🎨 feat: 优化命令的执行

spcookie · Jan 30, 2024 · ef13d42 · ef13d42
1 parent 2d9ee48
commit ef13d42
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 39 deletions.
diff --git a/tokisaki-function/src/main/kotlin/io/micro/function/domain/strategy/FunctionContext.kt b/tokisaki-function/src/main/kotlin/io/micro/function/domain/strategy/FunctionContext.kt
@@ -15,7 +15,7 @@ interface FunctionContext {
 
     fun config(cmd: Cmd): ConfigHint?
 
-    fun menu(): Uni<MessageChain>
+    fun description(cmds: List<Cmd>): Uni<MessageChain>
 
     fun downloadImage(cmd: Cmd): Uni<Void>
 

diff --git a/tokisaki-function/src/main/kotlin/io/micro/function/domain/strategy/FunctionContextImpl.kt b/tokisaki-function/src/main/kotlin/io/micro/function/domain/strategy/FunctionContextImpl.kt
@@ -1,6 +1,5 @@
 package io.micro.function.domain.strategy
 
-import io.micro.core.context.AuthContext
 import io.micro.core.exception.CmdException
 import io.micro.core.function.ConfigHint
 import io.micro.core.function.dto.Message
@@ -47,10 +46,10 @@ class FunctionContextImpl(
         return with(allocationCommandServices[cmd.cmd.lowercase()]) { this?.configHint() }
     }
 
-    override fun menu(): Uni<MessageChain> {
+    override fun description(cmds: List<Cmd>): Uni<MessageChain> {
         val unis = buildList {
             commandServices.forEach {
-                if (AuthContext.hasRole(it.cmd().code)) {
+                if (cmds.contains(it.cmd())) {
                     add(it.describe())
                 }
             }
@@ -77,7 +76,7 @@ class FunctionContextImpl(
                                 .format(LocalDateTime.now())
                         }
                             ∷ v8.8.8
-                            ∷ Mirai&Spring&Quarkus
+                            ∷ Mirai&Quarkus
                         """.trimIndent()
                     )
                 }

diff --git a/...aki-server/src/main/kotlin/io/micro/server/robot/domain/model/entity/FeatureFunctionDO.kt b/...aki-server/src/main/kotlin/io/micro/server/robot/domain/model/entity/FeatureFunctionDO.kt
@@ -37,7 +37,7 @@ class FeatureFunctionDO {
 
     var memberId: Long? = null
 
-    var isMenu: Boolean = false
+    var isDescription: Boolean = false
 
     var isUndefined: Boolean = false
 

diff --git a/...rver/src/main/kotlin/io/micro/server/robot/domain/service/impl/RobotManagerServiceImpl.kt b/...rver/src/main/kotlin/io/micro/server/robot/domain/service/impl/RobotManagerServiceImpl.kt
@@ -8,10 +8,7 @@ import io.micro.core.exception.requireNonNull
 import io.micro.core.exception.requireTure
 import io.micro.core.function.dto.CardID
 import io.micro.core.function.dto.MediaType
-import io.micro.core.rest.CommonCode
-import io.micro.core.rest.CommonMsg
-import io.micro.core.rest.PageDO
-import io.micro.core.rest.Pageable
+import io.micro.core.rest.*
 import io.micro.core.robot.Credential
 import io.micro.core.robot.Robot
 import io.micro.core.robot.qq.QQRobot
@@ -50,6 +47,7 @@ import net.mamoe.mirai.message.data.PlainText
 import net.mamoe.mirai.message.data.buildMessageChain
 import net.mamoe.mirai.message.data.findIsInstance
 import org.hibernate.reactive.mutiny.Mutiny
+import org.hibernate.reactive.mutiny.Mutiny.SessionFactory
 import java.util.*
 
 /**
@@ -273,29 +271,34 @@ class RobotManagerServiceImpl(
         robot.onGroupMessage = { event ->
             Log.info(event.message)
 
-            val latestRobot = sessionFactory.withSession {
-                robotManagerRepository.findRobotCacheById(robotId)
-            }.runSubscriptionOn { vertxContext.runOnContext(it) }.awaitSuspending()
+            val latestRobot =
+                fetchDatabase(sessionFactory, vertxContext) { robotManagerRepository.findRobotCacheById(robotId) }
             requireNonNull(latestRobot)
             val featureFunction = getFeatureFunction(event, latestRobot)
             if (featureFunction != null) {
-                val authority = sessionFactory.withSession {
-                    authService.getAuthorityCacheByCode(featureFunction.code!!)
-                }.runSubscriptionOn { vertxContext.runOnContext(it) }.awaitSuspending()
-                if (authority != null && authority.enabled == true) {
-                    val switch = sessionFactory.withSession {
-                        robotManagerRepository.findSwitchCacheByUseFunctionId(featureFunction.id!!)
-                    }.runSubscriptionOn { vertxContext.runOnContext(it) }.awaitSuspending()
-                    val switched = featureFunction.also { it.switch = switch }.switched()
-                    if (switched) {
-                        runCatching {
-                            functionContext.call(
-                                featureFunction.cmd!!,
-                                featureFunction.args,
-                                featureFunction.getConfigMap(objectMapper)
-                            ).awaitSuspending()
-                        }
-                            .onSuccess { messageChain ->
+                if (featureFunction.isDescription || featureFunction.isUndefined) {
+                    val cmds = latestRobot.functions.map { it.cmd }.filterNotNull()
+                    cacheCmdException(event, { functionContext.description(cmds) }) {
+                        val messageChain = it.awaitSuspending()
+                        group.sendMessage(messageChain.messages[0].msg)
+                    }
+                } else {
+                    val authority = fetchDatabase(sessionFactory, vertxContext) {
+                        authService.getAuthorityCacheByCode(featureFunction.code!!)
+                    }
+                    if (authority != null && authority.enabled == true) {
+                        val switch = sessionFactory.withSession {
+                            robotManagerRepository.findSwitchCacheByUseFunctionId(featureFunction.id!!)
+                        }.runSubscriptionOn { vertxContext.runOnContext(it) }.awaitSuspending()
+                        val switched = featureFunction.also { it.switch = switch }.switched()
+                        if (switched) {
+                            cacheCmdException(event, {
+                                functionContext.call(
+                                    featureFunction.cmd!!,
+                                    featureFunction.args,
+                                    featureFunction.getConfigMap(objectMapper)
+                                ).awaitSuspending()
+                            }) { messageChain ->
                                 val requireQuota = featureFunction.requireQuota
                                 val results = buildMessageChain {
                                     if (requireQuota == true) {
@@ -317,32 +320,54 @@ class RobotManagerServiceImpl(
                                     }
                                 }
 
-                                val receipt = event.group.sendMessage(results)
+                                val receipt = group.sendMessage(results)
 
                                 if (messageChain.receipt.recall > 0) {
                                     receipt.recallIn(messageChain.receipt.recall.toLong())
                                 }
                             }
-                            .onFailure {
-                                if (it is CmdException) {
-                                    event.group.sendMessage(it.message.toString())
-                                } else {
-                                    Log.error("function异常：", it)
-                                }
-                            }
+                        }
+                    } else {
+                        event.group.sendMessage("命令已被禁用")
                     }
                 }
             }
         }
     }
 
+    private suspend fun <T> fetchDatabase(
+        sessionFactory: SessionFactory,
+        vertxContext: Context,
+        block: (Mutiny.Session) -> Uni<T>
+    ): T? {
+        return sessionFactory.withSession { block(it) }
+            .runSubscriptionOn { vertxContext.runOnContext(it) }
+            .awaitSuspending()
+    }
+
+    private suspend inline fun <T, E> cacheCmdException(
+        event: GroupMessageEvent,
+        block: () -> E,
+        success: GroupMessageEvent.(E) -> T
+    ) {
+        runCatching { block() }
+            .onSuccess { success(event, it) }
+            .onFailure {
+                if (it is CmdException) {
+                    event.group.sendMessage(it.message.toString())
+                } else {
+                    Log.error("function异常：", it)
+                }
+            }
+    }
+
     private fun getFeatureFunction(event: GroupMessageEvent, latestRobot: RobotDO): FeatureFunctionDO? {
         val text = event.message.findIsInstance<PlainText>().toString()
         val at = event.message.findIsInstance<At>()
         var featureFunction: FeatureFunctionDO? = null
         if (at != null) {
             if (at.target == latestRobot.id) {
-                featureFunction = FeatureFunctionDO().also { it.isMenu = true }
+                featureFunction = FeatureFunctionDO().also { it.isDescription = true }
             }
         } else {
             featureFunction = latestRobot.resolveCommand(event.group.id, event.sender.id, text)