版本更新

zhenxun/builtin_plugins/hooks/_auth_checker.py

@@ -88,7 +88,7 @@ class LimitManage:
     @classmethod
     async def check(
         cls,
-        module_path: str,
+        module: str,
         user_id: str,
         group_id: str | None,
         channel_id: str | None,
@@ -106,11 +106,11 @@ class LimitManage:
         异常:
             IgnoredException: IgnoredException
         """
-        if limit_model := cls.cd_limit.get(module_path):
+        if limit_model := cls.cd_limit.get(module):
             await cls.__check(limit_model, user_id, group_id, channel_id, session)
-        if limit_model := cls.block_limit.get(module_path):
+        if limit_model := cls.block_limit.get(module):
             await cls.__check(limit_model, user_id, group_id, channel_id, session)
-        if limit_model := cls.count_limit.get(module_path):
+        if limit_model := cls.count_limit.get(module):
             await cls.__check(limit_model, user_id, group_id, channel_id, session)
 
     @classmethod
@@ -298,7 +298,7 @@ class AuthChecker:
             LimitManage.add_limit(limit)
         if user_id:
             await LimitManage.check(
-                plugin.module_path, user_id, group_id, channel_id, session
+                plugin.module, user_id, group_id, channel_id, session
             )
 
     async def auth_plugin(
@@ -319,8 +319,8 @@ class AuthChecker:
             is_poke = isinstance(event, PokeNotifyEvent)
             if group_id:
                 sid = group_id or user_id
-                if await GroupConsole.is_super_block_plugin(
-                    group_id, plugin.module, channel_id
+                if await GroupConsole.is_superuser_block_plugin(
+                    group_id, plugin.module
                 ):
                     """超级用户群组插件状态"""
                     if self.is_send_limit_message(plugin, sid) and not is_poke:
@@ -334,9 +334,7 @@ class AuthChecker:
                         session=session,
                     )
                     raise IgnoredException("超级管理员禁用了该群此功能...")
-                if await GroupConsole.is_block_plugin(
-                    group_id, plugin.module, channel_id
-                ):
+                if await GroupConsole.is_normal_block_plugin(group_id, plugin.module):
                     """群组插件状态"""
                     if self.is_send_limit_message(plugin, sid) and not is_poke:
                         self._flmt_s.start_cd(group_id or user_id)

zhenxun/builtin_plugins/hooks/ban_hook.py

@@ -1,19 +1,18 @@
-import logging
-
-from nonebot.adapters import Bot, Event
-from nonebot.exception import IgnoredException
-from nonebot.matcher import Matcher
-from nonebot.message import run_preprocessor
 from nonebot.typing import T_State
+from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import At
+from nonebot.adapters import Bot, Event
+from nonebot.message import run_preprocessor
+from nonebot.exception import IgnoredException
 from nonebot_plugin_session import EventSession
 
+from zhenxun.services.log import logger
 from zhenxun.configs.config import Config
+from zhenxun.utils.enum import PluginType
+from zhenxun.utils.utils import FreqLimiter
+from zhenxun.utils.message import MessageUtils
 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
 
 Config.add_plugin_config(
     "hook",
@@ -41,11 +40,11 @@ async def _(
         if user_id in bot.config.superusers:
             return
         if await BanConsole.is_ban(None, group_id):
-            logging.debug("群组处于黑名单中...", "ban_hook")
+            logger.debug("群组处于黑名单中...", "ban_hook")
             raise IgnoredException("群组处于黑名单中...")
         if g := await GroupConsole.get_group(group_id):
             if g.level < 0:
-                logging.debug("群黑名单, 群权限-1...", "ban_hook")
+                logger.debug("群黑名单, 群权限-1...", "ban_hook")
                 raise IgnoredException("群黑名单, 群权限-1..")
     if user_id:
         ban_result = Config.get_config("hook", "BAN_RESULT")
@@ -58,12 +57,12 @@ async def _(
             else:
                 time = abs(int(time))
                 if time < 60:
-                    time_str = str(time) + " 秒"
+                    time_str = f"{time!s} 秒"
                 else:
                     minute = int(time / 60)
                     if minute > 60:
-                        hours = int(minute / 60)
-                        minute = minute % 60
+                        hours = minute // 60
+                        minute %= 60
                         time_str = f"{hours} 小时 {minute}分钟"
                     else:
                         time_str = f"{minute} 分钟"
@@ -75,5 +74,5 @@ async def _(
                         f"{ban_result}\n在..在 {time_str} 后才会理你喔",
                     ]
                 ).send()
-            logging.debug("用户处于黑名单中...", "ban_hook")
+            logger.debug("用户处于黑名单中...", "ban_hook")
             raise IgnoredException("用户处于黑名单中...")