fit nonebot.beta2

basic_plugins/super_cmd/super_task_switch.py

@@ -1,11 +1,12 @@
 from nonebot import on_command
 from nonebot.permission import SUPERUSER
-from nonebot.typing import T_State
-from nonebot.adapters.cqhttp import Bot, MessageEvent
+from nonebot.adapters.onebot.v11 import Bot, MessageEvent, Message
 from nonebot.rule import to_me
-from utils.utils import get_message_text, is_number
+from utils.utils import is_number
 from services.log import logger
 from utils.manager import group_manager
+from nonebot.params import Command, CommandArg
+from typing import Tuple
 
 
 __zx_plugin_name__ = "超级用户被动开关 [Superuser]"
@@ -34,8 +35,9 @@ oc_gb = on_command(
 
 
 @oc_gb.handle()
-async def _(bot: Bot, event: MessageEvent, state: T_State):
-    group = get_message_text(event.json())
+async def _(bot: Bot, event: MessageEvent, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
+    cmd = cmd[0]
+    group = arg.extract_plain_text().strip()
     if group:
         if is_number(group):
             group = int(group)
@@ -44,7 +46,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
                     break
             else:
                 await oc_gb.finish("没有加入这个群...", at_sender=True)
-            if state["_prefix"]["raw_command"] == "开启广播通知":
+            if cmd == "开启广播通知":
                 logger.info(f"USER {event.user_id} 开启了 GROUP {group} 的广播")
                 await oc_gb.finish(await group_manager.open_group_task(group, "broadcast",), at_sender=True)
             else: