Add custom command features

Author: alazeprt

gradle.properties

@@ -1,5 +1,5 @@
 group=top.alazeprt.aqqbot
-version=1.0.5
+version=1.0.6
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.caching.enabled=true

src/main/kotlin/top/alazeprt/aqqbot/AQQBot.kt

@@ -12,6 +12,7 @@ import taboolib.module.metrics.Metrics
 import top.alazeprt.aonebot.BotClient
 import top.alazeprt.aonebot.action.SendGroupMessage
 import top.alazeprt.aqqbot.qq.BotListener
+import top.alazeprt.aqqbot.util.ACustom
 import java.io.File
 import java.net.URI
 import javax.sql.DataSource
@@ -36,6 +37,8 @@ object AQQBot : Plugin() {
 
     val dataMap: MutableMap<String, String> = mutableMapOf()
 
+    val customCommands: MutableList<ACustom> = mutableListOf()
+
     lateinit var table: Table<*, *>
 
     lateinit var dataSource: DataSource
@@ -95,6 +98,17 @@ object AQQBot : Plugin() {
         botConfig = Configuration.loadFromFile(botFile)
         val messageFile = releaseResourceFile("messages.yml", replace = false)
         messageConfig = Configuration.loadFromFile(messageFile)
+        val customFile = releaseResourceFile("custom.yml", replace = false)
+        val customConfig = Configuration.loadFromFile(customFile)
+        customConfig.getKeys(false).forEach {
+            if (customConfig.getBoolean("$it.enable")) {
+                val command = customConfig.getStringList("$it.command")
+                val output = customConfig.getStringList("$it.output")
+                val unbind_output = customConfig.getStringList("$it.unbind_output")
+                val format = customConfig.getBoolean("$it.format")
+                customCommands.add(ACustom(command, output, unbind_output, format))
+            }
+        }
         dataConfig.getKeys(false).forEach {
             dataMap[it] = (dataConfig.getString(it)?: return@forEach)
         }

src/main/kotlin/top/alazeprt/aqqbot/command/ABotCommand.kt

@@ -11,12 +11,14 @@ import taboolib.module.configuration.Configuration
 import top.alazeprt.aonebot.BotClient
 import top.alazeprt.aqqbot.AQQBot.botConfig
 import top.alazeprt.aqqbot.AQQBot.config
+import top.alazeprt.aqqbot.AQQBot.customCommands
 import top.alazeprt.aqqbot.AQQBot.enableGroups
 import top.alazeprt.aqqbot.AQQBot.isBukkit
 import top.alazeprt.aqqbot.AQQBot.messageConfig
 import top.alazeprt.aqqbot.AQQBot.oneBotClient
 import top.alazeprt.aqqbot.DependencyImpl
 import top.alazeprt.aqqbot.qq.BotListener
+import top.alazeprt.aqqbot.util.ACustom
 import top.alazeprt.aqqbot.util.AI18n.get
 import java.net.URI
 
@@ -38,6 +40,18 @@ object ABotCommand {
                 botConfig = Configuration.loadFromFile(botFile)
                 val messageFile = releaseResourceFile("messages.yml", replace = false)
                 messageConfig = Configuration.loadFromFile(messageFile)
+                customCommands.clear()
+                val customFile = releaseResourceFile("custom.yml", replace = false)
+                val customConfig = Configuration.loadFromFile(customFile)
+                customConfig.getKeys(false).forEach {
+                    if (customConfig.getBoolean("$it.enable")) {
+                        val command = customConfig.getStringList("$it.command")
+                        val output = customConfig.getStringList("$it.output")
+                        val unbind_output = customConfig.getStringList("$it.unbind_output")
+                        val format = customConfig.getBoolean("$it.format")
+                        customCommands.add(ACustom(command, output, unbind_output, format))
+                    }
+                }
                 botConfig.getStringList("groups").forEach {
                     enableGroups.add(it)
                 }

src/main/kotlin/top/alazeprt/aqqbot/handler/StatsHandler.kt

@@ -5,9 +5,9 @@ import top.alazeprt.aonebot.event.Listener
 import top.alazeprt.aonebot.event.SubscribeBotEvent
 import top.alazeprt.aonebot.event.message.GroupMessageEvent
 import top.alazeprt.aqqbot.AQQBot
+import top.alazeprt.aqqbot.AQQBot.customCommands
 import top.alazeprt.aqqbot.AQQBot.isBukkit
 import top.alazeprt.aqqbot.handler.InformationHandler
-import top.alazeprt.aqqbot.handler.StatsHandler
 import top.alazeprt.aqqbot.handler.WhitelistHandler
 import top.alazeprt.aqqbot.util.AI18n.get
 
@@ -20,11 +20,14 @@ class BotListener : Listener {
         val message = event.message
         val handleInfo = InformationHandler.handle(message, event)
         val handleWl = WhitelistHandler.handle(message, event)
-        var handleStats = false
-        if (isBukkit) {
-            handleStats = StatsHandler.handle(message, event)
+        var handleCustom = false
+        customCommands.forEach {
+            if (it.handle(message?: return@forEach, event.senderId.toString(), event.groupId.toString())) {
+                handleCustom = true
+                return@forEach
+            }
         }
-        if(AQQBot.config.getBoolean("chat.group_to_server") && !(handleInfo || handleWl || handleStats) && isBukkit) {
+        if(AQQBot.config.getBoolean("chat.group_to_server") && !(handleInfo || handleWl || handleCustom) && isBukkit) {
             Bukkit.broadcastMessage(formatString(get("game.chat_from_qq", mutableMapOf("groupId" to event.groupId.toString(),
                 "userName" to event.senderNickName,
                 "message" to message))))

src/main/kotlin/top/alazeprt/aqqbot/qq/BotListener.kt

@@ -0,0 +1,40 @@
+package top.alazeprt.aqqbot.util
+
+import me.clip.placeholderapi.PlaceholderAPI
+import org.bukkit.Bukkit
+import top.alazeprt.aonebot.action.SendGroupMessage
+import top.alazeprt.aqqbot.AQQBot.dataMap
+import top.alazeprt.aqqbot.AQQBot.isFileStorage
+import top.alazeprt.aqqbot.AQQBot.oneBotClient
+import top.alazeprt.aqqbot.DependencyImpl.Companion.withPAPI
+
+class ACustom(val command: List<String>, val output: List<String>, val unbind_output: List<String>, val format: Boolean) {
+    companion object {
+        private fun formatString(input: String): String {
+            return input.replace(Regex("&([0-9a-fklmnor])"), "")
+        }
+    }
+
+    fun handle(input: String, userId: String, groupId: String): Boolean {
+        if (!command.contains(input)) return false
+        var player: String?
+        if (isFileStorage) {
+            player = dataMap.getOrDefault(userId, null)
+        } else {
+            player = DBQuery.qqInDatabase(userId.toLong())
+        }
+        if (player == null) {
+            oneBotClient.action(SendGroupMessage(groupId.toLong(), unbind_output.joinToString("\n")))
+            return true
+        }
+        var outputString: String = output.joinToString("\n")
+        if (withPAPI) {
+            outputString = PlaceholderAPI.setPlaceholders(Bukkit.getOfflinePlayer(player), outputString)
+        }
+        if (format) {
+            outputString = formatString(outputString)
+        }
+        oneBotClient.action(SendGroupMessage(groupId.toLong(), outputString))
+        return true
+    }
+}

src/main/kotlin/top/alazeprt/aqqbot/util/ACustom.kt

@@ -112,45 +112,6 @@ chat:
   # [服务器] ${sender}: ${message}
   server_to_group: true
 
-# 玩家统计信息
-# * 该功能仅支持Bukkit类服务端
-# 大部分信息需要安装PlayerStats插件作为前置
-# 权限 & 组织 信息需要安装PlaceholderAPI插件作为前置
-stats:
-  # 是否开启该功能
-  enable: true
-
-  # 获取指令
-  command:
-    - "/stats"
-    - "stats"
-    - "统计信息"
-    - "/统计信息"
-    - "玩家统计信息"
-    - "/玩家统计信息"
-
-  # 组织信息来源
-  party:
-    # 是否启用该功能
-    enable: false
-
-    # 获取的PlaceholderAPI变量
-    placeholder: "%parties_name%"
-
-    # 将颜色符号格式化
-    format: false
-
-  # 称号信息来源
-  prefix:
-    # 是否启用该功能
-    enable: true
-
-    # 获取的PlaceholderAPI变量
-    placeholder: "%luckperms_prefix%"
-
-    # 将颜色符号格式化
-    format: true
-
 # 服务器开启/关闭通知
 notify:
   # 是否开启该功能

src/main/resources/config.yml

@@ -0,0 +1,26 @@
+# 自定义命令配置文件
+# 在QQ中执行该命令时返回指定结果
+# 支持掺杂 PlaceholderAPI 所提供的变量
+
+# 例 1
+# 输入 /prefix 或 /称号 时返回玩家的称号 (对应PAPI变量 %vault_prefix%)
+prefix:
+  # 是否开启该命令
+  enable: true
+
+  # 获取命令
+  command:
+    - "/prefix"
+    - "/称号"
+
+  # 输出结果
+  output:
+    - "你的称号是: %vault_prefix%"
+
+  # 未绑定账号的玩家输出 (不支持 PAPI)
+  unbind_output:
+    - "你还没有绑定账号!"
+
+  # 是否格式化颜色符号 (如: &7普通&a玩家 -> 普通玩家)
+  format: true
+