fit nonebot.beta2

plugins/genshin/almanac/__init__.py

@@ -1,13 +1,11 @@
 from utils.utils import get_bot, scheduler
 from nonebot import on_command
-from nonebot.typing import T_State
-from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, MessageEvent
+from nonebot.adapters.onebot.v11 import GroupMessageEvent, MessageEvent
 from services.log import logger
 from configs.path_config import IMAGE_PATH
 from .data_source import get_alc_image
 from utils.manager import group_manager
 from configs.config import Config
-from pathlib import Path
 
 __zx_plugin_name__ = "原神老黄历"
 __plugin_usage__ = """
@@ -40,12 +38,12 @@ Config.add_plugin_config(
 almanac = on_command("原神黄历", priority=5, block=True)
 
 
-ALC_PATH = Path(IMAGE_PATH) / "genshin" / "alc"
+ALC_PATH = IMAGE_PATH / "genshin" / "alc"
 ALC_PATH.mkdir(parents=True, exist_ok=True)
 
 
 @almanac.handle()
-async def _(bot: Bot, event: MessageEvent, state: T_State):
+async def _(event: MessageEvent,):
     alc_img = await get_alc_image(ALC_PATH)
     if alc_img:
         mes = alc_img + "\n ※ 黄历数据来源于 genshin.pub"
@@ -71,7 +69,7 @@ async def _():
         gl = [g["group_id"] for g in gl]
         alc_img = await get_alc_image(ALC_PATH)
         if alc_img:
-            mes = alc_img + "\n ※ 黄历数据来源于 genshin.pub"
+            mes = "[[_task|genshin_alc]]" + alc_img + "\n ※ 黄历数据来源于 genshin.pub"
             for gid in gl:
                 if await group_manager.check_group_task_status(gid, "genshin_alc"):
                     await bot.send_group_msg(group_id=int(gid), message="" + mes)

plugins/genshin/almanac/data_source.py

@@ -2,7 +2,7 @@ from utils.message_builder import image
 from datetime import datetime
 from pathlib import Path
 from utils.http_utils import AsyncPlaywright
-from nonebot.adapters.cqhttp import MessageSegment
+from nonebot.adapters.onebot.v11 import MessageSegment
 from typing import Optional
 import os