fit nonebot.beta2

plugins/what_anime/__init__.py

@@ -1,7 +1,8 @@
+from nonebot.adapters.onebot.v11 import MessageEvent, GroupMessageEvent, Message, Bot
 from .data_source import get_anime
 from nonebot import on_command
 from nonebot.typing import T_State
-from nonebot.adapters.cqhttp import Bot, MessageEvent, GroupMessageEvent
+from nonebot.params import Arg
 from utils.utils import get_message_img
 from services.log import logger
 
@@ -29,28 +30,19 @@ __plugin_settings__ = {
 what_anime = on_command("识番", priority=5, block=True)
 
 
-@what_anime.args_parser
-async def _(bot: Bot, event: MessageEvent, state: T_State):
-    if str(event.get_message()) in ["取消", "算了"]:
-        await what_anime.finish("已取消操作..", at_sender=True)
-    img_url = get_message_img(event.json())
-    if not img_url:
-        await what_anime.reject(prompt="图呢图呢图呢图呢GKD", at_sender=True)
-    state["img_url"] = img_url
-
-
 @what_anime.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
-    if str(event.get_message()) in ["帮助"]:
-        await what_anime.finish(__plugin_usage__)
     img_url = get_message_img(event.json())
     if img_url:
-        state["img_url"] = img_url
+        state["img_url"] = img_url[0]
 
 
 @what_anime.got("img_url", prompt="虚空识番？来图来图GKD")
-async def _(bot: Bot, event: MessageEvent, state: T_State):
-    img_url = state["img_url"][0]
+async def _(bot: Bot, event: MessageEvent, state: T_State, img_url: Message = Arg("img_url")):
+    img_url = get_message_img(img_url)
+    if not img_url:
+        await what_anime.reject_arg("img_url", "发送的必须是图片！")
+    img_url = img_url[0]
     await what_anime.send("开始识别.....")
     anime_data_report = await get_anime(img_url)
     if anime_data_report:
@@ -63,6 +55,6 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
     else:
         logger.info(
             f"USER {event.user_id} GROUP "
-            f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'} 识番 {img_url} 未找到！！"
+            f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'} 识番 {img_url} 未找到"
         )
         await what_anime.send(f"没有寻找到该番剧，果咩..", at_sender=True)