PaiGramTeam/PaiGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PaiGram.git synced 2025-02-02 16:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

🎨 捕获 DataNotPublic 异常并改进异常处理

Browse Source
This commit is contained in:
洛水居室 2022-09-20 14:42:12 +08:00
parent 62dbcafa8c
commit 350322831d
No known key found for this signature in database
GPG Key ID: C9DE87DA724B88FC
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/decorators/error.py
View File

@ -3,7 +3,7 @@ from functools import wraps
from typing import Callable, cast from typing import Callable, cast
from aiohttp import ClientConnectorError from aiohttp import ClientConnectorError
from genshin import InvalidCookies, GenshinException, TooManyRequests from genshin import InvalidCookies, GenshinException, TooManyRequests, DataNotPublic
from httpx import ConnectTimeout from httpx import ConnectTimeout
from telegram import Update, ReplyKeyboardRemove from telegram import Update, ReplyKeyboardRemove
from telegram.error import BadRequest, TimedOut, Forbidden from telegram.error import BadRequest, TimedOut, Forbidden
@ -93,11 +93,15 @@ def error_callable(func: Callable) -> Callable:
logger.warning("查询次数太多（操作频繁）", exc) logger.warning("查询次数太多（操作频繁）", exc)
await send_user_notification(update, context, "出错了呜呜呜 ~ 当天查询次数已经超过30次，请次日再进行查询") await send_user_notification(update, context, "出错了呜呜呜 ~ 当天查询次数已经超过30次，请次日再进行查询")
return ConversationHandler.END return ConversationHandler.END
except DataNotPublic:
await send_user_notification(update, context, "出错了呜呜呜 ~ 查询的用户数据未公开")
return ConversationHandler.END
except GenshinException as exc: except GenshinException as exc:
if "[-130]" in str(exc): if "[-130]" in str(exc):
await send_user_notification(update, context, "出错了呜呜呜 ~ 未设置默认角色，请尝试重新绑定默认角色") await send_user_notification(update, context, "出错了呜呜呜 ~ 未设置默认角色，请尝试重新绑定默认角色")
return ConversationHandler.END return ConversationHandler.END
logger.warning("GenshinException", exc) logger.warning("GenshinException")
logger.exception(exc)
await send_user_notification(update, context, "出错了呜呜呜 ~ 获取账号信息发生错误") await send_user_notification(update, context, "出错了呜呜呜 ~ 获取账号信息发生错误")
return ConversationHandler.END return ConversationHandler.END
except BadRequest as exc: except BadRequest as exc: