🍱 更新xx用什么的数据集

* ✨ 添加gsrc的图片版

* 🚨 auto fix by pre-commit-ci

* ✨ 添加`gsrc`的图片版

* 🚨 auto fix by pre-commit-ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.github/workflows/unittest.yml

@@ -1,42 +0,0 @@
-name: Unittest
-
-on:
-  push:
-    branches:
-      - nonebot2-beta1
-  pull_request:
-
-
-jobs:
-  test:
-    name: Test
-    strategy:
-      matrix:
-        version: ["3.8", "3.9", "3.10", "3.11"]
-        os: [ubuntu-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
-    env:
-      OS: ${{ matrix.os }}
-      PYTHON_VERSION: ${{ matrix.python-version }}
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install poetry
-        run: pipx install poetry
-        shell: bash
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.version }}
-          architecture: "x64"
-          cache: "poetry"
-
-      - name: Install dependencies
-        run: poetry install --with test --without dev
-        shell: bash
-
-      - name: Run Pytest
-        run: |
-          cd tests
-          poetry run pytest

.pre-commit-config.yaml

@@ -1,7 +1,5 @@
 ci:
   autofix_commit_msg: ":rotating_light: auto fix by pre-commit-ci"
-  skip:
-    - "poetry-lock"
   autofix_prs: true
   autoupdate_branch: master
   autoupdate_schedule: monthly

GenshinUID/__init__.py

@@ -1,25 +1,39 @@
-from pathlib import Path
-from pkgutil import iter_modules
-
 from nonebot.log import logger
 from nonebot import require, load_all_plugins, get_plugin_by_module_name
 
-from .config import config as _config
-
 require('nonebot_plugin_apscheduler')
 
 if get_plugin_by_module_name("GenshinUID"):
     logger.info("推荐直接加载 GenshinUID 仓库文件夹")
     load_all_plugins(
         [
-            f"GenshinUID.{module.name}"
-            for module in iter_modules([str(Path(__file__).parent)])
-            if module.ispkg
-            and (
-                (name := module.name[11:]) == "meta"
-                or name not in _config.disabled_plugins
-            )
-            # module.name[:11] == genshinuid_
+            'GenshinUID.genshinuid_abyss',
+            'GenshinUID.genshinuid_adv',
+            'GenshinUID.genshinuid_ann',
+            'GenshinUID.genshinuid_gcg',
+            'GenshinUID.genshinuid_xkdata',
+            'GenshinUID.genshinuid_check',
+            'GenshinUID.genshinuid_collection',
+            'GenshinUID.genshinuid_config',
+            'GenshinUID.genshinuid_enka',
+            'GenshinUID.genshinuid_etcimg',
+            'GenshinUID.genshinuid_eventlist',
+            'GenshinUID.genshinuid_gachalog',
+            'GenshinUID.genshinuid_guide',
+            'GenshinUID.genshinuid_help',
+            'GenshinUID.genshinuid_map',
+            'GenshinUID.genshinuid_meta',
+            'GenshinUID.genshinuid_mhybbscoin',
+            'GenshinUID.genshinuid_mys',
+            'GenshinUID.genshinuid_note',
+            'GenshinUID.genshinuid_resin',
+            'GenshinUID.genshinuid_resource',
+            'GenshinUID.genshinuid_roleinfo',
+            'GenshinUID.genshinuid_signin',
+            'GenshinUID.genshinuid_user',
+            'GenshinUID.genshinuid_wikitext',
+            'GenshinUID.genshinuid_webconsole',
+            'GenshinUID.genshinuid_update',
         ],
         [],
     )

GenshinUID/config.py

@@ -1,15 +1,5 @@
-from typing import Set
-
 from nonebot import get_driver
-from pydantic import Field, BaseModel
 
-
-class Config(BaseModel):
-    disabled_plugins: Set[str] = Field(
-        default_factory=set, alias="genshinuid_disabled_plugins"
-    )
-    priority: int = Field(2, alias="genshinuid_priority")
-
-
-config = Config.parse_obj(get_driver().config)
-priority = config.priority
+config = get_driver().config
+SUPERUSERS = {x for x in config.superusers}
+priority = 2

GenshinUID/genshinuid_abyss/__init__.py

@@ -1,22 +1,18 @@
-from typing import Any, Tuple, Union
+from typing import Any, Tuple
 
 from nonebot import on_regex
 from nonebot.log import logger
 from nonebot.matcher import Matcher
-from nonebot.params import Depends, RegexGroup
-from nonebot.adapters.onebot.v11 import (
-    MessageSegment,
-    GroupMessageEvent,
-    PrivateMessageEvent,
-)
+from nonebot.params import RegexGroup
+from nonebot.adapters.ntchat import MessageSegment, TextMessageEvent
 
 from ..genshinuid_meta import register_menu
 from .draw_abyss_card import draw_abyss_img
 from ..utils.message.error_reply import UID_HINT
 from ..utils.db_operation.db_operation import select_db
-from ..utils.message.get_image_and_at import ImageAndAt
 from ..utils.mhy_api.convert_mysid_to_uid import convert_mysid
 from ..utils.exception.handle_exception import handle_exception
+from ..utils.draw_image_tools.send_image_tool import convert_img
 
 get_abyss_info = on_regex(
     r'^(\[CQ:at,qq=[0-9]+\])?( )?'
@@ -25,6 +21,7 @@ get_abyss_info = on_regex(
     r'(\[CQ:at,qq=[0-9]+\])?( )?$',
     block=True,
 )
+# 恢复了查询二字，和其他的查询打架下次解决
 
 
 @get_abyss_info.handle()
@@ -56,15 +53,19 @@ get_abyss_info = on_regex(
     ),
 )
 async def send_abyss_info(
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
     args: Tuple[Any, ...] = RegexGroup(),
-    custom: ImageAndAt = Depends(),
 ):
     logger.info('开始执行[查询深渊信息]')
     logger.info(f'[查询深渊信息]参数: {args}')
-    at = custom.get_first_at()
-    qid = at or event.user_id
+    qid = event.from_wxid
+    if event.at_user_list:
+        for user in event.at_user_list:
+            user = user.strip()
+            if user != "":
+                qid = user
+
     if args[2] == 'mys':
         uid = await convert_mysid(args[3])
     elif args[3] is None:
@@ -97,6 +98,7 @@ async def send_abyss_info(
     if isinstance(im, str):
         await matcher.finish(im)
     elif isinstance(im, bytes):
+        im = await convert_img(im)
         await matcher.finish(MessageSegment.image(im))
     else:
         await matcher.finish('发生了未知错误,请联系管理员检查后台输出!')

GenshinUID/genshinuid_achievement/__init__.py

@@ -2,7 +2,7 @@ from nonebot import on_command
 from nonebot.log import logger
 from nonebot.matcher import Matcher
 from nonebot.params import CommandArg
-from nonebot.adapters.onebot.v11 import Message
+from nonebot.adapters.ntchat import Message
 
 from ..config import priority
 from .get_achi_desc import get_achi, get_daily_achi

GenshinUID/genshinuid_ann/__init__.py

@@ -1,3 +1,4 @@
+import base64
 import random
 import asyncio
 
@@ -7,11 +8,11 @@ from nonebot.params import CommandArg
 from nonebot import get_bot, on_command
 from nonebot.permission import SUPERUSER
 from nonebot_plugin_apscheduler import scheduler
-from nonebot.adapters.onebot.v11 import (
-    Message,
+from nonebot.adapters.ntchat.message import Message
+from nonebot.adapters.ntchat import (
     MessageEvent,
     MessageSegment,
-    GroupMessageEvent,
+    TextMessageEvent,
 )
 
 from .util import black_ids
@@ -61,19 +62,19 @@ async def send_ann_pic(
 @reg_ann.handle()
 @handle_exception('设置原神公告', '设置原神公告失败')
 async def send_reg_ann(
-    event: GroupMessageEvent,
+    event: TextMessageEvent,
     matcher: Matcher,
 ):
-    await matcher.finish(sub_ann(event.group_id))
+    await matcher.finish(sub_ann(event.room_wxid))
 
 
 @unreg_ann.handle()
 @handle_exception('取消原神公告', '取消设置原神公告失败')
 async def send_unreg_ann(
-    event: GroupMessageEvent,
+    event: TextMessageEvent,
     matcher: Matcher,
 ):
-    await matcher.finish(unsub_ann(event.group_id))
+    await matcher.finish(unsub_ann(event.room_wxid))
 
 
 @consume_ann.handle()
@@ -82,7 +83,7 @@ async def send_consume_ann(
     event: MessageEvent,
     matcher: Matcher,
 ):
-    qid = event.user_id
+    qid = event.from_wxid
     uid = await select_db(qid, mode='uid')
     uid = str(uid)
     if '未找到绑定的UID' in uid:
@@ -99,11 +100,9 @@ async def check_ann_state():
     logger.info('[原神公告] 定时任务: 原神公告查询..')
     ids = string_config.get_config('Ann_Ids')
     sub_list = string_config.get_config('Ann_Groups')
-
     if not sub_list:
         logger.info('没有群订阅, 取消获取数据')
         return
-
     if not ids:
         ids = await ann().get_ann_ids()
         if not ids:
@@ -111,10 +110,9 @@ async def check_ann_state():
         string_config.set_config('Ann_Ids', ids)
         logger.info('初始成功, 将在下个轮询中更新.')
         return
-
     new_ids = await ann().get_ann_ids()
-    new_ann = set(ids) ^ set(new_ids)
 
+    new_ann = set(ids) ^ set(new_ids)
     if not new_ann:
         logger.info('[原神公告] 没有最新公告')
         return
@@ -125,18 +123,20 @@ async def check_ann_state():
         try:
             img = await ann_detail_card(ann_id)  # 防止抛出异常报错
             bot = get_bot()
+            b64img = base64.b64encode(img)
+
             for group in sub_list:
                 try:
                     await bot.call_api(
-                        api='send_group_msg',
-                        group_id=group,
-                        message=MessageSegment.image(img),
+                        api='send_image',
+                        to_wxid=str(group),
+                        file_path="base64://" + b64img.decode(),
                     )
                     await asyncio.sleep(random.uniform(1, 3))
                 except Exception as e:
                     logger.exception(e)
         except Exception as e:
-            logger.exception(str(e))
+            logger.exception(e)
 
     logger.info('[原神公告] 推送完毕, 更新数据库')
     string_config.set_config('Ann_Ids', new_ids)

GenshinUID/genshinuid_check/__init__.py

@@ -1,17 +1,12 @@
 import random
 import asyncio
-from typing import Union
 
 from nonebot import on_command
 from nonebot.log import logger
 from nonebot.matcher import Matcher
 from nonebot.permission import SUPERUSER
 from nonebot_plugin_apscheduler import scheduler
-from nonebot.adapters.onebot.v11 import (
-    Bot,
-    GroupMessageEvent,
-    PrivateMessageEvent,
-)
+from nonebot.adapters.ntchat import Bot, TextMessageEvent
 
 from ..config import priority
 from .backup_data import data_backup
@@ -25,11 +20,17 @@ from ..utils.message.get_cqhttp_data import (
     get_group_member_list,
 )
 
-backup = on_command('gs清除缓存', rule=FullCommand(), priority=priority)
-check = on_command('校验全部Cookies', rule=FullCommand(), priority=priority)
-check_stoken = on_command('校验全部Stoken', rule=FullCommand(), priority=priority)
+backup = on_command(
+    'gs清除缓存', rule=FullCommand(), priority=priority, permission=SUPERUSER
+)
+check = on_command(
+    '校验全部Cookies', rule=FullCommand(), priority=priority, permission=SUPERUSER
+)
+check_stoken = on_command(
+    '校验全部Stoken', rule=FullCommand(), priority=priority, permission=SUPERUSER
+)
 remove_invalid_user = on_command(
-    '清除无效用户', rule=FullCommand(), priority=priority
+    '清除无效用户', rule=FullCommand(), priority=priority, permission=SUPERUSER
 )
 
 backup_scheduler = scheduler
@@ -57,7 +58,7 @@ async def daily_refresh_charData():
 )
 async def send_backup_msg(
     bot: Bot,
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
 ):
     if not await SUPERUSER(bot, event):
@@ -84,7 +85,7 @@ async def send_backup_msg(
 )
 async def send_remove_invalid_user_msg(
     bot: Bot,
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
 ):
     if not await SUPERUSER(bot, event):

GenshinUID/genshinuid_collection/__init__.py

@@ -1,20 +1,13 @@
-from typing import Union
-
 from nonebot import on_command
 from nonebot.log import logger
 from nonebot.matcher import Matcher
-from nonebot.params import Depends, CommandArg
-from nonebot.adapters.onebot.v11 import (
-    Message,
-    MessageSegment,
-    GroupMessageEvent,
-    PrivateMessageEvent,
-)
+from nonebot.params import CommandArg
+from nonebot.adapters.ntchat.message import Message
+from nonebot.adapters.ntchat import MessageSegment, TextMessageEvent
 
 from ..genshinuid_meta import register_menu
 from ..utils.data_convert.get_uid import get_uid
 from ..utils.message.error_reply import UID_HINT
-from ..utils.message.get_image_and_at import ImageAndAt
 from ..utils.exception.handle_exception import handle_exception
 from .draw_collection_card import draw_explora_img, draw_collection_img
 
@@ -49,23 +42,20 @@ get_explora_info = on_command('查询探索', aliases={'探索', 'ts'}, block=Tr
     ),
 )
 async def send_collection_info(
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
     args: Message = CommandArg(),
-    custom: ImageAndAt = Depends(),
 ):
     logger.info('开始执行[查询收集信息]')
     logger.info('[查询收集信息]参数: {}'.format(args))
     raw_mes = args.extract_plain_text().strip()
-    at = custom.get_first_at()
-    if at:
-        qid = at
+    if event.at_user_list:
+        qid = event.at_user_list[0]
     else:
-        qid = event.user_id
+        qid = event.from_wxid
 
-    # 获取uid
     uid = await get_uid(qid, raw_mes)
-    logger.info('[查询角色面板]uid: {}'.format(uid))
+    logger.info('[查询收集信息]uid: {}'.format(uid))
 
     if '未找到绑定的UID' in uid:
         await matcher.finish(UID_HINT)
@@ -82,23 +72,20 @@ async def send_collection_info(
 @get_explora_info.handle()
 @handle_exception('查询探索信息')
 async def send_explora_info(
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
     args: Message = CommandArg(),
-    custom: ImageAndAt = Depends(),
 ):
     logger.info('开始执行[查询探索信息]')
     logger.info('[查询探索信息]参数: {}'.format(args))
     raw_mes = args.extract_plain_text().strip()
-    at = custom.get_first_at()
-    if at:
-        qid = at
+    if event.at_user_list:
+        qid = event.at_user_list[0]
     else:
-        qid = event.user_id
+        qid = event.from_wxid
 
-    # 获取uid
     uid = await get_uid(qid, raw_mes)
-    logger.info('[查询角色面板]uid: {}'.format(uid))
+    logger.info('[查询探索信息]uid: {}'.format(uid))
 
     if '未找到绑定的UID' in uid:
         await matcher.finish(UID_HINT)

GenshinUID/genshinuid_config/__init__.py

@@ -1,23 +1,17 @@
-from typing import Any, Tuple, Union
+from typing import Any, Tuple
 
 from nonebot.log import logger
 from nonebot.matcher import Matcher
+from nonebot.params import RegexGroup
 from nonebot import on_regex, on_command
 from nonebot.permission import SUPERUSER
-from nonebot.params import Depends, CommandArg, RegexGroup
-from nonebot.adapters.onebot.v11 import (
-    Bot,
-    Message,
-    MessageSegment,
-    GroupMessageEvent,
-    PrivateMessageEvent,
-)
+from nonebot.adapters.ntchat import Bot, MessageSegment, TextMessageEvent
 
 from ..genshinuid_meta import register_menu
+from ..utils.nonebot2.rule import FullCommand
 from .draw_config_card import draw_config_img
 from ..utils.message.error_reply import UID_HINT
 from ..utils.db_operation.db_operation import select_db
-from ..utils.message.get_image_and_at import ImageAndAt
 from .set_config import set_push_value, set_config_func
 from ..utils.exception.handle_exception import handle_exception
 
@@ -33,7 +27,7 @@ push_config = on_regex(
     r'(\[CQ:at,qq=[0-9]+\])?( )?$'
 )
 
-config_card = on_command('gs配置')
+config_card = on_command('gs配置', rule=FullCommand())
 
 
 @config_card.handle()
@@ -50,9 +44,7 @@ config_card = on_command('gs配置')
         '- <ft color=(238,120,0)>gs配置</ft>'
     ),
 )
-async def send_config_card(matcher: Matcher, args: Message = CommandArg()):
-    if args:
-        await matcher.finish()
+async def send_config_card(matcher: Matcher):
     logger.info('开始执行[gs配置]')
     im = await draw_config_img()
     if isinstance(im, str):
@@ -85,38 +77,59 @@ async def send_config_card(matcher: Matcher, args: Message = CommandArg()):
 )
 async def send_config_msg(
     bot: Bot,
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
     args: Tuple[Any, ...] = RegexGroup(),
-    custom: ImageAndAt = Depends(),
 ):
     logger.info('开始执行[设置阈值信息]')
     logger.info('[设置阈值信息]参数: {}'.format(args))
-    qid = event.user_id
-    at = custom.get_first_at()
+    wxid_list = []
+    wxid_list.append(event.from_wxid)
+    qid = event.from_wxid
+    if event.at_user_list:
+        for user in event.at_user_list:
+            user = user.strip()
+            if user != "" and await SUPERUSER(bot, event):
+                qid = user
+            else:
+                await matcher.finish(
+                    MessageSegment.room_at_msg(
+                        content="{$@}你没有权限操作别人的状态噢~", at_list=wxid_list
+                    )
+                )
 
