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

🐛 Fix avatar_list: AttributeError: 'NoneType' object has no attribute 'avatar'

Browse Source 
The list of `Character` may contain `None`
This commit is contained in:
Nahida 2023-01-06 00:04:59 +08:00 committed by 洛水居室
parent af529a642f
commit b0300134cb
No known key found for this signature in database
GPG Key ID: C9DE87DA724B88FC
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/genshin/avatar_list.py
View File

@ -157,26 +157,21 @@ class AvatarListPlugin(Plugin, BasePlugin):
task_results = await asyncio.gather(*[_task(character) for character in characters]) task_results = await asyncio.gather(*[_task(character) for character in characters])
return list( return sorted(
filter( list(filter(lambda x: x, task_results)),
lambda x: x, key=lambda x: (
sorted( x.avatar.level,
task_results, x.avatar.rarity,
key=lambda x: ( x.sum_of_skills(),
x.avatar.level, x.avatar.constellation,
x.avatar.rarity, # TODO 如果加入武器排序条件，需要把武器转化为图片url的处理后置
x.sum_of_skills(), # x.weapon.level,
x.avatar.constellation, # x.weapon.rarity,
# TODO 如果加入武器排序条件，需要把武器转化为图片url的处理后置 # x.weapon.refinement,
# x.weapon.level, x.avatar.friendship,
# x.weapon.rarity, ),
# x.weapon.refinement, reverse=True,
x.avatar.friendship, )[:max_length]
),
reverse=True,
)[:max_length],
)
)
async def get_final_data(self, client: Client, characters: Sequence[Character], update: Update): async def get_final_data(self, client: Client, characters: Sequence[Character], update: Update):
try: try: