diff --git a/StarRailUID/starrailuid_gachalog/__init__.py b/StarRailUID/starrailuid_gachalog/__init__.py index 600c080..4d8c03e 100644 --- a/StarRailUID/starrailuid_gachalog/__init__.py +++ b/StarRailUID/starrailuid_gachalog/__init__.py @@ -28,7 +28,7 @@ async def get_gachalog_by_link(bot: Bot, ev: Event): if uid is None: return await bot.send(UID_HINT) gacha_url = ev.text.strip() - if gacha_url and not isinstance(gacha_url, str): + if not gacha_url or not isinstance(gacha_url, str): return await bot.send('请给出正确的抽卡记录链接') is_force = False if ev.command.startswith('强制'): diff --git a/StarRailUID/starrailuid_gachalog/get_gachalogs.py b/StarRailUID/starrailuid_gachalog/get_gachalogs.py index 1860101..d1ba5d8 100644 --- a/StarRailUID/starrailuid_gachalog/get_gachalogs.py +++ b/StarRailUID/starrailuid_gachalog/get_gachalogs.py @@ -5,7 +5,6 @@ from datetime import datetime from typing import Dict, Optional from ..utils.mys_api import mys_api -from ..utils.error_reply import SK_HINT from ..utils.resource.RESOURCE_PATH import PLAYER_PATH gacha_type_meta_data = { @@ -26,6 +25,8 @@ async def get_new_gachalog_by_link( for page in range(1, 999): url = parse.urlparse(gacha_url) url_parse = parse.parse_qs(url.query) + if 'authkey' not in url_parse: + return {} authkey = url_parse['authkey'][0] data = await mys_api.get_gacha_log_by_link_in_authkey( authkey, gacha_type, page, end_id @@ -121,7 +122,7 @@ async def save_gachalogs( raw_data[i].extend(gachalogs_history[i]) if raw_data == {} or not raw_data: - return SK_HINT + return '请给出正确的抽卡记录链接或链接已失效' temp_data = {'始发跃迁': [], '群星跃迁': [], '角色跃迁': [], '光锥跃迁': []} for i in ['始发跃迁', '群星跃迁', '角色跃迁', '光锥跃迁']: diff --git a/StarRailUID/utils/error_reply.py b/StarRailUID/utils/error_reply.py index f4e6cf5..60989fc 100644 --- a/StarRailUID/utils/error_reply.py +++ b/StarRailUID/utils/error_reply.py @@ -1,6 +1,6 @@ from typing import Union -UID_HINT = '你还没有绑定过uid哦!\n请使用[绑定uid123456]命令绑定!' +UID_HINT = '你还没有绑定过uid哦!\n请使用[sr绑定uid123456]命令绑定!' MYS_HINT = '你还没有绑定过mysid哦!\n请使用[绑定mys1234]命令绑定!' CK_HINT = """你还没有绑定过Cookie哦!发送【ck帮助】获取帮助! 警告:绑定Cookie可能会带来未知的账号风险,请确保信任机器人管理员""" @@ -10,7 +10,7 @@ VERIFY_HINT = '''出现验证码! (可使用[gs关闭推送]命令关闭体力推送以减少出现验证码风险) 如未绑定CK: 可联系管理员使用[gs清除缓存]命令 ''' -SK_HINT = '你还没有绑定过Stoken或者Stoken已失效~\n请加好友私聊Bot\n [扫码登陆] 或 [添加]后跟SK格式 以绑定SK' +SK_HINT = '你还没有绑定过Stoken或者Stoken已失效~\n请群聊发送 [扫码登陆] 或加好友私聊Bot [添加]后跟SK格式 以绑定SK' UPDATE_HINT = '''更新失败!更多错误信息请查看控制台... >> 可以尝试使用 >> [gs强制更新](危险)