diff --git a/nonebot_plugin_tetris_stats/games/tetrio/query.py b/nonebot_plugin_tetris_stats/games/tetrio/query.py index 5c524dd..c7de499 100644 --- a/nonebot_plugin_tetris_stats/games/tetrio/query.py +++ b/nonebot_plugin_tetris_stats/games/tetrio/query.py @@ -26,9 +26,9 @@ from zstandard import ZstdDecompressor from ...db import query_bind_info, trigger from ...utils.host import HostPage, get_self_netloc from ...utils.platform import get_platform -from ...utils.render import TETRIOInfo, render +from ...utils.render import render from ...utils.render.schemas.base import Avatar -from ...utils.render.schemas.tetrio_info import Data, Radar, Ranking, TetraLeague, TetraLeagueHistory +from ...utils.render.schemas.tetrio_info import Data, Info, Radar, Ranking, TetraLeague, TetraLeagueHistory from ...utils.render.schemas.tetrio_info import User as TemplateUser from ...utils.screenshot import screenshot from ...utils.typing import Me, Number @@ -230,7 +230,7 @@ async def make_query_image( async with HostPage( await render( 'tetrio/info', - TETRIOInfo( + Info( user=TemplateUser( avatar=f'https://tetr.io/user-content/avatars/{user_info.data.user.id}.jpg?rv={user_info.data.user.avatar_revision}' if user_info.data.user.avatar_revision is not None diff --git a/nonebot_plugin_tetris_stats/utils/render/__init__.py b/nonebot_plugin_tetris_stats/utils/render/__init__.py index 927c18c..ee79c85 100644 --- a/nonebot_plugin_tetris_stats/utils/render/__init__.py +++ b/nonebot_plugin_tetris_stats/utils/render/__init__.py @@ -5,7 +5,7 @@ from nonebot.compat import PYDANTIC_V2 from ..templates import templates_dir from .schemas.bind import Bind -from .schemas.tetrio_info import TETRIOInfo +from .schemas.tetrio_info import Info as TETRIOInfo env = Environment( loader=FileSystemLoader(templates_dir), autoescape=True, trim_blocks=True, lstrip_blocks=True, enable_async=True @@ -26,4 +26,4 @@ async def render(render_type: Literal['binding', 'tetrio/info'], data: Bind | TE return await env.get_template('index.html').render_async(path=render_type, data=data.json()) -__all__ = ['render', 'Bind', 'TETRIOInfo'] +__all__ = ['render', 'Bind'] diff --git a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio_info.py b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio_info.py index baff8bb..c35c3cf 100644 --- a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio_info.py +++ b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio_info.py @@ -62,7 +62,7 @@ class Radar(BaseModel): ge: Number -class TETRIOInfo(BaseModel): +class Info(BaseModel): user: User ranking: Ranking tetra_league: TetraLeague