FIX BUG

basic_plugins/admin_bot_manage/switch_rule.py

@@ -1,23 +1,32 @@
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, MessageEvent, GROUP, PrivateMessageEvent
-from nonebot import on_command, on_message, on_regex
-from nonebot.params import RegexGroup
+from typing import Any, Tuple
 
+from nonebot import on_command, on_message, on_regex
+from nonebot.adapters.onebot.v11 import (
+    GROUP,
+    Bot,
+    GroupMessageEvent,
+    Message,
+    MessageEvent,
+    PrivateMessageEvent,
+)
+from nonebot.params import RegexGroup
+from nonebot.permission import SUPERUSER
+
+from configs.config import NICKNAME, Config
+from services.log import logger
 from utils.message_builder import image
+from utils.utils import get_message_text, is_number
+
 from ._data_source import (
+    change_global_task_status,
     change_group_switch,
-    set_plugin_status,
     get_plugin_status,
     group_current_status,
-    set_group_bot_status, change_global_task_status
+    set_group_bot_status,
+    set_plugin_status,
 )
-from services.log import logger
-from configs.config import NICKNAME, Config
-from utils.utils import get_message_text, is_number
-from nonebot.permission import SUPERUSER
-from typing import Tuple, Any
 from .rule import switch_rule
 
-
 __zx_plugin_name__ = "群功能开关 [Admin]"
 
 __plugin_usage__ = """
@@ -55,7 +64,7 @@ __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
 __plugin_settings__ = {
     "admin_level": Config.get_config("admin_bot_manage", "CHANGE_GROUP_SWITCH_LEVEL"),
-    "cmd": ["开启功能", "关闭功能", "开关"]
+    "cmd": ["开启功能", "关闭功能", "开关"],
 }
 
 switch_rule_matcher = on_message(rule=switch_rule, priority=4, block=True)
@@ -68,21 +77,27 @@ group_status = on_regex("^(休息吧|醒来)$", permission=GROUP, priority=5, bl
 
 
 @switch_rule_matcher.handle()
-async def _(bot: Bot, event: MessageEvent):
-    _cmd = get_message_text(event.json()).split()[0]
+async def _(
+    bot: Bot,
+    event: MessageEvent,
+):
+    msg = get_message_text(event.message).strip()
+    msg_split = msg.split()
+    _cmd = msg_split[0]
     if isinstance(event, GroupMessageEvent):
         await switch_rule_matcher.send(await change_group_switch(_cmd, event.group_id))
-        logger.info(f"USER {event.user_id} GROUP {event.group_id} 使用群功能管理命令 {_cmd}")
+        logger.info(f"使用群功能管理命令 {_cmd}", "功能管理", event.user_id, event.group_id)
     else:
         if str(event.user_id) in bot.config.superusers:
-            block_type = " ".join(get_message_text(event.json()).split()[1:])
+            block_type = " ".join(msg_split[1:])
             block_type = block_type if block_type else "a"
-            if ("关闭被动" in _cmd or "开启被动" in _cmd) and isinstance(event, PrivateMessageEvent):
+            if ("关闭被动" in _cmd or "开启被动" in _cmd) and isinstance(
+                event, PrivateMessageEvent
+            ):
                 await switch_rule_matcher.send(change_global_task_status(_cmd))
             elif is_number(block_type):
                 if not int(block_type) in [
-                    g["group_id"]
-                    for g in await bot.get_group_list()
+                    g["group_id"] for g in await bot.get_group_list()
                 ]:
                     await switch_rule_matcher.finish(f"{NICKNAME}未加入群聊：{block_type}")
                 await change_group_switch(_cmd, int(block_type), True)
@@ -105,7 +120,7 @@ async def _(bot: Bot, event: MessageEvent):
                     await switch_rule_matcher.send(f"已在群聊中{_cmd[:2]}功能：{_cmd[2:]}")
             else:
                 await switch_rule_matcher.finish("格式错误：关闭[功能] [group]/[p/g]")
-            logger.info(f"USER {event.user_id} 使用功能管理命令 {_cmd} | {block_type}")
+            logger.info(f"使用功能管理命令 {_cmd} | {block_type}", f"{_cmd}", event.user_id)
 
 
 @plugins_status.handle()
@@ -126,4 +141,4 @@ async def _(event: GroupMessageEvent, reg_group: Tuple[Any, ...] = RegexGroup())
     else:
         msg = set_group_bot_status(event.group_id, True)
     await group_status.send(msg)
-    logger.info(f"USER {event.user_id} GROUP {event.group_id} 使用总开关命令：{cmd}")
+    logger.info(f"使用总开关命令: {cmd}", cmd, event.user_id, event.group_id)