diff --git a/StarRailUID/starrailuid_abyss/__init__.py b/StarRailUID/starrailuid_abyss/__init__.py index bf6d35d..503742e 100644 --- a/StarRailUID/starrailuid_abyss/__init__.py +++ b/StarRailUID/starrailuid_abyss/__init__.py @@ -4,9 +4,9 @@ from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.utils.database.api import get_uid -from gsuid_core.utils.error_reply import UID_HINT from gsuid_core.utils.database.models import GsBind +from ..utils.error_reply import UID_HINT from .draw_abyss_card import draw_abyss_img sv_srabyss = SV("sr查询深渊") diff --git a/StarRailUID/starrailuid_abyss_boss/__init__.py b/StarRailUID/starrailuid_abyss_boss/__init__.py index 8f50bb4..7e9c663 100644 --- a/StarRailUID/starrailuid_abyss_boss/__init__.py +++ b/StarRailUID/starrailuid_abyss_boss/__init__.py @@ -4,9 +4,9 @@ from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.utils.database.api import get_uid -from gsuid_core.utils.error_reply import UID_HINT from gsuid_core.utils.database.models import GsBind +from ..utils.error_reply import UID_HINT from .draw_abyss_card import draw_abyss_img sv_abyss_boss = SV("sr查询末日幻影") diff --git a/StarRailUID/starrailuid_abyss_story/__init__.py b/StarRailUID/starrailuid_abyss_story/__init__.py index 3437de0..d79d3b7 100644 --- a/StarRailUID/starrailuid_abyss_story/__init__.py +++ b/StarRailUID/starrailuid_abyss_story/__init__.py @@ -4,9 +4,9 @@ from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.utils.database.api import get_uid -from gsuid_core.utils.error_reply import UID_HINT from gsuid_core.utils.database.models import GsBind +from ..utils.error_reply import UID_HINT from .draw_abyss_card import draw_abyss_img sv_abyss_story = SV("sr查询虚构叙事") diff --git a/StarRailUID/starrailuid_config/__init__.py b/StarRailUID/starrailuid_config/__init__.py index 3c86558..2f087f8 100644 --- a/StarRailUID/starrailuid_config/__init__.py +++ b/StarRailUID/starrailuid_config/__init__.py @@ -4,9 +4,9 @@ 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 ..utils.error_reply import UID_HINT from .set_config import set_push_value, set_config_func sv_self_config = SV("星铁配置") diff --git a/StarRailUID/starrailuid_note/__init__.py b/StarRailUID/starrailuid_note/__init__.py index b766a4d..c8e96fa 100644 --- a/StarRailUID/starrailuid_note/__init__.py +++ b/StarRailUID/starrailuid_note/__init__.py @@ -16,7 +16,7 @@ sv_get_monthly_data = SV("sr查询月历") 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: - return UID_HINT + return await bot.send(UID_HINT) await bot.send(await award(sr_uid)) return None @@ -32,7 +32,7 @@ async def send_monthly_pic(bot: Bot, ev: Event): await bot.logger.info("开始执行[sr开拓月历]") sr_uid = await get_uid(bot, ev, GsBind, "sr") if sr_uid is None: - return UID_HINT + return await bot.send(UID_HINT) im = await draw_note_img(str(sr_uid)) await bot.send(im) return None diff --git a/StarRailUID/starrailuid_rogue/__init__.py b/StarRailUID/starrailuid_rogue/__init__.py index 2f0674f..5608aab 100644 --- a/StarRailUID/starrailuid_rogue/__init__.py +++ b/StarRailUID/starrailuid_rogue/__init__.py @@ -4,9 +4,9 @@ from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.utils.database.api import get_uid -from gsuid_core.utils.error_reply import UID_HINT from gsuid_core.utils.database.models import GsBind +from ..utils.error_reply import UID_HINT from .draw_rogue_card import draw_rogue_img, draw_rogue_locust_img sv_srabyss = SV("sr查询模拟宇宙") diff --git a/StarRailUID/utils/error_reply.py b/StarRailUID/utils/error_reply.py index 5a40dea..7b8f412 100644 --- a/StarRailUID/utils/error_reply.py +++ b/StarRailUID/utils/error_reply.py @@ -1,47 +1,20 @@ -from typing import Union +from copy import deepcopy -UID_HINT = "你还没有绑定过uid哦!\n请使用[sr绑定uid123456]命令绑定!" -MYS_HINT = "你还没有绑定过mysid哦!\n请使用[绑定mys1234]命令绑定!" -CK_HINT = """你还没有绑定过Cookie哦!发送【ck帮助】获取帮助! -警告:绑定Cookie可能会带来未知的账号风险,请确保信任机器人管理员""" -CHAR_HINT = "您的支援/星海同行角色没有{}的数据哦!\n请先把{}放入支援/星海同行中再使用【sr强制刷新】命令来缓存数据进行查询! !" -VERIFY_HINT = """出现验证码! -如已绑定CK: 请至米游社软件->我的->我的角色处解锁验证码 -(可使用[gs关闭推送]命令关闭体力推送以减少出现验证码风险) -如未绑定CK: 可联系管理员使用[gs清除缓存]命令 -""" -SK_HINT = "你还没有绑定过Stoken或者Stoken已失效~\n请群聊发送 [扫码登陆] 或加好友私聊Bot [添加]后跟SK格式 以绑定SK" -UPDATE_HINT = """更新失败!更多错误信息请查看控制台... ->> 可以尝试使用 ->> [gs强制更新](危险) ->> [gs强行强制更新](超级危险)!""" +from gsuid_core.utils.error_reply import ERROR_CODE +from gsuid_core.sv import get_plugin_available_prefix + +prefix = get_plugin_available_prefix("StarRailUID") + +UID_HINT = f"你还没有绑定过uid哦!\n请使用[{prefix}绑定uid123456]命令绑定!" +_CHAR_HINT = f"再使用【{prefix}强制刷新】命令来缓存数据进行查询! !" +CHAR_HINT = "您的支援/星海同行角色没有{}的数据哦!\n请先把{}放入支援/星海同行中" + _CHAR_HINT -def get_error(retcode: Union[int, str]) -> str: - if retcode == -51: - return CK_HINT - if retcode == -100: - return "您的cookie已经失效, 请重新获取!" - if retcode == 10001: - return "您的cookie已经失效, 请重新获取!" - if retcode == 10101: - return "当前查询CK已超过每日30次上限!" - if retcode == 10102: - return "当前查询id已经设置了隐私, 无法查询!" - if retcode == 1034: - return VERIFY_HINT - if retcode == -10001: - return "请求体出错, 请检查具体实现代码..." - if retcode == 10104: - return CK_HINT - if retcode == -512009: - return "[留影叙佳期]已经获取过该内容~!" - if retcode == -201: - return "你的账号可能已被封禁, 请联系米游社客服..." - if retcode == -501101: - return "当前角色冒险等阶未达到10级, 暂时无法参加此活动..." - if retcode == 400: - return "[MINIGG]暂未找到此内容..." - if retcode == -400: - return "请输入更详细的名称..." - return f"API报错, 错误码为{retcode}!" +SR_ERROR_CODE = deepcopy(ERROR_CODE) + + +def get_error(retcode: int) -> str: + msg_list = [f'❌错误代码为: {retcode}'] + if retcode in SR_ERROR_CODE: + msg_list.append(f'📝错误信息: {SR_ERROR_CODE[retcode]}') + return '\n'.join(msg_list)