-    if at and await SUPERUSER(bot, event):
-        qid = at
-    elif at and at != qid:
-        await matcher.finish('你没有权限操作别人的状态噢~', at_sender=True)
     logger.info('[设置阈值信息]qid: {}'.format(qid))
 
     try:
         uid = await select_db(qid, mode='uid')
     except TypeError:
-        await matcher.finish(UID_HINT)
+        await matcher.finish(
+            MessageSegment.room_at_msg(
+                content='{$@}' + UID_HINT, at_list=wxid_list
+            )
+        )
 
     func = args[4].replace('阈值', '')
     if args[5]:
         try:
             value = int(args[5])
         except ValueError:
-            await matcher.finish('请输入数字哦~', at_sender=True)
+            await matcher.finish(
+                MessageSegment.room_at_msg(
+                    content="{$@}请输入数字哦~", at_list=wxid_list
+                )
+            )
     else:
-        await matcher.finish('请输入正确的阈值数字!', at_sender=True)
+        await matcher.finish(
+            MessageSegment.room_at_msg(
+                content="{$@}请输入正确的阈值数字!", at_list=wxid_list
+            )
+        )
     logger.info('[设置阈值信息]func: {}, value: {}'.format(func, value))
     im = await set_push_value(func, str(uid), value)
-    await matcher.finish(im, at_sender=True)
+    await matcher.finish(
+        MessageSegment.room_at_msg(content="{$@}" + f"{im}", at_list=wxid_list)
+    )
 
 
 # 开启 自动签到 和 推送树脂提醒 功能
@@ -141,38 +154,49 @@ async def send_config_msg(
 )
 async def open_switch_func(
     bot: Bot,
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
     args: Tuple[Any, ...] = RegexGroup(),
-    at: ImageAndAt = Depends(),
 ):
-    qid = event.user_id
-    atqq = at.get_first_at() if at else None
+    wxid_list = []
+    wxid_list.append(event.from_wxid)
+    qid = event.from_wxid
+    if event.at_user_list:
+        for user in event.at_user_list:
+            user = user.strip()
+            if user != "" and await SUPERUSER(bot, event):
+                qid = user
+            else:
+                await matcher.finish(
+                    MessageSegment.room_at_msg(
+                        content="{$@}你没有权限操作别人的状态噢~", at_list=wxid_list
+                    )
+                )
 
     config_name = args[4]
 
     logger.info(f'[{qid}]尝试[{args[3]}]了[{config_name}]功能')
 
+    fake_seession = f'group_{event.room_wxid}_{event.from_wxid}'
+
     if args[3] == '开启':
         query = 'OPEN'
         gid = (
-            event.get_session_id().split('_')[1]
-            if len(event.get_session_id().split('_')) == 3
+            fake_seession.split('_')[1]
+            if len(fake_seession.split('_')) == 3
             else 'on'
         )
     else:
         query = 'CLOSED'
         gid = 'off'
-    is_admin = await SUPERUSER(bot, event)
-    if atqq:
-        if is_admin:
-            qid = atqq
-        elif atqq != qid:
-            await matcher.finish('你没有权限操作别人的状态噢~', at_sender=True)
 
     uid = await select_db(qid, mode='uid')
     if uid is None or not isinstance(uid, str) or not uid.isdecimal():
-        await matcher.finish(UID_HINT)
+        await matcher.finish(
+            MessageSegment.room_at_msg(
+                content='{$@}' + UID_HINT, at_list=wxid_list
+            )
+        )
 
     im = await set_config_func(
         config_name=config_name,
@@ -180,6 +204,8 @@ async def open_switch_func(
         qid=str(qid),
         option=gid,
         query=query,
-        is_admin=is_admin,
+        is_admin=await SUPERUSER(bot, event),
+    )
+    await matcher.finish(
+        MessageSegment.room_at_msg(content="{$@}" + f"{im}", at_list=wxid_list)
     )
-    await matcher.finish(im, at_sender=True)

GenshinUID/genshinuid_data/export_data.py

@@ -5,7 +5,7 @@ from ..utils.download_resource.RESOURCE_PATH import MAIN_PATH
 from ..utils.db_operation.db_operation import get_all_bind, get_user_bind_data
 
 DATA_PATH = MAIN_PATH / 'v3_data.json'
-BOT_ID = 'onebot'
+BOT_ID = 'ntchat'
 RECOGNIZE_SERVER = {
     '1': 'cn_gf01',
     '2': 'cn_gf01',

GenshinUID/genshinuid_enka/__init__.py

@@ -1,20 +1,21 @@
 import re
 import random
 import asyncio
-from typing import Tuple, Union
+from typing import Tuple
 
 from nonebot import on_command
 from nonebot.log import logger
 from nonebot.matcher import Matcher
+from nonebot.params import CommandArg
 from nonebot.permission import SUPERUSER
-from nonebot.params import Depends, CommandArg
 from nonebot_plugin_apscheduler import scheduler
-from nonebot.adapters.onebot.v11 import (
+from nonebot.adapters.ntchat.message import Message
+from nonebot.adapters.ntchat import (
     Bot,
-    Message,
+    MessageEvent,
     MessageSegment,
-    GroupMessageEvent,
-    PrivateMessageEvent,
+    TextMessageEvent,
+    QuoteMessageEvent,
 )
 
 from ..config import priority
@@ -26,14 +27,13 @@ from ..utils.message.error_reply import UID_HINT
 from ..utils.enka_api.get_enka_data import switch_api
 from ..utils.enka_api.enka_to_card import enka_to_card
 from ..utils.enka_api.enka_to_data import enka_to_data
-from ..utils.message.get_image_and_at import ImageAndAt
 from ..utils.download_resource.RESOURCE_PATH import TEMP_PATH
 from ..utils.exception.handle_exception import handle_exception
 from ..utils.db_operation.db_operation import select_db, get_all_uid
 
 refresh = on_command('强制刷新')
 original_pic = on_command('原图', rule=FullCommand())
-change_api = on_command('切换api')
+change_api = on_command('切换api', rule=FullCommand())
 get_charcard_list = on_command('毕业度统计')
 get_char_info = on_command(
     '查询',
@@ -60,11 +60,10 @@ refresh_scheduler = scheduler
 )
 async def send_change_api_info(
     bot: Bot,
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: MessageEvent,
     matcher: Matcher,
-    args: Message = CommandArg(),
 ):
-    if args or not await SUPERUSER(bot, event):
+    if not await SUPERUSER(bot, event):
         return
 
     im = await switch_api()
@@ -87,11 +86,10 @@ async def send_change_api_info(
     ),
 )
 async def send_original_pic(
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: QuoteMessageEvent,
     matcher: Matcher,
 ):
-    if event.reply:
-        msg_id = event.reply.message_id
+    msg_id = event.quote_message_id
     path = TEMP_PATH / f'{msg_id}.jpg'
     if path.exists():
         logger.info('[原图]访问图片: {}'.format(path))
@@ -147,28 +145,33 @@ async def send_original_pic(
     ),
 )
 async def send_char_info(
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
     args: Message = CommandArg(),
-    custom: ImageAndAt = Depends(),
 ):
     raw_mes = args.extract_plain_text().strip()
     name = ''.join(re.findall('[\u4e00-\u9fa5]', raw_mes))
+    # 如果输入中（查询之后的内容）没有其他字符串（如角色名等）则忽略。
     if not name:
         return
-
+    # 若查询中有@则排除@后内容，排除后若@前没有 其他内容则不继续运行下方代码 防止与roleinfo查询打架
+    # 修改后@人应该在命令末尾 如：查询万叶@XXXX
+    if "@" in raw_mes:
+        raw_mes = raw_mes.split("@")[0]
+        if not raw_mes:
+            return
     logger.info('开始执行[查询角色面板]')
-    at = custom.get_first_at()
-    img = custom.get_first_image()
-
-    if at:
-        qid = at
-    else:
-        qid = event.user_id
-    logger.info('[查询角色面板]QQ: {}'.format(qid))
+    # 获取被@的Wxid，排除""
+    qid = event.from_wxid
+    if event.at_user_list:
+        for user in event.at_user_list:
+            user = user.strip()
+            if user != "":
+                qid = user
+    logger.info('[查询角色面板]WXID: {}'.format(qid))
 
     # 获取uid
-    uid = re.findall(r'\d+', raw_mes)
+    uid = re.findall(r'\d+', raw_mes.split("@")[0])
     if uid:
         uid = uid[0]
     else:
@@ -179,15 +182,15 @@ async def send_char_info(
     if '未找到绑定的UID' in uid:
         await matcher.finish(UID_HINT)
 
-    im = await draw_enka_img(raw_mes, uid, img)
+    im = await draw_enka_img(raw_mes, uid, None)
 
     if isinstance(im, str):
         await matcher.finish(im)
     elif isinstance(im, Tuple):
-        req = await matcher.send(MessageSegment.image(im[0]))
-        msg_id = req['message_id']
+        await matcher.send(MessageSegment.image(im[0]))
+        # msg_id = req['message_id']
         if im[1]:
-            with open(TEMP_PATH / f'{msg_id}.jpg', 'wb') as f:
+            with open(TEMP_PATH / f'{uid}.jpg', 'wb') as f:
                 f.write(im[1])
     else:
         await matcher.finish('发生了未知错误,请联系管理员检查后台输出!')
@@ -245,17 +248,19 @@ async def daily_refresh_charData():
 async def send_card_info(
     bot: Bot,
     matcher: Matcher,
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     args: Message = CommandArg(),
-    custom: ImageAndAt = Depends(),
 ):
     message = args.extract_plain_text().strip().replace(' ', '')
-    uid = re.findall(r'\d+', message)  # str
+    uid = re.findall(r'\d+', message.split("@")[0])  # str
     m = ''.join(re.findall('[\u4e00-\u9fa5]', message))
-    qid = event.user_id
-    at = custom.get_first_at()
-    if at:
-        qid = at
+    # 获取被@的Wxid，排除""
+    qid = event.from_wxid
+    if event.at_user_list:
+        for user in event.at_user_list:
+            user = user.strip()
+            if user != "":
+                qid = user
 
     if len(uid) >= 1:
         uid = uid[0]
@@ -301,19 +306,21 @@ async def send_card_info(
     ),
 )
 async def send_charcard_list(
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
     args: Message = CommandArg(),
-    custom: ImageAndAt = Depends(),
 ):
     raw_mes = args.extract_plain_text().strip()
-    qid = event.user_id
-    at = custom.get_first_at()
-    if at:
-        qid = at
+    # 获取被@的Wxid，排除""
+    qid = event.from_wxid
+    if event.at_user_list:
+        for user in event.at_user_list:
+            user = user.strip()
+            if user != "":
+                qid = user
 
     # 获取uid
-    uid = re.findall(r'\d+', raw_mes)
+    uid = re.findall(r'\d+', raw_mes.split("@")[0])
     if uid:
         uid = uid[0]
     else:

GenshinUID/genshinuid_etcimg/__init__.py

@@ -5,7 +5,8 @@ from nonebot.log import logger
 from nonebot.matcher import Matcher
 from nonebot import on_regex, on_command
 from nonebot.params import CommandArg, RegexGroup
-from nonebot.adapters.onebot.v11 import Message, MessageSegment
+from nonebot.adapters.ntchat import MessageSegment
+from nonebot.adapters.ntchat.message import Message
 
 from ..version import Genshin_version
 from ..genshinuid_meta import register_menu

GenshinUID/genshinuid_eventlist/__init__.py

@@ -1,7 +1,7 @@
 from nonebot import on_command
 from nonebot.matcher import Matcher
 from nonebot_plugin_apscheduler import scheduler
-from nonebot.adapters.onebot.v11 import MessageSegment
+from nonebot.adapters.ntchat import MessageSegment
 
 from ..config import priority
 from ..genshinuid_meta import register_menu

GenshinUID/genshinuid_gachalog/__init__.py

@@ -1,13 +1,15 @@
-from typing import Union
+import os
+import asyncio
 
 from nonebot.log import logger
+from nonebot.rule import is_type
 from nonebot.matcher import Matcher
-from nonebot import get_bot, on_notice, on_command
-from nonebot.adapters.onebot.v11 import (
-    NoticeEvent,
+from nonebot import get_bot, on_command, on_message
+from nonebot.adapters.ntchat.permission import GROUP
+from nonebot.adapters.ntchat import (
     MessageSegment,
-    GroupMessageEvent,
-    PrivateMessageEvent,
+    FileMessageEvent,
+    TextMessageEvent,
 )
 
 from .get_gachalogs import save_gachalogs
@@ -21,8 +23,8 @@ from .export_and_import import export_gachalogs, import_gachalogs
 
 get_gacha_log = on_command('刷新抽卡记录', aliases={'强制刷新抽卡记录'}, rule=FullCommand())
 get_gacha_log_card = on_command('抽卡记录', rule=FullCommand())
-import_gacha_log = on_notice()
-export_gacha_log = on_command('导出抽卡记录', rule=FullCommand())
+import_gacha_log = on_message(block=False, rule=(is_type(FileMessageEvent)))
+export_gacha_log = on_command('导出抽卡记录', rule=FullCommand(), permission=GROUP)
 
 
 @export_gacha_log.handle()
@@ -41,12 +43,12 @@ export_gacha_log = on_command('导出抽卡记录', rule=FullCommand())
     ),
 )
 async def export_gacha_log_info(
-    event: GroupMessageEvent,
+    event: TextMessageEvent,
     matcher: Matcher,
 ):
     logger.info('开始执行[导出抽卡记录]')
-    qid = event.user_id
-    gid = event.group_id
+    qid = event.from_wxid
+    gid = event.room_wxid
     uid = await select_db(qid, mode='uid')
     bot = get_bot()
     if not isinstance(uid, str) or '未找到绑定的UID' in uid:
@@ -54,10 +56,9 @@ async def export_gacha_log_info(
     raw_data = await export_gachalogs(uid)
     if raw_data['retcode'] == 'ok':
         await bot.call_api(
-            'upload_group_file',
-            group_id=gid,
-            name=raw_data['name'],
-            file=raw_data['url'],
+            'send_file',
+            to_wxid=gid,
+            file_path=raw_data['url'],
         )
         logger.info(f'[导出抽卡记录] UID{uid}成功!')
         await matcher.finish('上传成功!')
@@ -81,21 +82,22 @@ async def export_gacha_log_info(
         '- <ft color=(238,120,0)>私聊发送json格式的离线文件</ft>'
     ),
 )
-async def import_gacha_log_info(event: NoticeEvent, matcher: Matcher):
-    args = event.dict()
-    if args['notice_type'] != 'offline_file':
-        await matcher.finish()
-    url = args['file']['url']
-    name: str = args['file']['name']
-    if not name.endswith('.json'):
-        return
-    qid = args['user_id']
-    uid = await select_db(qid, mode='uid')
+async def import_gacha_log_info(event: FileMessageEvent, matcher: Matcher):
+    await asyncio.sleep(2)  # 等待下载文件，避免占用
+    # 检测文件是否存在并小于8MB
+    if (
+        os.path.exists(event.file)
+        and os.path.getsize(event.file) <= 8 * 1024 * 1024
+        and event.file_name.endswith(".json")
+    ):
+        uid = await select_db(event.from_wxid, mode='uid')
         if not isinstance(uid, str) or '未找到绑定的UID' in uid:
             await matcher.finish(UID_HINT)
         logger.info('开始执行[导入抽卡记录]')
-    im = await import_gachalogs(url, uid)
+        im = await import_gachalogs(event.file, uid)
         await matcher.finish(im)
+    else:
+        await matcher.finish()
 
 
 @get_gacha_log_card.handle()
@@ -114,14 +116,14 @@ async def import_gacha_log_info(event: NoticeEvent, matcher: Matcher):
     ),
 )
 async def send_gacha_log_card_info(
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
 ):
     logger.info('开始执行[抽卡记录]')
 
-    uid = await select_db(event.user_id, mode='uid')
+    uid = await select_db(event.from_wxid, mode='uid')
     if isinstance(uid, str):
-        im = await draw_gachalogs_img(uid, event.user_id)
+        im = await draw_gachalogs_img(uid, event.from_wxid)  # type: ignore
         if isinstance(im, bytes):
             await matcher.finish(MessageSegment.image(im))
         else:
@@ -146,15 +148,21 @@ async def send_gacha_log_card_info(
     ),
 )
 async def send_daily_info(
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
 ):
     logger.info('开始执行[刷新抽卡记录]')
-    uid = await select_db(event.user_id, mode='uid')
+    wxid_list = []
+    wxid_list.append(event.from_wxid)
+    uid = await select_db(event.from_wxid, mode='uid')
     if isinstance(uid, str):
         is_force = False
-        if event.raw_message.startswith('强制'):
+        if event.msg.startswith('强制'):
             is_force = True
+        tip = '正在刷新抽卡记录，请耐心等待，不要重复发送命令。'
+        await matcher.send(
+            MessageSegment.room_at_msg(content=tip, at_list=wxid_list)
+        )
         im = await save_gachalogs(uid, None, is_force)
         await matcher.finish(im)
     else:

GenshinUID/genshinuid_gachalog/export_and_import.py

