🎨(coreLib/CommandApi) 增加CommandInfo.requirePermission

Author: way-zer

scripts/coreLibrary/lib/CommandApi.kt

@@ -118,7 +118,7 @@ class CommandInfo(
     val attrs: List<CommandHandler> = mutableListOf()
     var usage: String = ""
 
-    @Deprecated("use RequirePermission(permission)")
+    @Deprecated("use requirePermission(permission)")
     var permission: String = ""
     private var onComplete: CommandHandler = CommandHandler {}
     private var body: CommandHandler = CommandHandler {}
@@ -128,7 +128,7 @@ class CommandInfo(
         if (frozen) return
         @Suppress("DEPRECATION")
         if (permission.isNotEmpty())
-            attr(RequirePermission(permission))
+            attr(Commands.Permission(permission))
         frozen = true
     }
 
@@ -141,6 +141,8 @@ class CommandInfo(
         (attrs as MutableList).add(beforeBody)
     }
 
+    inline fun <reified T> attr() = attrs.filterIsInstance<T>()
+
     @Deprecated("replace CommandHandler", level = DeprecationLevel.HIDDEN)
     fun onComplete(block: CommandHandlerOld) = onComplete {
         block.invoke(context)
@@ -186,7 +188,7 @@ class CommandInfo(
     }
 
     @CommandBuilder
-    @Deprecated("use +RequirePermission(permission)")
+    @Deprecated("use requirePermission(permission)")
     fun CommandContext.replyNoPermission(): Nothing {
         reply("[red]你没有执行该命令的权限".with())
         Return()
@@ -223,6 +225,13 @@ open class Commands : CommandHandler, TabCompleter, CommandHandlerOld {
         }
     }
 
+    data class Permission(val permission: String) : Hidden {
+        context(CommandContext) override suspend fun visible(): Boolean = hasPermission(permission)
+        context(CommandContext) override suspend fun handle() {
+            if (!visible()) returnReply("[red]你没有执行该命令的权限".with())
+        }
+    }
+
     protected val nameMap = mutableMapOf<String, CommandInfo>()
     open fun subCommands(): Map<String, CommandInfo> = nameMap
     fun getSub(name: String): CommandInfo? = subCommands()[name.lowercase()]
@@ -318,15 +327,16 @@ open class Commands : CommandHandler, TabCompleter, CommandHandlerOld {
     }
 
     //compatibility for [CommandInfo.body]
-    @Deprecated("use CommandHandler instead", level = DeprecationLevel.ERROR,
+    @Deprecated(
+        "use CommandHandler instead", level = DeprecationLevel.ERROR,
         replaceWith = ReplaceWith("this.handle()")
     )
     override suspend fun invoke(p1: CommandContext) = error("use CommandHandler")
 
     object Root : Commands() {
         init {
             this += CommandInfo(null, "ScriptAgent", "ScriptAgent 控制指令".with(), listOf("sa")).apply {
-                attr(RequirePermission("scriptAgent.admin"))
+                requirePermission("scriptAgent.admin")
                 body(controlCommand)
             }
             thisContextScript().listenTo<ScriptDisableEvent> {
@@ -349,7 +359,7 @@ open class Commands : CommandHandler, TabCompleter, CommandHandlerOld {
             val detail = buildString {
                 if (!showDetail) return@buildString
                 if (it.script != null) append(" | ${it.script.id}")
-                if (it.permission.isNotBlank()) append(" | ${it.permission}")
+                it.attr<Permission>().firstOrNull()?.let { append(" | ${it.permission}") }
             }
             return "[light_yellow]{prefix}{name}[light_red]{aliases} [white]{usage}  [light_cyan]{desc}[cyan]{detail}".with(
                 "prefix" to prefix, "name" to it.name, "aliases" to alias,
@@ -361,13 +371,6 @@ open class Commands : CommandHandler, TabCompleter, CommandHandlerOld {
     }
 }
 
-data class RequirePermission(val permission: String) : Commands.Hidden {
-    context(CommandContext) override suspend fun visible(): Boolean = hasPermission(permission)
-    context(CommandContext) override suspend fun handle() {
-        if (!visible()) returnReply("[red]你没有执行该命令的权限".with())
-    }
-}
-
 @ScriptDsl
 inline fun Script.command(
     name: String,
@@ -384,4 +387,9 @@ inline fun Script.command(
 @ScriptDsl
 inline fun Script.command(name: String, description: String, init: CommandInfo.() -> Unit) {
     command(name, description.with()) { init() }
+}
+
+@CommandInfo.CommandBuilder
+fun CommandInfo.requirePermission(permission: String) {
+    attr(Commands.Permission(permission))
 }

scripts/wayzer/cmds/voteKick.kts

@@ -51,7 +51,7 @@ val banImpl = contextScript<wayzer.user.Ban>()
 command("kick", "踢出某人".with(), commands = VoteEvent.VoteCommands) {
     aliases = listOf("踢出")
     usage = "<玩家名/id> <理由>"
-    attr(RequirePermission("wayzer.vote.kick"))
+    requirePermission("wayzer.vote.kick")
     body {
         val target = getTarget()
         val reason = getInput("踢人理由", "[red]投票踢人需要理由".with())
@@ -72,13 +72,4 @@ command("kick", "踢出某人".with(), commands = VoteEvent.VoteCommands) {
     }
 }
 
-command("votekick", "(弃用)投票踢人") {
-    usage = "<player...>"
-    attr(ClientOnly)
-    body {
-        //Redirect
-        arg = listOf("kick", *arg.toTypedArray())
-        VoteEvent.VoteCommands.handle()
-    }
-}
 PermissionApi.registerDefault("wayzer.admin.skipKick", group = "@admin")

scripts/wayzer/cmds/voteOb.kts

@@ -9,7 +9,7 @@ import java.time.Duration
 import java.time.Instant
 
 val teams = contextScript<BetterTeam>()
-val voteKick = contextScript<wayzer.cmds.VoteKick>()
+val voteKick = contextScript<VoteKick>()
 
 @Savable(false)
 val limitPlayers = mutableMapOf<String, Pair<String, Instant>>()//profile -> reason,time
@@ -85,7 +85,8 @@ listenTo<BetterTeam.AssignTeamEvent>(Event.Priority.Intercept) {
     }
 }
 command("votekick", "(弃用)投票踢人") {
-    this.usage = "<player...>";this.type = CommandType.Client
+    this.usage = "<player...>"
+    attr(ClientOnly)
     body {
         //Redirect
         arg = listOf("ob", *arg.toTypedArray())
@@ -112,4 +113,4 @@ command("forceOB", "管理指令：使某人强制观战") {
         )
     }
 }
-PermissionApi.registerDefault("wayzer.admin.skipKick", "wayzer.admin.forceOb", group = "@admin")
+PermissionApi.registerDefault("wayzer.admin.forceOb", group = "@admin")

scripts/wayzer/user/ext/skills.kts

@@ -68,7 +68,7 @@ companion object Api {
     @ScriptDsl
     fun Script.skill(name: String, desc: String, vararg aliases: String, body: SkillScope.() -> Unit) {
         skills += CommandInfo(this, name, desc) {
-            attr(RequirePermission("wayzer.user.skills.$name"))
+            requirePermission("wayzer.user.skills.$name")
             attr(ClientOnly)
             this.aliases = aliases.toList()
             body {