fit nonebot.beta2

plugins/genshin/query_user/query_role/__init__.py

@@ -1,10 +1,10 @@
 from nonebot import on_command
-from nonebot.typing import T_State
-from nonebot.adapters.cqhttp import Bot, MessageEvent, GroupMessageEvent
+from nonebot.adapters.onebot.v11 import MessageEvent, GroupMessageEvent, Message
 from services.log import logger
 from .data_source import query_role_data
-from ..models import Genshin
-from utils.utils import get_message_text, is_number
+from .._models import Genshin
+from utils.utils import is_number
+from nonebot.params import CommandArg
 
 
 __zx_plugin_name__ = "原神玩家查询"
@@ -33,8 +33,8 @@ query_role_info_matcher = on_command("原神玩家查询", aliases={"原神玩
 
 
 @query_role_info_matcher.handle()
-async def _(bot: Bot, event: MessageEvent, state: T_State):
-    msg = get_message_text(event.json())
+async def _(event: MessageEvent, arg: Message = CommandArg()):
+    msg = arg.extract_plain_text().strip()
     if msg:
         if not is_number(msg):
             await query_role_info_matcher.finish("查询uid必须为数字！")
@@ -45,7 +45,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
         uid = msg
     if not uid:  # or not await Genshin.get_user_cookie(uid):
         await query_role_info_matcher.finish("请先绑定uid和cookie！")
-    nickname = event.sender.card if event.sender.card else event.sender.nickname
+    nickname = event.sender.card or event.sender.nickname
     mys_id = await Genshin.get_user_mys_id(uid)
     data = await query_role_data(event.user_id, uid, mys_id, nickname)
     if data:

plugins/genshin/query_user/query_role/data_source.py

@@ -1,11 +1,11 @@
 from typing import Optional, List, Dict, Union
 from .draw_image import init_image, get_genshin_image
-from nonebot.adapters.cqhttp import MessageSegment
-from ..utils import get_ds, element_mastery
+from nonebot.adapters.onebot.v11 import MessageSegment
+from .._utils import get_ds, element_mastery
 from services.log import logger
 from utils.http_utils import AsyncHttpx
 from configs.config import Config
-from ..models import Genshin
+from .._models import Genshin
 
 try:
     import ujson as json

plugins/genshin/query_user/query_role/draw_image.py

@@ -1,9 +1,8 @@
-from configs.path_config import IMAGE_PATH
-from pathlib import Path
+from configs.path_config import IMAGE_PATH, TEMP_PATH
 from utils.image_utils import BuildImage
 from typing import List, Dict, Optional
 from utils.message_builder import image
-from nonebot.adapters.cqhttp import MessageSegment
+from nonebot.adapters.onebot.v11 import MessageSegment
 from utils.http_utils import AsyncHttpx
 from utils.utils import get_user_avatar
 from io import BytesIO
@@ -12,7 +11,7 @@ import asyncio
 import os
 
 
-image_path = Path(IMAGE_PATH) / "genshin" / "genshin_card"
+image_path = IMAGE_PATH / "genshin" / "genshin_card"
 
 
 async def get_genshin_image(
@@ -109,8 +108,8 @@ def _get_genshin_image(
     A.paste(char_image, (0, top_bk.h + bar.h + 10), center_type="by_width")
     rand = random.randint(1, 10000)
     A.resize(0.8)
-    A.save(Path(IMAGE_PATH) / "temp" / f"genshin_user_card_{rand}.png")
-    return image(f"genshin_user_card_{rand}.png", "temp")
+    A.save(TEMP_PATH / f"genshin_user_card_{rand}.png")
+    return image(TEMP_PATH / f"genshin_user_card_{rand}.png")
 
 
 def get_user_data_image(