🔖 1.2.12

✨ 修改插件元数据
✨ 直接使用 fstring 生成链接
2026-03-05 05:36:54 +08:00 · 2024-06-10 02:37:29 +08:00 · 2024-06-10 02:37:12 +08:00 · 2024-06-10 02:35:07 +08:00 · 2024-06-10 02:34:30 +08:00 · 2024-06-10 02:13:03 +08:00
32 changed files with 777 additions and 368 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ package-lock.json
 bot.py
 TODO
 *.fish
+extracted_skin_mino_*
--- a/nonebot_plugin_tetris_stats/init.py
+++ b/nonebot_plugin_tetris_stats/init.py
@@ -5,8 +5,9 @@ require('nonebot_plugin_alconna')
 require('nonebot_plugin_apscheduler')
 require('nonebot_plugin_localstore')
 require('nonebot_plugin_orm')
-require('nonebot_plugin_session')
 require('nonebot_plugin_session_orm')
+require('nonebot_plugin_session')
+require('nonebot_plugin_user')

 from nonebot_plugin_alconna import namespace  # noqa: E402

@@ -18,7 +19,7 @@ from .config.config import migrations  # noqa: E402
 __plugin_meta__ = PluginMetadata(
    name='Tetris Stats',
    description='一个用于查询 Tetris 相关游戏玩家数据的插件',
-    usage='发送 {游戏名} --help 查询使用方法',
+    usage='发送 tstats --help 查询使用方法',
    type='application',
    homepage='https://github.com/A-minos/nonebot-plugin-tetris-stats',
    extra={
--- a/nonebot_plugin_tetris_stats/config/migrations/8a91210ce14d_correct_the_data_in_historicaldata.py
+++ b/nonebot_plugin_tetris_stats/config/migrations/8a91210ce14d_correct_the_data_in_historicaldata.py
@@ -46,7 +46,9 @@ def upgrade(name: str = '') -> None:  # noqa: C901
        TimeRemainingColumn,
    )

-    from nonebot_plugin_tetris_stats.game_data_processor.schemas import BaseProcessedData  # type: ignore[attr-defined]
+    from nonebot_plugin_tetris_stats.game_data_processor.schemas import (  # type: ignore[import-untyped]
+        BaseProcessedData,
+    )

    Base = automap_base()  # noqa: N806
    Base.prepare(autoload_with=op.get_bind())
--- a/nonebot_plugin_tetris_stats/config/migrations/a1195e989cc6_add_tetrio_user_configuration.py
+++ b/nonebot_plugin_tetris_stats/config/migrations/a1195e989cc6_add_tetrio_user_configuration.py
@@ -0,0 +1,44 @@
+"""Add TETRIO user configuration
+
+迁移 ID: a1195e989cc6
+父迁移: b15844837693
+创建时间: 2024-06-09 04:20:07.819194
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import sqlalchemy as sa
+from alembic import op
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'a1195e989cc6'
+down_revision: str | Sequence[str] | None = 'b15844837693'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        'nonebot_plugin_tetris_stats_tetriouserconfig',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('query_template', sa.String(length=2), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nonebot_plugin_tetris_stats_tetriouserconfig')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('nonebot_plugin_tetris_stats_tetriouserconfig')
+    # ### end Alembic commands ###
--- a/nonebot_plugin_tetris_stats/config/migrations/b15844837693_migrate_to_nonobot_plugin_user.py
+++ b/nonebot_plugin_tetris_stats/config/migrations/b15844837693_migrate_to_nonobot_plugin_user.py
@@ -0,0 +1,71 @@
+"""Migrate to nonobot-plugin-user
+
+迁移 ID: b15844837693
+父迁移: 3c25a5a8c050
+创建时间: 2024-06-08 02:27:35.227596
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import sqlalchemy as sa
+from alembic import op
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'b15844837693'
+down_revision: str | Sequence[str] | None = '3c25a5a8c050'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_bind', schema=None) as batch_op:
+        batch_op.drop_index('ix_nonebot_plugin_tetris_stats_bind_chat_account')
+        batch_op.drop_index('ix_nonebot_plugin_tetris_stats_bind_chat_platform')
+
+    op.drop_table('nonebot_plugin_tetris_stats_bind')
+
+    op.create_table(
+        'nonebot_plugin_tetris_stats_bind',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=False),
+        sa.Column('game_platform', sa.String(length=32), nullable=False),
+        sa.Column('game_account', sa.String(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nonebot_plugin_tetris_stats_bind')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_bind', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nonebot_plugin_tetris_stats_bind_user_id'), ['user_id'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_bind', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_bind_user_id'))
+
+    op.drop_table('nonebot_plugin_tetris_stats_bind')
+
+    op.create_table(
+        'nonebot_plugin_tetris_stats_bind',
+        sa.Column('id', sa.INTEGER(), nullable=False),
+        sa.Column('chat_platform', sa.VARCHAR(length=32), nullable=False),
+        sa.Column('chat_account', sa.VARCHAR(), nullable=False),
+        sa.Column('game_platform', sa.VARCHAR(length=32), nullable=False),
+        sa.Column('game_account', sa.VARCHAR(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name='pk_nonebot_plugin_tetris_stats_bind'),
+    )
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_bind', schema=None) as batch_op:
+        batch_op.create_index('ix_nonebot_plugin_tetris_stats_bind_chat_platform', ['chat_platform'], unique=False)
+        batch_op.create_index('ix_nonebot_plugin_tetris_stats_bind_chat_account', ['chat_account'], unique=False)
+
+    # ### end Alembic commands ###
--- a/nonebot_plugin_tetris_stats/config/migrations/b7fbdafc339a_add_user_unique_identifier_field_to_.py
+++ b/nonebot_plugin_tetris_stats/config/migrations/b7fbdafc339a_add_user_unique_identifier_field_to_.py
@@ -46,7 +46,7 @@ def upgrade(name: str = '') -> None:
    from sqlalchemy.ext.automap import automap_base
    from sqlalchemy.orm import Session

-    from nonebot_plugin_tetris_stats.game_data_processor.schemas import BaseUser
+    from nonebot_plugin_tetris_stats.game_data_processor.schemas import BaseUser  # type: ignore[import-untyped]

    with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:
        batch_op.add_column(sa.Column('user_unique_identifier', sa.String(length=32), nullable=True))
--- a/nonebot_plugin_tetris_stats/db/init.py
+++ b/nonebot_plugin_tetris_stats/db/init.py
@@ -8,6 +8,7 @@ from typing import TYPE_CHECKING, Literal, TypeVar, overload
 from nonebot.exception import FinishedException
 from nonebot.log import logger
 from nonebot_plugin_orm import AsyncSession, get_session
+from nonebot_plugin_user import User  # type: ignore[import-untyped]
 from sqlalchemy import select

 from ..utils.typing import CommandType, GameType
@@ -28,37 +29,28 @@ class BindStatus(Enum):

 async def query_bind_info(
    session: AsyncSession,
-    chat_platform: str,
-    chat_account: str,
+    user: User,
    game_platform: GameType,
 ) -> Bind | None:
    return (
-        await session.scalars(
-            select(Bind)
-            .where(Bind.chat_platform == chat_platform)
-            .where(Bind.chat_account == chat_account)
-            .where(Bind.game_platform == game_platform)
-        )
+        await session.scalars(select(Bind).where(Bind.user_id == user.id).where(Bind.game_platform == game_platform))
    ).one_or_none()


 async def create_or_update_bind(
    session: AsyncSession,
-    chat_platform: str,
-    chat_account: str,
+    user: User,
    game_platform: GameType,
    game_account: str,
 ) -> BindStatus:
    bind = await query_bind_info(
        session=session,
-        chat_platform=chat_platform,
-        chat_account=chat_account,
+        user=user,
        game_platform=game_platform,
    )
    if bind is None:
        bind = Bind(
-            chat_platform=chat_platform,
-            chat_account=chat_account,
+            user_id=user.id,
            game_platform=game_platform,
            game_account=game_account,
        )
--- a/nonebot_plugin_tetris_stats/db/models.py
+++ b/nonebot_plugin_tetris_stats/db/models.py
@@ -66,8 +66,7 @@ class PydanticType(TypeDecorator):

 class Bind(MappedAsDataclass, Model):
    id: Mapped[int] = mapped_column(init=False, primary_key=True)
-    chat_platform: Mapped[str] = mapped_column(String(32), index=True)
-    chat_account: Mapped[str] = mapped_column(index=True)
+    user_id: Mapped[int] = mapped_column(index=True)
    game_platform: Mapped[GameType] = mapped_column(String(32))
    game_account: Mapped[str]

--- a/nonebot_plugin_tetris_stats/games/init.py
+++ b/nonebot_plugin_tetris_stats/games/init.py
@@ -1,40 +1,53 @@
-from typing import Any
+from collections.abc import Callable

 from nonebot.adapters import Bot
-from nonebot.exception import FinishedException
 from nonebot.matcher import Matcher
 from nonebot.message import run_postprocessor
-from nonebot_plugin_alconna import AlcMatches, AlconnaMatcher, At
+from nonebot.typing import T_Handler
+from nonebot_plugin_alconna import AlcMatches, Alconna, At, CommandMeta, on_alconna

+from .. import ns
 from ..utils.exception import MessageFormatError, NeedCatchError

+alc = on_alconna(
+    Alconna(
+        ['tetris-stats', 'tstats'],
+        namespace=ns,
+        meta=CommandMeta(
+            description='俄罗斯方块相关游戏数据查询',
+            fuzzy_match=True,
+        ),
+    ),
+    skip_for_unmatch=False,
+    auto_send_output=True,
+    use_origin=True,
+)

-def add_default_handlers(matcher: type[AlconnaMatcher]) -> None:
-    @matcher.assign('query')
+
+def add_block_handlers(handler: Callable[[T_Handler], T_Handler]) -> None:
+    @handler
    async def _(bot: Bot, matcher: Matcher, target: At):
        if isinstance(target, At) and target.target == bot.self_id:
            await matcher.finish('不能查询bot的信息')

-    @matcher.handle()
-    async def _(matcher: Matcher, account: MessageFormatError):
-        await matcher.finish(str(account))
-
-    @matcher.handle()
-    async def _(matcher: Matcher, matches: AlcMatches):
-        if matches.head_matched and matches.options != {} or matches.main_args == {}:
-            await matcher.finish(
-                (f'{matches.error_info!r}\n' if matches.error_info is not None else '')
-                + f'输入"{matches.header_result} --help"查看帮助'
-            )
-
-    @matcher.handle()
-    def _(other: Any):  # noqa: ANN401, ARG001
-        raise FinishedException
-

 from . import tetrio, top, tos  # noqa: F401, E402


+@alc.handle()
+async def _(matcher: Matcher, account: MessageFormatError):
+    await matcher.finish(str(account))
+
+
+@alc.handle()
+async def _(matcher: Matcher, matches: AlcMatches):
+    if matches.head_matched and matches.options != {} or matches.main_args == {}:
+        await matcher.finish(
+            (f'{matches.error_info!r}\n' if matches.error_info is not None else '')
+            + f'输入"{matches.header_result} --help"查看帮助'
+        )
+
+
@run_postprocessor
 async def _(matcher: Matcher, exception: NeedCatchError):
    await matcher.send(str(exception))
--- a/nonebot_plugin_tetris_stats/games/tetrio/init.py
+++ b/nonebot_plugin_tetris_stats/games/tetrio/init.py
@@ -1,14 +1,13 @@
-from arclet.alconna import Alconna, AllParam, Arg, ArgFlag, Args, CommandMeta, Option
-from nonebot_plugin_alconna import At, on_alconna
+from arclet.alconna import Arg, ArgFlag, Args, Option, Subcommand
+from nonebot_plugin_alconna import At

-from ... import ns
 from ...utils.exception import MessageFormatError
 from ...utils.typing import Me
-from .. import add_default_handlers
-from ..constant import BIND_COMMAND, QUERY_COMMAND
+from .. import add_block_handlers, alc
 from .api import Player
-from .api.typing import Rank
+from .api.typing import ValidRank
 from .constant import USER_ID, USER_NAME
+from .typing import Template


 def get_player(user_id_or_name: str) -> Player | MessageFormatError:
@@ -19,69 +18,62 @@ def get_player(user_id_or_name: str) -> Player | MessageFormatError:
    return MessageFormatError('用户名/ID不合法')


-alc = on_alconna(
-    Alconna(
-        'io',
-        Option(
-            BIND_COMMAND[0],
+alc.command.add(
+    Subcommand(
+        'TETR.IO',
+        Subcommand(
+            'bind',
            Args(
                Arg(
                    'account',
                    get_player,
-                    notice='IO 用户名 / ID',
+                    notice='TETR.IO 用户名 / ID',
                    flags=[ArgFlag.HIDDEN],
                )
            ),
-            alias=BIND_COMMAND[1:],
-            compact=True,
-            dest='bind',
-            help_text='绑定 IO 账号',
+            help_text='绑定 TETR.IO 账号',
        ),
-        Option(
-            QUERY_COMMAND[0],
+        Subcommand(
+            'query',
            Args(
                Arg(
                    'target',
                    At | Me,
-                    notice='@想要查询的人 | 自己',
+                    notice='@想要查询的人 / 自己',
                    flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
                ),
                Arg(
                    'account',
                    get_player,
-                    notice='IO 用户名 / ID',
+                    notice='TETR.IO 用户名 / ID',
                    flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
                ),
            ),
-            alias=QUERY_COMMAND[1:],
-            compact=True,
-            dest='query',
-            help_text='查询 IO 游戏信息',
+            Option(
+                '--template',
+                Arg('template', Template),
+                alias=['-T'],
+                help_text='要使用的查询模板',
+            ),
+            help_text='查询 TETR.IO 游戏信息',
        ),
-        Option(
+        Subcommand(
            'rank',
-            Args(Arg('rank', Rank, notice='IO 段位')),
-            alias={'Rank', 'RANK', '段位'},
-            compact=True,
-            dest='rank',
-            help_text='查询 IO 段位信息',
+            Args(Arg('rank', ValidRank, notice='TETR.IO 段位')),
+            help_text='查询 TETR.IO 段位信息',
        ),
-        Arg('other', AllParam, flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL]),
-        meta=CommandMeta(
-            description='查询 TETR.IO 的信息',
-            example='io绑定scdhh\nio查我\niorankx',
-            compact=True,
-            fuzzy_match=True,
-        ),
-        namespace=ns,
-    ),
-    skip_for_unmatch=False,
-    auto_send_output=True,
-    aliases={'IO'},
+        dest='TETRIO',
+        help_text='TETR.IO 游戏相关指令',
+    )
 )

-alc.shortcut('fkosk', {'command': 'io查', 'args': ['我'], 'fuzzy': False, 'humanized': 'An Easter egg!'})
+alc.shortcut('(?i:io)(?i:绑|绑定|bind)', {'command': 'tstats TETR.IO bind', 'humanized': 'io绑定'})
+alc.shortcut('(?i:io)(?i:查|查询|query|stats)', {'command': 'tstats TETR.IO query', 'humanized': 'io查'})
+
+alc.shortcut(
+    'fkosk', {'command': 'tstats TETR.IO query', 'args': ['我'], 'fuzzy': False, 'humanized': 'An Easter egg!'}
+)
+
+add_block_handlers(alc.assign('TETRIO.query'))

 from . import bind, query, rank  # noqa: F401, E402
-
-add_default_handlers(alc)
--- a/nonebot_plugin_tetris_stats/games/tetrio/api/models.py
+++ b/nonebot_plugin_tetris_stats/games/tetrio/api/models.py
@@ -15,3 +15,8 @@ class TETRIOHistoricalData(MappedAsDataclass, Model):
    api_type: Mapped[Literal['User Info', 'User Records']] = mapped_column(String(16), index=True)
    data: Mapped[SuccessModel] = mapped_column(PydanticType(get_model=[SuccessModel.__subclasses__], models=set()))
    update_time: Mapped[datetime] = mapped_column(DateTime, index=True)
+
+
+class TETRIOUserConfig(MappedAsDataclass, Model):
+    id: Mapped[int] = mapped_column(init=False, primary_key=True)
+    query_template: Mapped[Literal['v1', 'v2']] = mapped_column(String(2))
--- a/nonebot_plugin_tetris_stats/games/tetrio/api/typing.py
+++ b/nonebot_plugin_tetris_stats/games/tetrio/api/typing.py
@@ -1,6 +1,6 @@
 from typing import Literal

-Rank = Literal[
+ValidRank = Literal[
    'x',
    'u',
    'ss',
@@ -18,5 +18,6 @@ Rank = Literal[
    'c-',
    'd+',
    'd',
-    'z',  # 未定级
 ]
+
+Rank = ValidRank | Literal['z']  # 未定级
--- a/nonebot_plugin_tetris_stats/games/tetrio/bind.py
+++ b/nonebot_plugin_tetris_stats/games/tetrio/bind.py
@@ -1,17 +1,17 @@
+from asyncio import gather
 from hashlib import md5
-from urllib.parse import urlunparse
+from urllib.parse import urlencode

-from nonebot.adapters import Bot, Event
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
 from nonebot_plugin_session import EventSession  # type: ignore[import-untyped]
 from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_user import User  # type: ignore[import-untyped]
 from nonebot_plugin_userinfo import BotUserInfo, UserInfo  # type: ignore[import-untyped]

 from ...db import BindStatus, create_or_update_bind, trigger
-from ...utils.avatar import get_avatar
 from ...utils.host import HostPage, get_self_netloc
-from ...utils.platform import get_platform
+from ...utils.image import get_avatar
 from ...utils.render import Bind, render
 from ...utils.render.schemas.base import Avatar, People
 from ...utils.screenshot import screenshot
@@ -20,33 +20,32 @@ from .api import Player
 from .constant import GAME_TYPE


-@alc.assign('bind')
-async def _(bot: Bot, event: Event, account: Player, event_session: EventSession, bot_info: UserInfo = BotUserInfo()):  # noqa: B008
+@alc.assign('TETRIO.bind')
+async def _(nb_user: User, account: Player, event_session: EventSession, bot_info: UserInfo = BotUserInfo()):  # noqa: B008
    async with trigger(
        session_persist_id=await get_session_persist_id(event_session),
        game_platform=GAME_TYPE,
        command_type='bind',
        command_args=[],
    ):
-        user = await account.user
+        user, user_info = await gather(account.user, account.get_info())
        async with get_session() as session:
            bind_status = await create_or_update_bind(
                session=session,
-                chat_platform=get_platform(bot),
-                chat_account=event.get_user_id(),
+                user=nb_user,
                game_platform=GAME_TYPE,
                game_account=user.unique_identifier,
            )
-        user_info = await account.get_info()
        if bind_status in (BindStatus.SUCCESS, BindStatus.UPDATE):
+            netloc = get_self_netloc()
            async with HostPage(
                await render(
-                    'binding',
+                    'v1/binding',
                    Bind(
                        platform='TETR.IO',
                        status='unknown',
                        user=People(
-                            avatar=f'https://tetr.io/user-content/avatars/{user_info.data.user.id}.jpg?rv={user_info.data.user.avatar_revision}'
+                            avatar=f'http://{netloc}/host/resource/tetrio/avatars/{user.ID}?{urlencode({"revision": user_info.data.user.avatar_revision})}'
                            if user_info.data.user.avatar_revision is not None
                            else Avatar(type='identicon', hash=md5(user_info.data.user.id.encode()).hexdigest()),  # noqa: S324
                            name=user_info.data.user.username.upper(),
@@ -59,6 +58,4 @@ async def _(bot: Bot, event: Event, account: Player, event_session: EventSession
                    ),
                )
            ) as page_hash:
-                await UniMessage.image(
-                    raw=await screenshot(urlunparse(('http', get_self_netloc(), f'/host/{page_hash}.html', '', '', '')))
-                ).finish()
+                await UniMessage.image(raw=await screenshot(f'http://{netloc}/host/{page_hash}.html')).finish()
--- a/nonebot_plugin_tetris_stats/games/tetrio/query.py
+++ b/nonebot_plugin_tetris_stats/games/tetrio/query.py
@@ -1,17 +1,16 @@
-import contextlib
 from asyncio import gather
 from collections import defaultdict
 from datetime import date, datetime, timedelta, timezone
 from hashlib import md5
 from math import ceil, floor
-from typing import ClassVar
-from urllib.parse import urlunparse
+from typing import ClassVar, TypeVar, overload
+from urllib.parse import urlencode
 from zoneinfo import ZoneInfo

 from aiofiles import open
 from nonebot import get_driver
-from nonebot.adapters import Bot, Event
-from nonebot.compat import type_validate_json
+from nonebot.adapters import Event
+from nonebot.compat import model_dump, type_validate_json
 from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import At
 from nonebot_plugin_alconna.uniseg import UniMessage
@@ -20,16 +19,23 @@ from nonebot_plugin_localstore import get_data_file  # type: ignore[import-untyp
 from nonebot_plugin_orm import get_session
 from nonebot_plugin_session import EventSession  # type: ignore[import-untyped]
 from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_user import get_user  # type: ignore[import-untyped]
 from sqlalchemy import select
 from zstandard import ZstdDecompressor

 from ...db import query_bind_info, trigger
+from ...utils.exception import FallbackError
 from ...utils.host import HostPage, get_self_netloc
-from ...utils.platform import get_platform
+from ...utils.metrics import TetrisMetricsProWithPPSVS, get_metrics
 from ...utils.render import render
 from ...utils.render.schemas.base import Avatar, Ranking
-from ...utils.render.schemas.tetrio_info import Data, Info, Radar, TetraLeague, TetraLeagueHistory
-from ...utils.render.schemas.tetrio_info import User as TemplateUser
+from ...utils.render.schemas.tetrio_info import Data, Radar, TetraLeague, TetraLeagueHistory
+from ...utils.render.schemas.tetrio_info import Info as V1TemplateInfo
+from ...utils.render.schemas.tetrio_info import User as V1TemplateUser
+from ...utils.render.schemas.tetrio_info_v2 import Badge, Blitz, Sprint, Statistic, TetraLeagueStatistic, Zen
+from ...utils.render.schemas.tetrio_info_v2 import Info as V2TemplateInfo
+from ...utils.render.schemas.tetrio_info_v2 import TetraLeague as V2TemplateTetraLeague
+from ...utils.render.schemas.tetrio_info_v2 import User as V2TemplateUser
 from ...utils.screenshot import screenshot
 from ...utils.typing import Me, Number
 from ..constant import CANT_VERIFY_MESSAGE
@@ -38,17 +44,24 @@ from .api import Player, User, UserInfoSuccess
 from .api.models import TETRIOHistoricalData
 from .api.schemas.tetra_league import TetraLeagueSuccess
 from .api.schemas.user_info import NeverPlayedLeague, NeverRatedLeague, RatedLeague
-from .api.schemas.user_records import SoloModeRecord, SoloRecord
+from .api.schemas.user_records import SoloModeRecord, UserRecordsSuccess
 from .constant import GAME_TYPE, TR_MAX, TR_MIN
 from .model import IORank
+from .typing import Template

 UTC = timezone.utc

 driver = get_driver()


-@alc.assign('query')
-async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me, event_session: EventSession):
+@alc.assign('TETRIO.query')
+async def _(
+    event: Event,
+    matcher: Matcher,
+    target: At | Me,
+    event_session: EventSession,
+    template: Template | None = None,
+):
    async with trigger(
        session_persist_id=await get_session_persist_id(event_session),
        game_platform=GAME_TYPE,
@@ -58,38 +71,27 @@ async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me, event_ses
        async with get_session() as session:
            bind = await query_bind_info(
                session=session,
-                chat_platform=get_platform(bot),
-                chat_account=(target.target if isinstance(target, At) else event.get_user_id()),
+                user=await get_user(
+                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+                ),
                game_platform=GAME_TYPE,
            )
        if bind is None:
            await matcher.finish('未查询到绑定信息')
        message = UniMessage(CANT_VERIFY_MESSAGE)
        player = Player(user_id=bind.game_account, trust=True)
-        user, user_info, user_records = await gather(player.user, player.get_info(), player.get_records())
-        sprint = user_records.data.records.sprint
-        blitz = user_records.data.records.blitz
-        with contextlib.suppress(TypeError):
-            message += UniMessage.image(raw=await make_query_image(user, user_info, sprint.record, blitz.record))
-            await message.finish()
-        message += make_query_text(user_info, sprint, blitz)
-        await message.finish()
+        await (message + (await make_query_result(player, template or 'v1'))).finish()


-@alc.assign('query')
-async def _(account: Player, event_session: EventSession):
+@alc.assign('TETRIO.query')
+async def _(account: Player, event_session: EventSession, template: Template | None = None):
    async with trigger(
        session_persist_id=await get_session_persist_id(event_session),
        game_platform=GAME_TYPE,
        command_type='query',
        command_args=[],
    ):
-        user, user_info, user_records = await gather(account.user, account.get_info(), account.get_records())
-        sprint = user_records.data.records.sprint
-        blitz = user_records.data.records.blitz
-        with contextlib.suppress(TypeError):
-            await UniMessage.image(raw=await make_query_image(user, user_info, sprint.record, blitz.record)).finish()
-        await make_query_text(user_info, sprint, blitz).finish()
+        await (await make_query_result(account, template or 'v1')).finish()


 def get_value_bounds(values: list[int | float]) -> tuple[int, int]:
@@ -211,34 +213,62 @@ async def query_historical_data(user: User, user_info: UserInfoSuccess) -> list[
    return histories


-async def make_query_image(
-    user: User, user_info: UserInfoSuccess, sprint: SoloRecord | None, blitz: SoloRecord | None
-) -> bytes:
+L = TypeVar('L', NeverPlayedLeague, NeverRatedLeague, RatedLeague)
+
+
+@overload
+def get_league(user_info: UserInfoSuccess, league_type: type[L]) -> L: ...
+@overload
+def get_league(
+    user_info: UserInfoSuccess, league_type: None = None
+) -> NeverPlayedLeague | NeverRatedLeague | RatedLeague: ...
+def get_league(
+    user_info: UserInfoSuccess, league_type: type[L] | None = None
+) -> L | NeverPlayedLeague | NeverRatedLeague | RatedLeague:
    league = user_info.data.user.league
-    if not isinstance(league, RatedLeague) or league.vs is None:
-        raise TypeError
-    user_name = user_info.data.user.username.upper()
+    if league_type is None:
+        return league
+    if isinstance(league, league_type):
+        return league
+    raise FallbackError
+
+
+def get_sprint(user_records: UserRecordsSuccess) -> SoloModeRecord:
+    return user_records.data.records.sprint
+
+
+def get_blitz(user_records: UserRecordsSuccess) -> SoloModeRecord:
+    return user_records.data.records.blitz
+
+
+async def make_query_image_v1(player: Player) -> bytes:
+    user, user_info, user_records = await gather(player.user, player.get_info(), player.get_records())
+    league = get_league(user_info, RatedLeague)
+    sprint, blitz = get_sprint(user_records).record, get_blitz(user_records).record
+    if league.vs is None:
+        raise FallbackError
    histories = await query_historical_data(user, user_info)
    value_max, value_min = get_value_bounds([i.tr for i in histories])
    split_value, offset = get_split(value_max, value_min)
    if sprint is not None:
        duration = timedelta(milliseconds=sprint.endcontext.final_time).total_seconds()
-        sprint_value = f'{duration:.1f}s' if duration < 60 else f'{duration // 60:.0f}m {duration % 60:.1f}s'  # noqa: PLR2004
+        sprint_value = f'{duration:.3f}s' if duration < 60 else f'{duration // 60:.0f}m {duration % 60:.3f}s'  # noqa: PLR2004
    else:
        sprint_value = 'N/A'
    blitz_value = f'{blitz.endcontext.score:,}' if blitz is not None else 'N/A'
+    netloc = get_self_netloc()
    async with HostPage(
-        await render(
-            'tetrio/info',
-            Info(
-                user=TemplateUser(
-                    avatar=f'https://tetr.io/user-content/avatars/{user_info.data.user.id}.jpg?rv={user_info.data.user.avatar_revision}'
+        page=await render(
+            'v1/tetrio/info',
+            V1TemplateInfo(
+                user=V1TemplateUser(
+                    avatar=f'http://{netloc}/host/resource/tetrio/avatars/{user.ID}?{urlencode({"revision": user_info.data.user.avatar_revision})}'
                    if user_info.data.user.avatar_revision is not None
                    else Avatar(
                        type='identicon',
                        hash=md5(user_info.data.user.id.encode()).hexdigest(),  # noqa: S324
                    ),
-                    name=user_name,
+                    name=user.name.upper(),
                    bio=user_info.data.user.bio,
                ),
                ranking=Ranking(
@@ -276,12 +306,129 @@ async def make_query_image(
            ),
        )
    ) as page_hash:
-        return await screenshot(urlunparse(('http', get_self_netloc(), f'/host/{page_hash}.html', '', '', '')))
+        return await screenshot(f'http://{netloc}/host/{page_hash}.html')


-def make_query_text(user_info: UserInfoSuccess, sprint: SoloModeRecord, blitz: SoloModeRecord) -> UniMessage:
-    league = user_info.data.user.league
-    user_name = user_info.data.user.username.upper()
+N = TypeVar('N', int, float)
+
+
+def handling_special_value(value: N) -> N | None:
+    return value if value != -1 else None
+
+
+async def make_query_image_v2(player: Player) -> bytes:
+    user, user_info, user_records = await gather(player.user, player.get_info(), player.get_records())
+    league = get_league(user_info)
+    sprint, blitz = get_sprint(user_records), get_blitz(user_records)
+
+    if sprint.record is not None:
+        duration = timedelta(milliseconds=sprint.record.endcontext.final_time).total_seconds()
+        sprint_value = f'{duration:.3f}s' if duration < 60 else f'{duration // 60:.0f}m {duration % 60:.3f}s'  # noqa: PLR2004
+    else:
+        sprint_value = 'N/A'
+
+    play_time: str | None
+    if (game_time := handling_special_value(user_info.data.user.gametime)) is not None:
+        if game_time // 3600 > 0:
+            play_time = f'{game_time//3600:.0f}h {game_time % 3600 // 60:.0f}m {game_time % 60:.0f}s'
+        elif game_time // 60 > 0:
+            play_time = f'{game_time//60:.0f}m {game_time % 60:.0f}s'
+        else:
+            play_time = f'{game_time:.0f}s'
+    else:
+        play_time = game_time
+    netloc = get_self_netloc()
+    async with HostPage(
+        await render(
+            'v2/tetrio/info',
+            V2TemplateInfo(
+                user=V2TemplateUser(
+                    id=user.ID,
+                    name=user.name.upper(),
+                    bio=user_info.data.user.bio,
+                    banner=f'http://{netloc}/host/resource/tetrio/banners/{user.ID}?{urlencode({"revision": user_info.data.user.avatar_revision})}'
+                    if user_info.data.user.banner_revision is not None and user_info.data.user.banner_revision != 0
+                    else None,
+                    avatar=f'http://{netloc}/host/resource/tetrio/avatars/{user.ID}?{urlencode({"revision": user_info.data.user.avatar_revision})}'
+                    if user_info.data.user.avatar_revision is not None
+                    else Avatar(
+                        type='identicon',
+                        hash=md5(user_info.data.user.id.encode()).hexdigest(),  # noqa: S324
+                    ),
+                    badges=[
+                        Badge(
+                            id=i.id,
+                            description=i.label,
+                            group=i.group,
+                            receive_at=i.ts if isinstance(i.ts, datetime) else None,
+                        )
+                        for i in user_info.data.user.badges
+                    ],
+                    country=user_info.data.user.country,
+                    xp=user_info.data.user.xp,
+                    friend_count=user_info.data.user.friend_count or 0,
+                    supporter_tier=user_info.data.user.supporter_tier,
+                    bad_standing=user_info.data.user.badstanding or False,
+                    verified=user_info.data.user.verified,
+                    playtime=play_time,
+                    join_at=user_info.data.user.ts,
+                ),
+                tetra_league=V2TemplateTetraLeague(
+                    rank=league.rank,
+                    highest_rank=league.bestrank,
+                    tr=round(league.rating, 2),
+                    glicko=round(league.glicko, 2),
+                    rd=round(league.rd, 2),
+                    global_rank=handling_special_value(league.standing),
+                    country_rank=handling_special_value(league.standing_local),
+                    pps=(
+                        metrics := get_metrics(pps=league.pps, apm=league.apm, vs=league.vs)
+                        if league.vs is not None
+                        else get_metrics(pps=league.pps, apm=league.apm)
+                    ).pps,
+                    apm=metrics.apm,
+                    apl=metrics.apl,
+                    vs=metrics.vs if isinstance(metrics, TetrisMetricsProWithPPSVS) else None,
+                    adpl=metrics.adpl if isinstance(metrics, TetrisMetricsProWithPPSVS) else None,
+                    statistic=TetraLeagueStatistic(
+                        total=league.gamesplayed,
+                        wins=league.gameswon,
+                    ),
+                )
+                if isinstance(league, RatedLeague)
+                else None,
+                statistic=Statistic(
+                    total=handling_special_value(user_info.data.user.gamesplayed),
+                    wins=handling_special_value(user_info.data.user.gameswon),
+                ),
+                sprint=Sprint(
+                    time=sprint_value,
+                    global_rank=sprint.rank,
+                    play_at=sprint.record.ts,
+                )
+                if sprint.record is not None
+                else None,
+                blitz=Blitz(
+                    score=blitz.record.endcontext.score,
+                    global_rank=blitz.rank,
+                    play_at=blitz.record.ts,
+                )
+                if blitz.record is not None
+                else None,
+                zen=Zen.model_validate(model_dump(user_records.data.zen)),
+            ),
+        ),
+    ) as page_hash:
+        return await screenshot(f'http://{netloc}/host/{page_hash}.html')
+
+
+async def make_query_text(player: Player) -> UniMessage:
+    user, user_info, user_records = await gather(player.user, player.get_info(), player.get_records())
+    league = get_league(user_info)
+    sprint, blitz = get_sprint(user_records), get_blitz(user_records)
+
+    user_name = user.name.upper()
+
    message = ''
    if isinstance(league, NeverPlayedLeague):
        message += f'用户 {user_name} 没有排位统计数据'
@@ -294,12 +441,15 @@ def make_query_text(user_info: UserInfoSuccess, sprint: SoloModeRecord, blitz: S
            else:
                message += f'{league.rank.upper()} 段用户 {user_name} {round(league.rating,2)} TR (#{league.standing})'
            message += f', 段位分 {round(league.glicko,2)}±{round(league.rd,2)}, 最近十场的数据:'
-        lpm = league.pps * 24
-        message += f"\nL'PM: {round(lpm, 2)} ( {league.pps} pps )"
-        message += f'\nAPM: {league.apm} ( x{round(league.apm/lpm,2)} )'
-        if league.vs is not None:
-            adpm = league.vs * 0.6
-            message += f'\nADPM: {round(adpm,2)} ( x{round(adpm/lpm,2)} ) ( {league.vs}vs )'
+        metrics = (
+            get_metrics(pps=league.pps, apm=league.apm, vs=league.vs)
+            if league.vs is not None
+            else get_metrics(pps=league.pps, apm=league.apm)
+        )
+        message += f"\nL'PM: {metrics.lpm} ( {metrics.pps} pps )"
+        message += f'\nAPM: {metrics.apm} ( x{metrics.apl} )'
+        if isinstance(metrics, TetrisMetricsProWithPPSVS):
+            message += f'\nADPM: {metrics.adpm} ( x{metrics.adpl} ) ( {metrics.vs}vs )'
    if sprint.record is not None:
        message += f'\n40L: {round(sprint.record.endcontext.final_time/1000,2)}s'
        message += f' ( #{sprint.rank} )' if sprint.rank is not None else ''
@@ -309,6 +459,17 @@ def make_query_text(user_info: UserInfoSuccess, sprint: SoloModeRecord, blitz: S
    return UniMessage(message)


+async def make_query_result(player: Player, template: Template) -> UniMessage:
+    try:
+        if template == 'v1':
+            return UniMessage.image(raw=await make_query_image_v1(player))
+        if template == 'v2':
+            return UniMessage.image(raw=await make_query_image_v2(player))
+    except FallbackError:
+        ...
+    return await make_query_text(player)
+
+
 class FullExport:
    cache: ClassVar[defaultdict[str, set[tuple[datetime, Number]]]] = defaultdict(set)
    latest_update: ClassVar[date | None] = None
--- a/nonebot_plugin_tetris_stats/games/tetrio/rank.py
+++ b/nonebot_plugin_tetris_stats/games/tetrio/rank.py
@@ -37,7 +37,7 @@ UTC = timezone.utc
 driver = get_driver()


-@alc.assign('rank')
+@alc.assign('TETRIO.rank')
 async def _(matcher: Matcher, rank: Rank, event_session: EventSession):
    async with trigger(
        session_persist_id=await get_session_persist_id(event_session),
--- a/nonebot_plugin_tetris_stats/games/tetrio/typing.py
+++ b/nonebot_plugin_tetris_stats/games/tetrio/typing.py
@@ -0,0 +1,3 @@
+from typing import Literal
+
+Template = Literal['v1', 'v2']
--- a/nonebot_plugin_tetris_stats/games/top/init.py
+++ b/nonebot_plugin_tetris_stats/games/top/init.py
@@ -1,11 +1,9 @@
-from arclet.alconna import Alconna, AllParam, Arg, ArgFlag, Args, CommandMeta, Option
-from nonebot_plugin_alconna import At, on_alconna
+from arclet.alconna import Arg, ArgFlag, Args, Subcommand
+from nonebot_plugin_alconna import At

-from ... import ns
 from ...utils.exception import MessageFormatError
 from ...utils.typing import Me
-from .. import add_default_handlers
-from ..constant import BIND_COMMAND, QUERY_COMMAND
+from .. import add_block_handlers, alc
 from .api import Player
 from .constant import USER_NAME

@@ -16,31 +14,28 @@ def get_player(name: str) -> Player | MessageFormatError:
    return MessageFormatError('用户名/ID不合法')


-alc = on_alconna(
-    Alconna(
-        'top',
-        Option(
-            BIND_COMMAND[0],
+alc.command.add(
+    Subcommand(
+        'TOP',
+        Subcommand(
+            'bind',
            Args(
                Arg(
                    'account',
                    get_player,
-                    notice='TOP 用户名',
+                    notice='TOP 用户名 / ID',
                    flags=[ArgFlag.HIDDEN],
                )
            ),
-            alias=BIND_COMMAND[1:],
-            compact=True,
-            dest='bind',
            help_text='绑定 TOP 账号',
        ),
-        Option(
-            QUERY_COMMAND[0],
+        Subcommand(
+            'query',
            Args(
                Arg(
                    'target',
                    At | Me,
-                    notice='@想要查询的人 | 自己',
+                    notice='@想要查询的人 / 自己',
                    flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
                ),
                Arg(
@@ -50,25 +45,15 @@ alc = on_alconna(
                    flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
                ),
            ),
-            alias=QUERY_COMMAND[1:],
-            compact=True,
-            dest='query',
            help_text='查询 TOP 游戏信息',
        ),
-        Arg('other', AllParam, flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL]),
-        meta=CommandMeta(
-            description='查询 TetrisOnline波兰服 的信息',
-            example='top绑定scdhh\ntop查我',
-            compact=True,
-            fuzzy_match=True,
-        ),
-        namespace=ns,
-    ),
-    skip_for_unmatch=False,
-    auto_send_output=True,
-    aliases={'TOP'},
+        help_text='TOP 游戏相关指令',
+    )
 )

-from . import bind, query  # noqa: E402, F401
+alc.shortcut('(?i:top)(?i:绑|绑定|bind)', {'command': 'tstats TOP bind', 'humanized': 'top绑定'})
+alc.shortcut('(?i:top)(?i:查|查询|query|stats)', {'command': 'tstats TOP query', 'humanized': 'top查'})

-add_default_handlers(alc)
+add_block_handlers(alc.assign('TOP.query'))
+
+from . import bind, query  # noqa: E402, F401
--- a/nonebot_plugin_tetris_stats/games/top/bind.py
+++ b/nonebot_plugin_tetris_stats/games/top/bind.py
@@ -1,16 +1,13 @@
-from urllib.parse import urlunparse
-
-from nonebot.adapters import Bot
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
 from nonebot_plugin_session import EventSession  # type: ignore[import-untyped]
 from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_user import User  # type: ignore[import-untyped]
 from nonebot_plugin_userinfo import BotUserInfo, EventUserInfo, UserInfo  # type: ignore[import-untyped]

 from ...db import BindStatus, create_or_update_bind, trigger
-from ...utils.avatar import get_avatar
 from ...utils.host import HostPage, get_self_netloc
-from ...utils.platform import get_platform
+from ...utils.image import get_avatar
 from ...utils.render import Bind, render
 from ...utils.render.schemas.base import People
 from ...utils.screenshot import screenshot
@@ -19,13 +16,13 @@ from .api import Player
 from .constant import GAME_TYPE


-@alc.assign('bind')
+@alc.assign('TOP.bind')
 async def _(
-    bot: Bot,
+    nb_user: User,
    account: Player,
    event_session: EventSession,
-    bot_info: UserInfo = BotUserInfo(),  # noqa: B008
    event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
+    bot_info: UserInfo = BotUserInfo(),  # noqa: B008
 ):
    async with trigger(
        session_persist_id=await get_session_persist_id(event_session),
@@ -37,15 +34,14 @@ async def _(
        async with get_session() as session:
            bind_status = await create_or_update_bind(
                session=session,
-                chat_platform=get_platform(bot),
-                chat_account=event_user_info.user_id,
+                user=nb_user,
                game_platform=GAME_TYPE,
                game_account=user.unique_identifier,
            )
        if bind_status in (BindStatus.SUCCESS, BindStatus.UPDATE):
            async with HostPage(
                await render(
-                    'binding',
+                    'v1/binding',
                    Bind(
                        platform=GAME_TYPE,
                        status='unknown',
@@ -62,5 +58,5 @@ async def _(
                )
            ) as page_hash:
                await UniMessage.image(
-                    raw=await screenshot(urlunparse(('http', get_self_netloc(), f'/host/{page_hash}.html', '', '', '')))
+                    raw=await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
                ).finish()
--- a/nonebot_plugin_tetris_stats/games/top/query.py
+++ b/nonebot_plugin_tetris_stats/games/top/query.py
@@ -1,14 +1,14 @@
-from nonebot.adapters import Bot, Event
+from nonebot.adapters import Event
 from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import At
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
 from nonebot_plugin_session import EventSession  # type: ignore[import-untyped]
 from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_user import get_user  # type: ignore[import-untyped]

 from ...db import query_bind_info, trigger
 from ...utils.metrics import get_metrics
-from ...utils.platform import get_platform
 from ...utils.typing import Me
 from ..constant import CANT_VERIFY_MESSAGE
 from . import alc
@@ -17,8 +17,8 @@ from .api.schemas.user_profile import UserProfile
 from .constant import GAME_TYPE


-@alc.assign('query')
-async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me, event_session: EventSession):
+@alc.assign('TOP.query')
+async def _(event: Event, matcher: Matcher, target: At | Me, event_session: EventSession):
    async with trigger(
        session_persist_id=await get_session_persist_id(event_session),
        game_platform=GAME_TYPE,
@@ -28,8 +28,9 @@ async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me, event_ses
        async with get_session() as session:
            bind = await query_bind_info(
                session=session,
-                chat_platform=get_platform(bot),
-                chat_account=(target.target if isinstance(target, At) else event.get_user_id()),
+                user=await get_user(
+                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+                ),
                game_platform=GAME_TYPE,
            )
        if bind is None:
@@ -38,7 +39,7 @@ async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me, event_ses
        await (message + make_query_text(await Player(user_name=bind.game_account, trust=True).get_profile())).finish()


-@alc.assign('query')
+@alc.assign('TOP.query')
 async def _(account: Player, event_session: EventSession):
    async with trigger(
        session_persist_id=await get_session_persist_id(event_session),
--- a/nonebot_plugin_tetris_stats/games/tos/init.py
+++ b/nonebot_plugin_tetris_stats/games/tos/init.py
@@ -1,11 +1,9 @@
-from arclet.alconna import Alconna, AllParam, Arg, ArgFlag, Args, CommandMeta, Option
-from nonebot_plugin_alconna import At, on_alconna
+from arclet.alconna import Arg, ArgFlag, Args, Subcommand
+from nonebot_plugin_alconna import At

-from ... import ns
 from ...utils.exception import MessageFormatError
 from ...utils.typing import Me
-from .. import add_default_handlers
-from ..constant import BIND_COMMAND, QUERY_COMMAND
+from .. import add_block_handlers, alc
 from .api import Player
 from .constant import USER_NAME

@@ -21,31 +19,28 @@ def get_player(teaid_or_name: str) -> Player | MessageFormatError:
    return MessageFormatError('用户名/ID不合法')


-alc = on_alconna(
-    Alconna(
-        '茶服',
-        Option(
-            BIND_COMMAND[0],
+alc.command.add(
+    Subcommand(
+        'TOS',
+        Subcommand(
+            'bind',
            Args(
                Arg(
                    'account',
                    get_player,
-                    notice='茶服 用户名 / TeaID',
+                    notice='茶服 用户名 / ID',
                    flags=[ArgFlag.HIDDEN],
                )
            ),
-            alias=BIND_COMMAND[1:],
-            compact=True,
-            dest='bind',
            help_text='绑定 茶服 账号',
        ),
-        Option(
-            QUERY_COMMAND[0],
+        Subcommand(
+            'query',
            Args(
                Arg(
                    'target',
                    At | Me,
-                    notice='@想要查询的人 | 自己',
+                    notice='@想要查询的人 / 自己',
                    flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
                ),
                Arg(
@@ -54,28 +49,16 @@ alc = on_alconna(
                    notice='茶服 用户名 / TeaID',
                    flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
                ),
-                # 如果放在一个 Union Args 里, 验证顺序不能保证, 可能出错
            ),
-            alias=QUERY_COMMAND[1:],
-            compact=True,
-            dest='query',
            help_text='查询 茶服 游戏信息',
        ),
-        Arg('other', AllParam, flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL]),
-        meta=CommandMeta(
-            description='查询 TetrisOnline茶服 的信息',
-            example='茶服查我',
-            compact=True,
-            fuzzy_match=True,
-        ),
-        namespace=ns,
-    ),
-    skip_for_unmatch=False,
-    auto_send_output=True,
-    aliases={'tos', 'TOS'},
+        help_text='茶服 游戏相关指令',
+    )
 )

+alc.shortcut('(?i:tos|茶服)(?i:绑|绑定|bind)', {'command': 'tstats TOS bind', 'humanized': '茶服绑定'})
+alc.shortcut('(?i:tos|茶服)(?i:查|查询|query|stats)', {'command': 'tstats TOS query', 'humanized': '茶服查'})
+
+add_block_handlers(alc.assign('TOS.query'))

 from . import bind, query  # noqa: E402, F401
-
-add_default_handlers(alc)
--- a/nonebot_plugin_tetris_stats/games/tos/bind.py
+++ b/nonebot_plugin_tetris_stats/games/tos/bind.py
@@ -1,16 +1,13 @@
-from urllib.parse import urlunparse
-
-from nonebot.adapters import Bot
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
 from nonebot_plugin_session import EventSession  # type: ignore[import-untyped]
 from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_user import User  # type: ignore[import-untyped]
 from nonebot_plugin_userinfo import BotUserInfo, EventUserInfo, UserInfo  # type: ignore[import-untyped]

 from ...db import BindStatus, create_or_update_bind, trigger
-from ...utils.avatar import get_avatar
 from ...utils.host import HostPage, get_self_netloc
-from ...utils.platform import get_platform
+from ...utils.image import get_avatar
 from ...utils.render import Bind, render
 from ...utils.render.schemas.base import People
 from ...utils.screenshot import screenshot
@@ -19,13 +16,13 @@ from .api import Player
 from .constant import GAME_TYPE


-@alc.assign('bind')
+@alc.assign('TOS.bind')
 async def _(
-    bot: Bot,
+    nb_user: User,
    account: Player,
    event_session: EventSession,
-    bot_info: UserInfo = BotUserInfo(),  # noqa: B008
    event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
+    bot_info: UserInfo = BotUserInfo(),  # noqa: B008
 ):
    async with trigger(
        session_persist_id=await get_session_persist_id(event_session),
@@ -37,8 +34,7 @@ async def _(
        async with get_session() as session:
            bind_status = await create_or_update_bind(
                session=session,
-                chat_platform=get_platform(bot),
-                chat_account=event_user_info.user_id,
+                user=nb_user,
                game_platform=GAME_TYPE,
                game_account=user.unique_identifier,
            )
@@ -46,7 +42,7 @@ async def _(
        if bind_status in (BindStatus.SUCCESS, BindStatus.UPDATE):
            async with HostPage(
                await render(
-                    'binding',
+                    'v1/binding',
                    Bind(
                        platform=GAME_TYPE,
                        status='unknown',
@@ -62,5 +58,5 @@ async def _(
                )
            ) as page_hash:
                await UniMessage.image(
-                    raw=await screenshot(urlunparse(('http', get_self_netloc(), f'/host/{page_hash}.html', '', '', '')))
+                    raw=await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
                ).finish()
--- a/nonebot_plugin_tetris_stats/games/tos/query.py
+++ b/nonebot_plugin_tetris_stats/games/tos/query.py
@@ -2,23 +2,22 @@ from asyncio import gather
 from datetime import timedelta
 from http import HTTPStatus
 from typing import Literal, NamedTuple
-from urllib.parse import urlunparse

-from nonebot.adapters import Bot, Event
+from nonebot.adapters import Event
 from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import At
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession  # type: ignore[import-untyped]  # type: ignore[import-untyped]
+from nonebot_plugin_session import EventSession  # type: ignore[import-untyped]
 from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_user import get_user  # type: ignore[import-untyped]
 from nonebot_plugin_userinfo import EventUserInfo, UserInfo  # type: ignore[import-untyped]

 from ...db import query_bind_info, trigger
-from ...utils.avatar import get_avatar
 from ...utils.exception import RequestError
 from ...utils.host import HostPage, get_self_netloc
+from ...utils.image import get_avatar
 from ...utils.metrics import TetrisMetricsProWithLPMADPM, get_metrics
-from ...utils.platform import get_platform
 from ...utils.render import render
 from ...utils.render.schemas.base import People, Ranking
 from ...utils.render.schemas.tos_info import Info, Multiplayer, Radar
@@ -34,7 +33,7 @@ from .constant import GAME_TYPE
 def add_special_handlers(
    teaid_prefix: Literal['onebot-', 'kook-', 'discord-', 'qqguild-'], match_event: type[Event]
 ) -> None:
-    @alc.assign('query')
+    @alc.assign('TOS.query')
    async def _(
        event: Event,
        target: At | Me,
@@ -60,7 +59,7 @@ def add_special_handlers(
                        await UniMessage.image(
                            raw=await make_query_image(user_info, game_data, event_user_info)
                        ).finish()
-                    await (await make_query_text(user_info, game_data)).finish()
+                    await make_query_text(user_info, game_data).finish()
                except RequestError as e:
                    if e.status_code == HTTPStatus.BAD_REQUEST and '未找到此用户' in e.message:
                        return
@@ -98,9 +97,8 @@ except ImportError:
    pass


-@alc.assign('query')
-async def _(  # noqa: PLR0913
-    bot: Bot,
+@alc.assign('TOS.query')
+async def _(
    event: Event,
    matcher: Matcher,
    target: At | Me,
@@ -116,8 +114,9 @@ async def _(  # noqa: PLR0913
        async with get_session() as session:
            bind = await query_bind_info(
                session=session,
-                chat_platform=get_platform(bot),
-                chat_account=(target.target if isinstance(target, At) else event.get_user_id()),
+                user=await get_user(
+                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+                ),
                game_platform=GAME_TYPE,
            )
        if bind is None:
@@ -129,10 +128,10 @@ async def _(  # noqa: PLR0913
            await (
                message + UniMessage.image(raw=await make_query_image(user_info, game_data, event_user_info))
            ).finish()
-        await (message + await make_query_text(user_info, game_data)).finish()
+        await (message + make_query_text(user_info, game_data)).finish()


-@alc.assign('query')
+@alc.assign('TOS.query')
 async def _(account: Player, event_session: EventSession, event_user_info: UserInfo = EventUserInfo()):  # noqa: B008
    async with trigger(
        session_persist_id=await get_session_persist_id(event_session),
@@ -143,7 +142,7 @@ async def _(account: Player, event_session: EventSession, event_user_info: UserI
        user_info, game_data = await gather(account.get_info(), get_game_data(account))
        if game_data is not None:
            await UniMessage.image(raw=await make_query_image(user_info, game_data, event_user_info)).finish()
-        await (await make_query_text(user_info, game_data)).finish()
+        await make_query_text(user_info, game_data).finish()


 class GameData(NamedTuple):
@@ -201,10 +200,10 @@ async def get_game_data(player: Player, query_num: int = 50) -> GameData | None:
 async def make_query_image(user_info: UserInfoSuccess, game_data: GameData, event_user_info: UserInfo) -> bytes:
    metrics = game_data.metrics
    duration = timedelta(milliseconds=float(user_info.data.pb_sprint)).total_seconds()
-    sprint_value = f'{duration:.1f}s' if duration < 60 else f'{duration // 60:.0f}m {duration % 60:.1f}s'  # noqa: PLR2004
+    sprint_value = f'{duration:.3f}s' if duration < 60 else f'{duration // 60:.0f}m {duration % 60:.3f}s'  # noqa: PLR2004
    async with HostPage(
        await render(
-            'tos/info',
+            'v1/tos/info',
            Info(
                user=People(avatar=await get_avatar(event_user_info, 'Data URI', None), name=user_info.data.name),
                ranking=Ranking(rating=float(user_info.data.ranking), rd=round(float(user_info.data.rd_now), 2)),
@@ -230,10 +229,10 @@ async def make_query_image(user_info: UserInfoSuccess, game_data: GameData, even
            ),
        )
    ) as page_hash:
-        return await screenshot(urlunparse(('http', get_self_netloc(), f'/host/{page_hash}.html', '', '', '')))
+        return await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')


-async def make_query_text(user_info: UserInfoSuccess, game_data: GameData | None) -> UniMessage:
+def make_query_text(user_info: UserInfoSuccess, game_data: GameData | None) -> UniMessage:
    user_data = user_info.data
    message = f'用户 {user_data.name} ({user_data.teaid}) '
    if user_data.ranked_games == '0':
--- a/nonebot_plugin_tetris_stats/utils/exception.py
+++ b/nonebot_plugin_tetris_stats/utils/exception.py
@@ -27,6 +27,10 @@ class MessageFormatError(NeedCatchError):
    """用户发送的消息格式不正确"""


+class FallbackError(NeedCatchError):
+    """需要回滚至更通用的方法"""
+
+
 class DoNotCatchError(TetrisStatsError):
    """不应该被捕获的异常基类"""

@@ -35,5 +39,5 @@ class WhatTheFuckError(DoNotCatchError):
    """用于表示不应该出现的情况 ("""


-class HandleNotFinishedError(DoNotCatchError):
-    """任务没有正常完成处理的错误"""
+class NoFallbackError(DoNotCatchError):  # 暂时没用 但是先写了
+    """没有可用的回退方法"""
--- a/nonebot_plugin_tetris_stats/utils/host.py
+++ b/nonebot_plugin_tetris_stats/utils/host.py
@@ -1,26 +1,27 @@
 from hashlib import sha256
 from ipaddress import IPv4Address, IPv6Address
-from typing import TYPE_CHECKING, ClassVar
+from typing import TYPE_CHECKING, ClassVar, Literal

-from fastapi import FastAPI, status
-from fastapi.responses import HTMLResponse
+from fastapi import FastAPI, Path, status
+from fastapi.responses import FileResponse, HTMLResponse, Response
 from fastapi.staticfiles import StaticFiles
 from nonebot import get_app, get_driver
 from nonebot.log import logger
-from nonebot_plugin_localstore import get_cache_dir  # type: ignore[import-untyped]

+from ..config.config import CACHE_PATH
+from .image import img_to_png
+from .request import Request
 from .templates import templates_dir

 if TYPE_CHECKING:
    from pydantic import IPvAnyAddress

-app = get_app()
+app: FastAPI = get_app()

 driver = get_driver()

 global_config = driver.config

-cache_dir = get_cache_dir('nonebot_plugin_tetris_stats')

 if not isinstance(app, FastAPI):
    msg = '本插件需要 FastAPI 驱动器才能运行'
@@ -60,6 +61,22 @@ async def _(page_hash: str) -> HTMLResponse:
    return NOT_FOUND


+@app.get('/host/resource/tetrio/{resource_type}/{user_id}', status_code=status.HTTP_200_OK)
+async def _(
+    resource_type: Literal['avatars', 'banners'], revision: int, user_id: str = Path(regex=r'^[a-f0-9]{24}$')
+) -> Response:
+    if not (path := CACHE_PATH / 'tetrio' / resource_type / f'{user_id}_{revision}.png').exists():
+        path.parent.mkdir(parents=True, exist_ok=True)
+        path.write_bytes(
+            img_to_png(
+                await Request.request(
+                    f'https://tetr.io/user-content/{resource_type}/{user_id}.jpg?rv={revision}', is_json=False
+                )
+            )
+        )
+    return FileResponse(path)
+
+
 def get_self_netloc() -> str:
    host: IPv4Address | IPv6Address | IPvAnyAddress = global_config.host
    if isinstance(host, IPv4Address):
--- a/nonebot_plugin_tetris_stats/utils/avatar.py
+++ b/nonebot_plugin_tetris_stats/utils/avatar.py
@@ -52,3 +52,11 @@ async def get_avatar(user: UserInfo, scheme: Literal['Data URI', 'bytes'], defau
            raise TypeError(msg)
        return f'data:{Image.MIME[avatar_format]};base64,{b64encode(bot_avatar).decode()}'
    return bot_avatar
+
+
+def img_to_png(image: bytes) -> bytes:
+    """将图片转换为 PNG 格式"""
+    result = BytesIO()
+    with Image.open(BytesIO(image)) as img:
+        img.save(result, 'PNG')
+    return result.getvalue()
--- a/nonebot_plugin_tetris_stats/utils/platform.py
+++ b/nonebot_plugin_tetris_stats/utils/platform.py
@@ -1,19 +0,0 @@
-from nonebot.adapters import Bot
-
-
-def get_platform(bot: Bot) -> str:
-    try:
-        from nonebot.adapters.onebot.v12 import Bot as OB12Bot
-
-        if isinstance(bot, OB12Bot):
-            return bot.platform
-    except ImportError:
-        pass
-    try:
-        from nonebot.adapters.satori import Bot as SaBot
-
-        if isinstance(bot, SaBot):
-            return bot.platform
-    except ImportError:
-        pass
-    return bot.type
--- a/nonebot_plugin_tetris_stats/utils/render/init.py
+++ b/nonebot_plugin_tetris_stats/utils/render/init.py
@@ -6,6 +6,7 @@ from nonebot.compat import PYDANTIC_V2
 from ..templates import templates_dir
 from .schemas.bind import Bind
 from .schemas.tetrio_info import Info as TETRIOInfo
+from .schemas.tetrio_info_v2 import Info as TETRIOInfoV2
 from .schemas.top_info import Info as TOPInfo
 from .schemas.tos_info import Info as TOSInfo

@@ -15,23 +16,28 @@ env = Environment(


@overload
-async def render(render_type: Literal['binding'], data: Bind) -> str: ...
+async def render(render_type: Literal['v1/binding'], data: Bind) -> str: ...


@overload
-async def render(render_type: Literal['tetrio/info'], data: TETRIOInfo) -> str: ...
+async def render(render_type: Literal['v1/tetrio/info'], data: TETRIOInfo) -> str: ...


@overload
-async def render(render_type: Literal['top/info'], data: TOPInfo) -> str: ...
+async def render(render_type: Literal['v2/tetrio/info'], data: TETRIOInfoV2) -> str: ...


@overload
-async def render(render_type: Literal['tos/info'], data: TOSInfo) -> str: ...
+async def render(render_type: Literal['v1/top/info'], data: TOPInfo) -> str: ...
+
+
+@overload
+async def render(render_type: Literal['v1/tos/info'], data: TOSInfo) -> str: ...


 async def render(
-    render_type: Literal['binding', 'tetrio/info', 'top/info', 'tos/info'], data: Bind | TETRIOInfo | TOPInfo | TOSInfo
+    render_type: Literal['v1/binding', 'v1/tetrio/info', 'v2/tetrio/info', 'v1/top/info', 'v1/tos/info'],
+    data: Bind | TETRIOInfo | TETRIOInfoV2 | TOPInfo | TOSInfo,
 ) -> str:
    if PYDANTIC_V2:
        return await env.get_template('index.html').render_async(
--- a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio_info_v2.py
+++ b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio_info_v2.py
@@ -0,0 +1,96 @@
+from datetime import datetime
+
+from pydantic import BaseModel
+
+from ....games.tetrio.api.typing import Rank
+from ...typing import Number
+from .base import Avatar
+
+
+class Badge(BaseModel):
+    id: str
+    description: str
+    group: str | None
+    receive_at: datetime | None
+
+
+class User(BaseModel):
+    id: str
+    name: str
+    country: str | None
+
+    avatar: str | Avatar
+    banner: str | None
+
+    bio: str | None
+
+    friend_count: int
+    supporter_tier: int
+
+    verified: bool
+    bad_standing: bool
+
+    badges: list[Badge]
+    xp: Number
+
+    playtime: str | None
+    join_at: datetime | None
+
+
+class Statistic(BaseModel):
+    total: int | None
+    wins: int | None
+
+
+class TetraLeagueStatistic(BaseModel):
+    total: int
+    wins: int
+
+
+class TetraLeague(BaseModel):
+    rank: Rank
+    highest_rank: Rank
+
+    tr: Number
+
+    glicko: Number
+    rd: Number
+
+    global_rank: int | None
+    country_rank: int | None
+
+    pps: Number
+
+    apm: Number
+    apl: Number
+
+    vs: Number | None
+    adpl: Number | None
+
+    statistic: TetraLeagueStatistic
+
+
+class Sprint(BaseModel):
+    time: str
+    global_rank: int | None
+    play_at: datetime
+
+
+class Blitz(BaseModel):
+    score: int
+    global_rank: int | None
+    play_at: datetime
+
+
+class Zen(BaseModel):
+    score: int
+    level: int
+
+
+class Info(BaseModel):
+    user: User
+    tetra_league: TetraLeague | None
+    statistic: Statistic | None
+    sprint: Sprint | None
+    blitz: Blitz | None
+    zen: Zen
--- a/nonebot_plugin_tetris_stats/utils/retry.py
+++ b/nonebot_plugin_tetris_stats/utils/retry.py
@@ -1,38 +1,44 @@
 from asyncio import sleep
-from collections.abc import Awaitable, Callable
+from collections.abc import Callable, Coroutine
+from contextlib import suppress
 from datetime import timedelta
 from functools import wraps
-from typing import TypeVar, cast
+from typing import Any, ParamSpec, TypeVar

 from nonebot.log import logger
+from nonebot_plugin_alconna.uniseg import SerializeFailed, UniMessage

 T = TypeVar('T')
+P = ParamSpec('P')


 def retry(
    max_attempts: int = 3,
    exception_type: type[BaseException] | tuple[type[BaseException], ...] = Exception,
    delay: timedelta | None = None,
-) -> Callable[[Callable[..., Awaitable[T]]], Callable[..., Awaitable[T]]]:
-    def decorator(func: Callable[..., Awaitable[T]]) -> Callable[..., Awaitable[T]]:
+    reply: str | UniMessage | None = None,
+) -> Callable[[Callable[P, Coroutine[Any, Any, T]]], Callable[P, Coroutine[Any, Any, T]]]:
+    def decorator(func: Callable[P, Coroutine[Any, Any, T]]) -> Callable[P, Coroutine[Any, Any, T]]:
        @wraps(func)
-        async def wrapper(*args, **kwargs) -> T:  # noqa: ANN002, ANN003
-            attempts = 0
-            while attempts < max_attempts + 1:
+        async def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
+            for i in range(max_attempts + 1):
+                if i > 0:
+                    message = f'Retrying: {func.__name__} ({i}/{max_attempts})'
+                    logger.debug(message)
+                    with suppress(SerializeFailed):
+                        await UniMessage(reply or message).send()
+                if i == max_attempts:
+                    break
                try:
                    return await func(*args, **kwargs)
-                except exception_type as e:  # noqa: PERF203
+                except exception_type as e:
+                    if i == max_attempts:
+                        raise
                    logger.exception(e)
-                    attempts += 1
-                    if attempts <= max_attempts:
-                        if delay is not None:
-                            await sleep(delay.total_seconds())
-                        logger.debug(f'Retrying: {func.__name__} ({attempts}/{max_attempts})')
-                        continue
-                    raise
-            msg = 'Unexpectedly reached the end of the retry loop'
-            raise RuntimeError(msg)
+                    if delay is not None:
+                        await sleep(delay.total_seconds())
+            return await func(*args, **kwargs)

-        return cast(Callable[..., Awaitable[T]], wrapper)
+        return wrapper

    return decorator
--- a/nonebot_plugin_tetris_stats/utils/screenshot.py
+++ b/nonebot_plugin_tetris_stats/utils/screenshot.py
@@ -1,11 +1,15 @@
+from playwright.async_api import TimeoutError
+
 from .browser import BrowserManager
+from .retry import retry


+@retry(exception_type=TimeoutError, reply='截图失败, 重试中')
 async def screenshot(url: str) -> bytes:
    browser = await BrowserManager.get_browser()
    async with (
-        await browser.new_page(no_viewport=True, viewport={'width': 0, 'height': 0}) as page,
+        await browser.new_page(viewport={'width': 3000, 'height': 3000}) as page,
    ):
        await page.goto(url)
        await page.wait_for_load_state('networkidle')
-        return await page.screenshot(full_page=True, type='png')
+        return await page.locator('id=content').screenshot(timeout=5000, type='png')
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.

 [[package]]
 name = "aiocache"
@@ -254,13 +254,13 @@ zookeeper = ["kazoo"]

 [[package]]
 name = "arclet-alconna"
-version = "1.8.13"
+version = "1.8.14"
 description = "A High-performance, Generality, Humane Command Line Arguments Parser Library."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "arclet_alconna-1.8.13-py3-none-any.whl", hash = "sha256:7a85d51aa588c40e525f5df3a2e23db757cd051e06dd266401ddb6346cc857db"},
-    {file = "arclet_alconna-1.8.13.tar.gz", hash = "sha256:19aba65958578b3287af9afcf051da903104553460c6198d3f9398de4b8371f7"},
+    {file = "arclet_alconna-1.8.14-py3-none-any.whl", hash = "sha256:e74ec1d0ca6829592a15768f48c6af9e5d9bb75a4476a763550d71594f7019d7"},
+    {file = "arclet_alconna-1.8.14.tar.gz", hash = "sha256:77b4b15b1c6b9873554b0990310f587016d9982b086680150febc21fa17390d6"},
 ]

 [package.dependencies]
@@ -643,6 +643,20 @@ files = [
 [package.extras]
 test = ["pytest (>=6)"]

+[[package]]
+name = "expiringdict"
+version = "1.2.2"
+description = "Dictionary with auto-expiring values for caching purposes"
+optional = false
+python-versions = "*"
+files = [
+    {file = "expiringdict-1.2.2-py3-none-any.whl", hash = "sha256:09a5d20bc361163e6432a874edd3179676e935eb81b925eccef48d409a8a45e8"},
+    {file = "expiringdict-1.2.2.tar.gz", hash = "sha256:300fb92a7e98f15b05cf9a856c1415b3bc4f2e132be07daa326da6414c23ee09"},
+]
+
+[package.extras]
+tests = ["coverage", "coveralls", "dill", "mock", "nose"]
+
 [[package]]
 name = "fastapi"
 version = "0.111.0"
@@ -1204,13 +1218,9 @@ files = [
    {file = "lxml-5.2.2-cp36-cp36m-win_amd64.whl", hash = "sha256:edcfa83e03370032a489430215c1e7783128808fd3e2e0a3225deee278585196"},
    {file = "lxml-5.2.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:28bf95177400066596cdbcfc933312493799382879da504633d16cf60bba735b"},
    {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3a745cc98d504d5bd2c19b10c79c61c7c3df9222629f1b6210c0368177589fb8"},
-    {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1b590b39ef90c6b22ec0be925b211298e810b4856909c8ca60d27ffbca6c12e6"},
    {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b336b0416828022bfd5a2e3083e7f5ba54b96242159f83c7e3eebaec752f1716"},
-    {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:c2faf60c583af0d135e853c86ac2735ce178f0e338a3c7f9ae8f622fd2eb788c"},
    {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:4bc6cb140a7a0ad1f7bc37e018d0ed690b7b6520ade518285dc3171f7a117905"},
-    {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7ff762670cada8e05b32bf1e4dc50b140790909caa8303cfddc4d702b71ea184"},
    {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:57f0a0bbc9868e10ebe874e9f129d2917750adf008fe7b9c1598c0fbbfdde6a6"},
-    {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:a6d2092797b388342c1bc932077ad232f914351932353e2e8706851c870bca1f"},
    {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:60499fe961b21264e17a471ec296dcbf4365fbea611bf9e303ab69db7159ce61"},
    {file = "lxml-5.2.2-cp37-cp37m-win32.whl", hash = "sha256:d9b342c76003c6b9336a80efcc766748a333573abf9350f4094ee46b006ec18f"},
    {file = "lxml-5.2.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b16db2770517b8799c79aa80f4053cd6f8b716f21f8aca962725a9565ce3ee40"},
@@ -1734,20 +1744,21 @@ nonebot2 = ">=2.2.0"

 [[package]]
 name = "nonebot-plugin-alconna"
-version = "0.46.1"
+version = "0.46.4"
 description = "Alconna Adapter for Nonebot"
 optional = false
 python-versions = ">=3.9"
 files = [
-    {file = "nonebot_plugin_alconna-0.46.1-py3-none-any.whl", hash = "sha256:4737e2036929f012181c832823a9d6d8e9992b939a0116ab5a81b49763565292"},
-    {file = "nonebot_plugin_alconna-0.46.1.tar.gz", hash = "sha256:e5e7b8b61cb472e51546c72a29a254a5152b55ddbf1e1b8a249382b9d2db13a1"},
+    {file = "nonebot_plugin_alconna-0.46.4-py3-none-any.whl", hash = "sha256:332aa98056f02b63aa194536cfac42387496d8ece29f354d5499418ca33fe83d"},
+    {file = "nonebot_plugin_alconna-0.46.4.tar.gz", hash = "sha256:60f6bf93d82117cca52948cfaa5f4563ee8ed6c942d1993634d88a14ada8c27f"},
 ]

 [package.dependencies]
-arclet-alconna = ">=1.8.12"
+arclet-alconna = ">=1.8.14"
 arclet-alconna-tools = ">=0.7.4"
 importlib-metadata = ">=4.13.0"
 nepattern = ">=0.7.4"
+nonebot-plugin-waiter = ">=0.6.0"
 nonebot2 = ">=2.3.0"

 [[package]]
@@ -1784,13 +1795,13 @@ typing-extensions = ">=4.0.0"

 [[package]]
 name = "nonebot-plugin-orm"
-version = "0.7.2"
+version = "0.7.3"
 description = "SQLAlchemy ORM support for nonebot"
 optional = false
 python-versions = "<4.0,>=3.8"
 files = [
-    {file = "nonebot_plugin_orm-0.7.2-py3-none-any.whl", hash = "sha256:a9fce44d7d80a98b7e07125abe26529995fde967e1f9dd390180d70734f9c596"},
-    {file = "nonebot_plugin_orm-0.7.2.tar.gz", hash = "sha256:12f12e8b1be5d5f75bba0a630e5112ad4041b0ef67469dbcd7ac6557faec0953"},
+    {file = "nonebot_plugin_orm-0.7.3-py3-none-any.whl", hash = "sha256:9b0d114a4e7b2e452cb333e7147ae4216dff2f9685df616e5fa1f3f892d8795b"},
+    {file = "nonebot_plugin_orm-0.7.3.tar.gz", hash = "sha256:cbb573598d0ecef2d0e75b5bdebd05297c68a2b368029a8763660f2a45381a2c"},
 ]

 [package.dependencies]
@@ -1847,6 +1858,24 @@ nonebot-plugin-orm = ">=0.7.0,<1.0.0"
 nonebot-plugin-session = ">=0.3.0,<0.4.0"
 nonebot2 = {version = ">=2.2.0,<3.0.0", extras = ["fastapi"]}

+[[package]]
+name = "nonebot-plugin-user"
+version = "0.2.0"
+description = "适用于 Nonebot2 的用户插件"
+optional = false
+python-versions = ">=3.8,<4.0"
+files = [
+    {file = "nonebot_plugin_user-0.2.0-py3-none-any.whl", hash = "sha256:9b052551b13fd8f8fab39023a8088637b0447b0ef42d87f54a0e7e2c3c371740"},
+    {file = "nonebot_plugin_user-0.2.0.tar.gz", hash = "sha256:f2f559e3381deb20a067fb2004a92f3625b1777da076ecfb956e334bdbe0f7d5"},
+]
+
+[package.dependencies]
+expiringdict = ">=1.2.2,<2.0.0"
+nonebot-plugin-alconna = ">=0.37.1"
+nonebot-plugin-orm = ">=0.7.0"
+nonebot-plugin-session = ">=0.3.0,<0.4.0"
+nonebot2 = ">=2.2.0,<3.0.0"
+
 [[package]]
 name = "nonebot-plugin-userinfo"
 version = "0.2.4"
@@ -1865,6 +1894,20 @@ httpx = ">=0.20.0,<1.0.0"
 nonebot2 = ">=2.0.0,<3.0.0"
 strenum = ">=0.4.8,<0.5.0"

+[[package]]
+name = "nonebot-plugin-waiter"
+version = "0.6.1"
+description = "An alternative for got-and-reject in Nonebot"
+optional = false
+python-versions = ">=3.9"
+files = [
+    {file = "nonebot_plugin_waiter-0.6.1-py3-none-any.whl", hash = "sha256:0abd678ff7671a2f5cee53b8c96fdbb700a78bbff921e8f37ab1e9388bdc8649"},
+    {file = "nonebot_plugin_waiter-0.6.1.tar.gz", hash = "sha256:ba4da15694ef4eeb23329e7ecde7e9e56df5cbf8e0dc03b8f98747658bbc138f"},
+]
+
+[package.dependencies]
+nonebot2 = ">=2.3.0"
+
 [[package]]
 name = "nonebot2"
 version = "2.3.1"
@@ -2018,7 +2061,6 @@ optional = false
 python-versions = ">=3.9"
 files = [
    {file = "pandas-2.2.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:90c6fca2acf139569e74e8781709dccb6fe25940488755716d1d354d6bc58bce"},
-    {file = "pandas-2.2.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c7adfc142dac335d8c1e0dcbd37eb8617eac386596eb9e1a1b77791cf2498238"},
    {file = "pandas-2.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4abfe0be0d7221be4f12552995e58723c7422c80a659da13ca382697de830c08"},
    {file = "pandas-2.2.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8635c16bf3d99040fdf3ca3db669a7250ddf49c55dc4aa8fe0ae0fa8d6dcc1f0"},
    {file = "pandas-2.2.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:40ae1dffb3967a52203105a077415a86044a2bea011b5f321c6aa64b379a3f51"},
@@ -2039,7 +2081,6 @@ files = [
    {file = "pandas-2.2.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:43498c0bdb43d55cb162cdc8c06fac328ccb5d2eabe3cadeb3529ae6f0517c32"},
    {file = "pandas-2.2.2-cp312-cp312-win_amd64.whl", hash = "sha256:d187d355ecec3629624fccb01d104da7d7f391db0311145817525281e2804d23"},
    {file = "pandas-2.2.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0ca6377b8fca51815f382bd0b697a0814c8bda55115678cbc94c30aacbb6eff2"},
-    {file = "pandas-2.2.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9057e6aa78a584bc93a13f0a9bf7e753a5e9770a30b4d758b8d5f2a62a9433cd"},
    {file = "pandas-2.2.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:001910ad31abc7bf06f49dcc903755d2f7f3a9186c0c040b827e522e9cef0863"},
    {file = "pandas-2.2.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:66b479b0bd07204e37583c191535505410daa8df638fd8e75ae1b383851fe921"},
    {file = "pandas-2.2.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:a77e9d1c386196879aa5eb712e77461aaee433e54c68cf253053a73b7e49c33a"},
@@ -2085,17 +2126,20 @@ xml = ["lxml (>=4.9.2)"]

 [[package]]
 name = "pandas-stubs"
-version = "2.2.2.240514"
+version = "2.2.2.240603"
 description = "Type annotations for pandas"
 optional = false
 python-versions = ">=3.9"
 files = [
-    {file = "pandas_stubs-2.2.2.240514-py3-none-any.whl", hash = "sha256:5d6f64d45a98bc94152a0f76fa648e598cd2b9ba72302fd34602479f0c391a53"},
-    {file = "pandas_stubs-2.2.2.240514.tar.gz", hash = "sha256:85b20da44a62c80eb8389bcf4cbfe31cce1cafa8cca4bf1fc75ec45892e72ce8"},
+    {file = "pandas_stubs-2.2.2.240603-py3-none-any.whl", hash = "sha256:e08ce7f602a4da2bff5a67475ba881c39f2a4d4f7fccc1cba57c6f35a379c6c0"},
+    {file = "pandas_stubs-2.2.2.240603.tar.gz", hash = "sha256:2dcc86e8fa6ea41535a4561c1f08b3942ba5267b464eff2e99caeee66f9e4cd1"},
 ]

 [package.dependencies]
-numpy = {version = ">=1.26.0", markers = "python_version < \"3.13\""}
+numpy = [
+    {version = ">=1.23.5", markers = "python_version >= \"3.9\" and python_version < \"3.12\""},
+    {version = ">=1.26.0", markers = "python_version >= \"3.12\" and python_version < \"3.13\""},
+]
 types-pytz = ">=2022.1.1"

 [[package]]
@@ -2631,28 +2675,28 @@ jupyter = ["ipywidgets (>=7.5.1,<9)"]

 [[package]]
 name = "ruff"
-version = "0.4.4"
+version = "0.4.8"
 description = "An extremely fast Python linter and code formatter, written in Rust."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "ruff-0.4.4-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:29d44ef5bb6a08e235c8249294fa8d431adc1426bfda99ed493119e6f9ea1bf6"},
-    {file = "ruff-0.4.4-py3-none-macosx_11_0_arm64.whl", hash = "sha256:c4efe62b5bbb24178c950732ddd40712b878a9b96b1d02b0ff0b08a090cbd891"},
-    {file = "ruff-0.4.4-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4c8e2f1e8fc12d07ab521a9005d68a969e167b589cbcaee354cb61e9d9de9c15"},
-    {file = "ruff-0.4.4-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:60ed88b636a463214905c002fa3eaab19795679ed55529f91e488db3fe8976ab"},
-    {file = "ruff-0.4.4-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b90fc5e170fc71c712cc4d9ab0e24ea505c6a9e4ebf346787a67e691dfb72e85"},
-    {file = "ruff-0.4.4-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:8e7e6ebc10ef16dcdc77fd5557ee60647512b400e4a60bdc4849468f076f6eef"},
-    {file = "ruff-0.4.4-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b9ddb2c494fb79fc208cd15ffe08f32b7682519e067413dbaf5f4b01a6087bcd"},
-    {file = "ruff-0.4.4-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c51c928a14f9f0a871082603e25a1588059b7e08a920f2f9fa7157b5bf08cfe9"},
-    {file = "ruff-0.4.4-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b5eb0a4bfd6400b7d07c09a7725e1a98c3b838be557fee229ac0f84d9aa49c36"},
-    {file = "ruff-0.4.4-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:b1867ee9bf3acc21778dcb293db504692eda5f7a11a6e6cc40890182a9f9e595"},
-    {file = "ruff-0.4.4-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:1aecced1269481ef2894cc495647392a34b0bf3e28ff53ed95a385b13aa45768"},
-    {file = "ruff-0.4.4-py3-none-musllinux_1_2_i686.whl", hash = "sha256:9da73eb616b3241a307b837f32756dc20a0b07e2bcb694fec73699c93d04a69e"},
-    {file = "ruff-0.4.4-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:958b4ea5589706a81065e2a776237de2ecc3e763342e5cc8e02a4a4d8a5e6f95"},
-    {file = "ruff-0.4.4-py3-none-win32.whl", hash = "sha256:cb53473849f011bca6e754f2cdf47cafc9c4f4ff4570003a0dad0b9b6890e876"},
-    {file = "ruff-0.4.4-py3-none-win_amd64.whl", hash = "sha256:424e5b72597482543b684c11def82669cc6b395aa8cc69acc1858b5ef3e5daae"},
-    {file = "ruff-0.4.4-py3-none-win_arm64.whl", hash = "sha256:39df0537b47d3b597293edbb95baf54ff5b49589eb7ff41926d8243caa995ea6"},
-    {file = "ruff-0.4.4.tar.gz", hash = "sha256:f87ea42d5cdebdc6a69761a9d0bc83ae9b3b30d0ad78952005ba6568d6c022af"},
+    {file = "ruff-0.4.8-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:7663a6d78f6adb0eab270fa9cf1ff2d28618ca3a652b60f2a234d92b9ec89066"},
+    {file = "ruff-0.4.8-py3-none-macosx_11_0_arm64.whl", hash = "sha256:eeceb78da8afb6de0ddada93112869852d04f1cd0f6b80fe464fd4e35c330913"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aad360893e92486662ef3be0a339c5ca3c1b109e0134fcd37d534d4be9fb8de3"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:284c2e3f3396fb05f5f803c9fffb53ebbe09a3ebe7dda2929ed8d73ded736deb"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a7354f921e3fbe04d2a62d46707e569f9315e1a613307f7311a935743c51a764"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:72584676164e15a68a15778fd1b17c28a519e7a0622161eb2debdcdabdc71883"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9678d5c9b43315f323af2233a04d747409d1e3aa6789620083a82d1066a35199"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704977a658131651a22b5ebeb28b717ef42ac6ee3b11e91dc87b633b5d83142b"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d05f8d6f0c3cce5026cecd83b7a143dcad503045857bc49662f736437380ad45"},
+    {file = "ruff-0.4.8-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:6ea874950daca5697309d976c9afba830d3bf0ed66887481d6bca1673fc5b66a"},
+    {file = "ruff-0.4.8-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:fc95aac2943ddf360376be9aa3107c8cf9640083940a8c5bd824be692d2216dc"},
+    {file = "ruff-0.4.8-py3-none-musllinux_1_2_i686.whl", hash = "sha256:384154a1c3f4bf537bac69f33720957ee49ac8d484bfc91720cc94172026ceed"},
+    {file = "ruff-0.4.8-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:e9d5ce97cacc99878aa0d084c626a15cd21e6b3d53fd6f9112b7fc485918e1fa"},
+    {file = "ruff-0.4.8-py3-none-win32.whl", hash = "sha256:6d795d7639212c2dfd01991259460101c22aabf420d9b943f153ab9d9706e6a9"},
+    {file = "ruff-0.4.8-py3-none-win_amd64.whl", hash = "sha256:e14a3a095d07560a9d6769a72f781d73259655919d9b396c650fc98a8157555d"},
+    {file = "ruff-0.4.8-py3-none-win_arm64.whl", hash = "sha256:14019a06dbe29b608f6b7cbcec300e3170a8d86efaddb7b23405cb7f7dcaf780"},
+    {file = "ruff-0.4.8.tar.gz", hash = "sha256:16d717b1d57b2e2fd68bd0bf80fb43931b79d05a7131aa477d66fc40fbd86268"},
 ]

 [[package]]
@@ -3638,4 +3682,4 @@ cffi = ["cffi (>=1.11)"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "f073f9fbc693de09d1db3f326451e3fa1b1233af5b04965d658cae297886cdd9"
+content-hash = "7eeac60a63bedc7ebff1466657b02fca9e6c4dcc6b525feca23c5bd664f92bdd"
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'nonebot-plugin-tetris-stats'
-version = '1.2.10'
+version = '1.2.12'
 description = '一款基于 NoneBot2 的用于查询 Tetris 相关游戏数据的插件'
 authors = ['scdhh <wallfjjd@gmail.com>']
 readme = 'README.md'
@@ -17,6 +17,7 @@ nonebot-plugin-localstore = "^0.6.0"
 nonebot-plugin-orm = ">=0.1.1,<0.8.0"
 nonebot-plugin-session = "^0.3.1"
 nonebot-plugin-session-orm = "^0.2.0"
+nonebot-plugin-user = "^0.2.0"
 nonebot-plugin-userinfo = "^0.2.4"
 aiocache = "^0.12.2"
 aiofiles = "^23.2.1"
Author	SHA1	Message	Date
shoucandanghehe	ce94aee0f4	🔖 1.2.12	2024-06-10 02:37:29 +08:00
shoucandanghehe	b9c58ae125	✨ 修改插件元数据	2024-06-10 02:37:12 +08:00
shoucandanghehe	92159e93b8	✨ 直接使用 fstring 生成链接	2024-06-10 02:35:07 +08:00
shoucandanghehe	f9b11895e2	✨ 使用缓存	2024-06-10 02:34:30 +08:00
shoucandanghehe	f7c3d493ea	✨ TETR.IO 适配 v2模板	2024-06-10 02:13:03 +08:00
shoucandanghehe	4954ab3d60	✨ TETR.IO 适配 v2模板	2024-06-10 00:48:13 +08:00
shoucandanghehe	bcca869e72	✨ 重置命令为shell style，并使用快捷方式保留之前的行为	2024-06-10 00:47:17 +08:00
shoucandanghehe	a4247abdad	✨ 添加 TETR.IO 部分资源的缓存	2024-06-10 00:39:36 +08:00
shoucandanghehe	2c1d43601a	🙈 更新.gitignore	2024-06-10 00:31:30 +08:00
shoucandanghehe	c929c463ec	✨ 添加 img_to_png 方法	2024-06-10 00:30:54 +08:00
shoucandanghehe	314e1dede3	🔥 去除截图等待状态时的超时	2024-06-10 00:26:26 +08:00
shoucandanghehe	d5b0ef34c5	✨ 更新 v2 模板模型	2024-06-10 00:25:21 +08:00
shoucandanghehe	3d9ef841b1	✨ 添加两个新异常类型	2024-06-10 00:09:41 +08:00
shoucandanghehe	b98871f170	🔥 删除 HandleNotFinishedError	2024-06-10 00:07:03 +08:00
shoucandanghehe	38ab872dd8	🗃️ 添加 TETRIOUserConfig	2024-06-09 04:24:48 +08:00
shoucandanghehe	f44c0baa2e	🚨 添加一些 type: ignore	2024-06-09 03:59:08 +08:00
shoucandanghehe	9b8d17577e	🔥 删除 get_platform 函数	2024-06-08 12:13:20 +08:00
shoucandanghehe	f301bee2b0	🔥 不小心把测试用注释传上去了）	2024-06-08 12:12:28 +08:00
shoucandanghehe	fbe018e56a	🔖 1.2.11	2024-06-08 12:04:44 +08:00
shoucandanghehe	ab046fe786	✨ 使用 nonebot-plugin-user 进行身份绑定 close #63	2024-06-08 12:03:07 +08:00
shoucandanghehe	ce95d8f977	✨ 完善 retry 装饰器	2024-06-08 11:57:45 +08:00
shoucandanghehe	fa05b80e61	✨ 修改截图方式	2024-06-08 11:57:21 +08:00
shoucandanghehe	0ab0d11a98	➕ 添加依赖 nonebot-plugin-user	2024-06-08 11:55:47 +08:00
shoucandanghehe	7f469540b2	⚡️ 删除一个不必要的async	2024-06-08 00:55:42 +08:00
shoucandanghehe	21bee29146	✨ 适配 v2 模板	2024-06-07 21:18:12 +08:00
dependabot[bot]	c2dd9c5d86	⬆️ Bump nonebot-plugin-alconna from 0.46.3 to 0.46.4 (#333 ) Bumps [nonebot-plugin-alconna](https://github.com/nonebot/plugin-alconna) from 0.46.3 to 0.46.4. - [Release notes](https://github.com/nonebot/plugin-alconna/releases) - [Commits](https://github.com/nonebot/plugin-alconna/compare/v0.46.3...v0.46.4) --- updated-dependencies: - dependency-name: nonebot-plugin-alconna dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-06 21:33:51 +08:00
dependabot[bot]	5927cb2bb5	⬆️ Bump pandas-stubs from 2.2.2.240514 to 2.2.2.240603 (#334 ) Bumps [pandas-stubs](https://github.com/pandas-dev/pandas-stubs) from 2.2.2.240514 to 2.2.2.240603. - [Changelog](https://github.com/pandas-dev/pandas-stubs/blob/main/docs/release_procedure.md) - [Commits](https://github.com/pandas-dev/pandas-stubs/compare/v2.2.2.240514...v2.2.2.240603) --- updated-dependencies: - dependency-name: pandas-stubs dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-06 21:33:35 +08:00
dependabot[bot]	4a4a215b61	⬆️ Bump ruff from 0.4.6 to 0.4.8 (#336 ) Bumps [ruff](https://github.com/astral-sh/ruff) from 0.4.6 to 0.4.8. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/v0.4.6...v0.4.8) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-06 21:33:15 +08:00
shoucandanghehe	bfe931d3bf	✨ 为截图添加自动重试	2024-06-04 20:15:41 +08:00
shoucandanghehe	b7b152d84d	✨ 完善 retry 装饰器的类型，并添加消息提示功能	2024-06-04 20:14:19 +08:00
shoucandanghehe	b6f6eb1170	✨ sprint 成绩保留三位小数	2024-06-04 20:12:56 +08:00
shoucandanghehe	934800aae0	🐛 修正 UniMessage 的使用方式	2024-06-04 20:10:57 +08:00
dependabot[bot]	d19c37e99a	⬆️ Bump nonebot-plugin-alconna from 0.46.1 to 0.46.3 (#331 ) Bumps [nonebot-plugin-alconna](https://github.com/nonebot/plugin-alconna) from 0.46.1 to 0.46.3. - [Release notes](https://github.com/nonebot/plugin-alconna/releases) - [Commits](https://github.com/nonebot/plugin-alconna/compare/v0.46.1...v0.46.3) --- updated-dependencies: - dependency-name: nonebot-plugin-alconna dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-01 14:50:10 +08:00
dependabot[bot]	43167fe9bd	⬆️ Bump ruff from 0.4.4 to 0.4.6 (#330 ) Bumps [ruff](https://github.com/astral-sh/ruff) from 0.4.4 to 0.4.6. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/v0.4.4...v0.4.6) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-01 14:50:00 +08:00
dependabot[bot]	db8de88667	⬆️ Bump nonebot-plugin-orm from 0.7.2 to 0.7.3 (#327 ) updated-dependencies: - dependency-name: nonebot-plugin-orm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-01 14:49:44 +08:00