🔖 1.4.9

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.5.7 to 0.6.0.
- [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/0.5.7...0.6.0)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.pre-commit-config.yaml

@@ -2,12 +2,12 @@ default_install_hook_types: [pre-commit, prepare-commit-msg]
 ci:
     autofix_commit_msg: ':rotating_light: auto fix by pre-commit hooks'
     autofix_prs: true
-    autoupdate_branch: master
-    autoupdate_schedule: monthly
+    autoupdate_branch: main
+    autoupdate_schedule: weekly
     autoupdate_commit_msg: ':arrow_up: auto update by pre-commit hooks'
 repos:
     - repo: https://github.com/astral-sh/ruff-pre-commit
-      rev: v0.4.10
+      rev: v0.5.7
       hooks:
           - id: ruff
             args: [--fix, --exit-non-zero-on-fix]

nonebot_plugin_tetris_stats/config/config.py

@@ -1,13 +1,14 @@
-from pathlib import Path
+from nonebot_plugin_localstore import get_cache_dir, get_data_dir
+from pydantic import BaseModel, Field
 
-from nonebot_plugin_localstore import get_cache_dir  # type: ignore[import-untyped]
-from pydantic import BaseModel
+CACHE_PATH = get_cache_dir('nonebot_plugin_tetris_stats')
+DATA_PATH = get_data_dir('nonebot_plugin_tetris_stats')
 
-CACHE_PATH: Path = get_cache_dir('nonebot_plugin_tetris_stats')
+
+class ScopedConfig(BaseModel):
+    request_timeout: float = 30.0
+    screenshot_quality: float = 2
 
 
 class Config(BaseModel):
-    """配置类"""
-
-    tetris_req_timeout: float = 30.0
-    tetris_screenshot_quality: float = 2
+    tetris: ScopedConfig = Field(default_factory=ScopedConfig)

nonebot_plugin_tetris_stats/config/migrations/cfeab6961dce_extend_api_type_field_length.py

