🔖 1.6.3

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.7.2 → v0.7.3](https://github.com/astral-sh/ruff-pre-commit/compare/v0.7.2...v0.7.3)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.github/dependabot.yml

@@ -1,12 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "pip" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    target-branch: "main"
-    schedule:
-      interval: "daily"

.github/workflows/Release.yml

@@ -3,7 +3,7 @@ name: Release CI
 on:
   push:
     tags:
-      - "*"
+      - '*'
 
 jobs:
   release:
@@ -12,24 +12,25 @@ jobs:
       id-token: write
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Install poetry
+      - uses: astral-sh/setup-uv@v3
-        run: pipx install poetry
+        name: Setup UV
-        shell: bash
-
-      - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          enable-cache: true
-          cache: "poetry"
 
-      - run: poetry install
+      - name: 'Set up Python'
+        uses: actions/setup-python@v5
+        with:
+          python-version-file: '.python-version'
+
+      - run: uv sync
         shell: bash
 
       - name: Get Version
         id: version
         run: |
-          echo "VERSION=$(poetry version -s)" >> $GITHUB_OUTPUT
+          echo "VERSION=$(uvx pdm show --version)" >> $GITHUB_OUTPUT
           echo "TAG_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
           echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
@@ -38,10 +39,10 @@ jobs:
         run: exit 1
 
       - name: Build Package
-        run: poetry build
+        run: uv build
 
       - name: Publish Package to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        run: uv publish
 
       - name: Publish Package to GitHub Release
         run: gh release create ${{ steps.version.outputs.TAG_NAME }} dist/*.tar.gz dist/*.whl -t "🔖 ${{ steps.version.outputs.TAG_NAME }}" --generate-notes

.github/workflows/Test.yml

@@ -0,0 +1,58 @@
+name: Code Coverage
+
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: Test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        # python-version: ['3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12']
+        os: [ubuntu-latest, windows-latest, macos-latest]
+      fail-fast: false
+    env:
+      OS: ${{ matrix.os }}
+      PYTHON_VERSION: ${{ matrix.python-version }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup uv
+        uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+          cache-suffix: ${{ env.PYTHON_VERSION }}_${{ env.OS }}
+
+      - name: Install Dependencies
+        run: |
+          uv python pin ${{ env.PYTHON_VERSION }}
+          uv sync --group test
+
+      - name: Run tests
+        run: uv run pytest --cov=nonebot_plugin_tetris_stats --cov-report xml
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          env_vars: OS,PYTHON_VERSION
+
+  check:
+    if: always()
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Decide whether the needed jobs succeeded or failed
+        uses: re-actors/alls-green@223e4bb7a751b91f43eda76992bcfbf23b8b0302
+        with:
+          jobs: ${{ toJSON(needs) }}

.github/workflows/TypeCheck.yml

@@ -0,0 +1,33 @@
+name: TypeCheck
+
+on:
+  push:
+
+jobs:
+  TypeCheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: astral-sh/setup-uv@v3
+        name: Setup UV
+        with:
+          enable-cache: true
+
+      - name: 'Set up Python'
+        uses: actions/setup-python@v5
+        with:
+          python-version-file: '.python-version'
+
+      - run: uv sync
+        shell: bash
+
+      - name: Run Mypy
+        shell: bash
+        run: |
+          uv run mypy ./nonebot_plugin_tetris_stats
+
+      - name: Run BasedPyright
+        shell: bash
+        run: |
+          uv run basedpyright ./nonebot_plugin_tetris_stats/

.github/workflows/codeql-analysis.yml

@@ -9,14 +9,14 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: 'CodeQL'
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [main]
   schedule:
     - cron: '17 6 * * 5'
 
@@ -32,41 +32,40 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'python' ]
+        language: ['python']
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
-    - name: Checkout repository
+      - name: Checkout repository
-      uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-    # Initializes the CodeQL tools for scanning.
+      # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
+      - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
-      with:
+        with:
-        languages: ${{ matrix.language }}
+          languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
+          # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
+          # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
-        
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
 
-        
+          # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+          # queries: security-extended,security-and-quality
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
 
-    # ℹ️ Command-line programs to run using the OS shell.
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+      # ℹ️ Command-line programs to run using the OS shell.
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    # - run: |
+      #   If the Autobuild fails above, remove it and uncomment the following three lines.
-    #   echo "Run, Build Application using script"
+      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-    #   ./location_of_script_within_repo/buildscript.sh
 
-    - name: Perform CodeQL Analysis
+      # - run: |
-      uses: github/codeql-action/analyze@v2
+      #   echo "Run, Build Application using script"
+      #   ./location_of_script_within_repo/buildscript.sh
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3

.gitignore

@@ -1,22 +1,528 @@
-.idea
+# Created by https://www.toptal.com/developers/gitignore/api/linux,macos,python,pycharm,windows,visualstudiocode,node
+# Edit at https://www.toptal.com/developers/gitignore?templates=linux,macos,python,pycharm,windows,visualstudiocode,node
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### macOS Patch ###
+# iCloud generated files
+*.icloud
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
 dist
-test_*
+
-Untitled*
+# Gatsby files
-*copy*
+.cache/
-.vscode
+# Comment in the public line in if your project uses Gatsby and not Next.js
-*dev*
+# https://nextjs.org/blog/next-9-1#public-directory-support
-*_cache*
+# public
-*backup*
+
-*.pyc
+# vuepress build output
-node_modules
+.vuepress/dist
-.prettier*
+
-package.json
+# vuepress v2.x temp and cache directory
-pnpm-lock.yaml
+.temp
-*.drawio.svg
+
-package-lock.json
+# Docusaurus cache and generated files
-*Zone.Identifier
+.docusaurus
-.env*
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+### Node Patch ###
+# Serverless Webpack directories
+.webpack/
+
+# Optional stylelint cache
+
+# SvelteKit build / generate output
+.svelte-kit
+
+### PyCharm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### PyCharm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+# https://plugins.jetbrains.com/plugin/7973-sonarlint
+.idea/**/sonarlint/
+
+# SonarQube Plugin
+# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
+.idea/**/sonarIssues.xml
+
+# Markdown Navigator plugin
+# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
+.idea/**/markdown-navigator.xml
+.idea/**/markdown-navigator-enh.xml
+.idea/**/markdown-navigator/
+
+# Cache file creation bug
+# See https://youtrack.jetbrains.com/issue/JBR-2257
+.idea/$CACHE_FILE$
+
+# CodeStream plugin
+# https://plugins.jetbrains.com/plugin/12206-codestream
+.idea/codestream.xml
+
+# Azure Toolkit for IntelliJ plugin
+# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
+.idea/**/azureSettings.xml
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+### Python Patch ###
+# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration
+poetry.toml
+
+# ruff
+.ruff_cache/
+
+# LSP config files
+pyrightconfig.json
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
+.ionide
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.toptal.com/developers/gitignore/api/linux,macos,python,pycharm,windows,visualstudiocode,node
+
+# NoneBot2
 bot.py
-TODO
+.env*
-*.fish
+
-extracted_skin_mino_*
+# Misc
+ignore_*
+*.backup
+TODO*

.pre-commit-config.yaml

@@ -0,0 +1,22 @@
+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: 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.7.3
+    hooks:
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
+        stages: [pre-commit]
+      - id: ruff-format
+        stages: [pre-commit]
+
+  - repo: https://github.com/nonebot/nonemoji
+    rev: v0.1.4
+    hooks:
+      - id: nonemoji
+        stages: [prepare-commit-msg]

.python-version

@@ -0,0 +1 @@
+3.10

CONTRIBUTING.en-US.md

@@ -0,0 +1,58 @@
+# How to Contribute?
+
+## Setting Up the Environment
+
+### For Developers with Basic Python Knowledge
+
+First, you need install [uv](https://docs.astral.sh/uv/).  
+Then:
+
+```bash
+# Set up the basic Python environment
+uv python install 3.10
+
+# Clone the repository
+git clone https://github.com/A-Minos/nonebot-plugin-tetris-stats.git
+cd nonebot-plugin-tetris-stats
+
+# Install dependencies
+uv sync
+```
+
+## Development
+
+### Code Development
+
+1. For static code analysis, use [ruff](https://docs.astral.sh/ruff/). You can install the corresponding plugin for your IDE or use the command line with `ruff check ./nonebot_plugin_tetris_stats/` to check the code.
+2. For code formatting, use [ruff](https://docs.astral.sh/ruff/). You can install the corresponding plugin for your IDE or use the command line with `ruff format ./nonebot_plugin_tetris_stats/` to format the code.
+3. For type checking, use both [basedpyright](https://docs.basedpyright.com/latest/) and [mypy](https://www.mypy-lang.org/). You can install the corresponding plugins for your IDE or use the following commands in the terminal to check the code:
+
+```bash
+# basedpyright
+basedpyright ./nonebot_plugin_tetris_stats/
+
+# mypy
+mypy ./nonebot_plugin_tetris_stats/
+```
+
+### Internationalization
+
+This project uses [Tarina](https://github.com/ArcletProject/Tarina) for internationalization support.
+
+#### Adding a New Language
+
+1. Navigate to the `./nonebot_plugin_tetris_stats/i18n/` directory.
+2. Run `tarina-lang create {language_code}` \* Please note that the language code should preferably follow the [IETF language tag](https://en.wikipedia.org/wiki/IETF_language_tag) standard.
+3. Edit the generated `./nonebot_plugin_tetris_stats/i18n/{language_code}.json` file.
+
+#### Updating an Existing Language
+
+1. Navigate to the `./nonebot_plugin_tetris_stats/i18n/` directory.
+2. Edit the corresponding `./nonebot_plugin_tetris_stats/i18n/{language_code}.json` file.
+
+#### Adding New Entries
+
+1. Navigate to the `./nonebot_plugin_tetris_stats/i18n/` directory.
+2. Edit the `.template.json` file.
+3. Run `tarina-lang schema && tarina-lang model`.
+4. Modify the language files, adding new entries at least to `en-US.json`.

CONTRIBUTING.md

@@ -0,0 +1,57 @@
+# 我该如何参与开发?
+
+## 配置环境
+
+首先你需要安装 [uv](https://docs.astral.sh/uv/)。  
+然后：
+
+```bash
+# 配置基础 Python 环境
+uv python install 3.10
+
+# 克隆仓库
+git clone https://github.com/A-Minos/nonebot-plugin-tetris-stats.git
+cd nonebot-plugin-tetris-stats
+
+# 安装依赖
+uv sync
+```
+
+## 开发
+
+### 代码开发
+
+1. 代码静态检查使用 [ruff](https://docs.astral.sh/ruff/)，你可以为你的ide安装对应插件来使用，也可以在命令行使用`ruff check ./nonebot_plugin_tetris_stats/`来检查代码。
+2. 代码格式化使用 [ruff](https://docs.astral.sh/ruff/)，你可以为你的ide安装对应插件来使用，也可以在命令行使用`ruff format ./nonebot_plugin_tetris_stats/`来格式化代码。
+3. 类型检查同时使用 [basedpyright](https://docs.basedpyright.com/latest/) 和 [mypy](https://www.mypy-lang.org/)，你可以为你的ide安装对应插件来使用。
+   也可以在命令行使用下面的命令来检查代码:
+
+```bash
+# basedpyright
+basedpyright ./nonebot_plugin_tetris_stats/
+
+# mypy
+mypy ./nonebot_plugin_tetris_stats/
+```
+
+### 国际化
+
+本项目使用 [Tarina](https://github.com/ArcletProject/Tarina) 提供国际化支持。
+
+#### 添加新的语言
+
+1. 进入 `./nonebot_plugin_tetris_stats/i18n/` 目录。
+2. 运行 `tarina-lang create {语言代码}` \* 请注意，语言代码最好符合 [IETF语言标签](https://zh.wikipedia.org/wiki/IETF%E8%AF%AD%E8%A8%80%E6%A0%87%E7%AD%BE) 的规范。
+3. 编辑生成的 `./nonebot_plugin_tetris_stats/i18n/{语言代码}.json` 文件。
+
+#### 更新已有语言
+
+1. 进入 `./nonebot_plugin_tetris_stats/i18n/` 目录。
+2. 编辑对应的 `./nonebot_plugin_tetris_stats/i18n/{语言代码}.json` 文件。
+
+#### 添加新的条目
+
+1. 进入 `./nonebot_plugin_tetris_stats/i18n/` 目录。
+2. 编辑 `.template.json` 文件。
+3. 运行 `tarina-lang schema && tarina-lang model`。
+4. 修改语言文件，至少为`en-US.json`添加新的条目。

README.md

@@ -87,3 +87,13 @@ pip install nonebot-plugin-tetris-stats
 ## 📝 开源
 
 本项目使用 [AGPL-3.0](https://github.com/shoucandanghehe/nonebot-plugin-tetris-stats/blob/main/LICENSE) 许可证开源
+
+## 🤓☝ 给个 star 吧
+
+<a href="https://star-history.com/#A-Minos/nonebot-plugin-tetris-stats&Date">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=A-Minos/nonebot-plugin-tetris-stats&type=Date&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=A-Minos/nonebot-plugin-tetris-stats&type=Date" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=A-Minos/nonebot-plugin-tetris-stats&type=Date" />
+ </picture>
+</a>

nonebot_plugin_tetris_stats/__init__.py

@@ -1,14 +1,19 @@
 from nonebot import require
-from nonebot.plugin import PluginMetadata
+from nonebot.plugin import PluginMetadata, inherit_supported_adapters
 
-require('nonebot_plugin_alconna')
+require_plugins = {
-require('nonebot_plugin_apscheduler')
+    'nonebot_plugin_alconna',
-require('nonebot_plugin_localstore')
+    'nonebot_plugin_apscheduler',
-require('nonebot_plugin_orm')
+    'nonebot_plugin_localstore',
-require('nonebot_plugin_session_orm')
+    'nonebot_plugin_orm',
-require('nonebot_plugin_session')
+    'nonebot_plugin_session_orm',
-require('nonebot_plugin_user')
+    'nonebot_plugin_session',
-require('nonebot_plugin_userinfo')
+    'nonebot_plugin_user',
+    'nonebot_plugin_userinfo',
+}
+
+for i in require_plugins:
+    require(i)
 
 from nonebot_plugin_alconna import namespace  # noqa: E402
 
@@ -16,6 +21,7 @@ with namespace('tetris_stats') as ns:
     ns.enable_message_cache = False
 
 from .config import migrations  # noqa: E402
+from .config.config import Config  # noqa: E402
 
 __plugin_meta__ = PluginMetadata(
     name='Tetris Stats',
@@ -23,6 +29,8 @@ __plugin_meta__ = PluginMetadata(
     usage='发送 tstats --help 查询使用方法',
     type='application',
     homepage='https://github.com/A-minos/nonebot-plugin-tetris-stats',
+    config=Config,
+    supported_adapters=inherit_supported_adapters(*require_plugins),
     extra={
         'orm_version_location': migrations,
     },

nonebot_plugin_tetris_stats/config/config.py

@@ -1,12 +1,27 @@
-from pathlib import Path
+from nonebot import get_plugin_config
+from nonebot_plugin_localstore import get_plugin_cache_dir, get_plugin_data_dir
+from pydantic import BaseModel, Field
 
-from nonebot_plugin_localstore import get_cache_dir  # type: ignore[import-untyped]
+CACHE_PATH = get_plugin_cache_dir()
-from pydantic import BaseModel
+DATA_PATH = get_plugin_data_dir()
 
-CACHE_PATH: Path = get_cache_dir('nonebot_plugin_tetris_stats')
+
+class Proxy(BaseModel):
+    main: str | None = None
+    github: str | None = None
+    tetrio: str | None = None
+    tos: str | None = None
+    top: str | None = None
+
+
+class ScopedConfig(BaseModel):
+    request_timeout: float = 30.0
+    screenshot_quality: float = 2
+    proxy: Proxy = Field(default_factory=Proxy)
 
 
 class Config(BaseModel):
-    """配置类"""
+    tetris: ScopedConfig = Field(default_factory=ScopedConfig)
 
-    tetris_req_timeout: float = 30.0
+
+config = get_plugin_config(Config)

nonebot_plugin_tetris_stats/config/migrations/3c25a5a8c050_refactor_historical.py

@@ -19,7 +19,6 @@ from sqlalchemy import desc, select
 from sqlalchemy.dialects import sqlite
 from sqlalchemy.ext.automap import automap_base
 from sqlalchemy.orm import Session
-from ujson import dumps, loads
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
@@ -30,7 +29,9 @@ branch_labels: str | Sequence[str] | None = None
 depends_on: str | Sequence[str] | None = None
 
 
-def migrate_old_data() -> None:
+def migrate_old_data() -> None:  # noqa: C901
+    from json import dumps, loads
+
     Base = automap_base()  # noqa: N806
     Base.prepare(autoload_with=op.get_bind())
     OldHistoricalData = Base.classes.nonebot_plugin_tetris_stats_historicaldata  # noqa: N806
@@ -46,6 +47,9 @@ def migrate_old_data() -> None:
             TimeRemainingColumn(),
         ) as progress,
     ):
+        if session.query(OldHistoricalData).count() == 0:
+            logger.info('空表, 跳过')
+            return
         task_id = progress.add_task('[cyan]Migrating:', total=session.query(OldHistoricalData).count())
         pointer = 0
         while pointer < session.query(OldHistoricalData).order_by(desc(OldHistoricalData.id)).limit(1).one().id:

nonebot_plugin_tetris_stats/config/migrations/5a1b93948494_add_tetrioleaguestats.py

@@ -0,0 +1,119 @@
+"""add TETRIOLeagueStats
+
+迁移 ID: 5a1b93948494
+父迁移: cfeab6961dce
+创建时间: 2024-08-24 00:22:41.359500
+
+"""
+
+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 = '5a1b93948494'
+down_revision: str | Sequence[str] | None = 'cfeab6961dce'
+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_tetrioleaguestats',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('update_time', sa.DateTime(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nonebot_plugin_tetris_stats_tetrioleaguestats')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_tetrioleaguestats', schema=None) as batch_op:
+        batch_op.create_index(
+            batch_op.f('ix_nonebot_plugin_tetris_stats_tetrioleaguestats_update_time'), ['update_time'], unique=False
+        )
+
+    op.create_table(
+        'nonebot_plugin_tetris_stats_tetrioleaguehistorical',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('request_id', sa.Uuid(), nullable=False),
+        sa.Column('data', sa.JSON(), nullable=False),
+        sa.Column('update_time', sa.DateTime(), nullable=False),
+        sa.Column('stats_id', sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ['stats_id'],
+            ['nonebot_plugin_tetris_stats_tetrioleaguestats.id'],
+            name=op.f(
+                'fk_nonebot_plugin_tetris_stats_tetrioleaguehistorical_stats_id_nonebot_plugin_tetris_stats_tetrioleaguestats'
+            ),
+        ),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nonebot_plugin_tetris_stats_tetrioleaguehistorical')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_tetrioleaguehistorical', schema=None) as batch_op:
+        batch_op.create_index(
+            batch_op.f('ix_nonebot_plugin_tetris_stats_tetrioleaguehistorical_request_id'), ['request_id'], unique=False
+        )
+        batch_op.create_index(
+            batch_op.f('ix_nonebot_plugin_tetris_stats_tetrioleaguehistorical_update_time'),
+            ['update_time'],
+            unique=False,
+        )
+
+    op.create_table(
+        'nonebot_plugin_tetris_stats_tetrioleaguestatsfield',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('rank', sa.String(length=2), nullable=False),
+        sa.Column('tr_line', sa.Float(), nullable=False),
+        sa.Column('player_count', sa.Integer(), nullable=False),
+        sa.Column('low_pps', sa.JSON(), nullable=False),
+        sa.Column('low_apm', sa.JSON(), nullable=False),
+        sa.Column('low_vs', sa.JSON(), nullable=False),
+        sa.Column('avg_pps', sa.Float(), nullable=False),
+        sa.Column('avg_apm', sa.Float(), nullable=False),
+        sa.Column('avg_vs', sa.Float(), nullable=False),
+        sa.Column('high_pps', sa.JSON(), nullable=False),
+        sa.Column('high_apm', sa.JSON(), nullable=False),
+        sa.Column('high_vs', sa.JSON(), nullable=False),
+        sa.Column('stats_id', sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ['stats_id'],
+            ['nonebot_plugin_tetris_stats_tetrioleaguestats.id'],
+            name=op.f(
+                'fk_nonebot_plugin_tetris_stats_tetrioleaguestatsfield_stats_id_nonebot_plugin_tetris_stats_tetrioleaguestats'
+            ),
+        ),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nonebot_plugin_tetris_stats_tetrioleaguestatsfield')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_tetrioleaguestatsfield', schema=None) as batch_op:
+        batch_op.create_index(
+            batch_op.f('ix_nonebot_plugin_tetris_stats_tetrioleaguestatsfield_rank'), ['rank'], 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_tetrioleaguestatsfield', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_tetrioleaguestatsfield_rank'))
+
+    op.drop_table('nonebot_plugin_tetris_stats_tetrioleaguestatsfield')
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_tetrioleaguehistorical', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_tetrioleaguehistorical_update_time'))
+        batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_tetrioleaguehistorical_request_id'))
+
+    op.drop_table('nonebot_plugin_tetris_stats_tetrioleaguehistorical')
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_tetrioleaguestats', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_tetrioleaguestats_update_time'))
+
+    op.drop_table('nonebot_plugin_tetris_stats_tetrioleaguestats')
+    # ### end Alembic commands ###

nonebot_plugin_tetris_stats/config/migrations/6c3206f90cc3_add_field.py

@@ -13,7 +13,6 @@ from typing import TYPE_CHECKING
 from alembic import op
 from sqlalchemy.ext.automap import automap_base
 from sqlalchemy.orm import Session
-from ujson import dumps, loads
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
@@ -27,6 +26,7 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    from json import dumps, loads
 
     Base = automap_base()  # noqa: N806
     connection = op.get_bind()
@@ -50,6 +50,7 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    from json import dumps, loads
 
     Base = automap_base()  # noqa: N806
     connection = op.get_bind()

nonebot_plugin_tetris_stats/config/migrations/8a91210ce14d_correct_the_data_in_historicaldata.py

@@ -28,12 +28,6 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:  # noqa: C901
     if name:
         return
-    from nonebot_plugin_tetris_stats.version import __version__
-
-    if __version__ != '1.0.3':
-        msg = '本迁移需要1.0.3版本, 请先锁定版本至1.0.3版本再执行本迁移'
-        logger.critical(msg)
-        raise RuntimeError(msg)
 
     from nonebot.compat import PYDANTIC_V2, type_validate_json
     from pydantic import BaseModel, ValidationError
@@ -46,10 +40,6 @@ def upgrade(name: str = '') -> None:  # noqa: C901
         TimeRemainingColumn,
     )
 
-    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())
     HistoricalData = Base.classes.nonebot_plugin_tetris_stats_historicaldata  # noqa: N806
@@ -62,18 +52,33 @@ def upgrade(name: str = '') -> None:  # noqa: C901
         def model_to_json(value: BaseModel) -> str:
             return value.json(by_alias=True)
 
-    models = BaseProcessedData.__subclasses__()
-
-    def json_to_model(value: str) -> BaseModel:
-        for i in models:
-            try:
-                return type_validate_json(i, value)
-            except ValidationError:  # noqa: PERF203
-                ...
-        raise ValueError
-
     with Session(op.get_bind()) as session:
         count = session.query(HistoricalData).count()
+        if count == 0:
+            logger.info('空表, 跳过')
+            return
+
+        from nonebot_plugin_tetris_stats.version import __version__
+
+        if __version__ != '1.0.3':
+            msg = '本迁移需要1.0.3版本, 请先锁定版本至1.0.3版本再执行本迁移'
+            logger.critical(msg)
+            raise RuntimeError(msg)
+
+        from nonebot_plugin_tetris_stats.game_data_processor.schemas import (  # type: ignore[import-untyped]
+            BaseProcessedData,
+        )
+
+        models = BaseProcessedData.__subclasses__()
+
+        def json_to_model(value: str) -> BaseModel:
+            for i in models:
+                try:
+                    return type_validate_json(i, value)
+                except ValidationError:  # noqa: PERF203
+                    ...
+            raise ValueError
+
         with Progress(
             TextColumn('[progress.description]{task.description}'),
             BarColumn(),

nonebot_plugin_tetris_stats/config/migrations/9cd1647db502_merge_old_db.py

@@ -37,14 +37,10 @@ def migrate_old_data(connection: Connection) -> None:
     Bind = Base.classes.nonebot_plugin_tetris_stats_bind  # noqa: N806
 
     def non_empty(obj: str) -> bool:
-        if obj != '' and not obj.isspace():
+        return bool(obj != '' and not obj.isspace())
-            return True
-        return False
 
     def is_int(obj: int | str) -> bool:
-        if isinstance(obj, int) or obj.isdigit():
+        return bool(isinstance(obj, int) or obj.isdigit())
-            return True
-        return False
 
     bind_list = [
         Bind(chat_platform='OneBot V11', chat_account=int(row.QQ), game_platform='IO', game_account=row.USER)

nonebot_plugin_tetris_stats/config/migrations/b7fbdafc339a_add_user_unique_identifier_field_to_.py

@@ -26,12 +26,7 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
-    from nonebot_plugin_tetris_stats.version import __version__
 
-    if __version__ != '1.0.4':
-        msg = '本迁移需要1.0.4版本, 请先锁定版本至1.0.4版本再执行本迁移'
-        logger.critical(msg)
-        raise RuntimeError(msg)
     from nonebot.compat import type_validate_json
     from pydantic import ValidationError
     from rich.progress import (
@@ -46,8 +41,6 @@ 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  # 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))
         batch_op.create_index(
@@ -60,37 +53,48 @@ def upgrade(name: str = '') -> None:
     Base.prepare(autoload_with=connection)
     HistoricalData = Base.classes.nonebot_plugin_tetris_stats_historicaldata  # noqa: N806
 
-    models: list[type[BaseUser]] = BaseUser.__subclasses__()
-
-    def json_to_model(value: str) -> BaseUser:
-        for i in models:
-            try:
-                return type_validate_json(i, value)
-            except ValidationError:  # noqa: PERF203
-                ...
-        raise ValueError
-
     with Session(op.get_bind()) as session:
         count = session.query(HistoricalData).count()
-        with Progress(
+        if count == 0:
-            TextColumn('[progress.description]{task.description}'),
+            logger.info('空表, 跳过')
-            BarColumn(),
+        else:
-            MofNCompleteColumn(),
+            from nonebot_plugin_tetris_stats.version import __version__
-            TaskProgressColumn(),
+
-            TimeRemainingColumn(),
+            if __version__ != '1.0.4':
-        ) as progress:
+                msg = '本迁移需要1.0.4版本, 请先锁定版本至1.0.4版本再执行本迁移'
-            task_id = progress.add_task('[cyan]Updateing:', total=count)
+                logger.critical(msg)
-            for i in range(0, count, 100):
+                raise RuntimeError(msg)
-                for j in session.scalars(
+            from nonebot_plugin_tetris_stats.game_data_processor.schemas import BaseUser  # type: ignore[import-untyped]
-                    select(HistoricalData).where(HistoricalData.id > i).order_by(HistoricalData.id).limit(100)
+
-                ):
+            models: list[type[BaseUser]] = BaseUser.__subclasses__()
-                    model = json_to_model(j.game_user)
+
+            def json_to_model(value: str) -> BaseUser:
+                for i in models:
                     try:
-                        j.user_unique_identifier = model.unique_identifier
+                        return type_validate_json(i, value)
-                    except ValueError:
+                    except ValidationError:  # noqa: PERF203
-                        session.delete(j)
+                        ...
-                    progress.update(task_id, advance=1)
+                raise ValueError
-                session.commit()
+
+            with Progress(
+                TextColumn('[progress.description]{task.description}'),
+                BarColumn(),
+                MofNCompleteColumn(),
+                TaskProgressColumn(),
+                TimeRemainingColumn(),
+            ) as progress:
+                task_id = progress.add_task('[cyan]Updateing:', total=count)
+                for i in range(0, count, 100):
+                    for j in session.scalars(
+                        select(HistoricalData).where(HistoricalData.id > i).order_by(HistoricalData.id).limit(100)
+                    ):
+                        model = json_to_model(j.game_user)
+                        try:
+                            j.user_unique_identifier = model.unique_identifier
+                        except ValueError:
+                            session.delete(j)
+                        progress.update(task_id, advance=1)
+                    session.commit()
     with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:
         batch_op.alter_column('user_unique_identifier', existing_type=sa.VARCHAR(length=32), nullable=False)
     logger.success('database upgrade success')

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/config/migrations/f5b4a6d1325b_tetr_io_new_season.py

@@ -0,0 +1,91 @@
+"""TETR.IO new season
+
+迁移 ID: f5b4a6d1325b
+父迁移: a1195e989cc6
+创建时间: 2024-08-01 20:44:48.644912
+
+"""
+
+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 = 'f5b4a6d1325b'
+down_revision: str | Sequence[str] | None = 'a1195e989cc6'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
+        batch_op.drop_index('ix_nonebot_plugin_tetris_stats_iorank_file_hash')
+        batch_op.drop_index('ix_nonebot_plugin_tetris_stats_iorank_rank')
+        batch_op.drop_index('ix_nonebot_plugin_tetris_stats_iorank_update_time')
+
+    op.drop_table('nonebot_plugin_tetris_stats_iorank')
+
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_tetriohistoricaldata', schema=None) as batch_op:
+        batch_op.drop_index('ix_nonebot_plugin_tetris_stats_tetriohistoricaldata_api_type')
+        batch_op.drop_index('ix_nonebot_plugin_tetris_stats_tetriohistoricaldata_update_time')
+        batch_op.drop_index('ix_nonebot_plugin_tetris_stats_tetriohistoricaldata_user_unique_identifier')
+
+    op.drop_table('nonebot_plugin_tetris_stats_tetriohistoricaldata')
+
+    op.create_table(
+        'nonebot_plugin_tetris_stats_tetriohistoricaldata',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_unique_identifier', sa.String(length=24), nullable=False),
+        sa.Column('api_type', sa.String(length=16), nullable=False),
+        sa.Column('data', sa.JSON(), nullable=False),
+        sa.Column('update_time', sa.DateTime(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nonebot_plugin_tetris_stats_tetriohistoricaldata')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_tetriohistoricaldata', schema=None) as batch_op:
+        batch_op.create_index(
+            batch_op.f('ix_nonebot_plugin_tetris_stats_tetriohistoricaldata_api_type'), ['api_type'], unique=False
+        )
+        batch_op.create_index(
+            batch_op.f('ix_nonebot_plugin_tetris_stats_tetriohistoricaldata_update_time'), ['update_time'], unique=False
+        )
+        batch_op.create_index(
+            batch_op.f('ix_nonebot_plugin_tetris_stats_tetriohistoricaldata_user_unique_identifier'),
+            ['user_unique_identifier'],
+            unique=False,
+        )
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    op.create_table(
+        'nonebot_plugin_tetris_stats_iorank',
+        sa.Column('id', sa.INTEGER(), nullable=False),
+        sa.Column('rank', sa.VARCHAR(length=2), nullable=False),
+        sa.Column('tr_line', sa.FLOAT(), nullable=False),
+        sa.Column('player_count', sa.INTEGER(), nullable=False),
+        sa.Column('low_pps', sa.JSON(), nullable=False),
+        sa.Column('low_apm', sa.JSON(), nullable=False),
+        sa.Column('low_vs', sa.JSON(), nullable=False),
+        sa.Column('avg_pps', sa.FLOAT(), nullable=False),
+        sa.Column('avg_apm', sa.FLOAT(), nullable=False),
+        sa.Column('avg_vs', sa.FLOAT(), nullable=False),
+        sa.Column('high_pps', sa.JSON(), nullable=False),
+        sa.Column('high_apm', sa.JSON(), nullable=False),
+        sa.Column('high_vs', sa.JSON(), nullable=False),
+        sa.Column('update_time', sa.DATETIME(), nullable=False),
+        sa.Column('file_hash', sa.VARCHAR(length=128), nullable=True),
+        sa.PrimaryKeyConstraint('id', name='pk_nonebot_plugin_tetris_stats_iorank'),
+    )
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
+        batch_op.create_index('ix_nonebot_plugin_tetris_stats_iorank_update_time', ['update_time'], unique=False)
+        batch_op.create_index('ix_nonebot_plugin_tetris_stats_iorank_rank', ['rank'], unique=False)
+        batch_op.create_index('ix_nonebot_plugin_tetris_stats_iorank_file_hash', ['file_hash'], unique=False)

nonebot_plugin_tetris_stats/db/__init__.py

@@ -8,10 +8,10 @@ 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 CommandType, GameType
+from ..utils.typing import AllCommandType, BaseCommandType, GameType, TETRIOCommandType
 from .models import Bind, TriggerHistoricalData
 
 UTC = timezone.utc
@@ -55,12 +55,12 @@ async def create_or_update_bind(
             game_account=game_account,
         )
         session.add(bind)
-        message = BindStatus.SUCCESS
+        status = BindStatus.SUCCESS
     else:
         bind.game_account = game_account
-        message = BindStatus.UPDATE
+        status = BindStatus.UPDATE
     await session.commit()
-    return message
+    return status
 
 
 T = TypeVar('T', 'TETRIOHistoricalData', 'TOPHistoricalData', 'TOSHistoricalData')
@@ -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)
@@ -92,7 +92,7 @@ async def anti_duplicate_add(cls: type[T], model: T) -> None:
 async def trigger(
     session_persist_id: int,
     game_platform: Literal['IO'],
-    command_type: CommandType | Literal['rank', 'config', 'record'],
+    command_type: TETRIOCommandType,
     command_args: list[str],
 ) -> AsyncGenerator:
     yield
@@ -103,7 +103,7 @@ async def trigger(
 async def trigger(
     session_persist_id: int,
     game_platform: GameType,
-    command_type: CommandType,
+    command_type: BaseCommandType,
     command_args: list[str],
 ) -> AsyncGenerator:
     yield
@@ -113,7 +113,7 @@ async def trigger(
 async def trigger(
     session_persist_id: int,
     game_platform: GameType,
-    command_type: CommandType | Literal['rank', 'config', 'record'],
+    command_type: AllCommandType,
     command_args: list[str],
 ) -> AsyncGenerator:
     trigger_time = datetime.now(UTC)

nonebot_plugin_tetris_stats/db/models.py

@@ -1,6 +1,6 @@
 from collections.abc import Callable, Sequence
 from datetime import datetime
-from typing import Any, Literal
+from typing import Any
 
 from nonebot.compat import PYDANTIC_V2, type_validate_json
 from nonebot_plugin_orm import Model
@@ -9,7 +9,7 @@ from sqlalchemy import JSON, DateTime, Dialect, String, TypeDecorator
 from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column
 from typing_extensions import override
 
-from ..utils.typing import CommandType, GameType
+from ..utils.typing import AllCommandType, GameType
 
 
 class PydanticType(TypeDecorator):
@@ -76,6 +76,6 @@ class TriggerHistoricalData(MappedAsDataclass, Model):
     trigger_time: Mapped[datetime] = mapped_column(DateTime)
     session_persist_id: Mapped[int]
     game_platform: Mapped[GameType] = mapped_column(String(32), index=True)
-    command_type: Mapped[CommandType | Literal['rank', 'config', 'record']] = mapped_column(String(16), index=True)
+    command_type: Mapped[AllCommandType] = mapped_column(String(16), index=True)
     command_args: Mapped[list[str]] = mapped_column(JSON)
     finish_time: Mapped[datetime] = mapped_column(DateTime)

nonebot_plugin_tetris_stats/games/__init__.py

@@ -7,17 +7,20 @@ from nonebot.typing import T_Handler
 from nonebot_plugin_alconna import AlcMatches, Alconna, At, CommandMeta, on_alconna
 
 from .. import ns
+from ..i18n.model import Lang
 from ..utils.exception import MessageFormatError, NeedCatchError
 
-alc = on_alconna(
+command: Alconna = Alconna(
-    Alconna(
+    ['tetris-stats', 'tstats'],
-        ['tetris-stats', 'tstats'],
+    namespace=ns,
-        namespace=ns,
+    meta=CommandMeta(
-        meta=CommandMeta(
+        description='俄罗斯方块相关游戏数据查询',
-            description='俄罗斯方块相关游戏数据查询',
+        fuzzy_match=True,
-            fuzzy_match=True,
-        ),
     ),
+)
+
+alc = on_alconna(
+    command=command,
     skip_for_unmatch=False,
     auto_send_output=True,
     use_origin=True,
@@ -28,7 +31,7 @@ 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的信息')
+            await matcher.finish(Lang.interaction.wrong.query_bot())
 
 
 from . import tetrio, top, tos  # noqa: F401, E402

nonebot_plugin_tetris_stats/games/constant.py

@@ -1,3 +0,0 @@
-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
 
-
+T = TypeVar('T', bound=GameType)
-class Base(BaseModel):
-    platform: GameType
 
 
-class BaseUser(ABC, Base):
+class BaseUser(BaseModel, ABC, Generic[T]):
     """游戏用户"""
 
-    def __eq__(self, __value: object) -> bool:
+    platform: T
-        if isinstance(__value, BaseUser):
+
-            return self.unique_identifier == __value.unique_identifier
+    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,13 +1,10 @@
-from arclet.alconna import Arg, ArgFlag, Args, Option, Subcommand
+from nonebot_plugin_alconna import Subcommand
-from nonebot_plugin_alconna import At
 
 from ...utils.exception import MessageFormatError
-from ...utils.typing import Me
+from .. import alc
-from .. import add_block_handlers, 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:
@@ -18,148 +15,23 @@ def get_player(user_id_or_name: str) -> Player | MessageFormatError:
     return MessageFormatError('用户名/ID不合法')
 
 
-alc.command.add(
+command = Subcommand(
-    Subcommand(
+    'TETR.IO',
-        'TETR.IO',
+    alias=['TETRIO', 'tetr.io', 'tetrio', 'io'],
-        Subcommand(
+    dest='TETRIO',
-            'bind',
+    help_text='TETR.IO 游戏相关指令',
-            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(
-            'rank',
-            Args(Arg('rank', ValidRank, notice='TETR.IO 段位')),
-            help_text='查询 TETR.IO 段位信息',
-        ),
-        Subcommand(
-            'config',
-            Option(
-                '--default-template',
-                Arg('template', Template),
-                alias=['-DT', 'DefaultTemplate'],
-            ),
-        ),
-        dest='TETRIO',
-        help_text='TETR.IO 游戏相关指令',
-    )
 )
 
-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(
-    '(?i:io)(?i:段位|段|rank)',
-    {
-        'command': 'tstats TETR.IO rank',
-        'humanized': 'iorank',
-    },
-)
-alc.shortcut(
-    '(?i:io)(?i:配置|配|config)',
-    {
-        'command': 'tstats TETR.IO config',
-        'humanized': 'io配置',
-    },
-)
 
-alc.shortcut(
+from . import bind, config, list, query, rank, record  # noqa: E402
-    'fkosk',
-    {
-        'command': 'tstats TETR.IO query',
-        'args': ['我'],
-        'fuzzy': False,
-        'humanized': 'An Easter egg!',
-    },
-)
 
-add_block_handlers(alc.assign('TETRIO.query'))
+main_command.add(command)
-
-from . import bind, config, query, rank, record  # noqa: E402
 
 __all__ = [
+    'alc',
     'bind',
     'config',
+    'list',
     'query',
     'rank',
     'record',

nonebot_plugin_tetris_stats/games/tetrio/api/__init__.py

@@ -1,7 +1,5 @@
 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']

nonebot_plugin_tetris_stats/games/tetrio/api/cache.py

@@ -1,30 +1,37 @@
 from asyncio import Lock
-from datetime import datetime, timezone
+from datetime import datetime, timedelta, timezone
 from typing import ClassVar
 from weakref import WeakValueDictionary
 
 from aiocache import Cache as ACache  # type: ignore[import-untyped]
 from nonebot.compat import type_validate_json
 from nonebot.log import logger
+from yarl import URL
 
+from ....config.config import config
+from ....utils.limit import limit
 from ....utils.request import Request
 from .schemas.base import FailedModel, SuccessModel
 
 UTC = timezone.utc
 
 
+request = Request(config.tetris.proxy.tetrio or config.tetris.proxy.main)
+request.request = limit(timedelta(seconds=1))(request.request)  # type: ignore[method-assign]
+
+
 class Cache:
     cache = ACache(ACache.MEMORY)
-    task: ClassVar[WeakValueDictionary[str, Lock]] = WeakValueDictionary()
+    task: ClassVar[WeakValueDictionary[URL, Lock]] = WeakValueDictionary()
 
     @classmethod
-    async def get(cls, url: str) -> bytes:
+    async def get(cls, url: URL, extra_headers: dict | None = None) -> bytes:
         lock = cls.task.setdefault(url, Lock())
         async with lock:
             if (cached_data := await cls.cache.get(url)) is not None:
                 logger.debug(f'{url}: Cache hit!')
                 return cached_data
-            response_data = await Request.request(url)
+            response_data = await request.request(url, extra_headers, enable_anti_cloudflare=True)
             parsed_data: SuccessModel | FailedModel = type_validate_json(SuccessModel | FailedModel, response_data)  # type: ignore[arg-type]
             if isinstance(parsed_data, SuccessModel):
                 await cls.cache.add(

nonebot_plugin_tetris_stats/games/tetrio/api/leaderboards.py

@@ -0,0 +1,89 @@
+from typing import Literal, overload
+from uuid import UUID
+
+from nonebot.compat import type_validate_json
+from yarl import URL
+
+from ....utils.exception import RequestError
+from ..constant import BASE_URL
+from .cache import Cache
+from .schemas.base import FailedModel
+from .schemas.leaderboards import Parameter
+from .schemas.leaderboards.by import By, BySuccessModel
+from .schemas.leaderboards.solo import Solo, SoloSuccessModel
+from .schemas.leaderboards.zenith import Zenith, ZenithSuccessModel
+
+
+async def by(
+    by_type: Literal['league', 'xp', 'ar'], parameter: Parameter, x_session_id: UUID | None = None
+) -> BySuccessModel:
+    model: By = type_validate_json(
+        By,  # type: ignore[arg-type]
+        await get(
+            BASE_URL / f'users/by/{by_type}',
+            parameter,
+            {'X-Session-ID': str(x_session_id)} if x_session_id is not None else None,
+        ),
+    )
+    if isinstance(model, FailedModel):
+        msg = f'排行榜信息请求错误:\n{model.error}'
+        raise RequestError(msg)
+    return model
+
+
+@overload
+async def records(
+    records_type: Literal['40l', 'blitz'],
+    scope: str = '_global',
+    revolution_id: str | None = None,
+    *,
+    parameter: Parameter,
+) -> SoloSuccessModel: ...
+
+
+@overload
+async def records(
+    records_type: Literal['zenith', 'zenithex'],
+    scope: str = '_global',
+    revolution_id: str | None = None,
+    *,
+    parameter: Parameter,
+) -> ZenithSuccessModel: ...
+
+
+async def records(
+    records_type: Literal['40l', 'blitz', 'zenith', 'zenithex'],
+    scope: str = '_global',
+    revolution_id: str | None = None,
+    *,
+    parameter: Parameter,
+) -> SoloSuccessModel | ZenithSuccessModel:
+    model: Solo | Zenith
+    match records_type:
+        case '40l' | 'blitz':
+            model = type_validate_json(
+                Solo,  # type: ignore[arg-type]
+                await get(
+                    BASE_URL / 'records' / f'{records_type}{scope}{revolution_id if revolution_id is not None else ""}',
+                    parameter,
+                ),
+            )
+        case 'zenith' | 'zenithex':
+            model = type_validate_json(
+                Zenith,  # type: ignore[arg-type]
+                await get(
+                    BASE_URL / 'records' / f'{records_type}{scope}{revolution_id if revolution_id is not None else ""}',
+                    parameter,
+                ),
+            )
+        case _:
+            msg = f'records_type: {records_type} is not supported'
+            raise ValueError(msg)
+    if isinstance(model, FailedModel):
+        msg = f'排行榜信息请求错误:\n{model.error}'  # type: ignore[attr-defined]
+        raise RequestError(msg)
+    return model
+
+
+async def get(url: URL, parameter: Parameter, extra_headers: dict | None = None) -> bytes:
+    return await Cache.get(url % parameter.to_params(), extra_headers)

nonebot_plugin_tetris_stats/games/tetrio/api/models.py

@@ -7,11 +7,12 @@ from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column
 
 from ....db.models import PydanticType
 from .schemas.base import SuccessModel
+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', 'User Records']] = 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,20 +1,67 @@
-from typing import overload
+from enum import Enum
+from types import MappingProxyType
+from typing import Literal, NamedTuple, cast, overload
 
+from async_lru import alru_cache
 from nonebot.compat import type_validate_json
 
 from ....db import anti_duplicate_add
 from ....utils.exception import RequestError
-from ....utils.request import splice_url
 from ..constant import BASE_URL, USER_ID, USER_NAME
 from .cache import Cache
 from .models import TETRIOHistoricalData
 from .schemas.base import FailedModel
+from .schemas.labs.leagueflow import LeagueFlow, LeagueFlowSuccess
+from .schemas.records.solo import Solo as SoloRecord
+from .schemas.records.solo import SoloSuccessModel as RecordsSoloSuccessModel
+from .schemas.summaries import (
+    AchievementsSuccessModel,
+    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 .schemas.user_records import SoloModeRecord, UserRecords, UserRecordsSuccess, Zen
+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': SummariesSoloSuccessModel,
+            'blitz': SummariesSoloSuccessModel,
+            'zenith': ZenithSuccessModel,
+            'zenithex': ZenithSuccessModel,
+            'league': LeagueSuccessModel,
+            'zen': ZenSuccessModel,
+            'achievements': AchievementsSuccessModel,
+        }
+    )
+
     @overload
     def __init__(self, *, user_id: str, trust: bool = False): ...
     @overload
@@ -36,40 +83,43 @@ class Player:
                 raise ValueError(msg)
         self.__user: User | None = None
         self._user_info: UserInfoSuccess | None = None
-        self._user_records: UserRecordsSuccess | None = None
+        self._summaries: dict[Summaries, SummariesModel] = {}
+        self._records: dict[RecordKey, RecordsSoloSuccessModel] = {}
+        self._leagueflow: LeagueFlowSuccess | None = None
 
     @property
     def _request_user_parameter(self) -> str:
-        if self.user_id is not None:
+        return self.user_id or cast(str, self.user_name).lower()
-            return self.user_id
-        if self.user_name is not None:
-            return self.user_name.lower()
-        msg = 'Invalid user'
-        raise ValueError(msg)
 
     @property
     async def user(self) -> User:
-        if self.__user is None:
+        if self.__user is not None:
+            return self.__user
+        if (user := (await self._get_local_summaries_user())) is not None:
+            self.__user = User(
+                ID=user.id,
+                name=user.username,
+            )
+        else:
             user_info = await self.get_info()
             self.__user = User(
-                ID=user_info.data.user.id,
+                ID=user_info.data.id,
-                name=user_info.data.user.username,
+                name=user_info.data.username,
             )
-            self.user_id = user_info.data.user.id
+        self.user_id = self.__user.ID
-            self.user_name = user_info.data.user.username
+        self.user_name = self.__user.name
         return self.__user
 
     async def get_info(self) -> UserInfoSuccess:
         """Get User Info"""
         if self._user_info is None:
-            raw_user_info = await Cache.get(splice_url([BASE_URL, 'users/', f'{self._request_user_parameter}']))
+            raw_user_info = await Cache.get(BASE_URL / 'users' / self._request_user_parameter)
             user_info: UserInfo = type_validate_json(UserInfo, raw_user_info)  # type: ignore[arg-type]
             if isinstance(user_info, FailedModel):
                 msg = f'用户信息请求错误:\n{user_info.error}'
                 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',
@@ -79,36 +129,115 @@ class Player:
             )
         return self._user_info
 
-    async def get_records(self) -> UserRecordsSuccess:
+    @overload
-        """Get User Records"""
+    async def get_summaries(self, summaries_type: Literal['40l', 'blitz']) -> SummariesSoloSuccessModel: ...
-        if self._user_records is None:
+    @overload
-            raw_user_records = await Cache.get(
+    async def get_summaries(self, summaries_type: Literal['zenith', 'zenithex']) -> ZenithSuccessModel: ...
-                splice_url([BASE_URL, 'users/', f'{self._request_user_parameter}/', 'records'])
+    @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:
+        if summaries_type not in self._summaries:
+            raw_summaries = await Cache.get(
+                BASE_URL / 'users' / self._request_user_parameter / 'summaries' / summaries_type
             )
-            user_records: UserRecords = type_validate_json(UserRecords, raw_user_records)  # type: ignore[arg-type]
+            summaries: SummariesModel | FailedModel = type_validate_json(
-            if isinstance(user_records, FailedModel):
+                self.__SUMMARIES_MAPPING[summaries_type] | FailedModel,  # type: ignore[arg-type]
-                msg = f'用户Solo数据请求错误:\n{user_records.error}'
+                raw_summaries,
+            )
+            if isinstance(summaries, FailedModel):
+                msg = f'用户Summaries数据请求错误:\n{summaries.error}'
                 raise RequestError(msg)
-            self._user_records = user_records
+            self._summaries[summaries_type] = summaries
             await anti_duplicate_add(
-                TETRIOHistoricalData,
                 TETRIOHistoricalData(
                     user_unique_identifier=(await self.user).unique_identifier,
-                    api_type='User Records',
+                    api_type=summaries_type,
-                    data=user_records,
+                    data=summaries,
-                    update_time=user_records.cache.cached_at,
+                    update_time=summaries.cache.cached_at,
                 ),
             )
-        return self._user_records
+        return self._summaries[summaries_type]
+
+    async def get_leagueflow(self) -> LeagueFlowSuccess:
+        if self._leagueflow is None:
+            leagueflow: LeagueFlow = type_validate_json(
+                LeagueFlow,  # type: ignore[arg-type]
+                await Cache.get(BASE_URL / 'labs/leagueflow' / self._request_user_parameter),
+            )
+            if isinstance(leagueflow, FailedModel):
+                msg = f'League 历史记录请求错误:\n{leagueflow.error}'
+                raise RequestError(msg)
+            self._leagueflow = leagueflow
+        return self._leagueflow
 
     @property
-    async def sprint(self) -> SoloModeRecord:
+    async def sprint(self) -> SummariesSoloSuccessModel:
-        return (await self.get_records()).data.records.sprint
+        return await self.get_summaries('40l')
 
     @property
-    async def blitz(self) -> SoloModeRecord:
+    async def blitz(self) -> SummariesSoloSuccessModel:
-        return (await self.get_records()).data.records.blitz
+        return await self.get_summaries('blitz')
 
     @property
-    async def zen(self) -> Zen:
+    async def zen(self) -> ZenSuccessModel:
-        return (await self.get_records()).data.zen
+        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',
+            'blitz',
+            'zenith',
+            'zenithex',
+        }
+        if has_summaries := (allow_summaries & self._summaries.keys()):
+            for i in has_summaries:
+                if (record := (await self.get_summaries(i)).data.record) is not None:
+                    return record.user
+        return None
+
+    @property
+    @alru_cache
+    async def avatar_revision(self) -> int | None:
+        if self._user_info is not None:
+            return self._user_info.data.avatar_revision
+        if (user := (await self._get_local_summaries_user())) is not None:
+            return user.avatar_revision
+        return (await self.get_info()).data.avatar_revision
+
+    @property
+    @alru_cache
+    async def banner_revision(self) -> int | None:
+        if self._user_info is not None:
+            return self._user_info.data.banner_revision
+        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(
+                BASE_URL / 'users' / self._request_user_parameter / 'records' / 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,20 +0,0 @@
-from datetime import datetime
-from typing import Literal
-
-from pydantic import BaseModel
-
-
-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,83 @@
+from datetime import datetime
+from typing import Literal
+
+from pydantic import BaseModel, Field
+
+from ...typing import Prisecter
+
+
+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):
+    pri: float
+    sec: float
+    ter: float
+
+    def to_prisecter(self) -> Prisecter:
+        return Prisecter(f'{self.pri}:{self.sec}:{self.ter}')
+
+
+# fmt: off
+class ArCounts(BaseModel):
+    bronze:   int | None = Field(default=None, alias='1')    # pyright: ignore [reportGeneralTypeIssues]
+    silver:   int | None = Field(default=None, alias='2')    # pyright: ignore [reportGeneralTypeIssues]
+    gold:     int | None = Field(default=None, alias='3')    # pyright: ignore [reportGeneralTypeIssues]
+    platinum: int | None = Field(default=None, alias='4')    # pyright: ignore [reportGeneralTypeIssues]
+    diamond:  int | None = Field(default=None, alias='5')    # pyright: ignore [reportGeneralTypeIssues]
+    issued:   int | None = Field(default=None, alias='100')  # pyright: ignore [reportGeneralTypeIssues]
+    top3:     int | None = Field(default=None, alias='t3')
+    top5:     int | None = Field(default=None, alias='t5')
+    top10:    int | None = Field(default=None, alias='t10')
+    top25:    int | None = Field(default=None, alias='t25')
+    top50:    int | None = Field(default=None, alias='t50')
+    top100:   int | None = Field(default=None, alias='t100')
+# fmt: on
+
+
+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 | None = None
+
+
+class Stats(BaseModel):
+    seed: float | None = None  # ?: 不知道是之后都没有了还是还会有
+    lines: int
+    level_lines: int
+    level_lines_needed: int
+    inputs: int
+    holds: int = 0
+    time: Time | None = None  # ?: 不知道是之后都没有了还是还会有
+    score: int
+    zenlevel: int | None = None
+    zenprogress: int | None = None
+    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/labs/leagueflow.py

@@ -0,0 +1,43 @@
+from datetime import datetime
+from enum import IntEnum
+from typing import Literal, NamedTuple
+
+from pydantic import BaseModel, Field
+
+from ..base import FailedModel
+from ..base import SuccessModel as BaseSuccessModel
+
+
+class Result(IntEnum):
+    VICTORY = 1
+    DEFEAT = 2
+    VICTORY_BY_DISQUALIFICATION = 3
+    DEFEAT_BY_DISQUALIFICATION = 4
+    TIE = 5
+    NO_CONTEST = 6
+    MATCH_NULLIFIED = 7
+
+
+class Point(NamedTuple):
+    timestamp_offset: int
+    result: Result
+    post_match_tr: int
+    opponent_pre_match_tr: int
+    """If the opponent was unranked, same as post_match_tr."""
+
+
+class Data(BaseModel):
+    start_time: datetime = Field(..., alias='startTime')
+    points: list[Point] = Field(..., min_length=1)
+
+
+class Empty(BaseModel):
+    start_time: Literal[9007199254740991] = Field(..., alias='startTime')
+    points: list = Field(..., max_length=0)
+
+
+class LeagueFlowSuccess(BaseSuccessModel):
+    data: Data | Empty
+
+
+LeagueFlow = LeagueFlowSuccess | FailedModel

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

@@ -0,0 +1,18 @@
+from typing import Any
+
+from nonebot.compat import PYDANTIC_V2
+from pydantic import BaseModel, Field
+
+from ...typing import Prisecter
+
+
+class Parameter(BaseModel):
+    after: Prisecter | None = None
+    before: Prisecter | None = None
+    limit: int = Field(default=25, ge=1, le=100)
+    country: str | None = None
+
+    def to_params(self) -> dict[str, Any]:
+        if PYDANTIC_V2:
+            return self.model_dump(exclude_defaults=True)
+        return self.dict(exclude_defaults=True)

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/leaderboards/by.py

@@ -0,0 +1,50 @@
+from datetime import datetime
+from typing import Literal
+
+from pydantic import BaseModel, Field
+
+from ...typing import Rank, ValidRank
+from ..base import ArCounts, FailedModel, P, SuccessModel
+
+
+class League(BaseModel):
+    gamesplayed: int
+    gameswon: int
+    tr: float
+    gxe: float
+    rank: Rank
+    bestrank: ValidRank
+    glicko: float
+    rd: float
+    apm: float
+    pps: float
+    vs: float
+    decaying: bool
+
+
+class Entry(BaseModel):
+    id: str = Field(..., alias='_id')
+    username: str
+    role: Literal['anon', 'user', 'bot', 'halfmod', 'mod', 'admin', 'sysop']
+    ts: datetime | None = None
+    xp: float
+    country: str | None = None
+    supporter: bool | None = None
+    league: League
+    gamesplayed: int
+    gameswon: int
+    gametime: float
+    ar: int
+    ar_counts: ArCounts
+    p: P
+
+
+class Data(BaseModel):
+    entries: list[Entry]
+
+
+class BySuccessModel(SuccessModel):
+    data: Data
+
+
+By = BySuccessModel | FailedModel

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

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

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

@@ -0,0 +1,15 @@
+from pydantic import BaseModel
+
+from ..base import FailedModel, SuccessModel
+from ..summaries.zenith import Record
+
+
+class Data(BaseModel):
+    entries: list[Record]
+
+
+class ZenithSuccessModel(SuccessModel):
+    data: Data
+
+
+Zenith = ZenithSuccessModel | FailedModel

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

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

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

@@ -0,0 +1,29 @@
+from typing import TypeAlias
+
+from pydantic import BaseModel
+
+from ..base import FailedModel, SuccessModel
+
+
+class Achievement(BaseModel):
+    # 这**都是些啥
+    k: int
+    o: int
+    rt: int
+    vt: int
+    min: int
+    deci: int
+    name: str
+    object: str
+    category: str
+    hidden: bool
+    desc: str
+    n: str
+    stub: bool
+
+
+class AchievementsSuccessModel(SuccessModel):
+    data: list[Achievement]
+
+
+Achievements: TypeAlias = AchievementsSuccessModel | FailedModel

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

@@ -0,0 +1,10 @@
+from pydantic import BaseModel
+
+
+class User(BaseModel):
+    id: str
+    username: str
+    avatar_revision: int | None
+    banner_revision: int | None
+    country: str | None
+    supporter: int

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

@@ -0,0 +1,130 @@
+from typing import Literal
+
+from nonebot.compat import PYDANTIC_V2
+from pydantic import BaseModel, Field
+
+from ...typing import Rank, S1Rank, S1ValidRank
+from ..base import SuccessModel
+
+if PYDANTIC_V2:
+    from pydantic import field_validator
+else:
+    from pydantic import validator
+
+
+class PastInner(BaseModel):
+    season: str
+    username: str
+    country: str | None = None
+    placement: int | None = None
+    gamesplayed: int
+    gameswon: int
+    glicko: float
+    gxe: float
+    tr: float
+    rd: float
+    rank: S1Rank
+    bestrank: S1ValidRank
+    ranked: bool
+    apm: float
+    pps: float
+    vs: float
+
+
+class Past(BaseModel):
+    first: PastInner | None = Field(default=None, alias='1')  # pyright: ignore [reportGeneralTypeIssues]
+
+
+class BaseData(BaseModel):
+    decaying: bool
+    past: Past
+
+
+class NeverPlayedData(BaseData):
+    gamesplayed: Literal[0]
+    gameswon: Literal[0]
+    glicko: Literal[-1]
+    rd: Literal[-1]
+    gxe: Literal[-1]
+    tr: Literal[-1]
+    rank: Literal['z']
+    apm: None = None
+    pps: None = None
+    vs: None = None
+    standing: Literal[-1]
+    standing_local: Literal[-1]
+    prev_rank: None
+    prev_at: Literal[-1]
+    next_rank: None
+    next_at: Literal[-1]
+    percentile: Literal[-1]
+    percentile_rank: Literal['z']
+
+
+class NeverRatedData(BaseData):
+    gamesplayed: Literal[1, 2, 3, 4, 5, 6, 7, 8, 9]
+    gameswon: int
+    glicko: Literal[-1]
+    rd: Literal[-1]
+    gxe: Literal[-1]
+    tr: Literal[-1]
+    apm: float
+    pps: float
+    vs: float
+    rank: Literal['z']
+    standing: Literal[-1]
+    standing_local: Literal[-1]
+    prev_rank: None
+    prev_at: Literal[-1]
+    next_rank: None
+    next_at: Literal[-1]
+    percentile: Literal[-1]
+    percentile_rank: Literal['z']
+
+    if PYDANTIC_V2:
+
+        @field_validator('apm', 'pps', 'vs', mode='before')
+        @classmethod
+        def _(cls, value: float | None) -> float:
+            if value is None:
+                return 0
+            return value
+
+    else:
+
+        @validator('apm', 'pps', 'vs', pre=True, always=True)
+        @classmethod
+        def _(cls, value: float | None) -> float:
+            if value is None:
+                return 0
+            return value
+
+
+class RatedData(BaseData):
+    gamesplayed: int
+    gameswon: int
+    glicko: float
+    rd: float
+    gxe: float
+    tr: float
+    rank: Rank
+    bestrank: Rank
+    standing: int
+    apm: float
+    pps: float
+    vs: float
+    standing_local: int
+    prev_rank: Rank | None = None
+    prev_at: int
+    next_rank: Rank | None = None
+    next_at: int
+    percentile: float
+    percentile_rank: str
+
+
+class InvalidData(BaseModel):
+    """I don't know what osk is doing, but the return value is an empty dictionary"""
+
+
+class LeagueSuccessModel(SuccessModel):
+    data: NeverPlayedData | NeverRatedData | RatedData | InvalidData

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

@@ -0,0 +1,24 @@
+from typing import TypeAlias
+
+from pydantic import BaseModel
+
+from ..base import FailedModel, SuccessModel
+from ..base.solo import Record as BaseRecord
+from .base import User
+
+
+class Record(BaseRecord):
+    user: User
+
+
+class Data(BaseModel):
+    record: Record | None
+    rank: int
+    rank_local: int
+
+
+class SoloSuccessModel(SuccessModel):
+    data: Data
+
+
+Solo: TypeAlias = SoloSuccessModel | FailedModel

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

@@ -0,0 +1,17 @@
+from typing import TypeAlias
+
+from pydantic import BaseModel
+
+from ..base import FailedModel, SuccessModel
+
+
+class Data(BaseModel):
+    level: int
+    score: int
+
+
+class ZenSuccessModel(SuccessModel):
+    data: Data
+
+
+Zen: TypeAlias = ZenSuccessModel | FailedModel

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

@@ -0,0 +1,116 @@
+from datetime import datetime
+from typing import Literal, TypeAlias
+
+from pydantic import BaseModel, Field
+
+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(BaseClears):
+    pentas: int
+    minitspintriples: int
+    minitspinquads: int
+    tspinpentas: int
+
+
+class Garbage(BaseGarbage):
+    sent_nomult: int
+    maxspike: int
+    maxspike_nomult: int
+
+
+class _Zenith(BaseModel):
+    altitude: float
+    rank: float
+    peakrank: float
+    avgrankpts: float
+    floor: int
+    targetingfactor: float
+    targetinggrace: float
+    totalbonus: float
+    revives: int
+    revives_total: int = Field(..., alias='revivesTotal')
+    speedrun: bool
+    speedrun_seen: bool
+    splits: list[int]
+
+
+class Stats(BaseModel):
+    lines: int
+    level_lines: int
+    level_lines_needed: int
+    inputs: int
+    holds: int
+    score: int
+    zenlevel: int
+    zenprogress: int
+    level: int
+    combo: int
+    topcombo: int
+    combopower: int
+    btb: int
+    topbtb: int
+    btbpower: int
+    tspins: int
+    piecesplaced: int
+    clears: Clears
+    garbage: Garbage
+    kills: int
+    finesse: Finesse
+    zenith: _Zenith
+    finaltime: float
+
+
+class Results(BaseModel):
+    aggregatestats: AggregateStats
+    stats: Stats
+    gameoverreason: str
+
+
+class ExtrasZenith(BaseModel):
+    mods: list[str]
+
+
+class Extras(BaseModel):
+    zenith: ExtrasZenith
+
+
+class Record(BaseModel):
+    id: str = Field(..., alias='_id')
+    replayid: str
+    stub: bool
+    gamemode: Literal['zenith', 'zenithex']
+    pb: bool
+    oncepb: bool
+    ts: datetime
+    revolution: None
+    user: User
+    otherusers: list
+    leaderboards: list[str]
+    results: Results
+    extras: Extras
+    disputed: bool
+    p: P
+
+
+class Best(BaseModel):
+    record: None  # WTF
+    rank: int
+
+
+class Data(BaseModel):
+    record: Record | None
+    rank: int
+    rank_local: int
+    best: Best
+
+
+class ZenithSuccessModel(SuccessModel):
+    data: Data
+
+
+Zenith: TypeAlias = ZenithSuccessModel | FailedModel
+ZenithEx: TypeAlias = ZenithSuccessModel | FailedModel

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

@@ -1,59 +0,0 @@
-from pydantic import BaseModel, Field
-
-from ..typing import Rank
-from .base import FailedModel
-from .base import SuccessModel as BaseSuccessModel
-
-
-class _User(BaseModel):
-    id: str = Field(..., alias='_id')
-    username: str
-    role: str
-    xp: float
-    supporter: bool
-    verified: bool
-    country: str | None = None
-
-
-class _League(BaseModel):
-    gamesplayed: int
-    gameswon: int
-    rating: float
-    rank: Rank
-    bestrank: Rank
-    decaying: bool
-
-
-class ValidLeague(_League):
-    glicko: float
-    rd: float
-    apm: float
-    pps: float
-    vs: float
-
-
-class ValidUser(_User):
-    league: ValidLeague
-
-
-class InvalidLeague(_League):
-    glicko: float | None = None
-    rd: float | None = None
-    apm: float | None = None
-    pps: float | None = None
-    vs: float | None = None
-
-
-class InvalidUser(_User):
-    league: InvalidLeague
-
-
-class Data(BaseModel):
-    users: list[ValidUser | InvalidUser]
-
-
-class TetraLeagueSuccess(BaseSuccessModel):
-    data: Data
-
-
-TetraLeague = TetraLeagueSuccess | FailedModel

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

@@ -3,8 +3,7 @@ from typing import Literal
 
 from pydantic import BaseModel, Field
 
-from ..typing import Rank
+from .base import ArCounts, FailedModel
-from .base import FailedModel
 from .base import SuccessModel as BaseSuccessModel
 
 
@@ -15,84 +14,29 @@ class Badge(BaseModel):
     ts: datetime | Literal[False] | None = None
 
 
-class MetaLeague(BaseModel):
+class Connection(BaseModel):
-    decaying: bool
-
-
-class NeverPlayedLeague(MetaLeague):
-    gamesplayed: Literal[0]
-    gameswon: Literal[0]
-    rating: Literal[-1]
-    rank: Literal['z']
-    standing: Literal[-1]
-    standing_local: Literal[-1]
-    next_rank: None
-    prev_rank: None
-    next_at: Literal[-1]
-    prev_at: Literal[-1]
-    percentile: Literal[-1]
-    percentile_rank: Literal['z']
-    apm: None = None
-    pps: None = None
-    vs: None = None
-
-
-class NeverRatedLeague(MetaLeague):
-    gamesplayed: Literal[1, 2, 3, 4, 5, 6, 7, 8, 9]
-    gameswon: int
-    rating: Literal[-1]
-    rank: Literal['z']
-    standing: Literal[-1]
-    standing_local: Literal[-1]
-    next_rank: None
-    prev_rank: None
-    next_at: Literal[-1]
-    prev_at: Literal[-1]
-    percentile: Literal[-1]
-    percentile_rank: Literal['z']
-    apm: float
-    pps: float
-    vs: float | None = None
-
-
-class RatedLeague(MetaLeague):
-    gamesplayed: int
-    gameswon: int
-    rating: float
-    rank: Rank
-    bestrank: Rank
-    standing: int
-    standing_local: int
-    next_rank: Rank | None = None
-    prev_rank: Rank | None = None
-    next_at: int
-    prev_at: int
-    percentile: float
-    percentile_rank: str
-    glicko: float
-    rd: float
-    apm: float
-    pps: float
-    vs: float | None = None
-
-
-class Discord(BaseModel):
     id: str
     username: str
+    display_username: str
 
 
 class Connections(BaseModel):
-    discord: Discord | None = None
+    discord: Connection | None = None
+    twitch: Connection | None = None
+    twitter: Connection | None = None
+    reddit: Connection | None = None
+    youtube: Connection | None = None
+    steam: Connection | None = None
 
 
 class Distinguishment(BaseModel):
     type: str
 
 
-class User(BaseModel):
+class Data(BaseModel):
-    id: str = Field(..., alias='_id')
+    id: str = Field(default=..., alias='_id')
     username: str
-    role: Literal['anon', 'user', 'bot', 'halfmod', 'mod', 'admin', 'sysop', 'banned']
+    role: Literal['anon', 'user', 'bot', 'halfmod', 'mod', 'admin', 'sysop', 'hidden', 'banned']
     ts: datetime | None = None
     botmaster: str | None = None
     badges: list[Badge]
@@ -104,8 +48,6 @@ class User(BaseModel):
     badstanding: bool | None = None
     supporter: bool | None = None  # osk说是必有, 但实际上不是 fkosk
     supporter_tier: int
-    verified: bool
-    league: NeverPlayedLeague | NeverRatedLeague | RatedLeague
     avatar_revision: int | None = None
     """This user's avatar ID. Get their avatar at
 
@@ -120,10 +62,9 @@ class User(BaseModel):
     connections: Connections
     friend_count: int | None = None
     distinguishment: Distinguishment | None = None
-
+    achievements: list[int]
-
+    ar: int
-class Data(BaseModel):
+    ar_counts: ArCounts
-    user: User
 
 
 class UserInfoSuccess(BaseSuccessModel):

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/tetra_league.py

@@ -1,36 +0,0 @@
-from typing import Literal, NamedTuple, overload
-
-from nonebot.compat import type_validate_json
-
-from ....utils.exception import RequestError
-from ....utils.request import splice_url
-from ..constant import BASE_URL
-from .cache import Cache
-from .schemas.base import FailedModel
-from .schemas.tetra_league import TetraLeague, TetraLeagueSuccess
-
-
-class FullExport(NamedTuple):
-    model: TetraLeagueSuccess
-    original: bytes
-
-
-@overload
-async def full_export(*, with_original: Literal[False]) -> TetraLeagueSuccess: ...
-
-
-@overload
-async def full_export(*, with_original: Literal[True]) -> FullExport: ...
-
-
-async def full_export(*, with_original: bool) -> TetraLeagueSuccess | FullExport:
-    full: TetraLeague = type_validate_json(
-        TetraLeague,  # type: ignore[arg-type]
-        (data := await Cache.get(splice_url([BASE_URL, 'users/lists/league/all']))),
-    )
-    if isinstance(full, FailedModel):
-        msg = f'排行榜数据请求错误:\n{full.error}'
-        raise RequestError(msg)
-    if with_original:
-        return FullExport(full, data)
-    return full

nonebot_plugin_tetris_stats/games/tetrio/api/typing.py

@@ -1,6 +1,6 @@
-from typing import Literal
+from typing import Literal, NewType
 
-ValidRank = Literal[
+S1ValidRank = Literal[
     'x',
     'u',
     'ss',
@@ -19,5 +19,28 @@ ValidRank = Literal[
     'd+',
     'd',
 ]
+S1Rank = S1ValidRank | Literal['z']
 
+ValidRank = Literal['x+'] | S1ValidRank
 Rank = ValidRank | Literal['z']  # 未定级
+
+Summaries = Literal[
+    '40l',
+    'blitz',
+    'zenith',
+    'zenithex',
+    'league',
+    'zen',
+    'achievements',
+]
+
+Records = Literal[
+    '40l_top',
+    '40l_recent',
+    '40l_progression',
+    'blitz_top',
+    'blitz_recent',
+    'blitz_progression',
+]
+
+Prisecter = NewType('Prisecter', str)

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_user import User
-from nonebot_plugin_userinfo import BotUserInfo, UserInfo  # type: ignore[import-untyped]
+from nonebot_plugin_userinfo import BotUserInfo, UserInfo
+from yarl import URL
 
 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,
@@ -45,11 +67,13 @@ async def _(nb_user: User, account: Player, event_session: EventSession, bot_inf
                         platform='TETR.IO',
                         status='unknown',
                         user=People(
-                            avatar=f'http://{netloc}/host/resource/tetrio/avatars/{user.ID}?{urlencode({"revision": user_info.data.user.avatar_revision})}'
+                            avatar=str(
-                            if user_info.data.user.avatar_revision is not None
+                                URL(f'http://{netloc}/host/resource/tetrio/avatars/{user.ID}')
-                            and user_info.data.user.avatar_revision != 0
+                                % {'revision': avatar_revision}
-                            else Avatar(type='identicon', hash=md5(user_info.data.user.id.encode()).hexdigest()),  # noqa: S324
+                            )
-                            name=user_info.data.user.username.upper(),
+                            if (avatar_revision := (await account.avatar_revision)) is not None and avatar_revision != 0
+                            else Avatar(type='identicon', hash=md5(user.ID.encode()).hexdigest()),  # noqa: S324
+                            name=user.name.upper(),
                         ),
                         bot=People(
                             avatar=await get_avatar(bot_info, 'Data URI', '../../static/logo/logo.svg'),

nonebot_plugin_tetris_stats/games/tetrio/config.py

@@ -1,20 +1,51 @@
+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_user import User  # 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
 from sqlalchemy import select
 
-from . import alc
+from ...db import trigger
+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, template: Template):
+async def _(user: User, session: async_scoped_session, event_session: EventSession, template: Template):
-    config = (await session.scalars(select(TETRIOUserConfig).where(TETRIOUserConfig.id == user.id))).one_or_none()
+    async with trigger(
-    if config is None:
+        session_persist_id=await get_session_persist_id(event_session),
-        config = TETRIOUserConfig(id=user.id, query_template=template)
+        game_platform=GAME_TYPE,
-        session.add(config)
+        command_type='config',
-    else:
+        command_args=[f'--default-template {template}'],
-        config.query_template = template
+    ):
-    await session.commit()
+        config = (await session.scalars(select(TETRIOUserConfig).where(TETRIOUserConfig.id == user.id))).one_or_none()
-    await UniMessage('配置成功').finish()
+        if config is None:
+            config = TETRIOUserConfig(id=user.id, query_template=template)
+            session.add(config)
+        else:
+            config.query_template = template
+        await session.commit()
+        await UniMessage('配置成功').finish()

nonebot_plugin_tetris_stats/games/tetrio/constant.py

@@ -1,13 +1,16 @@
 from re import compile
 from typing import Literal
 
-from .api.typing import Rank
+from yarl import URL
+
+from .api.typing import ValidRank
 
 GAME_TYPE: Literal['IO'] = 'IO'
 
-BASE_URL = 'https://ch.tetr.io/api/'
+BASE_URL = URL('https://ch.tetr.io/api/')
 
-RANK_PERCENTILE: dict[Rank, float] = {
+RANK_PERCENTILE: dict[ValidRank, float] = {
+    'x+': 0.2,
     'x': 1,
     'u': 5,
     'ss': 11,

nonebot_plugin_tetris_stats/games/tetrio/list.py

@@ -0,0 +1,91 @@
+from nonebot_plugin_alconna import Args, Option, Subcommand
+from nonebot_plugin_alconna.uniseg import UniMessage
+from nonebot_plugin_session import EventSession
+from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+
+from ...db import trigger
+from ...utils.host import HostPage, get_self_netloc
+from ...utils.metrics import get_metrics
+from ...utils.render import render
+from ...utils.render.schemas.tetrio.user.list_v2 import List, TetraLeague, User
+from ...utils.screenshot import screenshot
+from .. import alc
+from . import command
+from .api.leaderboards import by
+from .api.schemas.base import P
+from .api.schemas.leaderboards import Parameter
+from .constant import GAME_TYPE
+
+command.add(
+    Subcommand(
+        'list',
+        Option('--max-tr', Args['max_tr', float], help_text='TR的上限'),
+        Option('--min-tr', Args['min_tr', float], help_text='TR的下限'),
+        Option('--limit', Args['limit', int], help_text='查询数量'),
+        Option('--country', Args['country', str], help_text='国家代码'),
+        help_text='查询 TETR.IO 段位排行榜',
+    )
+)
+
+
+@alc.assign('TETRIO.list')
+async def _(
+    event_session: EventSession,
+    max_tr: float | None = None,
+    min_tr: float | None = None,
+    limit: int | None = None,
+    country: str | None = None,
+):
+    country = country.upper() if country is not None else None
+    async with trigger(
+        session_persist_id=await get_session_persist_id(event_session),
+        game_platform=GAME_TYPE,
+        command_type='list',
+        command_args=[
+            f'{key} {value}'
+            for key, value in zip(
+                ('--max-tr', '--min-tr', '--limit', '--country'), (max_tr, min_tr, limit, country), strict=True
+            )
+            if value is not None
+        ],
+    ):
+        parameter = Parameter(
+            # ?: 似乎是只需要 pri 至少 league 榜的返回值只有 pri
+            after=P(pri=max_tr, sec=0, ter=0).to_prisecter() if max_tr is not None else None,
+            before=P(pri=min_tr, sec=0, ter=0).to_prisecter() if min_tr is not None else None,
+            limit=limit or 25,
+            country=country,
+        )
+        league = await by('league', parameter)
+        async with HostPage(
+            await render(
+                'v2/tetrio/user/list',
+                List(
+                    show_index=True,
+                    users=[
+                        User(
+                            id=i.id,
+                            name=i.username.upper(),
+                            avatar=f'https://tetr.io/user-content/avatars/{i.id}.jpg',
+                            country=i.country,
+                            tetra_league=TetraLeague(
+                                rank=i.league.rank,
+                                tr=round(i.league.tr, 2),
+                                glicko=round(i.league.glicko, 2),
+                                rd=round(i.league.rd, 2),
+                                decaying=i.league.decaying,
+                                pps=(metrics := get_metrics(pps=i.league.pps, apm=i.league.apm, vs=i.league.vs)).pps,
+                                apm=metrics.apm,
+                                apl=metrics.apl,
+                                vs=metrics.vs,
+                                adpl=metrics.adpl,
+                            ),
+                            xp=i.xp,
+                            join_at=None,
+                        )
+                        for i in league.data.entries
+                    ],
+                ),
+            )
+        ) as page_hash:
+            await UniMessage.image(raw=await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')).finish()

nonebot_plugin_tetris_stats/games/tetrio/models.py

@@ -1,34 +1,53 @@
 from datetime import datetime
+from uuid import UUID
 
 from nonebot_plugin_orm import Model
-from sqlalchemy import JSON, DateTime, String
+from sqlalchemy import DateTime, ForeignKey, String
-from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column
+from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column, relationship
 
-from .api.typing import Rank
+from ...db.models import PydanticType
+from .api.schemas.leaderboards.by import BySuccessModel, Entry
+from .api.typing import ValidRank
 from .typing import Template
 
 
-class IORank(MappedAsDataclass, Model):
-    id: Mapped[int] = mapped_column(init=False, primary_key=True)
-    rank: Mapped[Rank] = mapped_column(String(2), index=True)
-    tr_line: Mapped[float]
-    player_count: Mapped[int]
-    low_pps: Mapped[tuple[dict[str, str], float]] = mapped_column(JSON)
-    low_apm: Mapped[tuple[dict[str, str], float]] = mapped_column(JSON)
-    low_vs: Mapped[tuple[dict[str, str], float]] = mapped_column(JSON)
-    avg_pps: Mapped[float]
-    avg_apm: Mapped[float]
-    avg_vs: Mapped[float]
-    high_pps: Mapped[tuple[dict[str, str], float]] = mapped_column(JSON)
-    high_apm: Mapped[tuple[dict[str, str], float]] = mapped_column(JSON)
-    high_vs: Mapped[tuple[dict[str, str], float]] = mapped_column(JSON)
-    update_time: Mapped[datetime] = mapped_column(
-        DateTime,
-        index=True,
-    )
-    file_hash: Mapped[str | None] = mapped_column(String(128), index=True)
-
-
 class TETRIOUserConfig(MappedAsDataclass, Model):
     id: Mapped[int] = mapped_column(primary_key=True)
     query_template: Mapped[Template] = mapped_column(String(2))
+
+
+class TETRIOLeagueStats(MappedAsDataclass, Model):
+    id: Mapped[int] = mapped_column(init=False, primary_key=True)
+    raw: Mapped[list['TETRIOLeagueHistorical']] = relationship(back_populates='stats', lazy='noload')
+    fields: Mapped[list['TETRIOLeagueStatsField']] = relationship(back_populates='stats')
+    update_time: Mapped[datetime] = mapped_column(DateTime, index=True)
+
+
+class TETRIOLeagueHistorical(MappedAsDataclass, Model):
+    id: Mapped[int] = mapped_column(init=False, primary_key=True)
+    request_id: Mapped[UUID] = mapped_column(index=True)
+    data: Mapped[BySuccessModel] = mapped_column(PydanticType([], {BySuccessModel}))
+    update_time: Mapped[datetime] = mapped_column(DateTime, index=True)
+    stats_id: Mapped[int] = mapped_column(ForeignKey('nonebot_plugin_tetris_stats_tetrioleaguestats.id'), init=False)
+    stats: Mapped['TETRIOLeagueStats'] = relationship(back_populates='raw')
+
+
+entry_type = PydanticType([], {Entry})
+
+
+class TETRIOLeagueStatsField(MappedAsDataclass, Model):
+    id: Mapped[int] = mapped_column(init=False, primary_key=True)
+    rank: Mapped[ValidRank] = mapped_column(String(2), index=True)
+    tr_line: Mapped[float]
+    player_count: Mapped[int]
+    low_pps: Mapped[Entry] = mapped_column(entry_type)
+    low_apm: Mapped[Entry] = mapped_column(entry_type)
+    low_vs: Mapped[Entry] = mapped_column(entry_type)
+    avg_pps: Mapped[float]
+    avg_apm: Mapped[float]
+    avg_vs: Mapped[float]
+    high_pps: Mapped[Entry] = mapped_column(entry_type)
+    high_apm: Mapped[Entry] = mapped_column(entry_type)
+    high_vs: Mapped[Entry] = mapped_column(entry_type)
+    stats_id: Mapped[int] = mapped_column(ForeignKey('nonebot_plugin_tetris_stats_tetrioleaguestats.id'), init=False)
+    stats: Mapped['TETRIOLeagueStats'] = relationship(back_populates='fields')

nonebot_plugin_tetris_stats/games/tetrio/query.py

@@ -1,551 +0,0 @@
-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, TypeVar, overload
-from urllib.parse import urlencode
-from zoneinfo import ZoneInfo
-
-from aiofiles import open
-from nonebot import get_driver
-from nonebot.adapters import Event
-from nonebot.compat import type_validate_json
-from nonebot.matcher import Matcher
-from nonebot_plugin_alconna import At
-from nonebot_plugin_alconna.uniseg import UniMessage
-from nonebot_plugin_apscheduler import scheduler  # type: ignore[import-untyped]
-from nonebot_plugin_localstore import get_data_file  # type: ignore[import-untyped]
-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 as NBUser  # 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.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, 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
-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
-from . import alc
-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 .constant import GAME_TYPE, TR_MAX, TR_MIN
-from .models import IORank, TETRIOUserConfig
-from .typing import Template
-
-UTC = timezone.utc
-
-driver = get_driver()
-
-
-@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=[],
-    ):
-        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 + (await make_query_result(player, template or 'v1'))).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=[],
-    ):
-        async with get_session() as session:
-            if template is None:
-                template = await session.scalar(
-                    select(TETRIOUserConfig.query_template).where(TETRIOUserConfig.id == user.id)
-                )
-        await (await make_query_result(account, template or 'v1')).finish()
-
-
-def get_value_bounds(values: list[int | float]) -> tuple[int, int]:
-    value_max = 10 * ceil(max(values) / 10)
-    value_min = 10 * floor(min(values) / 10)
-    return value_max, value_min
-
-
-def get_split(value_max: int, value_min: int) -> tuple[int, int]:
-    offset = 0
-    overflow = 0
-
-    while True:
-        if (new_max_value := value_max + offset + overflow) > TR_MAX:
-            overflow -= 1
-            continue
-        if (new_min_value := value_min - offset + overflow) < TR_MIN:
-            overflow += 1
-            continue
-        if ((new_max_value - new_min_value) / 40).is_integer():
-            split_value = int((value_max + offset - (value_min - offset)) / 4)
-            break
-        offset += 1
-    return split_value, offset + overflow
-
-
-def get_specified_point(
-    previous_point: Data,
-    behind_point: Data,
-    point_time: datetime,
-) -> Data:
-    """根据给出的 previous_point 和 behind_point, 推算 point_time 点处的数据
-
-    Args:
-        previous_point (Data): 前面的数据点
-        behind_point (Data): 后面的数据点
-        point_time (datetime): 要推算的点的位置
-
-    Returns:
-        Data: 要推算的点的数据
-    """
-    # 求两个点的斜率
-    slope = (behind_point.tr - previous_point.tr) / (
-        datetime.timestamp(behind_point.record_at) - datetime.timestamp(previous_point.record_at)
-    )
-    return Data(
-        record_at=point_time,
-        tr=previous_point.tr + slope * (datetime.timestamp(point_time) - datetime.timestamp(previous_point.record_at)),
-    )
-
-
-async def query_historical_data(user: User, user_info: UserInfoSuccess) -> list[Data]:
-    today = datetime.now(ZoneInfo('Asia/Shanghai')).replace(hour=0, minute=0, second=0, microsecond=0)
-    forward = timedelta(days=9)
-    start_time = (today - forward).astimezone(UTC)
-    async with get_session() as session:
-        historical_data = (
-            await session.scalars(
-                select(TETRIOHistoricalData)
-                .where(TETRIOHistoricalData.update_time >= start_time)
-                .where(TETRIOHistoricalData.user_unique_identifier == user.unique_identifier)
-                .where(TETRIOHistoricalData.api_type == 'User Info')
-            )
-        ).all()
-        if historical_data:
-            extra = (
-                await session.scalars(
-                    select(TETRIOHistoricalData)
-                    .where(TETRIOHistoricalData.user_unique_identifier == user.unique_identifier)
-                    .where(TETRIOHistoricalData.api_type == 'User Info')
-                    .order_by(TETRIOHistoricalData.id.desc())
-                    .where(TETRIOHistoricalData.id < min([i.id for i in historical_data]))
-                    .limit(1)
-                )
-            ).one_or_none()
-            if extra is not None:
-                historical_data = list(historical_data)
-                historical_data.append(extra)
-    full_export_data = FullExport.get_data(user.unique_identifier)
-    if not historical_data and not full_export_data:
-        return [
-            Data(record_at=today - forward, tr=user_info.data.user.league.rating),
-            Data(record_at=today.replace(microsecond=1000), tr=user_info.data.user.league.rating),
-        ]
-    histories = [
-        Data(
-            record_at=i.update_time.astimezone(ZoneInfo('Asia/Shanghai')),
-            tr=i.data.data.user.league.rating,
-        )
-        for i in historical_data
-        if isinstance(i.data, UserInfoSuccess) and isinstance(i.data.data.user.league, RatedLeague)
-    ] + full_export_data
-
-    # 按照时间排序
-    histories = sorted(histories, key=lambda x: x.record_at)
-    for index, value in enumerate(histories):
-        # 在历史记录里找有没有今天0点后的数据, 并且至少要有两个数据点
-        if value.record_at > today and len(histories) >= 2:  # noqa: PLR2004
-            histories = histories[:index] + [
-                get_specified_point(histories[index - 1], histories[index], today.replace(microsecond=1000))
-            ]
-            break
-    else:
-        histories.append(
-            get_specified_point(
-                histories[-1],
-                Data(record_at=user_info.cache.cached_at, tr=user_info.data.user.league.rating),
-                today.replace(microsecond=1000),
-            )
-        )
-    if histories[0].record_at < (today - forward):
-        histories[0] = get_specified_point(
-            histories[0],
-            histories[1],
-            today - forward,
-        )
-    else:
-        histories.insert(0, Data(record_at=today - forward, tr=histories[0].tr))
-    return histories
-
-
-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 league_type is None:
-        return league
-    if isinstance(league, league_type):
-        return league
-    raise FallbackError
-
-
-async def make_query_image_v1(player: Player) -> bytes:
-    user, user_info, sprint, blitz = await gather(player.user, player.get_info(), player.sprint, player.blitz)
-    league = get_league(user_info, RatedLeague)
-    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.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'
-    blitz_value = f'{blitz.record.endcontext.score:,}' if blitz.record is not None else 'N/A'
-    netloc = get_self_netloc()
-    async with HostPage(
-        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 and user_info.data.user.avatar_revision != 0
-                    else Avatar(
-                        type='identicon',
-                        hash=md5(user_info.data.user.id.encode()).hexdigest(),  # noqa: S324
-                    ),
-                    name=user.name.upper(),
-                    bio=user_info.data.user.bio,
-                ),
-                ranking=Ranking(
-                    rating=round(league.glicko, 2),
-                    rd=round(league.rd, 2),
-                ),
-                tetra_league=TetraLeague(
-                    rank=league.rank,
-                    tr=round(league.rating, 2),
-                    global_rank=league.standing,
-                    pps=league.pps,
-                    lpm=round(lpm := (league.pps * 24), 2),
-                    apm=league.apm,
-                    apl=round(league.apm / lpm, 2),
-                    vs=league.vs,
-                    adpm=round(adpm := (league.vs * 0.6), 2),
-                    adpl=round(adpm / lpm, 2),
-                ),
-                tetra_league_history=TetraLeagueHistory(
-                    data=histories,
-                    split_interval=split_value,
-                    min_tr=value_min,
-                    max_tr=value_max,
-                    offset=offset,
-                ),
-                radar=Radar(
-                    app=(app := (league.apm / (60 * league.pps))),
-                    dsps=(dsps := ((league.vs / 100) - (league.apm / 60))),
-                    dspp=(dspp := (dsps / league.pps)),
-                    ci=150 * dspp - 125 * app + 50 * (league.vs / league.apm) - 25,
-                    ge=2 * ((app * dsps) / league.pps),
-                ),
-                sprint=sprint_value,
-                blitz=blitz_value,
-            ),
-        )
-    ) as page_hash:
-        return await screenshot(f'http://{netloc}/host/{page_hash}.html')
-
-
-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, sprint, blitz, zen = await gather(
-        player.user, player.get_info(), player.sprint, player.blitz, player.zen
-    )
-    league = get_league(user_info)
-
-    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.banner_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 and user_info.data.user.avatar_revision != 0
-                    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,
-                    ),
-                    decaying=league.decaying,
-                )
-                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,
-            ),
-        ),
-    ) as page_hash:
-        return await screenshot(f'http://{netloc}/host/{page_hash}.html')
-
-
-async def make_query_text(player: Player) -> UniMessage:
-    user, user_info, sprint, blitz = await gather(player.user, player.get_info(), player.sprint, player.blitz)
-    league = get_league(user_info)
-
-    user_name = user.name.upper()
-
-    message = ''
-    if isinstance(league, NeverPlayedLeague):
-        message += f'用户 {user_name} 没有排位统计数据'
-    else:
-        if isinstance(league, NeverRatedLeague):
-            message += f'用户 {user_name} 暂未完成定级赛, 最近十场的数据:'
-        else:
-            if league.rank == 'z':
-                message += f'用户 {user_name} 暂无段位, {round(league.rating,2)} TR'
-            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)}, 最近十场的数据:'
-        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 ''
-    if blitz.record is not None:
-        message += f'\nBlitz: {blitz.record.endcontext.score}'
-        message += f' ( #{blitz.rank} )' if blitz.rank is not None else ''
-    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
-
-    @classmethod
-    async def init(cls) -> None:
-        async with get_session() as session:
-            full_exports = (await session.scalars(select(IORank).where(IORank.update_time >= cls.start_time()))).all()
-        await gather(
-            *[
-                cls._load(update_time, file_hash)
-                for file_hash, update_time in {
-                    i.file_hash: i.update_time for i in full_exports if i.file_hash is not None
-                }.items()
-            ]
-        )
-
-    @classmethod
-    async def update(cls) -> None:
-        if cls.latest_update == datetime.now(tz=ZoneInfo('Asia/Shanghai')).date():
-            return
-        start_time = cls.start_time()
-        for i in cls.cache:
-            cls.cache[i] = {j for j in cls.cache[i] if j[0] >= start_time}
-        latest_time = max(cls.cache)
-        async with get_session() as session:
-            full_exports = (await session.scalars(select(IORank).where(IORank.update_time > latest_time))).all()
-        await gather(
-            *[
-                cls._load(update_time, file_hash)
-                for file_hash, update_time in {
-                    i.file_hash: i.update_time for i in full_exports if i.file_hash is not None
-                }.items()
-            ]
-        )
-        cls.latest_update = datetime.now(tz=ZoneInfo('Asia/Shanghai')).date()
-
-    @classmethod
-    def get_data(cls, unique_identifier: str) -> list[Data]:
-        return [Data(record_at=i[0], tr=i[1]) for i in cls.cache[unique_identifier]]
-
-    @classmethod
-    def start_time(cls) -> datetime:
-        return (
-            datetime.now(ZoneInfo('Asia/Shanghai')).replace(hour=0, minute=0, second=0, microsecond=0)
-            - timedelta(days=9)
-        ).astimezone(UTC)
-
-    @classmethod
-    async def _load(cls, update_time: datetime, file_hash: str) -> None:
-        try:
-            users = type_validate_json(TetraLeagueSuccess, await cls.decompress(file_hash)).data.users
-        except FileNotFoundError:
-            await cls.clear_invalid(file_hash)
-            return
-        update_time = update_time.astimezone(ZoneInfo('Asia/Shanghai'))
-        for i in users:
-            cls.cache[i.id].add((update_time, i.league.rating))
-
-    @classmethod
-    async def decompress(cls, file_hash: str) -> bytes:
-        async with open(get_data_file('nonebot_plugin_tetris_stats', f'{file_hash}.json.zst'), mode='rb') as file:
-            return ZstdDecompressor().decompress(await file.read())
-
-    @classmethod
-    async def clear_invalid(cls, file_hash: str) -> None:
-        async with get_session() as session:
-            full_exports = (await session.scalars(select(IORank).where(IORank.file_hash == file_hash))).all()
-            for i in full_exports:
-                i.file_hash = None
-            await session.commit()
-
-
-@driver.on_startup
-async def _():
-    await FullExport.init()
-    scheduler.add_job(FullExport.update, 'interval', hours=1)

nonebot_plugin_tetris_stats/games/tetrio/query/__init__.py

@@ -0,0 +1,135 @@
+from datetime import timezone
+
+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 ....i18n import Lang
+from ....utils.exception import FallbackError
+from ....utils.typing import Me
+from ... import add_block_handlers, alc
+from .. import command, get_player
+from ..api import Player
+from ..constant import GAME_TYPE
+from ..models import TETRIOUserConfig
+from ..typing import Template
+from .v1 import make_query_image_v1
+from .v2 import make_query_image_v2
+
+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'))
+
+
+async def make_query_result(player: Player, template: Template) -> UniMessage:
+    if template == 'v1':
+        try:
+            return UniMessage.image(raw=await make_query_image_v1(player))
+        except FallbackError:
+            template = 'v2'
+    if template == 'v2':
+        return UniMessage.image(raw=await make_query_image_v2(player))
+    return None
+
+
+@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'--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('未查询到绑定信息')
+        player = Player(user_id=bind.game_account, trust=True)
+        await (
+            UniMessage.i18n(Lang.interaction.warning.unverified) + await make_query_result(player, template or 'v1')
+        ).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'--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 (await make_query_result(account, template or 'v1')).finish()

nonebot_plugin_tetris_stats/games/tetrio/query/tools.py

@@ -0,0 +1,56 @@
+from collections.abc import Callable
+from datetime import timedelta
+from typing import TypeVar, overload
+from zoneinfo import ZoneInfo
+
+from ....utils.exception import FallbackError
+from ....utils.render.schemas.tetrio.user.base import TetraLeagueHistoryData
+from ..api.schemas.labs.leagueflow import Empty, LeagueFlowSuccess
+from ..api.schemas.summaries.league import InvalidData, LeagueSuccessModel, NeverPlayedData, NeverRatedData, RatedData
+
+
+def flow_to_history(
+    leagueflow: LeagueFlowSuccess,
+    handle: Callable[[list[TetraLeagueHistoryData]], list[TetraLeagueHistoryData]] | None = None,
+) -> list[TetraLeagueHistoryData]:
+    if isinstance(leagueflow.data, Empty):
+        raise FallbackError
+    start_time = leagueflow.data.start_time.astimezone(ZoneInfo('Asia/Shanghai'))
+    ret = [
+        TetraLeagueHistoryData(
+            record_at=start_time + timedelta(milliseconds=i.timestamp_offset),
+            tr=i.post_match_tr,
+        )
+        for i in leagueflow.data.points
+        if start_time + timedelta(milliseconds=i.timestamp_offset)
+    ]
+    return ret if handle is None else handle(ret)
+
+
+N = TypeVar('N', int, float)
+
+
+def handling_special_value(value: N) -> N | None:
+    return value if value != -1 else None
+
+
+L = TypeVar('L', NeverPlayedData, NeverRatedData, RatedData)
+
+
+@overload
+def get_league_data(user_info: LeagueSuccessModel, league_type: type[L]) -> L: ...
+@overload
+def get_league_data(
+    user_info: LeagueSuccessModel, league_type: None = None
+) -> NeverPlayedData | NeverRatedData | RatedData: ...
+def get_league_data(
+    user_info: LeagueSuccessModel, league_type: type[L] | None = None
+) -> L | NeverPlayedData | NeverRatedData | RatedData:
+    league = user_info.data
+    if isinstance(league, InvalidData):
+        raise FallbackError
+    if league_type is None:
+        return league
+    if isinstance(league, league_type):
+        return league
+    raise FallbackError

nonebot_plugin_tetris_stats/games/tetrio/query/v1.py

@@ -0,0 +1,197 @@
+from asyncio import gather
+from datetime import datetime, timedelta
+from hashlib import md5
+from math import ceil, floor
+from zoneinfo import ZoneInfo
+
+from yarl import URL
+
+from ....utils.exception import FallbackError, WhatTheFuckError
+from ....utils.host import HostPage, get_self_netloc
+from ....utils.render import render
+from ....utils.render.schemas.base import Avatar, Ranking
+from ....utils.render.schemas.tetrio.user.base import TetraLeagueHistoryData
+from ....utils.render.schemas.tetrio.user.info_v1 import Info, Radar, TetraLeague, TetraLeagueHistory, User
+from ....utils.screenshot import screenshot
+from ..api import Player
+from ..api.schemas.summaries.league import RatedData
+from ..constant import TR_MAX, TR_MIN
+from .tools import flow_to_history, get_league_data
+
+
+def get_value_bounds(values: list[int | float]) -> tuple[int, int]:
+    value_max = 10 * ceil(max(values) / 10)
+    value_min = 10 * floor(min(values) / 10)
+    return value_max, value_min
+
+
+def get_split(value_max: int, value_min: int) -> tuple[int, int]:
+    offset = 0
+    overflow = 0
+
+    while True:
+        if (new_max_value := value_max + offset + overflow) > TR_MAX:
+            overflow -= 1
+            continue
+        if (new_min_value := value_min - offset + overflow) < TR_MIN:
+            overflow += 1
+            continue
+        if ((new_max_value - new_min_value) / 40).is_integer():
+            split_value = int((value_max + offset - (value_min - offset)) / 4)
+            break
+        offset += 1
+    return split_value, offset + overflow
+
+
+def get_specified_point(
+    previous_point: TetraLeagueHistoryData,
+    behind_point: TetraLeagueHistoryData,
+    point_time: datetime,
+) -> TetraLeagueHistoryData:
+    """根据给出的 previous_point 和 behind_point, 推算 point_time 点处的数据
+
+    Args:
+        previous_point (Data): 前面的数据点
+        behind_point (Data): 后面的数据点
+        point_time (datetime): 要推算的点的位置
+
+    Returns:
+        Data: 要推算的点的数据
+    """
+    # 求两个点的斜率
+    slope = (behind_point.tr - previous_point.tr) / (
+        datetime.timestamp(behind_point.record_at) - datetime.timestamp(previous_point.record_at)
+    )
+    return TetraLeagueHistoryData(
+        record_at=point_time,
+        tr=previous_point.tr + slope * (datetime.timestamp(point_time) - datetime.timestamp(previous_point.record_at)),
+    )
+
+
+def handle_history_data(data: list[TetraLeagueHistoryData]) -> list[TetraLeagueHistoryData]:  # noqa: C901, PLR0912
+    # 按照 记录时间 对数据进行排序
+    data.sort(key=lambda x: x.record_at)
+
+    # 定义时间边界, 右边界为当前时间的当天零点, 左边界为右边界前推9天
+    # 返回值的[0]和[-1]分别应满足left_border和right_border
+    zero = datetime.now(ZoneInfo('Asia/Shanghai')).replace(hour=0, minute=0, second=0, microsecond=0)
+    left_border = zero - timedelta(days=9)
+    right_border = zero.replace(microsecond=1000)
+
+    lefts: list[TetraLeagueHistoryData] = []
+    in_border: list[TetraLeagueHistoryData] = []
+    rights: list[TetraLeagueHistoryData] = []
+
+    # 根据 记录时间 将数据分类到对应的列表中
+    for i in data:
+        if i.record_at < left_border:
+            lefts.append(i)
+        elif i.record_at < right_border:
+            in_border.append(i)
+        else:
+            rights.append(i)
+
+    ret: list[TetraLeagueHistoryData] = []
+
+    # 处理左边界的点
+    if lefts and in_border:  # 如果边界左侧和边界内都有值则推算
+        ret.append(get_specified_point(lefts[-1], in_border[0], left_border))
+    elif lefts and not in_border:  # 如果边界左侧有值但是边界内没有值则直接取左侧的最后一个值
+        ret.append(TetraLeagueHistoryData(tr=lefts[-1].tr, record_at=left_border))
+    elif not lefts and in_border:  # 如果边界左侧没有值但是边界内有值则直接取边界内的第一个值
+        ret.append(TetraLeagueHistoryData(tr=in_border[0].tr, record_at=left_border))
+    elif not lefts and not in_border and rights:  # 如果边界左侧和边界内都没有值但是边界右侧有值则直接取边界右侧的第一个值 # fmt: skip
+        ret.append(TetraLeagueHistoryData(tr=rights[0].tr, record_at=left_border))
+    else:  # 暂时没想到其他情况
+        raise WhatTheFuckError
+
+    # 添加边界内数据
+    ret.extend(in_border)
+
+    # 处理右边界的点
+    if in_border and rights:  # 如果边界内和边界右侧都有值则推算
+        ret.append(get_specified_point(in_border[-1], rights[0], right_border))
+    elif not in_border and rights:  # 如果边界内没有值但是边界右侧有值则直接取右侧的第一个值
+        ret.append(TetraLeagueHistoryData(tr=rights[0].tr, record_at=right_border))
+    elif in_border and not rights:  # 如果边界内有值但是边界右侧没有值则直接取边界内的最后一个值
+        ret.append(TetraLeagueHistoryData(tr=in_border[-1].tr, record_at=right_border))
+    elif not in_border and not rights and lefts:  # 如果边界内和边界右侧都没有值但是边界左侧有值则直接取边界左侧的最后一个值 # fmt: skip
+        ret.append(TetraLeagueHistoryData(tr=lefts[-1].tr, record_at=right_border))
+    else:  # 暂时没想到其他情况
+        raise WhatTheFuckError
+    return ret
+
+
+async def make_query_image_v1(player: Player) -> bytes:
+    (
+        (user, user_info, league, sprint, blitz, leagueflow),
+        (avatar_revision,),
+    ) = await gather(
+        gather(player.user, player.get_info(), player.league, player.sprint, player.blitz, player.get_leagueflow()),
+        gather(player.avatar_revision),
+    )
+    league_data = get_league_data(league, RatedData)
+    if league_data.vs is None:
+        raise FallbackError
+    histories = flow_to_history(leagueflow, handle_history_data)
+    value_max, value_min = get_value_bounds([i.tr for i in histories])
+    split_value, offset = get_split(value_max, value_min)
+    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'
+    blitz_value = f'{blitz.data.record.results.stats.score:,}' if blitz.data.record is not None else 'N/A'
+    netloc = get_self_netloc()
+    async with HostPage(
+        page=await render(
+            'v1/tetrio/info',
+            Info(
+                user=User(
+                    avatar=str(
+                        URL(f'http://{netloc}/host/resource/tetrio/avatars/{user.ID}') % {'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
+                    ),
+                    name=user.name.upper(),
+                    bio=user_info.data.bio,
+                ),
+                ranking=Ranking(
+                    rating=round(league_data.glicko, 2),
+                    rd=round(league_data.rd, 2),
+                ),
+                tetra_league=TetraLeague(
+                    rank=league_data.rank,
+                    tr=round(league_data.tr, 2),
+                    global_rank=league_data.standing,
+                    pps=league_data.pps,
+                    lpm=round(lpm := (league_data.pps * 24), 2),
+                    apm=league_data.apm,
+                    apl=round(league_data.apm / lpm, 2),
+                    vs=league_data.vs,
+                    adpm=round(adpm := (league_data.vs * 0.6), 2),
+                    adpl=round(adpm / lpm, 2),
+                ),
+                tetra_league_history=TetraLeagueHistory(
+                    data=histories,
+                    split_interval=split_value,
+                    min_tr=value_min,
+                    max_tr=value_max,
+                    offset=offset,
+                ),
+                radar=Radar(
+                    app=(app := (league_data.apm / (60 * league_data.pps))),
+                    dsps=(dsps := ((league_data.vs / 100) - (league_data.apm / 60))),
+                    dspp=(dspp := (dsps / league_data.pps)),
+                    ci=150 * dspp - 125 * app + 50 * (league_data.vs / league_data.apm) - 25,
+                    ge=2 * ((app * dsps) / league_data.pps),
+                ),
+                sprint=sprint_value,
+                blitz=blitz_value,
+            ),
+        )
+    ) as page_hash:
+        return await screenshot(f'http://{netloc}/host/{page_hash}.html')

nonebot_plugin_tetris_stats/games/tetrio/query/v2.py

@@ -0,0 +1,138 @@
+from asyncio import gather
+from datetime import datetime, timedelta
+from hashlib import md5
+
+from yarl import URL
+
+from ....utils.exception import FallbackError
+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,
+    Info,
+    Sprint,
+    Statistic,
+    TetraLeague,
+    TetraLeagueStatistic,
+    User,
+    Zen,
+)
+from ....utils.screenshot import screenshot
+from ..api import Player
+from ..api.schemas.summaries.league import InvalidData, NeverPlayedData, NeverRatedData
+from .tools import flow_to_history, handling_special_value
+
+
+async def make_query_image_v2(player: Player) -> bytes:
+    (
+        (user, user_info, league, sprint, blitz, zen),
+        (avatar_revision, banner_revision, leagueflow),
+    ) = await gather(
+        gather(player.user, player.get_info(), player.league, player.sprint, player.blitz, player.zen),
+        gather(player.avatar_revision, player.banner_revision, player.get_leagueflow()),
+    )
+    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
+    try:
+        history = flow_to_history(leagueflow, lambda x: x[-100:])
+    except FallbackError:
+        history = None
+    netloc = get_self_netloc()
+    async with HostPage(
+        await render(
+            'v2/tetrio/user/info',
+            Info(
+                user=User(
+                    id=user.ID,
+                    name=user.name.upper(),
+                    bio=user_info.data.bio,
+                    banner=str(
+                        URL(f'http://{netloc}/host/resource/tetrio/banners/{user.ID}') % {'revision': banner_revision}
+                    )
+                    if banner_revision is not None and banner_revision != 0
+                    else None,
+                    avatar=str(
+                        URL(f'http://{netloc}/host/resource/tetrio/avatars/{user.ID}') % {'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,
+                    playtime=play_time,
+                    join_at=user_info.data.ts,
+                ),
+                tetra_league=TetraLeague(
+                    rank=league.data.rank,
+                    highest_rank='z' if isinstance(league.data, NeverRatedData) else 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=history,
+                )
+                if not isinstance(league.data, NeverPlayedData | InvalidData)
+                else 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/rank.py

@@ -1,174 +0,0 @@
-from collections import defaultdict
-from collections.abc import Callable
-from datetime import datetime, timedelta, timezone
-from hashlib import sha512
-from math import floor
-from statistics import mean
-from zoneinfo import ZoneInfo
-
-from aiofiles import open
-from nonebot import get_driver
-from nonebot.compat import model_dump
-from nonebot.matcher import Matcher
-from nonebot.utils import run_sync
-from nonebot_plugin_apscheduler import scheduler  # type: ignore[import-untyped]
-from nonebot_plugin_localstore import get_data_file  # type: ignore[import-untyped]
-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 sqlalchemy import func, select
-from zstandard import ZstdCompressor
-
-from ...db import trigger
-from ...utils.exception import RequestError
-from ...utils.metrics import get_metrics
-from ...utils.retry import retry
-from . import alc
-from .api.schemas.base import FailedModel
-from .api.schemas.tetra_league import ValidUser
-from .api.schemas.user import User
-from .api.tetra_league import full_export
-from .api.typing import Rank
-from .constant import GAME_TYPE, RANK_PERCENTILE
-from .models import IORank
-
-UTC = timezone.utc
-
-driver = get_driver()
-
-
-@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),
-        game_platform=GAME_TYPE,
-        command_type='rank',
-        command_args=[],
-    ):
-        if rank == 'z':
-            await matcher.finish('暂不支持查询未知段位')
-        async with get_session() as session:
-            latest_data = (
-                await session.scalars(select(IORank).where(IORank.rank == rank).order_by(IORank.id.desc()).limit(1))
-            ).one()
-            compare_data = (
-                await session.scalars(
-                    select(IORank)
-                    .where(IORank.rank == rank)
-                    .order_by(
-                        func.abs(
-                            func.julianday(IORank.update_time)
-                            - func.julianday(latest_data.update_time - timedelta(hours=24))
-                        )
-                    )
-                    .limit(1)
-                )
-            ).one()
-        message = ''
-        if (datetime.now(UTC) - latest_data.update_time.replace(tzinfo=UTC)) > timedelta(hours=7):
-            message += 'Warning: 数据超过7小时未更新, 请联系Bot主人查看后台\n'
-        message += f'{rank.upper()} 段 分数线 {latest_data.tr_line:.2f} TR, {latest_data.player_count} 名玩家\n'
-        if compare_data.id != latest_data.id:
-            message += f'对比 {(latest_data.update_time-compare_data.update_time).total_seconds()/3600:.2f} 小时前趋势: {f"↑{difference:.2f}" if (difference:=latest_data.tr_line-compare_data.tr_line) > 0 else f"↓{-difference:.2f}" if difference < 0 else "→"}'
-        else:
-            message += '暂无对比数据'
-        avg = get_metrics(pps=latest_data.avg_pps, apm=latest_data.avg_apm, vs=latest_data.avg_vs)
-        low_pps = get_metrics(pps=latest_data.low_pps[1])
-        low_vs = get_metrics(vs=latest_data.low_vs[1])
-        max_pps = get_metrics(pps=latest_data.high_pps[1])
-        max_vs = get_metrics(vs=latest_data.high_vs[1])
-        message += (
-            '\n'
-            '平均数据:\n'
-            f"L'PM: {avg.lpm} ( {avg.pps} pps )\n"
-            f'APM: {avg.apm} ( x{avg.apl} )\n'
-            f'ADPM: {avg.adpm} ( x{avg.adpl} ) ( {avg.vs}vs )\n'
-            '\n'
-            '最低数据:\n'
-            f"L'PM: {low_pps.lpm} ( {low_pps.pps} pps ) By: {latest_data.low_pps[0]['name'].upper()}\n"
-            f'APM: {latest_data.low_apm[1]} By: {latest_data.low_apm[0]["name"].upper()}\n'
-            f'ADPM: {low_vs.adpm} ( {low_vs.vs}vs ) By: {latest_data.low_vs[0]["name"].upper()}\n'
-            '\n'
-            '最高数据:\n'
-            f"L'PM: {max_pps.lpm} ( {max_pps.pps} pps ) By: {latest_data.high_pps[0]['name'].upper()}\n"
-            f'APM: {latest_data.high_apm[1]} By: {latest_data.high_apm[0]["name"].upper()}\n'
-            f'ADPM: {max_vs.adpm} ( {max_vs.vs}vs ) By: {latest_data.high_vs[0]["name"].upper()}\n'
-            '\n'
-            f'数据更新时间: {latest_data.update_time.replace(tzinfo=UTC).astimezone(ZoneInfo("Asia/Shanghai")).strftime("%Y-%m-%d %H:%M:%S")}'
-        )
-        await matcher.finish(message)
-
-
-@scheduler.scheduled_job('cron', hour='0,6,12,18', minute=0)
-@retry(exception_type=RequestError, delay=timedelta(minutes=15))
-async def get_tetra_league_data() -> None:
-    league, original = await full_export(with_original=True)
-    if isinstance(league, FailedModel):
-        msg = f'排行榜数据请求错误:\n{league.error}'
-        raise RequestError(msg)
-
-    def pps(user: ValidUser) -> float:
-        return user.league.pps
-
-    def apm(user: ValidUser) -> float:
-        return user.league.apm
-
-    def vs(user: ValidUser) -> float:
-        return user.league.vs
-
-    def _min(users: list[ValidUser], field: Callable[[ValidUser], float]) -> ValidUser:
-        return min(users, key=field)
-
-    def _max(users: list[ValidUser], field: Callable[[ValidUser], float]) -> ValidUser:
-        return max(users, key=field)
-
-    def build_extremes_data(
-        users: list[ValidUser],
-        field: Callable[[ValidUser], float],
-        sort: Callable[[list[ValidUser], Callable[[ValidUser], float]], ValidUser],
-    ) -> tuple[dict[str, str], float]:
-        user = sort(users, field)
-        return model_dump(User(ID=user.id, name=user.username)), field(user)
-
-    data_hash: str | None = await run_sync((await run_sync(sha512)(original)).hexdigest)()
-    async with open(get_data_file('nonebot_plugin_tetris_stats', f'{data_hash}.json.zst'), mode='wb') as file:
-        await file.write(await run_sync(ZstdCompressor(level=12, threads=-1).compress)(original))
-
-    users = [i for i in league.data.users if isinstance(i, ValidUser)]
-    rank_to_users: defaultdict[Rank, list[ValidUser]] = defaultdict(list)
-    for i in users:
-        rank_to_users[i.league.rank].append(i)
-    rank_info: list[IORank] = []
-    for rank, percentile in RANK_PERCENTILE.items():
-        offset = floor((percentile / 100) * len(users)) - 1
-        tr_line = users[offset].league.rating
-        rank_users = rank_to_users[rank]
-        rank_info.append(
-            IORank(
-                rank=rank,
-                tr_line=tr_line,
-                player_count=len(rank_users),
-                low_pps=(build_extremes_data(rank_users, pps, _min)),
-                low_apm=(build_extremes_data(rank_users, apm, _min)),
-                low_vs=(build_extremes_data(rank_users, vs, _min)),
-                avg_pps=mean({i.league.pps for i in rank_users}),
-                avg_apm=mean({i.league.apm for i in rank_users}),
-                avg_vs=mean({i.league.vs for i in rank_users}),
-                high_pps=(build_extremes_data(rank_users, pps, _max)),
-                high_apm=(build_extremes_data(rank_users, apm, _max)),
-                high_vs=(build_extremes_data(rank_users, vs, _max)),
-                update_time=league.cache.cached_at,
-                file_hash=data_hash,
-            )
-        )
-    async with get_session() as session:
-        session.add_all(rank_info)
-        await session.commit()
-
-
-@driver.on_startup
-async def _() -> None:
-    async with get_session() as session:
-        latest_time = await session.scalar(select(IORank.update_time).order_by(IORank.id.desc()).limit(1))
-    if latest_time is None or datetime.now(tz=UTC) - latest_time.replace(tzinfo=UTC) > timedelta(hours=6):
-        await get_tetra_league_data()

nonebot_plugin_tetris_stats/games/tetrio/rank/__init__.py

@@ -0,0 +1,153 @@
+from collections import defaultdict
+from collections.abc import Callable, Sequence
+from datetime import datetime, timedelta, timezone
+from math import floor
+from statistics import mean
+from typing import TYPE_CHECKING
+from uuid import uuid4
+
+from nonebot import get_driver
+from nonebot_plugin_alconna import Subcommand
+from nonebot_plugin_apscheduler import scheduler
+from nonebot_plugin_orm import get_session
+from sqlalchemy import select
+
+from ....utils.exception import RequestError
+from ....utils.retry import retry
+from .. import alc
+from .. import command as base_command
+from ..api.leaderboards import by
+from ..api.schemas.base import P
+from ..api.schemas.leaderboards import Parameter
+from ..api.schemas.leaderboards.by import Entry
+from ..constant import RANK_PERCENTILE
+from ..models import TETRIOLeagueHistorical, TETRIOLeagueStats, TETRIOLeagueStatsField
+
+if TYPE_CHECKING:
+    from ..api.schemas.leaderboards.by import BySuccessModel
+    from ..api.typing import Rank
+
+UTC = timezone.utc
+
+driver = get_driver()
+
+
+command = Subcommand('rank', help_text='查询 TETR.IO 段位信息')
+
+
+def wrapper(slot: int | str, content: str | None) -> str | None:
+    if slot == 'rank' and not content:
+        return '--all'
+    if content is not None:
+        return f'--detail {content.lower()}'
+    return content
+
+
+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=wrapper,
+)
+
+
+def _pps(user: Entry) -> float:
+    return user.league.pps
+
+
+def _apm(user: Entry) -> float:
+    return user.league.apm
+
+
+def _vs(user: Entry) -> float:
+    return user.league.vs
+
+
+def _min(users: Sequence[Entry], field: Callable[[Entry], float]) -> Entry:
+    return min(users, key=field)
+
+
+def _max(users: Sequence[Entry], field: Callable[[Entry], float]) -> Entry:
+    return max(users, key=field)
+
+
+def find_special_player(
+    users: Sequence[Entry],
+    field: Callable[[Entry], float],
+    sort: Callable[[Sequence[Entry], Callable[[Entry], float]], Entry],
+) -> Entry:
+    return sort(users, field)
+
+
+@scheduler.scheduled_job('cron', hour='0,6,12,18', minute=0)
+async def get_tetra_league_data() -> None:
+    x_session_id = uuid4()
+    retry_by = retry(max_attempts=10, exception_type=RequestError)(by)
+    prisecter = P(pri=9007199254740991, sec=9007199254740991, ter=9007199254740991)  # * from ch.tetr.io
+    results: list[BySuccessModel] = []
+    while True:
+        model = await retry_by('league', Parameter(after=prisecter.to_prisecter(), limit=100), x_session_id)
+        prisecter = model.data.entries[-1].p
+        results.append(model)
+        if len(model.data.entries) < 100:  # 分页值 # noqa: PLR2004
+            break
+
+    players: list[Entry] = []
+    for result in results:
+        players.extend(result.data.entries)
+    players.sort(key=lambda x: x.league.tr, reverse=True)
+
+    rank_player_mapping: defaultdict[Rank, list[Entry]] = defaultdict(list)
+    for player in players:
+        rank_player_mapping[player.league.rank].append(player)
+
+    stats = TETRIOLeagueStats(raw=[], fields=[], update_time=datetime.now(UTC))
+    fields: list[TETRIOLeagueStatsField] = []
+    for rank, percentile in RANK_PERCENTILE.items():
+        offset = floor((percentile / 100) * len(players)) - 1
+        tr_line = players[offset].league.tr
+        rank_players = rank_player_mapping[rank]
+        fields.append(
+            TETRIOLeagueStatsField(
+                rank=rank,
+                tr_line=tr_line,
+                player_count=len(rank_players),
+                low_pps=find_special_player(rank_players, _pps, _min),
+                low_apm=find_special_player(rank_players, _apm, _min),
+                low_vs=find_special_player(rank_players, _vs, _min),
+                avg_pps=mean(_pps(i) for i in rank_players),
+                avg_apm=mean(_apm(i) for i in rank_players),
+                avg_vs=mean(_vs(i) for i in rank_players),
+                high_pps=find_special_player(rank_players, _pps, _max),
+                high_apm=find_special_player(rank_players, _apm, _max),
+                high_vs=find_special_player(rank_players, _vs, _max),
+                stats=stats,
+            )
+        )
+    historicals = [
+        TETRIOLeagueHistorical(request_id=x_session_id, data=model, update_time=model.cache.cached_at, stats=stats)
+        for model in results
+    ]
+    stats.raw = historicals
+    stats.fields = fields
+    async with get_session() as session:
+        session.add(stats)
+        await session.commit()
+
+
+@driver.on_startup
+async def _() -> None:
+    async with get_session() as session:
+        latest_time = await session.scalar(
+            select(TETRIOLeagueStats.update_time).order_by(TETRIOLeagueStats.id.desc()).limit(1)
+        )
+    if latest_time is None or datetime.now(tz=UTC) - latest_time.replace(tzinfo=UTC) > timedelta(hours=6):
+        await get_tetra_league_data()
+
+
+from . import all, detail  # noqa: E402
+
+base_command.add(command)
+
+__all__ = ['all', 'detail']

nonebot_plugin_tetris_stats/games/tetrio/rank/all.py

@@ -0,0 +1,115 @@
+from datetime import timedelta
+
+from arclet.alconna import Arg
+from nonebot_plugin_alconna import Option, Subcommand, 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 sqlalchemy import func, select
+from sqlalchemy.orm import selectinload
+
+from ....db import trigger
+from ....utils.host import HostPage, get_self_netloc
+from ....utils.metrics import get_metrics
+from ....utils.render import render
+from ....utils.render.schemas.tetrio.rank.v1 import Data as DataV1
+from ....utils.render.schemas.tetrio.rank.v1 import ItemData as ItemDataV1
+from ....utils.render.schemas.tetrio.rank.v2 import AverageData as AverageDataV2
+from ....utils.render.schemas.tetrio.rank.v2 import Data as DataV2
+from ....utils.render.schemas.tetrio.rank.v2 import ItemData as ItemDataV2
+from ....utils.screenshot import screenshot
+from .. import alc
+from ..constant import GAME_TYPE
+from ..models import TETRIOLeagueStats
+from ..typing import Template
+from . import command
+
+command.add(
+    Subcommand(
+        '--all', Option('--template', Arg('template', Template), alias=['-T'], help_text='要使用的查询模板'), dest='all'
+    )
+)
+
+
+@alc.assign('TETRIO.rank.all')
+async def _(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='rank',
+        command_args=['--all'] + ([f'--template {template}'] if template is not None else []),
+    ):
+        async with get_session() as session:
+            latest_data = (
+                await session.scalars(
+                    select(TETRIOLeagueStats)
+                    .order_by(TETRIOLeagueStats.id.desc())
+                    .limit(1)
+                    .options(selectinload(TETRIOLeagueStats.fields))
+                )
+            ).one()
+            compare_data = (
+                await session.scalars(
+                    select(TETRIOLeagueStats)
+                    .order_by(
+                        func.abs(
+                            func.julianday(TETRIOLeagueStats.update_time)
+                            - func.julianday(latest_data.update_time - timedelta(hours=24))
+                        )
+                    )
+                    .limit(1)
+                    .options(selectinload(TETRIOLeagueStats.fields))
+                )
+            ).one()
+        match template:
+            case 'v1' | None:
+                await UniMessage.image(raw=await make_image_v1(latest_data, compare_data)).finish()
+            case 'v2':
+                await UniMessage.image(raw=await make_image_v2(latest_data, compare_data)).finish()
+
+
+async def make_image_v1(latest_data: TETRIOLeagueStats, compare_data: TETRIOLeagueStats) -> bytes:
+    async with HostPage(
+        await render(
+            'v1/tetrio/rank',
+            DataV1(
+                items={
+                    i[0].rank: ItemDataV1(
+                        trending=round(i[0].tr_line - i[1].tr_line, 2),
+                        require_tr=round(i[0].tr_line, 2),
+                        players=i[0].player_count,
+                    )
+                    for i in zip(latest_data.fields, compare_data.fields, strict=True)
+                },
+                updated_at=latest_data.update_time,
+            ),
+        )
+    ) as page_hash:
+        return await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
+
+
+async def make_image_v2(latest_data: TETRIOLeagueStats, compare_data: TETRIOLeagueStats) -> bytes:
+    async with HostPage(
+        await render(
+            'v2/tetrio/rank',
+            DataV2(
+                items={
+                    i[0].rank: ItemDataV2(
+                        require_tr=round(i[0].tr_line, 2),
+                        trending=round(i[0].tr_line - i[1].tr_line, 2),
+                        average_data=AverageDataV2(
+                            pps=(metrics := get_metrics(pps=i[0].avg_pps, apm=i[0].avg_apm, vs=i[0].avg_vs)).pps,
+                            apm=metrics.apm,
+                            apl=metrics.apl,
+                            vs=metrics.vs,
+                            adpl=metrics.adpl,
+                        ),
+                        players=i[0].player_count,
+                    )
+                    for i in zip(latest_data.fields, compare_data.fields, strict=True)
+                },
+                updated_at=latest_data.update_time,
+            ),
+        )
+    ) as page_hash:
+        return await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')

nonebot_plugin_tetris_stats/games/tetrio/rank/detail.py

@@ -0,0 +1,128 @@
+from datetime import timedelta, timezone
+from zoneinfo import ZoneInfo
+
+from arclet.alconna import Arg
+from nonebot import get_driver
+from nonebot_plugin_alconna import Option, 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 sqlalchemy import func, select
+from sqlalchemy.orm import selectinload
+
+from ....db import trigger
+from ....utils.host import HostPage, get_self_netloc
+from ....utils.metrics import get_metrics
+from ....utils.render import render
+from ....utils.render.schemas.tetrio.rank.detail import Data, SpecialData
+from ....utils.screenshot import screenshot
+from .. import alc
+from ..api.typing import ValidRank
+from ..constant import GAME_TYPE
+from ..models import TETRIOLeagueStats
+from . import command
+
+UTC = timezone.utc
+
+driver = get_driver()
+
+command.add(Option('--detail', Arg('rank', ValidRank), alias=['-D']))
+
+
+@alc.assign('TETRIO.rank')
+async def _(rank: ValidRank, event_session: EventSession):
+    async with trigger(
+        session_persist_id=await get_session_persist_id(event_session),
+        game_platform=GAME_TYPE,
+        command_type='rank',
+        command_args=[f'--detail {rank}'],
+    ):
+        async with get_session() as session:
+            latest_data = (
+                await session.scalars(
+                    select(TETRIOLeagueStats)
+                    .order_by(TETRIOLeagueStats.id.desc())
+                    .limit(1)
+                    .options(selectinload(TETRIOLeagueStats.fields))
+                )
+            ).one()
+            compare_data = (
+                await session.scalars(
+                    select(TETRIOLeagueStats)
+                    .order_by(
+                        func.abs(
+                            func.julianday(TETRIOLeagueStats.update_time)
+                            - func.julianday(latest_data.update_time - timedelta(hours=24))
+                        )
+                    )
+                    .limit(1)
+                    .options(selectinload(TETRIOLeagueStats.fields))
+                )
+            ).one()
+        await UniMessage.image(
+            raw=await make_image(
+                rank,
+                latest_data,
+                compare_data,
+            )
+        ).finish()
+
+
+async def make_image(rank: ValidRank, latest: TETRIOLeagueStats, compare: TETRIOLeagueStats) -> bytes:
+    latest_data = next(filter(lambda x: x.rank == rank, latest.fields))
+    compare_data = next(filter(lambda x: x.rank == rank, compare.fields))
+    avg = get_metrics(pps=latest_data.avg_pps, apm=latest_data.avg_apm, vs=latest_data.avg_vs)
+    low_pps = get_metrics(
+        pps=latest_data.low_pps.league.pps, apm=latest_data.low_pps.league.apm, vs=latest_data.low_pps.league.vs
+    )
+    low_apm = get_metrics(
+        pps=latest_data.low_apm.league.pps, apm=latest_data.low_apm.league.apm, vs=latest_data.low_apm.league.vs
+    )
+    low_vs = get_metrics(
+        pps=latest_data.low_vs.league.pps, apm=latest_data.low_vs.league.apm, vs=latest_data.low_vs.league.vs
+    )
+    max_pps = get_metrics(
+        pps=latest_data.high_pps.league.pps, apm=latest_data.high_pps.league.apm, vs=latest_data.high_pps.league.vs
+    )
+    max_apm = get_metrics(
+        pps=latest_data.high_apm.league.pps, apm=latest_data.high_apm.league.apm, vs=latest_data.high_apm.league.vs
+    )
+    max_vs = get_metrics(
+        pps=latest_data.high_vs.league.pps, apm=latest_data.high_vs.league.apm, vs=latest_data.high_vs.league.vs
+    )
+    async with HostPage(
+        await render(
+            'v2/tetrio/rank/detail',
+            Data(
+                name=latest_data.rank,
+                trending=round(latest_data.tr_line - compare_data.tr_line, 2),
+                require_tr=round(latest_data.tr_line, 2),
+                players=latest_data.player_count,
+                minimum_data=SpecialData(
+                    apm=low_apm.apm,
+                    pps=low_pps.pps,
+                    lpm=low_pps.lpm,
+                    vs=low_vs.vs,
+                    adpm=low_vs.adpm,
+                    apm_holder=latest_data.low_apm.username.upper(),
+                    pps_holder=latest_data.low_pps.username.upper(),
+                    vs_holder=latest_data.low_vs.username.upper(),
+                ),
+                average_data=SpecialData(
+                    apm=avg.apm, pps=avg.pps, lpm=avg.lpm, vs=avg.vs, adpm=avg.adpm, apl=avg.apl, adpl=avg.adpl
+                ),
+                maximum_data=SpecialData(
+                    apm=max_apm.apm,
+                    pps=max_pps.pps,
+                    lpm=max_pps.lpm,
+                    vs=max_vs.vs,
+                    adpm=max_vs.adpm,
+                    apm_holder=latest_data.high_apm.username.upper(),
+                    pps_holder=latest_data.high_pps.username.upper(),
+                    vs_holder=latest_data.high_vs.username.upper(),
+                ),
+                updated_at=latest.update_time.replace(tzinfo=UTC).astimezone(ZoneInfo('Asia/Shanghai')),
+            ),
+        )
+    ) as page_hash:
+        return await screenshot(f'http://{get_self_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

@@ -1,30 +1,40 @@
 from asyncio import gather
 from datetime import timedelta
 from hashlib import md5
-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_user import get_user  # 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
+from yarl import URL
 
-from ....db import query_bind_info
+from ....db import query_bind_info, trigger
+from ....i18n import Lang
 from ....utils.exception import RecordNotFoundError
 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_record_base import Finesse, Max, Mini, Tspins, User
+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.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')
@@ -34,67 +44,84 @@ async def _(
     target: At | Me,
     event_session: EventSession,
 ):
-    async with get_session() as session:
+    async with trigger(
-        bind = await query_bind_info(
+        session_persist_id=await get_session_persist_id(event_session),
-            session=session,
+        game_platform=GAME_TYPE,
-            user=await get_user(
+        command_type='record',
-                event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+        command_args=['--blitz'],
-            ),
+    ):
-            game_platform=GAME_TYPE,
+        async with get_session() as session:
-        )
+            bind = await query_bind_info(
-    if bind is None:
+                session=session,
-        await matcher.finish('未查询到绑定信息')
+                user=await get_user(
-    message = UniMessage(CANT_VERIFY_MESSAGE)
+                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
-    player = Player(user_id=bind.game_account, trust=True)
+                ),
-    await (message + UniMessage.image(raw=await make_blitz_image(player))).finish()
+                game_platform=GAME_TYPE,
+            )
+        if bind is None:
+            await matcher.finish('未查询到绑定信息')
+        player = Player(user_id=bind.game_account, trust=True)
+        await (
+            UniMessage.i18n(Lang.interaction.warning.unverified) + UniMessage.image(raw=await make_blitz_image(player))
+        ).finish()
 
 
 @alc.assign('TETRIO.record.blitz')
-async def _(account: Player):
+async def _(account: Player, event_session: EventSession):
-    await UniMessage.image(raw=await make_blitz_image(account)).finish()
+    async with trigger(
+        session_persist_id=await get_session_persist_id(event_session),
+        game_platform=GAME_TYPE,
+        command_type='record',
+        command_args=['--blitz'],
+    ):
+        await UniMessage.image(raw=await make_blitz_image(account)).finish()
 
 
 async def make_blitz_image(player: Player) -> bytes:
-    user, user_info, blitz = await gather(player.user, player.get_info(), player.blitz)
+    user, blitz = await gather(player.user, player.blitz)
-    if blitz.record is None:
+    if blitz.data.record is None:
         msg = f'未找到用户 {user.name.upper()} 的 Blitz 记录'
         raise RecordNotFoundError(msg)
-    endcontext = blitz.record.endcontext
+    stats = blitz.data.record.results.stats
-    clears = endcontext.clears
+    clears = stats.clears
-    duration = timedelta(milliseconds=endcontext.final_time).total_seconds()
+    duration = timedelta(milliseconds=stats.finaltime).total_seconds()
-    metrics = get_metrics(pps=endcontext.piecesplaced / duration)
+    metrics = get_metrics(pps=stats.piecesplaced / duration)
     netloc = get_self_netloc()
     async with HostPage(
         page=await render(
             'v2/tetrio/record/blitz',
             Record(
+                type='best',
                 user=User(
                     id=user.ID,
                     name=user.name.upper(),
-                    avatar=f'http://{netloc}/host/resource/tetrio/avatars/{user.ID}?{urlencode({"revision": user_info.data.user.avatar_revision})}'
+                    avatar=str(
-                    if user_info.data.user.avatar_revision is not None and user_info.data.user.avatar_revision != 0
+                        URL(f'http://{netloc}/host/resource/tetrio/avatars/{user.ID}') % {'revision': avatar_revision}
+                    )
+                    if (avatar_revision := (await player.avatar_revision)) is not None and avatar_revision != 0
                     else Avatar(
                         type='identicon',
                         hash=md5(user.ID.encode()).hexdigest(),  # noqa: S324
                     ),
                 ),
-                replay_id=blitz.record.replayid,
+                replay_id=blitz.data.record.replayid,
-                rank=blitz.rank,
+                rank=blitz.data.rank,
+                personal_rank=1,
                 statistic=Statistic(
-                    keys=endcontext.inputs,
+                    keys=stats.inputs,
-                    kpp=round(endcontext.inputs / endcontext.piecesplaced, 2),
+                    kpp=round(stats.inputs / stats.piecesplaced, 2),
-                    kps=round(endcontext.inputs / duration, 2),
+                    kps=round(stats.inputs / duration, 2),
                     max=Max(
-                        combo=max((0, endcontext.combo - 1)),
+                        combo=max((0, stats.topcombo - 1)),
-                        btb=max((0, endcontext.btb - 1)),
+                        btb=max((0, stats.topbtb - 1)),
                     ),
-                    pieces=endcontext.piecesplaced,
+                    pieces=stats.piecesplaced,
                     pps=metrics.pps,
-                    lines=endcontext.lines,
+                    lines=stats.lines,
                     lpm=metrics.lpm,
-                    holds=endcontext.holds,
+                    holds=stats.holds,
-                    score=endcontext.score,
+                    score=stats.score,
-                    spp=round(endcontext.score / endcontext.piecesplaced, 2),
+                    spp=round(stats.score / stats.piecesplaced, 2),
                     single=clears.singles,
                     double=clears.doubles,
                     triple=clears.triples,
@@ -103,7 +130,7 @@ async def make_blitz_image(player: Player) -> bytes:
                         total=clears.realtspins,
                         single=clears.tspinsingles,
                         double=clears.tspindoubles,
-                        triple=clears.triples,
+                        triple=clears.tspintriples,
                         mini=Mini(
                             total=clears.minitspins,
                             single=clears.minitspinsingles,
@@ -112,12 +139,12 @@ async def make_blitz_image(player: Player) -> bytes:
                     ),
                     all_clear=clears.allclear,
                     finesse=Finesse(
-                        faults=endcontext.finesse.faults,
+                        faults=stats.finesse.faults,
-                        accuracy=round(endcontext.finesse.perfectpieces / endcontext.piecesplaced * 100, 2),
+                        accuracy=round(stats.finesse.perfectpieces / stats.piecesplaced * 100, 2),
                     ),
-                    level=endcontext.level,
+                    level=stats.level,
                 ),
-                play_at=blitz.record.ts,
+                play_at=blitz.data.record.ts,
             ),
         )
     ) as page_hash:

nonebot_plugin_tetris_stats/games/tetrio/record/sprint.py

@@ -1,30 +1,40 @@
 from asyncio import gather
 from datetime import timedelta
 from hashlib import md5
-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_user import get_user  # 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
+from yarl import URL
 
-from ....db import query_bind_info
+from ....db import query_bind_info, trigger
+from ....i18n import Lang
 from ....utils.exception import RecordNotFoundError
 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_record_base import Finesse, Max, Mini, Tspins, User
+from ....utils.render.schemas.tetrio.record.base import Finesse, Max, Mini, Statistic, Tspins, User
-from ....utils.render.schemas.tetrio_record_sprint import Record, Statistic
+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')
@@ -34,68 +44,85 @@ async def _(
     target: At | Me,
     event_session: EventSession,
 ):
-    async with get_session() as session:
+    async with trigger(
-        bind = await query_bind_info(
+        session_persist_id=await get_session_persist_id(event_session),
-            session=session,
+        game_platform=GAME_TYPE,
-            user=await get_user(
+        command_type='record',
-                event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+        command_args=['--40l'],
-            ),
+    ):
-            game_platform=GAME_TYPE,
+        async with get_session() as session:
-        )
+            bind = await query_bind_info(
-    if bind is None:
+                session=session,
-        await matcher.finish('未查询到绑定信息')
+                user=await get_user(
-    message = UniMessage(CANT_VERIFY_MESSAGE)
+                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
-    player = Player(user_id=bind.game_account, trust=True)
+                ),
-    await (message + UniMessage.image(raw=await make_sprint_image(player))).finish()
+                game_platform=GAME_TYPE,
+            )
+        if bind is None:
+            await matcher.finish('未查询到绑定信息')
+        player = Player(user_id=bind.game_account, trust=True)
+        await (
+            UniMessage.i18n(Lang.interaction.warning.unverified) + UniMessage.image(raw=await make_sprint_image(player))
+        ).finish()
 
 
 @alc.assign('TETRIO.record.sprint')
-async def _(account: Player):
+async def _(account: Player, event_session: EventSession):
-    await UniMessage.image(raw=await make_sprint_image(account)).finish()
+    async with trigger(
+        session_persist_id=await get_session_persist_id(event_session),
+        game_platform=GAME_TYPE,
+        command_type='record',
+        command_args=['--40l'],
+    ):
+        await UniMessage.image(raw=await make_sprint_image(account)).finish()
 
 
 async def make_sprint_image(player: Player) -> bytes:
-    user, user_info, sprint = await gather(player.user, player.get_info(), player.sprint)
+    user, sprint = await gather(player.user, player.sprint)
-    if sprint.record is None:
+    if sprint.data.record is None:
         msg = f'未找到用户 {user.name.upper()} 的 40L 记录'
         raise RecordNotFoundError(msg)
-    endcontext = sprint.record.endcontext
+    stats = sprint.data.record.results.stats
-    clears = endcontext.clears
+    clears = stats.clears
-    duration = timedelta(milliseconds=endcontext.final_time).total_seconds()
+    duration = timedelta(milliseconds=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
-    metrics = get_metrics(pps=endcontext.piecesplaced / duration)
+    metrics = get_metrics(pps=stats.piecesplaced / duration)
     netloc = get_self_netloc()
     async with HostPage(
         page=await render(
             'v2/tetrio/record/40l',
             Record(
+                type='best',
                 user=User(
                     id=user.ID,
                     name=user.name.upper(),
-                    avatar=f'http://{netloc}/host/resource/tetrio/avatars/{user.ID}?{urlencode({"revision": user_info.data.user.avatar_revision})}'
+                    avatar=str(
-                    if user_info.data.user.avatar_revision is not None and user_info.data.user.avatar_revision != 0
+                        URL(f'http://{netloc}/host/resource/tetrio/avatars/{user.ID}') % {'revision': avatar_revision}
+                    )
+                    if (avatar_revision := (await player.avatar_revision)) is not None and avatar_revision != 0
                     else Avatar(
                         type='identicon',
                         hash=md5(user.ID.encode()).hexdigest(),  # noqa: S324
                     ),
                 ),
                 time=sprint_value,
-                replay_id=sprint.record.replayid,
+                replay_id=sprint.data.record.replayid,
-                rank=sprint.rank,
+                rank=sprint.data.rank,
+                personal_rank=1,
                 statistic=Statistic(
-                    keys=endcontext.inputs,
+                    keys=stats.inputs,
-                    kpp=round(endcontext.inputs / endcontext.piecesplaced, 2),
+                    kpp=round(stats.inputs / stats.piecesplaced, 2),
-                    kps=round(endcontext.inputs / duration, 2),
+                    kps=round(stats.inputs / duration, 2),
                     max=Max(
-                        combo=max((0, endcontext.combo - 1)),
+                        combo=max((0, stats.topcombo - 1)),
-                        btb=max((0, endcontext.btb - 1)),
+                        btb=max((0, stats.topbtb - 1)),
                     ),
-                    pieces=endcontext.piecesplaced,
+                    pieces=stats.piecesplaced,
                     pps=metrics.pps,
-                    lines=endcontext.lines,
+                    lines=stats.lines,
                     lpm=metrics.lpm,
-                    holds=endcontext.holds,
+                    holds=stats.holds,
-                    score=endcontext.score,
+                    score=stats.score,
                     single=clears.singles,
                     double=clears.doubles,
                     triple=clears.triples,
@@ -104,7 +131,7 @@ async def make_sprint_image(player: Player) -> bytes:
                         total=clears.realtspins,
                         single=clears.tspinsingles,
                         double=clears.tspindoubles,
-                        triple=clears.triples,
+                        triple=clears.tspintriples,
                         mini=Mini(
                             total=clears.minitspins,
                             single=clears.minitspinsingles,
@@ -113,11 +140,11 @@ async def make_sprint_image(player: Player) -> bytes:
                     ),
                     all_clear=clears.allclear,
                     finesse=Finesse(
-                        faults=endcontext.finesse.faults,
+                        faults=stats.finesse.faults,
-                        accuracy=round(endcontext.finesse.perfectpieces / endcontext.piecesplaced * 100, 2),
+                        accuracy=round(stats.finesse.perfectpieces / stats.piecesplaced * 100, 2),
                     ),
                 ),
-                play_at=sprint.record.ts,
+                play_at=sprint.data.record.ts,
             ),
         )
     ) as page_hash:

nonebot_plugin_tetris_stats/games/top/__init__.py

@@ -1,9 +1,9 @@
-from arclet.alconna import Arg, ArgFlag, Args, Subcommand
+from arclet.alconna import Arg, ArgFlag
-from nonebot_plugin_alconna import At
+from nonebot_plugin_alconna import Args, At, Subcommand
 
 from ...utils.exception import MessageFormatError
 from ...utils.typing import Me
-from .. import add_block_handlers, alc
+from .. import add_block_handlers, alc, command
 from .api import Player
 from .constant import USER_NAME
 
@@ -14,7 +14,7 @@ def get_player(name: str) -> Player | MessageFormatError:
     return MessageFormatError('用户名/ID不合法')
 
 
-alc.command.add(
+command.add(
     Subcommand(
         'TOP',
         Subcommand(

nonebot_plugin_tetris_stats/games/top/api/player.py

@@ -1,13 +1,13 @@
 from contextlib import suppress
 from datetime import datetime, timezone
 from io import StringIO
-from urllib.parse import urlencode
 
 from lxml import etree
 from pandas import read_html
 
+from ....config.config import config
 from ....db import anti_duplicate_add
-from ....utils.request import Request, splice_url
+from ....utils.request import Request
 from ..constant import BASE_URL, USER_NAME
 from .models import TOPHistoricalData
 from .schemas.user import User
@@ -15,6 +15,8 @@ from .schemas.user_profile import Data, UserProfile
 
 UTC = timezone.utc
 
+request = Request(config.tetris.proxy.top or config.tetris.proxy.main)
+
 
 class Player:
     def __init__(self, *, user_name: str, trust: bool = False) -> None:
@@ -35,11 +37,9 @@ class Player:
     async def get_profile(self) -> UserProfile:
         """获取用户信息"""
         if self._user_profile is None:
-            url = splice_url([BASE_URL, 'profile.php', f'?{urlencode({"user":self.user_name})}'])
+            raw_user_profile = await request.request(BASE_URL / 'profile.php' % {'user': self.user_name}, is_json=False)
-            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 +49,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 +69,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_user import User
-from nonebot_plugin_userinfo import BotUserInfo, EventUserInfo, UserInfo  # type: ignore[import-untyped]
+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/constant.py

@@ -1,8 +1,10 @@
 from re import compile
 from typing import Literal
 
+from yarl import URL
+
 GAME_TYPE: Literal['TOP'] = 'TOP'
 
-BASE_URL = 'http://tetrisonline.pl/top/'
+BASE_URL = URL('http://tetrisonline.pl/top/')
 
 USER_NAME = compile(r'^[a-zA-Z0-9_]{1,16}$')

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 ...i18n import Lang
+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 (
-        await (message + make_query_text(await Player(user_name=bind.game_account, trust=True).get_profile())).finish()
+            UniMessage.i18n(Lang.interaction.warning.unverified)
+            + 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
+        total = get_avg_metrics(profile.total)
-        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)
         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,9 +1,9 @@
-from arclet.alconna import Arg, ArgFlag, Args, Subcommand
+from arclet.alconna import Arg, ArgFlag
-from nonebot_plugin_alconna import At
+from nonebot_plugin_alconna import Args, At, Subcommand
 
 from ...utils.exception import MessageFormatError
 from ...utils.typing import Me
-from .. import add_block_handlers, alc
+from .. import add_block_handlers, alc, command
 from .api import Player
 from .constant import USER_NAME
 
@@ -19,7 +19,7 @@ def get_player(teaid_or_name: str) -> Player | MessageFormatError:
     return MessageFormatError('用户名/ID不合法')
 
 
-alc.command.add(
+command.add(
     Subcommand(
         'TOS',
         Subcommand(

nonebot_plugin_tetris_stats/games/tos/api/player.py

@@ -1,13 +1,14 @@
 from datetime import datetime, timezone
-from typing import overload
+from typing import cast, overload
-from urllib.parse import urlencode
 
 from httpx import TimeoutException
 from nonebot.compat import type_validate_json
+from yarl import URL
 
+from ....config.config import config
 from ....db import anti_duplicate_add
 from ....utils.exception import RequestError
-from ....utils.request import Request, splice_url
+from ....utils.request import Request
 from ..constant import BASE_URL, USER_NAME
 from .models import TOSHistoricalData
 from .schemas.user import User
@@ -16,6 +17,8 @@ from .schemas.user_profile import UserProfile
 
 UTC = timezone.utc
 
+request = Request(config.tetris.proxy.tos or config.tetris.proxy.main)
+
 
 class Player:
     @overload
@@ -57,35 +60,20 @@ class Player:
         """获取用户信息"""
         if self._user_info is None:
             if self.teaid is not None:
-                url = [
+                path = 'getTeaIdInfo'
-                    splice_url(
+                query = {'teaId': self.teaid}
-                        [
-                            i,
-                            'getTeaIdInfo',
-                            f'?{urlencode({"teaId":self.teaid})}',
-                        ]
-                    )
-                    for i in BASE_URL
-                ]
             else:
-                url = [
+                path = 'getUsernameInfo'
-                    splice_url(
+                query = {'username': cast(str, self.user_name)}
-                        [
+            raw_user_info = await request.failover_request(
-                            i,
+                [i / path % query for i in BASE_URL], failover_code=[502], failover_exc=(TimeoutException,)
-                            'getUsernameInfo',
+            )
-                            f'?{urlencode({"username":self.user_name})}',
-                        ]
-                    )
-                    for i in BASE_URL
-                ]
-            raw_user_info = await Request.failover_request(url, failover_code=[502], failover_exc=(TimeoutException,))
             user_info: UserInfo = type_validate_json(UserInfo, raw_user_info)  # type: ignore[arg-type]
             if not isinstance(user_info, UserInfoSuccess):
                 msg = f'用户信息请求错误:\n{user_info.error}'
                 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',
@@ -99,17 +87,11 @@ class Player:
         """获取用户数据"""
         if other_parameter is None:
             other_parameter = {}
-        params = urlencode(dict(sorted(other_parameter.items())))
+        params = (URL('') % dict(sorted(other_parameter.items()))).human_repr()
         if self._user_profile.get(params) is None:
-            raw_user_profile = await Request.failover_request(
+            raw_user_profile = await request.failover_request(
                 [
-                    splice_url(
+                    i / 'getProfile' % {'id': self.teaid or cast(str, self.user_name), **other_parameter}
-                        [
-                            i,
-                            'getProfile',
-                            f'?{urlencode({"id":self.teaid or self.user_name,**other_parameter})}',
-                        ]
-                    )
                     for i in BASE_URL
                 ],
                 failover_code=[502],
@@ -117,7 +99,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_user import User
-from nonebot_plugin_userinfo import BotUserInfo, EventUserInfo, UserInfo  # type: ignore[import-untyped]
+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

@@ -1,14 +1,13 @@
 from re import compile
 from typing import Literal
 
+from yarl import URL
+
 GAME_TYPE: Literal['TOS'] = 'TOS'
 
 BASE_URL = {
-    'https://teatube.cn:8888/',
+    URL('https://teatube.cn:8888/'),
-    'http://cafuuchino1.studio26f.org:19970',
+    URL('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,22 +8,23 @@ 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 nonebot_plugin_userinfo import EventUserInfo, UserInfo  # type: ignore[import-untyped]
+from nonebot_plugin_userinfo import EventUserInfo, UserInfo
 
 from ...db import query_bind_info, trigger
+from ...i18n import Lang
 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.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
 from ...utils.typing import Me, Number
-from ..constant import CANT_VERIFY_MESSAGE
 from . import alc
 from .api import Player
 from .api.schemas.user_info import UserInfoSuccess
@@ -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:
@@ -121,18 +124,23 @@ async def _(
             )
         if bind is None:
             await matcher.finish('未查询到绑定信息')
-        message = CANT_VERIFY_MESSAGE
+        message = UniMessage.i18n(Lang.interaction.warning.unverified)
         player = Player(teaid=bind.game_account, trust=True)
         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 = (
-    sprint_value = f'{duration:.3f}s' if duration < 60 else f'{duration // 60:.0f}m {duration % 60:.3f}s'  # noqa: PLR2004
+        (
+            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/i18n/.config.json

@@ -0,0 +1,5 @@
+{
+  "default": "en-US",
+  "frozen": [],
+  "require": []
+}

nonebot_plugin_tetris_stats/i18n/.lang.schema.json

@@ -0,0 +1,72 @@
+{
+  "title": "Lang Schema",
+  "description": "Schema for lang file",
+  "type": "object",
+  "properties": {
+    "interaction": {
+      "title": "Interaction",
+      "description": "Scope 'interaction' of lang item",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "wrong": {
+          "title": "Wrong",
+          "description": "Scope 'wrong' of lang item",
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "query_bot": {
+              "title": "query_bot",
+              "description": "value of lang item type 'query_bot'",
+              "type": "string"
+            }
+          }
+        },
+        "warning": {
+          "title": "Warning",
+          "description": "Scope 'warning' of lang item",
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "unverified": {
+              "title": "unverified",
+              "description": "value of lang item type 'unverified'",
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "error": {
+      "title": "Error",
+      "description": "Scope 'error' of lang item",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "MessageFormatError": {
+          "title": "Messageformaterror",
+          "description": "Scope 'MessageFormatError' of lang item",
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "TETR.IO": {
+              "title": "TETR.IO",
+              "description": "value of lang item type 'TETR.IO'",
+              "type": "string"
+            },
+            "TOS": {
+              "title": "TOS",
+              "description": "value of lang item type 'TOS'",
+              "type": "string"
+            },
+            "TOP": {
+              "title": "TOP",
+              "description": "value of lang item type 'TOP'",
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  }
+}

nonebot_plugin_tetris_stats/i18n/.template.json

@@ -0,0 +1,16 @@
+{
+  "$schema": ".template.schema.json",
+  "scopes": [
+    {
+      "scope": "interaction",
+      "types": [
+        { "subtype": "wrong", "types": ["query_bot"] },
+        { "subtype": "warning", "types": ["unverified"] }
+      ]
+    },
+    {
+      "scope": "error",
+      "types": [{ "subtype": "MessageFormatError", "types": ["TETR.IO", "TOS", "TOP"] }]
+    }
+  ]
+}

nonebot_plugin_tetris_stats/i18n/.template.schema.json

@@ -0,0 +1,54 @@
+{
+  "title": "Template",
+  "description": "Template for lang items to generate schema for lang files",
+  "type": "object",
+  "properties": {
+    "scopes": {
+      "title": "Scopes",
+      "description": "All scopes of lang items",
+      "type": "array",
+      "uniqueItems": true,
+      "items": {
+        "title": "Scope",
+        "description": "First level of all lang items",
+        "type": "object",
+        "properties": {
+          "scope": {
+            "type": "string",
+            "description": "Scope name"
+          },
+          "types": {
+            "type": "array",
+            "description": "All types of lang items",
+            "uniqueItems": true,
+            "items": {
+              "oneOf": [
+                {
+                  "type": "string",
+                  "description": "Value of lang item"
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "subtype": {
+                      "type": "string",
+                      "description": "Subtype name of lang item"
+                    },
+                    "types": {
+                      "type": "array",
+                      "description": "All subtypes of lang items",
+                      "uniqueItems": true,
+                      "items": {
+                        "$ref": "#/properties/scopes/items/properties/types/items"
+                      }
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      }
+    }
+  }
+}

nonebot_plugin_tetris_stats/i18n/__init__.py

@@ -0,0 +1,12 @@
+# This file is @generated by tarina.lang CLI tool
+# It is not intended for manual editing.
+
+# ruff: noqa: E402, F401, PLC0414
+
+from pathlib import Path
+
+from tarina.lang import lang  # type: ignore[import-untyped]
+
+lang.load(Path(__file__).parent)
+
+from .model import Lang as Lang

nonebot_plugin_tetris_stats/i18n/en-US.json

@@ -0,0 +1,16 @@
+{
+  "$schema": ".lang.schema.json",
+  "interaction": {
+    "wrong": { "query_bot": "Can't query bot's information" },
+    "warning": {
+      "unverified": "* Because I can't verify account linking information, I can't guarantee the info I found is yourself/themself."
+    }
+  },
+  "error": {
+    "MessageFormatError": {
+      "TETR.IO": "Username/ID is invalid",
+      "TOS": "Username/ID is invalid",
+      "TOP": "Username is invalid"
+    }
+  }
+}

nonebot_plugin_tetris_stats/i18n/model.py

@@ -0,0 +1,32 @@
+# This file is @generated by tarina.lang CLI tool
+# It is not intended for manual editing.
+
+from tarina.lang.model import LangItem, LangModel  # type: ignore[import-untyped]
+
+
+class InteractionWrong:
+    query_bot: LangItem = LangItem('interaction', 'wrong.query_bot')
+
+
+class InteractionWarning:
+    unverified: LangItem = LangItem('interaction', 'warning.unverified')
+
+
+class Interaction:
+    wrong = InteractionWrong
+    warning = InteractionWarning
+
+
+class ErrorMessageformaterror:
+    TETR_IO: LangItem = LangItem('error', 'MessageFormatError.TETR.IO')
+    TOS: LangItem = LangItem('error', 'MessageFormatError.TOS')
+    TOP: LangItem = LangItem('error', 'MessageFormatError.TOP')
+
+
+class Error:
+    MessageFormatError = ErrorMessageformaterror
+
+
+class Lang(LangModel):
+    interaction = Interaction
+    error = Error

nonebot_plugin_tetris_stats/i18n/zh-CN.json

@@ -0,0 +1,14 @@
+{
+  "$schema": ".lang.schema.json",
+  "interaction": {
+    "wrong": { "query_bot": "不能查询bot的信息" },
+    "warning": { "unverified": "* 由于无法验证绑定信息, 不能保证查询到的用户为本人" }
+  },
+  "error": {
+    "MessageFormatError": {
+      "TETR.IO": "用户名/ID不合法",
+      "TOS": "用户名/ID不合法",
+      "TOP": "用户名不合法"
+    }
+  }
+}

nonebot_plugin_tetris_stats/utils/browser.py

@@ -1,12 +1,14 @@
 import sys
+from collections.abc import Callable, Coroutine
 from os import environ
 from platform import system
 from re import sub
+from typing import Any, ClassVar
 
 from nonebot import get_driver
 from nonebot.log import logger
 from playwright.__main__ import main
-from playwright.async_api import Browser, async_playwright
+from playwright.async_api import Browser, BrowserContext, async_playwright
 
 driver = get_driver()
 
@@ -27,6 +29,7 @@ class BrowserManager:
     """浏览器管理类"""
 
     _browser: Browser | None = None
+    _contexts: ClassVar[dict[str, BrowserContext]] = {}
 
     @classmethod
     async def init_playwright(cls) -> None:
@@ -72,7 +75,11 @@ class BrowserManager:
     async def _start_browser(cls) -> Browser:
         """启动浏览器实例"""
         playwright = await async_playwright().start()
-        cls._browser = await playwright.firefox.launch()
+        cls._browser = await playwright.firefox.launch(
+            firefox_user_prefs={
+                'network.http.max-persistent-connections-per-server': 64,
+            },
+        )
         return cls._browser
 
     @classmethod
@@ -80,8 +87,26 @@ class BrowserManager:
         """获取浏览器实例"""
         return cls._browser or await cls._start_browser()
 
+    @classmethod
+    async def get_context(
+        cls, context_id: str = 'default', factory: Callable[[], Coroutine[Any, Any, BrowserContext]] | None = None
+    ) -> BrowserContext:
+        """获取浏览器上下文"""
+        return cls._contexts.setdefault(
+            context_id, await factory() if factory is not None else await (await cls.get_browser()).new_context()
+        )
+
+    @classmethod
+    async def del_context(cls, context_id: str) -> None:
+        """删除浏览器上下文"""
+        if context_id in cls._contexts:
+            await cls._contexts[context_id].close()
+            del cls._contexts[context_id]
+
     @classmethod
     async def close_browser(cls) -> None:
         """关闭浏览器实例"""
+        for i in cls._contexts.values():
+            await i.close()
         if isinstance(cls._browser, Browser):
             await cls._browser.close()

nonebot_plugin_tetris_stats/utils/host.py

@@ -1,17 +1,21 @@
+from functools import cache
 from hashlib import sha256
 from ipaddress import IPv4Address, IPv6Address
+from pathlib import Path as FilePath
 from typing import TYPE_CHECKING, ClassVar, Literal
 
-from fastapi import FastAPI, Path, status
+from aiofiles import open
+from fastapi import BackgroundTasks, 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 yarl import URL
 
 from ..config.config import CACHE_PATH
+from ..games.tetrio.api.cache import request
 from .image import img_to_png
-from .request import Request
+from .templates import TEMPLATES_DIR
-from .templates import templates_dir
 
 if TYPE_CHECKING:
     from pydantic import IPvAnyAddress
@@ -22,6 +26,7 @@ driver = get_driver()
 
 global_config = driver.config
 
+BASE_URL = URL('https://tetr.io/user-content/')
 
 if not isinstance(app, FastAPI):
     msg = '本插件需要 FastAPI 驱动器才能运行'
@@ -48,14 +53,14 @@ class HostPage:
 def _():
     app.mount(
         '/host/assets',
-        StaticFiles(directory=templates_dir / 'assets'),
+        StaticFiles(directory=TEMPLATES_DIR / 'assets'),
         name='assets',
     )
     logger.success('assets mounted')
 
 
 @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
@@ -63,20 +68,30 @@ async def _(page_hash: str) -> HTMLResponse:
 
 @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}$')
+    resource_type: Literal['avatars', 'banners'],
+    revision: int,
+    background_tasks: BackgroundTasks,
+    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)
+        image = img_to_png(
-        path.write_bytes(
+            await request.request(
-            img_to_png(
+                BASE_URL / resource_type / f'{user_id}.jpg' % {'rv': revision},
-                await Request.request(
+                is_json=False,
-                    f'https://tetr.io/user-content/{resource_type}/{user_id}.jpg?rv={revision}', is_json=False
-                )
             )
         )
+        background_tasks.add_task(write_cache, path=path, data=image)
+        return Response(content=image, media_type='image/png')
     return FileResponse(path)
 
 
+async def write_cache(path: FilePath, data: bytes) -> None:
+    path.parent.mkdir(parents=True, exist_ok=True)
+    async with open(path, 'wb') as file:
+        await file.write(data)
+
+
+@cache
 def get_self_netloc() -> str:
     host: IPv4Address | IPv6Address | IPvAnyAddress = global_config.host
     if isinstance(host, IPv4Address):

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/limit.py

@@ -0,0 +1,33 @@
+from asyncio import Lock, sleep
+from collections.abc import Callable, Coroutine
+from datetime import timedelta
+from functools import wraps
+from time import time
+from typing import Any, ParamSpec, TypeVar
+
+from nonebot.log import logger
+
+P = ParamSpec('P')
+T = TypeVar('T')
+
+
+def limit(limit: timedelta) -> Callable[[Callable[P, Coroutine[Any, Any, T]]], Callable[P, Coroutine[Any, Any, T]]]:
+    limit_seconds = limit.total_seconds()
+
+    def decorator(func: Callable[P, Coroutine[Any, Any, T]]) -> Callable[P, Coroutine[Any, Any, T]]:
+        last_call = 0.0
+        lock = Lock()
+
+        @wraps(func)
+        async def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
+            nonlocal last_call
+            async with lock:
+                if (diff := (time() - last_call)) < limit_seconds:
+                    logger.debug(f'func: {func.__name__} trigger limit, wait {(limit_time:=limit_seconds-diff):.3f}s')
+                    await sleep(limit_time)
+            last_call = time()
+            return await func(*args, **kwargs)
+
+        return wrapper
+
+    return decorator

nonebot_plugin_tetris_stats/utils/render/__init__.py

@@ -3,59 +3,73 @@ from typing import Literal, overload
 from jinja2 import Environment, FileSystemLoader
 from nonebot.compat import PYDANTIC_V2
 
-from ..templates import templates_dir
+from ..templates import TEMPLATES_DIR
 from .schemas.bind import Bind
-from .schemas.tetrio_info import Info as TETRIOInfo
+from .schemas.tetrio.rank.detail import Data as TETRIORankDetailData
-from .schemas.tetrio_info_v2 import Info as TETRIOInfoV2
+from .schemas.tetrio.rank.v1 import Data as TETRIORankDataV1
-from .schemas.tetrio_record_blitz import Record as TETRIORecordBlitz
+from .schemas.tetrio.rank.v2 import Data as TETRIORankDataV2
-from .schemas.tetrio_record_sprint import Record as TETRIORecordSprint
+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
 
 env = Environment(
-    loader=FileSystemLoader(templates_dir), autoescape=True, trim_blocks=True, lstrip_blocks=True, enable_async=True
+    loader=FileSystemLoader(TEMPLATES_DIR), autoescape=True, trim_blocks=True, lstrip_blocks=True, enable_async=True
 )
 
 
 @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
 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: ...
-
-
 @overload
-async def render(render_type: Literal['v2/tetrio/info'], data: TETRIOInfoV2) -> str: ...
+async def render(render_type: Literal['v2/tetrio/user/info'], data: TETRIOUserInfoV2) -> str: ...
-
+@overload
-
+async def render(render_type: Literal['v2/tetrio/user/list'], data: TETRIOUserListV2) -> str: ...
 @overload
 async def render(render_type: Literal['v2/tetrio/record/40l'], data: TETRIORecordSprint) -> str: ...
-
-
 @overload
 async def render(render_type: Literal['v2/tetrio/record/blitz'], data: TETRIORecordBlitz) -> str: ...
+@overload
+async def render(render_type: Literal['v2/tetrio/rank'], data: TETRIORankDataV2) -> str: ...
+@overload
+async def render(render_type: Literal['v2/tetrio/rank/detail'], data: TETRIORankDetailData) -> str: ...
 
 
 async def render(
     render_type: Literal[
         'v1/binding',
         'v1/tetrio/info',
+        'v1/tetrio/rank',
         'v1/top/info',
         'v1/tos/info',
-        'v2/tetrio/info',
+        'v2/tetrio/user/info',
+        'v2/tetrio/user/list',
         'v2/tetrio/record/40l',
         'v2/tetrio/record/blitz',
+        'v2/tetrio/rank',
+        'v2/tetrio/rank/detail',
     ],
-    data: Bind | TETRIOInfo | TOPInfo | TOSInfo | TETRIOInfoV2 | TETRIORecordSprint | TETRIORecordBlitz,
+    data: Bind
+    | TETRIOUserInfoV1
+    | TETRIORankDataV1
+    | TOPInfo
+    | TOSInfo
+    | TETRIOUserInfoV2
+    | TETRIOUserListV2
+    | TETRIORecordSprint
+    | TETRIORecordBlitz
+    | TETRIORankDataV2
+    | TETRIORankDetailData,
 ) -> str:
     if PYDANTIC_V2:
         return await env.get_template('index.html').render_async(

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)