diff --git a/README.md b/README.md index c0f4fb2..7bc7767 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,11 @@ MiraiConsolePlugin 自定义戳一戳回复消息 - `#group.mute:30` 禁言30s, 可以自定义禁言时间, 单位秒 - `#ignore` 忽略 -Tips:可以在特殊消息之后直接添加消息以在执行时同时回复消息 +Tips: + +- 可以在特殊消息之后直接添加消息以在执行时同时回复消息(除了忽略) +- 另外,请不要发送以`#Audio`开头的消息,避免将消息错认为语音 +- 可以在禁言时发送的特殊消息后添加"%s"以在回复的消息中加上禁言时长 ## 配置文件 文件位置:`config/me.jie65535.mirai-console-jnr-plugin/jnr.yml` diff --git a/src/main/kotlin/top/jie65535/jnr/JNRCommand.kt b/src/main/kotlin/top/jie65535/jnr/JNRCommand.kt index 383e8ba..12cbb97 100644 --- a/src/main/kotlin/top/jie65535/jnr/JNRCommand.kt +++ b/src/main/kotlin/top/jie65535/jnr/JNRCommand.kt @@ -54,12 +54,16 @@ object JNRCommand : CompositeCommand( sendMessage("已取消") } else { if (nextEvent.message.contains(OnlineAudio.Key)) { - sendMessage("暂不支持语音消息!") - return + saveResources(nextEvent.message) + for (it in nextEvent.message){ + if (it is OnlineAudio){ + JNRPluginConfig.replyMessageList.add(ReplyMessage(("#Audio" + it.filename), weight)) + } + } + } else { + saveResources(nextEvent.message) + JNRPluginConfig.replyMessageList.add(ReplyMessage(nextEvent.message.serializeToMiraiCode(), weight)) } - - saveResources(nextEvent.message) - JNRPluginConfig.replyMessageList.add(ReplyMessage(nextEvent.message.serializeToMiraiCode(), weight)) sendMessage("已添加一条消息,权重为$weight") } } catch (e: TimeoutCancellationException) { diff --git a/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt b/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt index c8583c4..cc2b58e 100644 --- a/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt +++ b/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt @@ -3,18 +3,14 @@ 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.Contact -import net.mamoe.mirai.contact.Group -import net.mamoe.mirai.contact.Member -import net.mamoe.mirai.contact.nameCardOrNick +import net.mamoe.mirai.contact.* 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.Audio -import net.mamoe.mirai.message.data.Image +import net.mamoe.mirai.message.data.* import net.mamoe.mirai.message.data.Image.Key.isUploaded -import net.mamoe.mirai.message.data.MessageChain +import net.mamoe.mirai.utils.ExternalResource.Companion.toExternalResource import net.mamoe.mirai.utils.ExternalResource.Companion.uploadAsImage import net.mamoe.mirai.utils.info import java.time.LocalDateTime @@ -138,6 +134,17 @@ object JNudgeReply : KotlinPlugin( logger.info("已忽略本次戳一戳回复") } + message.message.startsWith("#Audio") -> { + val audioFile = resolveDataFile("audios/" + message.message.substring(6)).toExternalResource() + if (event.subject is Group){ + val messageTemp = (event.subject as Group).uploadAudio(audioFile) + sendRecordMessage(event.subject, messageTemp.toMessageChain()) + } else { + val messageTemp = "暂不支持私聊发送语音" + sendRecordMessage(event.subject, messageTemp.deserializeMiraiCode()) + } + } + // 其它 else -> sendRecordMessage(event.subject, message.message.deserializeMiraiCode()) } @@ -160,8 +167,6 @@ object JNudgeReply : KotlinPlugin( ) } } - } else if (it is Audio) { - // val audioFile = resolveDataFile("audios/" + it.) } } subject.sendMessage(message)