build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "top.jie65535"
-version = "0.1.1"
+version = "0.1.0"
 
 repositories {
     mavenLocal()

src/main/kotlin/JPictureArchiving.kt

@@ -5,10 +5,8 @@ import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescription
 import net.mamoe.mirai.console.plugin.jvm.KotlinPlugin
 import net.mamoe.mirai.event.events.MessageEvent
 import net.mamoe.mirai.event.globalEventChannel
-import net.mamoe.mirai.message.data.ForwardMessage
 import net.mamoe.mirai.message.data.Image
 import net.mamoe.mirai.message.data.Image.Key.queryUrl
-import net.mamoe.mirai.message.data.MessageChain
 import net.mamoe.mirai.utils.info
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -20,7 +18,7 @@ object JPictureArchiving : KotlinPlugin(
     JvmPluginDescription(
         id = "top.jie65535.mirai-console-jpa-plugin",
         name = "J Picture Archiving",
-        version = "0.1.1"
+        version = "0.1.0"
     ) {
         author("jie65535")
         info("这个插件只做一件事，将机器人收到的所有图片存档")
@@ -37,36 +35,23 @@ object JPictureArchiving : KotlinPlugin(
         JPACommand.register()
 
         globalEventChannel().subscribeAlways<MessageEvent> {
-            saveImages(this.subject.id.toString(), message)
-        }
-    }
-
-    private suspend fun saveImages(from: String, message: MessageChain) {
-        val fm = message[ForwardMessage]
-        if (fm != null) {
-            fm.nodeList.forEach { saveImages(from, it.messageChain) }
-        } else {
-            message.filterIsInstance<Image>().forEach { img ->
-                saveImage(from, img)
+            message.filterIsInstance<Image>().forEach {
+                val url = it.queryUrl()
+                val filePath = "${this.subject.id}/${it.imageId}"
+                val file = if (JPAPluginConfig.archiveDirectory.isBlank()) {
+                    resolveDataFile(filePath)
+                } else {
+                    File(JPAPluginConfig.archiveDirectory, filePath)
+                }
+                if (!file.exists()) {
+                    val request = Request.Builder().url(url).build()
+                    val imageByte = okHttpClient.newCall(request).execute().body!!.bytes()
+                    val fileParent = file.parentFile
+                    if (!fileParent.exists()) fileParent.mkdirs()
+                    file.writeBytes(imageByte)
+                    logger.info("Saved ${file.path}.")
+                }
             }
         }
     }
-
-    private suspend fun saveImage(from: String, image: Image) {
-        val url = image.queryUrl()
-        val filePath = "${from}/${image.imageId}"
-        val file = if (JPAPluginConfig.archiveDirectory.isBlank()) {
-            resolveDataFile(filePath)
-        } else {
-            File(JPAPluginConfig.archiveDirectory, filePath)
-        }
-        if (!file.exists()) {
-            val request = Request.Builder().url(url).build()
-            val imageByte = okHttpClient.newCall(request).execute().body!!.bytes()
-            val fileParent = file.parentFile
-            if (!fileParent.exists()) fileParent.mkdirs()
-            file.writeBytes(imageByte)
-            logger.info("Saved ${file.path}.")
-        }
-    }
 }