@@ -0,0 +1,50 @@
+"""Extend api_type field length
+
+迁移 ID: cfeab6961dce
+父迁移: f5b4a6d1325b
+创建时间: 2024-08-09 14:20:59.789030
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import sqlalchemy as sa
+from alembic import op
+from nonebot.log import logger
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'cfeab6961dce'
+down_revision: str | Sequence[str] | None = 'f5b4a6d1325b'
+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_tetriohistoricaldata', schema=None) as batch_op:
+        batch_op.alter_column(
+            'api_type', existing_type=sa.VARCHAR(length=16), type_=sa.String(length=32), existing_nullable=False
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    logger.warning('新数据可能不支持降级!')
+    logger.warning('请确认数据库内数据可以迁移到旧版本!')
+    input('如果确认可以迁移, 请按回车键继续!')
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_tetriohistoricaldata', schema=None) as batch_op:
+        batch_op.alter_column(
+            'api_type', existing_type=sa.String(length=32), type_=sa.VARCHAR(length=16), existing_nullable=False
+        )
+
+    # ### end Alembic commands ###

nonebot_plugin_tetris_stats/db/__init__.py

@@ -8,7 +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 nonebot_plugin_user import User
 from sqlalchemy import select
 
 from ..utils.typing import AllCommandType, BaseCommandType, GameType, TETRIOCommandType
@@ -68,11 +68,11 @@ T = TypeVar('T', 'TETRIOHistoricalData', 'TOPHistoricalData', 'TOSHistoricalData
 lock = Lock()
 
 
-async def anti_duplicate_add(cls: type[T], model: T) -> None:
+async def anti_duplicate_add(model: T) -> None:
     async with lock, get_session() as session:
         result = (
             await session.scalars(
-                select(cls)
+                select(cls := model.__class__)
                 .where(cls.update_time == model.update_time)
                 .where(cls.user_unique_identifier == model.user_unique_identifier)
                 .where(cls.api_type == model.api_type)

nonebot_plugin_tetris_stats/games/constant.py

@@ -1,3 +1 @@
-BIND_COMMAND: list[str] = ['绑定', 'bind']
-QUERY_COMMAND: list[str] = ['查', '查询', 'query', 'stats']
 CANT_VERIFY_MESSAGE = '* 由于无法验证绑定信息, 不能保证查询到的用户为本人\n'

nonebot_plugin_tetris_stats/games/schemas.py

@@ -1,20 +1,21 @@
 from abc import ABC, abstractmethod
+from typing import Generic, TypeVar
 
 from pydantic import BaseModel
 
 from ..utils.typing import GameType
 
-
-class Base(BaseModel):
-    platform: GameType
+T = TypeVar('T', bound=GameType)
 
 
-class BaseUser(ABC, Base):
+class BaseUser(BaseModel, ABC, Generic[T]):
     """游戏用户"""
 
-    def __eq__(self, __value: object) -> bool:
-        if isinstance(__value, BaseUser):
-            return self.unique_identifier == __value.unique_identifier
+    platform: T
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, BaseUser):
+            return self.unique_identifier == other.unique_identifier
         return False
 
     @property

nonebot_plugin_tetris_stats/games/tetrio/__init__.py

@@ -1,16 +1,10 @@
-from arclet.alconna import Arg, ArgFlag, Args, Option, Subcommand
-from nonebot_plugin_alconna import At
+from nonebot_plugin_alconna import Subcommand
 
 from ...utils.exception import MessageFormatError
-from ...utils.typing import Me
-
-# from .. import add_block_handlers, alc, command
-from .. import alc, command
+from .. import alc
+from .. import command as main_command
 from .api import Player
-
-# 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:
@@ -21,171 +15,22 @@ def get_player(user_id_or_name: str) -> Player | MessageFormatError:
     return MessageFormatError('用户名/ID不合法')
 
 
-command.add(
-    Subcommand(
-        'TETR.IO',
-        Subcommand(
-            'bind',
-            Args(
-                Arg(
-                    'account',
-                    get_player,
-                    notice='TETR.IO 用户名 / ID',
-                    flags=[ArgFlag.HIDDEN],
-                )
-            ),
-            help_text='绑定 TETR.IO 账号',
-        ),
-        # Subcommand(
-        #     'query',
-        #     Args(
-        #         Arg(
-        #             'target',
-        #             At | Me,
-        #             notice='@想要查询的人 / 自己',
-        #             flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
-        #         ),
-        #         Arg(
-        #             'account',
-        #             get_player,
-        #             notice='TETR.IO 用户名 / ID',
-        #             flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
-        #         ),
-        #     ),
-        #     Option(
-        #         '--template',
-        #         Arg('template', Template),
-        #         alias=['-T'],
-        #         help_text='要使用的查询模板',
-        #     ),
-        #     help_text='查询 TETR.IO 游戏信息',
-        # ),
-        Subcommand(
-            'record',
-            Option(
-                '--40l',
-                dest='sprint',
-            ),
-            Option(
-                '--blitz',
-                dest='blitz',
-            ),
-            Args(
-                Arg(
-                    'target',
-                    At | Me,
-                    notice='@想要查询的人 / 自己',
-                    flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
-                ),
-                Arg(
-                    'account',
-                    get_player,
-                    notice='TETR.IO 用户名 / ID',
-                    flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
-                ),
-            ),
-        ),
-        # Subcommand(
-        #     'list',
-        #     Option('--max-tr', Arg('max_tr', float), help_text='TR的上限'),
-        #     Option('--min-tr', Arg('min_tr', float), help_text='TR的下限'),
-        #     Option('--limit', Arg('limit', int), help_text='查询数量'),
-        #     Option('--country', Arg('country', str), help_text='国家代码'),
-        #     help_text='查询 TETR.IO 段位排行榜',
-        # ),
-        # Subcommand(
-        #     'rank',
-        #     Subcommand(
-        #         '--all',
-        #         Option(
-        #             '--template',
-        #             Arg('template', Template),
-        #             alias=['-T'],
-        #             help_text='要使用的查询模板',
-        #         ),
-        #         dest='all',
-        #     ),
-        #     Option(
-        #         '--detail',
-        #         Arg('rank', ValidRank),
-        #         alias=['-D'],
-        #     ),
-        #     help_text='查询 TETR.IO 段位信息',
-        # ),
-        Subcommand(
-            'config',
-            Option(
-                '--default-template',
-                Arg('template', Template),
-                alias=['-DT', 'DefaultTemplate'],
-            ),
-        ),
-        alias=['TETRIO', 'tetr.io', 'tetrio', 'io'],
-        dest='TETRIO',
-        help_text='TETR.IO 游戏相关指令',
-    )
+command = Subcommand(
+    'TETR.IO',
+    alias=['TETRIO', 'tetr.io', 'tetrio', 'io'],
+    dest='TETRIO',
+    help_text='TETR.IO 游戏相关指令',
 )
 
 
-# def rank_wrapper(slot: int | str, content: str | None):
-#     if slot == 'rank' and not content:
-#         return '--all'
-#     if content is not None:
-#         return f'--detail {content.lower()}'
-#     return content
+from . import bind, config, query, record  # noqa: E402
 
-
-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(
-    '(?i:io)(?i:记录|record)(?i:40l)',
-    command='tstats TETR.IO record --40l',
-    humanized='io记录40l',
-)
-alc.shortcut(
-    '(?i:io)(?i:记录|record)(?i:blitz)',
-    command='tstats TETR.IO record --blitz',
-    humanized='io记录blitz',
-)
-# alc.shortcut(
-#     r'(?i:io)(?i:段位|段|rank)\s*(?P<rank>[a-zA-Z+-]{0,2})',
-#     command='tstats TETR.IO rank {rank}',
-#     humanized='iorank',
-#     fuzzy=False,
-#     wrapper=rank_wrapper,
-# )
-alc.shortcut(
-    '(?i:io)(?i:配置|配|config)',
-    command='tstats TETR.IO config',
-    humanized='io配置',
-)
-
-# alc.shortcut(
-#     'fkosk',
-#     command='tstats TETR.IO query',
-#     arguments=['我'],
-#     fuzzy=False,
-#     humanized='An Easter egg!',
-# )
-
-# add_block_handlers(alc.assign('TETRIO.query'))
-
-# from . import bind, config, list, query, rank, record
-from . import bind, config, record  # noqa: E402
+main_command.add(command)
 
 __all__ = [
+    'alc',
     'bind',
     'config',
-    # 'list',
-    # 'query',
-    # 'rank',
+    'query',
     'record',
 ]

nonebot_plugin_tetris_stats/games/tetrio/api/__init__.py

@@ -1,7 +1,6 @@
 from .player import Player
 from .schemas.user import User
 from .schemas.user_info import UserInfoSuccess
-from .schemas.user_records import UserRecordsSuccess
 from .tetra_league import full_export as tetra_league_full_export
 
-__all__ = ['Player', 'User', 'UserInfoSuccess', 'UserRecordsSuccess', 'tetra_league_full_export']
+__all__ = ['Player', 'User', 'UserInfoSuccess', 'tetra_league_full_export']

nonebot_plugin_tetris_stats/games/tetrio/api/models.py

@@ -7,12 +7,12 @@ from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column
 
 from ....db.models import PydanticType
 from .schemas.base import SuccessModel
-from .typing import Summaries
+from .typing import Records, Summaries
 
 
 class TETRIOHistoricalData(MappedAsDataclass, Model):
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
     user_unique_identifier: Mapped[str] = mapped_column(String(24), index=True)
-    api_type: Mapped[Literal['User Info', Summaries]] = mapped_column(String(16), index=True)
+    api_type: Mapped[Literal['User Info', Records, Summaries]] = mapped_column(String(32), index=True)
     data: Mapped[SuccessModel] = mapped_column(PydanticType(get_model=[SuccessModel.__subclasses__], models=set()))
     update_time: Mapped[datetime] = mapped_column(DateTime, index=True)

nonebot_plugin_tetris_stats/games/tetrio/api/player.py

@@ -1,5 +1,6 @@
+from enum import Enum
 from types import MappingProxyType
-from typing import Literal, overload
+from typing import Literal, NamedTuple, cast, overload
 
 from async_lru import alru_cache
 from nonebot.compat import type_validate_json
@@ -11,26 +12,51 @@ from ..constant import BASE_URL, USER_ID, USER_NAME
 from .cache import Cache
 from .models import TETRIOHistoricalData
 from .schemas.base import FailedModel
+from .schemas.records.solo import Solo as SoloRecord
+from .schemas.records.solo import SoloSuccessModel as RecordsSoloSuccessModel
 from .schemas.summaries import (
     AchievementsSuccessModel,
-    SoloSuccessModel,
     SummariesModel,
     ZenithSuccessModel,
     ZenSuccessModel,
 )
+from .schemas.summaries import (
+    SoloSuccessModel as SummariesSoloSuccessModel,
+)
 from .schemas.summaries.base import User as SummariesUser
+from .schemas.summaries.league import LeagueSuccessModel
 from .schemas.user import User
 from .schemas.user_info import UserInfo, UserInfoSuccess
-from .typing import Summaries
+from .typing import Records, Summaries
+
+
+class RecordModeType(str, Enum):
+    Sprint = '40l'
+    Blitz = 'blitz'
+
+
+class RecordType(str, Enum):
+    Top = 'top'
+    Recent = 'recent'
+    Progression = 'progression'
+
+
+class RecordKey(NamedTuple):
+    mode_type: RecordModeType
+    record_type: RecordType
+
+    def to_records(self) -> Records:
+        return cast(Records, f'{self.mode_type.value}_{self.record_type.value}')
 
 
 class Player:
     __SUMMARIES_MAPPING: MappingProxyType[Summaries, type[SummariesModel]] = MappingProxyType(
         {
-            '40l': SoloSuccessModel,
-            'blitz': SoloSuccessModel,
+            '40l': SummariesSoloSuccessModel,
+            'blitz': SummariesSoloSuccessModel,
             'zenith': ZenithSuccessModel,
             'zenithex': ZenithSuccessModel,
+            'league': LeagueSuccessModel,
             'zen': ZenSuccessModel,
             'achievements': AchievementsSuccessModel,
         }
@@ -58,6 +84,7 @@ class Player:
         self.__user: User | None = None
         self._user_info: UserInfoSuccess | None = None
         self._summaries: dict[Summaries, SummariesModel] = {}
+        self._records: dict[RecordKey, RecordsSoloSuccessModel] = {}
 
     @property
     def _request_user_parameter(self) -> str:
@@ -97,7 +124,6 @@ class Player:
                 raise RequestError(msg)
             self._user_info = user_info
             await anti_duplicate_add(
-                TETRIOHistoricalData,
                 TETRIOHistoricalData(
                     user_unique_identifier=(await self.user).unique_identifier,
                     api_type='User Info',
@@ -108,12 +134,14 @@ class Player:
         return self._user_info
 
     @overload
-    async def get_summaries(self, summaries_type: Literal['40l', 'blitz']) -> SoloSuccessModel: ...
+    async def get_summaries(self, summaries_type: Literal['40l', 'blitz']) -> SummariesSoloSuccessModel: ...
     @overload
     async def get_summaries(self, summaries_type: Literal['zenith', 'zenithex']) -> ZenithSuccessModel: ...
     @overload
     async def get_summaries(self, summaries_type: Literal['zen']) -> ZenSuccessModel: ...
     @overload
+    async def get_summaries(self, summaries_type: Literal['league']) -> LeagueSuccessModel: ...
+    @overload
     async def get_summaries(self, summaries_type: Literal['achievements']) -> AchievementsSuccessModel: ...
 
     async def get_summaries(self, summaries_type: Summaries) -> SummariesModel:
@@ -130,7 +158,6 @@ class Player:
                 raise RequestError(msg)
             self._summaries[summaries_type] = summaries
             await anti_duplicate_add(
-                TETRIOHistoricalData,
                 TETRIOHistoricalData(
                     user_unique_identifier=(await self.user).unique_identifier,
                     api_type=summaries_type,
@@ -141,20 +168,21 @@ class Player:
         return self._summaries[summaries_type]
 
     @property
-    @alru_cache
-    async def sprint(self) -> SoloSuccessModel:
+    async def sprint(self) -> SummariesSoloSuccessModel:
         return await self.get_summaries('40l')
 
     @property
-    @alru_cache
-    async def blitz(self) -> SoloSuccessModel:
+    async def blitz(self) -> SummariesSoloSuccessModel:
         return await self.get_summaries('blitz')
 
     @property
-    @alru_cache
     async def zen(self) -> ZenSuccessModel:
         return await self.get_summaries('zen')
 
+    @property
+    async def league(self) -> LeagueSuccessModel:
+        return await self.get_summaries('league')
+
     async def _get_local_summaries_user(self) -> SummariesUser | None:
         allow_summaries: set[Literal['40l', 'blitz', 'zenith', 'zenithex']] = {
             '40l',
@@ -185,3 +213,32 @@ class Player:
         if (user := (await self._get_local_summaries_user())) is not None:
             return user.banner_revision
         return (await self.get_info()).data.banner_revision
+
+    async def get_records(self, mode_type: RecordModeType, records_type: RecordType) -> RecordsSoloSuccessModel:
+        if (record_key := RecordKey(mode_type, records_type)) not in self._records:
+            raw_records = await Cache.get(
+                splice_url(
+                    [
+                        BASE_URL,
+                        'users/',
+                        f'{self._request_user_parameter}/',
+                        'records/',
+                        f'{mode_type}/',
+                        records_type,
+                    ]
+                )
+            )
+            records: RecordsSoloSuccessModel | FailedModel = type_validate_json(SoloRecord, raw_records)  # type: ignore[arg-type]
+            if isinstance(records, FailedModel):
+                msg = f'用户Summaries数据请求错误:\n{records.error}'
+                raise RequestError(msg)
+            self._records[record_key] = records
+            await anti_duplicate_add(
+                TETRIOHistoricalData(
+                    user_unique_identifier=(await self.user).unique_identifier,
+                    api_type=record_key.to_records(),
+                    data=records,
+                    update_time=records.cache.cached_at,
+                ),
+            )
+        return self._records[record_key]

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/base.py

@@ -1,26 +0,0 @@
-from datetime import datetime
-from typing import Literal
-
-from pydantic import BaseModel
-
-
-class P(BaseModel):  # what is P
-    pri: float
-    sec: float
-    ter: float
-
-
-class Cache(BaseModel):
-    status: str
-    cached_at: datetime
-    cached_until: datetime
-
-
-class SuccessModel(BaseModel):
-    success: Literal[True]
-    cache: Cache
-
-
-class FailedModel(BaseModel):
-    success: Literal[False]
-    error: str

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/base/__init__.py

@@ -0,0 +1,61 @@
+from datetime import datetime
+from typing import Literal
+
+from pydantic import BaseModel
+
+
+class AggregateStats(BaseModel):
+    apm: float
+    pps: float
+    vsscore: float
+
+
+class Finesse(BaseModel):
+    combo: int
+    faults: int
+    perfectpieces: int
+
+
+class Clears(BaseModel):
+    singles: int
+    doubles: int
+    triples: int
+    quads: int
+    realtspins: int
+    minitspins: int
+    minitspinsingles: int
+    tspinsingles: int
+    minitspindoubles: int
+    tspindoubles: int
+    tspintriples: int
+    tspinquads: int
+    allclear: int
+
+
+class Garbage(BaseModel):
+    sent: int
+    received: int
+    attack: int | None
+    cleared: int
+
+
+class P(BaseModel):  # what is P
+    pri: float
+    sec: float
+    ter: float
+
+
+class Cache(BaseModel):
+    status: str
+    cached_at: datetime
+    cached_until: datetime
+
+
+class SuccessModel(BaseModel):
+    success: Literal[True]
+    cache: Cache
+
+
+class FailedModel(BaseModel):
+    success: Literal[False]
+    error: str

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/base/solo.py

@@ -0,0 +1,65 @@
+from datetime import datetime
+from typing import Literal
+
+from pydantic import BaseModel, Field
+
+from ..base import P
+from . import AggregateStats, Clears, Finesse, Garbage
+
+
+class Time(BaseModel):
+    start: int
+    zero: bool
+    locked: bool
+    prev: int
+    frameoffset: int
+
+
+class Stats(BaseModel):
+    seed: int | None = None  # ?: 不知道是之后都没有了还是还会有
+    lines: int
+    level_lines: int
+    level_lines_needed: int
+    inputs: int
+    holds: int
+    time: Time | None = None  # ?: 不知道是之后都没有了还是还会有
+    score: int
+    zenlevel: int
+    zenprogress: int
+    level: int
+    combo: int
+    currentcombopower: int | None = None
+    topcombo: int
+    btb: int
+    topbtb: int
+    currentbtbchainpower: int | None = None
+    tspins: int
+    piecesplaced: int
+    clears: Clears
+    garbage: Garbage
+    kills: int
+    finesse: Finesse
+    finaltime: float
+
+
+class Results(BaseModel):
+    aggregatestats: AggregateStats
+    stats: Stats
+    gameoverreason: str
+
+
+class Record(BaseModel):
+    id: str = Field(..., alias='_id')
+    replayid: str
+    stub: bool
+    gamemode: Literal['40l', 'blitz']
+    pb: bool
+    oncepb: bool
+    ts: datetime
+    revolution: None
+    otherusers: list
+    leaderboards: list[str]
+    results: Results
+    extras: dict
+    disputed: bool
+    p: P

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/records/solo.py

@@ -0,0 +1,17 @@
+from typing import TypeAlias
+
+from pydantic import BaseModel
+
+from ..base import FailedModel, SuccessModel
+from ..base.solo import Record
+
+
+class Data(BaseModel):
+    entries: list[Record]
+
+
+class SoloSuccessModel(SuccessModel):
+    data: Data
+
+
+Solo: TypeAlias = SoloSuccessModel | FailedModel

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/summaries/__init__.py

@@ -1,20 +1,21 @@
 from .achievements import Achievements, AchievementsSuccessModel
-from .solo import Blitz, SoloSuccessModel, Sprint
+from .league import LeagueSuccessModel
+from .solo import Solo, SoloSuccessModel
 from .zen import Zen, ZenSuccessModel
 from .zenith import Zenith, ZenithEx, ZenithSuccessModel
 
-SummariesModel = AchievementsSuccessModel | SoloSuccessModel | ZenSuccessModel | ZenithSuccessModel
+SummariesModel = AchievementsSuccessModel | SoloSuccessModel | ZenSuccessModel | LeagueSuccessModel | ZenithSuccessModel
 
 __all__ = [
     'Achievements',
     'AchievementsSuccessModel',
-    'Blitz',
-    'Sprint',
+    'LeagueSuccessModel',
+    'Solo',
     'SoloSuccessModel',
+    'SummariesModel',
     'Zen',
-    'ZenSuccessModel',
     'Zenith',
     'ZenithEx',
     'ZenithSuccessModel',
-    'SummariesModel',
+    'ZenSuccessModel',
 ]

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/summaries/base.py

@@ -7,17 +7,5 @@ class User(BaseModel):
     avatar_revision: int | None
     banner_revision: int | None
     country: str | None
-    verified: int
+    verified: int | None = None
     supporter: int
-
-
-class AggregateStats(BaseModel):
-    apm: float
-    pps: float
-    vsscore: float
-
-
-class Finesse(BaseModel):
-    combo: int
-    faults: int
-    perfectpieces: int

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/summaries/solo.py

@@ -1,92 +1,14 @@
-from datetime import datetime
-from typing import Literal, TypeAlias
+from typing import TypeAlias
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 
-from ..base import FailedModel, P, SuccessModel
-from .base import AggregateStats, Finesse, User
+from ..base import FailedModel, SuccessModel
+from ..base.solo import Record as BaseRecord
+from .base import User
 
 
-class Time(BaseModel):
-    start: int
-    zero: bool
-    locked: bool
-    prev: int
-    frameoffset: int
-
-
-class Clears(BaseModel):
-    singles: int
-    doubles: int
-    triples: int
-    quads: int
-    realtspins: int
-    minitspins: int
-    minitspinsingles: int
-    tspinsingles: int
-    minitspindoubles: int
-    tspindoubles: int
-    tspintriples: int
-    tspinquads: int
-    allclear: int
-
-
-class Garbage(BaseModel):
-    sent: int
-    received: int
-    attack: int | None
-    cleared: int
-
-
-class Stats(BaseModel):
-    seed: int
-    lines: int
-    level_lines: int
-    level_lines_needed: int
-    inputs: int
-    holds: int
-    time: Time
-    score: int
-    zenlevel: int
-    zenprogress: int
-    level: int
-    combo: int
-    currentcombopower: int | None = None
-    topcombo: int
-    btb: int
-    topbtb: int
-    currentbtbchainpower: int | None = None
-    tspins: int
-    piecesplaced: int
-    clears: Clears
-    garbage: Garbage
-    kills: int
-    finesse: Finesse
-    finaltime: float
-
-
-class Results(BaseModel):
-    aggregatestats: AggregateStats
-    stats: Stats
-    gameoverreason: str
-
-
-class Record(BaseModel):
-    id: str = Field(..., alias='_id')
-    replayid: str
-    stub: bool
-    gamemode: Literal['40l', 'blitz']
-    pb: bool
-    oncepb: bool
-    ts: datetime
-    revolution: None
+class Record(BaseRecord):
     user: User
-    otherusers: list
-    leaderboards: list[str]
-    results: Results
-    extras: dict
-    disputed: bool
-    p: P
 
 
 class Data(BaseModel):
@@ -99,5 +21,4 @@ class SoloSuccessModel(SuccessModel):
     data: Data
 
 
-Sprint: TypeAlias = SoloSuccessModel | FailedModel
-Blitz: TypeAlias = SoloSuccessModel | FailedModel
+Solo: TypeAlias = SoloSuccessModel | FailedModel

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/summaries/zenith.py

@@ -3,38 +3,23 @@ from typing import Literal, TypeAlias
 
 from pydantic import BaseModel, Field
 
-from ..base import FailedModel, P, SuccessModel
-from .base import AggregateStats, Finesse, User
+from ..base import AggregateStats, FailedModel, Finesse, P, SuccessModel
+from ..base import Clears as BaseClears
+from ..base import Garbage as BaseGarbage
+from .base import User
 
 
-class Clears(BaseModel):
-    singles: int
-    doubles: int
-    triples: int
-    quads: int
+class Clears(BaseClears):
     pentas: int
-    realtspins: int
-    minitspins: int
-    minitspinsingles: int
-    tspinsingles: int
-    minitspindoubles: int
-    tspindoubles: int
     minitspintriples: int
-    tspintriples: int
     minitspinquads: int
-    tspinquads: int
     tspinpentas: int
-    allclear: int
 
 
-class Garbage(BaseModel):
-    sent: int
+class Garbage(BaseGarbage):
     sent_nomult: int
     maxspike: int
     maxspike_nomult: int
-    received: int
-    attack: int
-    cleared: int
 
 
 class _Zenith(BaseModel):

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/user.py

@@ -6,7 +6,7 @@ from ....schemas import BaseUser
 from ...constant import GAME_TYPE
 
 
-class User(BaseUser):
+class User(BaseUser[Literal['IO']]):
     platform: Literal['IO'] = GAME_TYPE
 
     ID: str

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/user_info.py

@@ -42,7 +42,7 @@ class Data(BaseModel):
     badstanding: bool | None = None
     supporter: bool | None = None  # osk说是必有, 但实际上不是 fkosk
     supporter_tier: int
-    verified: bool
+    verified: bool | None = None
     avatar_revision: int | None = None
     """This user's avatar ID. Get their avatar at
 

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/user_records.py