@@ -16,7 +16,13 @@ INT_TO_TYPE = {
 
 
 async def import_gachalogs(history_url: str, uid: str) -> str:
-    history_data: dict = json.loads(get(history_url).text)
+    # 是否Json文件检测
+    try:
+        if not history_url.startswith(('http', 'https')):
+            with open(history_url, 'r', encoding='utf-8') as history_url_files:
+                history_data = json.load(history_url_files)
+        else:
+            history_data: dict = get(history_url).json()
         data_uid = history_data['info']['uid']
         if data_uid != uid:
             return f'该抽卡记录UID{data_uid}与你绑定UID{uid}不符合！'
@@ -32,6 +38,8 @@ async def import_gachalogs(history_url: str, uid: str) -> str:
             result[INT_TO_TYPE[item['gacha_type']]].append(item)
         im = await save_gachalogs(uid, result)
         return im
+    except Exception:
+        return '导入失败，请检查你的Json文件！'
 
 
 async def export_gachalogs(uid: str) -> dict:

GenshinUID/genshinuid_gachaurl/__init__.py

@@ -1,43 +0,0 @@
-from nonebot import on_command
-from nonebot.log import logger
-from nonebot.matcher import Matcher
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent
-
-from .gacha_url import post_url
-from ..genshinuid_meta import register_menu
-from ..utils.nonebot2.rule import FullCommand
-from ..utils.message.error_reply import UID_HINT
-from ..utils.db_operation.db_operation import select_db
-from ..utils.exception.handle_exception import handle_exception
-
-get_gacha_url = on_command(
-    '获取抽卡记录链接', aliases={'抽卡链接', '抽卡记录链接'}, rule=FullCommand()
-)
-
-
-@get_gacha_url.handle()
-@handle_exception('获取抽卡记录链接')
-@register_menu(
-    '获取抽卡记录链接',
-    '获取抽卡记录链接',
-    '获取用户的抽卡记录链接',
-    trigger_method='群聊指令',
-    detail_des=(
-        '介绍：\n'
-        '导出抽卡记录的链接以用于原神小程序\n'
-        ' \n'
-        '指令：\n'
-        '- <ft color=(238,120,0)>抽卡链接</ft>'
-    ),
-)
-async def _(
-    bot: Bot,
-    event: GroupMessageEvent,
-    matcher: Matcher,
-):
-    await get_gacha_url.send("正在获取抽卡记录链接")
-    logger.info('开始执行[获取抽卡记录链接]')
-    uid = await select_db(event.user_id, mode='uid')
-    if not isinstance(uid, str) or '未找到绑定的UID' in uid:
-        await matcher.finish(UID_HINT)
-    await post_url(bot, uid, str(event.group_id), str(event.user_id))

GenshinUID/genshinuid_gachaurl/gacha_url.py

@@ -1,53 +0,0 @@
-import time
-from urllib.parse import quote
-
-from nonebot.adapters.onebot.v11 import Bot
-
-from ..utils.message.error_reply import SK_HINT
-from ..utils.message.send_msg import send_forward_msg
-from ..utils.mhy_api.get_mhy_data import get_authkey_by_cookie
-
-
-async def post_url(bot: Bot, uid: str, group_id: str, qid: str):
-    async def send_group_msg(msg: str):
-        await bot.call_api(
-            api='send_group_msg',
-            group_id=group_id,
-            message=msg,
-        )
-        return ''
-
-    authkey = await get_authkey_by_cookie(uid)
-    if authkey == {}:
-        return await send_group_msg(SK_HINT)
-    authkey = authkey['data']['authkey']
-    now = time.time()
-    region = ""
-    if uid[0] == "1" or uid[0] == "2":
-        region = 'cn_gf01'
-    elif uid[0] == "5":
-        region = "'cn_qd01'"
-    elif uid[0] == "6":
-        region = "'os_usa'"
-    elif uid[0] == "7":
-        region = "'os_euro'"
-    elif uid[0] == "8":
-        region = "'os_asia'"
-    elif uid[0] == "9":
-        region = "'os_cht'"
-    else:
-        region = 'cn_gf01'
-    msgs = []
-    msgs.append(f"uid：{uid}的抽卡记录链接为：")
-    url = (
-        f"https://hk4e-api.mihoyo.com/event/gacha_info/api/getGachaLog?"
-        f"authkey_ver=1&sign_type=2&auth_appid=webview_gacha&init_type=301&"
-        f"gacha_id=fecafa7b6560db5f3182222395d88aaa6aaac1bc"
-        f"&timestamp={str(int(now))}"
-        f"&lang=zh-cn&device_type=mobile&plat_type=ios&region={region}"
-        f"&authkey={quote(authkey,'utf-8')}"
-        f"&game_biz=hk4e_cn&gacha_type=301&page=1&size=5&end_id=0"
-    )
-    msgs.append(url)
-    await send_forward_msg(bot, group_id, "抽卡链接", qid, msgs)
-    return "成功执行"

GenshinUID/genshinuid_gcg/__init__.py

@@ -3,13 +3,13 @@ import re
 from nonebot import on_command
 from nonebot.log import logger
 from nonebot.matcher import Matcher
-from nonebot.params import Depends, CommandArg
-from nonebot.adapters.onebot.v11 import Message, MessageEvent, MessageSegment
+from nonebot.params import CommandArg
+from nonebot.adapters.ntchat.message import Message
+from nonebot.adapters.ntchat import MessageSegment, TextMessageEvent
 
 from ..config import priority
 from .draw_gcginfo import draw_gcg_info
 from ..utils.db_operation.db_operation import select_db
-from ..utils.message.get_image_and_at import ImageAndAt
 from ..utils.message.error_reply import CK_HINT, UID_HINT
 from ..utils.exception.handle_exception import handle_exception
 
@@ -20,26 +20,30 @@ get_gcg_info = on_command('七圣召唤', aliases={'七圣', '召唤'}, priority
 @get_gcg_info.handle()
 @handle_exception('七圣召唤', '获取/发送七圣召唤失败', '@未找到绑定信息\n' + CK_HINT)
 async def send_gcg_pic(
-    event: MessageEvent,
+    event: TextMessageEvent,
     matcher: Matcher,
     args: Message = CommandArg(),
-    custom: ImageAndAt = Depends(),
 ):
     raw_mes = args.extract_plain_text().strip().replace(' ', '')
-    name = ''.join(re.findall('[\u4e00-\u9fa5]', raw_mes))
+    if "@" in raw_mes:
+        name = ''.join(re.findall('^[\u4e00-\u9fa5]+', raw_mes.split("@")[0]))
         if name:
             return
-    at = custom.get_first_at()
-    logger.info('开始执行[七圣召唤]')
-
-    if at:
-        qid = at
     else:
-        qid = event.user_id
-    logger.info('[七圣召唤]QQ: {}'.format(qid))
+        name = ''.join(re.findall('^[\u4e00-\u9fa5]+', raw_mes))
+        if name:
+            return
+    logger.info('开始执行[七圣召唤]')
+    qid = event.from_wxid
+    if event.at_user_list:
+        for user in event.at_user_list:
+            user = user.strip()
+            if user != "":
+                qid = user
+    logger.info('[七圣召唤]WXID: {}'.format(qid))
 
     # 获取uid
-    uid = re.findall(r'\d+', raw_mes)
+    uid = re.findall(r'\d+', raw_mes.split("@")[0])
     if uid:
         uid = uid[0]
     else:

GenshinUID/genshinuid_guide/__init__.py

@@ -7,12 +7,8 @@ from nonebot.log import logger
 from nonebot.matcher import Matcher
 from nonebot import on_regex, on_command
 from nonebot.params import CommandArg, RegexGroup
-from nonebot.adapters.onebot.v11 import (
-    Bot,
-    Message,
-    MessageSegment,
-    GroupMessageEvent,
-)
+from nonebot.adapters.ntchat import MessageSegment
+from nonebot.adapters.ntchat.message import Message
 
 from .get_card import get_gs_card
 from .get_guide import get_gs_guide
@@ -27,7 +23,6 @@ get_bluekun_pic = on_command('参考面板')
 get_card = on_command('原牌')
 get_abyss = on_command('版本深渊')
 
-
 IMG_PATH = Path(__file__).parent / 'img'
 
 
@@ -115,10 +110,8 @@ async def send_gscard_pic(matcher: Matcher, args: Message = CommandArg()):
 
 
 @get_abyss.handle()
-@handle_exception('原牌')
+@handle_exception('版本深渊')
 async def send_abyss_review(
-    bot: Bot,
-    event: GroupMessageEvent,
     matcher: Matcher,
     args: Message = CommandArg(),
 ):
@@ -128,22 +121,8 @@ async def send_abyss_review(
         version = str(args[0])
     im = await get_review(version)
     if isinstance(im, List):
-        mes = []
-        for msg in im:
-            mes.append(
-                {
-                    'type': 'node',
-                    'data': {
-                        'name': '小仙',
-                        'uin': '3399214199',
-                        'content': msg,
-                    },
-                }
-            )
-        await bot.call_api(
-            'send_group_forward_msg', group_id=event.group_id, messages=mes
-        )
-        await matcher.finish()
+        im = '\n'.join(im)
+        await matcher.finish(im)
     elif isinstance(im, str):
         await matcher.finish(im)
     elif isinstance(im, bytes):

GenshinUID/genshinuid_help/__init__.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from nonebot import on_command
 from nonebot.log import logger
 from nonebot.matcher import Matcher
-from nonebot.adapters.onebot.v11 import MessageSegment
+from nonebot.adapters.ntchat import MessageSegment
 
 from .draw_help_card import draw_help_img
 from ..genshinuid_meta import register_menu

GenshinUID/genshinuid_map/__init__.py

@@ -1,16 +1,11 @@
-from typing import Any, Dict, Union
+from typing import Any, Dict
 
 from nonebot.log import logger
 from nonebot.matcher import Matcher
 from nonebot.params import RegexDict
 from nonebot import on_regex, on_command
 from nonebot.permission import SUPERUSER
-from nonebot.adapters.onebot.v11 import (
-    Bot,
-    MessageSegment,
-    GroupMessageEvent,
-    PrivateMessageEvent,
-)
+from nonebot.adapters.ntchat import Bot, MessageSegment, TextMessageEvent
 
 from ..config import priority
 from ..genshinuid_meta import register_menu
@@ -60,7 +55,7 @@ MAP_CHN_NAME = {
 )
 async def send_change_map_msg(
     bot: Bot,
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
 ):
     if not await SUPERUSER(bot, event):
@@ -129,7 +124,6 @@ async def send_find_map_msg(
         logger.info('本地未缓存,正在渲染...')
         im = await draw_genshin_map(name, map_id, map_name)
     if isinstance(im, str):
-        # 如果无结果，直接不返回
         await matcher.finish()
     elif isinstance(im, bytes):
         await matcher.finish(MessageSegment.image(im))

GenshinUID/genshinuid_mhybbscoin/__init__.py

@@ -6,12 +6,11 @@ from nonebot.matcher import Matcher
 from nonebot import get_bot, on_command
 from nonebot.permission import SUPERUSER
 from nonebot_plugin_apscheduler import scheduler
-from nonebot.adapters.onebot.v11 import MessageEvent
+from nonebot.adapters.ntchat import Bot, MessageEvent, MessageSegment
 
-from ..config import priority
+from ..config import SUPERUSERS, priority
 from ..genshinuid_meta import register_menu
 from ..utils.nonebot2.rule import FullCommand
-from ..utils.nonebot2.utils import get_superusers
 from ..utils.db_operation.db_operation import config_check
 from ..utils.exception.handle_exception import handle_exception
 from .daily_mihoyo_bbs_coin import mihoyo_coin, all_daily_mihoyo_bbs_coin
@@ -20,7 +19,7 @@ bbscoin_scheduler = scheduler
 
 get_mihoyo_coin = on_command('开始获取米游币', priority=priority, rule=FullCommand())
 all_bbscoin_recheck = on_command(
-    '全部重获取', permission=SUPERUSER, priority=priority, rule=FullCommand()
+    '全部重获取', priority=priority, rule=FullCommand()
 )
 
 
@@ -40,10 +39,16 @@ all_bbscoin_recheck = on_command(
     ),
 )
 async def send_mihoyo_coin(event: MessageEvent, matcher: Matcher):
-    await matcher.send('开始操作……', at_sender=True)
-    qid = event.user_id
+    wxid_list = []
+    wxid_list.append(event.from_wxid)
+    await matcher.send(
+        MessageSegment.room_at_msg(content='{$@}开始操作……', at_list=wxid_list)
+    )
+    qid = event.from_wxid
     im = await mihoyo_coin(qid)
-    await matcher.finish(im, at_sender=True)
+    await matcher.finish(
+        MessageSegment.room_at_msg(content="{$@}" + f'{im}', at_list=wxid_list)
+    )
 
 
 @all_bbscoin_recheck.handle()
@@ -60,12 +65,13 @@ async def send_mihoyo_coin(event: MessageEvent, matcher: Matcher):
         '- <ft color=(238,120,0)>全部重获取</ft>'
     ),
 )
-async def bbs_recheck(
-    matcher: Matcher,
-):
+async def bbs_recheck(bot: Bot, event: MessageEvent, matcher: Matcher):
+    if await SUPERUSER(bot, event):
         await matcher.send('已开始执行!可能需要较久时间!')
         await send_daily_mihoyo_bbs_sign()
         await matcher.finish('执行完成!')
+    else:
+        return
 
 
 # 每日一点十六分进行米游币获取
@@ -80,12 +86,12 @@ async def send_daily_mihoyo_bbs_sign():
     im, im_private = await all_daily_mihoyo_bbs_coin()
     if im_private:
         for user_id in im_private:
-            await bot.send_private_msg(
-                user_id=user_id, message=im_private[user_id]
+            await bot.call_api(
+                'send_text', to_wxid=user_id, content=im_private[user_id]
             )
             await asyncio.sleep(5 + random.randint(1, 3))
     if await config_check('PrivateReport'):
-        for qid in get_superusers():
-            await bot.call_api(api='send_private_msg', user_id=qid, message=im)
+        for qid in SUPERUSERS:
+            await bot.call_api(api='send_text', to_wxid=qid, content=im)
             await asyncio.sleep(5 + random.randint(1, 3))
     logger.info('米游币获取已结束。')

GenshinUID/genshinuid_mys/__init__.py

@@ -1,23 +1,22 @@
-import asyncio
 from typing import Any, Tuple
 
 from nonebot.log import logger
 from nonebot.matcher import Matcher
 from nonebot.params import RegexGroup
 from nonebot import on_regex, on_command
-from nonebot.adapters.onebot.v11 import (
+from nonebot.adapters.ntchat import (
     Bot,
     MessageEvent,
     MessageSegment,
-    GroupMessageEvent,
+    TextMessageEvent,
 )
 
 from ..config import priority
 from .get_lots_data import get_lots_msg
 from .get_meme_card import get_meme_img
+from .get_mys_data import get_task_detail
 from ..genshinuid_meta import register_menu
 from ..utils.nonebot2.rule import FullCommand
-from .get_mys_data import get_region_task, get_task_detail
 from ..utils.exception.handle_exception import handle_exception
 
 get_task_adv = on_regex(
@@ -50,10 +49,11 @@ get_lots = on_command('御神签', priority=priority, rule=FullCommand())
 )
 async def send_task_adv(
     bot: Bot,
-    event: GroupMessageEvent,
+    event: TextMessageEvent,
     matcher: Matcher,
     args: Tuple[Any, ...] = RegexGroup(),
 ):
+    '''
     if str(args[2]) in ['须弥', '层岩', '海岛']:
         im = await get_region_task(str(args[2]))
         for i in im:
@@ -63,6 +63,7 @@ async def send_task_adv(
             await asyncio.sleep(1)
         await matcher.finish()
     else:
+    '''
     im = await get_task_detail(str(args[2]))
     await matcher.finish(im)
 
@@ -98,7 +99,7 @@ async def send_meme_card(matcher: Matcher):
     ),
 )
 async def send_lots_data(matcher: Matcher, event: MessageEvent):
-    qid = event.user_id
+    qid = event.from_wxid
     logger.info('开始执行[御神签]')
     im = await get_lots_msg(qid)
     await matcher.finish(im)

GenshinUID/genshinuid_note/__init__.py

@@ -1,7 +1,7 @@
 from nonebot import on_command
 from nonebot.log import logger
 from nonebot.matcher import Matcher
-from nonebot.adapters.onebot.v11 import MessageEvent, MessageSegment
+from nonebot.adapters.ntchat import MessageEvent, MessageSegment
 
 from .note_text import award
 from ..config import priority
@@ -33,15 +33,23 @@ async def send_monthly_data(
     event: MessageEvent,
     matcher: Matcher,
 ):
-    qid = event.user_id
+    qid = event.from_wxid
+    wxid_list = []
+    wxid_list.append(event.from_wxid)
     uid = await select_db(qid, mode='uid')
     if isinstance(uid, str):
         if '未找到绑定的UID' in uid:
-            await matcher.finish(UID_HINT)
+            await matcher.finish(
+                MessageSegment.room_at_msg(
+                    content='{$@}' + UID_HINT, at_list=wxid_list
+                )
+            )
     else:
         await matcher.finish('发生未知错误...')
     im = await award(uid)
-    await matcher.finish(im, at_sender=True)
+    await matcher.finish(
+        MessageSegment.room_at_msg(content="{$@}" + f'{im}', at_list=wxid_list)
+    )
 
 
 # 群聊内 每月统计 功能
@@ -65,11 +73,17 @@ async def send_monthly_pic(
     event: MessageEvent,
     matcher: Matcher,
 ):
-    qid = event.user_id
+    qid = event.from_wxid
+    wxid_list = []
+    wxid_list.append(event.from_wxid)
     uid = await select_db(qid, mode='uid')
     if isinstance(uid, str):
         if '未找到绑定的UID' in uid:
-            await matcher.finish(UID_HINT)
+            await matcher.finish(
+                MessageSegment.room_at_msg(
+                    content='{$@}' + UID_HINT, at_list=wxid_list
+                )
+            )
     else:
         await matcher.finish('发生未知错误...')
     logger.info(f'[原石札记] 开始绘制,UID: {uid}')

GenshinUID/genshinuid_resin/__init__.py

@@ -1,16 +1,10 @@
 import asyncio
-from typing import Union
 
 from nonebot.log import logger
-from nonebot.params import Depends
 from nonebot.matcher import Matcher
 from nonebot import get_bot, on_command
 from nonebot_plugin_apscheduler import scheduler
-from nonebot.adapters.onebot.v11 import (
-    MessageSegment,
-    GroupMessageEvent,
-    PrivateMessageEvent,
-)
+from nonebot.adapters.ntchat import MessageSegment, TextMessageEvent
 
 from .notice import get_notice_list
 from .resin_text import get_resin_text
@@ -19,7 +13,6 @@ from ..genshinuid_meta import register_menu
 from ..utils.nonebot2.rule import FullCommand
 from ..utils.message.error_reply import UID_HINT
 from ..utils.db_operation.db_operation import select_db
-from ..utils.message.get_image_and_at import ImageAndAt
 from ..utils.exception.handle_exception import handle_exception
 
 notice_scheduler = scheduler
@@ -47,16 +40,17 @@ get_daily_info = on_command('当前状态', rule=FullCommand())
     ),
 )
 async def send_daily_info(
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
-    custom: ImageAndAt = Depends(),
 ):
     logger.info('开始执行[每日信息文字版]')
 
