🐛 修复bug

zhenxun/builtin_plugins/hooks/_auth_checker.py

@@ -198,6 +198,8 @@ class AuthChecker:
             return False
         if not self._flmt_s.check(sid):
             return False
+        if plugin.module == "ai":
+            return False
         return True
 
     async def auth(
@@ -392,7 +394,7 @@ class AuthChecker:
             if not plugin.status and plugin.block_type == BlockType.ALL:
                 """全局状态"""
                 if group_id:
-                    if await GroupConsole.is_super_group(group_id, channel_id):
+                    if await GroupConsole.is_super_group(group_id):
                         raise IsSuperuserException()
                 logger.debug(
                     f"{plugin.name}({plugin.module}) 全局未开启此功能...",

zhenxun/builtin_plugins/hooks/auth_hook.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from nonebot.adapters.onebot.v11 import Bot, Event, MessageEvent
+from nonebot.adapters.onebot.v11 import Bot, Event
 from nonebot.matcher import Matcher
 from nonebot.message import run_postprocessor, run_preprocessor
 from nonebot_plugin_alconna import UniMsg

zhenxun/builtin_plugins/hooks/ban_hook.py

@@ -1,3 +1,5 @@
+import logging
+
 from nonebot.adapters import Bot, Event
 from nonebot.exception import IgnoredException
 from nonebot.matcher import Matcher
@@ -8,6 +10,7 @@ from nonebot_plugin_session import EventSession
 
 from zhenxun.configs.config import Config
 from zhenxun.models.ban_console import BanConsole
+from zhenxun.models.group_console import GroupConsole
 from zhenxun.utils.enum import PluginType
 from zhenxun.utils.message import MessageUtils
 from zhenxun.utils.utils import FreqLimiter
@@ -30,7 +33,7 @@ async def _(
     if plugin := matcher.plugin:
         if metadata := plugin.metadata:
             extra = metadata.extra
-            if extra.get("plugin_type") == PluginType.HIDDEN:
+            if extra.get("plugin_type") in [PluginType.HIDDEN, PluginType.DEPENDANT]:
                 return
     user_id = session.id1
     group_id = session.id3 or session.id2
@@ -38,7 +41,12 @@ async def _(
         if user_id in bot.config.superusers:
             return
         if await BanConsole.is_ban(None, group_id):
+            logging.debug("群组处于黑名单中...", "ban_hook")
             raise IgnoredException("群组处于黑名单中...")
+        if g := await GroupConsole.get_group(group_id):
+            if g.level < 0:
+                logging.debug("群黑名单, 群权限-1...", "ban_hook")
+                raise IgnoredException("群黑名单, 群权限-1..")
     if user_id:
         ban_result = Config.get_config("hook", "BAN_RESULT")
         if user_id in bot.config.superusers:
@@ -59,7 +67,7 @@ async def _(
                         time_str = f"{hours} 小时 {minute}分钟"
                     else:
                         time_str = f"{minute} 分钟"
-            if ban_result and _flmt.check(user_id):
+            if time != -1 and ban_result and _flmt.check(user_id):
                 _flmt.start_cd(user_id)
                 await MessageUtils.build_message(
                     [
@@ -67,4 +75,5 @@ async def _(
                         f"{ban_result}\n在..在 {time_str} 后才会理你喔",
                     ]
                 ).send()
+            logging.debug("用户处于黑名单中...", "ban_hook")
             raise IgnoredException("用户处于黑名单中...")

zhenxun/builtin_plugins/hooks/chkdsk_hook.py

@@ -1,6 +1,7 @@
 import time
 from collections import defaultdict
 
+from nonebot.adapters import Event
 from nonebot.adapters.onebot.v11 import Bot
 from nonebot.exception import IgnoredException
 from nonebot.matcher import Matcher
@@ -63,16 +64,24 @@ _blmt = BanCheckLimiter(
 
 # 恶意触发命令检测
 @run_preprocessor
-async def _(matcher: Matcher, bot: Bot, session: EventSession, state: T_State):
+async def _(
+    matcher: Matcher, bot: Bot, session: EventSession, state: T_State, event: Event
+):
     module = None
     if plugin := matcher.plugin:
         module = plugin.module_name
         if metadata := plugin.metadata:
             extra = metadata.extra
-            if extra.get("plugin_type") in [PluginType.HIDDEN, PluginType.DEPENDANT]:
+            if extra.get("plugin_type") in [
+                PluginType.HIDDEN,
+                PluginType.DEPENDANT,
+                PluginType.ADMIN,
+            ]:
                 return
         else:
             return
+    if matcher.type == "notice":
+        return
     user_id = session.id1
     group_id = session.id3 or session.id2
     malicious_ban_time = Config.get_config("hook", "MALICIOUS_BAN_TIME")