@@ -1,122 +0,0 @@
-from datetime import datetime
-
-from pydantic import BaseModel, Field
-
-from .....utils.typing import Number
-from .base import FailedModel
-from .base import SuccessModel as BaseSuccessModel
-
-
-class Time(BaseModel):
-    start: int
-    zero: bool
-    locked: bool
-    prev: int
-    frameoffset: int | None = None
-
-
-class Clears(BaseModel):
-    singles: int
-    doubles: int
-    triples: int
-    quads: int
-    pentas: int | None = None
-    realtspins: int
-    minitspins: int
-    minitspinsingles: int
-    tspinsingles: int
-    minitspindoubles: int
-    tspindoubles: int
-    tspintriples: int
-    tspinquads: int
-    allclear: int
-
-
-class Garbage(BaseModel):
-    sent: int
-    received: int
-    attack: int | None = None
-    cleared: int | None = None
-
-
-class Finesse(BaseModel):
-    combo: int
-    faults: int
-    perfectpieces: int
-
-
-class EndContext(BaseModel):
-    seed: Number
-    lines: int
-    level_lines: int
-    level_lines_needed: int
-    inputs: int
-    holds: int | None = None
-    time: Time
-    score: int
-    zenlevel: int | None = None
-    zenprogress: int | None = None
-    level: int
-    combo: int
-    currentcombopower: int | None = None  # WTF
-    topcombo: int
-    btb: int
-    topbtb: int
-    currentbtbchainpower: int | None = None  # WTF * 2
-    tspins: int
-    piecesplaced: int
-    clears: Clears
-    garbage: Garbage
-    kills: int
-    finesse: Finesse
-    final_time: float = Field(..., alias='finalTime')
-    gametype: str
-
-
-class _User(BaseModel):
-    id: str = Field(..., alias='_id')
-    username: str
-
-
-class _Record(BaseModel):
-    id: str = Field(..., alias='_id')
-    stream: str
-    replayid: str
-    user: _User
-    ts: datetime
-    ismulti: bool | None = None
-
-
-class SoloRecord(_Record):
-    endcontext: EndContext
-
-
-class MultiRecord(_Record):
-    endcontext: list[EndContext]
-
-
-class SoloModeRecord(BaseModel):
-    record: SoloRecord | None = None
-    rank: int | None = None
-
-
-class Records(BaseModel):
-    sprint: SoloModeRecord = Field(..., alias='40l')
-    blitz: SoloModeRecord
-
-
-class Zen(BaseModel):
-    level: int
-    score: int
-
-
-class Data(BaseModel):
-    records: Records
-    zen: Zen
-
-
-class UserRecordsSuccess(BaseSuccessModel):
-    data: Data
-
-
-UserRecords = UserRecordsSuccess | FailedModel

nonebot_plugin_tetris_stats/games/tetrio/api/typing.py

@@ -1,6 +1,7 @@
 from typing import Literal
 