-    at = custom.get_first_at()
-    qid = event.user_id
-    if at:
-        qid = at
+    qid = event.from_wxid
+    if event.at_user_list:
+        for user in event.at_user_list:
+            user = user.strip()
+            if user != "":
+                qid = user
     logger.info('[每日信息文字版]QQ号: {}'.format(qid))
 
     uid: str = await select_db(qid, mode='uid')  # type: ignore
@@ -119,19 +113,19 @@ async def notice_job():
     ),
 )
 async def send_uid_info(
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
-    custom: ImageAndAt = Depends(),
 ):
     logger.info('开始执行[每日信息]')
-
-    at = custom.get_first_at()
-    qid = event.user_id
-    if at:
-        qid = at
+    qid = event.from_wxid
+    if event.at_user_list:
+        for user in event.at_user_list:
+            user = user.strip()
+            if user != "":
+                qid = user
     logger.info('[每日信息]QQ号: {}'.format(qid))
 
-    im = await get_resin_img(qid)
+    im = await get_resin_img(qid)  # type:ignore
     if isinstance(im, str):
         await matcher.finish(im)
     elif isinstance(im, bytes):

GenshinUID/genshinuid_resource/__init__.py

@@ -1,16 +1,11 @@
 import asyncio
 import threading
-from typing import Union
 
 from nonebot import on_command
 from nonebot.log import logger
 from nonebot.matcher import Matcher
 from nonebot.permission import SUPERUSER
-from nonebot.adapters.onebot.v11 import (
-    Bot,
-    GroupMessageEvent,
-    PrivateMessageEvent,
-)
+from nonebot.adapters.ntchat import Bot, TextMessageEvent
 
 from ..genshinuid_meta import register_menu
 from ..utils.nonebot2.rule import FullCommand
@@ -39,7 +34,7 @@ download_resource = on_command('下载全部资源', rule=FullCommand())
 )
 async def send_download_resource_msg(
     bot: Bot,
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
 ):
     if not await SUPERUSER(bot, event):

GenshinUID/genshinuid_roleinfo/__init__.py

@@ -1,16 +1,11 @@
 import re
-from typing import Union
 
 from nonebot import on_command
 from nonebot.log import logger
 from nonebot.matcher import Matcher
-from nonebot.params import Depends, CommandArg
-from nonebot.adapters.onebot.v11 import (
-    Message,
-    MessageSegment,
-    GroupMessageEvent,
-    PrivateMessageEvent,
-)
+from nonebot.params import CommandArg
+from nonebot.adapters.ntchat.message import Message
+from nonebot.adapters.ntchat import MessageSegment, TextMessageEvent
 
 from .get_regtime import calc_reg_time
 from .draw_roleinfo_card import draw_pic
@@ -18,7 +13,6 @@ from ..genshinuid_meta import register_menu
 from ..utils.nonebot2.rule import FullCommand
 from ..utils.message.error_reply import UID_HINT
 from ..utils.db_operation.db_operation import select_db
-from ..utils.message.get_image_and_at import ImageAndAt
 from ..utils.exception.handle_exception import handle_exception
 
 get_role_info = on_command('uid', aliases={'查询'})
@@ -53,22 +47,31 @@ get_reg_time = on_command(
     ),
 )
 async def send_role_info(
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
     args: Message = CommandArg(),
-    custom: ImageAndAt = Depends(),
 ):
     raw_mes = args.extract_plain_text().strip().replace(' ', '')
-    name = ''.join(re.findall('[\u4e00-\u9fa5]', raw_mes))
+    # 若@在文本中 先无视@后面内容 如果@前面有内容则无视并停止执行下方命令 避免与enka查询打架
+    if "@" in raw_mes:
+        name = ''.join(re.findall('^[\u4e00-\u9fa5]+', raw_mes.split("@")[0]))
         if name:
             return
-    qid = event.user_id
-    at = custom.get_first_at()
-    if at:
-        qid = at
+    else:
+        name = ''.join(re.findall('^[\u4e00-\u9fa5]+', raw_mes))
+        if name:
+            return
+
+    qid = event.from_wxid
+    # 识别@的人 排除空
+    if event.at_user_list:
+        for user in event.at_user_list:
+            user = user.strip()
+            if user != "":
+                qid = user
 
     # 获取uid
-    uid = re.findall(r'\d+', raw_mes)
+    uid = re.findall(r'\d+', raw_mes.split("@")[0])
     if uid:
         uid = uid[0]
     else:
@@ -94,14 +97,16 @@ async def send_role_info(
 
 @get_reg_time.handle()
 async def regtime(
-    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    event: TextMessageEvent,
     matcher: Matcher,
-    custom: ImageAndAt = Depends(),
 ):
-    qid = event.user_id
-    at = custom.get_first_at()
-    if at:
-        qid = at
+    qid = event.from_wxid
+    # 识别@的人 排除空
+    if event.at_user_list:
+        for user in event.at_user_list:
+            user = user.strip()
+            if user != "":
+                qid = user
 
     uid = await select_db(qid, mode='uid')
     uid = str(uid)

GenshinUID/genshinuid_signin/__init__.py

@@ -5,7 +5,8 @@ from nonebot.log import logger
 from nonebot.matcher import Matcher
 from nonebot import get_bot, on_command
 from nonebot.permission import SUPERUSER
-from nonebot.adapters.onebot.v11 import MessageEvent
+from nonebot_plugin_apscheduler import scheduler
+from nonebot.adapters.ntchat import Bot, MessageEvent, MessageSegment
 
 from ..config import priority
 
@@ -14,8 +15,6 @@ try:
 except ImportError:
     from .sign import sign_in, daily_sign
 
-from nonebot_plugin_apscheduler import scheduler
-
 from ..genshinuid_meta import register_menu
 from ..utils.nonebot2.rule import FullCommand
 from ..utils.exception.handle_exception import handle_exception
@@ -24,9 +23,7 @@ from ..utils.db_operation.db_operation import select_db, config_check
 sign_scheduler = scheduler
 
 get_sign = on_command('签到', priority=priority, rule=FullCommand())
-all_recheck = on_command(
-    '全部重签', permission=SUPERUSER, priority=priority, rule=FullCommand()
-)
+all_recheck = on_command('全部重签', priority=priority, rule=FullCommand())
 
 
 # 每日零点半执行米游社原神签到
@@ -56,12 +53,16 @@ async def get_sign_func(
     matcher: Matcher,
 ):
     logger.info('开始执行[签到]')
-    qid = event.user_id
+    qid = event.from_wxid
+    wxid_list = []
+    wxid_list.append(event.from_wxid)
     logger.info('[签到]QQ号: {}'.format(qid))
     uid = await select_db(qid, mode='uid')
     logger.info('[签到]UID: {}'.format(uid))
     im = await sign_in(uid)
-    await matcher.finish(im, at_sender=True)
+    await matcher.finish(
+        MessageSegment.room_at_msg(content="{$@}" + f'{im}', at_list=wxid_list)
+    )
 
 
 @all_recheck.handle()
@@ -78,7 +79,9 @@ async def get_sign_func(
         '- <ft color=(238,120,0)>全部重签</ft>'
     ),
 )
-async def recheck(matcher: Matcher):
+async def recheck(bot: Bot, event: MessageEvent, matcher: Matcher):
+    if not await SUPERUSER(bot, event):
+        return
     logger.info('开始执行[全部重签]')
     await matcher.send('已开始执行')
     await send_daily_sign()
@@ -98,9 +101,9 @@ async def send_daily_sign():
     for qid in private_msg_list:
         try:
             await bot.call_api(
-                api='send_private_msg',
-                user_id=qid,
-                message=private_msg_list[qid],
+                api='send_text',
+                to_wxid=qid,
+                content=private_msg_list[qid],
             )
         except Exception:
             logger.warning(f'[每日全部签到] QQ {qid} 私聊推送失败!')
@@ -122,13 +125,16 @@ async def send_daily_sign():
                 report,
             )
         else:
-            msg_title = group_msg_list[gid]['push_message']
+            msg_title = group_msg_list[gid]['push_message'].rstrip()
         # 发送群消息
+        at_wxid = []
+        at_wxid.append(group_msg_list[gid]['wxid'])
         try:
             await bot.call_api(
-                api='send_group_msg',
-                group_id=gid,
-                message=msg_title,
+                api='send_room_at_msg',
+                to_wxid=gid,
+                at_list=at_wxid,
+                content=msg_title,
             )
         except Exception:
             logger.warning(f'[每日全部签到]群 {gid} 推送失败!')

GenshinUID/genshinuid_signin/sign.py

@@ -139,16 +139,18 @@ async def single_daily_sign(uid: str, gid: str, qid: str):
             # 如果失败, 则添加到推送列表
             if im.startswith('签到失败') or im.startswith('网络有点忙'):
                 # 不用MessageSegment.at(row[2])，因为不方便移植
-                message = f'[CQ:at,qq={qid}] {im}'
+                message = f'UID:{uid} | {im}'
                 group_msg_list[gid]['failed'] += 1
-                group_msg_list[gid]['push_message'] += '\n' + message
+                group_msg_list[gid]['push_message'] += message + '\n'
             else:
                 group_msg_list[gid]['success'] += 1
         # 没有开启简洁签到, 则每条消息都要携带@信息
         else:
             # 不用MessageSegment.at(row[2])，因为不方便移植
-            message = f'[CQ:at,qq={qid}] {im}'
-            group_msg_list[gid]['push_message'] += '\n' + message
+            # message = '{$@}' + f'UID:{uid} | {im}'
+            message = f'UID:{uid} | {im}'
+            group_msg_list[gid]['wxid'] = qid
+            group_msg_list[gid]['push_message'] += message + '\n'
             group_msg_list[gid]['success'] -= 1
 
 

GenshinUID/genshinuid_update/__init__.py

@@ -5,7 +5,7 @@ from nonebot.matcher import Matcher
 from nonebot.params import RegexGroup
 from nonebot.permission import SUPERUSER
 from nonebot import get_bot, on_regex, get_driver, on_command
-from nonebot.adapters.onebot.v11 import Bot, MessageEvent, MessageSegment
+from nonebot.adapters.ntchat import Bot, MessageEvent, MessageSegment
 
 from ..genshinuid_meta import register_menu
 from ..utils.nonebot2.rule import FullCommand
@@ -32,15 +32,15 @@ async def _():
         return
     if update_log['send_type'] == 'group':
         await bot.call_api(
-            api='send_group_msg',
-            group_id=update_log['send_to'],
-            message=update_log['msg'],
+            api='send_room_at_msg',
+            to_wxid=update_log['send_to'],
+            content=update_log['msg'],
         )
     else:
         await bot.call_api(
-            api='send_private_msg',
-            user_id=update_log['send_to'],
-            message=update_log['msg'],
+            api='send_text',
+            to_wxid=update_log['send_to'],
+            content=update_log['msg'],
         )
     logger.info('遗留信息检查完毕!')
 
