PaiGramTeam/MibooGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/MibooGram.git synced 2024-11-25 09:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix unable to get genshin account information correctly

Browse Source
This commit is contained in:
洛水居室 2022-11-19 21:41:12 +08:00
parent ba7c5f2f14
commit e83a9fd8cb
No known key found for this signature in database
GPG Key ID: C9DE87DA724B88FC
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/genshin/cookies.py
View File

@ -4,6 +4,7 @@ from typing import Optional
import genshin import genshin
from genshin import InvalidCookies, GenshinException, DataNotPublic from genshin import InvalidCookies, GenshinException, DataNotPublic
from genshin.models import GenshinAccount
from telegram import Update, ReplyKeyboardRemove, ReplyKeyboardMarkup, TelegramObject from telegram import Update, ReplyKeyboardRemove, ReplyKeyboardMarkup, TelegramObject
from telegram.ext import CallbackContext, filters, ConversationHandler from telegram.ext import CallbackContext, filters, ConversationHandler
from telegram.helpers import escape_markdown from telegram.helpers import escape_markdown
@ -248,7 +249,7 @@ class SetUserCookies(Plugin.Conversation, BasePlugin.Conversation):
await message.reply_text("数据错误", reply_markup=ReplyKeyboardRemove()) await message.reply_text("数据错误", reply_markup=ReplyKeyboardRemove())
return ConversationHandler.END return ConversationHandler.END
try: try:
user_info = await client.get_record_card() genshin_accounts = await client.genshin_accounts()
except DataNotPublic: except DataNotPublic:
await message.reply_text("账号疑似被注销，请检查账号状态", reply_markup=ReplyKeyboardRemove()) await message.reply_text("账号疑似被注销，请检查账号状态", reply_markup=ReplyKeyboardRemove())
return ConversationHandler.END return ConversationHandler.END
@ -268,6 +269,16 @@ class SetUserCookies(Plugin.Conversation, BasePlugin.Conversation):
await sign_in_client.get_s_token() await sign_in_client.get_s_token()
add_user_command_data.cookies = sign_in_client.cookie add_user_command_data.cookies = sign_in_client.cookie
logger.info(f"用户 {user.full_name}[{user.id}] 绑定时获取 stoken 成功") logger.info(f"用户 {user.full_name}[{user.id}] 绑定时获取 stoken 成功")
user_info: Optional[GenshinAccount] = None
level: int = 0
# todo : 多账号绑定
for genshin_account in genshin_accounts:
if genshin_account.level >= level: # 获取账号等级最高的
level = genshin_account.level
user_info = genshin_account
if user_info is None:
await message.reply_text("未找到原神账号，请确认账号信息无误。")
return ConversationHandler.END
add_user_command_data.game_uid = user_info.uid add_user_command_data.game_uid = user_info.uid
reply_keyboard = [["确认", "退出"]] reply_keyboard = [["确认", "退出"]]
await message.reply_text("获取角色基础信息成功，请检查是否正确！") await message.reply_text("获取角色基础信息成功，请检查是否正确！")