fit nonebot.beta2

plugins/sign_in/__init__.py

@@ -5,12 +5,12 @@ from .group_user_checkin import (
     impression_rank,
     check_in_all
 )
-from nonebot.typing import T_State
-from nonebot.adapters.cqhttp import Bot, GroupMessageEvent
-from nonebot.adapters.cqhttp.permission import GROUP
+from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message
+from nonebot.adapters.onebot.v11.permission import GROUP
 from utils.message_builder import image
 from nonebot import on_command
-from utils.utils import get_message_text, scheduler
+from utils.utils import scheduler
+from nonebot.params import CommandArg
 from pathlib import Path
 from configs.path_config import DATA_PATH
 from services.log import logger
@@ -85,20 +85,19 @@ total_sign_rank = on_command(
 
 
 @sign.handle()
-async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
-    nickname = event.sender.card if event.sender.card else event.sender.nickname
+async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
+    nickname = event.sender.card or event.sender.nickname
     await sign.send(
         await group_user_check_in(nickname, event.user_id, event.group_id),
         at_sender=True,
     )
-    if get_message_text(event.json()) == "all":
+    if arg.extract_plain_text().strip() == "all":
         await check_in_all(nickname, event.user_id)
 
 
-
 @my_sign.handle()
-async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
-    nickname = event.sender.card if event.sender.card else event.sender.nickname
+async def _(event: GroupMessageEvent):
+    nickname = event.sender.card or event.sender.nickname
     await my_sign.send(
         await group_user_check(nickname, event.user_id, event.group_id),
         at_sender=True,
@@ -106,8 +105,8 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
 
 
 @sign_rank.handle()
-async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
-    num = get_message_text(event.json())
+async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
+    num = arg.extract_plain_text().strip()
     if is_number(num) and 51 > int(num) > 10:
         num = int(num)
     else:
@@ -118,8 +117,8 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
 
 
 @total_sign_rank.handle()
-async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
-    msg = get_message_text(event.json())
+async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
+    msg = arg.extract_plain_text().strip()
     if not msg:
         await total_sign_rank.send("请稍等..正在整理数据...")
         await total_sign_rank.send(image(b64=await impression_rank(0, data)))

plugins/sign_in/config.py

@@ -1,11 +1,10 @@
 from configs.path_config import IMAGE_PATH
-from pathlib import Path
 
 
-SIGN_RESOURCE_PATH = Path(IMAGE_PATH) / 'sign' / 'sign_res'
-SIGN_TODAY_CARD_PATH = Path(IMAGE_PATH) / 'sign' / 'today_card'
-SIGN_BORDER_PATH = Path(SIGN_RESOURCE_PATH) / 'border'
-SIGN_BACKGROUND_PATH = Path(SIGN_RESOURCE_PATH) / 'background'
+SIGN_RESOURCE_PATH = IMAGE_PATH / 'sign' / 'sign_res'
+SIGN_TODAY_CARD_PATH = IMAGE_PATH / 'sign' / 'today_card'
+SIGN_BORDER_PATH = SIGN_RESOURCE_PATH / 'border'
+SIGN_BACKGROUND_PATH = SIGN_RESOURCE_PATH / 'background'
 
 SIGN_BORDER_PATH.mkdir(exist_ok=True, parents=True)
 SIGN_BACKGROUND_PATH.mkdir(exist_ok=True, parents=True)

plugins/sign_in/group_user_checkin.py

@@ -3,7 +3,7 @@ from models.sign_group_user import SignGroupUser
 from models.group_member_info import GroupInfoUser
 from models.bag_user import BagUser
 from configs.config import NICKNAME
-from nonebot.adapters.cqhttp import MessageSegment
+from nonebot.adapters.onebot.v11 import MessageSegment
 from utils.image_utils import BuildImage, BuildMat
 from services.db_context import db
 from .utils import get_card, SIGN_TODAY_CARD_PATH

plugins/sign_in/utils.py

@@ -10,7 +10,7 @@ from .config import (
 )
 from models.sign_group_user import SignGroupUser
 from models.group_member_info import GroupInfoUser
-from nonebot.adapters.cqhttp import MessageSegment
+from nonebot.adapters.onebot.v11 import MessageSegment
 from configs.config import Config
 from utils.utils import get_user_avatar
 from utils.image_utils import BuildImage