feat[onebot11]: add more message type

RTAkland · Dec 14, 2024 · 89527d6 · 89527d6
1 parent 2316442
commit 89527d6
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.code.style=official
-libVersion=2.6.1
+libVersion=2.6.2
 #systemProp.http.proxyHost=127.0.0.1
 #systemProp.http.proxyPort=7890
 #systemProp.https.proxyHost=127.0.0.1

diff --git a/ronebot-common/src/main/kotlin/cn/rtast/rob/command/ICommandContext.kt b/ronebot-common/src/main/kotlin/cn/rtast/rob/command/ICommandContext.kt
@@ -8,14 +8,37 @@
 package cn.rtast.rob.command
 
 import cn.rtast.rob.BaseBotInstance
+import cn.rtast.rob.entity.IGroupMessage
 import cn.rtast.rob.entity.IMessage
+import cn.rtast.rob.entity.IPrivateMessage
 import cn.rtast.rob.enums.BrigadierMessageType
 
 /**
  * 指令上下文接口
  */
 interface ICommandContext {
+    /**
+     * 当前Bot实例
+     */
     val botInstance: BaseBotInstance
+
+    /**
+     * 两种消息类型的父类
+     */
     val message: IMessage
+
+    /**
+     * 消息类型
+     */
     val messageType: BrigadierMessageType
+
+    /**
+     * 群聊消息(可能为空)
+     */
+    val groupMessage: IGroupMessage?
+
+    /**
+     * 私聊消息(可能为空)
+     */
+    val privateMessage: IPrivateMessage?
 }
diff --git a/ronebot-onebot-v11/src/main/kotlin/cn/rtast/rob/util/BrigadierCommandManagerImpl.kt b/ronebot-onebot-v11/src/main/kotlin/cn/rtast/rob/util/BrigadierCommandManagerImpl.kt
@@ -9,7 +9,9 @@ package cn.rtast.rob.util
 
 import cn.rtast.rob.BotInstance
 import cn.rtast.rob.command.BrigadierCommandManager
+import cn.rtast.rob.entity.GroupMessage
 import cn.rtast.rob.entity.IMessage
+import cn.rtast.rob.entity.PrivateMessage
 import cn.rtast.rob.enums.BrigadierMessageType
 import com.mojang.brigadier.CommandDispatcher
 
@@ -21,7 +23,23 @@ class BrigadierCommandManagerImpl internal constructor(
     override fun execute(command: String, message: IMessage, messageType: BrigadierMessageType) {
         try {
             botInstances.forEach {
-                val context = CommandContext(it, message, messageType)
+                val context = when (messageType) {
+                    BrigadierMessageType.Group -> CommandContext(
+                        it,
+                        message,
+                        messageType,
+                        message as GroupMessage,
+                        null
+                    )
+
+                    BrigadierMessageType.Private -> CommandContext(
+                        it,
+                        message,
+                        messageType,
+                        null,
+                        message as PrivateMessage
+                    )
+                }
                 dispatcher.execute(command, context)
             }
         } catch (_: Exception) {

diff --git a/ronebot-onebot-v11/src/main/kotlin/cn/rtast/rob/util/CommandContext.kt b/ronebot-onebot-v11/src/main/kotlin/cn/rtast/rob/util/CommandContext.kt
@@ -7,16 +7,20 @@
 
 package cn.rtast.rob.util
 
-import cn.rtast.rob.BaseBotInstance
+import cn.rtast.rob.BotInstance
 import cn.rtast.rob.command.ICommandContext
+import cn.rtast.rob.entity.GroupMessage
 import cn.rtast.rob.entity.IMessage
+import cn.rtast.rob.entity.PrivateMessage
 import cn.rtast.rob.enums.BrigadierMessageType
 
 /**
  * 指令上下文
  */
 data class CommandContext(
-    override val botInstance: BaseBotInstance,
+    override val botInstance: BotInstance,
     override val message: IMessage,
-    override val messageType: BrigadierMessageType
+    override val messageType: BrigadierMessageType,
+    override val groupMessage: GroupMessage?,
+    override val privateMessage: PrivateMessage?
 ) : ICommandContext
diff --git a/ronebot-onebot-v11/src/test/kotlin/test/TestClient.kt b/ronebot-onebot-v11/src/test/kotlin/test/TestClient.kt
@@ -42,6 +42,7 @@ class TestBrigadierCommand : BrigadierCommand() {
             LiteralArgumentBuilder.literal<CommandContext>("test")
                 .executes { context ->
                     scope.launch {
+                        context.source.groupMessage?.reply("114514")
                         (context.source.message as GroupMessage).reply("114514")
                     }
                     0