From 86c53da0d2b0e0fef504568f2d8b219e0b8332c3 Mon Sep 17 00:00:00 2001 From: baiqwerdvd <158065462+baiqwerdvd@users.noreply.github.com> Date: Thu, 5 Jun 2025 11:17:00 +0800 Subject: [PATCH] 111 --- ArknightsUID/arknightsuid_ann/__init__.py | 10 +++++----- ArknightsUID/arknightsuid_ap/__init__.py | 12 ++++++------ ArknightsUID/arknightsuid_charsnapshot/__init__.py | 2 +- ArknightsUID/arknightsuid_gacha/__init__.py | 2 +- ArknightsUID/arknightsuid_help/__init__.py | 2 +- ArknightsUID/arknightsuid_login/__init__.py | 2 +- ArknightsUID/arknightsuid_mind/__init__.py | 2 +- ArknightsUID/arknightsuid_roleinfo/__init__.py | 2 +- .../arknightsuid_server_update_check/__init__.py | 4 ++-- ArknightsUID/arknightsuid_signin/__init__.py | 4 ++-- ArknightsUID/arknightsuid_user/__init__.py | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ArknightsUID/arknightsuid_ann/__init__.py b/ArknightsUID/arknightsuid_ann/__init__.py index fe7cb50..752eaf7 100644 --- a/ArknightsUID/arknightsuid_ann/__init__.py +++ b/ArknightsUID/arknightsuid_ann/__init__.py @@ -23,7 +23,7 @@ task_name_ann = "订阅明日方舟公告" ann_minute_check: int = ArkConfig.get_config("AnnMinuteCheck").data -@sv_ann.on_command(f"{PREFIX}公告") +@sv_ann.on_command(f"公告") async def ann_(bot: Bot, ev: Event): cid = ev.text @@ -40,13 +40,13 @@ async def ann_(bot: Bot, ev: Event): await bot.send(msg) -@sv_ann.on_command(f"{PREFIX}强制刷新全部公告") +@sv_ann.on_command(f"强制刷新全部公告") async def force_ann_(bot: Bot, ev: Event): data = await check_bulletin_update() await bot.send(f"成功刷新{len(data)}条公告!") -@sv_ann.on_command(f"{PREFIX}获取当前Android公告列表") +@sv_ann.on_command(f"获取当前Android公告列表") async def get_ann_list_(bot: Bot, ev: Event): async with aiohttp.ClientSession() as session: async with session.get("https://ak-webview.hypergryph.com/api/game/bulletinList?target=Android") as response: @@ -61,7 +61,7 @@ async def get_ann_list_(bot: Bot, ev: Event): await bot.send(msg) -@sv_ann_sub.on_fullmatch(f"{PREFIX}订阅公告") +@sv_ann_sub.on_fullmatch(f"订阅公告") async def sub_ann_(bot: Bot, ev: Event): if ev.group_id is None: return await bot.send("请在群聊中订阅") @@ -82,7 +82,7 @@ async def sub_ann_(bot: Bot, ev: Event): await bot.send("成功订阅明日方舟公告!") -@sv_ann_sub.on_fullmatch((f"{PREFIX}取消订阅公告", f"{PREFIX}取消公告", f"{PREFIX}退订公告")) +@sv_ann_sub.on_fullmatch((f"取消订阅公告", f"取消公告", f"退订公告")) async def unsub_ann_(bot: Bot, ev: Event): if ev.group_id is None: return await bot.send("请在群聊中取消订阅") diff --git a/ArknightsUID/arknightsuid_ap/__init__.py b/ArknightsUID/arknightsuid_ap/__init__.py index 9ac73f9..cab43ef 100644 --- a/ArknightsUID/arknightsuid_ap/__init__.py +++ b/ArknightsUID/arknightsuid_ap/__init__.py @@ -16,7 +16,7 @@ sv_get_ap = SV("ark查询体力") sv_get_ap_admin = SV("ark强制推送", pm=1) -@sv_get_ap_admin.on_fullmatch((f"{PREFIX}强制推送体力提醒")) # noqa: UP034 +@sv_get_ap_admin.on_fullmatch((f"强制推送体力提醒")) # noqa: UP034 async def force_notice_job(bot: Bot, ev: Event): await bot.logger.info("开始执行[ark强制推送体力信息]") await ark_notice_job() @@ -50,11 +50,11 @@ async def ark_notice_job(): @sv_get_ap.on_fullmatch( ( - f"{PREFIX}每日", - f"{PREFIX}mr", - f"{PREFIX}实时便笺", - f"{PREFIX}便笺", - f"{PREFIX}便签", + f"每日", + f"mr", + f"实时便笺", + f"便笺", + f"便签", ) ) async def send_daily_info_pic(bot: Bot, ev: Event): diff --git a/ArknightsUID/arknightsuid_charsnapshot/__init__.py b/ArknightsUID/arknightsuid_charsnapshot/__init__.py index cf30156..90c0ae4 100644 --- a/ArknightsUID/arknightsuid_charsnapshot/__init__.py +++ b/ArknightsUID/arknightsuid_charsnapshot/__init__.py @@ -9,7 +9,7 @@ from .get_char_snapshot import get_char_snapshot sv_get_char_snapshot = SV("ark角色快照") -@sv_get_char_snapshot.on_command(f"{PREFIX}角色快照") +@sv_get_char_snapshot.on_command(f"角色快照") async def send_char_snapshot(bot: Bot, ev: Event): user_id = ev.at if ev.at else ev.user_id uid = await ArknightsBind.get_uid_by_game(user_id, ev.bot_id) diff --git a/ArknightsUID/arknightsuid_gacha/__init__.py b/ArknightsUID/arknightsuid_gacha/__init__.py index 34633bf..7c3a940 100644 --- a/ArknightsUID/arknightsuid_gacha/__init__.py +++ b/ArknightsUID/arknightsuid_gacha/__init__.py @@ -9,7 +9,7 @@ from .gacha import gacha sv_ark_gacha = SV("ark十连") -@sv_ark_gacha.on_fullmatch(f"{PREFIX}十连") +@sv_ark_gacha.on_fullmatch(f"十连") async def send_gacha_info(bot: Bot, ev: Event): user_id = ev.at if ev.at else ev.user_id uid = await ArknightsBind.get_uid_by_game(user_id, ev.bot_id) diff --git a/ArknightsUID/arknightsuid_help/__init__.py b/ArknightsUID/arknightsuid_help/__init__.py index 9846275..8e6befd 100644 --- a/ArknightsUID/arknightsuid_help/__init__.py +++ b/ArknightsUID/arknightsuid_help/__init__.py @@ -9,7 +9,7 @@ from .get_help import get_core_help sv_ark_help = SV("ark帮助") -@sv_ark_help.on_fullmatch((f"{PREFIX}帮助")) # noqa: UP034 +@sv_ark_help.on_fullmatch((f"帮助")) # noqa: UP034 async def send_help_img(bot: Bot, ev: Event): logger.info("开始执行[ark帮助]") im = await get_core_help() diff --git a/ArknightsUID/arknightsuid_login/__init__.py b/ArknightsUID/arknightsuid_login/__init__.py index 1e398e3..5063805 100644 --- a/ArknightsUID/arknightsuid_login/__init__.py +++ b/ArknightsUID/arknightsuid_login/__init__.py @@ -16,7 +16,7 @@ from .login import SklandLogin sv_skland_login = SV("ark森空岛登录") -@sv_skland_login.on_prefix(f"{PREFIX}森空岛登录") +@sv_skland_login.on_prefix(f"森空岛登录") async def get_resp_msg(bot: Bot, ev: Event): uid_list = await ArknightsBind.get_uid_list_by_game(ev.user_id, ev.bot_id) if uid_list is None: diff --git a/ArknightsUID/arknightsuid_mind/__init__.py b/ArknightsUID/arknightsuid_mind/__init__.py index 908a782..40005ee 100644 --- a/ArknightsUID/arknightsuid_mind/__init__.py +++ b/ArknightsUID/arknightsuid_mind/__init__.py @@ -23,7 +23,7 @@ # sv_get_version_admin = SV('ark推送版本更新', pm=1) -# @sv_get_version_admin.on_fullmatch((f'{PREFIX}开启推送版本更新')) +# @sv_get_version_admin.on_fullmatch((f'开启推送版本更新')) # async def force_version_job(bot: Bot, ev: Event): # await bot.logger.info('开始执行[ark推送版本更新]') # await ark_version_job() diff --git a/ArknightsUID/arknightsuid_roleinfo/__init__.py b/ArknightsUID/arknightsuid_roleinfo/__init__.py index fdd6108..f512d83 100644 --- a/ArknightsUID/arknightsuid_roleinfo/__init__.py +++ b/ArknightsUID/arknightsuid_roleinfo/__init__.py @@ -10,7 +10,7 @@ from .draw_roleinfo_card import get_role_img sv_get_info = SV("ark查询信息") -@sv_get_info.on_command((f"{PREFIX}uid")) # noqa: UP034 +@sv_get_info.on_command((f"uid")) # noqa: UP034 async def send_role_info(bot: Bot, ev: Event): uid = await get_uid(bot, ev, bind_model=ArknightsBind) if uid is None: diff --git a/ArknightsUID/arknightsuid_server_update_check/__init__.py b/ArknightsUID/arknightsuid_server_update_check/__init__.py index 4d9a9f8..24934c2 100644 --- a/ArknightsUID/arknightsuid_server_update_check/__init__.py +++ b/ArknightsUID/arknightsuid_server_update_check/__init__.py @@ -90,7 +90,7 @@ async def get_latest_version(bot: Bot, ev: Event): await bot.send(f"clientVersion: {result.version.clientVersion}\nresVersion: {result.version.resVersion}") -@sv_server_check_sub.on_fullmatch(f"{PREFIX}订阅版本更新") +@sv_server_check_sub.on_fullmatch(f"订阅版本更新") async def sub_ann_(bot: Bot, ev: Event): if ev.group_id is None: return await bot.send("请在群聊中订阅") @@ -167,7 +167,7 @@ async def get_game_server_status(bot: Bot, ev: Event): await bot.send(f"明日方舟服务器状态: {server_status}") -@sv_game_server_check_sub.on_fullmatch(f"{PREFIX}订阅服务器状态更新") +@sv_game_server_check_sub.on_fullmatch(f"订阅服务器状态更新") async def sub_game_server_status(bot: Bot, ev: Event): if ev.group_id is None: return await bot.send("请在群聊中订阅") diff --git a/ArknightsUID/arknightsuid_signin/__init__.py b/ArknightsUID/arknightsuid_signin/__init__.py index 6f26802..65e37f0 100644 --- a/ArknightsUID/arknightsuid_signin/__init__.py +++ b/ArknightsUID/arknightsuid_signin/__init__.py @@ -28,7 +28,7 @@ async def ark_sign_at_night(): # 群聊内 签到 功能 -@sv_sign.on_fullmatch(f"{PREFIX}签到") +@sv_sign.on_fullmatch(f"签到") async def get_sign_func(bot: Bot, ev: Event): await bot.logger.info(f"[ARK签到]QQ号: {ev.user_id}") ark_uid = await get_uid(bot, ev, bind_model=ArknightsBind) @@ -39,7 +39,7 @@ async def get_sign_func(bot: Bot, ev: Event): return None -@sv_sign_config.on_fullmatch(f"{PREFIX}全部重签") +@sv_sign_config.on_fullmatch(f"全部重签") async def recheck(bot: Bot, ev: Event): await bot.logger.info("开始执行[ARK全部重签]") await bot.send("已开始执行") diff --git a/ArknightsUID/arknightsuid_user/__init__.py b/ArknightsUID/arknightsuid_user/__init__.py index 532dc58..f628de0 100644 --- a/ArknightsUID/arknightsuid_user/__init__.py +++ b/ArknightsUID/arknightsuid_user/__init__.py @@ -18,7 +18,7 @@ ark_skd_cred_add = SV("森空岛cred绑定") # sv_user_help = SV('ark绑定帮助') -# @sv_user_info.on_fullmatch((f'{PREFIX}绑定信息')) +# @sv_user_info.on_fullmatch((f'绑定信息')) # async def send_bind_card(bot: Bot, ev: Event): # await bot.logger.info('ark开始执行[查询用户绑定状态]') # uid_list = await get_user_card(ev.bot_id, ev.user_id) @@ -26,7 +26,7 @@ ark_skd_cred_add = SV("森空岛cred绑定") # await bot.send(uid_list) -@sv_user_info.on_command((f"{PREFIX}绑定uid", f"{PREFIX}切换uid", f"{PREFIX}删除uid", f"{PREFIX}解绑uid")) +@sv_user_info.on_command((f"绑定uid", f"切换uid", f"删除uid", f"解绑uid")) async def send_link_uid_msg(bot: Bot, ev: Event): await bot.logger.info("开始执行[绑定/解绑用户信息]") qid = ev.user_id