chore: use user role instead of admin list

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 kotlinVersion = "2.0.20"
-ronebotVersion = "1.13.5"
+ronebotVersion = "1.13.6"
 shadowVersion = "8.3.0"
 okhttpVersion = "5.0.0-alpha.14"
 exposedVersion = "0.53.0"

src/main/kotlin/cn/rtast/fancybot/commands/EchoCommand.kt

@@ -8,7 +8,6 @@
 package cn.rtast.fancybot.commands
 
 import cn.rtast.fancybot.annotations.CommandDescription
-import cn.rtast.fancybot.configManager
 import cn.rtast.fancybot.enums.CommandAction
 import cn.rtast.fancybot.util.file.insertActionRecord
 import cn.rtast.rob.entity.GroupMessage
@@ -20,12 +19,12 @@ class EchoCommand : BaseCommand() {
     override val commandNames = listOf("/echo")
 
     override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
-        if (message.sender.userId !in configManager.admins) {
+        if (message.sender.isAdmin || message.sender.isOwner) {
+            listener.sendGroupMessage(message.groupId, args.joinToString(" "))
+            insertActionRecord(CommandAction.Echo, message.sender.userId)
+        } else {
             message.reply("你不许用echo")
-            return
         }
-        listener.sendGroupMessage(message.groupId, args.joinToString(" "))
-        insertActionRecord(CommandAction.Echo, message.sender.userId)
     }
 }
 
@@ -34,11 +33,11 @@ class ShuffleEchoCommand : BaseCommand() {
     override val commandNames = listOf("/secho", "/se")
 
     override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
-        if (message.sender.userId !in configManager.admins) {
+        if (message.sender.isAdmin || message.sender.isOwner) {
+            message.reply(message.rawMessage.toList().shuffled().joinToString(""))
+            insertActionRecord(CommandAction.Echo, message.sender.userId)
+        } else{
             message.reply("你不许用echo")
-            return
         }
-        message.reply(message.rawMessage.toList().shuffled().joinToString(""))
-        insertActionRecord(CommandAction.Echo, message.sender.userId)
     }
 }

src/main/kotlin/cn/rtast/fancybot/commands/misc/AntiRevokeCommand.kt

@@ -8,7 +8,6 @@
 package cn.rtast.fancybot.commands.misc
 
 import cn.rtast.fancybot.annotations.CommandDescription
-import cn.rtast.fancybot.configManager
 import cn.rtast.fancybot.enums.CommandAction
 import cn.rtast.fancybot.util.file.insertActionRecord
 import cn.rtast.rob.entity.ArrayMessage
@@ -22,14 +21,17 @@ class AntiRevokeCommand : BaseCommand() {
     override val commandNames = listOf("/revoke", "/rv")
 
     override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
-        if (message.sender.userId !in configManager.admins) message.reply("你不许用防撤回")
-        val messageId = args.first().toLong()
-        val getMsg = listener.getMessage(messageId)
-        val msgList = mutableListOf<ArrayMessage>()
-        msgList.add(ArrayMessage(ArrayMessageType.at, ArrayMessage.Data(qq = message.sender.userId.toString())))
-        msgList.add(ArrayMessage(ArrayMessageType.text, ArrayMessage.Data(text = "\n被撤回的消息如下: \n")))
-        msgList.addAll(getMsg.message)
-        listener.sendGroupMessage(message.groupId, msgList)
-        insertActionRecord(CommandAction.AntiRevoke, message.sender.userId, getMsg.messageId.toString())
+        if (message.sender.isAdmin || message.sender.isOwner) {
+            val messageId = args.first().toLong()
+            val getMsg = listener.getMessage(messageId)
+            val msgList = mutableListOf<ArrayMessage>()
+            msgList.add(ArrayMessage(ArrayMessageType.at, ArrayMessage.Data(qq = message.sender.userId.toString())))
+            msgList.add(ArrayMessage(ArrayMessageType.text, ArrayMessage.Data(text = "\n被撤回的消息如下: \n")))
+            msgList.addAll(getMsg.message)
+            listener.sendGroupMessage(message.groupId, msgList)
+            insertActionRecord(CommandAction.AntiRevoke, message.sender.userId, getMsg.messageId.toString())
+        } else {
+            message.reply("你不许用防撤回")
+        }
     }
 }

src/main/kotlin/cn/rtast/fancybot/commands/misc/SendMailCommand.kt

