From a201911817b6fba3abdda552d83e9151932c32aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E7=81=B5=E5=89=91=E5=BD=B1?= <2583963775@qq.com> Date: Mon, 12 Feb 2024 01:48:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20mirai-console=20=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=88=B0=202.16.0=EF=BC=9B=E4=BD=BF=E7=94=A8=20Mirai?= =?UTF-8?q?=20kdoc=20=E6=8E=A8=E8=8D=90=E7=9A=84=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=B9=E5=BC=8F=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=AE=BD=E9=AB=98=E5=BC=82=E5=B8=B8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- .../kotlin/top/jie65535/jnr/JNudgeReply.kt | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2a88111..6345a39 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { kotlin("jvm") version kotlinVersion kotlin("plugin.serialization") version kotlinVersion - id("net.mamoe.mirai-console") version "2.14.0" + id("net.mamoe.mirai-console") version "2.16.0" } group = "top.jie65535" diff --git a/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt b/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt index fd7db5c..805d3f4 100644 --- a/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt +++ b/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt @@ -9,7 +9,6 @@ import net.mamoe.mirai.event.events.NudgeEvent import net.mamoe.mirai.event.globalEventChannel import net.mamoe.mirai.message.code.MiraiCode.deserializeMiraiCode import net.mamoe.mirai.message.data.* -import net.mamoe.mirai.message.data.Image.Key.isUploaded import net.mamoe.mirai.utils.ExternalResource.Companion.toExternalResource import net.mamoe.mirai.utils.ExternalResource.Companion.uploadAsImage import net.mamoe.mirai.utils.info @@ -164,21 +163,22 @@ object JNudgeReply : KotlinPlugin( } private suspend fun sendRecordMessage(subject: Contact, message: MessageChain) { + val modifiedChain = MessageChainBuilder() for (it in message) { + var innerMessage = it if (it is Image) { - if (!it.isUploaded(subject.bot)) { - val imgFile = resolveDataFile("images/" + it.imageId) - if (imgFile.exists()) { - imgFile.uploadAsImage(subject) - } else { - logger.warning( - "图片的服务器缓存已失效，本地缓存已丢失，请重新设置该消息内的图片！" + - "消息内容：" + message.serializeToMiraiCode() - ) - } + val imgFile = resolveDataFile("images/" + it.imageId) + if (imgFile.exists()) { + innerMessage = imgFile.uploadAsImage(subject) + } else { + logger.warning( + "图片的本地缓存已丢失，请重新设置该消息内的图片！" + + "消息内容：" + message.serializeToMiraiCode() + ) } } + modifiedChain.append(innerMessage) } - subject.sendMessage(message) + subject.sendMessage(modifiedChain.build()) } }