Browse Source

fix GroupPermissionChecker.kt

00ll00 5 years ago
parent
commit
b6da1d5437

+ 2 - 2
src/main/kotlin/bot_luo_core/cli/checkers/GroupPermissionChecker.kt

@@ -11,8 +11,8 @@ class GroupPermissionChecker: Checker {
     override val name = "群组权限检定器"
 
     override fun check(cmd: CmdExecutable, context: CmdContext) {
-        val p = context.groupF.pmsGroup.readPmsOn(cmd)
-        if (p >= cmd.pmsLevel) fatal("群组权限不足,要求:${cmd.pmsLevel.name} 群组权限:${p.name}".toPlainText())
+        val p = context.group.pmsGroup.readPmsOn(cmd)
+        if (p < cmd.pmsLevel) fatal("群组权限不足,要求:${cmd.pmsLevel.name} 群组权限:${p.name}".toPlainText())
     }
 
 }

+ 3 - 3
src/main/kotlin/bot_luo_core/cli/commands/ListCmd.kt

@@ -25,7 +25,7 @@ class ListCmd(context: CmdContext) : Cmd(context) {
         table.th("命令列表 —— 群组 ${group.name}(${group.id})").br()
 
         val map = HashMap<String, Pair<Boolean, CmdExecutable>>()
-        for (cmd in CmdCatalog.COMMANDS) {
+        for (cmd in CmdCatalog.COMMANDS.sortedBy { it.id }) {
             if (map[cmd.cmdName]?.first == true) continue
             try {
                 justCheck.forEach { it.createInstance().check(cmd, context) }
@@ -46,7 +46,7 @@ class ListCmd(context: CmdContext) : Cmd(context) {
         val table = TableBuilder(4)
         table.th("命令列表 —— 群组 ${group.name}(${group.id})").br()
 
-        for (cex in CmdCatalog.COMMANDS) {
+        for (cex in CmdCatalog.COMMANDS.sortedBy { it.id }) {
             try {
                 justCheck.forEach { it.createInstance().check(cex, context) }
                 table.tr(if (group.readCmdData(cex).working) "[√]" else "[×]").tb(cex.idFixed).tb(cex.subTitle)
@@ -63,7 +63,7 @@ class ListCmd(context: CmdContext) : Cmd(context) {
         val table = TableBuilder(4)
         table.th("命令列表 —— 群组 ${group.name}(${group.id})").br()
 
-        for (cex in CmdCatalog.COMMANDS) {
+        for (cex in CmdCatalog.COMMANDS.sortedBy { it.id }) {
             table.tr(if (group.readCmdData(cex).working) "[√]" else "[×]").tb(cex.idFixed).tb(cex.subTitle)
         }