@@ -89,7 +89,7 @@ async def send_restart_msg(
     if not await SUPERUSER(bot, event):
         return
     logger.warning('开始执行[重启]')
-    qid = event.user_id
+    qid = event.from_wxid
     if len(event.get_session_id().split('_')) == 3:
         send_id = event.get_session_id().split('_')[1]
         send_type = 'group'

GenshinUID/genshinuid_user/__init__.py

@@ -1,3 +1,4 @@
+import asyncio
 from typing import Any, Tuple
 
 from nonebot.log import logger
@@ -5,33 +6,39 @@ from nonebot.matcher import Matcher
 from nonebot import on_regex, on_command
 from nonebot.permission import SUPERUSER
 from nonebot.params import CommandArg, RegexGroup
-from nonebot.adapters.onebot.v11 import (
-    PRIVATE_FRIEND,
+from nonebot.adapters.ntchat.message import Message
+from nonebot.adapters.ntchat.permission import PRIVATE
+from nonebot.adapters.ntchat import (
     Bot,
-    Message,
     MessageEvent,
     MessageSegment,
-    GroupMessageEvent,
+    TextMessageEvent,
 )
 
-from .topup import topup_
 from ..config import priority
+from .topup import GOODS, topup_
 from .qrlogin import qrcode_login
-from .get_ck_help_msg import get_ck_help
 from .draw_user_card import get_user_card
 from ..genshinuid_meta import register_menu
 from ..utils.nonebot2.rule import FullCommand
+from .get_ck_help_msg import get_ck_help, get_qr_help
 from ..utils.exception.handle_exception import handle_exception
 from .add_ck import deal_ck, get_ck_by_stoken, get_ck_by_all_stoken
 from ..utils.db_operation.db_operation import bind_db, delete_db, switch_db
 
-add_cookie = on_command('添加', permission=PRIVATE_FRIEND)
+add_cookie = on_command('添加', permission=PRIVATE)
 get_ck_msg = on_command(
     '绑定ck说明',
     aliases={'ck帮助', '绑定ck'},
     block=True,
     rule=FullCommand(),
 )
+get_qr_msg = on_command(
+    '扫码登录说明',
+    aliases={'扫码帮助', '登录帮助', '登陆帮助'},
+    block=True,
+    rule=FullCommand(),
+)
 bind_info = on_command(
     '绑定信息', priority=priority, block=True, rule=FullCommand()
 )
@@ -58,19 +65,40 @@ get_qrcode_login = on_command(
     aliases={'扫码登陆', '扫码登入'},
     rule=FullCommand(),
 )
-get_topup = on_command('gsrc', priority=priority, block=True, aliases={'原神充值'})
+get_topup = on_command(
+    'gsrc', priority=priority, block=True, aliases={'原神充值', 'pay'}
+)
 
 
 @get_topup.handle()
-async def send_topup(bot: Bot, event: GroupMessageEvent):
-    qid = event.user_id
-    goods_id = event.raw_message.replace('原神充值', '').replace('gsrc', '')
-    if goods_id == "":
-        goods_id = 0
-    else:
-        goods_id = int(goods_id)
-    group_id = event.group_id
-    await topup_(bot, qid, group_id, goods_id)
+async def send_topup(
+    matcher: Matcher, event: TextMessageEvent, args: Message = CommandArg()
+):
+    # 获取被@的Wxid，排除""
+    qid = event.from_wxid
+    if event.at_user_list:
+        for user in event.at_user_list:
+            user = user.strip()
+            if user != "":
+                qid = user
+
+    goods_id, method = 0, "alipay"
+    for s in str(args).split():
+        # 支持指定支付方式
+        if "微信" in s or "wx" in s:
+            method = "weixin"
+            continue
+        if "支付宝" in s or "zfb" in s:
+            method = "alipay"
+        # 输入物品别名识别
+        for gId, gData in GOODS.items():
+            if (s == gId) or (s in gData["aliases"]):
+                goods_id = gId
+                break
+    group_id = event.room_wxid
+    await matcher.finish(
+        await topup_(matcher, qid, group_id, goods_id, method)
+    )
 
 
 @refresh_all_ck.handle()
@@ -90,7 +118,7 @@ async def send_refresh_ck_msg(
     matcher: Matcher,
 ):
     logger.info('开始执行[刷新CK]')
-    qid = event.user_id
+    qid = event.from_wxid
     im = await get_ck_by_stoken(qid)
     if isinstance(im, str):
         await matcher.finish(im)
@@ -100,13 +128,12 @@ async def send_refresh_ck_msg(
 @get_qrcode_login.handle()
 async def send_qrcode_login(
     bot: Bot,
-    event: GroupMessageEvent,
+    event: MessageEvent,
     matcher: Matcher,
 ):
     logger.info('开始执行[扫码登陆]')
-    qid = event.user_id
-    groupid = event.group_id
-    im = await qrcode_login(bot, groupid, qid)
+    qid = event.from_wxid
+    im = await qrcode_login(matcher, qid)
     if not im:
         return
     im = await deal_ck(im, qid)
@@ -131,7 +158,7 @@ async def send_bind_card(
     matcher: Matcher,
 ):
     logger.info('开始执行[查询用户绑定状态]')
-    qid = event.user_id
+    qid = event.from_wxid
     im = await get_user_card(qid)
     logger.info('[查询用户绑定状态]完成!等待图片发送中...')
     await matcher.finish(MessageSegment.image(im))
@@ -157,7 +184,7 @@ async def send_add_ck_msg(
     event: MessageEvent, matcher: Matcher, args: Message = CommandArg()
 ):
     mes = args.extract_plain_text().strip().replace(' ', '')
-    qid = event.user_id
+    qid = event.from_wxid
     im = await deal_ck(mes, qid)
     if isinstance(im, str):
         await matcher.finish(im)
@@ -218,7 +245,9 @@ async def send_link_uid_msg(
 ):
     logger.info('开始执行[绑定/解绑用户信息]')
     logger.info('[绑定/解绑]参数: {}'.format(args))
-    qid = event.user_id
+    qid = event.from_wxid
+    wxid_list = []
+    wxid_list.append(event.from_wxid)
     logger.info('[绑定/解绑]UserID: {}'.format(qid))
 
     if args[0] in ('绑定'):
@@ -236,20 +265,23 @@ async def send_link_uid_msg(
             im = await delete_db(qid, {'UID': args[2]})
         else:
             im = await delete_db(qid, {'MYSID': args[2]})
-    await matcher.finish(im, at_sender=True)
+    await matcher.finish(
+        MessageSegment.room_at_msg(content="{$@}" + f'{im}', at_list=wxid_list)
+    )
 
 
 @get_ck_msg.handle()
-async def send_ck_help(bot: Bot, event: GroupMessageEvent):
+async def send_ck_help(matcher: Matcher):
     msg_list = await get_ck_help()
-    forward_msg = []
     for msg in msg_list:
-        forward_msg.append(
-            {
-                "type": "node",
-                "data": {"name": "小冰", "uin": "2854196306", "content": msg},
-            }
-        )
-    await bot.call_api(
-        'send_group_forward_msg', group_id=event.group_id, messages=forward_msg
-    )
+        await matcher.send(msg)
+        await asyncio.sleep(0.5)
+
+
+@get_qr_msg.handle()
+async def send_qr_help(matcher: Matcher):
+    msg_list = await get_qr_help()
+    for msg in msg_list:
+        await matcher.send(msg)
+        await asyncio.sleep(0.5)
+        await asyncio.sleep(0.5)

GenshinUID/genshinuid_user/add_ck.py

@@ -55,7 +55,7 @@ async def get_ck_by_all_stoken():
     return im
 
 
-async def get_ck_by_stoken(qid: int):
+async def get_ck_by_stoken(qid: str):
     uid_list: List = await select_db(qid, mode='list')  # type: ignore
     uid_dict = {uid: qid for uid in uid_list}
     im = await refresh_ck_by_uid_list(uid_dict)

GenshinUID/genshinuid_user/draw_topup_img.py

@@ -0,0 +1,241 @@
+from io import BytesIO
+from time import strftime, localtime
+
+from httpx import AsyncClient
+from PIL import Image, ImageDraw, ImageFont
+
+from ..utils.genshin_fonts.genshin_fonts import FONT_ORIGIN_PATH
+
+
+def font(size: int) -> ImageFont.FreeTypeFont:
+    """Pillow 绘制字体设置"""
+    return ImageFont.truetype(str(FONT_ORIGIN_PATH), size=size)
+
+
+# 支付宝充值图片绘制
+async def draw_ali(
+    uid,
+    item_info: str,
+    item_price: str,
+    item_order_no: str,
+    qrcode,
+    item_icon: str,
+    item_create_time: int,
+    item_id: str,
+) -> bytes:
+    """充值图片绘制"""
+    async with AsyncClient() as client:
+        _img = await client.get(item_icon, timeout=10.0)
+        itemImg = Image.open(BytesIO(_img.content)).convert("RGBA")
+
+    themeColor = "#1678ff"
+    warning = 20 if item_id == 'ys_chn_blessofmoon_tier5' else 0
+    res = Image.new("RGBA", (450, 530), themeColor)
+    drawer = ImageDraw.Draw(res)
+    resample = getattr(Image, "Resampling", Image).LANCZOS
+
+    # 头部矩形背景
+    drawer.rectangle(
+        (75, 50 - warning, 375 - 1, 150 - warning), fill="#E5F9FF", width=0
+    )
+    # 商品图片
+    item = itemImg.resize((90, 90), resample=resample)
+    res.paste(item, (80, 55 - warning), item)
+    # 二维码图片
+    qrcode = Image.open(qrcode)
+    qrcode = qrcode.resize((300, 300), resample=resample)
+    res.paste(qrcode, (75, 150 + warning), qrcode)
+    # 商品名称
+    drawer.text(
+        (
+            int(175 + (195 - font(25).getlength(item_info)) / 2),
+            int(70 - warning + (30 - font(25).getbbox(item_info)[-1]) / 2),
+        ),
+        item_info,
+        fill="#000000",
+        font=font(25),
+    )
+    # 价格
+    drawer.text(
+        (
+            int(175 + (195 - font(25).getlength(item_price)) / 2),
+            int(105 - warning + (30 - font(25).getbbox(item_price)[-1]) / 2),
+        ),
+        item_price,
+        fill="#000000",
+        font=font(25),
+    )
+    # 商品充值 UID
+    drawer.text(
+        (
+            int((460 - font(15).getlength(f"充值到 UID{uid}")) / 2),
+            int(
+                155
+                + warning
+                + (20 - font(15).getbbox(f"充值到 UID{uid}")[-1]) / 2
+            ),
+        ),
+        f"充值到 UID{uid}",
+        fill="#333333",
+        font=font(15),
+    )
+    # 月卡相关商品警告
+    if warning:
+        # 首部矩形背景
+        drawer.rectangle((75, 130, 375 - 1, 170), fill="#eeeeee", width=0)
+        # 转换警告文字
+        warning_text = "特殊情况将直接返还 330 创世结晶"
+        drawer.text(
+            (
+                int((450 - font(15).getlength(warning_text)) / 2),
+                int(130 + (40 - font(15).getbbox(warning_text)[-1]) / 2),
+            ),
+            warning_text,
+            fill="#ff5652",
+            font=font(15),
+        )
+    # 图片生成时间
+    timestamp = strftime("%Y-%m-%d %H:%M:%S", localtime(int(item_create_time)))
+    drawer.text(
+        (int((460 - font(15).getlength(timestamp)) / 2), 425 + warning),
+        timestamp,
+        fill="#1678ff",
+        font=font(15),
+    )
+    # 账单信息
+    ticket = f"支付宝账单编号 {item_order_no}"
+    drawer.text(
+        (int((450 - font(15).getlength(ticket)) / 2), 460 + warning),
+        ticket,
+        fill="#ffffff",
+        font=font(15),
+    )
+    # 免责声明
+    drawer.text(
+        (
+            int(
+                (
+                    410
+                    - font(15).getlength(
+                        "免责声明：该充值接口由米游社提供，不对充值结果负责。\n请在充值前仔细阅读米哈游的充值条款。"
+                    )
+                    / 2
+                )
+            ),
+            490 + warning,
+        ),
+        "免责声明：该充值接口由米游社提供，不对充值结果负责。\n          请在充值前仔细阅读米哈游的充值条款。",
+        fill="#FFA500",
+        font=font(12),
+    )
+    buf = BytesIO()
+    res.convert("RGB").save(buf, format="PNG")
+    return buf.getvalue()
+
+
+# 微信充值图片绘制
+async def draw_wx(
+    uid,
+    item_info: str,
+    item_price: str,
+    item_order_no: str,
+    item_icon: str,
+    item_create_time: int,
+    item_id: str,
+) -> bytes:
+    """充值图片绘制"""
+    async with AsyncClient() as client:
+        _img = await client.get(item_icon, timeout=10.0)
+        itemImg = Image.open(BytesIO(_img.content)).convert("RGBA")
+
+    themeColor = "#29ac66"
+    warning = 20 if item_id == 'ys_chn_blessofmoon_tier5' else 0
+    res = Image.new("RGBA", (450, 200), themeColor)
+    drawer = ImageDraw.Draw(res)
+    resample = getattr(Image, "Resampling", Image).LANCZOS
+    left = (450 - 370) / 2  # (图片宽度 - 矩形宽度) / 2
+    top = (200 - 130) / 2  # (图片高度 - 矩形高度) / 2
+    # 头部矩形背景
+    drawer.rectangle(
+        (
+            left,
+            top - warning,
+            left + 370,
+            top + 130 - warning,
+        ),  # 使用新的左上角和右下角的坐标
+        fill="#E5F9FF",  # 保留原有的填充色
+        width=0,  # 保留原有的边框宽度
+    )
+
+    # 商品图片
+    item = itemImg.resize((110, 110), resample=resample)
+    res.paste(item, (55, 50 - warning), item)
+    # 商品名称
+    drawer.text(
+        (
+            int(175 + (215 - font(25).getlength(item_info)) / 2),
+            int(50 - warning + (30 - font(25).getbbox(item_info)[-1]) / 2),
+        ),
+        item_info,
+        fill="#000000",
+        font=font(25),
+    )
+    # 价格
+    drawer.text(
+        (
+            int(180 + (195 - font(25).getlength(item_price)) / 2),
+            int(80 - warning + (30 - font(25).getbbox(item_price)[-1]) / 2),
+        ),
+        item_price,
+        fill="#000000",
+        font=font(25),
+    )
+    # 商品充值 UID
+    drawer.text(
+        (
+            int(185 + (195 - font(15).getlength(f"充值到 UID{uid}")) / 2),
+            int(
+                120
+                - warning
+                + (20 - font(15).getbbox(f"充值到 UID{uid}")[-1]) / 2
+            ),
+        ),
+        f"充值到 UID{uid}",
+        fill="#000000",
+        font=font(15),
+    )
+    # 图片生成时间
+    timestamp = strftime("%Y-%m-%d %H:%M:%S", localtime(int(item_create_time)))
+    drawer.text(
+        (int(185 + (195 - font(15).getlength(timestamp)) / 2), 140 - warning),
+        timestamp,
+        fill="#29ac66",
+        font=font(15),
+    )
+    if warning:
+        # 首部矩形背景
+        drawer.rectangle(
+            (left, top + 110, left + 370, top + 130), fill="#eeeeee", width=0
+        )
+        # 转换警告文字
+        warning_text = "特殊情况将直接返还 330 创世结晶"
+        drawer.text(
+            (
+                int((450 - font(15).getlength(warning_text)) / 2),
+                int(135 + (40 - font(15).getbbox(warning_text)[-1]) / 2),
+            ),
+            warning_text,
+            fill="#ff5652",
+            font=font(15),
+        )
+    # 账单信息
+    ticket = f"微信支付账单编号 {item_order_no}"
+    drawer.text(
+        (int((450 - font(15).getlength(ticket)) / 2), 170),
+        ticket,
+        fill="#ffffff",
+        font=font(15),
+    )
+    buf = BytesIO()
+    res.convert("RGB").save(buf, format="PNG")
+    return buf.getvalue()

GenshinUID/genshinuid_user/draw_user_card.py

@@ -29,7 +29,7 @@ gs_font_15 = genshin_font_origin(15)
 gs_font_26 = genshin_font_origin(26)
 
 
-async def get_user_card(qid: int) -> bytes:
+async def get_user_card(qid: str) -> bytes:
     uid_list: List = await select_db(qid, 'list')  # type: ignore
     w, h = 500, len(uid_list) * 210 + 330
     img = await get_simple_bg(w, h)

GenshinUID/genshinuid_user/get_ck_help_msg.py

@@ -26,6 +26,10 @@ http://user.mihoyo.com/（国服）
 然后在和机器人的私聊窗口，粘贴发送即可
 '''
 
+QRL = '''请在群里发送【扫码登录】并用米游社/原神进行扫码绑定
+如果使用该功能，请先绑定UID后再进行登录
+注意不要乱扫他人二维码'''
+
 
 async def get_ck_help() -> List:
     msg_list = []
@@ -34,3 +38,9 @@ async def get_ck_help() -> List:
     msg_list.append(CK_URL)
     msg_list.append(SK_URL)
     return msg_list
+
+
+async def get_qr_help() -> List:
+    msg_list = []
+    msg_list.append(QRL)
+    return msg_list

GenshinUID/genshinuid_user/qrlogin.py

@@ -3,13 +3,15 @@ import json
 import base64
 import asyncio
 from http.cookies import SimpleCookie
-from typing import Any, Tuple, Union, Literal
+from typing import Any, List, Tuple, Union, Literal, NoReturn
 
 import qrcode
 from nonebot.log import logger
+from nonebot.matcher import Matcher
 from qrcode.constants import ERROR_CORRECT_L
+from nonebot.adapters.ntchat import MessageSegment
 
-from ..utils.message.send_msg import send_forward_msg
+from ..utils.message.error_reply import UID_HINT
 from ..utils.db_operation.db_operation import select_db
 from ..utils.mhy_api.get_mhy_data import (
     check_qrcode,
@@ -20,12 +22,13 @@ from ..utils.mhy_api.get_mhy_data import (
     get_cookie_token_by_stoken,
 )
 
-disnote = '''免责声明:您将通过扫码完成获取米游社sk以及ck。
-本Bot将不会保存您的登录状态。
-我方仅提供米游社查询及相关游戏内容服务
+disnote = '''免责声明：您将通过扫码完成获取米游社sk以及ck。
+登录米游社相当于将账号授权于机器人，可能会带来未知的账号风险。
 若您的账号封禁、被盗等处罚与我方无关。
-害怕风险请勿扫码!
-'''
+登录后即代表您同意机器人使用协议并知晓会带来未知的账号风险！
+若想取消授权，请到米游社退出登录以清除机器人绑定的登录状态。
+
+请用米游社/原神扫描下方二维码登录：'''
 
 
 def get_qrcode_base64(url):
@@ -63,41 +66,36 @@ async def refresh(
             continue
         if status_data['data']['stat'] == 'Confirmed':
             logger.info('二维码已确认')
-            # print(status_data['data']['payload']['raw'])
             break
     return True, json.loads(status_data['data']['payload']['raw'])
 
 
-async def qrcode_login(bot, group_id, user_id) -> str:
-    async def send_group_msg(msg: str):
-        await bot.call_api(
-            api='send_group_msg',
-            group_id=group_id,
-            message=msg,
+async def qrcode_login(matcher: Matcher, user_id) -> str:
+    async def send_group_msg(msg: str, at_list: List) -> NoReturn:
+        await matcher.finish(
+            MessageSegment.room_at_msg(content=msg, at_list=at_list)
         )
-        return ''
 
+    wxid_list = []
+    wxid_list.append(user_id)
     code_data = await create_qrcode_url()
     try:
-        im = []
-        im.append('请使用米游社扫描下方二维码登录：')
-        im.append(
-            f'[CQ:image,file=base64://{get_qrcode_base64(code_data["url"])}]'
+        await matcher.send(
+            MessageSegment.image(
+                f'base64://{get_qrcode_base64(code_data["url"])}'
+            )
+        )
+        await matcher.send(
+            MessageSegment.room_at_msg(
+                content='{$@}' + disnote, at_list=wxid_list
             )
-        im.append(
-            '免责声明:您将通过扫码完成获取米游社sk以及ck。\n'
-            '本Bot将不会保存您的登录状态。\n'
-            '我方仅提供米游社查询及相关游戏内容服务,\n'
-            '若您的账号封禁、被盗等处罚与我方无关。\n'
-            '害怕风险请勿扫码~'
         )
-        await send_forward_msg(bot, group_id, "扫码小助手", str(user_id), im)
     except Exception:
-        logger.warning(f'[扫码登录] {user_id} 图片发送失败')
+        logger.warning('[扫码登录] {user_id} 图片发送失败')
     status, game_token_data = await refresh(code_data)
     if status:
         assert game_token_data is not None  # 骗过 pyright
-        logger.info('game_token获取成功')
+        logger.info('[扫码登录]game_token获取成功')
         cookie_token = await get_cookie_token(**game_token_data)
         stoken_data = await get_stoken_by_game_token(
             account_id=int(game_token_data['uid']),
@@ -111,7 +109,6 @@ async def qrcode_login(bot, group_id, user_id) -> str:
         ck = ck['data']['cookie_token']
         cookie_check = f'account_id={account_id};cookie_token={ck}'
         get_uid = await get_mihoyo_bbs_info(account_id, cookie_check)
-        # 剔除除了原神之外的其他游戏
         im = None
         if get_uid:
             for i in get_uid['data']['list']:
@@ -120,18 +117,15 @@ async def qrcode_login(bot, group_id, user_id) -> str:
                     break
             else:
                 im = f'你的米游社账号{account_id}尚未绑定原神账号，请前往米游社操作！'
-                return await send_group_msg(im)
+                await send_group_msg(im, wxid_list)
         else:
             im = '请求失败, 请稍后再试...'
-            return await send_group_msg(im)
+            await send_group_msg(im, wxid_list)
 
         uid_bind = await select_db(user_id, mode='uid')
-        # 没有在gsuid绑定uid的情况
         if uid_bind == "未找到绑定的UID~":
             logger.warning('game_token获取失败')
-            im = '你还没有绑定uid，请输入[绑定uid123456]绑定你的uid，再发送[扫码登录]进行绑定'
-            return await send_group_msg(im)
-        # 比对gsuid数据库和扫码登陆获取到的uid
+            await matcher.finish(UID_HINT)
         if str(uid_bind) == uid_check or str(uid_bind) == account_id:
             return SimpleCookie(
                 {
@@ -142,9 +136,12 @@ async def qrcode_login(bot, group_id, user_id) -> str:
                 }
             ).output(header='', sep=';')
         else:
-            logger.warning('game_token获取失败')
-            im = 'game_token获取失败：被非绑定指定uid用户扫取，取消绑定，请重新发送[扫码登录]登录账号'
+            logger.warning('game_token获取失败：非触发者本人扫码')
+            im = (
+                '{$@}' + f'检测到扫码登录UID{uid_check}与绑定UID{uid_bind}不同,'
+                'gametoken获取失败，请重新发送[扫码登录]进行登录'
+            )
+            await send_group_msg(im, wxid_list)
     else:
         logger.warning('game_token获取失败')
-        im = 'game_token获取失败：二维码已过期'
-    return await send_group_msg(im)
+        await send_group_msg('{$@}game_token获取失败：二维码已过期', wxid_list)

GenshinUID/genshinuid_user/topup.py

@@ -2,19 +2,73 @@ import io
 import base64
 import asyncio
 import traceback
+from typing import List, NoReturn
 
 import qrcode
 from nonebot.log import logger
+from nonebot.matcher import Matcher
 from qrcode.constants import ERROR_CORRECT_L
+from nonebot.adapters.ntchat import MessageSegment
 
-from ..utils.message.send_msg import send_forward_msg
+from .draw_topup_img import draw_wx, draw_ali
+from ..utils.message.error_reply import UID_HINT
 from ..utils.db_operation.db_operation import select_db
 from ..utils.mhy_api.get_mhy_data import topup, checkorder, fetchgoods
 
-disnote = '''免责声明:
-该充值接口由米游社提供,不对充值结果负责。
-请在充值前仔细阅读米哈游的充值条款。
-'''
+disnote = '''免责声明：该充值接口由米游社提供，不对充值结果负责。
+请在充值前仔细阅读米哈游的充值条款。'''
+
+GOODS = {
+    0: {
+        "title": "创世结晶×60",
+        "aliases": ["创世结晶x60", "结晶×60", "结晶x60", "创世结晶60", "结晶60"],
+    },
+    1: {
+        "title": "创世结晶×300",
+        "aliases": ["创世结晶x300", "结晶×300", "结晶x300", "创世结晶300", "结晶300", "30"],
+    },
+    2: {
+        "title": "创世结晶×980",
+        "aliases": ["创世结晶x980", "结晶×980", "结晶x980", "创世结晶980", "结晶980", "98"],
+    },
+    3: {
+        "title": "创世结晶×1980",
+        "aliases": [
+            "创世结晶x1980",
+            "结晶×1980",
+            "结晶x1980",
+            "创世结晶1980",
+            "结晶1980",
+            "198",
+        ],
+    },
+    4: {
+        "title": "创世结晶×3280",
+        "aliases": [
+            "创世结晶x3280",
+            "结晶×3280",
+            "结晶x3280",
+            "创世结晶3280",
+            "结晶3280",
+            "328",
+        ],
+    },
+    5: {
+        "title": "创世结晶×6480",
+        "aliases": [
+            "创世结晶x6480",
+            "结晶×6480",
+            "结晶x6480",
+            "创世结晶6480",
+            "结晶6480",
+            "648",
+        ],
+    },
+    6: {
+        "title": "空月祝福",
+        "aliases": ["空月", "祝福", "月卡", "小月卡"],
+    },
+}
 
 
 def get_qrcode_base64(url):
@@ -33,7 +87,7 @@ def get_qrcode_base64(url):
     return base64.b64encode(img_byte).decode()
 
 
-async def refresh(order, uid):
+async def refresh(order, uid, oid):
     times = 0
     while True:
         await asyncio.sleep(5)
@@ -41,53 +95,91 @@ async def refresh(order, uid):
         if order_status != 900:
             pass
         else:
-            return "支付成功"
+            return "{$@}" + f"支付成功！\nUID:{uid}\n订单号:{oid}"
         times += 1
         if times > 60:
-            return "支付超时"
+            return "{$@}" + f"支付超时！\nUID:{uid}\n订单号:{oid}"
 
 
-async def topup_(bot, qid, group_id, goods_id):
-    async def send_group_msg(msg: str):
-        await bot.call_api(
-            api='send_group_msg',
-            group_id=group_id,
-            message=msg,
+async def topup_(matcher: Matcher, qid, group_id, goods_id, method):
+    async def send_group_msg(msg: str, at_list: List) -> NoReturn:
+        await matcher.finish(
+            MessageSegment.room_at_msg(content=msg, at_list=at_list)
         )
-        return ''
 
+    wxid_list = []
+    wxid_list.append(qid)
     uid = await select_db(qid, mode="uid")
     if uid is None:
-        await send_group_msg("未绑定米游社账号")
-        return
+        await send_group_msg("{$@}" + UID_HINT, wxid_list)
     fetchgoods_data = await fetchgoods()
     try:
         goods_data = fetchgoods_data[goods_id]
-    except Exception:
-        await send_group_msg("商品不存在,最大为" + str(len(fetchgoods_data) - 1))
-        return
-    try:
-        order = await topup(uid, goods_data)
-    except Exception:
-        await send_group_msg("出错了,可能是cookie过期或接口出错")
-        logger.warning(f"[充值] {group_id} {qid}")
-        return
-    try:
-        im = []
-        b64_data = get_qrcode_base64(order["encode_order"])
-        qrc = f'[CQ:image,file=base64://{b64_data}]'
-        im.append(f"充值uid：{uid}")
-        im.append(
-            f"商品名称：{goods_data['goods_name']}×{str(goods_data['goods_unit'])}"
-            if int(goods_data['goods_unit']) > 0
-            else goods_data["goods_name"],
+    except Exception as e:
+        logger.warning(f'[充值]错误 {e}')
+        await send_group_msg(
+            "{$@}商品不存在,最大为" + str(len(fetchgoods_data) - 1), wxid_list
         )
-        im.append(f'商品价格：{int(order["amount"])/100}')
-        im.append(f"订单号：{order['order_no']}")
-        im.append(disnote)
-        im.append(qrc)
-        await send_forward_msg(bot, group_id, "小助手", str(qid), im)
-    except Exception:
+    try:
+        order = await topup(uid, goods_data, method)
+    except Exception as e:
+        logger.warning(f"[充值] {group_id} {qid} 错误：{e}")
+        await send_group_msg("{$@}出错了,可能是Cookie过期或接口出错。", wxid_list)
+    try:
+        b64_data = get_qrcode_base64(order["encode_order"])
+        img_b64decode = base64.b64decode(b64_data)
+        qrimage = io.BytesIO(img_b64decode)  # 二维码
+        item_icon_url: str = goods_data['goods_icon']  # 图标
+        item_id: str = goods_data['goods_id']  # 商品内部id
+        item_pay_url: str = order['encode_order']  # 支付链接
+        item_name_full = (
+            f"{goods_data['goods_name']}×{str(goods_data['goods_unit'])}"
+        )
+        # 物品名字(非月卡)
+        item_name: str = (
+            item_name_full
+            if int(goods_data['goods_unit']) > 0
+            else goods_data["goods_name"]
+        )
+        # 物品名字
+        item_price: str = order["currency"] + str(
+            int(order["amount"]) / 100
+        )  # 价格
+        item_order_no: str = order['order_no']  # 订单号
+        item_create_time: int = order['create_time']  # 创建时间
+
+        if method == 'alipay':
+            img_data = await draw_ali(
+                uid,
+                item_name,
+                item_price,
+                item_order_no,
+                qrimage,
+                item_icon_url,
+                item_create_time,
+                item_id,
+            )
+            return MessageSegment.image(img_data)
+        else:
+            img_data = await draw_wx(
+                uid,
+                item_name,
+                item_price,
+                item_order_no,
+                item_icon_url,
+                item_create_time,
+                item_id,
+            )
+            msg_text = '{$@}' + f' UID：{uid}\n{item_name}\n{item_create_time}'
+            msg_text2 = msg_text + f'\n\nZF：{item_pay_url}\n\n{disnote}'
+            at_msg = MessageSegment.room_at_msg(
+                content=msg_text2, at_list=wxid_list
+            )
+            return MessageSegment.image(img_data) + at_msg
+
+    except Exception as e:
         traceback.print_exc()
-        logger.warning(f"[充值] {group_id} 图片发送失败")
-    await send_group_msg(await refresh(order, uid))
+        logger.warning(f"[充值] {group_id} 图片发送失败: {e}")
+    await send_group_msg(
+        await refresh(order, uid, order['order_no']), wxid_list
+    )

GenshinUID/genshinuid_wikitext/__init__.py

@@ -3,19 +3,13 @@ import re
 from nonebot import on_command
 from nonebot.matcher import Matcher
 from nonebot.params import CommandArg
-from nonebot.adapters.onebot.v11 import (
-    Bot,
-    Message,
-    MessageSegment,
-    GroupMessageEvent,
-)
+from nonebot.adapters.ntchat.message import Message
 
 from ..config import priority
 from ..genshinuid_meta import register_menu
 from ..utils.exception.handle_exception import handle_exception
 from .get_wiki_text import (
     char_wiki,
-    audio_wiki,
     foods_wiki,
     weapon_wiki,
     enemies_wiki,
@@ -32,7 +26,8 @@ get_audio = on_command('语音', priority=priority)
 get_artifacts = on_command('圣遗物', priority=priority)
 get_food = on_command('食物', priority=priority)
 
-
+# 语音暂时不支持
+'''
 @get_audio.handle()
 @handle_exception('语音', '语音发送失败，可能是FFmpeg环境未配置。')
 @register_menu(
@@ -61,6 +56,7 @@ async def send_audio(matcher: Matcher, args: Message = CommandArg()):
             await matcher.finish(im)
         else:
             await matcher.finish(MessageSegment.record(im))
+'''
 
 
 @get_enemies.handle()
@@ -153,6 +149,8 @@ async def send_weapon(matcher: Matcher, args: Message = CommandArg()):
     await matcher.finish(im)
 
 
+# 天赋暂时不支持
+'''
 @get_talents.handle()
 @handle_exception('天赋')
 @register_menu(
@@ -173,7 +171,6 @@ async def send_weapon(matcher: Matcher, args: Message = CommandArg()):
 )
 async def send_talents(
     bot: Bot,
-    event: GroupMessageEvent,
     matcher: Matcher,
     args: Message = CommandArg(),
 ):
@@ -187,10 +184,10 @@ async def send_talents(
                 'send_group_forward_msg', group_id=event.group_id, messages=im
             )
             await matcher.finish()
-            return
     else:
         im = '参数不正确。'
     await matcher.finish(im)
+'''
 
 
 @get_char.handle()

GenshinUID/genshinuid_xkdata/__init__.py

@@ -6,7 +6,7 @@ from nonebot import on_command
 from nonebot.log import logger
 from nonebot.matcher import Matcher
 from nonebot_plugin_apscheduler import scheduler
-from nonebot.adapters.onebot.v11 import MessageSegment
+from nonebot.adapters.ntchat import MessageSegment
 
 from .draw_abyss_total import TOTAL_IMG, draw_xk_abyss_img
 from ..utils.exception.handle_exception import handle_exception

GenshinUID/utils/db_operation/database/UidDataDAL.py

@@ -11,7 +11,7 @@ class UidDataDAL:
     def __init__(self, db_session: Session):
         self.db_session = db_session
 
-    async def get_user_data(self, userid: int) -> Optional[UidData]:
+    async def get_user_data(self, userid: str) -> Optional[UidData]:
         """
         :说明:
           获取用户的绑定信息
@@ -37,7 +37,7 @@ class UidDataDAL:
             bind_list.append(item.__dict__)
         return bind_list
 
-    async def user_exists(self, userid: int) -> bool:
+    async def user_exists(self, userid: str) -> bool:
         """
         :说明:
           是否存在用户的绑定信息
@@ -67,7 +67,7 @@ class UidDataDAL:
             uid_list.extend(item.UID.split("_"))
         return uid_list
 
-    async def get_uid_list(self, userid: int) -> List[str]:
+    async def get_uid_list(self, userid: str) -> List[str]:
         """
         :说明:
           获得用户的绑定UID列表
@@ -83,7 +83,7 @@ class UidDataDAL:
                 return uid_list
         return []
 
-    async def get_uid(self, userid: int) -> str:
+    async def get_uid(self, userid: str) -> str:
         """
         :说明:
           获得用户绑定的UID
@@ -98,14 +98,14 @@ class UidDataDAL:
         else:
             return '未找到绑定的UID~'
 
-    async def switch_uid(self, userid: int, uid: Optional[str] = None) -> str:
+    async def switch_uid(self, userid: str, uid: Optional[str] = None) -> str:
         """
         :说明:
           切换绑定的UID列表,绑定一个UID的情况下返回无法切换
           切换前 -> 12_13_14
           切换后 -> 13_12_14
         :参数:
-          * userid (int): QQ号。
+          * userid (int): WX号。
           * uid (str): 切换的UID, 可选, 不传入的话自动切换下一个。
         :返回:
           * msg (str): 回调信息。
@@ -126,7 +126,7 @@ class UidDataDAL:
         else:
             return '你还没有绑定过UID噢~'
 
-    async def get_mysid_list(self, userid: int) -> List[str]:
+    async def get_mysid_list(self, userid: str) -> List[str]:
         """
         :说明:
           获得用户的绑定MYSID列表
@@ -142,7 +142,7 @@ class UidDataDAL:
                 return mys_list
         return []
 
-    async def get_mysid(self, userid: int) -> str:
+    async def get_mysid(self, userid: str) -> str:
         """
         :说明:
           获得用户绑定的MYSID
@@ -157,7 +157,7 @@ class UidDataDAL:
         else:
             return "未找到绑定的MYSID~"
 
-    async def get_anyid(self, userid: int) -> str:
+    async def get_anyid(self, userid: str) -> str:
         """
         :说明:
           获得用户绑定的ID信息
@@ -176,7 +176,7 @@ class UidDataDAL:
         else:
             return '未找到绑定的ID信息~'
 
-    async def bind_db(self, userid: int, data: dict) -> str:
+    async def bind_db(self, userid: str, data: dict) -> str:
         """
         :说明:
           绑定UID或者MYSID
@@ -229,7 +229,7 @@ class UidDataDAL:
         await self.db_session.flush()  # type: ignore
         return _bind
 
-    async def delete_db(self, userid: int, data: Optional[dict]) -> str:
+    async def delete_db(self, userid: str, data: Optional[dict]) -> str:
         """
         :说明:
           删除用户的绑定UID或者MYSID
@@ -284,7 +284,7 @@ class UidDataDAL:
 
     async def update_db(
         self,
-        userid: int,
+        userid: str,
         data: Optional[dict],
     ):
         """

GenshinUID/utils/db_operation/database/models.py

@@ -33,7 +33,7 @@ class PushData(SQLModel, table=True):
 
 class UidData(SQLModel, table=True):
     __table_args__ = {'keep_existing': True}
-    USERID: int = Field(default=100000000, primary_key=True, title='QQ号')
+    USERID: str = Field(default='WX_100001', primary_key=True, title='WX号')
     UID: Optional[str] = Field(title='UID')
     MYSID: Optional[str] = Field(title='米游社通行证(废弃)')
 
@@ -42,7 +42,7 @@ class NewCookiesTable(SQLModel, table=True):
     __table_args__ = {'keep_existing': True}
     UID: int = Field(default=100000000, primary_key=True, title='UID')
     Cookies: str = Field(title='CK')
-    QID: int = Field(title='QQ号')
+    QID: str = Field(title='QQ号')
     StatusA: str = Field(title='全局推送开关')
     StatusB: str = Field(title='自动签到')
     StatusC: str = Field(title='自动米游币')

GenshinUID/utils/db_operation/db_operation.py

@@ -92,7 +92,7 @@ async def get_all_stoken() -> List:
 
 
 async def select_db(
-    userid: int, mode: str = 'auto'
+    userid: str, mode: str = 'auto'
 ) -> Union[List[str], str, None]:
     """
     :说明:
@@ -126,14 +126,14 @@ async def select_db(
             return im
 
 
-async def switch_db(userid: int, uid: Optional[str] = None) -> str:
+async def switch_db(userid: str, uid: Optional[str] = None) -> str:
     """
     :说明:
       切换绑定的UID列表,绑定一个UID的情况下返回无法切换
       切换前 -> 12_13_14
       切换后 -> 13_14_12
     :参数:
-      * userid (str): QQ号。
+      * userid (str): WX号。
     :返回:
       * im (str): 回调信息。
     """
@@ -144,7 +144,7 @@ async def switch_db(userid: int, uid: Optional[str] = None) -> str:
             return im
 
 
-async def delete_db(userid: int, data: dict) -> str:
+async def delete_db(userid: str, data: dict) -> str:
     """
     :说明:
       删除当前绑定的UID信息

GenshinUID/utils/draw_image_tools/draw_image_tool.py

@@ -184,10 +184,7 @@ async def get_level_pic(level: int) -> Image.Image:
 async def get_qq_avatar(
     qid: Optional[Union[int, str]] = None, avatar_url: Optional[str] = None
 ) -> Image.Image:
-    if qid:
-        avatar_url = f'http://q1.qlogo.cn/g?b=qq&nk={qid}&s=640'
-    elif avatar_url is None:
-        avatar_url = 'https://q1.qlogo.cn/g?b=qq&nk=3399214199&s=640'
+    avatar_url = 'https://s2.loli.net/2022/01/31/kwCIl3cF1Z2GxnR.png'
     char_pic = Image.open(BytesIO(get(avatar_url).content)).convert('RGBA')
     return char_pic
 

GenshinUID/utils/draw_image_tools/send_image_tool.py

@@ -52,4 +52,4 @@ async def convert_img(
     else:
         async with aiofiles.open(img, 'rb') as fp:
             img = await fp.read()
-    return f'[CQ:image,file=base64://{b64encode(img).decode()}]'
+    return f'base64://{b64encode(img).decode()}'

GenshinUID/utils/exception/handle_exception.py

@@ -4,7 +4,6 @@ from typing import Optional
 from nonebot.log import logger
 from nonebot.matcher import Matcher
 from nonebot.exception import FinishedException
-from nonebot.adapters.onebot.v11 import ActionFailed
 
 
 def handle_exception(
@@ -30,10 +29,6 @@ def handle_exception(
             matcher: Matcher = kwargs['matcher']
             try:
                 await func(**kwargs)
-            except ActionFailed as e:
-                # 此为bot本身由于风控或网络问题发不出消息，并非代码本身出问题
-                await matcher.send(f'发送消息失败{e.info["wording"]}')
-                logger.exception(f'发送{name}消息失败')
             except FinishedException:
                 # `finish` 会抛出此异常，应予以抛出而不处理
                 raise
@@ -46,9 +41,7 @@ def handle_exception(
                     if not fail_msg:
                         fail_msg = log_msg
                     if fail_msg[0] == '@':
-                        await matcher.send(
-                            f'{fail_msg[1:]}\n错误信息为{e}', at_sender=True
-                        )
+                        await matcher.send(f'{fail_msg[1:]}\n错误信息为{e}')
                     else:
                         await matcher.send(f'{fail_msg}\n错误信息为{e}')
                     if log_msg[0] == '@':

GenshinUID/utils/message/get_cqhttp_data.py

@@ -1,11 +1,11 @@
 from typing import List
 
-from nonebot.adapters.onebot.v11 import Bot
+from nonebot.adapters.ntchat import Bot
 
 
 async def get_all_friend_list(bot: Bot) -> List[int]:
     friend_list = []
-    friend_dict_list = await bot.call_api('get_friend_list')
+    friend_dict_list = await bot.call_api('get_contacts')
     for friend in friend_dict_list:
         friend_list.append(friend['user_id'])
     return friend_list
@@ -14,7 +14,7 @@ async def get_all_friend_list(bot: Bot) -> List[int]:
 async def get_group_member_list(bot: Bot, group_id: int) -> List[int]:
     member_list = []
     group_member_list = await bot.call_api(
-        'get_group_member_list', group_id=group_id
+        'get_room_members', group_id=group_id
     )
     for group_member in group_member_list:
         member_list.append(group_member['user_id'])

GenshinUID/utils/message/send_msg.py

@@ -1,12 +1,12 @@
 from typing import List
 
-from nonebot.adapters.onebot.v11 import Bot
+from nonebot.adapters.qqguild import Bot
 
 
 # 发送聊天记录
 async def send_forward_msg(
     bot: Bot,
-    groupid: int,
+    userid: int,
     name: str,
     uin: str,
     msgs: List[str],
@@ -19,5 +19,5 @@ async def send_forward_msg(
 
     messages = [to_json(msg) for msg in msgs]
     await bot.call_api(
-        "send_group_forward_msg", group_id=groupid, messages=messages
+        "send_private_forward_msg", user_id=userid, messages=messages
     )

GenshinUID/utils/mhy_api/get_mhy_data.py

@@ -877,7 +877,7 @@ async def fetchgoods():
     return goodslist["data"]["goods_list"]
 
 
-async def topup(uid, goods):
+async def topup(uid, goods, method):
     device_id = str(uuid.uuid4())
     HEADER = copy.deepcopy(_HEADER)
     HEADER["Cookie"] = await owner_cookies(uid)
@@ -902,7 +902,7 @@ async def topup(uid, goods):
         "price_tier": goods["tier_id"],
         # "price_tier": "Tier_1",
         "currency": "CNY",
-        "pay_plat": "alipay",
+        "pay_plat": method,
     }
     data = {"order": order, "sign": gen_payment_sign(order)}
     HEADER["x-rpc-device_id"] = device_id

GenshinUID/utils/nonebot2/rule.py

@@ -1,6 +1,6 @@
 from nonebot.rule import Rule
 from nonebot.params import Depends, CommandArg
-from nonebot.adapters.onebot.v11 import Message
+from nonebot.adapters.ntchat.message import Message
 
 
 async def full_command(arg: Message = CommandArg()) -> bool:

poetry.lock

@@ -889,32 +889,32 @@ test = ["objgraph", "psutil"]
 
 [[package]]
 name = "h11"
-version = "0.14.0"
+version = "0.12.0"
 description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
 category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.6"
 files = [
-    {file = "h11-0.14.0-py3-none-any.whl", hash = "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761"},
-    {file = "h11-0.14.0.tar.gz", hash = "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d"},
+    {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"},
+    {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"},
 ]
 
 [[package]]
 name = "httpcore"
-version = "0.16.3"
+version = "0.15.0"
 description = "A minimal low-level HTTP client."
 category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "httpcore-0.16.3-py3-none-any.whl", hash = "sha256:da1fb708784a938aa084bde4feb8317056c55037247c787bd7e19eb2c2949dc0"},
-    {file = "httpcore-0.16.3.tar.gz", hash = "sha256:c5d6f04e2fc530f39e0c077e6a30caa53f1451096120f1f38b954afd0b17c0cb"},
+    {file = "httpcore-0.15.0-py3-none-any.whl", hash = "sha256:1105b8b73c025f23ff7c36468e4432226cbb959176eab66864b8e31c4ee27fa6"},
+    {file = "httpcore-0.15.0.tar.gz", hash = "sha256:18b68ab86a3ccf3e7dc0f43598eaddcf472b602aba29f9aa6ab85fe2ada3980b"},
 ]
 
 [package.dependencies]
-anyio = ">=3.0,<5.0"
+anyio = ">=3.0.0,<4.0.0"
 certifi = "*"
-h11 = ">=0.13,<0.15"
+h11 = ">=0.11,<0.13"
 sniffio = ">=1.0.0,<2.0.0"
 
 [package.extras]
@@ -923,19 +923,19 @@ socks = ["socksio (>=1.0.0,<2.0.0)"]
 
 [[package]]
 name = "httpx"
-version = "0.23.3"
+version = "0.23.0"
 description = "The next generation HTTP client."
 category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "httpx-0.23.3-py3-none-any.whl", hash = "sha256:a211fcce9b1254ea24f0cd6af9869b3d29aba40154e947d2a07bb499b3e310d6"},
-    {file = "httpx-0.23.3.tar.gz", hash = "sha256:9818458eb565bb54898ccb9b8b251a28785dd4a55afbc23d0eb410754fe7d0f9"},
+    {file = "httpx-0.23.0-py3-none-any.whl", hash = "sha256:42974f577483e1e932c3cdc3cd2303e883cbfba17fe228b0f63589764d7b9c4b"},
+    {file = "httpx-0.23.0.tar.gz", hash = "sha256:f28eac771ec9eb4866d3fb4ab65abd42d38c424739e80c08d8d20570de60b0ef"},
 ]
 
 [package.dependencies]
 certifi = "*"
-httpcore = ">=0.15.0,<0.17.0"
+httpcore = ">=0.15.0,<0.16.0"
 rfc3986 = {version = ">=1.3,<2", extras = ["idna2008"]}
 sniffio = "*"
 
@@ -1174,79 +1174,6 @@ files = [
     {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"},
 ]
 
-[[package]]
-name = "msgpack"
-version = "1.0.5"
-description = "MessagePack serializer"
-category = "main"
-optional = false
-python-versions = "*"
-files = [
-    {file = "msgpack-1.0.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:525228efd79bb831cf6830a732e2e80bc1b05436b086d4264814b4b2955b2fa9"},
-    {file = "msgpack-1.0.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4f8d8b3bf1ff2672567d6b5c725a1b347fe838b912772aa8ae2bf70338d5a198"},
-    {file = "msgpack-1.0.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:cdc793c50be3f01106245a61b739328f7dccc2c648b501e237f0699fe1395b81"},
-    {file = "msgpack-1.0.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5cb47c21a8a65b165ce29f2bec852790cbc04936f502966768e4aae9fa763cb7"},
-    {file = "msgpack-1.0.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e42b9594cc3bf4d838d67d6ed62b9e59e201862a25e9a157019e171fbe672dd3"},
-    {file = "msgpack-1.0.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:55b56a24893105dc52c1253649b60f475f36b3aa0fc66115bffafb624d7cb30b"},
-    {file = "msgpack-1.0.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:1967f6129fc50a43bfe0951c35acbb729be89a55d849fab7686004da85103f1c"},
-    {file = "msgpack-1.0.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20a97bf595a232c3ee6d57ddaadd5453d174a52594bf9c21d10407e2a2d9b3bd"},
-    {file = "msgpack-1.0.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d25dd59bbbbb996eacf7be6b4ad082ed7eacc4e8f3d2df1ba43822da9bfa122a"},
-    {file = "msgpack-1.0.5-cp310-cp310-win32.whl", hash = "sha256:382b2c77589331f2cb80b67cc058c00f225e19827dbc818d700f61513ab47bea"},
-    {file = "msgpack-1.0.5-cp310-cp310-win_amd64.whl", hash = "sha256:4867aa2df9e2a5fa5f76d7d5565d25ec76e84c106b55509e78c1ede0f152659a"},
-    {file = "msgpack-1.0.5-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9f5ae84c5c8a857ec44dc180a8b0cc08238e021f57abdf51a8182e915e6299f0"},
-    {file = "msgpack-1.0.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9e6ca5d5699bcd89ae605c150aee83b5321f2115695e741b99618f4856c50898"},
-    {file = "msgpack-1.0.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5494ea30d517a3576749cad32fa27f7585c65f5f38309c88c6d137877fa28a5a"},
-    {file = "msgpack-1.0.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1ab2f3331cb1b54165976a9d976cb251a83183631c88076613c6c780f0d6e45a"},
-    {file = "msgpack-1.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28592e20bbb1620848256ebc105fc420436af59515793ed27d5c77a217477705"},
-    {file = "msgpack-1.0.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fe5c63197c55bce6385d9aee16c4d0641684628f63ace85f73571e65ad1c1e8d"},
-    {file = "msgpack-1.0.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ed40e926fa2f297e8a653c954b732f125ef97bdd4c889f243182299de27e2aa9"},
-    {file = "msgpack-1.0.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:b2de4c1c0538dcb7010902a2b97f4e00fc4ddf2c8cda9749af0e594d3b7fa3d7"},
-    {file = "msgpack-1.0.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:bf22a83f973b50f9d38e55c6aade04c41ddda19b00c4ebc558930d78eecc64ed"},
-    {file = "msgpack-1.0.5-cp311-cp311-win32.whl", hash = "sha256:c396e2cc213d12ce017b686e0f53497f94f8ba2b24799c25d913d46c08ec422c"},
-    {file = "msgpack-1.0.5-cp311-cp311-win_amd64.whl", hash = "sha256:6c4c68d87497f66f96d50142a2b73b97972130d93677ce930718f68828b382e2"},
-    {file = "msgpack-1.0.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:a2b031c2e9b9af485d5e3c4520f4220d74f4d222a5b8dc8c1a3ab9448ca79c57"},
-    {file = "msgpack-1.0.5-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4f837b93669ce4336e24d08286c38761132bc7ab29782727f8557e1eb21b2080"},
-    {file = "msgpack-1.0.5-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1d46dfe3832660f53b13b925d4e0fa1432b00f5f7210eb3ad3bb9a13c6204a6"},
-    {file = "msgpack-1.0.5-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:366c9a7b9057e1547f4ad51d8facad8b406bab69c7d72c0eb6f529cf76d4b85f"},
-    {file = "msgpack-1.0.5-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:4c075728a1095efd0634a7dccb06204919a2f67d1893b6aa8e00497258bf926c"},
-    {file = "msgpack-1.0.5-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:f933bbda5a3ee63b8834179096923b094b76f0c7a73c1cfe8f07ad608c58844b"},
-    {file = "msgpack-1.0.5-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:36961b0568c36027c76e2ae3ca1132e35123dcec0706c4b7992683cc26c1320c"},
-    {file = "msgpack-1.0.5-cp36-cp36m-win32.whl", hash = "sha256:b5ef2f015b95f912c2fcab19c36814963b5463f1fb9049846994b007962743e9"},
-    {file = "msgpack-1.0.5-cp36-cp36m-win_amd64.whl", hash = "sha256:288e32b47e67f7b171f86b030e527e302c91bd3f40fd9033483f2cacc37f327a"},
-    {file = "msgpack-1.0.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:137850656634abddfb88236008339fdaba3178f4751b28f270d2ebe77a563b6c"},
-    {file = "msgpack-1.0.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0c05a4a96585525916b109bb85f8cb6511db1c6f5b9d9cbcbc940dc6b4be944b"},
-    {file = "msgpack-1.0.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56a62ec00b636583e5cb6ad313bbed36bb7ead5fa3a3e38938503142c72cba4f"},
-    {file = "msgpack-1.0.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ef8108f8dedf204bb7b42994abf93882da1159728a2d4c5e82012edd92c9da9f"},
-    {file = "msgpack-1.0.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:1835c84d65f46900920b3708f5ba829fb19b1096c1800ad60bae8418652a951d"},
-    {file = "msgpack-1.0.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:e57916ef1bd0fee4f21c4600e9d1da352d8816b52a599c46460e93a6e9f17086"},
-    {file = "msgpack-1.0.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:17358523b85973e5f242ad74aa4712b7ee560715562554aa2134d96e7aa4cbbf"},
-    {file = "msgpack-1.0.5-cp37-cp37m-win32.whl", hash = "sha256:cb5aaa8c17760909ec6cb15e744c3ebc2ca8918e727216e79607b7bbce9c8f77"},
-    {file = "msgpack-1.0.5-cp37-cp37m-win_amd64.whl", hash = "sha256:ab31e908d8424d55601ad7075e471b7d0140d4d3dd3272daf39c5c19d936bd82"},
-    {file = "msgpack-1.0.5-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:b72d0698f86e8d9ddf9442bdedec15b71df3598199ba33322d9711a19f08145c"},
-    {file = "msgpack-1.0.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:379026812e49258016dd84ad79ac8446922234d498058ae1d415f04b522d5b2d"},
-    {file = "msgpack-1.0.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:332360ff25469c346a1c5e47cbe2a725517919892eda5cfaffe6046656f0b7bb"},
-    {file = "msgpack-1.0.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:476a8fe8fae289fdf273d6d2a6cb6e35b5a58541693e8f9f019bfe990a51e4ba"},
-    {file = "msgpack-1.0.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9985b214f33311df47e274eb788a5893a761d025e2b92c723ba4c63936b69b1"},
-    {file = "msgpack-1.0.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:48296af57cdb1d885843afd73c4656be5c76c0c6328db3440c9601a98f303d87"},
-    {file = "msgpack-1.0.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:addab7e2e1fcc04bd08e4eb631c2a90960c340e40dfc4a5e24d2ff0d5a3b3edb"},
-    {file = "msgpack-1.0.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:916723458c25dfb77ff07f4c66aed34e47503b2eb3188b3adbec8d8aa6e00f48"},
-    {file = "msgpack-1.0.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:821c7e677cc6acf0fd3f7ac664c98803827ae6de594a9f99563e48c5a2f27eb0"},
-    {file = "msgpack-1.0.5-cp38-cp38-win32.whl", hash = "sha256:1c0f7c47f0087ffda62961d425e4407961a7ffd2aa004c81b9c07d9269512f6e"},
-    {file = "msgpack-1.0.5-cp38-cp38-win_amd64.whl", hash = "sha256:bae7de2026cbfe3782c8b78b0db9cbfc5455e079f1937cb0ab8d133496ac55e1"},
-    {file = "msgpack-1.0.5-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:20c784e66b613c7f16f632e7b5e8a1651aa5702463d61394671ba07b2fc9e025"},
-    {file = "msgpack-1.0.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:266fa4202c0eb94d26822d9bfd7af25d1e2c088927fe8de9033d929dd5ba24c5"},
-    {file = "msgpack-1.0.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:18334484eafc2b1aa47a6d42427da7fa8f2ab3d60b674120bce7a895a0a85bdd"},
-    {file = "msgpack-1.0.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:57e1f3528bd95cc44684beda696f74d3aaa8a5e58c816214b9046512240ef437"},
-    {file = "msgpack-1.0.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:586d0d636f9a628ddc6a17bfd45aa5b5efaf1606d2b60fa5d87b8986326e933f"},
-    {file = "msgpack-1.0.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a740fa0e4087a734455f0fc3abf5e746004c9da72fbd541e9b113013c8dc3282"},
-    {file = "msgpack-1.0.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:3055b0455e45810820db1f29d900bf39466df96ddca11dfa6d074fa47054376d"},
-    {file = "msgpack-1.0.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:a61215eac016f391129a013c9e46f3ab308db5f5ec9f25811e811f96962599a8"},
-    {file = "msgpack-1.0.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:362d9655cd369b08fda06b6657a303eb7172d5279997abe094512e919cf74b11"},
-    {file = "msgpack-1.0.5-cp39-cp39-win32.whl", hash = "sha256:ac9dd47af78cae935901a9a500104e2dea2e253207c924cc95de149606dc43cc"},
-    {file = "msgpack-1.0.5-cp39-cp39-win_amd64.whl", hash = "sha256:06f5174b5f8ed0ed919da0e62cbd4ffde676a374aba4020034da05fab67b9164"},
-    {file = "msgpack-1.0.5.tar.gz", hash = "sha256:c075544284eadc5cddc70f4757331d99dcbc16b2bbd4849d15f8aae4cf36d31c"},
-]
-
 [[package]]
 name = "multidict"
 version = "6.0.4"
@@ -1359,20 +1286,19 @@ files = [
 setuptools = "*"
 
 [[package]]
-name = "nonebot-adapter-onebot"
-version = "2.2.1"
-description = "OneBot(CQHTTP) adapter for nonebot2"
+name = "nonebot-adapter-ntchat"
+version = "0.3.5"
+description = "a wechat adapter for nonebot2"
 category = "main"
 optional = false
-python-versions = ">=3.8,<4.0"
+python-versions = ">=3.8"
 files = [
-    {file = "nonebot_adapter_onebot-2.2.1-py3-none-any.whl", hash = "sha256:db22c92a541f243ef427a7080096fb28751fec213bc75b111e2c9ed89e121d94"},
-    {file = "nonebot_adapter_onebot-2.2.1.tar.gz", hash = "sha256:2f77ff2345cc98e493c3bf00a5fd7112cf20e66ebeac062bbb8de56b4d07040e"},
+    {file = "nonebot-adapter-ntchat-0.3.5.tar.gz", hash = "sha256:52a19d9eeb71a534e5543f3804c5cb68997411f309d9b3c848f27f39de25301e"},
+    {file = "nonebot_adapter_ntchat-0.3.5-py3-none-any.whl", hash = "sha256:ee8851ac28b6463413066dc32ccae08f478df68c6b37e117d48c43698f5e5881"},
 ]
 
 [package.dependencies]
-msgpack = ">=1.0.3,<2.0.0"
-nonebot2 = ">=2.0.0-beta.3,<3.0.0"
+httpx = "0.23.0"
 
 [[package]]
 name = "nonebot-plugin-apscheduler"
@@ -1420,20 +1346,20 @@ websockets = ["websockets (>=10.0,<11.0)"]
 
 [[package]]
 name = "nonebug"
-version = "0.3.1"
+version = "0.2.3"
 description = "nonebot2 test framework"
 category = "dev"
 optional = false
 python-versions = ">=3.8,<4.0"
 files = [
-    {file = "nonebug-0.3.1-py3-none-any.whl", hash = "sha256:b33e93d486e3f187e890a516ad8d9432ea736e50b0270341ddc78fecfe080d5f"},
-    {file = "nonebug-0.3.1.tar.gz", hash = "sha256:96637bbdc406e7673e625492fbe928a9db467cd630d6fd04cfde0999f58f9a7a"},
+    {file = "nonebug-0.2.3-py3-none-any.whl", hash = "sha256:5c83bd885899b2857323fa19eff6bbc3f160729453b2f289d8305a99b7b95fc9"},
+    {file = "nonebug-0.2.3.tar.gz", hash = "sha256:3e59757b32b6b96cd8c36c4c9fd6050e611b1ffad058ec5fa82cba3f86495c61"},
 ]
 
 [package.dependencies]
 asgiref = ">=3.4.0,<4.0.0"
 async-asgi-testclient = ">=1.4.8,<2.0.0"
-nonebot2 = ">=2.0.0-rc.2,<3.0.0"
+nonebot2 = ">=2.0.0-beta.1,<3.0.0"
 pytest = ">=7.0.0,<8.0.0"
 typing-extensions = ">=4.0.0,<5.0.0"
 
@@ -2452,4 +2378,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.8.1"
-content-hash = "5de28f6fa03c9bf7e2207a3d3688e379c2c4aa7ed672718583c99f7f0907bc1c"
+content-hash = "c2a8ce5e8f1cc95b81fb90639eb323995941dd9bbd60372327e7e7067572e8c7"

pyproject.toml

@@ -18,7 +18,7 @@ extra_standard_library = ["typing_extensions"]
 asyncio_mode = "auto"
 
 [build-system]
-requires = ["poetry-core>=1.2.0"]
+requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
@@ -28,7 +28,7 @@ description = "基于HoshinoBot/NoneBot2/QQ官方频道/微信Bot的原神面板
 authors = ["KimigaiiWuyi <444835641@qq.com>"]
 license = "GPL-3.0-or-later"
 readme = "README.md"
-homepage = "https://github.com/KimigaiiWuyi/GenshinUID/tree/nonebot2-beta1"
+homepage = "https://github.com/KimigaiiWuyi/GenshinUID/tree/ntchat"
 repository = "https://github.com/KimigaiiWuyi/GenshinUID"
 documentation = "https://github.com/KimigaiiWuyi/GenshinUID/wiki"
 packages = [
@@ -42,7 +42,7 @@ exclude = ["tests", "deploy"]
 [tool.poetry.dependencies]
 python = "^3.8.1"
 nonebot2 = ">=2.0.0b4"
-nonebot-adapter-onebot = ">=2.1.1"
+nonebot-adapter-ntchat = ">=0.3.4"
 httpx = ">=0.23.0"
 beautifulsoup4 = ">=4.11.1"
 lxml = ">=4.9.2"
@@ -70,9 +70,7 @@ flake8 = "^6.0.0"
 black = "^22.12.0"
 isort = "^5.11.5"
 pre-commit = "^2.21.0"
-pycln = "^2.1.2"
-
-[tool.poetry.group.test.dependencies]
-nonebug = "^0.3.0"
+nonebug = "^0.2.2"
 pytest = "^7.2.0"
 pytest-asyncio = "^0.20.3"
+pycln = "^2.1.2"

requirements.txt

@@ -22,15 +22,14 @@ frozenlist==1.3.3 ; python_full_version >= "3.8.1" and python_full_version < "4.
 gitdb==4.0.10 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 gitpython==3.1.31 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 greenlet==2.0.2 ; python_full_version >= "3.8.1" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_full_version < "4.0.0"
-h11==0.14.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-httpcore==0.16.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-httpx==0.23.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+h11==0.12.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+httpcore==0.15.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+httpx==0.23.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 idna==3.4 ; python_full_version >= "3.8.1" and python_version < "4.0"
 loguru==0.6.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
 lxml==4.9.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-msgpack==1.0.5 ; python_full_version >= "3.8.1" and python_version < "4.0"
 multidict==6.0.4 ; python_full_version >= "3.8.1" and python_version < "4.0"
-nonebot-adapter-onebot==2.2.1 ; python_full_version >= "3.8.1" and python_version < "4.0"
+nonebot-adapter-ntchat==0.3.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 nonebot-plugin-apscheduler==0.2.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
 nonebot2==2.0.0rc3 ; python_full_version >= "3.8.1" and python_version < "4.0"
 openpyxl==3.1.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"

tests/.env.test

@@ -1,5 +1,4 @@
 LOG_LEVEL=TRACE
 NICKNAME=["test"]
-SUPERUSERS=["onebot:10000","10001","other:10002","abcdef"]
+SUPERUSERS=["10000"]
 COMMAND_START=["", "/"]
-DRIVER="~none"

tests/conftest.py

@@ -1,23 +1,34 @@
+from typing import TYPE_CHECKING, Optional
+
 import pytest
+
+if TYPE_CHECKING:
+    from nonebot.plugin import Plugin
+
+
+@pytest.fixture
+def load_metadata(nonebug_init: None) -> Optional["Plugin"]:
     import nonebot
-from nonebug import NONEBOT_INIT_KWARGS
-from nonebot.adapters.onebot.v11 import Adapter
 
-PLUGINS = ["meta", "adv", "etcimg", "guide"]
+    return nonebot.load_plugin("GenshinUID.genshinuid_meta")
 
 
-@pytest.fixture(scope="session", autouse=True)
-def load_bot():
-    driver = nonebot.get_driver()
-    driver.register_adapter(Adapter)
+@pytest.fixture
+def load_adv(nonebug_init: None) -> Optional["Plugin"]:
+    import nonebot
 
-    nonebot.load_all_plugins(
-        [f"GenshinUID.genshinuid_{name}" for name in PLUGINS], []
-    )
+    return nonebot.load_plugin("GenshinUID.genshinuid_adv")
 
 
-def pytest_configure(config: pytest.Config):
-    config.stash[NONEBOT_INIT_KWARGS] = {
-        "genshinuid_disabled_plugins": {"xkdata", "abyss", "adv"},
-        "genshinuid_priority": 5,
-    }
+@pytest.fixture
+def load_etc(nonebug_init: None) -> Optional["Plugin"]:
+    import nonebot
+
+    return nonebot.load_plugin("GenshinUID.genshinuid_etcimg")
+
+
+@pytest.fixture
+def load_guide(nonebug_init: None) -> Optional["Plugin"]:
+    import nonebot
+
+    return nonebot.load_plugin("GenshinUID.genshinuid_guide")

tests/test_adv.py

@@ -6,18 +6,12 @@ MESSAGE = """「安柏」
 推荐5★武器：阿莫斯之弓、天空之翼、终末嗟叹之诗
 推荐4★武器：绝弦
 推荐圣遗物搭配：
-[昔日宗室之仪]四件套
--=-=-=-=-=-=-=-=-=-
-备注：
-原神御三家之一，必胜客联动看板角色之一；
-身份西风骑士团侦查骑士，蒙德飞行冠军，柏菈图的拼图（误）；
-人送外号解谜点火真君/打火姬
-通常情况下，安柏的大世界解谜意义大于其深渊实战意义，建议根据实际需求选择投入资源培养"""
+[昔日宗室之仪]四件套"""
 
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize(argnames="alias", argvalues=["安柏用什么", "安柏怎么养"])
-async def test_adv_char_chat(app: App, alias):
+async def test_adv_char_chat(app: App, alias, load_adv: None):
     from utils import make_event
     from nonebot.adapters.onebot.v11 import Bot, Message
 

tests/test_base.py

@@ -1,8 +0,0 @@
-from nonebug import App
-
-
-def test_config(app: App):
-    from GenshinUID import config
-
-    assert config.config.disabled_plugins == {"xkdata", "abyss", "adv"}
-    assert config.priority == 5

tests/test_etc.py

@@ -6,7 +6,7 @@ from nonebug import App
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize(argnames="alias", argvalues=["版本规划", "原石预估"])
-async def test_get_primogems_data(app: App, alias):
+async def test_get_primogems_data(app: App, alias, load_etc: None):
     from utils import make_event
     from nonebot.adapters.onebot.v11 import Bot, Message, MessageSegment
 
@@ -37,7 +37,7 @@ async def test_get_primogems_data(app: App, alias):
 
 
 @pytest.mark.asyncio
-async def test_primogems_version(app: App):
+async def test_primogems_version(app: App, load_etc: None):
     from utils import make_event
     from nonebot.adapters.onebot.v11 import Bot, Message, MessageSegment
 
@@ -68,7 +68,7 @@ async def test_primogems_version(app: App):
 
 
 @pytest.mark.asyncio
-async def test_primogems_failed(app: App):
+async def test_primogems_failed(app: App, load_etc: None):
     from utils import make_event
     from nonebot.adapters.onebot.v11 import Bot, Message
 
@@ -100,7 +100,7 @@ async def test_primogems_failed(app: App):
         "伤害乘区",
     ],
 )
-async def test_get_img_data(app: App, alias):
+async def test_get_img_data(app: App, alias, load_etc: None):
     from utils import make_event
     from nonebot.adapters.onebot.v11 import Bot, Message, MessageSegment
 

tests/test_guide.py

@@ -3,72 +3,72 @@ from pathlib import Path
 import pytest
 from nonebug import App
 
-# TODO: update guide tests
-# @pytest.mark.asyncio
-# @pytest.mark.parametrize(
-#     argnames="alias",
-#     argvalues=[
-#         "钟离推荐",
-#         "钟离攻略",
-#         "岩王爷攻略",  # alias
-#     ],
-# )
-# async def test_get_guide_pic(app: App, alias ):
-#     from utils import make_event
-#     from nonebot.adapters.onebot.v11 import Bot, Message, MessageSegment
 
-#     from GenshinUID.genshinuid_guide import get_guide_pic
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    argnames="alias",
+    argvalues=[
+        "钟离推荐",
+        "钟离攻略",
+        "岩王爷攻略",  # alias
+    ],
+)
+async def test_get_guide_pic(app: App, alias, load_guide: None):
+    from utils import make_event
+    from nonebot.adapters.onebot.v11 import Bot, Message, MessageSegment
 
-#     async with app.test_matcher(get_guide_pic) as ctx:
-#         bot = ctx.create_bot(base=Bot)
+    from GenshinUID.genshinuid_guide import get_guide_pic
 
-#         event = make_event(message=Message(alias))
-#         ctx.receive_event(bot, event)
-#         ctx.should_call_send(
-#             event,
-#             MessageSegment.image(
-#                 "https://file.microgg.cn/MiniGG/guide/钟离.jpg"
-#             ),
-#             True,
-#         )
-#         ctx.should_finished()
+    async with app.test_matcher(get_guide_pic) as ctx:
+        bot = ctx.create_bot(base=Bot)
+
+        event = make_event(message=Message(alias))
+        ctx.receive_event(bot, event)
+        ctx.should_call_send(
+            event,
+            MessageSegment.image(
+                "https://file.microgg.cn/MiniGG/guide/钟离.jpg"
+            ),
+            True,
+        )
+        ctx.should_finished()
 
 
-# @pytest.mark.asyncio
-# async def test_get_guide_pic_traveler(app: App ):
-#     from utils import make_event
-#     from nonebot.adapters.onebot.v11 import Bot, Message, MessageSegment
+@pytest.mark.asyncio
+async def test_get_guide_pic_traveler(app: App, load_guide: None):
+    from utils import make_event
+    from nonebot.adapters.onebot.v11 import Bot, Message, MessageSegment
 
-#     from GenshinUID.genshinuid_guide import get_guide_pic
+    from GenshinUID.genshinuid_guide import get_guide_pic
 
-#     async with app.test_matcher(get_guide_pic) as ctx:
-#         bot = ctx.create_bot(base=Bot)
+    async with app.test_matcher(get_guide_pic) as ctx:
+        bot = ctx.create_bot(base=Bot)
 
-#         event = make_event(message=Message("旅行者风推荐"))
-#         ctx.receive_event(bot, event)
-#         ctx.should_call_send(
-#             event,
-#             MessageSegment.image(
-#                 "https://file.microgg.cn/MiniGG/guide/旅行者-风.jpg"
-#             ),
-#             True,
-#         )
-#         ctx.should_finished()
+        event = make_event(message=Message("旅行者风推荐"))
+        ctx.receive_event(bot, event)
+        ctx.should_call_send(
+            event,
+            MessageSegment.image(
+                "https://file.microgg.cn/MiniGG/guide/旅行者-风.jpg"
+            ),
+            True,
+        )
+        ctx.should_finished()
 
 
-# @pytest.mark.asyncio
-# async def test_get_guide_pic_failed(app: App ):
-#     from utils import make_event
-#     from nonebot.adapters.onebot.v11 import Bot, Message
+@pytest.mark.asyncio
+async def test_get_guide_pic_failed(app: App, load_guide: None):
+    from utils import make_event
+    from nonebot.adapters.onebot.v11 import Bot, Message
 
-#     from GenshinUID.genshinuid_guide import get_guide_pic
+    from GenshinUID.genshinuid_guide import get_guide_pic
 
-#     async with app.test_matcher(get_guide_pic) as ctx:
-#         bot = ctx.create_bot(base=Bot)
+    async with app.test_matcher(get_guide_pic) as ctx:
+        bot = ctx.create_bot(base=Bot)
 
-#         event = make_event(message=Message("蔡徐坤攻略"))
-#         ctx.receive_event(bot, event)
-#         ctx.should_finished()
+        event = make_event(message=Message("蔡徐坤攻略"))
+        ctx.receive_event(bot, event)
+        ctx.should_finished()
 
 
 @pytest.mark.asyncio
@@ -79,7 +79,7 @@ from nonebug import App
         "参考面板岩王爷",  # alias
     ],
 )
-async def test_get_bluekun_pic(app: App, alias):
+async def test_get_bluekun_pic(app: App, alias, load_guide: None):
     from utils import make_event
     from nonebot.adapters.onebot.v11 import Bot, Message, MessageSegment
 
@@ -104,7 +104,7 @@ async def test_get_bluekun_pic(app: App, alias):
         "冰",
     ],
 )
-async def test_get_bluekun_pic_element(app: App, alias):
+async def test_get_bluekun_pic_element(app: App, alias, load_guide: None):
     from utils import make_event
     from nonebot.adapters.onebot.v11 import Bot, Message, MessageSegment
 

tests/test_metadata.py

@@ -3,7 +3,7 @@ from nonebug import App
 
 
 @pytest.mark.asyncio
-async def test_metadata(app: App):
+async def test_metadata(app: App, load_metadata: None):
     from GenshinUID.genshinuid_meta import __plugin_meta__
 
     assert __plugin_meta__.name == 'GenshinUID'
@@ -13,7 +13,7 @@ async def test_metadata(app: App):
 
 
 @pytest.mark.asyncio
-async def test_register_menu(app: App):
+async def test_register_menu(app: App, load_metadata: None):
     from GenshinUID.genshinuid_meta import sub_menus, register_menu
 
     @register_menu(
@@ -26,11 +26,10 @@ async def test_register_menu(app: App):
     async def _example() -> None:
         pass
 
-    menu = {
-        "func": "test",
-        "trigger_condition": "trigger",
-        "trigger_method": "114514",
-        "brief_des": "test register_menu",
-        "detail_des": "test register_menu",
-    }
-    assert menu in sub_menus
+    assert len(sub_menus) == 1
+    menu = sub_menus[0]
+    assert menu['func'] == 'test'
+    assert menu['trigger_condition'] == 'trigger'
+    assert menu['trigger_method'] == '114514'
+    assert menu['brief_des'] == 'test register_menu'
+    assert menu['detail_des'] == 'test register_menu'

tests/test_utils/test_nonebot2.py

@@ -1,9 +0,0 @@
-from nonebug import App
-
-
-def test_get_superusers(app: App):
-    from GenshinUID.utils.nonebot2.utils import get_superusers
-
-    superusers = get_superusers()
-    assert len(superusers) == 2
-    assert set(superusers) == {10000, 10001}

tests/utils.py

@@ -104,5 +104,6 @@ def make_event(
                 "anonymous": anonymous,
                 **kwargs,
             },
+            str(self_id),
         ),
     )