feat: warning

BakaBotTeam · Jul 27, 2024 · 423d195 · 423d195
1 parent 967e943
commit 423d195
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/main/kotlin/ltd/guimc/lgzbot/listener/message/MessageFilter.kt b/src/main/kotlin/ltd/guimc/lgzbot/listener/message/MessageFilter.kt
@@ -26,6 +26,7 @@ import ltd.guimc.lgzbot.utils.RegexUtils
 import ltd.guimc.lgzbot.utils.TextUtils.findSimilarity
 import ltd.guimc.lgzbot.utils.TextUtils.removeNonVisible
 import ltd.guimc.lgzbot.word.WordUtils
+import net.mamoe.mirai.console.permission.Permission
 import net.mamoe.mirai.console.permission.PermissionService.Companion.hasPermission
 import net.mamoe.mirai.console.permission.PermitteeId.Companion.permitteeId
 import net.mamoe.mirai.contact.Group
@@ -64,6 +65,11 @@ object MessageFilter {
             35
         }
 
+        if (e.group.permitteeId.hasPermission(Permission.getRootPermission())) {
+            logger.warning("警告: 您似乎给群聊 ${e.bot.id}.${e.group.id} 上了 *:* 权限. 我们强烈不建议给群聊上 *:* 权限, 这会导致本插件工作异常. 例如: 无法处理任何群消息, 无法正常运行任何检查等... 为了避免接下来的插件无法正常处理事件, MessageFilter 将不会工作")
+            return
+        }
+
         if (textMessage.isEmpty() && e.message.content.isEmpty()) return
 
         if (!(e.sender.permission.level < e.group.botPermission.level || ModuleStateConfig.slientmute)) return
@@ -296,12 +302,13 @@ object MessageFilter {
                 counter.wordFrequency[it] = 0
             }
         }
-        // Permission block
+
         if ((e.sender.permitteeId.hasPermission(PluginMain.blocked) && !e.sender.permitteeId.hasPermission(bypassMute)) || (e.group.permitteeId.hasPermission(
                 PluginMain.blocked
             ) && !e.sender.permitteeId.hasPermission(bypassMute))
         ) {
-            muted = true
+            e.intercept()
+            return
         }
 
         // Cancel Event

diff --git a/src/main/kotlin/ltd/guimc/lgzbot/listener/multi/BakaListener.kt b/src/main/kotlin/ltd/guimc/lgzbot/listener/multi/BakaListener.kt
@@ -10,7 +10,6 @@ package ltd.guimc.lgzbot.listener.multi
 
 import ltd.guimc.lgzbot.PluginMain
 import ltd.guimc.lgzbot.files.ModuleStateConfig
-import net.mamoe.mirai.console.permission.Permission
 import net.mamoe.mirai.console.permission.PermissionService.Companion.hasPermission
 import net.mamoe.mirai.console.permission.PermitteeId.Companion.permitteeId
 import net.mamoe.mirai.event.EventHandler
@@ -90,9 +89,6 @@ object BakaListener : ListenerHost {
         if (!ModuleStateConfig.grouplistener) return
         if (this.group.permitteeId.hasPermission(PluginMain.quiet)) return
         this.group.sendMessage(format(NEW_MEMBER.random(), this.member.id))
-        if (this.member.permitteeId.hasPermission(Permission.getRootPermission())) {
-            this.group.sendMessage("挖欧！这是一个拥有机器人根权限的人！")
-        }
     }
 
     @EventHandler