PaiGramTeam/MibooGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/MibooGram.git synced 2024-11-16 12:51:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

🎨 改进对 GenshinException 的异常处理

Browse Source
This commit is contained in:
洛水居室 2022-10-08 09:01:51 +08:00
parent 29a5508174
commit 1c33189752
No known key found for this signature in database
GPG Key ID: C9DE87DA724B88FC
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
utils/decorators/error.py
View File

@ -78,17 +78,15 @@ def error_callable(func: Callable) -> Callable:
await send_user_notification(update, context, "出错了呜呜呜 ~ 资源未找到 ~ ") await send_user_notification(update, context, "出错了呜呜呜 ~ 资源未找到 ~ ")
return ConversationHandler.END return ConversationHandler.END
except InvalidCookies as exc: except InvalidCookies as exc:
if "[10001]" in str(exc): if exc.retcode == 10001 or exc.retcode == -100:
await send_user_notification(update, context, "出错了呜呜呜 ~ Cookies无效，请尝试重新绑定账户") await send_user_notification(update, context, "出错了呜呜呜 ~ Cookies无效，请尝试重新绑定账户")
elif "[-100]" in str(exc): elif exc.retcode == 10103:
await send_user_notification(update, context, "出错了呜呜呜 ~ Cookies无效，请尝试重新绑定账户")
elif "[10103]" in str(exc):
await send_user_notification(update, context, "出错了呜呜呜 ~ Cookie有效，但没有绑定到游戏帐户，" await send_user_notification(update, context, "出错了呜呜呜 ~ Cookie有效，但没有绑定到游戏帐户，"
"请尝试重新绑定邮游戏账户") "请尝试重新绑定邮游戏账户")
else: else:
logger.warning("Cookie错误") logger.warning("Cookie错误")
logger.exception(exc) logger.exception(exc)
await send_user_notification(update, context, "出错了呜呜呜 ~ Cookies无效，具体原因未知") await send_user_notification(update, context, f"出错了呜呜呜 ~ Cookies无效 错误信息为 {exc.msg}")
return ConversationHandler.END return ConversationHandler.END
except TooManyRequests as exc: except TooManyRequests as exc:
logger.warning("查询次数太多（操作频繁）", exc) logger.warning("查询次数太多（操作频繁）", exc)
@ -98,12 +96,12 @@ def error_callable(func: Callable) -> Callable:
await send_user_notification(update, context, "出错了呜呜呜 ~ 查询的用户数据未公开") await send_user_notification(update, context, "出错了呜呜呜 ~ 查询的用户数据未公开")
return ConversationHandler.END return ConversationHandler.END
except GenshinException as exc: except GenshinException as exc:
if "[-130]" in str(exc): if exc.retcode == -130:
await send_user_notification(update, context, "出错了呜呜呜 ~ 未设置默认角色，请尝试重新绑定默认角色") await send_user_notification(update, context, "出错了呜呜呜 ~ 未设置默认角色，请尝试重新绑定默认角色")
return ConversationHandler.END return ConversationHandler.END
logger.warning("GenshinException") logger.error("GenshinException")
logger.exception(exc) logger.exception(exc)
await send_user_notification(update, context, "出错了呜呜呜 ~ 获取账号信息发生错误") await send_user_notification(update, context, f"出错了呜呜呜 ~ 获取账号信息发生错误 错误信息为 {exc.msg}")
return ConversationHandler.END return ConversationHandler.END
except ReturnCodeError as exc: except ReturnCodeError as exc:
await send_user_notification(update, context, f"出错了呜呜呜 ~ API请求错误 错误信息为 {exc.message}") await send_user_notification(update, context, f"出错了呜呜呜 ~ API请求错误 错误信息为 {exc.message}")