@@ -49,17 +49,13 @@ class SendMailCommand : BaseCommand() {
             message.reply("发送`/mail <收件人地址>`即可发送测试邮件~")
             return
         }
-        if (message.sender.userId !in configManager.admins) {
-            val msg = MessageChain.Builder()
-                .addReply(message.messageId)
-                .addText("你不许发邮件")
-                .build()
-            listener.sendGroupMessage(message.groupId, msg)
-            return
+        if (message.sender.isAdmin || message.sender.isOwner) {
+            val target = args.first()
+            this.sendMail(target)
+            message.reply("正在发送邮件, 请查收~(可能会出现在垃圾桶中~)")
+            insertActionRecord(CommandAction.SendMail, message.sender.userId, target)
+        } else {
+            message.reply("你不许发邮件")
         }
-        val target = args.first()
-        this.sendMail(target)
-        message.reply("正在发送邮件, 请查收~(可能会出现在垃圾桶中~)")
-        insertActionRecord(CommandAction.SendMail, message.sender.userId, target)
     }
 }

src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziManagerCommand.kt

@@ -8,7 +8,6 @@
 package cn.rtast.fancybot.commands.niuzi
 
 import cn.rtast.fancybot.annotations.CommandDescription
-import cn.rtast.fancybot.configManager
 import cn.rtast.fancybot.niuziBankManager
 import cn.rtast.fancybot.niuziManager
 import cn.rtast.fancybot.util.misc.getUserName
@@ -27,42 +26,42 @@ class NiuziManagerCommand : BaseCommand() {
             message.reply("此命令可以管理成员的牛子或者银行账户")
             return
         }
-        if (message.sender() !in configManager.admins) {
-            message.reply("你没权限呢!")
-            return
-        }
-        val target = message.message.find { it.type == ArrayMessageType.at }!!.data.qq!!.toLong()
-        val method = args[1]
-        val amount = args.last().toDouble()
-        when (method) {
-            "set", "s", "设置" -> {
-                val type = args[2]
-                when (type) {
-                    "yh", "银行" -> {
-                        val before = niuziBankManager.getUser(target)
-                        niuziBankManager.deposit(target, amount, listener.getUserName(message.groupId, target))
-                        val after = niuziBankManager.getUser(target)
-                        val msg = MessageChain.Builder()
-                            .addText("设置成功! 金额: $amount")
-                            .addNewLine()
-                            .addText("设置前余额: ${before?.balance?.toFloat()} | 设置后余额: ${after?.balance?.toFloat()}")
-                            .build()
-                        message.reply(msg)
-                    }
+        if (message.sender.isAdmin || message.sender.isOwner) {
+            val target = message.message.find { it.type == ArrayMessageType.at }!!.data.qq!!.toLong()
+            val method = args[1]
+            val amount = args.last().toDouble()
+            when (method) {
+                "set", "s", "设置" -> {
+                    val type = args[2]
+                    when (type) {
+                        "yh", "银行" -> {
+                            val before = niuziBankManager.getUser(target)
+                            niuziBankManager.deposit(target, amount, listener.getUserName(message.groupId, target))
+                            val after = niuziBankManager.getUser(target)
+                            val msg = MessageChain.Builder()
+                                .addText("设置成功! 金额: $amount")
+                                .addNewLine()
+                                .addText("设置前余额: ${before?.balance?.toFloat()} | 设置后余额: ${after?.balance?.toFloat()}")
+                                .build()
+                            message.reply(msg)
+                        }
 
-                    else -> {
-                        val before = niuziManager.getUser(target)
-                        niuziManager.updateLength(target, amount)
-                        val after = niuziManager.getUser(target)
-                        val msg = MessageChain.Builder()
-                            .addText("设置成功! 金额: $amount")
-                            .addNewLine()
-                            .addText("设置前长度: ${before?.length?.toFloat()} | 设置后长度: ${after?.length?.toFloat()}")
-                            .build()
-                        message.reply(msg)
+                        else -> {
+                            val before = niuziManager.getUser(target)
+                            niuziManager.updateLength(target, amount)
+                            val after = niuziManager.getUser(target)
+                            val msg = MessageChain.Builder()
+                                .addText("设置成功! 金额: $amount")
+                                .addNewLine()
+                                .addText("设置前长度: ${before?.length?.toFloat()} | 设置后长度: ${after?.length?.toFloat()}")
+                                .build()
+                            message.reply(msg)
+                        }
                     }
                 }
             }
+        } else {
+            message.reply("你没权限呢!")
         }
     }
 }