Skip to content

Commit 0ad3823

Browse files
Samarium150Samarium150
committed
fix: correct url display
1 parent 1eddc96 commit 0ad3823

File tree

5 files changed

+29
-25
lines changed

5 files changed

+29
-25
lines changed

‎build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@ plugins {
55
kotlin("jvm") version kotlinVersion
66
kotlin("plugin.serialization") version kotlinVersion
77

8-
id("net.mamoe.mirai-console") version "2.12.1"
8+
id("net.mamoe.mirai-console") version "2.12.2"
99
id("com.geoffgranum.gradle-conventional-changelog") version "+"
1010
}
1111

1212
group = "io.github.samarium150"
13-
version = "6.0.1"
13+
version = "6.0.2"
1414

1515
repositories {
1616
mavenCentral()
1717
}
1818

1919
dependencies {
20-
implementation("io.ktor:ktor-client-okhttp:2.0.3") {
20+
implementation("io.ktor:ktor-client-okhttp-jvm:2.1.0") {
2121
exclude(group = "org.jetbrains.kotlin")
2222
exclude(group = "org.jetbrains.kotlinx")
2323
}
24-
implementation("io.ktor:ktor-client-content-negotiation:2.0.3") {
24+
implementation("io.ktor:ktor-client-content-negotiation:2.1.0") {
2525
exclude(group = "org.jetbrains.kotlin")
2626
exclude(group = "org.jetbrains.kotlinx")
2727
}
28-
implementation("io.ktor:ktor-serialization-kotlinx-json:2.0.3") {
28+
implementation("io.ktor:ktor-serialization-kotlinx-json:2.1.0") {
2929
exclude(group = "org.jetbrains.kotlin")
3030
exclude(group = "org.jetbrains.kotlinx")
3131
}

‎src/main/kotlin/MiraiConsoleLolicon.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import java.net.Proxy
3535
object MiraiConsoleLolicon : KotlinPlugin(
3636
JvmPluginDescription(
3737
id = "io.github.samarium150.mirai.plugin.mirai-console-lolicon",
38-
version = "6.0.1",
38+
version = "6.0.2",
3939
name = "Lolicon"
4040
) {
4141
author("Samarium150")

‎src/main/kotlin/command/Lolicon.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ object Lolicon : CompositeCommand(
9393
val imgInfoReceipt =
9494
if (subject == null ||
9595
PluginConfig.verbose && PluginConfig.messageType != PluginConfig.Type.Forward
96-
) sendMessage(imageData.toReadable())
96+
) sendMessage(imageData.toReadable(url))
9797
else null
9898
if (subject == null && !PluginConfig.save)
9999
return@withLock
@@ -112,7 +112,7 @@ object Lolicon : CompositeCommand(
112112
return@withLock
113113
}
114114
val image = (subject as Contact).uploadImage(stream)
115-
val imgReceipt = sendMessage(buildMessage(subject as Contact, imageData.toReadable(), image))
115+
val imgReceipt = sendMessage(buildMessage(subject as Contact, imageData.toReadable(url), image))
116116
if (notificationReceipt != null)
117117
recall(RecallType.NOTIFICATION, notificationReceipt, 0)
118118
if (imgReceipt == null)
@@ -165,7 +165,7 @@ object Lolicon : CompositeCommand(
165165
for (imageData in response.data) {
166166
when {
167167
imageData.urls.size > 1 -> {
168-
imageMsgBuilder.add(contact.bot, PlainText(imageData.toReadable()))
168+
imageMsgBuilder.add(contact.bot, PlainText(imageData.toReadable(imageData.urls)))
169169
for (url in imageData.urls.values) {
170170
runCatching {
171171
val stream = getImageInputStream(url)
@@ -187,12 +187,12 @@ object Lolicon : CompositeCommand(
187187
runCatching {
188188
val stream = getImageInputStream(imageData.urls.values.first())
189189
val image = contact.uploadImage(stream)
190-
imageMsgBuilder.add(contact.bot, PlainText(imageData.toReadable()))
190+
imageMsgBuilder.add(contact.bot, PlainText(imageData.toReadable(imageData.urls)))
191191
imageMsgBuilder.add(contact.bot, image)
192192
stream
193193
}.onFailure {
194194
logger.error(it)
195-
imageMsgBuilder.add(contact.bot, PlainText(imageData.toReadable()))
195+
imageMsgBuilder.add(contact.bot, PlainText(imageData.toReadable(imageData.urls)))
196196
imageMsgBuilder.add(contact.bot, PlainText(ReplyConfig.networkError))
197197
}.onSuccess {
198198
runInterruptible(Dispatchers.IO) {
@@ -235,7 +235,7 @@ object Lolicon : CompositeCommand(
235235
logger.error(it)
236236
sendMessage(ReplyConfig.networkError)
237237
}.onSuccess {
238-
imageInfoMsgBuilder.add(imageData.toReadable())
238+
imageInfoMsgBuilder.add(imageData.toReadable(imageData.urls))
239239
imageInfoMsgBuilder.add("\n")
240240
runInterruptible(Dispatchers.IO) {
241241
it.close()
@@ -257,7 +257,7 @@ object Lolicon : CompositeCommand(
257257
logger.error(it)
258258
sendMessage(ReplyConfig.networkError)
259259
}.onSuccess {
260-
imageInfoMsgBuilder.add(imageData.toReadable())
260+
imageInfoMsgBuilder.add(imageData.toReadable(imageData.urls))
261261
imageInfoMsgBuilder.add("\n")
262262
runInterruptible(Dispatchers.IO) {
263263
it.close()

‎src/main/kotlin/data/ImageData.kt

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package io.github.samarium150.mirai.plugin.lolicon.data
1818

19-
import io.github.samarium150.mirai.plugin.lolicon.config.PluginConfig
2019
import kotlinx.serialization.Serializable
2120
import kotlinx.serialization.encodeToString
2221
import kotlinx.serialization.json.Json
@@ -36,19 +35,24 @@ data class ImageData(
3635
val uploadDate: Long,
3736
val urls: Map<String, String>
3837
) {
38+
39+
private val template = """
40+
标题: $title
41+
作者: $author (uid: ${uid})
42+
标签: $tags
43+
链接: https://pixiv.net/artworks/${pid}
44+
代理链接：
45+
""".trimIndent()
46+
3947
override fun toString(): String {
4048
return "ImageData" + Json.encodeToString(this)
4149
}
4250

43-
fun toReadable(): String {
44-
return (
45-
"""
46-
标题: $title
47-
作者: $author (uid: ${uid})
48-
标签: $tags
49-
链接: https://pixiv.net/artworks/${pid}
50-
代理链接：${urls[PluginConfig.size.name.lowercase()]}
51-
""".trimIndent()
52-
)
51+
fun toReadable(url: String): String {
52+
return template + url
53+
}
54+
55+
fun toReadable(urls: Map<String, String>): String {
56+
return template + urls.toString()
5357
}
5458
}

‎src/main/kotlin/data/RequestBody.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ data class RequestBody(
2828
val keyword: String? = "",
2929
val tag: List<List<String>>? = null,
3030
val size: List<String>? = null,
31-
val proxy: String = "i.pixiv.re",
31+
val proxy: String = "https://i.pixiv.re",
3232
val dataAfter: Long? = null,
3333
val dataBefore: Long? = null,
3434
val dsc: Boolean? = null

0 commit comments

Comments
 (0)