fix: correct verbose setting in forward mode (#84)

closes #83
Samarium150 · Oct 13, 2022 · 2c88080 · 2c88080
1 parent afb3ce8
commit 2c88080
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 37 deletions.
diff --git a/Module.md b/Module.md
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "io.github.samarium150"
-version = "6.0.4"
+version = "6.0.5"
 
 repositories {
     mavenCentral()

diff --git a/src/main/kotlin/MiraiConsoleLolicon.kt b/src/main/kotlin/MiraiConsoleLolicon.kt
@@ -35,7 +35,7 @@ import java.net.Proxy
 object MiraiConsoleLolicon : KotlinPlugin(
     JvmPluginDescription(
         id = "io.github.samarium150.mirai.plugin.mirai-console-lolicon",
-        version = "6.0.4",
+        version = "6.0.5",
         name = "Lolicon"
     ) {
         author("Samarium150")

diff --git a/src/main/kotlin/command/Lolicon.kt b/src/main/kotlin/command/Lolicon.kt
@@ -117,7 +117,13 @@ object Lolicon : CompositeCommand(
                 return@withLock
             }
             val image = (subject as Contact).uploadImage(stream)
-            val imgReceipt = sendMessage(buildMessage(subject as Contact, imageData.toReadable(url), image))
+            val imgReceipt = sendMessage(
+                buildMessage(
+                    subject as Contact,
+                    if (PluginConfig.verbose) imageData.toReadable(url) else "",
+                    image
+                )
+            )
             if (notificationReceipt != null)
                 recall(RecallType.NOTIFICATION, notificationReceipt, 0)
             if (imgReceipt == null)

diff --git a/src/main/kotlin/util/GeneralUtil.kt b/src/main/kotlin/util/GeneralUtil.kt
@@ -137,7 +137,8 @@ internal fun buildMessage(contact: Contact, imageInfo: String, image: Image): Si
         PluginConfig.Type.Simple -> image
         PluginConfig.Type.Flash -> FlashImage(image)
         PluginConfig.Type.Forward -> buildForwardMessage(contact, CustomDisplayStrategy) {
-            add(contact.bot, PlainText(imageInfo))
+            if (imageInfo.isNotEmpty())
+                add(contact.bot, PlainText(imageInfo))
             add(contact.bot, image)
         }
     }