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 + } + } + } + }