-ValidRank = Literal[
+S1ValidRank = Literal[
+    'x+',
     'x',
     'u',
     'ss',
@@ -19,7 +20,9 @@ ValidRank = Literal[
     'd+',
     'd',
 ]
+S1Rank = S1ValidRank | Literal['z']
 
+ValidRank = Literal['x+'] | S1ValidRank
 Rank = ValidRank | Literal['z']  # 未定级
 
 Summaries = Literal[
@@ -27,7 +30,16 @@ Summaries = Literal[
     'blitz',
     'zenith',
     'zenithex',
-    # 'league',  # 等待正式赛季开始
+    'league',
     'zen',
     'achievements',
 ]
+
+Records = Literal[
+    '40l_top',
+    '40l_recent',
+    '40l_progression',
+    'blitz_top',
+    'blitz_recent',
+    'blitz_progression',
+]

nonebot_plugin_tetris_stats/games/tetrio/bind.py

@@ -1,13 +1,14 @@
-from asyncio import gather
 from hashlib import md5
 from urllib.parse import urlencode
 
+from arclet.alconna import Arg, ArgFlag
+from nonebot_plugin_alconna import Args, Subcommand
 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 import EventSession
 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 nonebot_plugin_user import User
+from nonebot_plugin_userinfo import BotUserInfo, UserInfo
 
 from ...db import BindStatus, create_or_update_bind, trigger
 from ...utils.host import HostPage, get_self_netloc
@@ -15,10 +16,31 @@ 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
-from . import alc
+from . import alc, command, get_player
 from .api import Player
 from .constant import GAME_TYPE
 
+command.add(
+    Subcommand(
+        'bind',
+        Args(
+            Arg(
+                'account',
+                get_player,
+                notice='TETR.IO 用户名 / ID',
+                flags=[ArgFlag.HIDDEN],
+            )
+        ),
+        help_text='绑定 TETR.IO 账号',
+    )
+)
+
+alc.shortcut(
+    '(?i:io)(?i:绑定|绑|bind)',
+    command='tstats TETR.IO bind',
+    humanized='io绑定',
+)
+
 
 @alc.assign('TETRIO.bind')
 async def _(nb_user: User, account: Player, event_session: EventSession, bot_info: UserInfo = BotUserInfo()):  # noqa: B008
@@ -28,7 +50,7 @@ async def _(nb_user: User, account: Player, event_session: EventSession, bot_inf
         command_type='bind',
         command_args=[],
     ):
-        user, user_info = await gather(account.user, account.get_info())
+        user = await account.user
         async with get_session() as session:
             bind_status = await create_or_update_bind(
                 session=session,

nonebot_plugin_tetris_stats/games/tetrio/config.py

@@ -1,16 +1,37 @@
+from arclet.alconna import Arg
+from nonebot_plugin_alconna import Option, Subcommand
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import async_scoped_session
-from nonebot_plugin_session import EventSession  # type: ignore[import-untyped]
+from nonebot_plugin_session import EventSession
 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_user import User
 from sqlalchemy import select
 
 from ...db import trigger
-from . import alc
+from . import alc, command
 from .constant import GAME_TYPE
 from .models import TETRIOUserConfig
 from .typing import Template
 
+command.add(
+    Subcommand(
+        'config',
+        Option(
+            '--default-template',
+            Arg('template', Template, notice='模板版本'),
+            alias=['-DT', 'DefaultTemplate'],
+            help_text='设置默认查询模板',
+        ),
+        help_text='TETR.IO 查询个性化配置',
+    ),
+)
+
+alc.shortcut(
+    '(?i:io)(?i:配置|配|config)',
+    command='tstats TETR.IO config',
+    humanized='io配置',
+)
+
 
 @alc.assign('TETRIO.config')
 async def _(user: User, session: async_scoped_session, event_session: EventSession, template: Template):

nonebot_plugin_tetris_stats/games/tetrio/query.py

@@ -0,0 +1,269 @@
+from asyncio import gather
+from datetime import datetime, timedelta, timezone
+from hashlib import md5
+from typing import TYPE_CHECKING, TypeVar
+from urllib.parse import urlencode
+
+from arclet.alconna import Arg, ArgFlag
+from nonebot import get_driver
+from nonebot.adapters import Event
+from nonebot.matcher import Matcher
+from nonebot_plugin_alconna import Args, At, Option, Subcommand
+from nonebot_plugin_alconna.uniseg import UniMessage
+from nonebot_plugin_orm import get_session
+from nonebot_plugin_session import EventSession
+from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_user import User as NBUser
+from nonebot_plugin_user import get_user
+from sqlalchemy import select
+
+from ...db import query_bind_info, trigger
+from ...utils.host import HostPage, get_self_netloc
+from ...utils.metrics import get_metrics
+from ...utils.render import render
+from ...utils.render.schemas.base import Avatar
+from ...utils.render.schemas.tetrio.user.info_v2 import (
+    Badge,
+    Blitz,
+    Sprint,
+    Statistic,
+    TetraLeague,
+    TetraLeagueStatistic,
+    Zen,
+)
+from ...utils.render.schemas.tetrio.user.info_v2 import Info as V2TemplateInfo
+from ...utils.render.schemas.tetrio.user.info_v2 import User as V2TemplateUser
+from ...utils.screenshot import screenshot
+from ...utils.typing import Me
+from .. import add_block_handlers, alc
+from ..constant import CANT_VERIFY_MESSAGE
+from . import command, get_player
+from .api import Player
+from .constant import GAME_TYPE
+from .models import TETRIOUserConfig
+from .typing import Template
+
+if TYPE_CHECKING:
+    from .api.schemas.summaries import SoloSuccessModel, ZenSuccessModel
+    from .api.schemas.summaries.league import LeagueSuccessModel
+    from .api.schemas.user import User
+    from .api.schemas.user_info import UserInfoSuccess
+
+UTC = timezone.utc
+
+driver = get_driver()
+
+command.add(
+    Subcommand(
+        'query',
+        Args(
+            Arg(
+                'target',
+                At | Me,
+                notice='@想要查询的人 / 自己',
+                flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
+            ),
+            Arg(
+                'account',
+                get_player,
+                notice='TETR.IO 用户名 / ID',
+                flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
+            ),
+        ),
+        Option(
+            '--template',
+            Arg('template', Template),
+            alias=['-T'],
+            help_text='要使用的查询模板',
+        ),
+        help_text='查询 TETR.IO 游戏信息',
+    ),
+)
+
+alc.shortcut(
+    '(?i:io)(?i:查询|查|query|stats)',
+    command='tstats TETR.IO query',
+    humanized='io查',
+)
+alc.shortcut(
+    'fkosk',
+    command='tstats TETR.IO query',
+    arguments=['我'],
+    fuzzy=False,
+    humanized='An Easter egg!',
+)
+
+add_block_handlers(alc.assign('TETRIO.query'))
+
+
+@alc.assign('TETRIO.query')
+async def _(  # noqa: PLR0913
+    user: NBUser,
+    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,
+        command_type='query',
+        command_args=[f'--default-template {template}'] if template is not None else [],
+    ):
+        async with get_session() as session:
+            bind = await query_bind_info(
+                session=session,
+                user=await get_user(
+                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+                ),
+                game_platform=GAME_TYPE,
+            )
+            if template is None:
+                template = await session.scalar(
+                    select(TETRIOUserConfig.query_template).where(TETRIOUserConfig.id == user.id)
+                )
+        if bind is None:
+            await matcher.finish('未查询到绑定信息')
+        message = UniMessage(CANT_VERIFY_MESSAGE)
+        player = Player(user_id=bind.game_account, trust=True)
+        await (message + UniMessage.image(raw=await make_query_image_v2(player))).finish()
+
+
+@alc.assign('TETRIO.query')
+async def _(user: NBUser, 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=[f'--default-template {template}'] if template is not None else [],
+    ):
+        async with get_session() as session:
+            if template is None:
+                template = await session.scalar(
+                    select(TETRIOUserConfig.query_template).where(TETRIOUserConfig.id == user.id)
+                )
+        await (UniMessage.image(raw=await make_query_image_v2(account))).finish()
+
+
+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
+    user_info: UserInfoSuccess
+    league: LeagueSuccessModel
+    sprint: SoloSuccessModel
+    blitz: SoloSuccessModel
+    zen: ZenSuccessModel
+    avatar_revision: int | None
+    banner_revision: int | None
+    # TODO)) 有没有什么办法能让这类型推导成功)
+    user, user_info, league, sprint, blitz, zen, avatar_revision, banner_revision = await gather(  # type: ignore[assignment]
+        player.user,
+        player.get_info(),
+        player.league,
+        player.sprint,
+        player.blitz,
+        player.zen,
+        player.avatar_revision,
+        player.banner_revision,
+    )
+
+    if sprint.data.record is not None:
+        duration = timedelta(milliseconds=sprint.data.record.results.stats.finaltime).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.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/user/info',
+            V2TemplateInfo(
+                user=V2TemplateUser(
+                    id=user.ID,
+                    name=user.name.upper(),
+                    bio=user_info.data.bio,
+                    banner=f'http://{netloc}/host/resource/tetrio/banners/{user.ID}?{urlencode({"revision": banner_revision})}'
+                    if banner_revision is not None and banner_revision != 0
+                    else None,
+                    avatar=f'http://{netloc}/host/resource/tetrio/avatars/{user.ID}?{urlencode({"revision": avatar_revision})}'
+                    if avatar_revision is not None and avatar_revision != 0
+                    else Avatar(
+                        type='identicon',
+                        hash=md5(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.badges
+                    ],
+                    country=user_info.data.country,
+                    role=user_info.data.role,
+                    xp=user_info.data.xp,
+                    friend_count=user_info.data.friend_count,
+                    supporter_tier=user_info.data.supporter_tier,
+                    bad_standing=user_info.data.badstanding or False,
+                    verified=user_info.data.verified or False,
+                    playtime=play_time,
+                    join_at=user_info.data.ts,
+                ),
+                tetra_league=TetraLeague(
+                    rank=league.data.rank,
+                    highest_rank=league.data.bestrank,
+                    tr=round(league.data.tr, 2),
+                    glicko=round(league.data.glicko, 2),
+                    rd=round(league.data.rd, 2),
+                    global_rank=league.data.standing,
+                    country_rank=league.data.standing_local,
+                    pps=(metrics := get_metrics(pps=league.data.pps, apm=league.data.apm, vs=league.data.vs)).pps,
+                    apm=metrics.apm,
+                    apl=metrics.apl,
+                    vs=metrics.vs,
+                    adpl=metrics.adpl,
+                    statistic=TetraLeagueStatistic(total=league.data.gamesplayed, wins=league.data.gameswon),
+                    decaying=league.data.decaying,
+                    history=None,
+                ),
+                statistic=Statistic(
+                    total=handling_special_value(user_info.data.gamesplayed),
+                    wins=handling_special_value(user_info.data.gameswon),
+                ),
+                sprint=Sprint(
+                    time=sprint_value,
+                    global_rank=sprint.data.rank,
+                    play_at=sprint.data.record.ts,
+                )
+                if sprint.data.record is not None
+                else None,
+                blitz=Blitz(
+                    score=blitz.data.record.results.stats.score,
+                    global_rank=blitz.data.rank,
+                    play_at=blitz.data.record.ts,
+                )
+                if blitz.data.record is not None
+                else None,
+                zen=Zen(level=zen.data.level, score=zen.data.score),
+            ),
+        ),
+    ) as page_hash:
+        return await screenshot(f'http://{netloc}/host/{page_hash}.html')

nonebot_plugin_tetris_stats/games/tetrio/record/__init__.py

@@ -1,4 +1,31 @@
-from . import blitz, sprint
+from arclet.alconna import Arg, ArgFlag
+from nonebot_plugin_alconna import Args, At, Subcommand
+
+from ....utils.typing import Me
+from .. import command as base_command
+from .. import get_player
+
+command = Subcommand(
+    'record',
+    Args(
+        Arg(
+            'target',
+            At | Me,
+            notice='@想要查询的人 / 自己',
+            flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
+        ),
+        Arg(
+            'account',
+            get_player,
+            notice='TETR.IO 用户名 / ID',
+            flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
+        ),
+    ),
+)
+
+from . import blitz, sprint  # noqa: E402
+
+base_command.add(command)
 
 __all__ = [
     'blitz',

nonebot_plugin_tetris_stats/games/tetrio/record/blitz.py

@@ -5,12 +5,12 @@ from urllib.parse import urlencode
 
 from nonebot.adapters import Event
 from nonebot.matcher import Matcher
-from nonebot_plugin_alconna import At
+from nonebot_plugin_alconna import At, Option
 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 import EventSession
 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_user import get_user
 
 from ....db import query_bind_info, trigger
 from ....utils.exception import RecordNotFoundError
@@ -18,14 +18,23 @@ from ....utils.host import HostPage, get_self_netloc
 from ....utils.metrics import get_metrics
 from ....utils.render import render
 from ....utils.render.schemas.base import Avatar
-from ....utils.render.schemas.tetrio.tetrio_record_base import Finesse, Max, Mini, Tspins, User
-from ....utils.render.schemas.tetrio.tetrio_record_blitz import Record, Statistic
+from ....utils.render.schemas.tetrio.record.base import Finesse, Max, Mini, Tspins, User
+from ....utils.render.schemas.tetrio.record.blitz import Record, Statistic
 from ....utils.screenshot import screenshot
 from ....utils.typing import Me
 from ...constant import CANT_VERIFY_MESSAGE
 from .. import alc
 from ..api.player import Player
 from ..constant import GAME_TYPE
+from . import command
+
+command.add(Option('--blitz', dest='blitz'))
+
+alc.shortcut(
+    '(?i:io)(?i:记录|record)(?i:blitz)',
+    command='tstats TETR.IO record --blitz',
+    humanized='io记录blitz',
+)
 
 
 @alc.assign('TETRIO.record.blitz')
@@ -81,7 +90,7 @@ async def make_blitz_image(player: Player) -> bytes:
         page=await render(
             'v2/tetrio/record/blitz',
             Record(
-                type='personal_best',
+                type='best',
                 user=User(
                     id=user.ID,
                     name=user.name.upper(),

nonebot_plugin_tetris_stats/games/tetrio/record/sprint.py

@@ -5,12 +5,12 @@ from urllib.parse import urlencode
 
 from nonebot.adapters import Event
 from nonebot.matcher import Matcher
-from nonebot_plugin_alconna import At
+from nonebot_plugin_alconna import At, Option
 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 import EventSession
 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_user import get_user
 
 from ....db import query_bind_info, trigger
 from ....utils.exception import RecordNotFoundError
@@ -18,14 +18,23 @@ from ....utils.host import HostPage, get_self_netloc
 from ....utils.metrics import get_metrics
 from ....utils.render import render
 from ....utils.render.schemas.base import Avatar
-from ....utils.render.schemas.tetrio.tetrio_record_base import Finesse, Max, Mini, Statistic, Tspins, User
-from ....utils.render.schemas.tetrio.tetrio_record_sprint import Record
+from ....utils.render.schemas.tetrio.record.base import Finesse, Max, Mini, Statistic, Tspins, User
+from ....utils.render.schemas.tetrio.record.sprint import Record
 from ....utils.screenshot import screenshot
 from ....utils.typing import Me
 from ...constant import CANT_VERIFY_MESSAGE
 from .. import alc
 from ..api.player import Player
 from ..constant import GAME_TYPE
+from . import command
+
+command.add(Option('--40l', dest='sprint'))
+
+alc.shortcut(
+    '(?i:io)(?i:记录|record)(?i:40l)',
+    command='tstats TETR.IO record --40l',
+    humanized='io记录40l',
+)
 
 
 @alc.assign('TETRIO.record.sprint')
@@ -82,7 +91,7 @@ async def make_sprint_image(player: Player) -> bytes:
         page=await render(
             'v2/tetrio/record/40l',
             Record(
-                type='personal_best',
+                type='best',
                 user=User(
                     id=user.ID,
                     name=user.name.upper(),

nonebot_plugin_tetris_stats/games/top/__init__.py

@@ -1,5 +1,5 @@
-from arclet.alconna import Arg, ArgFlag, Args, Subcommand
-from nonebot_plugin_alconna import At
+from arclet.alconna import Arg, ArgFlag
+from nonebot_plugin_alconna import Args, At, Subcommand
 
 from ...utils.exception import MessageFormatError
 from ...utils.typing import Me

nonebot_plugin_tetris_stats/games/top/api/player.py

@@ -39,7 +39,6 @@ class Player:
             raw_user_profile = await Request.request(url, is_json=False)
             self._user_profile = self._parse_profile(raw_user_profile)
             await anti_duplicate_add(
-                TOPHistoricalData,
                 TOPHistoricalData(
                     user_unique_identifier=(await self.user).unique_identifier,
                     api_type='User Profile',
@@ -49,7 +48,8 @@ class Player:
             )
         return self._user_profile
 
-    def _parse_profile(self, original_user_profile: bytes) -> UserProfile:
+    @staticmethod
+    def _parse_profile(original_user_profile: bytes) -> UserProfile:
         html = etree.HTML(original_user_profile)
         user_name = html.xpath('//div[@class="mycontent"]/h1/text()')[0].replace("'s profile", '')
         today = None
@@ -68,4 +68,4 @@ class Player:
         total: list[Data] = []
         for _, value in dataframe.iterrows():
             total.append(Data(lpm=value['lpm'], apm=value['apm']))
-        return UserProfile(user_name=user_name, today=today, total=total)
+        return UserProfile(user_name=user_name, today=today, total=total or None)

nonebot_plugin_tetris_stats/games/top/api/schemas/user.py

@@ -6,7 +6,7 @@ from ....schemas import BaseUser
 from ...constant import GAME_TYPE
 
 
-class User(BaseUser):
+class User(BaseUser[Literal['TOP']]):
     platform: Literal['TOP'] = GAME_TYPE
 
     user_name: str

nonebot_plugin_tetris_stats/games/top/bind.py

@@ -1,9 +1,9 @@
 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 import EventSession
 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 nonebot_plugin_user import User
+from nonebot_plugin_userinfo import BotUserInfo, EventUserInfo, UserInfo
 
 from ...db import BindStatus, create_or_update_bind, trigger
 from ...utils.host import HostPage, get_self_netloc

nonebot_plugin_tetris_stats/games/top/query.py

@@ -3,17 +3,25 @@ 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 import EventSession
 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_user import get_user
 
 from ...db import query_bind_info, trigger
-from ...utils.metrics import get_metrics
+from ...utils.exception import FallbackError
+from ...utils.host import HostPage, get_self_netloc
+from ...utils.metrics import TetrisMetricsBasicWithLPM, get_metrics
+from ...utils.render import render
+from ...utils.render.avatar import get_avatar
+from ...utils.render.schemas.base import People
+from ...utils.render.schemas.top_info import Data as InfoData
+from ...utils.render.schemas.top_info import Info
+from ...utils.screenshot import screenshot
 from ...utils.typing import Me
 from ..constant import CANT_VERIFY_MESSAGE
 from . import alc
 from .api import Player
-from .api.schemas.user_profile import UserProfile
+from .api.schemas.user_profile import Data, UserProfile
 from .constant import GAME_TYPE
 
 
@@ -35,8 +43,10 @@ async def _(event: Event, matcher: Matcher, target: At | Me, event_session: Even
             )
         if bind is None:
             await matcher.finish('未查询到绑定信息')
-        message = CANT_VERIFY_MESSAGE
-        await (message + make_query_text(await Player(user_name=bind.game_account, trust=True).get_profile())).finish()
+        await (
+            UniMessage(CANT_VERIFY_MESSAGE)
+            + await make_query_result(await Player(user_name=bind.game_account, trust=True).get_profile())
+        ).finish()
 
 
 @alc.assign('TOP.query')
@@ -47,7 +57,34 @@ async def _(account: Player, event_session: EventSession):
         command_type='query',
         command_args=[],
     ):
-        await (make_query_text(await account.get_profile())).finish()
+        await (await make_query_result(await account.get_profile())).finish()
+
+
+def get_avg_metrics(data: list[Data]) -> TetrisMetricsBasicWithLPM:
+    total_lpm = total_apm = 0.0
+    for value in data:
+        total_lpm += value.lpm
+        total_apm += value.apm
+    num = len(data)
+    return get_metrics(lpm=total_lpm / num, apm=total_apm / num)
+
+
+async def make_query_image(profile: UserProfile) -> bytes:
+    if profile.today is None or profile.total is None:
+        raise FallbackError
+    today = get_metrics(lpm=profile.today.lpm, apm=profile.today.apm)
+    history = get_avg_metrics(profile.total)
+    async with HostPage(
+        await render(
+            'v1/top/info',
+            Info(
+                user=People(avatar=get_avatar(profile.user_name), name=profile.user_name),
+                today=InfoData(pps=today.pps, lpm=today.lpm, apm=today.apm, apl=today.apl),
+                history=InfoData(pps=history.pps, lpm=history.lpm, apm=history.apm, apl=history.apl),
+            ),
+        )
+    ) as page_hash:
+        return await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
 
 
 def make_query_text(profile: UserProfile) -> UniMessage:
@@ -60,15 +97,18 @@ def make_query_text(profile: UserProfile) -> UniMessage:
     else:
         message += f'用户 {profile.user_name} 暂无24小时内统计数据'
     if profile.total is not None:
-        total_lpm = total_apm = 0.0
-        for value in profile.total:
-            total_lpm += value.lpm
-            total_apm += value.apm
-        num = len(profile.total)
-        total = get_metrics(lpm=total_lpm / num, apm=total_apm / num)
+        total = get_avg_metrics(profile.total)
         message += '\n历史统计数据为: '
         message += f"\nL'PM: {total.lpm} ( {total.pps} pps )"
         message += f'\nAPM: {total.apm} ( x{total.apl} )'
     else:
         message += '\n暂无历史统计数据'
     return UniMessage(message)
+
+
+async def make_query_result(profile: UserProfile) -> UniMessage:
+    try:
+        return UniMessage.image(raw=await make_query_image(profile))
+    except FallbackError:
+        ...
+    return make_query_text(profile)

nonebot_plugin_tetris_stats/games/tos/__init__.py

@@ -1,5 +1,5 @@
-from arclet.alconna import Arg, ArgFlag, Args, Subcommand
-from nonebot_plugin_alconna import At
+from arclet.alconna import Arg, ArgFlag
+from nonebot_plugin_alconna import Args, At, Subcommand
 
 from ...utils.exception import MessageFormatError
 from ...utils.typing import Me

nonebot_plugin_tetris_stats/games/tos/api/player.py

@@ -85,7 +85,6 @@ class Player:
                 raise RequestError(msg)
             self._user_info = user_info
             await anti_duplicate_add(
-                TOSHistoricalData,
                 TOSHistoricalData(
                     user_unique_identifier=(await self.user).unique_identifier,
                     api_type='User Info',
@@ -117,7 +116,6 @@ class Player:
             )
             self._user_profile[params] = type_validate_json(UserProfile, raw_user_profile)
             await anti_duplicate_add(
-                TOSHistoricalData,
                 TOSHistoricalData(
                     user_unique_identifier=(await self.user).unique_identifier,
                     api_type='User Profile',

nonebot_plugin_tetris_stats/games/tos/api/schemas/user.py

@@ -6,7 +6,7 @@ from ....schemas import BaseUser
 from ...constant import GAME_TYPE
 
 
-class User(BaseUser):
+class User(BaseUser[Literal['TOS']]):
     platform: Literal['TOS'] = GAME_TYPE
 
     teaid: str

nonebot_plugin_tetris_stats/games/tos/bind.py

@@ -1,9 +1,9 @@
 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 import EventSession
 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 nonebot_plugin_user import User
+from nonebot_plugin_userinfo import BotUserInfo, EventUserInfo, UserInfo
 
 from ...db import BindStatus, create_or_update_bind, trigger
 from ...utils.host import HostPage, get_self_netloc

nonebot_plugin_tetris_stats/games/tos/constant.py

@@ -6,9 +6,6 @@ GAME_TYPE: Literal['TOS'] = 'TOS'
 BASE_URL = {
     'https://teatube.cn:8888/',
     'http://cafuuchino1.studio26f.org:19970',
-    'http://cafuuchino2.studio26f.org:19970',
-    'http://cafuuchino3.studio26f.org:19970',
-    'http://cafuuchino4.studio26f.org:19970',
 }
 
 USER_NAME = compile(

nonebot_plugin_tetris_stats/games/tos/query.py

@@ -8,10 +8,10 @@ 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 import EventSession
 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 nonebot_plugin_user import get_user
+from nonebot_plugin_userinfo import EventUserInfo, UserInfo
 
 from ...db import query_bind_info, trigger
 from ...utils.exception import RequestError
@@ -19,6 +19,7 @@ from ...utils.host import HostPage, get_self_netloc
 from ...utils.image import get_avatar
 from ...utils.metrics import TetrisMetricsProWithLPMADPM, get_metrics
 from ...utils.render import render
+from ...utils.render.avatar import get_avatar as get_random_avatar
 from ...utils.render.schemas.base import People, Ranking
 from ...utils.render.schemas.tos_info import Info, Multiplayer, Radar
 from ...utils.screenshot import screenshot
@@ -57,7 +58,9 @@ def add_special_handlers(
                     user_info, game_data = await gather(player.get_info(), get_game_data(player))
                     if game_data is not None:
                         await UniMessage.image(
-                            raw=await make_query_image(user_info, game_data, event_user_info)
+                            raw=await make_query_image(
+                                user_info, game_data, None if isinstance(target, At) else event_user_info
+                            )
                         ).finish()
                     await make_query_text(user_info, game_data).finish()
                 except RequestError as e:
@@ -126,13 +129,18 @@ async def _(
         user_info, game_data = await gather(player.get_info(), get_game_data(player))
         if game_data is not None:
             await (
-                message + UniMessage.image(raw=await make_query_image(user_info, game_data, event_user_info))
+                message
+                + UniMessage.image(
+                    raw=await make_query_image(
+                        user_info, game_data, None if isinstance(target, At) else event_user_info
+                    )
+                )
             ).finish()
         await (message + make_query_text(user_info, game_data)).finish()
 
 
 @alc.assign('TOS.query')
-async def _(account: Player, event_session: EventSession, event_user_info: UserInfo = EventUserInfo()):  # noqa: B008
+async def _(account: Player, event_session: EventSession):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
@@ -141,7 +149,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 UniMessage.image(raw=await make_query_image(user_info, game_data, None)).finish()
         await make_query_text(user_info, game_data).finish()
 
 
@@ -184,7 +192,7 @@ async def get_game_data(player: Player, query_num: int = 50) -> GameData | None:
             break
     if num == 0:
         return None
-    # TODO: 如果有效局数小于 {查询数} , 并且没有无dig信息的局, 且 user_profile.data 内有{请求数}个局, 则继续往前获取信息
+    # TODO)) 如果有效局数小于 {查询数} , 并且没有无dig信息的局, 且 user_profile.data 内有{请求数}个局, 则继续往前获取信息
     metrics = get_metrics(
         lpm=weighted_total_lpm / total_time, apm=weighted_total_apm / total_time, adpm=weighted_total_adpm / total_time
     )
@@ -197,15 +205,27 @@ 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:
+async def make_query_image(user_info: UserInfoSuccess, game_data: GameData, event_user_info: UserInfo | None) -> bytes:
     metrics = game_data.metrics
-    duration = timedelta(milliseconds=float(user_info.data.pb_sprint)).total_seconds()
-    sprint_value = f'{duration:.3f}s' if duration < 60 else f'{duration // 60:.0f}m {duration % 60:.3f}s'  # noqa: PLR2004
+    sprint_value = (
+        (
+            f'{duration:.3f}s'
+            if (duration := timedelta(milliseconds=float(user_info.data.pb_sprint)).total_seconds()) < 60  # noqa: PLR2004
+            else f'{duration // 60:.0f}m {duration % 60:.3f}s'
+        )
+        if user_info.data.pb_sprint != '2147483647'
+        else 'N/A'
+    )
     async with HostPage(
         await render(
             'v1/tos/info',
             Info(
-                user=People(avatar=await get_avatar(event_user_info, 'Data URI', None), name=user_info.data.name),
+                user=People(
+                    avatar=await get_avatar(event_user_info, 'Data URI', None)
+                    if event_user_info is not None
+                    else get_random_avatar(user_info.data.teaid),
+                    name=user_info.data.name,
+                ),
                 ranking=Ranking(rating=float(user_info.data.ranking), rd=round(float(user_info.data.rd_now), 2)),
                 multiplayer=Multiplayer(
                     pps=metrics.pps,

nonebot_plugin_tetris_stats/utils/host.py

@@ -55,7 +55,7 @@ def _():
 
 
 @app.get('/host/{page_hash}.html', status_code=status.HTTP_200_OK)
-async def _(page_hash: str) -> HTMLResponse:
+def _(page_hash: str) -> HTMLResponse:
     if page_hash in HostPage.pages:
         return HTMLResponse(HostPage.pages[page_hash])
     return NOT_FOUND

nonebot_plugin_tetris_stats/utils/image.py

@@ -2,7 +2,7 @@ from base64 import b64encode
 from io import BytesIO
 from typing import Literal, overload
 
-from nonebot_plugin_userinfo import UserInfo  # type: ignore[import-untyped]
+from nonebot_plugin_userinfo import UserInfo
 from PIL import Image
 
 

nonebot_plugin_tetris_stats/utils/render/__init__.py

@@ -5,14 +5,14 @@ from nonebot.compat import PYDANTIC_V2
 
 from ..templates import TEMPLATES_DIR
 from .schemas.bind import Bind
-from .schemas.tetrio.tetrio_info import Info as TETRIOInfo
-from .schemas.tetrio.tetrio_rank_detail import Data as TETRIORankDetailData
-from .schemas.tetrio.tetrio_rank_v1 import Data as TETRIORankDataV1
-from .schemas.tetrio.tetrio_rank_v2 import Data as TETRIORankDataV2
-from .schemas.tetrio.tetrio_record_blitz import Record as TETRIORecordBlitz
-from .schemas.tetrio.tetrio_record_sprint import Record as TETRIORecordSprint
-from .schemas.tetrio.tetrio_user_info_v2 import Info as TETRIOUserInfoV2
-from .schemas.tetrio.tetrio_user_list_v2 import List as TETRIOUserListV2
+from .schemas.tetrio.rank.detail import Data as TETRIORankDetailData
+from .schemas.tetrio.rank.v1 import Data as TETRIORankDataV1
+from .schemas.tetrio.rank.v2 import Data as TETRIORankDataV2
+from .schemas.tetrio.record.blitz import Record as TETRIORecordBlitz
+from .schemas.tetrio.record.sprint import Record as TETRIORecordSprint
+from .schemas.tetrio.user.info_v1 import Info as TETRIOUserInfoV1
+from .schemas.tetrio.user.info_v2 import Info as TETRIOUserInfoV2
+from .schemas.tetrio.user.list_v2 import List as TETRIOUserListV2
 from .schemas.top_info import Info as TOPInfo
 from .schemas.tos_info import Info as TOSInfo
 
@@ -24,7 +24,7 @@ env = Environment(
 @overload
 async def render(render_type: Literal['v1/binding'], data: Bind) -> str: ...
 @overload
-async def render(render_type: Literal['v1/tetrio/info'], data: TETRIOInfo) -> str: ...
+async def render(render_type: Literal['v1/tetrio/info'], data: TETRIOUserInfoV1) -> str: ...
 @overload
 async def render(render_type: Literal['v1/tetrio/rank'], data: TETRIORankDataV1) -> str: ...
 @overload
@@ -60,7 +60,7 @@ async def render(
         'v2/tetrio/rank/detail',
     ],
     data: Bind
-    | TETRIOInfo
+    | TETRIOUserInfoV1
     | TETRIORankDataV1
     | TOPInfo
     | TOSInfo

nonebot_plugin_tetris_stats/utils/render/avatar/__init__.py

@@ -0,0 +1,34 @@
+from base64 import b64encode
+from io import BytesIO
+from random import Random
+
+from PIL import Image
+from PIL.Image import Resampling
+
+from .draw import PIECE_MEMBERS, SkinManager
+
+
+def get_avatar(send: float | str | bytes | bytearray | None = None) -> str:
+    random = Random(send)  # noqa: S311
+    skin = (
+        SkinManager.get_skin(send)
+        .get_piece(random.choice(PIECE_MEMBERS))
+        .rotate(
+            random.randint(-360, 360),
+            expand=True,
+            resample=Resampling.BICUBIC,
+        )
+    )
+    skin = skin.crop(skin.getbbox())
+    background = Image.new('RGBA', (2048, 2048), '#e5e5e5')
+
+    skin_ratio = min(1536 / skin.width, 1536 / skin.height)
+
+    new_size = (int(skin.width * skin_ratio), int(skin.height * skin_ratio))
+    skin = skin.resize(new_size, Resampling.BICUBIC)
+
+    background.paste(skin, ((background.width - skin.width) // 2, (background.height - skin.height) // 2), mask=skin)
+    background = background.resize((512, 512), Resampling.LANCZOS)
+    with BytesIO() as output:
+        background.save(output, format='PNG')
+        return f'data:image/png;base64,{b64encode(output.getvalue()).decode("utf-8")}'

nonebot_plugin_tetris_stats/utils/render/avatar/draw/__init__.py

@@ -0,0 +1,169 @@
+from abc import ABC, abstractmethod
+from enum import Enum
+from random import Random
+from typing import Any, ClassVar
+
+from PIL.Image import Image
+from typing_extensions import Self
+
+
+class Piece(Enum):
+    Z = (
+        (True, True, False),
+        (False, True, True),
+    )
+
+    S = (
+        (False, True, True),
+        (True, True, False),
+    )
+
+    J = (
+        (True, False, False),
+        (True, True, True),
+    )
+
+    L = (
+        (False, False, True),
+        (True, True, True),
+    )
+
+    T = (
+        (False, True, False),
+        (True, True, True),
+    )
+
+    I = (  # noqa: E741
+        (True, True, True, True),
+    )
+
+    O = (  # noqa: E741
+        (True, True),
+        (True, True),
+    )
+
+    I5 = (
+        (True, True, True, True, True),  # fmt: skip
+    )
+
+    V = (
+        (True, False, False),
+        (True, False, False),
+        (True, True, True),
+    )
+
+    T5 = (
+        (True, True, True),
+        (False, True, False),
+        (False, True, False),
+    )
+
+    U = (
+        (True, False, True),
+        (True, True, True),
+    )
+
+    W = (
+        (True, False, False),
+        (True, True, False),
+        (False, True, True),
+    )
+
+    X = (
+        (False, True, False),
+        (True, True, True),
+        (False, True, False),
+    )
+
+    J5 = (
+        (True, False, False, False),
+        (True, True, True, True),
+    )
+
+    L5 = (
+        (False, False, False, True),
+        (True, True, True, True),
+    )
+
+    H = (
+        (False, False, True, True),
+        (True, True, True, False),
+    )
+
+    N = (
+        (True, True, False, False),
+        (False, True, True, True),
+    )
+
+    Y = (
+        (False, True, False, False),
+        (True, True, True, True),
+    )
+
+    R = (
+        (False, False, True, False),
+        (True, True, True, True),
+    )
+
+    P = (
+        (True, True, False),
+        (True, True, True),
+    )
+
+    Q = (
+        (False, True, True),
+        (True, True, True),
+    )
+
+    F = (
+        (True, False, False),
+        (True, True, True),
+        (False, True, False),
+    )
+
+    E = (
+        (False, False, True),
+        (True, True, True),
+        (False, True, False),
+    )
+
+    S5 = (
+        (False, True, True),
+        (False, True, False),
+        (True, True, False),
+    )
+
+    Z5 = (
+        (True, True, False),
+        (False, True, False),
+        (False, True, True),
+    )
+
+
+PIECE_MEMBERS = tuple(Piece)
+
+
+class SkinManager:
+    skin: ClassVar[list['Skin']] = []
+
+    @classmethod
+    def register(cls, skin: 'Skin') -> None:
+        cls.skin.append(skin)
+
+    @classmethod
+    def get_skin(cls, send: float | str | bytes | bytearray | None = None) -> 'Skin':
+        return Random(send).choice(cls.skin)  # noqa: S311
+
+
+class Skin(ABC):
+    def __new__(cls, *args: Any, **kwargs: Any) -> Self:  # noqa: ANN401, ARG003
+        instance = super().__new__(cls)
+        SkinManager.register(instance)
+        return instance
+
+    @abstractmethod
+    def get_piece(self, piece: Piece) -> Image:
+        raise NotImplementedError
+
+
+from . import tech  # noqa: E402, F401

nonebot_plugin_tetris_stats/utils/render/avatar/draw/tech/__init__.py

@@ -0,0 +1,94 @@
+from enum import Enum
+from pathlib import Path
+
+from nonebot import get_driver
+from PIL import Image
+from PIL.Image import Resampling
+from typing_extensions import override
+
+from .. import Piece, Skin
+
+SINGLE = 30
+
+driver = get_driver()
+
+
+class Block(Enum):
+    Z = (0, 0, 30, 30)
+    Y = (30, 0, 60, 30)
+    L = (60, 0, 90, 30)
+    O = (90, 0, 120, 30)  # noqa: E741
+    U = (120, 0, 150, 30)
+    Q = (150, 0, 180, 30)
+    S = (180, 0, 210, 30)
+    H = (210, 0, 240, 30)
+    I = (0, 30, 30, 60)  # noqa: E741
+    F = (30, 30, 60, 60)
+    J = (60, 30, 90, 60)
+    R = (90, 30, 120, 60)
+    C = (120, 30, 150, 60)
+    T = (150, 30, 180, 60)
+    W = (180, 30, 210, 60)
+    N = (210, 30, 240, 60)
+
+
+piece_block_mapping = {
+    Piece.Z: Block.Z,
+    Piece.S: Block.S,
+    Piece.J: Block.J,
+    Piece.L: Block.L,
+    Piece.T: Block.T,
+    Piece.I: Block.I,
+    Piece.O: Block.O,
+    Piece.I5: Block.O,
+    Piece.V: Block.I,
+    Piece.T5: Block.C,
+    Piece.U: Block.U,
+    Piece.W: Block.W,
+    Piece.X: Block.O,
+    Piece.J5: Block.J,
+    Piece.L5: Block.L,
+    Piece.H: Block.H,
+    Piece.N: Block.N,
+    Piece.R: Block.R,
+    Piece.Y: Block.Y,
+    Piece.P: Block.Y,
+    Piece.Q: Block.Q,
+    Piece.F: Block.F,
+    Piece.E: Block.Y,
+    Piece.S5: Block.S,
+    Piece.Z5: Block.Z,
+}
+
+
+class TechSkin(Skin):
+    def __init__(self, path: Path, name: str | None = None) -> None:
+        self.path = path
+        self.name = name or path.name
+        self.image = Image.open(path)
+        self._block_cache: dict[Block, Image.Image] = {}
+
+    def get_block(self, block: Block) -> Image.Image:
+        return self._block_cache.setdefault(block, self.image.crop(block.value))
+
+    def draw_piece(self, block: Block, piece: Piece, scale: int = 10) -> Image.Image:
+        canvas = Image.new(
+            'RGBA', (len(piece.value[0]) * SINGLE * scale, len(piece.value) * SINGLE * scale), (0, 0, 0, 0)
+        )
+        block_img = self.get_block(block).resize((SINGLE * scale, SINGLE * scale), resample=Resampling.BICUBIC)
+        for i, row in enumerate(piece.value):
+            for j, mino in enumerate(row):
+                if mino:
+                    canvas.paste(block_img, (j * SINGLE * scale, i * SINGLE * scale))
+        return canvas
+
+    @override
+    def get_piece(self, piece: Piece) -> Image.Image:
+        return self.draw_piece(piece_block_mapping[piece], piece)
+
+
+@driver.on_startup
+def _():
+    path = Path(__file__).parent / 'skins'
+    for i in sorted(path.iterdir()):
+        TechSkin(i)

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/rank/detail.py

@@ -2,7 +2,7 @@ from datetime import datetime
 
 from pydantic import BaseModel
 
-from .....games.tetrio.api.typing import ValidRank
+from ......games.tetrio.api.typing import ValidRank
 
 
 class SpecialData(BaseModel):

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/rank/v1.py

@@ -2,7 +2,7 @@ from datetime import datetime
 
 from pydantic import BaseModel
 
-from .....games.tetrio.api.typing import ValidRank
+from ......games.tetrio.api.typing import ValidRank
 
 
 class ItemData(BaseModel):

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/rank/v2.py

@@ -2,7 +2,7 @@ from datetime import datetime
 
 from pydantic import BaseModel
 
-from .....games.tetrio.api.typing import ValidRank
+from ......games.tetrio.api.typing import ValidRank
 
 
 class AverageData(BaseModel):

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/record/base.py

@@ -3,7 +3,7 @@ from typing import Literal
 
 from pydantic import BaseModel
 
-from ..base import People
+from ...base import People
 
 
 class User(People):
@@ -70,6 +70,4 @@ class Record(BaseModel):
     rank: int | None
     personal_rank: int | None
 
-    statistic: Statistic
-
     play_at: datetime

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/record/blitz.py

@@ -1,5 +1,5 @@
-from .tetrio_record_base import Record as BaseRecord
-from .tetrio_record_base import Statistic as BaseStatistic
+from .base import Record as BaseRecord
+from .base import Statistic as BaseStatistic
 
 
 class Statistic(BaseStatistic):

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/record/sprint.py

@@ -0,0 +1,7 @@
+from .base import Record as BaseRecord
+from .base import Statistic
+
+
+class Record(BaseRecord):
+    statistic: Statistic
+    time: str

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_record_sprint.py

@@ -1,5 +0,0 @@
-from .tetrio_record_base import Record as BaseRecord
-
-
-class Record(BaseRecord):
-    time: str

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/base.py

@@ -2,7 +2,7 @@ from datetime import datetime
 
 from pydantic import BaseModel
 
-from ....typing import Number
+from .....typing import Number
 
 
 class TetraLeagueHistoryData(BaseModel):

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/info_v1.py

@@ -1,8 +1,8 @@
 from pydantic import BaseModel
 
-from .....games.tetrio.api.typing import Rank
-from ....typing import Number
-from ..base import People, Ranking
+from ......games.tetrio.api.typing import Rank
+from .....typing import Number
+from ...base import People, Ranking
 from .base import TetraLeagueHistoryData
 
 

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/info_v2.py

@@ -3,10 +3,9 @@ from typing import Literal
 
 from pydantic import BaseModel
 
-from .....games.tetrio.api.schemas.user_records import Zen
-from .....games.tetrio.api.typing import Rank
-from ....typing import Number
-from ..base import Avatar
+from ......games.tetrio.api.typing import Rank, ValidRank
+from .....typing import Number
+from ...base import Avatar
 from .base import TetraLeagueHistoryData
 
 
@@ -54,20 +53,20 @@ class TetraLeagueStatistic(BaseModel):
 
 class TetraLeague(BaseModel):
     rank: Rank
-    highest_rank: Rank
+    highest_rank: ValidRank
 
     tr: Number
 
-    glicko: Number
-    rd: Number
+    glicko: Number | None
+    rd: Number | None
 
     global_rank: int | None
     country_rank: int | None
 
-    pps: Number
+    pps: Number | None
 
-    apm: Number
-    apl: Number
+    apm: Number | None
+    apl: Number | None
 
     vs: Number | None
     adpl: Number | None
@@ -76,7 +75,7 @@ class TetraLeague(BaseModel):
 
     decaying: bool
 
-    history: list[TetraLeagueHistoryData]
+    history: list[TetraLeagueHistoryData] | None
 
 
 class Sprint(BaseModel):
@@ -91,10 +90,15 @@ class Blitz(BaseModel):
     play_at: datetime
 
 
+class Zen(BaseModel):
+    level: int
+    score: int
+
+
 class Info(BaseModel):
     user: User
     tetra_league: TetraLeague | None
     statistic: Statistic | None
     sprint: Sprint | None
     blitz: Blitz | None
-    zen: Zen
+    zen: Zen | None

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/list_v2.py

@@ -2,9 +2,9 @@ from datetime import datetime
 
 from pydantic import BaseModel
 
-from .....games.tetrio.api.typing import Rank
-from ....typing import Number
-from ..base import Avatar
+from ......games.tetrio.api.typing import Rank
+from .....typing import Number
+from ...base import Avatar
 
 
 class TetraLeague(BaseModel):

nonebot_plugin_tetris_stats/utils/request.py

@@ -119,7 +119,7 @@ class Request:
     async def request(cls, url: str, *, is_json: bool = True) -> bytes:
         """请求api"""
         try:
-            async with AsyncClient(cookies=cls._cookies, timeout=config.tetris_req_timeout) as session:
+            async with AsyncClient(cookies=cls._cookies, timeout=config.tetris.request_timeout) as session:
                 response = await session.get(url, headers=cls._headers)
                 if response.status_code != HTTPStatus.OK:
                     msg = f'请求错误 code: {response.status_code} {HTTPStatus(response.status_code).phrase}\n{response.text}'

nonebot_plugin_tetris_stats/utils/screenshot.py

@@ -4,18 +4,19 @@ from playwright.async_api import TimeoutError, ViewportSize
 from ..config.config import Config
 from .browser import BrowserManager
 from .retry import retry
+from .time_it import time_it
 
 config = get_plugin_config(Config)
 
 
 @retry(exception_type=TimeoutError, reply='截图失败, 重试中')
+@time_it
 async def screenshot(url: str) -> bytes:
     browser = await BrowserManager.get_browser()
     async with (
-        await browser.new_page(device_scale_factor=config.tetris_screenshot_quality) as page,
+        await browser.new_page(device_scale_factor=config.tetris.screenshot_quality) as page,
     ):
         await page.goto(url)
-        await page.wait_for_load_state('networkidle')
         size: ViewportSize = await page.evaluate("""
             () => {
                 const element = document.querySelector('#content');

nonebot_plugin_tetris_stats/utils/templates.py

@@ -11,12 +11,13 @@ from nonebot import get_driver
 from nonebot.log import logger
 from nonebot.permission import SUPERUSER
 from nonebot_plugin_alconna import Alconna, Args, Option, on_alconna
-from nonebot_plugin_localstore import get_cache_file, get_data_dir
 from rich.progress import Progress
 
+from ..config.config import CACHE_PATH, DATA_PATH
+
 driver = get_driver()
 
-TEMPLATES_DIR = get_data_dir('nonebot_plugin_tetris_stats') / 'templates'
+TEMPLATES_DIR = DATA_PATH / 'templates'
 
 alc = on_alconna(Alconna('更新模板', Option('--revision', Args['revision', str], alias={'-R'})), permission=SUPERUSER)
 
@@ -36,7 +37,7 @@ async def download_templates(tag: str) -> Path:
                 .rsplit('/', 1)[-1]
             )
             logger.success(f'获取到的最新版本号: {tag}')
-        path = get_cache_file('nonebot_plugin_tetris_stats', f'dist_{time_ns()}.zip')
+        path = CACHE_PATH / f'dist_{time_ns()}.zip'
         with Progress() as progress:
             task_id = progress.add_task('[red]Downloading...', total=None)
             async with (
@@ -56,7 +57,7 @@ async def download_templates(tag: str) -> Path:
         return path
 
 
-async def unzip_templates(zip_path: Path) -> Path:
+def unzip_templates(zip_path: Path) -> Path:
     logger.info('开始解压模板')
     temp_path = TEMPLATES_DIR.parent / f'temp_{time_ns()}'
     with ZipFile(zip_path) as zip_file:
@@ -91,7 +92,7 @@ async def check_hash(hash_file_path: Path) -> bool:
 
 async def init_templates(tag: str) -> bool:
     logger.info(f'开始初始化模板 {tag}')
-    temp_path = await unzip_templates(await download_templates(tag))
+    temp_path = unzip_templates(await download_templates(tag))
     if not await check_hash(temp_path / 'hash.sha256'):
         rmtree(temp_path)
         return False

nonebot_plugin_tetris_stats/utils/time_it.py

@@ -0,0 +1,21 @@
+from collections.abc import Callable, Coroutine
+from functools import wraps
+from time import time_ns
+from typing import Any, ParamSpec, TypeVar
+
+from nonebot.log import logger
+
+T = TypeVar('T')
+P = ParamSpec('P')
+
+
+def time_it(func: Callable[P, Coroutine[Any, Any, T]]) -> Callable[P, Coroutine[Any, Any, T]]:
+    @wraps(func)
+    async def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
+        start = time_ns()
+        try:
+            return await func(*args, **kwargs)
+        finally:
+            logger.debug(f'{func.__name__} took {(time_ns() - start) / 1e6}ms')
+
+    return wrapper

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'nonebot-plugin-tetris-stats'
-version = '1.4.2'
+version = '1.4.9'
 description = '一款基于 NoneBot2 的用于查询 Tetris 相关游戏数据的插件'
 authors = ['scdhh <wallfjjd@gmail.com>']
 readme = 'README.md'
@@ -10,49 +10,48 @@ license = 'AGPL-3.0'
 
 [tool.poetry.dependencies]
 python = '^3.10'
-nonebot2 = { extras = ["fastapi"], version = "^2.3.0" }
-nonebot-plugin-alconna = ">=0.48.0"
-nonebot-plugin-apscheduler = ">=0.4,<0.6"
-nonebot-plugin-localstore = ">=0.6,<0.8"
-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.4"
-nonebot-plugin-userinfo = "^0.2.4"
-aiocache = "^0.12.2"
-aiofiles = ">=23.2.1,<25.0.0"
-arclet-alconna = "^1.8.19"
-async-lru = "^2.0.4"
-httpx = "^0.27.0"
-jinja2 = "^3.1.3"
+nonebot2 = { extras = ['fastapi'], version = '^2.3.0' }
+nonebot-plugin-alconna = '>=0.48.0'
+nonebot-plugin-apscheduler = '>=0.4,<0.6'
+nonebot-plugin-localstore = '>=0.6,<0.8'
+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.5'
+nonebot-plugin-userinfo = '^0.2.4'
+aiocache = '^0.12.2'
+aiofiles = '>=23.2.1,<25.0.0'
+async-lru = '^2.0.4'
+httpx = '^0.27.0'
+jinja2 = '^3.1.3'
 lxml = '^5.1.0'
 pandas = '>=1.4.3,<3.0.0'
-pillow = "^10.3.0"
+pillow = '^10.3.0'
 playwright = '^1.41.2'
-rich = "^13.7.1"
+rich = '^13.7.1'
 ujson = '^5.9.0'
-zstandard = ">=0.22,<0.24"
+zstandard = '>=0.22,<0.24'
 
 [tool.poetry.group.dev.dependencies]
 mypy = '>=1.9'
 ruff = '>=0.3.0'
-types-aiofiles = ">=23.2.0.20240106,<25.0.0.0"
-types-lxml = "^2024.2.9"
-types-pillow = "^10.2.0.20240423"
+types-aiofiles = '>=23.2.0.20240106,<25.0.0.0'
+types-lxml = '^2024.2.9'
+types-pillow = '^10.2.0.20240423'
 types-ujson = '^5.9.0'
 pandas-stubs = '>=1.5.2,<3.0.0'
-nonebot2 = { extras = ["all"], version = "^2.3.0" }
-nonebot-adapter-discord = "^0.1.3"
-nonebot-adapter-kaiheila = "^0.3.4"
-nonebot-adapter-onebot = "^2.4.1"
-nonebot-adapter-qq = "^1.4.4"
-nonebot-adapter-satori = ">=0.11.4,<0.13.0"
-nonebot-plugin-orm = { extras = ["default"], version = ">=0.3,<0.8" }
+nonebot2 = { extras = ['all'], version = '^2.3.0' }
+nonebot-adapter-discord = '^0.1.3'
+nonebot-adapter-kaiheila = '^0.3.4'
+nonebot-adapter-onebot = '^2.4.1'
+nonebot-adapter-qq = '^1.4.4'
+nonebot-adapter-satori = '>=0.11.4,<0.13.0'
+nonebot-plugin-orm = { extras = ['default'], version = '>=0.3,<0.8' }
 
 [tool.poetry.group.debug.dependencies]
-memory-profiler = "^0.61.0"
+memory-profiler = '^0.61.0'
 objprint = '^0.2.2'
-viztracer = "^0.16.2"
+viztracer = '^0.16.2'
 
 [build-system]
 requires = ['poetry-core>=1.0.0']
@@ -60,7 +59,7 @@ build-backend = 'poetry.core.masonry.api'
 
 [tool.ruff]
 line-length = 120
-target-version = "py310"
+target-version = 'py310'
 
 [tool.ruff.lint]
 select = [
@@ -89,10 +88,12 @@ select = [
     'ICN',   # flake8-import-conventions
     'PIE',   # flake8-pie
     'T20',   # flake8-print
+    'PYI',   # flake8-pyi
     'Q',     # flake8-quotes
     'RSE',   # flake8-raise
     'RET',   # flake8-return
     'SLF',   # flake8-self
+    'SLOT',  # flake8-slots
     'SIM',   # flake8-simplify
     'TID',   # flake8-tidy-imports
     'TCH',   # flake8-type-checking
@@ -104,6 +105,7 @@ select = [
     'PL',    # pylint
     'TRY',   # tryceratops
     'FLY',   # flynt
+    'FAST',  # FastAPI
     'PERF',  # Perflint
     'FURB',  # refurb
     'RUF',   # Ruff-specific rules
@@ -124,7 +126,7 @@ flake8-quotes = { inline-quotes = 'single', multiline-quotes = 'double' }
 mypy-init-return = true
 
 [tool.ruff.lint.flake8-builtins]
-builtins-ignorelist = ["id"]
+builtins-ignorelist = ['id']
 
 [tool.ruff.format]
 quote-style = 'single'