From c1a198d6e47b51d08682a7cafa541f752c667b67 Mon Sep 17 00:00:00 2001 From: KimigaiiWuyi <444835641@qq.com> Date: Mon, 7 Oct 2024 06:26:34 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A5=20=E5=B0=86`sr`=E5=89=8D=E7=BC=80?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E8=87=B3core=E6=9D=A5=E7=AE=A1=E7=90=86=20(G?= =?UTF-8?q?enshin-bots/gsuid=5Fcore#76)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- StarRailUID/__init__.py | 5 +++ StarRailUID/starrailuid_abyss/__init__.py | 13 ++++---- .../starrailuid_abyss_boss/__init__.py | 13 ++++---- .../starrailuid_abyss_story/__init__.py | 17 +++++----- StarRailUID/starrailuid_calc/__init__.py | 15 ++++----- StarRailUID/starrailuid_charinfo/__init__.py | 18 ++++++----- StarRailUID/starrailuid_config/__init__.py | 8 +++-- StarRailUID/starrailuid_gachalog/__init__.py | 10 +++--- .../starrailuid_gachalog/get_gachalogs.py | 5 ++- StarRailUID/starrailuid_help/__init__.py | 6 ++-- StarRailUID/starrailuid_help/get_help.py | 6 ++-- StarRailUID/starrailuid_help/help.json | 8 +++++ StarRailUID/starrailuid_note/__init__.py | 13 ++++---- StarRailUID/starrailuid_resource/__init__.py | 9 +++--- StarRailUID/starrailuid_rogue/__init__.py | 31 +++++++++---------- StarRailUID/starrailuid_roleinfo/__init__.py | 13 ++++---- StarRailUID/starrailuid_signin/__init__.py | 19 ++++++------ StarRailUID/starrailuid_stamina/__init__.py | 15 +++++---- StarRailUID/starrailuid_user/__init__.py | 19 +++++++----- StarRailUID/starrailuid_wiki/__init__.py | 12 +++---- 20 files changed, 133 insertions(+), 122 deletions(-) diff --git a/StarRailUID/__init__.py b/StarRailUID/__init__.py index e69de29..72badbd 100644 --- a/StarRailUID/__init__.py +++ b/StarRailUID/__init__.py @@ -0,0 +1,5 @@ +from gsuid_core.sv import Plugins + +Plugins( + name="StarRailUID", force_prefix=['sr'], allow_empty_prefix=False +) diff --git a/StarRailUID/starrailuid_abyss/__init__.py b/StarRailUID/starrailuid_abyss/__init__.py index 23f16da..bf6d35d 100644 --- a/StarRailUID/starrailuid_abyss/__init__.py +++ b/StarRailUID/starrailuid_abyss/__init__.py @@ -1,24 +1,23 @@ import re +from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event -from gsuid_core.sv import SV from gsuid_core.utils.database.api import get_uid -from gsuid_core.utils.database.models import GsBind from gsuid_core.utils.error_reply import UID_HINT +from gsuid_core.utils.database.models import GsBind from .draw_abyss_card import draw_abyss_img -from ..utils.sr_prefix import PREFIX sv_srabyss = SV("sr查询深渊") @sv_srabyss.on_command( ( - f"{PREFIX}查询深渊", - f"{PREFIX}查询上期深渊", - f"{PREFIX}上期深渊", - f"{PREFIX}深渊", + "查询深渊", + "查询上期深渊", + "上期深渊", + "深渊", ), block=True, ) diff --git a/StarRailUID/starrailuid_abyss_boss/__init__.py b/StarRailUID/starrailuid_abyss_boss/__init__.py index b23ccdc..8f50bb4 100644 --- a/StarRailUID/starrailuid_abyss_boss/__init__.py +++ b/StarRailUID/starrailuid_abyss_boss/__init__.py @@ -1,24 +1,23 @@ import re +from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event -from gsuid_core.sv import SV from gsuid_core.utils.database.api import get_uid -from gsuid_core.utils.database.models import GsBind from gsuid_core.utils.error_reply import UID_HINT +from gsuid_core.utils.database.models import GsBind from .draw_abyss_card import draw_abyss_img -from ..utils.sr_prefix import PREFIX sv_abyss_boss = SV("sr查询末日幻影") @sv_abyss_boss.on_command( ( - f"{PREFIX}查询末日幻影", - f"{PREFIX}查询上期末日幻影", - f"{PREFIX}上期末日", - f"{PREFIX}末日", + "查询末日幻影", + "查询上期末日幻影", + "上期末日", + "末日", ), block=True, ) diff --git a/StarRailUID/starrailuid_abyss_story/__init__.py b/StarRailUID/starrailuid_abyss_story/__init__.py index 8fa498f..3437de0 100644 --- a/StarRailUID/starrailuid_abyss_story/__init__.py +++ b/StarRailUID/starrailuid_abyss_story/__init__.py @@ -1,26 +1,25 @@ import re +from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event -from gsuid_core.sv import SV from gsuid_core.utils.database.api import get_uid -from gsuid_core.utils.database.models import GsBind from gsuid_core.utils.error_reply import UID_HINT +from gsuid_core.utils.database.models import GsBind from .draw_abyss_card import draw_abyss_img -from ..utils.sr_prefix import PREFIX sv_abyss_story = SV("sr查询虚构叙事") @sv_abyss_story.on_command( ( - f"{PREFIX}查询虚构叙事", - f"{PREFIX}xg", - f"{PREFIX}查询上期虚构叙事", - f"{PREFIX}sqxg", - f"{PREFIX}上期虚构", - f"{PREFIX}虚构", + "查询虚构叙事", + "xg", + "查询上期虚构叙事", + "sqxg", + "上期虚构", + "虚构", ), block=True, ) diff --git a/StarRailUID/starrailuid_calc/__init__.py b/StarRailUID/starrailuid_calc/__init__.py index 9b8b1cf..0c824f0 100644 --- a/StarRailUID/starrailuid_calc/__init__.py +++ b/StarRailUID/starrailuid_calc/__init__.py @@ -2,16 +2,12 @@ from typing import TYPE_CHECKING from gsuid_core.sv import SV from gsuid_core.utils.database.api import get_uid -from gsuid_core.utils.database.models import GsBind from gsuid_core.utils.error_reply import get_error +from gsuid_core.utils.database.models import GsBind -from ..utils.error_reply import UID_HINT from ..utils.mys_api import mys_api -from ..utils.name_covert import ( - alias_to_char_name, - name_to_avatar_id, -) -from ..utils.sr_prefix import PREFIX +from ..utils.error_reply import UID_HINT +from ..utils.name_covert import name_to_avatar_id, alias_to_char_name if TYPE_CHECKING: from gsuid_core.bot import Bot @@ -20,7 +16,7 @@ if TYPE_CHECKING: sv_char_calc = SV("sr养成计算") -@sv_char_calc.on_command(f"{PREFIX}养成计算", block=True) +@sv_char_calc.on_command("养成计算", block=True) async def send_char_calc_info(bot: "Bot", ev: "Event"): name = ev.text.strip() char_id = await name_to_avatar_id(name) @@ -41,6 +37,7 @@ async def send_char_calc_info(bot: "Bot", ev: "Event"): avatar_skills = avatar_detail.skills + avatar_detail.skills_other skill_list = [] for skill in avatar_skills: - skill_list.append(f"{skill.point_id}({skill.cur_level}/{skill.max_level})") + d = f"{skill.point_id}({skill.cur_level}/{skill.max_level})" + skill_list.append(d) return None diff --git a/StarRailUID/starrailuid_charinfo/__init__.py b/StarRailUID/starrailuid_charinfo/__init__.py index b8c989c..63345ca 100644 --- a/StarRailUID/starrailuid_charinfo/__init__.py +++ b/StarRailUID/starrailuid_charinfo/__init__.py @@ -1,31 +1,33 @@ -from pathlib import Path import re +from pathlib import Path from typing import Tuple, cast from PIL import Image -from gsuid_core.bot import Bot -from gsuid_core.message_models import Button -from gsuid_core.models import Event from gsuid_core.sv import SV +from gsuid_core.bot import Bot +from gsuid_core.models import Event +from gsuid_core.message_models import Button from gsuid_core.utils.database.api import get_uid from gsuid_core.utils.database.models import GsBind from gsuid_core.utils.image.convert import convert_img from starrail_damage_cal.map.SR_MAP_PATH import avatarId2Name -from .get_char_img import draw_char_info_img from .to_card import api_to_card from ..utils.error_reply import UID_HINT +from .get_char_img import draw_char_info_img from ..utils.resource.RESOURCE_PATH import TEMP_PATH -from ..utils.sr_prefix import PREFIX sv_char_info_config = SV("sr面板设置", pm=2) sv_get_char_info = SV("sr面板查询", priority=10) sv_get_sr_original_pic = SV("sr查看面板原图", priority=5) -@sv_get_char_info.on_prefix(f"{PREFIX}查询") +@sv_get_char_info.on_prefix("查询") async def send_char_info(bot: Bot, ev: Event): name = ev.text.strip() + if not name: + return + im = await _get_char_info(bot, ev, ev.text) if isinstance(im, str): await bot.send(im) @@ -81,7 +83,7 @@ async def _get_char_info(bot: Bot, ev: Event, text: str): return await draw_char_info_img(msg, uid) -@sv_get_char_info.on_command(f"{PREFIX}强制刷新") +@sv_get_char_info.on_command(("强制刷新", "刷新面板")) async def send_card_info(bot: Bot, ev: Event): uid = await get_uid(bot, ev, GsBind, "sr") if uid is None: diff --git a/StarRailUID/starrailuid_config/__init__.py b/StarRailUID/starrailuid_config/__init__.py index 3ebe184..77fb8f4 100644 --- a/StarRailUID/starrailuid_config/__init__.py +++ b/StarRailUID/starrailuid_config/__init__.py @@ -1,16 +1,18 @@ import re + from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.logger import logger from gsuid_core.utils.error_reply import UID_HINT from gsuid_core.utils.database.models import GsBind + from .set_config import set_push_value, set_config_func sv_self_config = SV("星铁配置") -@sv_self_config.on_prefix(("sr设置")) +@sv_self_config.on_prefix(("设置")) async def send_config_ev(bot: Bot, ev: Event): logger.info("开始执行[设置阈值信息]") uid = await GsBind.get_uid_by_game(ev.user_id, ev.bot_id, "sr") @@ -30,14 +32,14 @@ async def send_config_ev(bot: Bot, ev: Event): # 开启 自动签到 和 推送树脂提醒 功能 -@sv_self_config.on_prefix(("sr开启", "sr关闭")) +@sv_self_config.on_prefix(("开启", "关闭")) async def open_switch_func(bot: Bot, ev: Event): user_id = ev.user_id config_name = ev.text logger.info(f"[{user_id}]尝试[{ev.command[2:]}]了[{ev.text}]功能") - if ev.command == "sr开启": + if "开启" in ev.command: query = True gid = ev.group_id if ev.group_id else "on" else: diff --git a/StarRailUID/starrailuid_gachalog/__init__.py b/StarRailUID/starrailuid_gachalog/__init__.py index 327d338..a6c7b9d 100644 --- a/StarRailUID/starrailuid_gachalog/__init__.py +++ b/StarRailUID/starrailuid_gachalog/__init__.py @@ -1,13 +1,13 @@ +from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event -from gsuid_core.sv import SV from gsuid_core.utils.database.api import get_uid from gsuid_core.utils.database.models import GsBind -from .draw_gachalogs import draw_gachalogs_img -from .get_gachalogs import save_gachalogs -from ..utils.error_reply import UID_HINT from ..utils.sr_prefix import PREFIX +from ..utils.error_reply import UID_HINT +from .get_gachalogs import save_gachalogs +from .draw_gachalogs import draw_gachalogs_img sv_gacha_log = SV("sr抽卡记录") sv_get_gachalog_by_link = SV("sr导入抽卡链接", area="DIRECT") @@ -24,7 +24,7 @@ async def send_gacha_log_card_info(bot: Bot, ev: Event): return None -@sv_get_gachalog_by_link.on_command(f"{PREFIX}导入抽卡链接") +@sv_get_gachalog_by_link.on_command("导入抽卡链接") async def get_gachalog_by_link(bot: Bot, ev: Event): await bot.logger.info("开始执行[sr导入抽卡链接]") uid = await get_uid(bot, ev, GsBind, "sr", False, None) diff --git a/StarRailUID/starrailuid_gachalog/get_gachalogs.py b/StarRailUID/starrailuid_gachalog/get_gachalogs.py index eec23cf..aed59ae 100644 --- a/StarRailUID/starrailuid_gachalog/get_gachalogs.py +++ b/StarRailUID/starrailuid_gachalog/get_gachalogs.py @@ -22,7 +22,10 @@ gacha_type_meta_data = { async def get_new_gachalog_by_link( uid: str, gacha_url: str, full_data: Dict, is_force: bool ): - full_data = msgspec.convert(full_data, type=Dict[str, List[SingleGachaLog]]) + full_data = msgspec.convert( + full_data, + type=Dict[str, List[SingleGachaLog]], + ) temp = [] for gacha_name in gacha_type_meta_data: for gacha_type in gacha_type_meta_data[gacha_name]: diff --git a/StarRailUID/starrailuid_help/__init__.py b/StarRailUID/starrailuid_help/__init__.py index 710f6a0..6e01779 100644 --- a/StarRailUID/starrailuid_help/__init__.py +++ b/StarRailUID/starrailuid_help/__init__.py @@ -1,17 +1,17 @@ from PIL import Image -from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.logger import logger from gsuid_core.help.utils import register_help +from gsuid_core.sv import SV, get_plugin_available_prefix -from ..utils.sr_prefix import PREFIX from .get_help import ICON, get_help +PREFIX = get_plugin_available_prefix('StarRailUID') sv_sr_help = SV("sr帮助") -@sv_sr_help.on_fullmatch(f"{PREFIX}帮助") +@sv_sr_help.on_fullmatch("帮助") async def send_help_img(bot: Bot, ev: Event): logger.info("开始执行[sr帮助]") im = await get_help() diff --git a/StarRailUID/starrailuid_help/get_help.py b/StarRailUID/starrailuid_help/get_help.py index bc96c0c..95e0452 100644 --- a/StarRailUID/starrailuid_help/get_help.py +++ b/StarRailUID/starrailuid_help/get_help.py @@ -5,11 +5,11 @@ import aiofiles from PIL import Image from msgspec import json as msgjson from gsuid_core.help.model import PluginHelp +from gsuid_core.sv import get_plugin_available_prefix from gsuid_core.help.draw_new_plugin_help import get_new_help -from ..utils.image.image_tools import get_footer -from ..utils.sr_prefix import PREFIX from ..version import StarRailUID_version +from ..utils.image.image_tools import get_footer ICON = Path(__file__).parent.parent.parent / 'ICON.png' HELP_DATA = Path(__file__).parent / 'help.json' @@ -28,7 +28,7 @@ async def get_help(): plugin_info={f'v{StarRailUID_version}': ''}, plugin_icon=Image.open(ICON), plugin_help=await get_help_data(), - plugin_prefix=PREFIX, + plugin_prefix=get_plugin_available_prefix('StarRailUID'), help_mode='dark', banner_bg=Image.open(TEXT_PATH / 'banner_bg.jpg'), banner_sub_text='「愿此行, 终抵群星!」', diff --git a/StarRailUID/starrailuid_help/help.json b/StarRailUID/starrailuid_help/help.json index c419ff0..b6fa845 100644 --- a/StarRailUID/starrailuid_help/help.json +++ b/StarRailUID/starrailuid_help/help.json @@ -168,6 +168,14 @@ "need_ck": false, "need_sk": false, "need_admin": false + }, + { + "name": "养成计算", + "desc": "查询武器图鉴", + "eg": "养成计算 希儿", + "need_ck": false, + "need_sk": false, + "need_admin": false } ] }, diff --git a/StarRailUID/starrailuid_note/__init__.py b/StarRailUID/starrailuid_note/__init__.py index 1ea8e24..b766a4d 100644 --- a/StarRailUID/starrailuid_note/__init__.py +++ b/StarRailUID/starrailuid_note/__init__.py @@ -1,19 +1,18 @@ +from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event -from gsuid_core.sv import SV from gsuid_core.utils.database.api import get_uid from gsuid_core.utils.database.models import GsBind -from .draw_note_card import draw_note_img from .note_text import award from ..utils.error_reply import UID_HINT -from ..utils.sr_prefix import PREFIX +from .draw_note_card import draw_note_img sv_get_monthly_data = SV("sr查询月历") # 群聊内 每月统计 功能 -@sv_get_monthly_data.on_fullmatch(f"{PREFIX}每月统计") +@sv_get_monthly_data.on_fullmatch("每月统计") async def send_monthly_data(bot: Bot, ev: Event): sr_uid = await GsBind.get_uid_by_game(ev.user_id, ev.bot_id, "sr") if sr_uid is None: @@ -24,9 +23,9 @@ async def send_monthly_data(bot: Bot, ev: Event): @sv_get_monthly_data.on_fullmatch( ( - f"{PREFIX}开拓月历", - f"{PREFIX}zj", - f"{PREFIX}月历", + "开拓月历", + "zj", + "月历", ) ) async def send_monthly_pic(bot: Bot, ev: Event): diff --git a/StarRailUID/starrailuid_resource/__init__.py b/StarRailUID/starrailuid_resource/__init__.py index e296baa..07ef854 100644 --- a/StarRailUID/starrailuid_resource/__init__.py +++ b/StarRailUID/starrailuid_resource/__init__.py @@ -1,15 +1,14 @@ -from gsuid_core.bot import Bot -from gsuid_core.logger import logger -from gsuid_core.models import Event from gsuid_core.sv import SV +from gsuid_core.bot import Bot +from gsuid_core.models import Event +from gsuid_core.logger import logger from ..utils.resource.download_all_file import check_use -from ..utils.sr_prefix import PREFIX sv_sr_download_config = SV("sr下载资源", pm=1) -@sv_sr_download_config.on_fullmatch(f"{PREFIX}下载全部资源") +@sv_sr_download_config.on_fullmatch("下载全部资源") async def send_download_resource_msg(bot: Bot, ev: Event): await bot.send("sr正在开始下载~可能需要较久的时间!") im = await check_use() diff --git a/StarRailUID/starrailuid_rogue/__init__.py b/StarRailUID/starrailuid_rogue/__init__.py index 1e394b6..2f0674f 100644 --- a/StarRailUID/starrailuid_rogue/__init__.py +++ b/StarRailUID/starrailuid_rogue/__init__.py @@ -1,14 +1,13 @@ import re +from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event -from gsuid_core.sv import SV from gsuid_core.utils.database.api import get_uid -from gsuid_core.utils.database.models import GsBind from gsuid_core.utils.error_reply import UID_HINT +from gsuid_core.utils.database.models import GsBind from .draw_rogue_card import draw_rogue_img, draw_rogue_locust_img -from ..utils.sr_prefix import PREFIX sv_srabyss = SV("sr查询模拟宇宙") sv_srabyss_locust = SV("sr查询寰宇蝗灾") @@ -16,15 +15,15 @@ sv_srabyss_locust = SV("sr查询寰宇蝗灾") @sv_srabyss.on_command( ( - f"{PREFIX}查询宇宙", - f"{PREFIX}yz", - f"{PREFIX}查询上期宇宙", - f"{PREFIX}sqyz", - f"{PREFIX}上期宇宙", - f"{PREFIX}宇宙", - f"{PREFIX}查询模拟宇宙", - f"{PREFIX}上期模拟宇宙", - f"{PREFIX}查询上期模拟宇宙", + "查询宇宙", + "yz", + "查询上期宇宙", + "sqyz", + "上期宇宙", + "宇宙", + "查询模拟宇宙", + "上期模拟宇宙", + "查询上期模拟宇宙", ), block=True, ) @@ -68,10 +67,10 @@ async def send_srabyss_info(bot: Bot, ev: Event): @sv_srabyss_locust.on_command( ( - f"{PREFIX}寰宇蝗灾", - f"{PREFIX}hyhz", - f"{PREFIX}查询寰宇蝗灾", - f"{PREFIX}sqhyhz", + "寰宇蝗灾", + "hyhz", + "查询寰宇蝗灾", + "sqhyhz", ), block=True, ) diff --git a/StarRailUID/starrailuid_roleinfo/__init__.py b/StarRailUID/starrailuid_roleinfo/__init__.py index 233e2ae..d90e246 100644 --- a/StarRailUID/starrailuid_roleinfo/__init__.py +++ b/StarRailUID/starrailuid_roleinfo/__init__.py @@ -1,20 +1,19 @@ import re -from gsuid_core.bot import Bot -from gsuid_core.logger import logger -from gsuid_core.models import Event from gsuid_core.sv import SV +from gsuid_core.bot import Bot +from gsuid_core.models import Event +from gsuid_core.logger import logger from gsuid_core.utils.database.api import get_uid from gsuid_core.utils.database.models import GsBind -from .draw_roleinfo_card import get_detail_img, get_role_img from ..utils.error_reply import UID_HINT -from ..utils.sr_prefix import PREFIX +from .draw_roleinfo_card import get_role_img, get_detail_img sv_get_info = SV("sr查询信息") -@sv_get_info.on_command(f"{PREFIX}uid") +@sv_get_info.on_command(("uid", "查询")) async def send_role_info(bot: Bot, ev: Event): name = "".join(re.findall("[\u4e00-\u9fa5]", ev.text)) if name: @@ -30,7 +29,7 @@ async def send_role_info(bot: Bot, ev: Event): return None -@sv_get_info.on_command(f"{PREFIX}练度统计") +@sv_get_info.on_command(("练度统计", "角色列表")) async def send_detail_info(bot: Bot, ev: Event): name = "".join(re.findall("[\u4e00-\u9fa5]", ev.text)) if name: diff --git a/StarRailUID/starrailuid_signin/__init__.py b/StarRailUID/starrailuid_signin/__init__.py index 991a887..03965b5 100644 --- a/StarRailUID/starrailuid_signin/__init__.py +++ b/StarRailUID/starrailuid_signin/__init__.py @@ -1,15 +1,14 @@ -from gsuid_core.aps import scheduler -from gsuid_core.bot import Bot -from gsuid_core.logger import logger -from gsuid_core.models import Event from gsuid_core.sv import SV -from gsuid_core.utils.boardcast.send_msg import send_board_cast_msg +from gsuid_core.bot import Bot +from gsuid_core.models import Event +from gsuid_core.aps import scheduler +from gsuid_core.logger import logger from gsuid_core.utils.database.models import GsBind -from gsuid_core.utils.sign.sign import daily_sign, sign_in +from gsuid_core.utils.sign.sign import sign_in, daily_sign +from gsuid_core.utils.boardcast.send_msg import send_board_cast_msg -from ..starrailuid_config.sr_config import srconfig from ..utils.error_reply import UID_HINT -from ..utils.sr_prefix import PREFIX +from ..starrailuid_config.sr_config import srconfig SIGN_TIME = srconfig.get_config("SignTime").data IS_REPORT = srconfig.get_config("PrivateSignReport").data @@ -18,7 +17,7 @@ sv_sign = SV("星穹铁道签到") sv_sign_config = SV("星穹铁道管理", pm=2) -@sv_sign.on_fullmatch(f"{PREFIX}签到") +@sv_sign.on_fullmatch("签到") async def get_sign_func(bot: Bot, ev: Event): logger.info(f"[星穹铁道] [签到] 用户: {ev.user_id}") uid = await GsBind.get_uid_by_game(ev.user_id, ev.bot_id, "sr") @@ -29,7 +28,7 @@ async def get_sign_func(bot: Bot, ev: Event): return None -@sv_sign_config.on_fullmatch(f"{PREFIX}全部重签") +@sv_sign_config.on_fullmatch("全部重签") async def recheck(bot: Bot, ev: Event): await bot.logger.info("开始执行[全部重签]") await bot.send("[星穹铁道] [全部重签] 已开始执行!") diff --git a/StarRailUID/starrailuid_stamina/__init__.py b/StarRailUID/starrailuid_stamina/__init__.py index 1ae5dec..24689f4 100644 --- a/StarRailUID/starrailuid_stamina/__init__.py +++ b/StarRailUID/starrailuid_stamina/__init__.py @@ -11,7 +11,6 @@ from gsuid_core.utils.database.api import get_uid from gsuid_core.utils.database.models import GsBind from .notice import get_notice_list -from ..utils.sr_prefix import PREFIX from ..utils.error_reply import UID_HINT from .stamina_text import get_stamina_text from .draw_stamina_card import get_stamina_img @@ -21,7 +20,7 @@ sv_get_stamina = SV("sr查询体力") sv_get_stamina_admin = SV("sr强制推送", pm=1) -@sv_get_stamina.on_fullmatch(f"{PREFIX}当前状态") +@sv_get_stamina.on_fullmatch("当前状态") async def send_daily_info(bot: Bot, ev: Event): await bot.logger.info("开始执行[sr每日信息文字版]") uid = await get_uid(bot, ev, GsBind, "sr") @@ -34,7 +33,7 @@ async def send_daily_info(bot: Bot, ev: Event): return None -@sv_get_stamina_admin.on_fullmatch(f"{PREFIX}强制推送体力提醒") +@sv_get_stamina_admin.on_fullmatch("强制推送体力提醒") async def force_notice_job(bot: Bot, ev: Event): await bot.logger.info("开始执行[sr强制推送体力信息]") await sr_notice_job() @@ -73,11 +72,11 @@ async def sr_notice_job(): @sv_get_stamina.on_fullmatch( ( - f"{PREFIX}每日", - f"{PREFIX}mr", - f"{PREFIX}实时便笺", - f"{PREFIX}便笺", - f"{PREFIX}便签", + "每日", + "mr", + "实时便笺", + "便笺", + "便签", ) ) async def send_daily_info_pic(bot: Bot, ev: Event): diff --git a/StarRailUID/starrailuid_user/__init__.py b/StarRailUID/starrailuid_user/__init__.py index 17edc01..8d059a7 100644 --- a/StarRailUID/starrailuid_user/__init__.py +++ b/StarRailUID/starrailuid_user/__init__.py @@ -1,17 +1,16 @@ +from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event -from gsuid_core.sv import SV from gsuid_core.utils.database.models import GsBind -from .draw_user_card import get_user_card from ..utils.message import send_diff_msg -from ..utils.sr_prefix import PREFIX +from .draw_user_card import get_user_card sv_user_config = SV("sr用户管理", pm=2) sv_user_info = SV("sr用户信息") -@sv_user_info.on_fullmatch(f"{PREFIX}绑定信息") +@sv_user_info.on_fullmatch("绑定信息") async def send_bind_card(bot: Bot, ev: Event): await bot.logger.info("sr开始执行[查询用户绑定状态]") uid_list = await get_user_card(ev.bot_id, ev.user_id) @@ -24,10 +23,14 @@ async def send_bind_card(bot: Bot, ev: Event): @sv_user_info.on_command( ( - f"{PREFIX}绑定uid", - f"{PREFIX}切换uid", - f"{PREFIX}删除uid", - f"{PREFIX}解绑uid", + "绑定uid", + "绑定UID", + "切换uid", + "切换UID", + "删除uid", + "删除UID", + "解绑uid", + "解绑UID", ) ) async def send_link_uid_msg(bot: Bot, ev: Event): diff --git a/StarRailUID/starrailuid_wiki/__init__.py b/StarRailUID/starrailuid_wiki/__init__.py index ba42cbf..6630b74 100644 --- a/StarRailUID/starrailuid_wiki/__init__.py +++ b/StarRailUID/starrailuid_wiki/__init__.py @@ -25,7 +25,7 @@ sv_sr_wiki = SV("星铁WIKI") sv_sr_guide = SV("星铁攻略") -@sv_sr_wiki.on_prefix("sr角色图鉴") +@sv_sr_wiki.on_prefix("角色图鉴") async def send_role_wiki_pic(bot: Bot, ev: Event): char_name = " ".join(re.findall("[\u4e00-\u9fa5]+", ev.text)) await bot.logger.info(f"开始获取{char_name}图鉴") @@ -44,7 +44,7 @@ async def send_role_wiki_pic(bot: Bot, ev: Event): await bot.logger.warning(f"未找到{char_name}图鉴图片") -@sv_sr_guide.on_prefix("sr角色攻略") +@sv_sr_guide.on_prefix("角色攻略") async def send_role_guide_pic(bot: Bot, ev: Event): char_name = " ".join(re.findall("[\u4e00-\u9fa5]+", ev.text)) await bot.logger.info(f"开始获取{char_name}图鉴") @@ -65,7 +65,7 @@ async def send_role_guide_pic(bot: Bot, ev: Event): await bot.logger.warning(f"未找到{char_id}图鉴图片") -@sv_sr_guide.on_prefix("sr光锥攻略") +@sv_sr_guide.on_prefix("光锥攻略") async def send_weapon_guide_pic(bot: Bot, ev: Event): msg = " ".join(re.findall("[\u4e00-\u9fa5]+", ev.text)) await bot.logger.info(f"开始获取{msg}图鉴") @@ -79,7 +79,7 @@ async def send_weapon_guide_pic(bot: Bot, ev: Event): await bot.logger.warning(f"未找到{light_cone_id}光锥图片") -@sv_sr_wiki.on_prefix("sr遗器") +@sv_sr_wiki.on_prefix("遗器") async def send_relic_wiki_pic(bot: Bot, ev: Event): msg = " ".join(re.findall("[\u4e00-\u9fa5]+", ev.text)) await bot.logger.info(f"开始获取{msg}遗器") @@ -93,7 +93,7 @@ async def send_relic_wiki_pic(bot: Bot, ev: Event): await bot.logger.warning(f"未找到{msg}遗器图片") -@sv_sr_wiki.on_prefix("sr突破材料") +@sv_sr_wiki.on_prefix("突破材料") async def send_material_for_role_wiki_pic(bot: Bot, ev: Event): char_name = " ".join(re.findall("[\u4e00-\u9fa5]+", ev.text)) await bot.logger.info(f"开始获取{char_name}突破材料") @@ -112,7 +112,7 @@ async def send_material_for_role_wiki_pic(bot: Bot, ev: Event): await bot.logger.warning(f"未找到{char_name}突破材料图片") -@sv_sr_wiki.on_prefix("sr武器") +@sv_sr_wiki.on_prefix("武器") async def send_light_cone_wiki_pic(bot: Bot, ev: Event): msg = " ".join(re.findall("[\u4e00-\u9fa5]+", ev.text)) await bot.logger.info(f"开始获取{msg}武器")