README.md

@@ -18,20 +18,8 @@ MiraiConsolePlugin 自定义戳一戳回复消息
 设置回复消息为以下内容，代表特殊含义
 
 - `#nudge` 戳回去
-- `#nudge:戳我干嘛！` 戳回去，并且回复一条消息
 - `#group.mute:30` 禁言30s, 可以自定义禁言时间, 单位秒
-- `#group.mute:60:生气了！禁言你1分钟` 同上，并且回复一条消息
-- `#ignore` 忽略本次戳一戳
-- `#audio:XXX.amr` 回复音频，参数通常为 XXX.amr，服务器要求文件名后缀必须为 ".amr"，但其编码方式也有可能是非
-  AudioCodec.AMR。
-  音频文件保存在 `data/me.jie65535.mirai-console-jnr-plugin/` 目录下，理论上你也可以手工设置音频文件。
-
-## 占位符
-
-- `{name}` 会被替换为群名片或昵称
-- `{botName}` 会被替换为机器人群名片或昵称
-- `{groupName}` 会被替换为群名称
-- 更多欢迎 ISSUE 或者 PR 补充...
+- `#ignore` 忽略
 
 ## 配置文件
 

build.gradle.kts

@@ -3,11 +3,11 @@ plugins {
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
 
-    id("net.mamoe.mirai-console") version "2.16.0"
+    id("net.mamoe.mirai-console") version "2.14.0"
 }
 
 group = "top.jie65535"
