PaiGramTeam/PamGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PamGram.git synced 2024-11-16 03:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix handle CookiesCachePoolExhausted gracefully

Browse Source
This commit is contained in:
Lei Shi 2023-11-23 05:39:33 +01:00 committed by xtaodada
parent f1918e80fb
commit 82b478160c
Signed by: xtaodada
GPG Key ID: 4CBB3F4FA8C85659
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/account/account.py
View File

@ -15,7 +15,7 @@ from telegram.helpers import escape_markdown
from core.basemodel import RegionEnum from core.basemodel import RegionEnum
from core.plugin import Plugin, conversation, handler from core.plugin import Plugin, conversation, handler
from core.services.cookies.error import TooManyRequestPublicCookies from core.services.cookies.error import TooManyRequestPublicCookies, CookiesCachePoolExhausted
from core.services.cookies.services import CookiesService, PublicCookiesService from core.services.cookies.services import CookiesService, PublicCookiesService
from core.services.players.models import PlayersDataBase as Player, PlayerInfoSQLModel from core.services.players.models import PlayersDataBase as Player, PlayerInfoSQLModel
from core.services.players.services import PlayersService, PlayerInfoService from core.services.players.services import PlayersService, PlayerInfoService
@ -137,6 +137,9 @@ class BindAccountPlugin(Plugin.Conversation):
except TooManyRequestPublicCookies: except TooManyRequestPublicCookies:
await message.reply_text("用户查询次数过多，请稍后重试", reply_markup=ReplyKeyboardRemove()) await message.reply_text("用户查询次数过多，请稍后重试", reply_markup=ReplyKeyboardRemove())
return ConversationHandler.END return ConversationHandler.END
except CookiesCachePoolExhausted:
await message.reply_text("公共Cookies池已经耗尽，请稍后重试或者绑定 cookie", reply_markup=ReplyKeyboardRemove())
return ConversationHandler.END
if region == RegionEnum.HYPERION: if region == RegionEnum.HYPERION:
client = StarRailClient(cookies=cookies.data, region=Region.CHINESE, lang="zh-cn") client = StarRailClient(cookies=cookies.data, region=Region.CHINESE, lang="zh-cn")
elif region == RegionEnum.HOYOLAB: elif region == RegionEnum.HOYOLAB: