PaiGramTeam/PaiGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PaiGram.git synced 2024-11-29 02:57:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Improve Code

Browse Source 
Remove unnecessary `else / elif` used after `return`
Update error handler
This commit is contained in:
洛水居室 2023-11-16 14:11:52 +08:00
parent 7cdc453a22
commit 1f7d35ff95
No known key found for this signature in database
GPG Key ID: C9DE87DA724B88FC
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/account/account.py
View File

@ -7,6 +7,7 @@ from simnet.errors import (
BadRequest as SimnetBadRequest, BadRequest as SimnetBadRequest,
DataNotPublic, DataNotPublic,
AccountNotFound, AccountNotFound,
NeedChallenge,
) )
from telegram import ReplyKeyboardMarkup, ReplyKeyboardRemove, TelegramObject from telegram import ReplyKeyboardMarkup, ReplyKeyboardRemove, TelegramObject
from telegram.ext import ConversationHandler, filters from telegram.ext import ConversationHandler, filters
@ -210,20 +211,16 @@ class BindAccountPlugin(Plugin.Conversation):
await message.reply_text("角色未公开", reply_markup=ReplyKeyboardRemove()) await message.reply_text("角色未公开", reply_markup=ReplyKeyboardRemove())
logger.warning("获取账号信息发生错误 %s 账户信息未公开", player_id) logger.warning("获取账号信息发生错误 %s 账户信息未公开", player_id)
return ConversationHandler.END return ConversationHandler.END
except InvalidCookies: except (InvalidCookies, NeedChallenge):
await self.public_cookies_service.undo(user.id) await self.public_cookies_service.undo(user.id)
await message.reply_text("出错了呜呜呜 ~ 请稍后重试或者绑定 cookie") await message.reply_text("出错了呜呜呜 ~ 请稍后重试或者绑定 cookie")
return ConversationHandler.END return ConversationHandler.END
except SimnetBadRequest as exc: except SimnetBadRequest as exc:
if exc.ret_code == 1034: if exc.ret_code == -10001:
await message.reply_text("出错了呜呜呜 ~ 请稍后重试或者绑定 cookie")
return ConversationHandler.END
elif exc.ret_code == -10001:
await message.reply_text("账号所属服务器与选择服务器不符，请检查", reply_markup=ReplyKeyboardRemove()) await message.reply_text("账号所属服务器与选择服务器不符，请检查", reply_markup=ReplyKeyboardRemove())
return ConversationHandler.END return ConversationHandler.END
await message.reply_text("获取账号信息发生错误", reply_markup=ReplyKeyboardRemove()) await message.reply_text("获取账号信息发生错误", reply_markup=ReplyKeyboardRemove())
logger.error("获取账号信息发生错误") logger.error("获取账号信息发生错误", exc_info=exc)
logger.exception(exc)
return ConversationHandler.END return ConversationHandler.END
except ValueError: except ValueError:
await message.reply_text("ID 格式有误，请检查", reply_markup=ReplyKeyboardRemove()) await message.reply_text("ID 格式有误，请检查", reply_markup=ReplyKeyboardRemove())