fit nonebot.beta2

basic_plugins/shop/buy.py

@@ -1,11 +1,11 @@
 from nonebot import on_command
 from services.log import logger
-from nonebot.adapters.cqhttp import Bot, GroupMessageEvent
-from nonebot.typing import T_State
-from utils.utils import get_message_text, is_number
+from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message
+from nonebot.params import CommandArg
+from utils.utils import is_number
 from models.bag_user import BagUser
 from services.db_context import db
-from nonebot.adapters.cqhttp.permission import GROUP
+from nonebot.adapters.onebot.v11.permission import GROUP
 from models.goods_info import GoodsInfo
 import time
 
@@ -37,9 +37,9 @@ buy = on_command("购买", aliases={"购买道具"}, priority=5, block=True, per
 
 
 @buy.handle()
-async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
+async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
     goods = None
-    if get_message_text(event.json()) in ["神秘药水"]:
+    if arg.extract_plain_text().strip() in ["神秘药水"]:
         await buy.finish("你们看看就好啦，这是不可能卖给你们的~", at_sender=True)
     goods_list = [
         x
@@ -50,7 +50,7 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
         x.goods_name
         for x in goods_list
     ]
-    msg = get_message_text(event.json()).split()
+    msg = arg.extract_plain_text().strip().split()
     num = 1
     if len(msg) > 1:
         if is_number(msg[1]) and int(msg[1]) > 0:

basic_plugins/shop/gold.py

@@ -1,11 +1,11 @@
 from nonebot import on_command
-from nonebot.adapters.cqhttp import Bot, GroupMessageEvent
-from nonebot.typing import T_State
-from nonebot.adapters.cqhttp.permission import GROUP
+from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message
+from nonebot.params import CommandArg
+from nonebot.adapters.onebot.v11.permission import GROUP
 from utils.data_utils import init_rank
 from models.bag_user import BagUser
 from utils.message_builder import image
-from utils.utils import get_message_text, is_number
+from utils.utils import is_number
 
 __zx_plugin_name__ = "商店 - 我的金币"
 __plugin_usage__ = """
@@ -33,13 +33,13 @@ gold_rank = on_command("金币排行", priority=5, block=True, permission=GROUP)
 
 
 @my_gold.handle()
-async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
+async def _(event: GroupMessageEvent):
     await my_gold.finish(await BagUser.get_user_total_gold(event.user_id, event.group_id))
 
 
 @gold_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:

basic_plugins/shop/my_props.py

@@ -1,9 +1,8 @@
 from nonebot import on_command
 from services.log import logger
-from nonebot.adapters.cqhttp import Bot, GroupMessageEvent
-from nonebot.typing import T_State
+from nonebot.adapters.onebot.v11 import GroupMessageEvent
 from models.bag_user import BagUser
-from nonebot.adapters.cqhttp.permission import GROUP
+from nonebot.adapters.onebot.v11.permission import GROUP
 
 
 __zx_plugin_name__ = "商店 - 我的道具"
@@ -30,7 +29,7 @@ my_props = on_command("我的道具", priority=5, block=True, permission=GROUP)
 
 
 @my_props.handle()
-async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
+async def _(event: GroupMessageEvent):
     props = await BagUser.get_property(event.user_id, event.group_id)
     if props:
         rst = ""

basic_plugins/shop/shop_handle/__init__.py

@@ -1,11 +1,11 @@
+from .data_source import create_shop_help, delete_goods, update_goods, register_goods, parse_goods_info
+from nonebot.adapters.onebot.v11 import MessageEvent, Message
 from nonebot import on_command
-from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, MessageEvent
-from nonebot.typing import T_State
 from configs.path_config import IMAGE_PATH
 from utils.message_builder import image
-from .data_source import create_shop_help, delete_goods, update_goods, register_goods, parse_goods_info
 from nonebot.permission import SUPERUSER
-from utils.utils import get_message_text, is_number
+from utils.utils import is_number
+from nonebot.params import CommandArg
 from nonebot.plugin import export
 from services.log import logger
 import os
@@ -67,13 +67,13 @@ shop_update_goods = on_command("修改商品", priority=5, permission=SUPERUSER,
 
 
 @shop_help.handle()
-async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
+async def _():
     await shop_help.send(image(b64=await create_shop_help()))
 
 
 @shop_add_goods.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:
         data = parse_goods_info(msg)
         if isinstance(data, str):
@@ -94,8 +94,8 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
 
 
 @shop_del_goods.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:
         name = ""
         id_ = 0
@@ -115,8 +115,8 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
 
 
 @shop_update_goods.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:
         data = parse_goods_info(msg)
         if isinstance(data, str):

basic_plugins/shop/use/__init__.py

@@ -1,10 +1,10 @@
 from nonebot import on_command
 from services.log import logger
-from nonebot.adapters.cqhttp import Bot, GroupMessageEvent
-from nonebot.typing import T_State
-from utils.utils import is_number, get_message_text
+from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message
+from nonebot.params import CommandArg
+from utils.utils import is_number
 from models.bag_user import BagUser
-from nonebot.adapters.cqhttp.permission import GROUP
+from nonebot.adapters.onebot.v11.permission import GROUP
 from services.db_context import db
 from nonebot.plugin import export
 from .data_source import effect, register_use, func_manager
@@ -38,10 +38,8 @@ use_props = on_command("使用道具", priority=5, block=True, permission=GROUP)
 
 
 @use_props.handle()
-async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
-    msg = get_message_text(event.json())
-    if msg in ["", "帮助"]:
-        await use_props.finish(__plugin_usage__)
+async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
+    msg = arg.extract_plain_text().strip()
     num = 1
     msg_sp = msg.split()
     if len(msg_sp) > 1 and is_number(msg_sp[-1]) and int(msg_sp[-1]) > 0:

basic_plugins/shop/use/data_source.py

@@ -1,6 +1,6 @@
-from nonebot.adapters.cqhttp import GroupMessageEvent, MessageSegment
+from nonebot.adapters.onebot.v11 import GroupMessageEvent, MessageSegment
 from services.log import logger
-from nonebot.adapters.cqhttp import Bot
+from nonebot.adapters.onebot.v11 import Bot
 from typing import Optional, Union
 import asyncio