fit nonebot.beta2

plugins/genshin/query_user/query_memo/__init__.py

@@ -1,9 +1,8 @@
 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
 from services.log import logger
 from .data_source import get_user_memo, get_memo
-from ..models import Genshin
+from .._models import Genshin
 from nonebot.plugin import export
 
 
@@ -37,7 +36,7 @@ query_memo_matcher = on_command("原神便签查询", aliases={"原神便笺查
 
 
 @query_memo_matcher.handle()
-async def _(bot: Bot, event: MessageEvent, state: T_State):
+async def _(event: MessageEvent):
     uid = await Genshin.get_user_uid(event.user_id)
     if not uid or not await Genshin.get_user_cookie(uid, True):
         await query_memo_matcher.finish("请先绑定uid和cookie！")

plugins/genshin/query_user/query_memo/data_source.py

@@ -1,5 +1,5 @@
 from typing import Optional, Union
-from nonebot.adapters.cqhttp import MessageSegment
+from nonebot.adapters.onebot.v11 import MessageSegment
 from configs.config import Config
 from asyncio.exceptions import TimeoutError
 from services.log import logger
@@ -8,10 +8,9 @@ from utils.image_utils import BuildImage
 from utils.http_utils import AsyncHttpx
 from utils.utils import get_user_avatar
 from utils.message_builder import image
-from ..utils import get_ds
-from ..models import Genshin
+from .._utils import get_ds
+from .._models import Genshin
 from io import BytesIO
-from pathlib import Path
 from nonebot import Driver
 import asyncio
 import nonebot
@@ -20,7 +19,7 @@ import nonebot
 driver: Driver = nonebot.get_driver()
 
 
-memo_path = Path(IMAGE_PATH) / "genshin" / "genshin_memo"
+memo_path = IMAGE_PATH / "genshin" / "genshin_memo"
 memo_path.mkdir(exist_ok=True, parents=True)