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

🐛 修复未向养成计算器授权时出现的错误

Browse Source 
🐛 修复读取名片时错误

Signed-off-by: Karako <karakohear@gmail.com>
This commit is contained in:
Karako 2022-10-16 22:00:28 +08:00
parent cf7012bed0
commit cfbbfe91fb
No known key found for this signature in database
GPG Key ID: 5920831B0095D4A0
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/genshin/avatar_list.py
View File

@ -3,7 +3,7 @@ from typing import Iterable, List, Optional, Sequence
from arkowrapper import ArkoWrapper
from enkanetwork import Assets as EnkaAssets, EnkaNetworkAPI
from genshin import Client
from genshin import Client, GenshinException
from genshin.models import CalculatorCharacterDetails, CalculatorTalent, Character
from telegram import InlineKeyboardButton, InlineKeyboardMarkup, InputFile, Message, Update, User
from telegram.constants import ChatAction, ParseMode
@ -122,7 +122,7 @@ class AvatarListPlugin(Plugin, BasePlugin):
except Exception as e: # pylint: disable=W0703
logger.debug(f"enka 请求失败: {e}")
choices = ArkoWrapper(characters).filter(lambda x: x.friendship == 10) # 筛选出好感满了的角色
if not choices: # 若没有满好感角色、则以好感等级排序
if choices.length == 0: # 若没有满好感角色、则以好感等级排序
choices = ArkoWrapper(characters).sort(lambda x: x.friendship, reverse=True)
namecard_choices = ( # 找到与角色对应的满好感名片ID
ArkoWrapper(choices)
@ -162,7 +162,17 @@ class AvatarListPlugin(Plugin, BasePlugin):
characters = await client.get_genshin_characters(client.uid)
avatar_datas: List[AvatarData] = await self.get_avatars_data(characters, client, None if all_avatars else 20)
try:
avatar_datas: List[AvatarData] = await self.get_avatars_data(
characters, client, None if all_avatars else 20
)
except GenshinException as e:
if e.retcode == -502002:
self._add_delete_message_job(context, notice.chat_id, notice.message_id, 5)
notice = await message.reply_text("请先在米游社中使用一次<b>养成计算器</b>后再使用此功能~", parse_mode=ParseMode.HTML)
self._add_delete_message_job(context, notice.chat_id, notice.message_id, 20)
return
raise e
namecard, avatar, nickname, rarity = await self.get_final_data(client, characters, update)