From 0909b9d0d53c2593d20b523cfdab918fe825370f Mon Sep 17 00:00:00 2001 From: Dream-Rainy <88184993+Dream-Rainy@users.noreply.github.com> Date: Sun, 2 Apr 2023 13:05:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=96=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加了群聊语音支持，支持特殊消息顺便回复普通消息 --- README.md | 5 ++ .../kotlin/top/jie65535/jnr/JNRCommand.kt | 14 +++-- .../top/jie65535/jnr/JNRPluginConfig.kt | 2 +- .../kotlin/top/jie65535/jnr/JNudgeReply.kt | 57 ++++++++++++++----- 4 files changed, 59 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 14d2720..7bc7767 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,11 @@ MiraiConsolePlugin 自定义戳一戳回复消息 - `#group.mute:30` 禁言30s, 可以自定义禁言时间, 单位秒 - `#ignore` 忽略 +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/JNRPluginConfig.kt b/src/main/kotlin/top/jie65535/jnr/JNRPluginConfig.kt index 6db422a..8f94c24 100644 --- a/src/main/kotlin/top/jie65535/jnr/JNRPluginConfig.kt +++ b/src/main/kotlin/top/jie65535/jnr/JNRPluginConfig.kt @@ -52,4 +52,4 @@ object JNRPluginConfig : AutoSavePluginConfig("jnr") { * 是否在间隔期间依然拦截事件，与 [isIntercept] 有关 */ var interceptAtInterval: Boolean by value(true) -} \ No newline at end of file +} diff --git a/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt b/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt index 46ba653..cc2b58e 100644 --- a/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt +++ b/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt @@ -3,21 +3,19 @@ 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 +import java.util.regex.Matcher +import java.util.regex.Pattern import kotlin.random.Random object JNudgeReply : KotlinPlugin( @@ -101,20 +99,29 @@ object JNudgeReply : KotlinPlugin( if (message.message.startsWith("#")) { when { // 戳回去 - message.message == "#nudge" -> { + message.message.startsWith("#nudge") -> { event.from.nudge().sendTo(event.subject) + if (message.message.length > 6) { + val messageTemp = message.message.substring(6) + sendRecordMessage(event.subject, messageTemp.deserializeMiraiCode()) + } logger.info("已尝试戳回发送者") } // 禁言 - message.message.startsWith("#group.mute:") -> { - val duration = message.message.substringAfter(':').toIntOrNull() - if (duration == null) { + message.message.startsWith("#group.mute\\:") -> { + val duration = RegexMatches.main(message.message) + if (duration == 0) { logger.warning("戳一戳禁言失败：\"${message.message}\" 格式不正确") } else { val member: Member = event.from as Member try { member.mute(duration) + val s = duration.toString() + if (message.message.length > (13 + s.length)){ + val messageTemp = String.format(message.message.substring(13 + s.length),s) + sendRecordMessage(event.subject, messageTemp.deserializeMiraiCode()) + } logger.info("戳一戳禁言目标 ${member.nameCardOrNick}(${member.id}) $duration 秒") } catch (e: Throwable) { logger.warning("戳一戳禁言失败", e) @@ -127,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()) } @@ -149,10 +167,23 @@ object JNudgeReply : KotlinPlugin( ) } } - } else if (it is Audio) { - // TODO } } subject.sendMessage(message) } + + object RegexMatches { + @JvmStatic + fun main(str: String): Int { + val pattern = "[0-9]+" + val r: Pattern = Pattern.compile(pattern) + val m: Matcher = r.matcher(str) + return if (m.find()){ + m.group(0).toInt() + }else{ + 0 + } + } + } + } From ac6633de90ad6a3901cbb501b0a0929bdad3013d Mon Sep 17 00:00:00 2001 From: Dream-Rainy <88184993+Dream-Rainy@users.noreply.github.com> Date: Mon, 3 Apr 2023 21:07:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=AF=AD?= =?UTF-8?q?=E9=9F=B3=E5=8C=B9=E9=85=8D=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在#Audio之后添加了冒号。 --- README.md | 1 - src/main/kotlin/top/jie65535/jnr/JNRCommand.kt | 2 +- src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7bc7767..7733e6d 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,6 @@ MiraiConsolePlugin 自定义戳一戳回复消息 Tips： - 可以在特殊消息之后直接添加消息以在执行时同时回复消息（除了忽略） -- 另外，请不要发送以`#Audio`开头的消息，避免将消息错认为语音 - 可以在禁言时发送的特殊消息后添加"%s"以在回复的消息中加上禁言时长 ## 配置文件 diff --git a/src/main/kotlin/top/jie65535/jnr/JNRCommand.kt b/src/main/kotlin/top/jie65535/jnr/JNRCommand.kt index 12cbb97..5d180bd 100644 --- a/src/main/kotlin/top/jie65535/jnr/JNRCommand.kt +++ b/src/main/kotlin/top/jie65535/jnr/JNRCommand.kt @@ -57,7 +57,7 @@ object JNRCommand : CompositeCommand( saveResources(nextEvent.message) for (it in nextEvent.message){ if (it is OnlineAudio){ - JNRPluginConfig.replyMessageList.add(ReplyMessage(("#Audio" + it.filename), weight)) + JNRPluginConfig.replyMessageList.add(ReplyMessage("#Audio:${it.filename}", weight)) } } } else { diff --git a/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt b/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt index cc2b58e..a3838ca 100644 --- a/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt +++ b/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt @@ -60,7 +60,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\\:") } } } @@ -134,8 +134,8 @@ object JNudgeReply : KotlinPlugin( logger.info("已忽略本次戳一戳回复") } - message.message.startsWith("#Audio") -> { - val audioFile = resolveDataFile("audios/" + message.message.substring(6)).toExternalResource() + message.message.startsWith("#Audio:") -> { + val audioFile = resolveDataFile("audios/" + message.message.substring(7)).toExternalResource() if (event.subject is Group){ val messageTemp = (event.subject as Group).uploadAudio(audioFile) sendRecordMessage(event.subject, messageTemp.toMessageChain()) From f60cb05eb519dbc195d520273a9db4e03c3481f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E5=82=91?= Date: Mon, 3 Apr 2023 23:09:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B01.4=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BA=86=E5=BA=8F=E5=88=97=E5=8C=96=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E6=94=B9=E4=BA=86=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E5=8A=A8=E4=BD=9C=E5=B8=A6=E5=9B=9E=E5=A4=8D=E9=80=BB?= =?UTF-8?q?=E8=BE=91=20=E5=8F=96=E6=B6=88=E4=BA=86=E7=A6=81=E8=A8=80?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=97=B6=E9=95=BF=E9=80=BB=E8=BE=91?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E4=BA=86=E8=AF=AD=E9=9F=B3=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=9B=9E=E5=A4=8D=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 +-- build.gradle.kts | 2 +- .../kotlin/top/jie65535/jnr/JNRCommand.kt | 27 ++++-- .../kotlin/top/jie65535/jnr/JNudgeReply.kt | 83 +++++++++---------- 4 files changed, 64 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index 7733e6d..98f1132 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,14 @@ MiraiConsolePlugin 自定义戳一戳回复消息 设置回复消息为以下内容，代表特殊含义 - `#nudge` 戳回去 +- `#nudge:戳我干嘛！` 戳回去，并且回复一条消息 - `#group.mute:30` 禁言30s, 可以自定义禁言时间, 单位秒 -- `#ignore` 忽略 +- `#group.mute:60:生气了！禁言你1分钟` 同上，并且回复一条消息 +- `#ignore` 忽略本次戳一戳 +- `#audio:XXX.amr` 回复音频，参数通常为 XXX.amr，服务器要求文件名后缀必须为 ".amr"，但其编码方式也有可能是非 + AudioCodec.AMR。 + 音频文件保存在 `data/me.jie65535.mirai-console-jnr-plugin/` 目录下，理论上你也可以手工设置音频文件。 -Tips： - -- 可以在特殊消息之后直接添加消息以在执行时同时回复消息（除了忽略） -- 可以在禁言时发送的特殊消息后添加"%s"以在回复的消息中加上禁言时长 ## 配置文件 文件位置：`config/me.jie65535.mirai-console-jnr-plugin/jnr.yml` diff --git a/build.gradle.kts b/build.gradle.kts index 77bc2ed..2a88111 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } group = "top.jie65535" -version = "1.3.0" +version = "1.4.0" repositories { mavenLocal() diff --git a/src/main/kotlin/top/jie65535/jnr/JNRCommand.kt b/src/main/kotlin/top/jie65535/jnr/JNRCommand.kt index 5d180bd..9404beb 100644 --- a/src/main/kotlin/top/jie65535/jnr/JNRCommand.kt +++ b/src/main/kotlin/top/jie65535/jnr/JNRCommand.kt @@ -53,16 +53,25 @@ object JNRCommand : CompositeCommand( if (nextEvent.message.isContentBlank()) { sendMessage("已取消") } else { - if (nextEvent.message.contains(OnlineAudio.Key)) { - saveResources(nextEvent.message) - for (it in nextEvent.message){ - if (it is OnlineAudio){ - JNRPluginConfig.replyMessageList.add(ReplyMessage("#Audio:${it.filename}", weight)) - } - } + // 保存资源 + saveResources(nextEvent.message) + + // 保存音频文件名 + val audio = nextEvent.message.findIsInstance() + if (audio != null) { + JNRPluginConfig.replyMessageList.add( + ReplyMessage( + PlainText("#audio:${audio.filename}").serializeToMiraiCode(), + weight + ) + ) } else { - saveResources(nextEvent.message) - JNRPluginConfig.replyMessageList.add(ReplyMessage(nextEvent.message.serializeToMiraiCode(), weight)) + JNRPluginConfig.replyMessageList.add( + ReplyMessage( + nextEvent.message.serializeToMiraiCode(), + weight + ) + ) } sendMessage("已添加一条消息，权重为$weight") } diff --git a/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt b/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt index a3838ca..fd7db5c 100644 --- a/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt +++ b/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt @@ -14,15 +14,15 @@ 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 -import java.util.regex.Matcher -import java.util.regex.Pattern 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.3.0", + version = "1.4.0", ) { author("jie65535") info("""自定义戳一戳回复插件""") @@ -95,34 +95,41 @@ object JNudgeReply : KotlinPlugin( logger.info { "Plugin loaded. https://github.com/jie65535/mirai-console-jnr-plugin" } } - private suspend fun doReply(message: ReplyMessage, event: NudgeEvent) { - if (message.message.startsWith("#")) { + private suspend fun doReply(reply: ReplyMessage, event: NudgeEvent) { + val replyMessageChain = reply.message.deserializeMiraiCode() + val replyMessage = replyMessageChain.content + if (replyMessage.startsWith("#")) { when { // 戳回去 - message.message.startsWith("#nudge") -> { + replyMessage.startsWith("#nudge") -> { event.from.nudge().sendTo(event.subject) - if (message.message.length > 6) { - val messageTemp = message.message.substring(6) - sendRecordMessage(event.subject, messageTemp.deserializeMiraiCode()) + val replyMsg = replyMessage.substring("#nudge".length).removePrefix(":") + if (replyMsg.isNotBlank()) { + sendRecordMessage(event.subject, messageChainOf(PlainText(replyMsg.trim()))) + logger.info("已尝试戳回发送者并回复消息") + } else { + logger.info("已尝试戳回发送者") } - logger.info("已尝试戳回发送者") } // 禁言 - message.message.startsWith("#group.mute\\:") -> { - val duration = RegexMatches.main(message.message) - if (duration == 0) { - logger.warning("戳一戳禁言失败：\"${message.message}\" 格式不正确") + 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}\" 格式不正确") } else { val member: Member = event.from as Member try { - member.mute(duration) - val s = duration.toString() - if (message.message.length > (13 + s.length)){ - val messageTemp = String.format(message.message.substring(13 + s.length),s) - sendRecordMessage(event.subject, messageTemp.deserializeMiraiCode()) + 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.subject, messageChainOf(PlainText(replyMsg))) } - logger.info("戳一戳禁言目标 ${member.nameCardOrNick}(${member.id}) $duration 秒") + logger.info("戳一戳禁言目标 ${member.nameCardOrNick}(${member.id}) $duration") } catch (e: Throwable) { logger.warning("戳一戳禁言失败", e) } @@ -130,26 +137,29 @@ object JNudgeReply : KotlinPlugin( } // 忽略 - message.message == "#ignore" -> { + replyMessage == "#ignore" -> { logger.info("已忽略本次戳一戳回复") } - message.message.startsWith("#Audio:") -> { - val audioFile = resolveDataFile("audios/" + message.message.substring(7)).toExternalResource() - if (event.subject is Group){ - val messageTemp = (event.subject as Group).uploadAudio(audioFile) + // 音频回复 + 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.subject, messageTemp.toMessageChain()) } else { - val messageTemp = "暂不支持私聊发送语音" - sendRecordMessage(event.subject, messageTemp.deserializeMiraiCode()) + logger.warning("当前上下文不支持回复语音") + sendRecordMessage(event.subject, messageChainOf(PlainText("[语音消息] 当前上下文不支持"))) } } // 其它 - else -> sendRecordMessage(event.subject, message.message.deserializeMiraiCode()) + else -> sendRecordMessage(event.subject, replyMessageChain) } } else { - sendRecordMessage(event.subject, message.message.deserializeMiraiCode()) + sendRecordMessage(event.subject, replyMessageChain) } } @@ -171,19 +181,4 @@ object JNudgeReply : KotlinPlugin( } subject.sendMessage(message) } - - object RegexMatches { - @JvmStatic - fun main(str: String): Int { - val pattern = "[0-9]+" - val r: Pattern = Pattern.compile(pattern) - val m: Matcher = r.matcher(str) - return if (m.find()){ - m.group(0).toInt() - }else{ - 0 - } - } - } - }