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 material character weapon miss

Browse Source
This commit is contained in:
omg-xtao 2022-11-22 18:36:52 +08:00 committed by GitHub
parent 3f2a9b8ee9
commit 7457fef7f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/genshin/daily/material.py
View File

@ -16,6 +16,7 @@ from aiofiles import open as async_open
from arkowrapper import ArkoWrapper from arkowrapper import ArkoWrapper
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from genshin import Client, InvalidCookies, GenshinException from genshin import Client, InvalidCookies, GenshinException
from genshin.models import Character
from httpx import AsyncClient, HTTPError from httpx import AsyncClient, HTTPError
from pydantic import BaseModel from pydantic import BaseModel
from telegram import Message, Update, User from telegram import Message, Update, User
@ -128,11 +129,11 @@ class DailyMaterial(Plugin, BasePlugin):
self.data = data self.data = data
@staticmethod @staticmethod
async def _get_skills_data(client: Client, character_id: int) -> Optional[List[int]]: async def _get_skills_data(client: Client, character: Character) -> Optional[List[int]]:
"""获取角色技能的数据""" """获取角色技能的数据"""
for _ in range(5): for _ in range(5):
try: try:
detail = await client.get_character_details(character_id) detail = await client.get_character_details(character)
except Exception as e: # pylint: disable=W0703 except Exception as e: # pylint: disable=W0703
if isinstance(e, GenshinException): if isinstance(e, GenshinException):
# 如果是 Too Many Requests 异常，则等待一段时间后重试 # 如果是 Too Many Requests 异常，则等待一段时间后重试
@ -146,7 +147,7 @@ class DailyMaterial(Plugin, BasePlugin):
else: else:
# 如果重试了5次都失败了，则直接返回 None # 如果重试了5次都失败了，则直接返回 None
logger.warning( logger.warning(
f"daily_material 解析角色 id 为 [bold]{character_id}[/]的数据时遇到了 Too Many Requests 错误", extra={"markup": True} f"daily_material 解析角色 id 为 [bold]{character.id}[/]的数据时遇到了 Too Many Requests 错误", extra={"markup": True}
) )
return None return None
# 不用针对旅行者、草主进行特殊处理，因为输入数据不会有旅行者。 # 不用针对旅行者、草主进行特殊处理，因为输入数据不会有旅行者。
@ -176,6 +177,7 @@ class DailyMaterial(Plugin, BasePlugin):
constellation=character.constellation, constellation=character.constellation,
gid=character.id, gid=character.id,
icon=(await self.assets_service.avatar(cid).icon()).as_uri(), icon=(await self.assets_service.avatar(cid).icon()).as_uri(),
origin=character,
) )
) )
user_data["weapon"].append( user_data["weapon"].append(
@ -272,7 +274,7 @@ class DailyMaterial(Plugin, BasePlugin):
if i.rarity > 3: # 跳过 3 星及以下的武器 if i.rarity > 3: # 跳过 3 星及以下的武器
if type_ == "avatar" and client and calculator_sync: # client 不为 None 时给角色添加天赋信息 if type_ == "avatar" and client and calculator_sync: # client 不为 None 时给角色添加天赋信息
try: try:
skills = await self._get_skills_data(client, i.gid) skills = await self._get_skills_data(client, i.origin)
i.skills = skills i.skills = skills
except InvalidCookies: except InvalidCookies:
calculator_sync = False calculator_sync = False
@ -498,6 +500,7 @@ class ItemData(BaseModel):
gid: Optional[int] = None # 角色在 genshin.py 里的 ID gid: Optional[int] = None # 角色在 genshin.py 里的 ID
refinement: Optional[int] = None # 精炼度 refinement: Optional[int] = None # 精炼度
c_path: Optional[str] = None # 武器使用者图标 c_path: Optional[str] = None # 武器使用者图标
origin: Optional[Character] = None # 原始数据
class AreaData(BaseModel): class AreaData(BaseModel):