-version = "1.5.0"
+version = "1.3.0"
 
 repositories {
     mavenLocal()

src/main/kotlin/top/jie65535/jnr/JNRCommand.kt

@@ -53,26 +53,13 @@ object JNRCommand : CompositeCommand(
                 if (nextEvent.message.isContentBlank()) {
                     sendMessage("已取消")
                 } else {
-                    // 保存资源
-                    saveResources(nextEvent.message)
-
-                    // 保存音频文件名
-                    val audio = nextEvent.message.findIsInstance<OnlineAudio>()
-                    if (audio != null) {
-                        JNRPluginConfig.replyMessageList.add(
-                            ReplyMessage(
-                                PlainText("#audio:${audio.filename}").serializeToMiraiCode(),
-                                weight
-                            )
-                        )
-                    } else {
-                        JNRPluginConfig.replyMessageList.add(
-                            ReplyMessage(
-                                nextEvent.message.serializeToMiraiCode(),
-                                weight
-                            )
-                        )
+                    if (nextEvent.message.contains(OnlineAudio.Key)) {
+                        sendMessage("暂不支持语音消息！")
+                        return
                     }
+
+                    saveResources(nextEvent.message)
+                    JNRPluginConfig.replyMessageList.add(ReplyMessage(nextEvent.message.serializeToMiraiCode(), weight))
                     sendMessage("已添加一条消息，权重为$weight")
                 }
             } catch (e: TimeoutCancellationException) {

src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt

@@ -3,7 +3,7 @@ package top.jie65535.jnr
 import net.mamoe.mirai.console.command.CommandManager.INSTANCE.register
 import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescription
 import net.mamoe.mirai.console.plugin.jvm.KotlinPlugin
-import net.mamoe.mirai.contact.AudioSupported
+import net.mamoe.mirai.contact.Contact
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.Member
 import net.mamoe.mirai.contact.nameCardOrNick
@@ -11,20 +11,20 @@ import net.mamoe.mirai.event.EventPriority
 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.utils.ExternalResource.Companion.toExternalResource
+import net.mamoe.mirai.message.data.Audio
+import net.mamoe.mirai.message.data.Image
+import net.mamoe.mirai.message.data.Image.Key.isUploaded
+import net.mamoe.mirai.message.data.MessageChain
 import net.mamoe.mirai.utils.ExternalResource.Companion.uploadAsImage
 import net.mamoe.mirai.utils.info
 import java.time.LocalDateTime
 import kotlin.random.Random
-import kotlin.time.DurationUnit
-import kotlin.time.toDuration
 
 object JNudgeReply : KotlinPlugin(
     JvmPluginDescription(
         id = "me.jie65535.mirai-console-jnr-plugin",
         name = "J Nudge Reply",
-        version = "1.5.0",
+        version = "1.3.0",
     ) {
         author("jie65535")
         info("""自定义戳一戳回复插件""")
@@ -62,7 +62,7 @@ object JNudgeReply : KotlinPlugin(
                         }
                     }
                     if ((from as Member).permission.level >= (subject as Group).botPermission.level) {
-                        replyList = replyList.filter { !it.message.startsWith("#group.mute\\:") }
+                        replyList = replyList.filter { !it.message.startsWith("#group.mute:") }
                     }
                 }
 
@@ -97,41 +97,25 @@ object JNudgeReply : KotlinPlugin(
         logger.info { "Plugin loaded. https://github.com/jie65535/mirai-console-jnr-plugin" }
     }
 
-    private suspend fun doReply(reply: ReplyMessage, event: NudgeEvent) {
-        val replyMessageChain = reply.message.deserializeMiraiCode()
-        val replyMessage = replyMessageChain.content
-        if (replyMessage.startsWith("#")) {
+    private suspend fun doReply(message: ReplyMessage, event: NudgeEvent) {
+        if (message.message.startsWith("#")) {
             when {
                 // 戳回去
-                replyMessage.startsWith("#nudge") -> {
+                message.message == "#nudge" -> {
                     event.from.nudge().sendTo(event.subject)
-                    val replyMsg = replyMessage.substring("#nudge".length).removePrefix(":")
-                    if (replyMsg.isNotBlank()) {
-                        sendRecordMessage(event, messageChainOf(PlainText(replyMsg.trim())))
-                        logger.info("已尝试戳回发送者并回复消息")
-                    } else {
                     logger.info("已尝试戳回发送者")
                 }
-                }
 
                 // 禁言
-                replyMessage.startsWith("#group.mute:") -> {
-                    val args = replyMessage.substring("#group.mute:".length).split(':')
-                    val durationS = if (args.isNotEmpty()) args[0].toIntOrNull() else 0
-                    if (durationS == null || durationS < 1) {
-                        logger.warning("戳一戳禁言失败：\"${replyMessage}\" 格式不正确")
+                message.message.startsWith("#group.mute:") -> {
+                    val duration = message.message.substringAfter(':').toIntOrNull()
+                    if (duration == null) {
+                        logger.warning("戳一戳禁言失败：\"${message.message}\" 格式不正确")
                     } else {
                         val member: Member = event.from as Member
                         try {
-                            member.mute(durationS)
-                            val duration = durationS.toDuration(DurationUnit.SECONDS)
-                            if (args.size > 1 && args[1].isNotBlank()) {
-                                val replyMsg = args[1].trim()
-//                                    .replace("{duration}", duration.toString())
-//              如果禁言时间是在消息中设置的，那么用户也可以同时设置回复的内容里带时间，因此无需添加格式化，除非支持随机禁言时间，可以再考虑
-                                sendRecordMessage(event, messageChainOf(PlainText(replyMsg)))
-                            }
-                            logger.info("戳一戳禁言目标 ${member.nameCardOrNick}(${member.id}) $duration")
+                            member.mute(duration)
+                            logger.info("戳一戳禁言目标 ${member.nameCardOrNick}(${member.id}) $duration 秒")
                         } catch (e: Throwable) {
                             logger.warning("戳一戳禁言失败", e)
                         }
@@ -139,69 +123,36 @@ object JNudgeReply : KotlinPlugin(
                 }
 
                 // 忽略
-                replyMessage == "#ignore" -> {
+                message.message == "#ignore" -> {
                     logger.info("已忽略本次戳一戳回复")
                 }
 
-                // 音频回复
-                replyMessage.startsWith("#audio:") -> {
-                    val filename = replyMessage.substring("#audio:".length)
-                    val audioFile = resolveDataFile("audios/$filename").toExternalResource()
-                    if (event.subject is AudioSupported) {
-                        logger.info("上传并回复语音 $filename")
-                        val messageTemp = (event.subject as AudioSupported).uploadAudio(audioFile)
-                        sendRecordMessage(event, messageTemp.toMessageChain())
-                    } else {
-                        logger.warning("当前上下文不支持回复语音")
-                        sendRecordMessage(event, messageChainOf(PlainText("[语音消息] 当前上下文不支持")))
-                    }
-                }
-
                 // 其它
-                else -> sendRecordMessage(event, replyMessageChain)
+                else -> sendRecordMessage(event.subject, message.message.deserializeMiraiCode())
             }
         } else {
-            sendRecordMessage(event, replyMessageChain)
+            sendRecordMessage(event.subject, message.message.deserializeMiraiCode())
         }
     }
 
-    private suspend fun sendRecordMessage(event: NudgeEvent, message: MessageChain) {
-        val modifiedChain = MessageChainBuilder()
+    private suspend fun sendRecordMessage(subject: Contact, message: MessageChain) {
         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()) {
-                    innerMessage = imgFile.uploadAsImage(event.subject)
+                        imgFile.uploadAsImage(subject)
                     } else {
                         logger.warning(
-                        "图片的本地缓存已丢失，请重新设置该消息内的图片！" +
+                            "图片的服务器缓存已失效，本地缓存已丢失，请重新设置该消息内的图片！" +
                                     "消息内容：" + message.serializeToMiraiCode()
                         )
                     }
-            } else if (it is PlainText) {
-                /**
-                 * 占位符
-                 * - `{name}` 会被替换为群名片或昵称
-                 * - `{botName}` 会被替换为机器人群名片或昵称
-                 * - `{groupName}` 会被替换为群名称
-                 */
-                val content = it.content
-                    .replace("{name}", event.from.nameCardOrNick)
-                    .replace("{botName}", event.target.nameCardOrNick)
-                    .replace(
-                        "{groupName}",
-                        if (event.subject is Group) {
-                            (event.subject as Group).name
-                        } else {
-                            event.from.nick
                 }
-                    )
-
-                innerMessage = PlainText(content)
+            } else if (it is Audio) {
+                // TODO
             }
-            modifiedChain.append(innerMessage)
         }
-        event.subject.sendMessage(modifiedChain.build())
+        subject.sendMessage(message)
     }
 }