Merge pull request #13 from EnkanSakura/main

1.启用/停用随机操作指令; 2.指令消息回复(QuoteReply)使用者

Author: EnkanSakura

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "org.stg.verification.bot"
-version = "1.2.4"
+version = "1.2.5"
 
 repositories {
     maven("https://maven.aliyun.com/repository/public")

src/main/kotlin/CommandHandler.kt

@@ -91,11 +91,15 @@ interface CommandHandler {
         /**
          * 指令处理器列表
          */
-        val handlers = arrayOf(
+        val allCmd = arrayOf(
             ShowTips,
             AddAdmin, RemoveAdmin, ListAllAdmin,
             RandOperation, DeleteRecord, ClearRecord, ModifyTag,
-            GetRecord, GetAllRecord
+            GetRecord, GetAllRecord,
+            EnableGroup, DisableGroup
+        )
+        private val groupCmd = arrayOf(
+            EnableGroup, DisableGroup
         )
 
         /**
@@ -104,7 +108,11 @@ interface CommandHandler {
          */
         suspend fun handle(event: GroupMessageEvent) {
             // 排除非工作QQ群
-            if (event.group.id !in TRVGConfig.qq.qqGroup) return
+            val handlers =
+                if (event.group.id !in TRVGConfig.qq.qqGroup)
+                    if (TRVGConfig.isSuperAdmin(event.sender.id)) groupCmd
+                    else return
+                else allCmd
             // 从群消息事件中获取消息链并忽略空消息
             val message = event.message
             if (message.size <= 1) return
@@ -141,7 +149,7 @@ interface CommandHandler {
                     }
                     // 执行指令
                     val groupMsg = it.execute(event, content)
-                    event.group.sendMessage(groupMsg)
+                    event.group.sendMessage(QuoteReply(event.source) + groupMsg)
                 }
             }
         }

src/main/kotlin/PluginMain.kt

@@ -17,7 +17,7 @@ internal object PluginMain : KotlinPlugin(
     JvmPluginDescription(
         id = "org.stg.verification.bot",
         name = "Touhou Replay Verification Code Generator Bot",
-        version = "1.2.4"
+        version = "1.2.5"
     )
 ) {
     /**

src/main/kotlin/command/DisableGroup.kt

@@ -0,0 +1,28 @@
+package org.stg.verification.bot.command
+
+import net.mamoe.mirai.event.events.GroupMessageEvent
+import net.mamoe.mirai.message.data.Message
+import net.mamoe.mirai.message.data.PlainText
+import org.stg.verification.bot.CommandHandler
+import org.stg.verification.bot.storage.TRVGConfig
+
+object DisableGroup : CommandHandler {
+    override val name: String = "停用随机操作"
+
+    override val permLevel: CommandHandler.PermLevel = CommandHandler.PermLevel.SUPER_ADMIN
+
+    override val cooldown: MutableMap<Long, Long> = mutableMapOf()
+
+    override fun showTips(groupCode: Long, senderId: Long) = "$name"
+
+    override fun showInstruction(groupCode: Long, senderId: Long) = "$name"
+
+    override suspend fun execute(event: GroupMessageEvent, content: String): Message {
+        val groupId = event.group.id
+        val (succeed, failed) = listOf(groupId).partition { TRVGConfig.isGroupEnabled(it) && TRVGConfig.disableGroup(it) }
+        val result =
+            if (succeed.isNotEmpty()) "OK"
+            else failed.joinToString(postfix = "不是工作群")
+        return PlainText(result)
+    }
+}

src/main/kotlin/command/EnableGroup.kt

@@ -0,0 +1,28 @@
+package org.stg.verification.bot.command
+
+import net.mamoe.mirai.event.events.GroupMessageEvent
+import net.mamoe.mirai.message.data.Message
+import net.mamoe.mirai.message.data.PlainText
+import org.stg.verification.bot.CommandHandler
+import org.stg.verification.bot.storage.TRVGConfig
+
+object EnableGroup : CommandHandler {
+    override val name: String = "启用随机操作"
+
+    override val permLevel: CommandHandler.PermLevel = CommandHandler.PermLevel.SUPER_ADMIN
+
+    override val cooldown: MutableMap<Long, Long> = mutableMapOf()
+
+    override fun showTips(groupCode: Long, senderId: Long) = "$name"
+
+    override fun showInstruction(groupCode: Long, senderId: Long) = "$name"
+
+    override suspend fun execute(event: GroupMessageEvent, content: String): Message {
+        val groupId = event.group.id
+        val (succeed, failed) = listOf(groupId).partition { !TRVGConfig.isGroupEnabled(it) && TRVGConfig.enableGroup(it) }
+        val result =
+            if (succeed.isNotEmpty()) "OK"
+            else failed.joinToString(postfix = "是工作群")
+        return PlainText(result)
+    }
+}

src/main/kotlin/command/ShowTips.kt

@@ -4,7 +4,7 @@ import net.mamoe.mirai.event.events.GroupMessageEvent
 import net.mamoe.mirai.message.data.Message
 import net.mamoe.mirai.message.data.PlainText
 import org.stg.verification.bot.CommandHandler
-import org.stg.verification.bot.CommandHandler.Companion.handlers
+import org.stg.verification.bot.CommandHandler.Companion.allCmd
 
 object ShowTips : CommandHandler {
     override val name = "指令说明"
@@ -19,12 +19,12 @@ object ShowTips : CommandHandler {
 
     override suspend fun execute(event: GroupMessageEvent, content: String): Message {
         if (content.isEmpty()) {
-            val tips = handlers.filter { it.checkAuth(event.sender.id) }
+            val tips = allCmd.filter { it.checkAuth(event.sender.id) }
                 .mapNotNull { it.showTips(event.group.id, event.sender.id) }
             val result = tips.joinToString(separator = "\n", prefix = "你可以使用以下功能：\n")
             return PlainText(result)
         } else {
-            for (handler in handlers) {
+            for (handler in allCmd) {
                 if (content == handler.name) {
                     return PlainText(handler.showInstruction(event.group.id, event.sender.id)?:"")
                 }

src/main/kotlin/storage/TRVGConfig.kt

@@ -14,20 +14,39 @@ object TRVGConfig : AutoSavePluginConfig("TRVGConfig") {
 
         @SerialName("qq_group")
         /** 主要功能的QQ群 */
-        val qqGroup: LongArray,
+        var qqGroup: MutableList<Long>,
     )
 
     @ValueDescription("QQ相关配置")
     val qq: QQConfig by value(
         QQConfig(
-            superAdminQQ = 12345678,
-            qqGroup = longArrayOf(12345678)
+            superAdminQQ = 12345678L,
+            qqGroup = mutableListOf(12345678L)
         )
     )
 
-    fun isSuperAdmin(qq: Long) =
+    fun isSuperAdmin(qq: Long): Boolean =
         qq == this.qq.superAdminQQ
 
+    fun enableGroup(groupId: Long): Boolean {
+        synchronized(TRVGConfig) {
+            if (groupId in qq.qqGroup) return false
+            qq.qqGroup += groupId
+            return true
+        }
+    }
+
+    fun disableGroup(groupId: Long): Boolean {
+        synchronized(TRVGConfig) {
+            if (groupId !in qq.qqGroup) return false
+            qq.qqGroup -= groupId
+            return true
+        }
+    }
+
+    fun isGroupEnabled(groupId: Long): Boolean =
+        groupId in qq.qqGroup
+
     @Serializable
     class RandOperationConfig(
         /** 一个验证码包含的随机操作的次数 */