🔖 1.12.1

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

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

.github/workflows/Release.yml

@@ -3,7 +3,7 @@ name: Release CI
 on:
   push:
     tags:
-      - "*"
+      - '*'
 
 jobs:
   release:
@@ -12,17 +12,17 @@ jobs:
       id-token: write
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v7
         name: Setup UV
         with:
           enable-cache: true
 
-      - name: "Set up Python"
-        uses: actions/setup-python@v5
+      - name: 'Set up Python'
+        uses: actions/setup-python@v6
         with:
-          python-version-file: ".python-version"
+          python-version-file: '.python-version'
 
       - run: uv sync
         shell: bash

.github/workflows/Test.yml

@@ -0,0 +1,57 @@
+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", "3.14"]
+        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@v6
+
+      - name: Setup uv
+        uses: astral-sh/setup-uv@v7
+        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@v5
+        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@a638d6464689bbb24c325bb3fe9404d63a913030
+        with:
+          jobs: ${{ toJSON(needs) }}

.github/workflows/TypeCheck.yml

@@ -7,17 +7,17 @@ jobs:
   TypeCheck:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v7
         name: Setup UV
         with:
           enable-cache: true
 
-      - name: "Set up Python"
-        uses: actions/setup-python@v5
+      - name: 'Set up Python'
+        uses: actions/setup-python@v6
         with:
-          python-version-file: ".python-version"
+          python-version-file: '.python-version'
 
       - run: uv sync
         shell: bash

.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
-      uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v6
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: ${{ matrix.language }}
-        # 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.
-        # 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
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v4
+        with:
+          languages: ${{ matrix.language }}
+          # 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.
+          # Prefix the list here with "+" to use these queries and those in the config file.
 
-        
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+          # 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
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v4
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    # - run: |
-    #   echo "Run, Build Application using script"
-    #   ./location_of_script_within_repo/buildscript.sh
+      #   If the Autobuild fails above, remove it and uncomment the following three lines.
+      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      # - run: |
+      #   echo "Run, Build Application using script"
+      #   ./location_of_script_within_repo/buildscript.sh
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v4

.gitignore

@@ -1,24 +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*
-*copy*
-.vscode
-*dev*
-*_cache*
-*backup*
-*.pyc
-node_modules
-.prettier*
-package.json
-pnpm-lock.yaml
-*.drawio.svg
-package-lock.json
-*Zone.Identifier
-.env*
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# 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
-*.fish
-extracted_skin_mino_*
-sample_*
+.env*
+
+# Misc
+ignore_*
+*.backup
 TODO*

.pre-commit-config.yaml

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

CONTRIBUTING.en-US.md

@@ -42,7 +42,7 @@ This project uses [Tarina](https://github.com/ArcletProject/Tarina) for internat
 #### 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.
+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

CONTRIBUTING.md

@@ -24,7 +24,7 @@ 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
@@ -41,7 +41,7 @@ mypy ./nonebot_plugin_tetris_stats/
 #### 添加新的语言
 
 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) 的规范。
+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` 文件。
 
 #### 更新已有语言

README.md

@@ -41,10 +41,10 @@
     alt="Gitmoji"
   />
 </a>
-<a href="https://wakatime.com/badge/user/138b2226-8e02-42be-b99d-35c05198836f/project/65f5bdf7-45ec-479a-8dd2-18c498c910ca">
-  <img
-    src="https://wakatime.com/badge/user/138b2226-8e02-42be-b99d-35c05198836f/project/65f5bdf7-45ec-479a-8dd2-18c498c910ca.svg"
-    alt="wakatime"
+<a href="https://wakatime.com/badge/user/138b2226-8e02-42be-b99d-35c05198836f/project/e26c7985-a236-4e76-90a6-a72f71d305ef">
+    <img 
+        src="https://wakatime.com/badge/user/138b2226-8e02-42be-b99d-35c05198836f/project/e26c7985-a236-4e76-90a6-a72f71d305ef.svg"
+        alt="wakatime"
     />
 </a>
 </p>

nonebot_plugin_tetris_stats/__init__.py

@@ -6,10 +6,9 @@ require_plugins = {
     'nonebot_plugin_apscheduler',
     'nonebot_plugin_localstore',
     'nonebot_plugin_orm',
-    'nonebot_plugin_session_orm',
-    'nonebot_plugin_session',
+    'nonebot_plugin_uninfo',
     'nonebot_plugin_user',
-    'nonebot_plugin_userinfo',
+    'nonebot_plugin_waiter',
 }
 
 for i in require_plugins:

nonebot_plugin_tetris_stats/config/config.py

@@ -1,4 +1,6 @@
-from nonebot import get_plugin_config
+from pathlib import Path
+
+from nonebot import get_driver, get_plugin_config
 from nonebot_plugin_localstore import get_plugin_cache_dir, get_plugin_data_dir
 from pydantic import BaseModel, Field
 
@@ -14,10 +16,17 @@ class Proxy(BaseModel):
     top: str | None = None
 
 
+class Dev(BaseModel):
+    enabled: bool = False
+    template_path: Path | None = None
+    enable_template_check: bool = True
+
+
 class ScopedConfig(BaseModel):
     request_timeout: float = 30.0
     screenshot_quality: float = 2
     proxy: Proxy = Field(default_factory=Proxy)
+    dev: Dev = Field(default_factory=Dev)
 
 
 class Config(BaseModel):
@@ -25,3 +34,4 @@ class Config(BaseModel):
 
 
 config = get_plugin_config(Config)
+global_config = get_driver().config

nonebot_plugin_tetris_stats/config/migrations/09d4bb60160d_rename_field.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
         batch_op.alter_column('create_time', new_column_name='update_time', existing_type=sa.DateTime())
@@ -41,6 +43,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
         batch_op.alter_column('update_time', new_column_name='create_time')

nonebot_plugin_tetris_stats/config/migrations/0d50142b780f_add_field.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
         batch_op.add_column(sa.Column('file_hash', sa.String(length=128), nullable=True))
@@ -38,6 +40,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
         batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_iorank_file_hash'))

nonebot_plugin_tetris_stats/config/migrations/1c5346b657d4_fix_json_storage.py

@@ -0,0 +1,160 @@
+"""fix json storage
+
+迁移 ID: 1c5346b657d4
+父迁移: 2ff388a8c486
+创建时间: 2026-01-30 03:35:00
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import msgspec
+import sqlalchemy as sa
+from alembic import op
+from nonebot.log import logger
+from sqlalchemy.dialects.postgresql import ARRAY, JSONB
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+    from sqlalchemy.engine import Connection
+
+_LOG_INTERVAL = 10000
+_BATCH_SIZE = 1000
+_PG_CHUNK_SIZE = 50000
+_SQLITE_FETCH_SIZE = 500
+
+revision: str = '1c5346b657d4'
+down_revision: str | Sequence[str] | None = '2ff388a8c486'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+tables: dict[str, list[str]] = {
+    'nb_t_io_tl_stats_field': [
+        'low_pps',
+        'low_apm',
+        'low_vs',
+        'high_pps',
+        'high_apm',
+        'high_vs',
+    ],
+    'nb_t_io_hist_data': ['data'],
+    'nb_t_top_hist_data': ['data'],
+    'nb_t_tos_hist_data': ['data'],
+    'nb_t_io_tl_hist': ['data'],
+}
+
+
+def _pg_convert_column(conn: Connection, table: str, column: str) -> None:
+    tbl = sa.table(table, sa.column('id'), sa.column(column))
+    col = getattr(tbl.c, column)
+    path = sa.cast(sa.literal('{}'), ARRAY(sa.Text))
+    payload = sa.cast(sa.cast(col, JSONB).op('#>>')(path), sa.JSON)
+    base = sa.func.json_typeof(col) == 'string'
+    min_max_stmt = sa.select(sa.func.min(tbl.c.id), sa.func.max(tbl.c.id)).where(base)
+    result = conn.execute(min_max_stmt).one()
+    if result[0] is None or result[1] is None:
+        return
+    start_id, end_id = result
+    total = end_id - start_id + 1
+    processed = 0
+    context = op.get_context()
+    with context.autocommit_block():
+        for chunk_start in range(start_id, end_id + 1, _PG_CHUNK_SIZE):
+            chunk_end = min(chunk_start + _PG_CHUNK_SIZE - 1, end_id)
+            stmt = (
+                sa.update(tbl).values({column: payload}).where(base).where(sa.between(tbl.c.id, chunk_start, chunk_end))
+            )
+            conn.execute(stmt)
+            processed += chunk_end - chunk_start + 1
+            logger.warning(
+                f'tetris_stats: converting {table}.{column} chunk {chunk_start}-{chunk_end} '
+                f'processed={processed}/{total}'
+            )
+    remaining_stmt = sa.select(sa.func.count()).select_from(tbl).where(base)
+    remaining = conn.execute(remaining_stmt).scalar()
+    if remaining:
+        msg = f'json storage fix failed: {table}.{column} still has string rows'
+        raise ValueError(msg)
+
+
+def _pg_convert(conn: Connection) -> None:
+    for table, columns in tables.items():
+        for column in columns:
+            logger.warning(f'tetris_stats: converting {table}.{column} from json string to object')
+            _pg_convert_column(conn, table, column)
+
+
+def _convert_table_python(conn: Connection, table_name: str, columns: list[str]) -> None:  # noqa: C901
+    meta = sa.MetaData()
+    table = sa.Table(table_name, meta, autoload_with=conn)
+    update_stmt = (
+        table.update().where(table.c.id == sa.bindparam('b_id')).values(**{col: sa.bindparam(col) for col in columns})
+    )
+    batch: list[dict[str, object]] = []
+    last_id = 0
+    processed = 0
+    while True:
+        rows = (
+            conn.execute(
+                sa.select(table.c.id, *[table.c[col] for col in columns])
+                .where(table.c.id > last_id)
+                .order_by(table.c.id)
+                .limit(_SQLITE_FETCH_SIZE)
+            )
+            .mappings()
+            .all()
+        )
+        if not rows:
+            break
+        for row in rows:
+            last_id = row['id']
+            processed += 1
+            update_values: dict[str, object] = {'b_id': row['id']}
+            changed = False
+            for column in columns:
+                value = row[column]
+                if isinstance(value, str | bytes):
+                    parsed = msgspec.json.decode(value)
+                    if not isinstance(parsed, dict | list):
+                        msg = f'json storage fix failed: {table_name}.{column} value is not object'
+                        raise TypeError(msg)
+                    update_values[column] = parsed
+                    changed = True
+                elif isinstance(value, dict | list):
+                    update_values[column] = value
+                else:
+                    msg = f'json storage fix failed: {table_name}.{column} invalid type {type(value)}'
+                    raise TypeError(msg)
+            if changed:
+                batch.append(update_values)
+            if processed % _LOG_INTERVAL == 0:
+                logger.warning(f'tetris_stats: converting {table_name} processed={processed}')
+            if len(batch) >= _BATCH_SIZE:
+                conn.execute(update_stmt, batch)
+                batch.clear()
+    if batch:
+        conn.execute(update_stmt, batch)
+
+
+def _generic_convert(conn: Connection) -> None:
+    for table, columns in tables.items():
+        logger.warning(f'tetris_stats: converting {table} via python')
+        _convert_table_python(conn, table, columns)
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    conn = op.get_bind()
+    if conn.dialect.name == 'postgresql':
+        _pg_convert(conn)
+    else:
+        _generic_convert(conn)
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/2ff388a8c486_add_verify_field.py

@@ -0,0 +1,42 @@
+"""add verify field
+
+迁移 ID: 2ff388a8c486
+父迁移: 3588702dd3a4
+创建时间: 2025-07-22 18:09:09.734164
+
+"""
+
+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 = '2ff388a8c486'
+down_revision: str | Sequence[str] | None = '3588702dd3a4'
+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('nb_t_bind', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('verify', sa.Boolean(), nullable=False, server_default='false'))
+
+    # ### end Alembic commands ###
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('nb_t_bind', schema=None) as batch_op:
+        batch_op.drop_column('verify')
+
+    # ### end Alembic commands ###

nonebot_plugin_tetris_stats/config/migrations/3588702dd3a4_modify_field_length.py

@@ -0,0 +1,52 @@
+"""modify field length
+
+迁移 ID: 3588702dd3a4
+父迁移: bc6abd57928f
+创建时间: 2025-07-19 17:21:17.927162
+
+"""
+
+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 = '3588702dd3a4'
+down_revision: str | Sequence[str] | None = 'bc6abd57928f'
+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('nb_t_tos_hist_data', schema=None) as batch_op:
+        batch_op.alter_column(
+            'user_unique_identifier',
+            existing_type=sa.VARCHAR(length=24),
+            type_=sa.String(length=256),
+            existing_nullable=False,
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('nb_t_tos_hist_data', schema=None) as batch_op:
+        batch_op.alter_column(
+            'user_unique_identifier',
+            existing_type=sa.String(length=256),
+            type_=sa.VARCHAR(length=24),
+            existing_nullable=False,
+        )
+
+    # ### end Alembic commands ###

nonebot_plugin_tetris_stats/config/migrations/3a294ff14610_add_io_tl_map.py

@@ -0,0 +1,353 @@
+"""add io tl map
+
+迁移 ID: 3a294ff14610
+父迁移: 6ecf383d646a
+创建时间: 2026-01-28 03:25:40.714853
+
+"""
+
+from __future__ import annotations
+
+import os
+import re
+import time
+from typing import TYPE_CHECKING
+
+import sqlalchemy as sa
+from alembic import op
+from nonebot.log import logger
+from rich.progress import (
+    BarColumn,
+    MofNCompleteColumn,
+    Progress,
+    ProgressColumn,
+    Task,
+    TaskProgressColumn,
+    TextColumn,
+    TimeRemainingColumn,
+    filesize,
+)
+from rich.text import Text
+from sqlalchemy import Connection, text
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+from typing_extensions import override
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = '3a294ff14610'
+down_revision: str | Sequence[str] | None = '6ecf383d646a'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+class RateColumn(ProgressColumn):
+    """Renders human readable processing rate."""
+
+    @override
+    def render(self, task: Task) -> Text:
+        """Render the speed in iterations per second."""
+
+        def calculate_speed() -> float | None:
+            now = time.monotonic()
+
+            if task.start_time is not None:
+                elapsed = (task.finished_time or now) - task.start_time
+                if elapsed > 0:
+                    return task.completed / elapsed
+            return None
+
+        speed = task.finished_speed or task.speed or calculate_speed()
+
+        if speed is None:
+            return Text('', style='progress.percentage')
+        unit, suffix = filesize.pick_unit_and_suffix(
+            int(speed),
+            ['', '×10³', '×10⁶', '×10⁹', '×10¹²'],  # noqa: RUF001
+            1000,
+        )
+        data_speed = speed / unit
+        return Text(f'{data_speed:.1f}{suffix} it/s', style='progress.percentage')
+
+
+def _backfill_postgresql(conn: Connection, chunk_size: int = 20000) -> None:
+    result = conn.execute(text('SELECT min(id), max(id) FROM nb_t_io_tl_hist')).one()
+    if result[0] is None or result[1] is None:
+        return
+    min_id, max_id = result
+    total = max_id - min_id + 1
+
+    logger.warning('PG backfill: Disabling foreign key constraints...')
+
+    work_mem = os.getenv('TETRIS_STATS_MIGRATION_WORK_MEM', '256MB')
+    if not re.fullmatch(r'\d+(kB|MB|GB)', work_mem):
+        work_mem = '256MB'
+    conn.execute(
+        text("SELECT set_config('work_mem', :work_mem, true)"),
+        {'work_mem': work_mem},
+    )
+    temp_buffers = os.getenv('TETRIS_STATS_MIGRATION_TEMP_BUFFERS', '128MB')
+    if not re.fullmatch(r'\d+(kB|MB|GB)', temp_buffers):
+        temp_buffers = '128MB'
+    conn.execute(
+        text("SELECT set_config('temp_buffers', :temp_buffers, true)"),
+        {'temp_buffers': temp_buffers},
+    )
+    conn.execute(text('SET LOCAL synchronous_commit = off'))
+
+    logger.warning('tetris_stats: PG backfill synchronous_commit=off')
+    logger.warning(f'tetris_stats: PG backfill work_mem={work_mem}')
+    logger.warning(f'tetris_stats: PG backfill temp_buffers={temp_buffers}')
+
+    conn.execute(text('SET LOCAL max_parallel_workers_per_gather = 8'))
+    conn.execute(text('SET LOCAL parallel_setup_cost = 10'))
+    conn.execute(text('SET LOCAL parallel_tuple_cost = 0.01'))
+
+    logger.warning('tetris_stats: PG backfill max_parallel_workers_per_gather=8')
+    logger.warning('tetris_stats: PG backfill parallel_setup_cost=10')
+    logger.warning('tetris_stats: PG backfill parallel_tuple_cost=0.01')
+
+    with Progress(
+        TextColumn('[progress.description]{task.description}'),
+        BarColumn(),
+        MofNCompleteColumn(),
+        TaskProgressColumn(),
+        RateColumn(),
+        TimeRemainingColumn(),
+    ) as progress:
+        task = progress.add_task('生成索引...', total=total)
+        for start_id in range(min_id, max_id + 1, chunk_size):
+            end_id = min(start_id + chunk_size - 1, max_id)
+            conn.execute(
+                text(
+                    """
+                    WITH entries AS (
+                        SELECT
+                            h.stats_id,
+                            h.id AS hist_id,
+                            e.ordinality - 1 AS entry_index,
+                            COALESCE(e.entry->>'_id', e.entry->>'id') AS uid_str
+                        FROM nb_t_io_tl_hist h
+                        CROSS JOIN LATERAL jsonb_array_elements(h.data::jsonb->'data'->'entries')
+                            WITH ORDINALITY AS e(entry, ordinality)
+                        WHERE h.id BETWEEN :start_id AND :end_id
+                        AND COALESCE(e.entry->>'_id', e.entry->>'id') IS NOT NULL
+                    ),
+                    upserted_uids AS (
+                        INSERT INTO nb_t_io_uid (user_unique_identifier)
+                        SELECT DISTINCT uid_str FROM entries
+                        ON CONFLICT (user_unique_identifier)
+                        DO UPDATE SET user_unique_identifier = EXCLUDED.user_unique_identifier
+                        RETURNING id, user_unique_identifier
+                    )
+                    INSERT INTO nb_t_io_tl_map (stats_id, uid_id, hist_id, entry_index)
+                    SELECT e.stats_id, u.id, e.hist_id, e.entry_index
+                    FROM entries e
+                    JOIN upserted_uids u ON u.user_unique_identifier = e.uid_str
+                """
+                ),
+                {'start_id': start_id, 'end_id': end_id},
+            )
+            progress.update(task, advance=end_id - start_id + 1)
+
+
+def _add_foreign_keys_postgresql(conn: Connection) -> None:
+    logger.warning('PG backfill: Re-adding foreign key constraints (validating)...')
+
+    conn.execute(
+        text("""
+        ALTER TABLE nb_t_io_tl_map
+        ADD CONSTRAINT fk_nb_t_io_tl_map_hist_id_nb_t_io_tl_hist
+        FOREIGN KEY (hist_id) REFERENCES nb_t_io_tl_hist(id)
+        NOT VALID
+    """)
+    )
+    conn.execute(
+        text("""
+        ALTER TABLE nb_t_io_tl_map
+        VALIDATE CONSTRAINT fk_nb_t_io_tl_map_hist_id_nb_t_io_tl_hist
+    """)
+    )
+
+    conn.execute(
+        text("""
+        ALTER TABLE nb_t_io_tl_map
+        ADD CONSTRAINT fk_nb_t_io_tl_map_stats_id_nb_t_io_tl_stats
+        FOREIGN KEY (stats_id) REFERENCES nb_t_io_tl_stats(id)
+        NOT VALID
+    """)
+    )
+    conn.execute(
+        text("""
+        ALTER TABLE nb_t_io_tl_map
+        VALIDATE CONSTRAINT fk_nb_t_io_tl_map_stats_id_nb_t_io_tl_stats
+    """)
+    )
+
+    conn.execute(
+        text("""
+        ALTER TABLE nb_t_io_tl_map
+        ADD CONSTRAINT fk_nb_t_io_tl_map_uid_id_nb_t_io_uid
+        FOREIGN KEY (uid_id) REFERENCES nb_t_io_uid(id)
+        NOT VALID
+    """)
+    )
+    conn.execute(
+        text("""
+        ALTER TABLE nb_t_io_tl_map
+        VALIDATE CONSTRAINT fk_nb_t_io_tl_map_uid_id_nb_t_io_uid
+    """)
+    )
+
+    logger.success('PG backfill: Foreign keys validated successfully')
+
+
+def _backfill_generic(conn: Connection) -> None:
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Hist = Base.classes.nb_t_io_tl_hist  # noqa: N806
+    Uid = Base.classes.nb_t_io_uid  # noqa: N806
+    Map = Base.classes.nb_t_io_tl_map  # noqa: N806
+
+    with Session(conn) as session:
+        count = session.query(Hist).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在生成 TETR.IO 玩家分页索引, 请不要关闭程序...')
+        uid_map: dict[str, int] = {}
+
+        def refresh_uid_map() -> None:
+            uids = session.query(Uid).all()
+            uid_map.clear()
+            uid_map.update({uid.user_unique_identifier: uid.id for uid in uids})
+
+        with Progress(
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            MofNCompleteColumn(),
+            TaskProgressColumn(),
+            RateColumn(),
+            TimeRemainingColumn(),
+        ) as progress:
+            total = progress.add_task('生成索引...', total=count)
+            for hist in session.query(Hist).yield_per(1):
+                data = hist.data
+                if isinstance(data, str | bytes):
+                    msg = 'io tl map migration requires json object data'
+                    raise TypeError(msg)
+                entries = data.get('data', {}).get('entries', []) if isinstance(data, dict) else []
+                entry_info: list[tuple[str, int]] = []
+                for index, entry in enumerate(entries):
+                    if isinstance(entry, dict):
+                        uid = entry.get('_id')
+                        if isinstance(uid, str):
+                            entry_info.append((uid, index))
+                if not entry_info:
+                    progress.update(total, advance=1)
+                    continue
+
+                session.add_all([Uid(user_unique_identifier=uid) for uid, _ in entry_info if uid not in uid_map])
+                session.flush()
+                refresh_uid_map()
+                session.add_all(
+                    [
+                        Map(
+                            stats_id=hist.stats_id,
+                            uid_id=uid_map[uid],
+                            hist_id=hist.id,
+                            entry_index=index,
+                        )
+                        for uid, index in entry_info
+                    ]
+                )
+                session.flush()
+                progress.update(total, advance=1)
+
+
+def backfill_mapping(conn: Connection) -> None:
+    if conn.dialect.name == 'postgresql':
+        logger.warning('tetris_stats: 检测到 PostgreSQL, 使用快速索引回填...')
+        _backfill_postgresql(conn)
+        _add_foreign_keys_postgresql(conn)
+        return
+    _backfill_generic(conn)
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    conn = op.get_bind()
+    op.create_table(
+        'nb_t_io_uid',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_unique_identifier', sa.String(length=24), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_io_uid')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_io_uid', schema=None) as batch_op:
+        batch_op.create_index(
+            batch_op.f('ix_nb_t_io_uid_user_unique_identifier'),
+            ['user_unique_identifier'],
+            unique=True,
+        )
+
+    if conn.dialect.name == 'postgresql':
+        op.create_table(
+            'nb_t_io_tl_map',
+            sa.Column('id', sa.Integer(), nullable=False),
+            sa.Column('stats_id', sa.Integer(), nullable=False),
+            sa.Column('uid_id', sa.Integer(), nullable=False),
+            sa.Column('hist_id', sa.Integer(), nullable=False),
+            sa.Column('entry_index', sa.Integer(), nullable=False),
+            sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_io_tl_map')),
+            sa.UniqueConstraint('uid_id', 'hist_id', name='uq_nb_t_io_tl_map_uid_hist'),
+            info={'bind_key': 'nonebot_plugin_tetris_stats'},
+        )
+    else:
+        op.create_table(
+            'nb_t_io_tl_map',
+            sa.Column('id', sa.Integer(), nullable=False),
+            sa.Column('stats_id', sa.Integer(), nullable=False),
+            sa.Column('uid_id', sa.Integer(), nullable=False),
+            sa.Column('hist_id', sa.Integer(), nullable=False),
+            sa.Column('entry_index', sa.Integer(), nullable=False),
+            sa.ForeignKeyConstraint(
+                ['stats_id'],
+                ['nb_t_io_tl_stats.id'],
+                name=op.f('fk_nb_t_io_tl_map_stats_id_nb_t_io_tl_stats'),
+            ),
+            sa.ForeignKeyConstraint(
+                ['uid_id'],
+                ['nb_t_io_uid.id'],
+                name=op.f('fk_nb_t_io_tl_map_uid_id_nb_t_io_uid'),
+            ),
+            sa.ForeignKeyConstraint(
+                ['hist_id'],
+                ['nb_t_io_tl_hist.id'],
+                name=op.f('fk_nb_t_io_tl_map_hist_id_nb_t_io_tl_hist'),
+            ),
+            sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_io_tl_map')),
+            sa.UniqueConstraint('uid_id', 'hist_id', name='uq_nb_t_io_tl_map_uid_hist'),
+            info={'bind_key': 'nonebot_plugin_tetris_stats'},
+        )
+    backfill_mapping(conn)
+
+    with op.batch_alter_table('nb_t_io_tl_map', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_io_tl_map_stats_id'), ['stats_id'], unique=False)
+        batch_op.create_index(batch_op.f('ix_nb_t_io_tl_map_uid_id'), ['uid_id'], unique=False)
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    with op.batch_alter_table('nb_t_io_tl_map', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_tl_map_uid_id'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_tl_map_stats_id'))
+
+    op.drop_table('nb_t_io_tl_map')
+    with op.batch_alter_table('nb_t_io_uid', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_uid_user_unique_identifier'))
+
+    op.drop_table('nb_t_io_uid')

nonebot_plugin_tetris_stats/config/migrations/3c25a5a8c050_refactor_historical.py

@@ -16,7 +16,6 @@ from alembic import op
 from nonebot.log import logger
 from rich.progress import BarColumn, MofNCompleteColumn, Progress, TaskProgressColumn, TextColumn, TimeRemainingColumn
 from sqlalchemy import desc, select
-from sqlalchemy.dialects import sqlite
 from sqlalchemy.ext.automap import automap_base
 from sqlalchemy.orm import Session
 
@@ -30,7 +29,7 @@ depends_on: str | Sequence[str] | None = None
 
 
 def migrate_old_data() -> None:  # noqa: C901
-    from json import dumps, loads
+    from json import dumps, loads  # noqa: PLC0415
 
     Base = automap_base()  # noqa: N806
     Base.prepare(autoload_with=op.get_bind())
@@ -109,6 +108,8 @@ def migrate_old_data() -> None:  # noqa: C901
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
         'nonebot_plugin_tetris_stats_tetriohistoricaldata',
@@ -219,23 +220,25 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
         'nonebot_plugin_tetris_stats_historicaldata',
-        sa.Column('id', sa.INTEGER(), nullable=False),
-        sa.Column('trigger_time', sa.DATETIME(), nullable=False),
-        sa.Column('bot_platform', sa.VARCHAR(length=32), nullable=True),
-        sa.Column('bot_account', sa.VARCHAR(), nullable=True),
-        sa.Column('source_type', sa.VARCHAR(length=32), nullable=True),
-        sa.Column('source_account', sa.VARCHAR(), nullable=True),
-        sa.Column('message', sa.BLOB(), nullable=True),
-        sa.Column('game_platform', sa.VARCHAR(length=32), nullable=False),
-        sa.Column('command_type', sa.VARCHAR(length=16), nullable=False),
-        sa.Column('command_args', sqlite.JSON(), nullable=False),
-        sa.Column('game_user', sqlite.JSON(), nullable=False),
-        sa.Column('processed_data', sqlite.JSON(), nullable=False),
-        sa.Column('finish_time', sa.DATETIME(), nullable=False),
-        sa.Column('user_unique_identifier', sa.VARCHAR(length=32), nullable=False),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('trigger_time', sa.DateTime(), nullable=False),
+        sa.Column('bot_platform', sa.String(length=32), nullable=True),
+        sa.Column('bot_account', sa.String(), nullable=True),
+        sa.Column('source_type', sa.String(length=32), nullable=True),
+        sa.Column('source_account', sa.String(), nullable=True),
+        sa.Column('message', sa.PickleType(), nullable=True),
+        sa.Column('game_platform', sa.String(length=32), nullable=False),
+        sa.Column('command_type', sa.String(length=16), nullable=False),
+        sa.Column('command_args', sa.JSON(), nullable=False),
+        sa.Column('game_user', sa.JSON(), nullable=False),
+        sa.Column('processed_data', sa.JSON(), nullable=False),
+        sa.Column('finish_time', sa.DateTime(), nullable=False),
+        sa.Column('user_unique_identifier', sa.String(length=32), nullable=False),
         sa.PrimaryKeyConstraint('id', name='pk_nonebot_plugin_tetris_stats_historicaldata'),
     )
     with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:

nonebot_plugin_tetris_stats/config/migrations/3d900bb0e8d4_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,82 @@
+"""migrate nonebot_plugin_tetris_stats_tetrioleaguestats
+
+迁移 ID: 3d900bb0e8d4
+父迁移: 405c6936a164
+创建时间: 2025-07-18 02:22:03.771903
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = '3d900bb0e8d4'
+down_revision: str | Sequence[str] | None = '405c6936a164'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_tetrioleaguestats' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_tetrioleaguestats  # noqa: N806
+    New = Base.classes.nb_t_io_tl_stats  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        update_time=i.update_time,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/405c6936a164_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,85 @@
+"""migrate nonebot_plugin_tetris_stats_tetrioleaguehistorical
+
+迁移 ID: 405c6936a164
+父迁移: bbbdfd94e6fa
+创建时间: 2025-07-18 01:55:27.406032
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = '405c6936a164'
+down_revision: str | Sequence[str] | None = 'bbbdfd94e6fa'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_tetrioleaguehistorical' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_tetrioleaguehistorical  # noqa: N806
+    New = Base.classes.nb_t_io_tl_hist  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        request_id=i.request_id,
+                        data=i.data,
+                        update_time=i.update_time,
+                        stats_id=i.stats_id,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/5a1b93948494_add_tetrioleaguestats.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
         'nonebot_plugin_tetris_stats_tetrioleaguestats',
@@ -102,6 +104,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        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'))

nonebot_plugin_tetris_stats/config/migrations/612d8b00d9ac_create_a_new_table.py

@@ -0,0 +1,64 @@
+"""Create a new table
+
+迁移 ID: 612d8b00d9ac
+父迁移: 5a1b93948494
+创建时间: 2025-05-26 04:49:29.664480
+
+"""
+
+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 = '612d8b00d9ac'
+down_revision: str | Sequence[str] | None = '5a1b93948494'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
+    op.create_table(
+        'nonebot_plugin_tetris_stats_triggerhistoricaldatav2',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('trigger_time', sa.DateTime(), nullable=False),
+        sa.Column('session_persist_id', sa.Integer(), nullable=False),
+        sa.Column('game_platform', sa.String(length=32), nullable=False),
+        sa.Column('command_type', sa.String(length=16), nullable=False),
+        sa.Column('command_args', sa.JSON(), nullable=False),
+        sa.Column('finish_time', sa.DateTime(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nonebot_plugin_tetris_stats_triggerhistoricaldatav2')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_triggerhistoricaldatav2', schema=None) as batch_op:
+        batch_op.create_index(
+            batch_op.f('ix_nonebot_plugin_tetris_stats_triggerhistoricaldatav2_command_type'),
+            ['command_type'],
+            unique=False,
+        )
+        batch_op.create_index(
+            batch_op.f('ix_nonebot_plugin_tetris_stats_triggerhistoricaldatav2_game_platform'),
+            ['game_platform'],
+            unique=False,
+        )
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_triggerhistoricaldatav2', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_triggerhistoricaldatav2_game_platform'))
+        batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_triggerhistoricaldatav2_command_type'))
+
+    op.drop_table('nonebot_plugin_tetris_stats_triggerhistoricaldatav2')

nonebot_plugin_tetris_stats/config/migrations/6c3206f90cc3_add_field.py

@@ -26,7 +26,9 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
-    from json import dumps, loads
+    if op.get_bind().dialect.name == 'postgresql':
+        return
+    from json import dumps, loads  # noqa: PLC0415
 
     Base = automap_base()  # noqa: N806
     connection = op.get_bind()
@@ -50,7 +52,9 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
-    from json import dumps, loads
+    if op.get_bind().dialect.name == 'postgresql':
+        return
+    from json import dumps, loads  # noqa: PLC0415
 
     Base = automap_base()  # noqa: N806
     connection = op.get_bind()

nonebot_plugin_tetris_stats/config/migrations/6ecf383d646a_add_compare_delta_config.py

@@ -0,0 +1,53 @@
+"""add compare delta config
+
+迁移 ID: 6ecf383d646a
+父迁移: 1c5346b657d4
+创建时间: 2026-01-27 06:05:04.481654
+
+"""
+
+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 = '6ecf383d646a'
+down_revision: str | Sequence[str] | None = '1c5346b657d4'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    op.create_table(
+        'nb_t_top_u_cfg',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('compare_delta', sa.Interval(), nullable=True),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_top_u_cfg')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    op.create_table(
+        'nb_t_tos_u_cfg',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('compare_delta', sa.Interval(), nullable=True),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_tos_u_cfg')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_io_u_cfg', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('compare_delta', sa.Interval(), nullable=True))
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    with op.batch_alter_table('nb_t_io_u_cfg', schema=None) as batch_op:
+        batch_op.drop_column('compare_delta')
+
+    op.drop_table('nb_t_tos_u_cfg')
+    op.drop_table('nb_t_top_u_cfg')

nonebot_plugin_tetris_stats/config/migrations/766cc7e75a62_migrate_to_uninfo.py

@@ -0,0 +1,120 @@
+"""Migrate to uninfo
+
+迁移 ID: 766cc7e75a62
+父迁移: 612d8b00d9ac
+创建时间: 2025-05-26 04:51:54.665200
+
+"""
+
+from __future__ import annotations
+
+import math
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = '766cc7e75a62'
+down_revision: str | Sequence[str] | None = '612d8b00d9ac'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_triggerhistoricaldata' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    TriggerHistoricalData = Base.classes.nonebot_plugin_tetris_stats_triggerhistoricaldata  # noqa: N806
+    TriggerHistoricalDataV2 = Base.classes.nonebot_plugin_tetris_stats_triggerhistoricaldatav2  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(TriggerHistoricalData).count()
+        if count == 0:
+            return
+
+        try:
+            from nonebot_session_to_uninfo import (  # type: ignore[import-untyped]  # noqa: PLC0415
+                check_tables,
+                get_id_map,
+            )
+        except ImportError as err:
+            msg = '请安装 `nonebot-session-to-uninfo` 以迁移数据'
+            raise ValueError(msg) from err
+
+        check_tables()
+
+        migration_limit = 10000  # 每次迁移的数据量为 10000 条
+        last_id = -1
+        id_map: dict[int, int] = {}
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for _ in range(math.ceil(count / migration_limit)):
+                records = (
+                    db_session.query(TriggerHistoricalData)
+                    .order_by(TriggerHistoricalData.id)
+                    .where(TriggerHistoricalData.id > last_id)
+                    .limit(migration_limit)
+                    .all()
+                )
+                last_id = records[-1].id
+
+                session_ids = [
+                    record.session_persist_id for record in records if record.session_persist_id not in id_map
+                ]
+                if session_ids:
+                    id_map.update(get_id_map(session_ids))
+
+                db_session.add_all(
+                    TriggerHistoricalDataV2(
+                        id=record.id,
+                        session_persist_id=id_map[record.session_persist_id],
+                        trigger_time=record.trigger_time,
+                        game_platform=record.game_platform,
+                        command_type=record.command_type,
+                        command_args=record.command_args,
+                        finish_time=record.finish_time,
+                    )
+                    for record in records
+                )
+
+                progress.update(task, advance=len(records))
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    if op.get_bind().dialect.name == 'postgresql':
+        return

nonebot_plugin_tetris_stats/config/migrations/8459b2a4b7a3_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,94 @@
+"""migrate nonebot_plugin_tetris_stats_tetrioleaguestatsfield
+
+迁移 ID: 8459b2a4b7a3
+父迁移: 3d900bb0e8d4
+创建时间: 2025-07-18 02:24:59.560252
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = '8459b2a4b7a3'
+down_revision: str | Sequence[str] | None = '3d900bb0e8d4'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_tetrioleaguestatsfield' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_tetrioleaguestatsfield  # noqa: N806
+    New = Base.classes.nb_t_io_tl_stats_field  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        rank=i.rank,
+                        tr_line=i.tr_line,
+                        player_count=i.player_count,
+                        low_pps=i.low_pps,
+                        low_apm=i.low_apm,
+                        low_vs=i.low_vs,
+                        avg_pps=i.avg_pps,
+                        avg_apm=i.avg_apm,
+                        avg_vs=i.avg_vs,
+                        high_pps=i.high_pps,
+                        high_apm=i.high_apm,
+                        high_vs=i.high_vs,
+                        stats_id=i.stats_id,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/8a91210ce14d_correct_the_data_in_historicaldata.py

@@ -28,10 +28,12 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:  # noqa: C901
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
 
-    from nonebot.compat import PYDANTIC_V2, type_validate_json
-    from pydantic import BaseModel, ValidationError
-    from rich.progress import (
+    from nonebot.compat import PYDANTIC_V2, type_validate_json  # noqa: PLC0415
+    from pydantic import BaseModel, ValidationError  # noqa: PLC0415
+    from rich.progress import (  # noqa: PLC0415
         BarColumn,
         MofNCompleteColumn,
         Progress,
@@ -58,14 +60,14 @@ def upgrade(name: str = '') -> None:  # noqa: C901
             logger.info('空表, 跳过')
             return
 
-        from nonebot_plugin_tetris_stats.version import __version__
+        from nonebot_plugin_tetris_stats.version import __version__  # noqa: PLC0415
 
         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]
+        from nonebot_plugin_tetris_stats.game_data_processor.schemas import (  # type: ignore[import-untyped]  # pyright: ignore[reportMissingImports]  # noqa: PLC0415
             BaseProcessedData,
         )
 
@@ -101,3 +103,5 @@ def upgrade(name: str = '') -> None:  # noqa: C901
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return

nonebot_plugin_tetris_stats/config/migrations/9866f53ce44f_init_db.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
         'nonebot_plugin_tetris_stats_bind',
@@ -122,6 +124,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
         batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_iorank_rank'))

nonebot_plugin_tetris_stats/config/migrations/9cd1647db502_merge_old_db.py

@@ -63,6 +63,8 @@ def migrate_old_data(connection: Connection) -> None:
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     try:
         db_path = Path(config.db_url)
     except AttributeError:
@@ -91,3 +93,5 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return

nonebot_plugin_tetris_stats/config/migrations/9f6582279ce2_recreate_historical_data.py

@@ -12,7 +12,6 @@ from typing import TYPE_CHECKING
 
 import sqlalchemy as sa
 from alembic import op
-from sqlalchemy.dialects import sqlite
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
@@ -26,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:
         batch_op.drop_index('ix_nonebot_plugin_tetris_stats_historicaldata_command_type')
@@ -71,6 +72,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:
         batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_historicaldata_source_type'))
@@ -82,19 +85,19 @@ def downgrade(name: str = '') -> None:
 
     op.create_table(
         'nonebot_plugin_tetris_stats_historicaldata',
-        sa.Column('id', sa.INTEGER(), nullable=False),
-        sa.Column('trigger_time', sa.DATETIME(), nullable=False),
-        sa.Column('bot_platform', sa.VARCHAR(length=32), nullable=True),
-        sa.Column('bot_account', sa.VARCHAR(), nullable=True),
-        sa.Column('source_type', sa.VARCHAR(length=32), nullable=True),
-        sa.Column('source_account', sa.VARCHAR(), nullable=True),
-        sa.Column('message', sa.BLOB(), nullable=True),
-        sa.Column('game_platform', sa.VARCHAR(length=32), nullable=False),
-        sa.Column('command_type', sa.VARCHAR(length=16), nullable=False),
-        sa.Column('command_args', sqlite.JSON(), nullable=False),
-        sa.Column('game_user', sa.BLOB(), nullable=False),
-        sa.Column('processed_data', sa.BLOB(), nullable=False),
-        sa.Column('finish_time', sa.DATETIME(), nullable=False),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('trigger_time', sa.DateTime(), nullable=False),
+        sa.Column('bot_platform', sa.String(length=32), nullable=True),
+        sa.Column('bot_account', sa.String(), nullable=True),
+        sa.Column('source_type', sa.String(length=32), nullable=True),
+        sa.Column('source_account', sa.String(), nullable=True),
+        sa.Column('message', sa.PickleType(), nullable=True),
+        sa.Column('game_platform', sa.String(length=32), nullable=False),
+        sa.Column('command_type', sa.String(length=16), nullable=False),
+        sa.Column('command_args', sa.JSON(), nullable=False),
+        sa.Column('game_user', sa.PickleType(), nullable=False),
+        sa.Column('processed_data', sa.PickleType(), nullable=False),
+        sa.Column('finish_time', sa.DateTime(), nullable=False),
         sa.PrimaryKeyConstraint('id', name='pk_nonebot_plugin_tetris_stats_historicaldata'),
     )
     with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:

nonebot_plugin_tetris_stats/config/migrations/a1195e989cc6_add_tetrio_user_configuration.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
         'nonebot_plugin_tetris_stats_tetriouserconfig',
@@ -39,6 +41,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_table('nonebot_plugin_tetris_stats_tetriouserconfig')
     # ### end Alembic commands ###

nonebot_plugin_tetris_stats/config/migrations/b15844837693_migrate_to_nonobot_plugin_user.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_bind', schema=None) as batch_op:
         batch_op.drop_index('ix_nonebot_plugin_tetris_stats_bind_chat_account')
@@ -49,6 +51,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_bind', schema=None) as batch_op:
         batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_bind_user_id'))
@@ -57,11 +61,11 @@ def downgrade(name: str = '') -> None:
 
     op.create_table(
         'nonebot_plugin_tetris_stats_bind',
-        sa.Column('id', sa.INTEGER(), nullable=False),
-        sa.Column('chat_platform', sa.VARCHAR(length=32), nullable=False),
-        sa.Column('chat_account', sa.VARCHAR(), nullable=False),
-        sa.Column('game_platform', sa.VARCHAR(length=32), nullable=False),
-        sa.Column('game_account', sa.VARCHAR(), nullable=False),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('chat_platform', sa.String(length=32), nullable=False),
+        sa.Column('chat_account', sa.String(), nullable=False),
+        sa.Column('game_platform', sa.String(length=32), nullable=False),
+        sa.Column('game_account', sa.String(), nullable=False),
         sa.PrimaryKeyConstraint('id', name='pk_nonebot_plugin_tetris_stats_bind'),
     )
     with op.batch_alter_table('nonebot_plugin_tetris_stats_bind', schema=None) as batch_op:

nonebot_plugin_tetris_stats/config/migrations/b2075a5ce371_create_new_tables.py

@@ -0,0 +1,215 @@
+"""create new tables
+
+迁移 ID: b2075a5ce371
+父迁移: 766cc7e75a62
+创建时间: 2025-07-17 22:57:32.245327
+
+"""
+
+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 = 'b2075a5ce371'
+down_revision: str | Sequence[str] | None = '766cc7e75a62'
+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(
+        'nb_t_bind',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=False),
+        sa.Column('game_platform', sa.String(length=32), nullable=False),
+        sa.Column('game_account', sa.String(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_bind')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_bind', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_bind_user_id'), ['user_id'], unique=False)
+
+    op.create_table(
+        'nb_t_io_hist_data',
+        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=32), nullable=False),
+        sa.Column('data', sa.JSON(), nullable=False),
+        sa.Column('update_time', sa.DateTime(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_io_hist_data')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_io_hist_data', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_io_hist_data_api_type'), ['api_type'], unique=False)
+        batch_op.create_index(batch_op.f('ix_nb_t_io_hist_data_update_time'), ['update_time'], unique=False)
+        batch_op.create_index(
+            batch_op.f('ix_nb_t_io_hist_data_user_unique_identifier'), ['user_unique_identifier'], unique=False
+        )
+
+    op.create_table(
+        'nb_t_io_tl_stats',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('update_time', sa.DateTime(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_io_tl_stats')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_io_tl_stats', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_io_tl_stats_update_time'), ['update_time'], unique=False)
+
+    op.create_table(
+        'nb_t_io_u_cfg',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('query_template', sa.String(length=2), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_io_u_cfg')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    op.create_table(
+        'nb_t_top_hist_data',
+        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_nb_t_top_hist_data')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_top_hist_data', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_top_hist_data_api_type'), ['api_type'], unique=False)
+        batch_op.create_index(batch_op.f('ix_nb_t_top_hist_data_update_time'), ['update_time'], unique=False)
+        batch_op.create_index(
+            batch_op.f('ix_nb_t_top_hist_data_user_unique_identifier'), ['user_unique_identifier'], unique=False
+        )
+
+    op.create_table(
+        'nb_t_tos_hist_data',
+        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_nb_t_tos_hist_data')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_tos_hist_data', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_tos_hist_data_api_type'), ['api_type'], unique=False)
+        batch_op.create_index(batch_op.f('ix_nb_t_tos_hist_data_update_time'), ['update_time'], unique=False)
+        batch_op.create_index(
+            batch_op.f('ix_nb_t_tos_hist_data_user_unique_identifier'), ['user_unique_identifier'], unique=False
+        )
+
+    op.create_table(
+        'nb_t_trigger_hist_v2',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('trigger_time', sa.DateTime(), nullable=False),
+        sa.Column('session_persist_id', sa.Integer(), nullable=False),
+        sa.Column('game_platform', sa.String(length=32), nullable=False),
+        sa.Column('command_type', sa.String(length=16), nullable=False),
+        sa.Column('command_args', sa.JSON(), nullable=False),
+        sa.Column('finish_time', sa.DateTime(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_trigger_hist_v2')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_trigger_hist_v2', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_trigger_hist_v2_command_type'), ['command_type'], unique=False)
+        batch_op.create_index(batch_op.f('ix_nb_t_trigger_hist_v2_game_platform'), ['game_platform'], unique=False)
+
+    op.create_table(
+        'nb_t_io_tl_hist',
+        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'], ['nb_t_io_tl_stats.id'], name=op.f('fk_nb_t_io_tl_hist_stats_id_nb_t_io_tl_stats')
+        ),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_io_tl_hist')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_io_tl_hist', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_io_tl_hist_request_id'), ['request_id'], unique=False)
+        batch_op.create_index(batch_op.f('ix_nb_t_io_tl_hist_update_time'), ['update_time'], unique=False)
+
+    op.create_table(
+        'nb_t_io_tl_stats_field',
+        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'], ['nb_t_io_tl_stats.id'], name=op.f('fk_nb_t_io_tl_stats_field_stats_id_nb_t_io_tl_stats')
+        ),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_io_tl_stats_field')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_io_tl_stats_field', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_io_tl_stats_field_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('nb_t_io_tl_stats_field', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_tl_stats_field_rank'))
+
+    op.drop_table('nb_t_io_tl_stats_field')
+    with op.batch_alter_table('nb_t_io_tl_hist', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_tl_hist_update_time'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_tl_hist_request_id'))
+
+    op.drop_table('nb_t_io_tl_hist')
+    with op.batch_alter_table('nb_t_trigger_hist_v2', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_trigger_hist_v2_game_platform'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_trigger_hist_v2_command_type'))
+
+    op.drop_table('nb_t_trigger_hist_v2')
+    with op.batch_alter_table('nb_t_tos_hist_data', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_tos_hist_data_user_unique_identifier'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_tos_hist_data_update_time'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_tos_hist_data_api_type'))
+
+    op.drop_table('nb_t_tos_hist_data')
+    with op.batch_alter_table('nb_t_top_hist_data', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_top_hist_data_user_unique_identifier'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_top_hist_data_update_time'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_top_hist_data_api_type'))
+
+    op.drop_table('nb_t_top_hist_data')
+    op.drop_table('nb_t_io_u_cfg')
+    with op.batch_alter_table('nb_t_io_tl_stats', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_tl_stats_update_time'))
+
+    op.drop_table('nb_t_io_tl_stats')
+    with op.batch_alter_table('nb_t_io_hist_data', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_hist_data_user_unique_identifier'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_hist_data_update_time'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_hist_data_api_type'))
+
+    op.drop_table('nb_t_io_hist_data')
+    with op.batch_alter_table('nb_t_bind', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_bind_user_id'))
+
+    op.drop_table('nb_t_bind')
+    # ### end Alembic commands ###

nonebot_plugin_tetris_stats/config/migrations/b7fbdafc339a_add_user_unique_identifier_field_to_.py

@@ -23,13 +23,15 @@ branch_labels: str | Sequence[str] | None = None
 depends_on: str | Sequence[str] | None = None
 
 
-def upgrade(name: str = '') -> None:
+def upgrade(name: str = '') -> None:  # noqa: C901
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
 
-    from nonebot.compat import type_validate_json
-    from pydantic import ValidationError
-    from rich.progress import (
+    from nonebot.compat import type_validate_json  # noqa: PLC0415
+    from pydantic import ValidationError  # noqa: PLC0415
+    from rich.progress import (  # noqa: PLC0415
         BarColumn,
         MofNCompleteColumn,
         Progress,
@@ -37,9 +39,9 @@ def upgrade(name: str = '') -> None:
         TextColumn,
         TimeRemainingColumn,
     )
-    from sqlalchemy import select
-    from sqlalchemy.ext.automap import automap_base
-    from sqlalchemy.orm import Session
+    from sqlalchemy import select  # noqa: PLC0415
+    from sqlalchemy.ext.automap import automap_base  # noqa: PLC0415
+    from sqlalchemy.orm import Session  # noqa: PLC0415
 
     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))
@@ -58,13 +60,15 @@ def upgrade(name: str = '') -> None:
         if count == 0:
             logger.info('空表, 跳过')
         else:
-            from nonebot_plugin_tetris_stats.version import __version__
+            from nonebot_plugin_tetris_stats.version import __version__  # noqa: PLC0415
 
             if __version__ != '1.0.4':
                 msg = '本迁移需要1.0.4版本, 请先锁定版本至1.0.4版本再执行本迁移'
                 logger.critical(msg)
                 raise RuntimeError(msg)
-            from nonebot_plugin_tetris_stats.game_data_processor.schemas import BaseUser  # type: ignore[import-untyped]
+            from nonebot_plugin_tetris_stats.game_data_processor.schemas import (  # type: ignore[import-untyped]  # pyright: ignore[reportMissingImports]  # noqa: PLC0415
+                BaseUser,
+            )
 
             models: list[type[BaseUser]] = BaseUser.__subclasses__()
 
@@ -103,6 +107,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:
         batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_historicaldata_user_unique_identifier'))

nonebot_plugin_tetris_stats/config/migrations/b96c8c18b79a_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,82 @@
+"""migrate nonebot_plugin_tetris_stats_tetriouserconfig
+
+迁移 ID: b96c8c18b79a
+父迁移: 8459b2a4b7a3
+创建时间: 2025-07-18 04:25:44.190319
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'b96c8c18b79a'
+down_revision: str | Sequence[str] | None = '8459b2a4b7a3'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_tetriouserconfig' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_tetriouserconfig  # noqa: N806
+    New = Base.classes.nb_t_io_u_cfg  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        query_template=i.query_template,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/b9d65badc713_del_old_tos_bind_data.py

@@ -26,6 +26,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
 
     Base = automap_base()  # noqa: N806
     connection = op.get_bind()
@@ -40,3 +42,5 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return

nonebot_plugin_tetris_stats/config/migrations/bbbdfd94e6fa_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,85 @@
+"""migrate nonebot_plugin_tetris_stats_tetriohistoricaldata
+
+迁移 ID: bbbdfd94e6fa
+父迁移: d61e6ae36586
+创建时间: 2025-07-18 00:42:33.730885
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'bbbdfd94e6fa'
+down_revision: str | Sequence[str] | None = 'd61e6ae36586'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_tetriohistoricaldata' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_tetriohistoricaldata  # noqa: N806
+    New = Base.classes.nb_t_io_hist_data  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        user_unique_identifier=i.user_unique_identifier,
+                        api_type=i.api_type,
+                        data=i.data,
+                        update_time=i.update_time,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/bc6abd57928f_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,87 @@
+"""migrate nonebot_plugin_tetris_stats_triggerhistoricaldatav2
+
+迁移 ID: bc6abd57928f
+父迁移: ee76ae37d70a
+创建时间: 2025-07-18 04:33:04.222045
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'bc6abd57928f'
+down_revision: str | Sequence[str] | None = 'ee76ae37d70a'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_triggerhistoricaldatav2' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_triggerhistoricaldatav2  # noqa: N806
+    New = Base.classes.nb_t_trigger_hist_v2  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        trigger_time=i.trigger_time,
+                        session_persist_id=i.session_persist_id,
+                        game_platform=i.game_platform,
+                        command_type=i.command_type,
+                        command_args=i.command_args,
+                        finish_time=i.finish_time,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/ce073d279d19_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,85 @@
+"""migrate nonebot_plugin_tetris_stats_tophistoricaldata
+
+迁移 ID: ce073d279d19
+父迁移: b96c8c18b79a
+创建时间: 2025-07-18 04:28:13.820635
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'ce073d279d19'
+down_revision: str | Sequence[str] | None = 'b96c8c18b79a'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_tophistoricaldata' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_tophistoricaldata  # noqa: N806
+    New = Base.classes.nb_t_top_hist_data  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        user_unique_identifier=i.user_unique_identifier,
+                        api_type=i.api_type,
+                        data=i.data,
+                        update_time=i.update_time,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/cfeab6961dce_extend_api_type_field_length.py

@@ -26,6 +26,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        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(
@@ -38,6 +40,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     logger.warning('新数据可能不支持降级!')
     logger.warning('请确认数据库内数据可以迁移到旧版本!')

nonebot_plugin_tetris_stats/config/migrations/d61e6ae36586_migrate_nonebot_plugin_tetris_stats_bind.py

@@ -0,0 +1,84 @@
+"""migrate nonebot_plugin_tetris_stats_bind
+
+迁移 ID: d61e6ae36586
+父迁移: b2075a5ce371
+创建时间: 2025-07-17 23:58:13.408384
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'd61e6ae36586'
+down_revision: str | Sequence[str] | None = 'b2075a5ce371'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_bind' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_bind  # noqa: N806
+    New = Base.classes.nb_t_bind  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(100):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        user_id=i.user_id,
+                        game_platform=i.game_platform,
+                        game_account=i.game_account,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/ee76ae37d70a_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,85 @@
+"""migrate nonebot_plugin_tetris_stats_toshistoricaldata
+
+迁移 ID: ee76ae37d70a
+父迁移: ce073d279d19
+创建时间: 2025-07-18 04:29:52.976624
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'ee76ae37d70a'
+down_revision: str | Sequence[str] | None = 'ce073d279d19'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_toshistoricaldata' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_toshistoricaldata  # noqa: N806
+    New = Base.classes.nb_t_tos_hist_data  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        user_unique_identifier=i.user_unique_identifier,
+                        api_type=i.api_type,
+                        data=i.data,
+                        update_time=i.update_time,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/f5b4a6d1325b_tetr_io_new_season.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        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')
@@ -66,23 +68,25 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        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('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('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.Column('update_time', sa.DateTime(), nullable=False),
+        sa.Column('file_hash', sa.String(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:

nonebot_plugin_tetris_stats/db/__init__.py

@@ -1,7 +1,7 @@
 from asyncio import Lock
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
-from datetime import datetime, timezone
+from datetime import datetime, timedelta, timezone
 from enum import Enum, auto
 from typing import TYPE_CHECKING, Literal, TypeVar, overload
 
@@ -11,15 +11,19 @@ from nonebot_plugin_orm import AsyncSession, get_session
 from nonebot_plugin_user import User
 from sqlalchemy import select
 
-from ..utils.typing import AllCommandType, BaseCommandType, GameType, TETRIOCommandType
-from .models import Bind, TriggerHistoricalData
+from ..utils.duration import DEFAULT_COMPARE_DELTA
+from ..utils.typedefs import AllCommandType, BaseCommandType, GameType, TETRIOCommandType
+from .models import Bind, TriggerHistoricalDataV2
 
 UTC = timezone.utc
 
 if TYPE_CHECKING:
     from ..games.tetrio.api.models import TETRIOHistoricalData
+    from ..games.tetrio.models import TETRIOUserConfig
     from ..games.top.api.models import TOPHistoricalData
+    from ..games.top.models import TOPUserConfig
     from ..games.tos.api.models import TOSHistoricalData
+    from ..games.tos.models import TOSUserConfig
 
 
 class BindStatus(Enum):
@@ -42,6 +46,8 @@ async def create_or_update_bind(
     user: User,
     game_platform: GameType,
     game_account: str,
+    *,
+    verify: bool = False,
 ) -> BindStatus:
     bind = await query_bind_info(
         session=session,
@@ -53,22 +59,41 @@ async def create_or_update_bind(
             user_id=user.id,
             game_platform=game_platform,
             game_account=game_account,
+            verify=verify,
         )
         session.add(bind)
         status = BindStatus.SUCCESS
     else:
         bind.game_account = game_account
+        bind.verify = verify
         status = BindStatus.UPDATE
     await session.commit()
     return status
 
 
-T = TypeVar('T', 'TETRIOHistoricalData', 'TOPHistoricalData', 'TOSHistoricalData')
+async def remove_bind(
+    session: AsyncSession,
+    user: User,
+    game_platform: GameType,
+) -> bool:
+    bind = await query_bind_info(
+        session=session,
+        user=user,
+        game_platform=game_platform,
+    )
+    if bind is not None:
+        await session.delete(bind)
+        await session.commit()
+        return True
+    return False
+
+
+T_HistoricalData = TypeVar('T_HistoricalData', 'TETRIOHistoricalData', 'TOPHistoricalData', 'TOSHistoricalData')
 
 lock = Lock()
 
 
-async def anti_duplicate_add(model: T) -> None:
+async def anti_duplicate_add(model: T_HistoricalData) -> None:
     async with lock, get_session() as session:
         result = (
             await session.scalars(
@@ -87,6 +112,19 @@ async def anti_duplicate_add(model: T) -> None:
         await session.commit()
 
 
+T_CONFIG = TypeVar('T_CONFIG', 'TETRIOUserConfig', 'TOPUserConfig', 'TOSUserConfig')
+
+
+async def resolve_compare_delta(
+    config: type[T_CONFIG], session: AsyncSession, user_id: int, compare: timedelta | None
+) -> timedelta:
+    return (
+        compare
+        or await session.scalar(select(config.compare_delta).where(config.id == user_id))
+        or DEFAULT_COMPARE_DELTA
+    )
+
+
 @asynccontextmanager
 @overload
 async def trigger(
@@ -122,7 +160,7 @@ async def trigger(
     except FinishedException:
         async with get_session() as session:
             session.add(
-                TriggerHistoricalData(
+                TriggerHistoricalDataV2(
                     trigger_time=trigger_time,
                     session_persist_id=session_persist_id,
                     game_platform=game_platform,

nonebot_plugin_tetris_stats/db/models.py

@@ -2,14 +2,14 @@ from collections.abc import Callable, Sequence
 from datetime import datetime
 from typing import Any
 
-from nonebot.compat import PYDANTIC_V2, type_validate_json
+from nonebot.compat import PYDANTIC_V2, type_validate_python
 from nonebot_plugin_orm import Model
 from pydantic import BaseModel, ValidationError
 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 AllCommandType, GameType
+from ..utils.typedefs import AllCommandType, GameType
 
 
 class PydanticType(TypeDecorator):
@@ -30,27 +30,27 @@ class PydanticType(TypeDecorator):
     if PYDANTIC_V2:
 
         @override
-        def process_bind_param(self, value: Any | None, dialect: Dialect) -> str:
+        def process_bind_param(self, value: Any | None, dialect: Dialect) -> dict | list:
             # 将 Pydantic 模型实例转换为 JSON
             if isinstance(value, tuple(self.models)):
-                return value.model_dump_json(by_alias=True)  # type: ignore[union-attr]
+                return value.model_dump(mode='json', by_alias=True)  # type: ignore[union-attr]
             raise TypeError
     else:
 
         @override
-        def process_bind_param(self, value: Any | None, dialect: Dialect) -> str:
+        def process_bind_param(self, value: Any | None, dialect: Dialect) -> dict | list:
             # 将 Pydantic 模型实例转换为 JSON
             if isinstance(value, tuple(self.models)):
-                return value.json(by_alias=True)  # type: ignore[union-attr]
+                return value.dict(by_alias=True)  # type: ignore[union-attr]
             raise TypeError
 
     @override
     def process_result_value(self, value: Any | None, dialect: Dialect) -> BaseModel:
         # 将 JSON 转换回 Pydantic 模型实例
-        if isinstance(value, str | bytes):
+        if isinstance(value, dict | list):
             for i in self.models:
                 try:
-                    return type_validate_json(i, value)
+                    return type_validate_python(i, value)
                 except ValidationError:  # noqa: PERF203
                     ...
         raise ValueError
@@ -65,13 +65,18 @@ class PydanticType(TypeDecorator):
 
 
 class Bind(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_bind'
+
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
     user_id: Mapped[int] = mapped_column(index=True)
     game_platform: Mapped[GameType] = mapped_column(String(32))
     game_account: Mapped[str]
+    verify: Mapped[bool]
 
 
-class TriggerHistoricalData(MappedAsDataclass, Model):
+class TriggerHistoricalDataV2(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_trigger_hist_v2'
+
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
     trigger_time: Mapped[datetime] = mapped_column(DateTime)
     session_persist_id: Mapped[int]

nonebot_plugin_tetris_stats/games/__init__.py

@@ -7,7 +7,7 @@ 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 ..i18n import Lang
 from ..utils.exception import MessageFormatError, NeedCatchError
 
 command: Alconna = Alconna(
@@ -44,10 +44,10 @@ async def _(matcher: Matcher, account: MessageFormatError):
 
 @alc.handle()
 async def _(matcher: Matcher, matches: AlcMatches):
-    if matches.head_matched and matches.options != {} or matches.main_args == {}:
+    if (matches.head_matched and matches.options != {}) or matches.main_args == {}:
         await matcher.finish(
             (f'{matches.error_info!r}\n' if matches.error_info is not None else '')
-            + f'输入"{matches.header_result} --help"查看帮助'
+            + Lang.help.usage(command=matches.header_result)
         )
 
 

nonebot_plugin_tetris_stats/games/schemas.py

@@ -2,8 +2,9 @@ from abc import ABC, abstractmethod
 from typing import Generic, TypeVar
 
 from pydantic import BaseModel
+from typing_extensions import override
 
-from ..utils.typing import GameType
+from ..utils.typedefs import GameType
 
 T = TypeVar('T', bound=GameType)
 
@@ -13,6 +14,7 @@ class BaseUser(BaseModel, ABC, Generic[T]):
 
     platform: T
 
+    @override
     def __eq__(self, other: object) -> bool:
         if isinstance(other, BaseUser):
             return self.unique_identifier == other.unique_identifier
@@ -22,3 +24,5 @@ class BaseUser(BaseModel, ABC, Generic[T]):
     @abstractmethod
     def unique_identifier(self) -> str:
         raise NotImplementedError
+
+    __hash__ = BaseModel.__hash__

nonebot_plugin_tetris_stats/games/tetrio/__init__.py

@@ -23,7 +23,7 @@ command = Subcommand(
 )
 
 
-from . import bind, config, list, query, rank, record  # noqa: E402
+from . import bind, config, list, query, rank, record, unbind, verify  # noqa: A004, E402
 
 main_command.add(command)
 
@@ -35,4 +35,6 @@ __all__ = [
     'query',
     'rank',
     'record',
+    'unbind',
+    'verify',
 ]

nonebot_plugin_tetris_stats/games/tetrio/api/cache.py

@@ -17,7 +17,7 @@ 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]
+request.request = limit(timedelta(seconds=1))(request.request)  # type: ignore[method-assign]  # pyright: ignore[reportAttributeAccessIssue]
 
 
 class Cache:
@@ -32,7 +32,7 @@ class Cache:
                 logger.debug(f'{url}: Cache hit!')
                 return cached_data
             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]
+            parsed_data: SuccessModel | FailedModel = type_validate_json(SuccessModel | FailedModel, response_data)  # type: ignore[arg-type]  # pyright: ignore[reportArgumentType]
             if isinstance(parsed_data, SuccessModel):
                 await cls.cache.add(
                     url,

nonebot_plugin_tetris_stats/games/tetrio/api/leaderboards.py

@@ -1,10 +1,12 @@
 from typing import Literal, overload
 from uuid import UUID
 
+from nonebot import __version__ as __nonebot_version__
 from nonebot.compat import type_validate_json
 from yarl import URL
 
 from ....utils.exception import RequestError
+from ....version import __version__
 from ..constant import BASE_URL
 from .cache import Cache
 from .schemas.base import FailedModel
@@ -18,11 +20,16 @@ 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]
+        By,  # type: ignore[arg-type]  # pyright: ignore[reportArgumentType]
         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,
+            {
+                'X-Session-ID': str(x_session_id),
+                'User-Agent': f'nonebot-plugin-tetris-stats/{__version__} (Windows NT 10.0; Win64; x64) NoneBot2/{__nonebot_version__}',
+            }
+            if x_session_id is not None
+            else None,
         ),
     )
     if isinstance(model, FailedModel):
@@ -62,7 +69,7 @@ async def records(
     match records_type:
         case '40l' | 'blitz':
             model = type_validate_json(
-                Solo,  # type: ignore[arg-type]
+                Solo,  # type: ignore[arg-type]  # pyright: ignore[reportArgumentType]
                 await get(
                     BASE_URL / 'records' / f'{records_type}{scope}{revolution_id if revolution_id is not None else ""}',
                     parameter,
@@ -70,17 +77,14 @@ async def records(
             )
         case 'zenith' | 'zenithex':
             model = type_validate_json(
-                Zenith,  # type: ignore[arg-type]
+                Zenith,  # type: ignore[arg-type]  # pyright: ignore[reportArgumentType]
                 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]
+        msg = f'排行榜信息请求错误:\n{model.error}'
         raise RequestError(msg)
     return model
 

nonebot_plugin_tetris_stats/games/tetrio/api/models.py

@@ -7,10 +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
+from .typedefs import Records, Summaries
 
 
 class TETRIOHistoricalData(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_io_hist_data'
+
     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', Records, Summaries]] = mapped_column(String(32), index=True)

nonebot_plugin_tetris_stats/games/tetrio/api/player.py

@@ -27,7 +27,7 @@ from .schemas.summaries.base import User as SummariesUser
 from .schemas.summaries.league import LeagueSuccessModel
 from .schemas.user import User
 from .schemas.user_info import UserInfo, UserInfoSuccess
-from .typing import Records, Summaries
+from .typedefs import Records, Summaries
 
 
 class RecordModeType(str, Enum):
@@ -46,7 +46,7 @@ class RecordKey(NamedTuple):
     record_type: RecordType
 
     def to_records(self) -> Records:
-        return cast(Records, f'{self.mode_type.value}_{self.record_type.value}')
+        return cast('Records', f'{self.mode_type.value}_{self.record_type.value}')
 
 
 class Player:
@@ -89,7 +89,7 @@ class Player:
 
     @property
     def _request_user_parameter(self) -> str:
-        return self.user_id or cast(str, self.user_name).lower()
+        return self.user_id or cast('str', self.user_name).lower()
 
     @property
     async def user(self) -> User:
@@ -114,7 +114,7 @@ class Player:
         """Get User Info"""
         if self._user_info is None:
             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]
+            user_info: UserInfo = type_validate_json(UserInfo, raw_user_info)  # type: ignore[arg-type]  # pyright: ignore[reportArgumentType]
             if isinstance(user_info, FailedModel):
                 msg = f'用户信息请求错误:\n{user_info.error}'
                 raise RequestError(msg)
@@ -146,7 +146,7 @@ class Player:
                 BASE_URL / 'users' / self._request_user_parameter / 'summaries' / summaries_type
             )
             summaries: SummariesModel | FailedModel = type_validate_json(
-                self.__SUMMARIES_MAPPING[summaries_type] | FailedModel,  # type: ignore[arg-type]
+                self.__SUMMARIES_MAPPING[summaries_type] | FailedModel,  # type: ignore[assignment, arg-type]  # pyright: ignore[reportArgumentType]  #! waiting for [PEP 747](https://peps.python.org/pep-0747/)
                 raw_summaries,
             )
             if isinstance(summaries, FailedModel):
@@ -166,7 +166,7 @@ class Player:
     async def get_leagueflow(self) -> LeagueFlowSuccess:
         if self._leagueflow is None:
             leagueflow: LeagueFlow = type_validate_json(
-                LeagueFlow,  # type: ignore[arg-type]
+                LeagueFlow,  # type: ignore[arg-type]  # pyright: ignore[reportArgumentType]
                 await Cache.get(BASE_URL / 'labs/leagueflow' / self._request_user_parameter),
             )
             if isinstance(leagueflow, FailedModel):
@@ -227,7 +227,7 @@ class Player:
             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]
+            records: RecordsSoloSuccessModel | FailedModel = type_validate_json(SoloRecord, raw_records)  # type: ignore[arg-type]  # pyright: ignore[reportArgumentType]
             if isinstance(records, FailedModel):
                 msg = f'用户Summaries数据请求错误:\n{records.error}'
                 raise RequestError(msg)

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

@@ -3,7 +3,7 @@ from typing import Literal
 
 from pydantic import BaseModel, Field
 
-from ...typing import Prisecter
+from ...typedefs import Prisecter
 
 
 class AggregateStats(BaseModel):
@@ -52,12 +52,12 @@ class P(BaseModel):
 
 # 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]
+    bronze:   int | None = Field(default=None, alias='1')
+    silver:   int | None = Field(default=None, alias='2')
+    gold:     int | None = Field(default=None, alias='3')
+    platinum: int | None = Field(default=None, alias='4')
+    diamond:  int | None = Field(default=None, alias='5')
+    issued:   int | None = Field(default=None, alias='100')
     top3:     int | None = Field(default=None, alias='t3')
     top5:     int | None = Field(default=None, alias='t5')
     top10:    int | None = Field(default=None, alias='t10')

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

@@ -12,11 +12,11 @@ class Time(BaseModel):
     zero: bool
     locked: bool
     prev: int
-    frameoffset: int
+    frameoffset: int | None = None
 
 
 class Stats(BaseModel):
-    seed: int | None = None  # ?: 不知道是之后都没有了还是还会有
+    seed: float | None = None  # ?: 不知道是之后都没有了还是还会有
     lines: int
     level_lines: int
     level_lines_needed: int
@@ -24,8 +24,8 @@ class Stats(BaseModel):
     holds: int = 0
     time: Time | None = None  # ?: 不知道是之后都没有了还是还会有
     score: int
-    zenlevel: int
-    zenprogress: int
+    zenlevel: int | None = None
+    zenprogress: int | None = None
     level: int
     combo: int
     currentcombopower: int | None = None

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

@@ -3,7 +3,7 @@ from typing import Any
 from nonebot.compat import PYDANTIC_V2
 from pydantic import BaseModel, Field
 
-from ...typing import Prisecter
+from ...typedefs import Prisecter
 
 
 class Parameter(BaseModel):

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

@@ -3,11 +3,11 @@ from typing import Literal
 
 from pydantic import BaseModel, Field
 
-from ...typing import Rank, ValidRank
+from ...typedefs import Rank, ValidRank
 from ..base import ArCounts, FailedModel, P, SuccessModel
 
 
-class League(BaseModel):
+class BaseLeague(BaseModel):
     gamesplayed: int
     gameswon: int
     tr: float
@@ -16,13 +16,22 @@ class League(BaseModel):
     bestrank: ValidRank
     glicko: float
     rd: float
-    apm: float
-    pps: float
-    vs: float
     decaying: bool
 
 
-class Entry(BaseModel):
+class InvalidLeague(BaseLeague):
+    pps: float | None
+    apm: None
+    vs: None
+
+
+class League(BaseLeague):
+    pps: float
+    apm: float
+    vs: float
+
+
+class BaseEntry(BaseModel):
     id: str = Field(..., alias='_id')
     username: str
     role: Literal['anon', 'user', 'bot', 'halfmod', 'mod', 'admin', 'sysop']
@@ -30,7 +39,6 @@ class Entry(BaseModel):
     xp: float
     country: str | None = None
     supporter: bool | None = None
-    league: League
     gamesplayed: int
     gameswon: int
     gametime: float
@@ -39,8 +47,16 @@ class Entry(BaseModel):
     p: P
 
 
+class InvalidEntry(BaseEntry):
+    league: InvalidLeague
+
+
+class Entry(BaseEntry):
+    league: League
+
+
 class Data(BaseModel):
-    entries: list[Entry]
+    entries: list[Entry | InvalidEntry]
 
 
 class BySuccessModel(SuccessModel):

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

@@ -14,8 +14,8 @@ __all__ = [
     'SoloSuccessModel',
     'SummariesModel',
     'Zen',
+    'ZenSuccessModel',
     'Zenith',
     'ZenithEx',
     'ZenithSuccessModel',
-    'ZenSuccessModel',
 ]

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

@@ -1,25 +1,94 @@
-from typing import TypeAlias
+from datetime import datetime
+from enum import IntEnum
+from typing import Literal, TypeAlias
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 from ..base import FailedModel, SuccessModel
 
 
+class RankType(IntEnum):
+    PERCENTILE = 1
+    ISSUE = 2
+    ZENITH = 3
+    PERCENTILELAX = 4
+    PERCENTILEVLAX = 5
+    PERCENTILEMLAX = 6
+    PERCENTILEINVARIANT = 7
+
+
+class ValueType(IntEnum):
+    NONE = 0
+    NUMBER = 1
+    TIME = 2
+    TIME_INV = 3
+    FLOOR = 4
+    ISSUE = 5
+    NUMBER_INV = 6
+
+
+class ArType(IntEnum):
+    UNRANKED = 0
+    RANKED = 1
+    COMPETITIVE = 2
+
+
+class Rank(IntEnum):
+    NONE = 0
+    BRONZE = 1
+    SILVER = 2
+    GOLD = 3
+    PLATINUM = 4
+    DIAMOND = 5
+    ISSUED = 100
+
+
+class Ally(BaseModel):
+    id: str = Field(alias='_id')
+    username: str
+    role: Literal['anon', 'user', 'bot', 'halfmod', 'mod', 'admin', 'sysop', 'hidden', 'banned']
+    country: str | None = None
+    supporter: bool
+    avatar_revision: int | None = None
+
+
+class X(BaseModel):
+    ally: Ally | None = None
+
+
 class Achievement(BaseModel):
     # 这**都是些啥
-    k: int
-    o: int
-    rt: int
-    vt: int
+    achievement_id: int = Field(alias='k')
+    category: str
+    primary_name: str = Field(alias='name')
+    objective: str = Field(alias='object')
+    flavor_text: str = Field(alias='desc')
+    order: int = Field(alias='o')
+    rank_type: RankType = Field(alias='rt')
+    value_type: ValueType = Field(alias='vt')
+    ar_type: ArType = Field(alias='art')
     min: int
     deci: int
-    name: str
-    object: str
-    category: str
     hidden: bool
-    desc: str
+    nolb: bool
+    event: str | None = None
+    event_past: bool | None = None
+    disabled: bool | None = None
+    pair: bool | None = None
+    achieved_score: float | None = Field(None, alias='v')
+    a: float | None = None
+    t: datetime | None = None
+    pos: int | None = None
+    total: int | None = None
+    rank: Rank | None = None
+    x: X | None = None
     n: str
-    stub: bool
+
+    tiebreak: int
+    notifypb: bool
+    id: str | None = Field(None, alias='_id')
+    progress: float | None = None
+    stub: bool | None = None
 
 
 class AchievementsSuccessModel(SuccessModel):

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

@@ -3,7 +3,7 @@ from typing import Literal
 from nonebot.compat import PYDANTIC_V2
 from pydantic import BaseModel, Field
 
-from ...typing import Rank, S1Rank, S1ValidRank
+from ...typedefs import Rank, S1Rank, S1ValidRank
 from ..base import SuccessModel
 
 if PYDANTIC_V2:
@@ -32,7 +32,7 @@ class PastInner(BaseModel):
 
 
 class Past(BaseModel):
-    first: PastInner | None = Field(default=None, alias='1')  # pyright: ignore [reportGeneralTypeIssues]
+    first: PastInner | None = Field(default=None, alias='1')
 
 
 class BaseData(BaseModel):

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

@@ -86,7 +86,7 @@ class Record(BaseModel):
     pb: bool
     oncepb: bool
     ts: datetime
-    revolution: None
+    revolution: str | None
     user: User
     otherusers: list
     leaderboards: list[str]
@@ -97,7 +97,7 @@ class Record(BaseModel):
 
 
 class Best(BaseModel):
-    record: None  # WTF
+    record: Record | None
     rank: int
 
 

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

@@ -33,6 +33,11 @@ class Distinguishment(BaseModel):
     type: str
 
 
+class OldUsernames(BaseModel):
+    username: str
+    ts: datetime
+
+
 class Data(BaseModel):
     id: str = Field(default=..., alias='_id')
     username: str
@@ -65,6 +70,7 @@ class Data(BaseModel):
     achievements: list[int]
     ar: int
     ar_counts: ArCounts
+    oldusernames: list[OldUsernames]
 
 
 class UserInfoSuccess(BaseSuccessModel):

nonebot_plugin_tetris_stats/games/tetrio/api/typedefs.py

@@ -1,7 +1,6 @@
 from typing import Literal, NewType
 
 S1ValidRank = Literal[
-    'x+',
     'x',
     'u',
     'ss',

nonebot_plugin_tetris_stats/games/tetrio/bind.py

@@ -1,21 +1,26 @@
+from asyncio import gather
 from hashlib import md5
+from secrets import choice
 
 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
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import QryItrface, Uninfo
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
-from nonebot_plugin_userinfo import BotUserInfo, UserInfo
 from yarl import URL
 
+from ...config.config import global_config
 from ...db import BindStatus, create_or_update_bind, trigger
-from ...utils.host import HostPage, get_self_netloc
+from ...i18n import Lang
+from ...utils.host import get_self_netloc
 from ...utils.image import get_avatar
-from ...utils.render import Bind, render
+from ...utils.lang import get_lang
+from ...utils.render import render_image
 from ...utils.render.schemas.base import Avatar, People
-from ...utils.screenshot import screenshot
+from ...utils.render.schemas.bind import Bind
 from . import alc, command, get_player
 from .api import Player
 from .constant import GAME_TYPE
@@ -41,9 +46,45 @@ alc.shortcut(
     humanized='io绑定',
 )
 
+try:
+    from nonebot.adapters.discord import MessageCreateEvent
+
+    @alc.assign('TETRIO.bind')
+    async def _(_: MessageCreateEvent, nb_user: User, account: Player, event_session: Uninfo, interface: QryItrface):
+        async with trigger(
+            session_persist_id=await get_session_persist_id(event_session),
+            game_platform=GAME_TYPE,
+            command_type='bind',
+            command_args=[],
+        ):
+            user, user_info = await gather(account.user, account.get_info())
+            verify = (
+                user_info.data.connections.discord is not None
+                and user_info.data.connections.discord.id == event_session.user.id
+            )
+            async with get_session() as session:
+                bind_status = await create_or_update_bind(
+                    session=session,
+                    user=nb_user,
+                    game_platform=GAME_TYPE,
+                    game_account=user.unique_identifier,
+                    verify=verify,
+                )
+            if bind_status in (BindStatus.SUCCESS, BindStatus.UPDATE):
+                await UniMessage.image(
+                    raw=await make_bind_image(
+                        player=account,
+                        event_session=event_session,
+                        interface=interface,
+                        verify=verify,
+                    )
+                ).finish()
+except ImportError:
+    pass
+
 
 @alc.assign('TETRIO.bind')
-async def _(nb_user: User, account: Player, event_session: EventSession, bot_info: UserInfo = BotUserInfo()):  # noqa: B008
+async def _(nb_user: User, account: Player, event_session: Uninfo, interface: QryItrface):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
@@ -59,28 +100,45 @@ async def _(nb_user: User, account: Player, event_session: EventSession, bot_inf
                 game_account=user.unique_identifier,
             )
         if bind_status in (BindStatus.SUCCESS, BindStatus.UPDATE):
-            netloc = get_self_netloc()
-            async with HostPage(
-                await render(
-                    'v1/binding',
-                    Bind(
-                        platform='TETR.IO',
-                        status='unknown',
-                        user=People(
-                            avatar=str(
-                                URL(f'http://{netloc}/host/resource/tetrio/avatars/{user.ID}')
-                                % {'revision': avatar_revision}
-                            )
-                            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'),
-                            name=bot_info.user_name,
-                        ),
-                        command='io查我',
-                    ),
+            await UniMessage.image(
+                raw=await make_bind_image(
+                    player=account,
+                    event_session=event_session,
+                    interface=interface,
+                    verify=None,
                 )
-            ) as page_hash:
-                await UniMessage.image(raw=await screenshot(f'http://{netloc}/host/{page_hash}.html')).finish()
+            ).finish()
+
+
+async def make_bind_image(
+    player: Player, event_session: Uninfo, interface: QryItrface, *, verify: bool | None = None
+) -> bytes:
+    (user, avatar_revision) = await gather(player.user, player.avatar_revision)
+    return await render_image(
+        Bind(
+            platform='TETR.IO',
+            type='unknown' if verify is None else 'success' if verify else 'unverified',
+            user=People(
+                avatar=str(
+                    URL(f'http://{get_self_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(),
+            ),
+            bot=People(
+                avatar=await get_avatar(
+                    (
+                        bot_user := await interface.get_user(event_session.self_id)
+                        or UninfoUser(id=event_session.self_id)
+                    ),
+                    'Data URI',
+                    '../../static/logo/logo.svg',
+                ),
+                name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
+            ),
+            prompt=Lang.prompt.io_check(),
+            lang=get_lang(),
+        ),
+    )

nonebot_plugin_tetris_stats/games/tetrio/config.py

@@ -1,17 +1,21 @@
+from datetime import timedelta
+
 from arclet.alconna import Arg
 from nonebot_plugin_alconna import Option, Subcommand
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import async_scoped_session
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
 from sqlalchemy import select
 
 from ...db import trigger
+from ...i18n import Lang
+from ...utils.duration import parse_duration
 from . import alc, command
 from .constant import GAME_TYPE
 from .models import TETRIOUserConfig
-from .typing import Template
+from .typedefs import Template
 
 command.add(
     Subcommand(
@@ -22,6 +26,12 @@ command.add(
             alias=['-DT', 'DefaultTemplate'],
             help_text='设置默认查询模板',
         ),
+        Option(
+            '--default-compare',
+            Arg('compare', parse_duration, notice='对比时间距离'),
+            alias=['-DC', 'DefaultCompare'],
+            help_text='设置默认对比时间距离',
+        ),
         help_text='TETR.IO 查询个性化配置',
     ),
 )
@@ -34,18 +44,28 @@ alc.shortcut(
 
 
 @alc.assign('TETRIO.config')
-async def _(user: User, session: async_scoped_session, event_session: EventSession, template: Template):
+async def _(
+    user: User,
+    session: async_scoped_session,
+    event_session: Uninfo,
+    template: Template | None = None,
+    compare: timedelta | None = None,
+):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
         command_type='config',
-        command_args=[f'--default-template {template}'],
+        command_args=([f'--default-template {template}'] if template is not None else [])
+        + ([f'--default-compare {compare}'] if compare is not None else []),
     ):
         config = (await session.scalars(select(TETRIOUserConfig).where(TETRIOUserConfig.id == user.id))).one_or_none()
         if config is None:
-            config = TETRIOUserConfig(id=user.id, query_template=template)
+            config = TETRIOUserConfig(id=user.id, query_template=template or 'v1', compare_delta=compare)
             session.add(config)
         else:
-            config.query_template = template
+            if template is not None:
+                config.query_template = template
+            if compare is not None:
+                config.compare_delta = compare
         await session.commit()
-        await UniMessage('配置成功').finish()
+        await UniMessage(Lang.bind.config_success()).finish()

nonebot_plugin_tetris_stats/games/tetrio/constant.py

@@ -1,9 +1,9 @@
-from re import compile
+from re import compile  # noqa: A004
 from typing import Literal
 
 from yarl import URL
 
-from .api.typing import ValidRank
+from .api.typedefs import ValidRank
 
 GAME_TYPE: Literal['IO'] = 'IO'
 

nonebot_plugin_tetris_stats/games/tetrio/list.py

@@ -1,19 +1,19 @@
 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 nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 
 from ...db import trigger
-from ...utils.host import HostPage, get_self_netloc
+from ...utils.lang import get_lang
 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 ...utils.render import render_image
+from ...utils.render.schemas.v2.tetrio.user.list import Data, List, TetraLeague, User
 from .. import alc
 from . import 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 GAME_TYPE
 
 command.add(
@@ -30,7 +30,7 @@ command.add(
 
 @alc.assign('TETRIO.list')
 async def _(
-    event_session: EventSession,
+    event_session: Uninfo,
     max_tr: float | None = None,
     min_tr: float | None = None,
     limit: int | None = None,
@@ -57,17 +57,19 @@ async def _(
             country=country,
         )
         league = await by('league', parameter)
-        async with HostPage(
-            await render(
-                'v2/tetrio/user/list',
+        await UniMessage.image(
+            raw=await render_image(
                 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,
+                    data=[
+                        Data(
+                            user=User(
+                                id=i.id,
+                                name=i.username.upper(),
+                                avatar=f'https://tetr.io/user-content/avatars/{i.id}.jpg',
+                                country=i.country,
+                                xp=i.xp,
+                            ),
                             tetra_league=TetraLeague(
                                 rank=i.league.rank,
                                 tr=round(i.league.tr, 2),
@@ -80,12 +82,11 @@ async def _(
                                 vs=metrics.vs,
                                 adpl=metrics.adpl,
                             ),
-                            xp=i.xp,
-                            join_at=None,
                         )
                         for i in league.data.entries
+                        if isinstance(i, Entry)
                     ],
+                    lang=get_lang(),
                 ),
             )
-        ) as page_hash:
-            await UniMessage.image(raw=await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')).finish()
+        ).finish()

nonebot_plugin_tetris_stats/games/tetrio/models.py

@@ -1,22 +1,27 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 from uuid import UUID
 
 from nonebot_plugin_orm import Model
-from sqlalchemy import DateTime, ForeignKey, String
+from sqlalchemy import DateTime, ForeignKey, Integer, Interval, String, UniqueConstraint
 from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column, relationship
 
 from ...db.models import PydanticType
 from .api.schemas.leaderboards.by import BySuccessModel, Entry
-from .api.typing import ValidRank
-from .typing import Template
+from .api.typedefs import ValidRank
+from .typedefs import Template
 
 
 class TETRIOUserConfig(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_io_u_cfg'
+
     id: Mapped[int] = mapped_column(primary_key=True)
     query_template: Mapped[Template] = mapped_column(String(2))
+    compare_delta: Mapped[timedelta | None] = mapped_column(Interval(native=True), nullable=True)
 
 
 class TETRIOLeagueStats(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_io_tl_stats'
+
     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')
@@ -24,11 +29,13 @@ class TETRIOLeagueStats(MappedAsDataclass, Model):
 
 
 class TETRIOLeagueHistorical(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_io_tl_hist'
+
     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_id: Mapped[int] = mapped_column(ForeignKey('nb_t_io_tl_stats.id'), init=False)
     stats: Mapped['TETRIOLeagueStats'] = relationship(back_populates='raw')
 
 
@@ -36,6 +43,8 @@ entry_type = PydanticType([], {Entry})
 
 
 class TETRIOLeagueStatsField(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_io_tl_stats_field'
+
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
     rank: Mapped[ValidRank] = mapped_column(String(2), index=True)
     tr_line: Mapped[float]
@@ -49,5 +58,23 @@ class TETRIOLeagueStatsField(MappedAsDataclass, Model):
     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_id: Mapped[int] = mapped_column(ForeignKey('nb_t_io_tl_stats.id'), init=False)
     stats: Mapped['TETRIOLeagueStats'] = relationship(back_populates='fields')
+
+
+class TETRIOUserUniqueIdentifier(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_io_uid'
+
+    id: Mapped[int] = mapped_column(init=False, primary_key=True)
+    user_unique_identifier: Mapped[str] = mapped_column(String(24), unique=True, index=True)
+
+
+class TETRIOLeagueUserMap(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_io_tl_map'
+    __table_args__ = (UniqueConstraint('uid_id', 'hist_id', name='uq_nb_t_io_tl_map_uid_hist'),)
+
+    id: Mapped[int] = mapped_column(init=False, primary_key=True)
+    stats_id: Mapped[int] = mapped_column(ForeignKey('nb_t_io_tl_stats.id'), index=True)
+    uid_id: Mapped[int] = mapped_column(ForeignKey('nb_t_io_uid.id'), index=True)
+    hist_id: Mapped[int] = mapped_column(ForeignKey('nb_t_io_tl_hist.id'))
+    entry_index: Mapped[int] = mapped_column(Integer)

nonebot_plugin_tetris_stats/games/tetrio/query/__init__.py

@@ -1,28 +1,29 @@
-from datetime import timezone
+from datetime import timedelta, 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_alconna.uniseg import Image, 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_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 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 ....db import query_bind_info, resolve_compare_delta, trigger
 from ....i18n import Lang
+from ....utils.duration import parse_duration
 from ....utils.exception import FallbackError
-from ....utils.typing import Me
+from ....utils.typedefs 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 ..typedefs import Template
 from .v1 import make_query_image_v1
 from .v2 import make_query_image_v2
 
@@ -53,6 +54,12 @@ command.add(
             alias=['-T'],
             help_text='要使用的查询模板',
         ),
+        Option(
+            '--compare',
+            Arg('compare', parse_duration),
+            alias=['-C'],
+            help_text='指定对比时间距离',
+        ),
         help_text='查询 TETR.IO 游戏信息',
     ),
 )
@@ -73,10 +80,10 @@ alc.shortcut(
 add_block_handlers(alc.assign('TETRIO.query'))
 
 
-async def make_query_result(player: Player, template: Template) -> UniMessage:
+async def make_query_result(player: Player, template: Template, compare_delta: timedelta) -> UniMessage:
     if template == 'v1':
         try:
-            return UniMessage.image(raw=await make_query_image_v1(player))
+            return UniMessage.image(raw=await make_query_image_v1(player, compare_delta))
         except FallbackError:
             template = 'v2'
     if template == 'v2':
@@ -90,20 +97,26 @@ async def _(  # noqa: PLR0913
     event: Event,
     matcher: Matcher,
     target: At | Me,
-    event_session: EventSession,
+    event_session: Uninfo,
     template: Template | None = None,
+    compare: timedelta | None = None,
 ):
+    command_args: list[str] = []
+    if template is not None:
+        command_args.append(f'--template {template}')
+    if compare is not None:
+        command_args.append(f'--compare {compare}')
     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 [],
+        command_args=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()
+                    event_session.scope, target.target if isinstance(target, At) else event.get_user_id()
                 ),
                 game_platform=GAME_TYPE,
             )
@@ -111,25 +124,44 @@ async def _(  # noqa: PLR0913
                 template = await session.scalar(
                     select(TETRIOUserConfig.query_template).where(TETRIOUserConfig.id == user.id)
                 )
+            compare_delta = await resolve_compare_delta(TETRIOUserConfig, session, user.id, compare)
         if bind is None:
-            await matcher.finish('未查询到绑定信息')
+            await matcher.finish(Lang.bind.not_found())
         player = Player(user_id=bind.game_account, trust=True)
         await (
-            UniMessage.i18n(Lang.interaction.warning.unverified) + await make_query_result(player, template or 'v1')
+            UniMessage.i18n(Lang.interaction.warning.unverified)
+            + (
+                UniMessage('\n')
+                if not (result := await make_query_result(player, template or 'v1', compare_delta)).has(Image)
+                else UniMessage()
+            )
+            + result
         ).finish()
 
 
 @alc.assign('TETRIO.query')
-async def _(user: NBUser, account: Player, event_session: EventSession, template: Template | None = None):
+async def _(
+    user: NBUser,
+    account: Player,
+    event_session: Uninfo,
+    template: Template | None = None,
+    compare: timedelta | None = None,
+):
+    command_args: list[str] = []
+    if template is not None:
+        command_args.append(f'--template {template}')
+    if compare is not None:
+        command_args.append(f'--compare {compare}')
     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 [],
+        command_args=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()
+            compare_delta = await resolve_compare_delta(TETRIOUserConfig, session, user.id, compare)
+        await (await make_query_result(account, template or 'v1', compare_delta)).finish()

nonebot_plugin_tetris_stats/games/tetrio/query/tools.py

@@ -4,22 +4,22 @@ from typing import TypeVar, overload
 from zoneinfo import ZoneInfo
 
 from ....utils.exception import FallbackError
-from ....utils.render.schemas.tetrio.user.base import TetraLeagueHistoryData
+from ....utils.render.schemas.base import HistoryData
 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]:
+    handle: Callable[[list[HistoryData]], list[HistoryData]] | None = None,
+) -> list[HistoryData]:
     if isinstance(leagueflow.data, Empty):
         raise FallbackError
     start_time = leagueflow.data.start_time.astimezone(ZoneInfo('Asia/Shanghai'))
     ret = [
-        TetraLeagueHistoryData(
+        HistoryData(
             record_at=start_time + timedelta(milliseconds=i.timestamp_offset),
-            tr=i.post_match_tr,
+            score=i.post_match_tr,
         )
         for i in leagueflow.data.points
         if start_time + timedelta(milliseconds=i.timestamp_offset)

nonebot_plugin_tetris_stats/games/tetrio/query/v1.py

@@ -1,128 +1,223 @@
 from asyncio import gather
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from hashlib import md5
-from math import ceil, floor
-from zoneinfo import ZoneInfo
+from typing import Literal, NamedTuple
 
+from nonebot_plugin_orm import AsyncSession, get_session
+from sqlalchemy import func, select
 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 ....utils.chart import get_split, get_value_bounds, handle_history_data
+from ....utils.host import get_self_netloc
+from ....utils.lang import get_lang
+from ....utils.metrics import TetrisMetricsProWithPPSVS, get_metrics
+from ....utils.render import render_image
+from ....utils.render.schemas.base import Avatar, Trending
+from ....utils.render.schemas.v1.base import History
+from ....utils.render.schemas.v1.tetrio.info import Info, Multiplayer, Singleplayer, User
 from ..api import Player
-from ..api.schemas.summaries.league import RatedData
+from ..api.models import TETRIOHistoricalData
+from ..api.schemas.leaderboards.by import Entry, InvalidEntry
+from ..api.schemas.summaries.league import LeagueSuccessModel, NeverRatedData, RatedData
 from ..constant import TR_MAX, TR_MIN
+from ..models import TETRIOLeagueHistorical, TETRIOLeagueUserMap, TETRIOUserUniqueIdentifier
 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
+UTC = timezone.utc
 
 
-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
+class Trends(NamedTuple):
+    pps: Trending = Trending.KEEP
+    apm: Trending = Trending.KEEP
+    adpm: Trending = Trending.KEEP
 
 
-def get_specified_point(
-    previous_point: TetraLeagueHistoryData,
-    behind_point: TetraLeagueHistoryData,
-    point_time: datetime,
-) -> TetraLeagueHistoryData:
-    """根据给出的 previous_point 和 behind_point, 推算 point_time 点处的数据
+class HistoricalSnapshot(NamedTuple):
+    metrics: TetrisMetricsProWithPPSVS
+    delta: timedelta
 
-    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)
+async def get_nearest_historical(
+    session: AsyncSession,
+    unique_identifier: str,
+    target_time: datetime,
+) -> HistoricalSnapshot | None:
+    before = await session.scalar(
+        select(TETRIOHistoricalData)
+        .where(
+            TETRIOHistoricalData.user_unique_identifier == unique_identifier,
+            TETRIOHistoricalData.api_type == 'league',
+            TETRIOHistoricalData.update_time <= target_time,
+        )
+        .order_by(TETRIOHistoricalData.update_time.desc())
+        .limit(1)
     )
-    return TetraLeagueHistoryData(
-        record_at=point_time,
-        tr=previous_point.tr + slope * (datetime.timestamp(point_time) - datetime.timestamp(previous_point.record_at)),
+    after = await session.scalar(
+        select(TETRIOHistoricalData)
+        .where(
+            TETRIOHistoricalData.user_unique_identifier == unique_identifier,
+            TETRIOHistoricalData.api_type == 'league',
+            TETRIOHistoricalData.update_time >= target_time,
+        )
+        .order_by(TETRIOHistoricalData.update_time.asc())
+        .limit(1)
+    )
+    candidates = [i for i in (before, after) if i is not None]
+    if not candidates:
+        return None
+
+    delta_seconds, selected = min(
+        (
+            abs((target_time - i.update_time.astimezone(UTC)).total_seconds()),
+            i,
+        )
+        for i in candidates
+    )
+    delta = timedelta(seconds=delta_seconds)
+
+    if not isinstance(selected.data, LeagueSuccessModel) or not isinstance(
+        selected.data.data, RatedData | NeverRatedData
+    ):
+        return None
+
+    data = selected.data.data
+    return HistoricalSnapshot(get_metrics(pps=data.pps, apm=data.apm, vs=data.vs), delta)
+
+
+async def _get_boundary_league_historical(
+    session: AsyncSession,
+    uid_id: int,
+    target_time: datetime,
+    *,
+    time_direction: Literal['before', 'after'],
+) -> tuple[TETRIOLeagueUserMap, datetime] | None:
+    boundary_time = await session.scalar(
+        select((func.max if time_direction == 'before' else func.min)(TETRIOLeagueHistorical.update_time))
+        .select_from(TETRIOLeagueUserMap)
+        .join(TETRIOLeagueHistorical, TETRIOLeagueUserMap.hist_id == TETRIOLeagueHistorical.id)
+        .where(
+            TETRIOLeagueUserMap.uid_id == uid_id,
+            TETRIOLeagueHistorical.update_time <= target_time
+            if time_direction == 'before'
+            else TETRIOLeagueHistorical.update_time >= target_time,
+        )
+    )
+    if boundary_time is None:
+        return None
+
+    return (
+        (
+            await session.execute(
+                select(TETRIOLeagueUserMap, TETRIOLeagueHistorical.update_time)
+                .join(TETRIOLeagueHistorical, TETRIOLeagueUserMap.hist_id == TETRIOLeagueHistorical.id)
+                .where(
+                    TETRIOLeagueUserMap.uid_id == uid_id,
+                    TETRIOLeagueHistorical.update_time == boundary_time,
+                )
+                .order_by(TETRIOLeagueHistorical.id.desc())
+                .limit(1)
+            )
+        )
+        .tuples()
+        .first()
     )
 
 
-def handle_history_data(data: list[TetraLeagueHistoryData]) -> list[TetraLeagueHistoryData]:  # noqa: C901, PLR0912
-    # 按照 记录时间 对数据进行排序
-    data.sort(key=lambda x: x.record_at)
+async def get_nearest_league_historical(
+    session: AsyncSession,
+    unique_identifier: str,
+    target_time: datetime,
+) -> HistoricalSnapshot | None:
+    uid_id = await session.scalar(
+        select(TETRIOUserUniqueIdentifier.id).where(
+            TETRIOUserUniqueIdentifier.user_unique_identifier == unique_identifier
+        )
+    )
+    if uid_id is None:
+        return None
 
-    # 定义时间边界, 右边界为当前时间的当天零点, 左边界为右边界前推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)
+    before = await _get_boundary_league_historical(
+        session,
+        uid_id,
+        target_time,
+        time_direction='before',
+    )
+    after = await _get_boundary_league_historical(
+        session,
+        uid_id,
+        target_time,
+        time_direction='after',
+    )
 
-    lefts: list[TetraLeagueHistoryData] = []
-    in_border: list[TetraLeagueHistoryData] = []
-    rights: list[TetraLeagueHistoryData] = []
+    candidates = [i for i in (before, after) if i is not None]
+    if not candidates:
+        return None
+    delta_seconds, selected = min(
+        (
+            abs((target_time - i[1].astimezone(UTC)).total_seconds()),
+            i[0],
+        )
+        for i in candidates
+    )
+    delta = timedelta(seconds=delta_seconds)
 
-    # 根据 记录时间 将数据分类到对应的列表中
-    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
+    historical = await session.get(TETRIOLeagueHistorical, selected.hist_id)
+    if historical is None or not isinstance(
+        (entry := find_entry(historical.data.data.entries, selected.entry_index, unique_identifier)), Entry
+    ):
+        return None
+    return HistoricalSnapshot(get_metrics(pps=entry.league.pps, apm=entry.league.apm, vs=entry.league.vs), delta)
 
 
-async def make_query_image_v1(player: Player) -> bytes:
+def find_entry(
+    entries: list[Entry | InvalidEntry],
+    entry_index: int,
+    unique_identifier: str | None = None,
+) -> Entry | InvalidEntry | None:
+    if 0 <= entry_index < len(entries):
+        entry = entries[entry_index]
+        if unique_identifier is None or entry.id == unique_identifier:
+            return entry
+    if unique_identifier is None:
+        return None
+    for entry in entries:
+        if entry.id == unique_identifier:
+            return entry
+    return None
+
+
+async def get_trends(player: Player, compare_delta: timedelta) -> Trends:
+    league = await player.league
+    if not isinstance(league.data, RatedData | NeverRatedData):
+        return Trends()
+    user = await player.user
+
+    async with get_session() as session:
+        target_time = (league.cache.cached_at - compare_delta).astimezone(UTC)
+        historical, league_historical = await gather(
+            get_nearest_historical(
+                session,
+                user.unique_identifier,
+                target_time,
+            ),
+            get_nearest_league_historical(
+                session,
+                user.unique_identifier,
+                target_time,
+            ),
+        )
+    selected = min((historical, league_historical), key=lambda x: x.delta if x is not None else timedelta.max)
+    if selected is None:
+        return Trends()
+    metrics = get_metrics(pps=league.data.pps, apm=league.data.apm, vs=league.data.vs)
+    return Trends(
+        pps=Trending.compare(selected.metrics.pps, metrics.pps),
+        apm=Trending.compare(selected.metrics.apm, metrics.apm),
+        adpm=Trending.compare(selected.metrics.adpm, metrics.adpm),
+    )
+
+
+async def make_query_image_v1(player: Player, compare_delta: timedelta) -> bytes:
     (
         (user, user_info, league, sprint, blitz, leagueflow),
         (avatar_revision,),
@@ -131,67 +226,66 @@ async def make_query_image_v1(player: Player) -> bytes:
         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)
+    values = get_value_bounds([i.score for i in histories])
+    split_value, offset = get_split(values, TR_MAX, TR_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,
+    dsps: float
+    dspp: float
+    # make mypy happy
+    return await render_image(
+        Info(
+            user=User(
+                avatar=str(
+                    URL(f'http://{get_self_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
                 ),
-                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(
+                name=user.name.upper(),
+                bio=user_info.data.bio,
+            ),
+            multiplayer=Multiplayer(
+                glicko=f'{round(league_data.glicko, 2):,}',
+                rd=round(league_data.rd, 2),
+                rank=league_data.rank,
+                tr=f'{round(league_data.tr, 2):,}',
+                global_rank=league_data.standing,
+                history=History(
                     data=histories,
                     split_interval=split_value,
-                    min_tr=value_min,
-                    max_tr=value_max,
+                    min_value=values.value_min,
+                    max_value=values.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),
-                ),
+                lpm=(metrics := get_metrics(pps=league_data.pps, apm=league_data.apm, vs=league_data.vs)).lpm,
+                pps=metrics.pps,
+                lpm_trending=(trends := (await get_trends(player, compare_delta))).pps,
+                apm=metrics.apm,
+                apl=metrics.apl,
+                apm_trending=trends.apm,
+                adpm=metrics.adpm,
+                vs=metrics.vs,
+                adpl=metrics.adpl,
+                adpm_trending=trends.adpm,
+                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),
+            ),
+            singleplayer=Singleplayer(
                 sprint=sprint_value,
                 blitz=blitz_value,
             ),
-        )
-    ) as page_hash:
-        return await screenshot(f'http://{netloc}/host/{page_hash}.html')
+            lang=get_lang(),
+        ),
+    )

nonebot_plugin_tetris_stats/games/tetrio/query/v2.py

@@ -5,12 +5,15 @@ from hashlib import md5
 from yarl import URL
 
 from ....utils.exception import FallbackError
-from ....utils.host import HostPage, get_self_netloc
+from ....utils.host import get_self_netloc
+from ....utils.lang import get_lang
 from ....utils.metrics import get_metrics
-from ....utils.render import render
+from ....utils.render import render_image
 from ....utils.render.schemas.base import Avatar
-from ....utils.render.schemas.tetrio.user.info_v2 import (
+from ....utils.render.schemas.v2.tetrio.user.info import (
+    Achievement,
     Badge,
+    Best,
     Blitz,
     Info,
     Sprint,
@@ -18,9 +21,10 @@ from ....utils.render.schemas.tetrio.user.info_v2 import (
     TetraLeague,
     TetraLeagueStatistic,
     User,
+    Week,
     Zen,
+    Zenith,
 )
-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
@@ -29,10 +33,24 @@ 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),
+        (avatar_revision, banner_revision, leagueflow, zenith, zenithex, achievements),
     ) = 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()),
+        gather(
+            player.user,
+            player.get_info(),
+            player.league,
+            player.sprint,
+            player.blitz,
+            player.zen,
+        ),
+        gather(
+            player.avatar_revision,
+            player.banner_revision,
+            player.get_leagueflow(),
+            player.get_summaries('zenith'),
+            player.get_summaries('zenithex'),
+            player.get_summaries('achievements'),
+        ),
     )
     if sprint.data.record is not None:
         duration = timedelta(milliseconds=sprint.data.record.results.stats.finaltime).total_seconds()
@@ -43,9 +61,9 @@ async def make_query_image_v2(player: Player) -> bytes:
     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'
+            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'
+            play_time = f'{game_time // 60:.0f}m {game_time % 60:.0f}s'
         else:
             play_time = f'{game_time:.0f}s'
     else:
@@ -55,84 +73,133 @@ async def make_query_image_v2(player: Player) -> bytes:
     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,
+    return await render_image(
+        Info(
+            user=User(
+                id=user.ID,
+                name=user.name.upper(),
+                country=user_info.data.country,
+                role=user_info.data.role,
+                botmaster=user_info.data.botmaster,
+                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
                 ),
-                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,
+                banner=str(
+                    URL(f'http://{netloc}/host/resource/tetrio/banners/{user.ID}') % {'revision': banner_revision}
                 )
-                if not isinstance(league.data, NeverPlayedData | InvalidData)
+                if banner_revision is not None and banner_revision != 0
                 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),
+                bio=user_info.data.bio,
+                friend_count=user_info.data.friend_count,
+                supporter_tier=user_info.data.supporter_tier,
+                bad_standing=user_info.data.badstanding or False,
+                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
+                ],
+                xp=user_info.data.xp,
+                ar=user_info.data.ar,
+                achievements=[
+                    Achievement(
+                        key=i.achievement_id,
+                        rank_type=i.rank_type,
+                        ar_type=i.ar_type,
+                        stub=i.stub,
+                        rank=i.rank,
+                        achieved_score=i.achieved_score,
+                        pos=i.pos,
+                        progress=i.progress,
+                        total=i.total,
+                    )
+                    for i in achievements.data
+                ],
+                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,
+            zenith=Zenith(
+                week=Week(
+                    altitude=zenith.data.record.results.stats.zenith.altitude,
+                    global_rank=zenith.data.rank,
+                    country_rank=zenith.data.rank_local,
+                    play_at=zenith.data.record.ts,
+                )
+                if zenith.data.record is not None
+                else None,
+                best=Best(
+                    altitude=zenith.data.best.record.results.stats.zenith.altitude,
+                    global_rank=zenith.data.best.rank,
+                    play_at=zenith.data.best.record.ts,
+                )
+                if zenith.data.best.record is not None
+                else None,
+            ),
+            zenithex=Zenith(
+                week=Week(
+                    altitude=zenithex.data.record.results.stats.zenith.altitude,
+                    global_rank=zenithex.data.rank,
+                    country_rank=zenithex.data.rank_local,
+                    play_at=zenithex.data.record.ts,
+                )
+                if zenithex.data.record is not None
+                else None,
+                best=Best(
+                    altitude=zenithex.data.best.record.results.stats.zenith.altitude,
+                    global_rank=zenithex.data.best.rank,
+                    play_at=zenithex.data.best.record.ts,
+                )
+                if zenithex.data.best.record is not None
+                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,
+                country_rank=sprint.data.rank_local,
+                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,
+                country_rank=blitz.data.rank_local,
+                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),
+            lang=get_lang(),
         ),
-    ) as page_hash:
-        return await screenshot(f'http://{netloc}/host/{page_hash}.html')
+    )

nonebot_plugin_tetris_stats/games/tetrio/rank/__init__.py

@@ -1,9 +1,9 @@
 from collections import defaultdict
-from collections.abc import Callable, Sequence
+from collections.abc import Callable, Iterator, Sequence
 from datetime import datetime, timedelta, timezone
 from math import floor
 from statistics import mean
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, TypeVar
 from uuid import uuid4
 
 from nonebot import get_driver
@@ -12,6 +12,7 @@ from nonebot_plugin_apscheduler import scheduler
 from nonebot_plugin_orm import get_session
 from sqlalchemy import select
 
+from ....config.config import config
 from ....utils.exception import RequestError
 from ....utils.retry import retry
 from .. import alc
@@ -21,11 +22,17 @@ 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
+from ..models import (
+    TETRIOLeagueHistorical,
+    TETRIOLeagueStats,
+    TETRIOLeagueStatsField,
+    TETRIOLeagueUserMap,
+    TETRIOUserUniqueIdentifier,
+)
 
 if TYPE_CHECKING:
     from ..api.schemas.leaderboards.by import BySuccessModel
-    from ..api.typing import Rank
+    from ..api.typedefs import Rank
 
 UTC = timezone.utc
 
@@ -80,6 +87,14 @@ def find_special_player(
     return sort(users, field)
 
 
+T = TypeVar('T')
+
+
+def _chunked(values: list[T], size: int) -> Iterator[list[T]]:
+    for i in range(0, len(values), size):
+        yield values[i : i + size]
+
+
 @scheduler.scheduled_job('cron', hour='0,6,12,18', minute=0)
 async def get_tetra_league_data() -> None:
     x_session_id = uuid4()
@@ -93,9 +108,7 @@ async def get_tetra_league_data() -> None:
         if len(model.data.entries) < 100:  # 分页值 # noqa: PLR2004
             break
 
-    players: list[Entry] = []
-    for result in results:
-        players.extend(result.data.entries)
+    players = [i for result in results for i in result.data.entries if isinstance(i, Entry)]
     players.sort(key=lambda x: x.league.tr, reverse=True)
 
     rank_player_mapping: defaultdict[Rank, list[Entry]] = defaultdict(list)
@@ -131,22 +144,53 @@ async def get_tetra_league_data() -> None:
     ]
     stats.raw = historicals
     stats.fields = fields
+    player_ids = {i.id for result in results for i in result.data.entries}
     async with get_session() as session:
         session.add(stats)
+        existing_ids: list[TETRIOUserUniqueIdentifier] = []
+        for chunk in _chunked(list(player_ids), 500):
+            existing_ids.extend(
+                (
+                    await session.scalars(
+                        select(TETRIOUserUniqueIdentifier).filter(
+                            TETRIOUserUniqueIdentifier.user_unique_identifier.in_(chunk)
+                        )
+                    )
+                ).all()
+            )
+        new_ids = [
+            TETRIOUserUniqueIdentifier(user_unique_identifier=i)
+            for i in player_ids - {i.user_unique_identifier for i in existing_ids}
+        ]
+        session.add_all(new_ids)
+        await session.flush()
+        uid_mapping = {i.user_unique_identifier: i.id for i in list(existing_ids) + new_ids}
+        maps: list[TETRIOLeagueUserMap] = []
+        for i in stats.raw:
+            for index, entry in enumerate(i.data.data.entries):
+                maps.append(
+                    TETRIOLeagueUserMap(
+                        stats_id=stats.id, uid_id=uid_mapping[entry.id], hist_id=i.id, entry_index=index
+                    )
+                )
+            session.add_all(maps)
+            maps.clear()
         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()
+if not config.tetris.dev.enabled:
+
+    @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
+from . import all, detail  # noqa: A004, E402
 
 base_command.add(command)
 

nonebot_plugin_tetris_stats/games/tetrio/rank/all.py

@@ -3,25 +3,24 @@ 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 nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
+from sqlalchemy import select
 from sqlalchemy.orm import selectinload
 
 from ....db import trigger
-from ....utils.host import HostPage, get_self_netloc
+from ....utils.lang import get_lang
 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 ....utils.render import render_image
+from ....utils.render.schemas.v1.tetrio.rank import Data as DataV1
+from ....utils.render.schemas.v1.tetrio.rank import ItemData as ItemDataV1
+from ....utils.render.schemas.v2.tetrio.rank import AverageData as AverageDataV2
+from ....utils.render.schemas.v2.tetrio.rank import Data as DataV2
+from ....utils.render.schemas.v2.tetrio.rank import ItemData as ItemDataV2
 from .. import alc
 from ..constant import GAME_TYPE
 from ..models import TETRIOLeagueStats
-from ..typing import Template
+from ..typedefs import Template
 from . import command
 
 command.add(
@@ -32,7 +31,7 @@ command.add(
 
 
 @alc.assign('TETRIO.rank.all')
-async def _(event_session: EventSession, template: Template | None = None):
+async def _(event_session: Uninfo, template: Template | None = None):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
@@ -40,6 +39,7 @@ async def _(event_session: EventSession, template: Template | None = None):
         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)
@@ -48,19 +48,42 @@ async def _(event_session: EventSession, template: Template | None = None):
                     .options(selectinload(TETRIOLeagueStats.fields))
                 )
             ).one()
-            compare_data = (
-                await session.scalars(
+
+            # 计算目标时间点 (24小时前)
+            target_time = latest_data.update_time - timedelta(hours=24)
+
+            # 查询目标时间点之前的最近记录
+            before = (
+                await session.scalar(
                     select(TETRIOLeagueStats)
-                    .order_by(
-                        func.abs(
-                            func.julianday(TETRIOLeagueStats.update_time)
-                            - func.julianday(latest_data.update_time - timedelta(hours=24))
-                        )
-                    )
+                    .where(TETRIOLeagueStats.update_time <= target_time)
+                    .order_by(TETRIOLeagueStats.update_time.desc())
                     .limit(1)
                     .options(selectinload(TETRIOLeagueStats.fields))
                 )
-            ).one()
+                or latest_data
+            )
+
+            # 查询目标时间点之后的最近记录
+            after = (
+                await session.scalar(
+                    select(TETRIOLeagueStats)
+                    .where(TETRIOLeagueStats.update_time >= target_time)  # 使用 >= 避免间隙
+                    .order_by(TETRIOLeagueStats.update_time.asc())
+                    .limit(1)
+                    .options(selectinload(TETRIOLeagueStats.fields))
+                )
+                or latest_data
+            )
+
+            # 确定最接近的记录
+            compare_data = (
+                before
+                if abs((target_time - before.update_time).total_seconds())
+                < abs((target_time - after.update_time).total_seconds())
+                else after
+            )
+
         match template:
             case 'v1' | None:
                 await UniMessage.image(raw=await make_image_v1(latest_data, compare_data)).finish()
@@ -68,48 +91,66 @@ async def _(event_session: EventSession, template: Template | None = None):
                 await UniMessage.image(raw=await make_image_v2(latest_data, compare_data)).finish()
 
 
+_RANK_ORDER_INDEX = {
+    v: i
+    for i, v in enumerate(
+        ('x+', 'x', 'u', 'ss', 's+', 's', 's-', 'a+', 'a', 'a-', 'b+', 'b', 'b-', 'c+', 'c', 'c-', 'd+', 'd', 'z')
+    )
+}
+
+
+def _rank_sort_key(rank: str) -> int:
+    try:
+        return _RANK_ORDER_INDEX[rank]
+    except KeyError as e:
+        msg = f'未知段位: {rank!r}'
+        raise ValueError(msg) from e
+
+
 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')
+    return await render_image(
+        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(
+                    sorted(latest_data.fields, key=lambda x: _rank_sort_key(x.rank)),
+                    sorted(compare_data.fields, key=lambda x: _rank_sort_key(x.rank)),
+                    strict=True,
+                )
+            },
+            updated_at=latest_data.update_time,
+            lang=get_lang(),
+        ),
+    )
 
 
 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')
+    return await render_image(
+        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(
+                    sorted(latest_data.fields, key=lambda x: _rank_sort_key(x.rank)),
+                    sorted(compare_data.fields, key=lambda x: _rank_sort_key(x.rank)),
+                    strict=True,
+                )
+            },
+            updated_at=latest_data.update_time,
+            lang=get_lang(),
+        ),
+    )

nonebot_plugin_tetris_stats/games/tetrio/rank/detail.py

@@ -5,19 +5,18 @@ 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 nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
+from sqlalchemy import select
 from sqlalchemy.orm import selectinload
 
 from ....db import trigger
-from ....utils.host import HostPage, get_self_netloc
+from ....utils.lang import get_lang
 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 ....utils.render import render_image
+from ....utils.render.schemas.v2.tetrio.rank.detail import Data, SpecialData
 from .. import alc
-from ..api.typing import ValidRank
+from ..api.typedefs import ValidRank
 from ..constant import GAME_TYPE
 from ..models import TETRIOLeagueStats
 from . import command
@@ -30,7 +29,7 @@ command.add(Option('--detail', Arg('rank', ValidRank), alias=['-D']))
 
 
 @alc.assign('TETRIO.rank')
-async def _(rank: ValidRank, event_session: EventSession):
+async def _(rank: ValidRank, event_session: Uninfo):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
@@ -38,6 +37,7 @@ async def _(rank: ValidRank, event_session: EventSession):
         command_args=[f'--detail {rank}'],
     ):
         async with get_session() as session:
+            # 获取最新记录
             latest_data = (
                 await session.scalars(
                     select(TETRIOLeagueStats)
@@ -46,19 +46,41 @@ async def _(rank: ValidRank, event_session: EventSession):
                     .options(selectinload(TETRIOLeagueStats.fields))
                 )
             ).one()
-            compare_data = (
-                await session.scalars(
+
+            # 计算目标时间点 (24小时前)
+            target_time = latest_data.update_time - timedelta(hours=24)
+
+            # 查询目标时间点之前的最近记录
+            before = (
+                await session.scalar(
                     select(TETRIOLeagueStats)
-                    .order_by(
-                        func.abs(
-                            func.julianday(TETRIOLeagueStats.update_time)
-                            - func.julianday(latest_data.update_time - timedelta(hours=24))
-                        )
-                    )
+                    .where(TETRIOLeagueStats.update_time <= target_time)
+                    .order_by(TETRIOLeagueStats.update_time.desc())
                     .limit(1)
                     .options(selectinload(TETRIOLeagueStats.fields))
                 )
-            ).one()
+                or latest_data  # 回退到最新记录
+            )
+
+            # 查询目标时间点之后的最近记录
+            after = (
+                await session.scalar(
+                    select(TETRIOLeagueStats)
+                    .where(TETRIOLeagueStats.update_time >= target_time)
+                    .order_by(TETRIOLeagueStats.update_time.asc())
+                    .limit(1)
+                    .options(selectinload(TETRIOLeagueStats.fields))
+                )
+                or latest_data  # 回退到最新记录
+            )
+
+            # 确定最接近的记录
+            compare_data = (
+                before
+                if abs((target_time - before.update_time).total_seconds())
+                < abs((target_time - after.update_time).total_seconds())
+                else after
+            )
         await UniMessage.image(
             raw=await make_image(
                 rank,
@@ -90,39 +112,36 @@ async def make_image(rank: ValidRank, latest: TETRIOLeagueStats, compare: TETRIO
     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')),
+    return await render_image(
+        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(),
             ),
-        )
-    ) as page_hash:
-        return await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
+            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')),
+            lang=get_lang(),
+        ),
+    )

nonebot_plugin_tetris_stats/games/tetrio/record/__init__.py

@@ -1,7 +1,7 @@
 from arclet.alconna import Arg, ArgFlag
 from nonebot_plugin_alconna import Args, At, Subcommand
 
-from ....utils.typing import Me
+from ....utils.typedefs import Me
 from .. import command as base_command
 from .. import get_player
 

nonebot_plugin_tetris_stats/games/tetrio/record/blitz.py

@@ -7,22 +7,22 @@ from nonebot.matcher import Matcher
 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
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import get_user
 from yarl import URL
 
 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.host import get_self_netloc
+from ....utils.lang import get_lang
 from ....utils.metrics import get_metrics
-from ....utils.render import render
+from ....utils.render import render_image
 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.blitz import Record, Statistic
-from ....utils.screenshot import screenshot
-from ....utils.typing import Me
+from ....utils.render.schemas.v2.tetrio.record.base import Finesse, Max, Mini, Tspins, User
+from ....utils.render.schemas.v2.tetrio.record.blitz import Record, Statistic
+from ....utils.typedefs import Me
 from .. import alc
 from ..api.player import Player
 from ..constant import GAME_TYPE
@@ -42,7 +42,7 @@ async def _(
     event: Event,
     matcher: Matcher,
     target: At | Me,
-    event_session: EventSession,
+    event_session: Uninfo,
 ):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
@@ -54,12 +54,12 @@ async def _(
             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()
+                    event_session.scope, target.target if isinstance(target, At) else event.get_user_id()
                 ),
                 game_platform=GAME_TYPE,
             )
         if bind is None:
-            await matcher.finish('未查询到绑定信息')
+            await matcher.finish(Lang.bind.not_found())
         player = Player(user_id=bind.game_account, trust=True)
         await (
             UniMessage.i18n(Lang.interaction.warning.unverified) + UniMessage.image(raw=await make_blitz_image(player))
@@ -67,7 +67,7 @@ async def _(
 
 
 @alc.assign('TETRIO.record.blitz')
-async def _(account: Player, event_session: EventSession):
+async def _(account: Player, event_session: Uninfo):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
@@ -80,72 +80,69 @@ async def _(account: Player, event_session: EventSession):
 async def make_blitz_image(player: Player) -> bytes:
     user, blitz = await gather(player.user, player.blitz)
     if blitz.data.record is None:
-        msg = f'未找到用户 {user.name.upper()} 的 Blitz 记录'
+        msg = Lang.record.not_found(username=user.name.upper(), mode=Lang.record.blitz())
         raise RecordNotFoundError(msg)
     stats = blitz.data.record.results.stats
     clears = stats.clears
     duration = timedelta(milliseconds=stats.finaltime).total_seconds()
     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=str(
-                        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
-                    ),
+    return await render_image(
+        Record(
+            type='best',
+            user=User(
+                id=user.ID,
+                name=user.name.upper(),
+                avatar=str(
+                    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.data.record.replayid,
-                rank=blitz.data.rank,
-                personal_rank=1,
-                statistic=Statistic(
-                    keys=stats.inputs,
-                    kpp=round(stats.inputs / stats.piecesplaced, 2),
-                    kps=round(stats.inputs / duration, 2),
-                    max=Max(
-                        combo=max((0, stats.topcombo - 1)),
-                        btb=max((0, stats.topbtb - 1)),
-                    ),
-                    pieces=stats.piecesplaced,
-                    pps=metrics.pps,
-                    lines=stats.lines,
-                    lpm=metrics.lpm,
-                    holds=stats.holds,
-                    score=stats.score,
-                    spp=round(stats.score / stats.piecesplaced, 2),
-                    single=clears.singles,
-                    double=clears.doubles,
-                    triple=clears.triples,
-                    quad=clears.quads,
-                    tspins=Tspins(
-                        total=clears.realtspins,
-                        single=clears.tspinsingles,
-                        double=clears.tspindoubles,
-                        triple=clears.tspintriples,
-                        mini=Mini(
-                            total=clears.minitspins,
-                            single=clears.minitspinsingles,
-                            double=clears.minitspindoubles,
-                        ),
-                    ),
-                    all_clear=clears.allclear,
-                    finesse=Finesse(
-                        faults=stats.finesse.faults,
-                        accuracy=round(stats.finesse.perfectpieces / stats.piecesplaced * 100, 2),
-                    ),
-                    level=stats.level,
-                ),
-                play_at=blitz.data.record.ts,
             ),
-        )
-    ) as page_hash:
-        return await screenshot(f'http://{netloc}/host/{page_hash}.html')
+            replay_id=blitz.data.record.replayid,
+            rank=blitz.data.rank,
+            personal_rank=1,
+            statistic=Statistic(
+                keys=stats.inputs,
+                kpp=round(stats.inputs / stats.piecesplaced, 2),
+                kps=round(stats.inputs / duration, 2),
+                max=Max(
+                    combo=max((0, stats.topcombo - 1)),
+                    btb=max((0, stats.topbtb - 1)),
+                ),
+                pieces=stats.piecesplaced,
+                pps=metrics.pps,
+                lines=stats.lines,
+                lpm=metrics.lpm,
+                holds=stats.holds,
+                score=stats.score,
+                spp=round(stats.score / stats.piecesplaced, 2),
+                single=clears.singles,
+                double=clears.doubles,
+                triple=clears.triples,
+                quad=clears.quads,
+                tspins=Tspins(
+                    total=clears.realtspins,
+                    single=clears.tspinsingles,
+                    double=clears.tspindoubles,
+                    triple=clears.tspintriples,
+                    mini=Mini(
+                        total=clears.minitspins,
+                        single=clears.minitspinsingles,
+                        double=clears.minitspindoubles,
+                    ),
+                ),
+                all_clear=clears.allclear,
+                finesse=Finesse(
+                    faults=stats.finesse.faults,
+                    accuracy=round(stats.finesse.perfectpieces / stats.piecesplaced * 100, 2),
+                ),
+                level=stats.level,
+            ),
+            play_at=blitz.data.record.ts,
+            lang=get_lang(),
+        ),
+    )

nonebot_plugin_tetris_stats/games/tetrio/record/sprint.py

@@ -7,22 +7,22 @@ from nonebot.matcher import Matcher
 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
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import get_user
 from yarl import URL
 
 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.host import get_self_netloc
+from ....utils.lang import get_lang
 from ....utils.metrics import get_metrics
-from ....utils.render import render
+from ....utils.render import render_image
 from ....utils.render.schemas.base import Avatar
-from ....utils.render.schemas.tetrio.record.base import Finesse, Max, Mini, Statistic, Tspins, User
-from ....utils.render.schemas.tetrio.record.sprint import Record
-from ....utils.screenshot import screenshot
-from ....utils.typing import Me
+from ....utils.render.schemas.v2.tetrio.record.base import Finesse, Max, Mini, Statistic, Tspins, User
+from ....utils.render.schemas.v2.tetrio.record.sprint import Record
+from ....utils.typedefs import Me
 from .. import alc
 from ..api.player import Player
 from ..constant import GAME_TYPE
@@ -42,7 +42,7 @@ async def _(
     event: Event,
     matcher: Matcher,
     target: At | Me,
-    event_session: EventSession,
+    event_session: Uninfo,
 ):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
@@ -54,12 +54,12 @@ async def _(
             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()
+                    event_session.scope, target.target if isinstance(target, At) else event.get_user_id()
                 ),
                 game_platform=GAME_TYPE,
             )
         if bind is None:
-            await matcher.finish('未查询到绑定信息')
+            await matcher.finish(Lang.bind.not_found())
         player = Player(user_id=bind.game_account, trust=True)
         await (
             UniMessage.i18n(Lang.interaction.warning.unverified) + UniMessage.image(raw=await make_sprint_image(player))
@@ -67,7 +67,7 @@ async def _(
 
 
 @alc.assign('TETRIO.record.sprint')
-async def _(account: Player, event_session: EventSession):
+async def _(account: Player, event_session: Uninfo):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
@@ -80,7 +80,7 @@ async def _(account: Player, event_session: EventSession):
 async def make_sprint_image(player: Player) -> bytes:
     user, sprint = await gather(player.user, player.sprint)
     if sprint.data.record is None:
-        msg = f'未找到用户 {user.name.upper()} 的 40L 记录'
+        msg = Lang.record.not_found(username=user.name.upper(), mode=Lang.record.sprint())
         raise RecordNotFoundError(msg)
     stats = sprint.data.record.results.stats
     clears = stats.clears
@@ -88,64 +88,61 @@ async def make_sprint_image(player: Player) -> bytes:
     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=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=str(
-                        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
-                    ),
+    return await render_image(
+        Record(
+            type='best',
+            user=User(
+                id=user.ID,
+                name=user.name.upper(),
+                avatar=str(
+                    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.data.record.replayid,
-                rank=sprint.data.rank,
-                personal_rank=1,
-                statistic=Statistic(
-                    keys=stats.inputs,
-                    kpp=round(stats.inputs / stats.piecesplaced, 2),
-                    kps=round(stats.inputs / duration, 2),
-                    max=Max(
-                        combo=max((0, stats.topcombo - 1)),
-                        btb=max((0, stats.topbtb - 1)),
-                    ),
-                    pieces=stats.piecesplaced,
-                    pps=metrics.pps,
-                    lines=stats.lines,
-                    lpm=metrics.lpm,
-                    holds=stats.holds,
-                    score=stats.score,
-                    single=clears.singles,
-                    double=clears.doubles,
-                    triple=clears.triples,
-                    quad=clears.quads,
-                    tspins=Tspins(
-                        total=clears.realtspins,
-                        single=clears.tspinsingles,
-                        double=clears.tspindoubles,
-                        triple=clears.tspintriples,
-                        mini=Mini(
-                            total=clears.minitspins,
-                            single=clears.minitspinsingles,
-                            double=clears.minitspindoubles,
-                        ),
-                    ),
-                    all_clear=clears.allclear,
-                    finesse=Finesse(
-                        faults=stats.finesse.faults,
-                        accuracy=round(stats.finesse.perfectpieces / stats.piecesplaced * 100, 2),
-                    ),
-                ),
-                play_at=sprint.data.record.ts,
             ),
-        )
-    ) as page_hash:
-        return await screenshot(f'http://{netloc}/host/{page_hash}.html')
+            time=sprint_value,
+            replay_id=sprint.data.record.replayid,
+            rank=sprint.data.rank,
+            personal_rank=1,
+            statistic=Statistic(
+                keys=stats.inputs,
+                kpp=round(stats.inputs / stats.piecesplaced, 2),
+                kps=round(stats.inputs / duration, 2),
+                max=Max(
+                    combo=max((0, stats.topcombo - 1)),
+                    btb=max((0, stats.topbtb - 1)),
+                ),
+                pieces=stats.piecesplaced,
+                pps=metrics.pps,
+                lines=stats.lines,
+                lpm=metrics.lpm,
+                holds=stats.holds,
+                score=stats.score,
+                single=clears.singles,
+                double=clears.doubles,
+                triple=clears.triples,
+                quad=clears.quads,
+                tspins=Tspins(
+                    total=clears.realtspins,
+                    single=clears.tspinsingles,
+                    double=clears.tspindoubles,
+                    triple=clears.tspintriples,
+                    mini=Mini(
+                        total=clears.minitspins,
+                        single=clears.minitspinsingles,
+                        double=clears.minitspindoubles,
+                    ),
+                ),
+                all_clear=clears.allclear,
+                finesse=Finesse(
+                    faults=stats.finesse.faults,
+                    accuracy=round(stats.finesse.perfectpieces / stats.piecesplaced * 100, 2),
+                ),
+            ),
+            play_at=sprint.data.record.ts,
+            lang=get_lang(),
+        ),
+    )

nonebot_plugin_tetris_stats/games/tetrio/unbind.py

@@ -0,0 +1,85 @@
+from hashlib import md5
+from secrets import choice
+
+from nonebot_plugin_alconna import Subcommand
+from nonebot_plugin_alconna.uniseg import UniMessage
+from nonebot_plugin_orm import get_session
+from nonebot_plugin_uninfo import QryItrface, Uninfo
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
+from nonebot_plugin_user import User
+from nonebot_plugin_waiter import suggest  # type: ignore[import-untyped]
+from yarl import URL
+
+from ...config.config import global_config
+from ...db import query_bind_info, remove_bind, trigger
+from ...i18n import Lang
+from ...utils.host import get_self_netloc
+from ...utils.image import get_avatar
+from ...utils.lang import get_lang
+from ...utils.render import render_image
+from ...utils.render.schemas.base import Avatar, People
+from ...utils.render.schemas.bind import Bind
+from . import alc, command
+from .api import Player
+from .constant import GAME_TYPE
+
+command.add(Subcommand('unbind', help_text='解除绑定 TETR.IO 账号'))
+
+alc.shortcut(
+    '(?i:io)(?i:解除绑定|解绑|unbind)',
+    command='tstats TETR.IO unbind',
+    humanized='io解绑',
+)
+
+
+@alc.assign('TETRIO.unbind')
+async def _(nb_user: User, event_session: Uninfo, interface: QryItrface):
+    async with (
+        trigger(
+            session_persist_id=await get_session_persist_id(event_session),
+            game_platform=GAME_TYPE,
+            command_type='unbind',
+            command_args=[],
+        ),
+        get_session() as session,
+    ):
+        if (bind := await query_bind_info(session=session, user=nb_user, game_platform=GAME_TYPE)) is None:
+            await UniMessage(Lang.bind.no_account(game='TETR.IO')).finish()
+        resp = await suggest(Lang.bind.confirm_unbind(), ['是', '否'])
+        if resp is None or resp.extract_plain_text() == '否':
+            return
+        player = Player(user_id=bind.game_account, trust=True)
+        user = await player.user
+        netloc = get_self_netloc()
+        await UniMessage.image(
+            raw=await render_image(
+                Bind(
+                    platform='TETR.IO',
+                    type='unbind',
+                    user=People(
+                        avatar=str(
+                            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
+                        name=user.name.upper(),
+                    ),
+                    bot=People(
+                        avatar=await get_avatar(
+                            (
+                                bot_user := await interface.get_user(event_session.self_id)
+                                or UninfoUser(id=event_session.self_id)
+                            ),
+                            'Data URI',
+                            '../../static/logo/logo.svg',
+                        ),
+                        name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
+                    ),
+                    prompt=Lang.prompt.io_bind(),
+                    lang=get_lang(),
+                ),
+            )
+        ).send()
+        await remove_bind(session=session, user=nb_user, game_platform=GAME_TYPE)

nonebot_plugin_tetris_stats/games/tetrio/verify.py

@@ -0,0 +1,111 @@
+from asyncio import gather
+from hashlib import md5
+from secrets import choice
+
+from nonebot_plugin_alconna import Subcommand
+from nonebot_plugin_alconna.uniseg import UniMessage
+from nonebot_plugin_orm import get_session
+from nonebot_plugin_uninfo import QryItrface, Uninfo
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
+from nonebot_plugin_user import User
+from yarl import URL
+
+from ...config.config import global_config
+from ...db import create_or_update_bind, query_bind_info, trigger
+from ...i18n import Lang
+from ...utils.host import get_self_netloc
+from ...utils.image import get_avatar
+from ...utils.lang import get_lang
+from ...utils.render import render_image
+from ...utils.render.schemas.base import Avatar, People
+from ...utils.render.schemas.bind import Bind
+from . import alc, command
+from .api import Player
+from .constant import GAME_TYPE
+
+command.add(Subcommand('verify', help_text='验证 TETR.IO 账号'))
+
+alc.shortcut(
+    '(?i:io)(?i:验证|verify)',
+    command='tstats TETR.IO verify',
+    humanized='io验证',
+)
+
+try:
+    from nonebot.adapters.discord import MessageCreateEvent
+
+    @alc.assign('TETRIO.verify')
+    async def _(_: MessageCreateEvent, nb_user: User, event_session: Uninfo, interface: QryItrface):
+        async with (
+            trigger(
+                session_persist_id=await get_session_persist_id(event_session),
+                game_platform=GAME_TYPE,
+                command_type='verify',
+                command_args=[],
+            ),
+            get_session() as session,
+        ):
+            if (bind := await query_bind_info(session=session, user=nb_user, game_platform=GAME_TYPE)) is None:
+                await UniMessage(Lang.bind.no_account(game='TETR.IO')).finish()
+            if bind.verify is True:
+                await UniMessage(Lang.bind.verify_already()).finish()
+            player = Player(user_id=bind.game_account, trust=True)
+            user_info = await player.get_info()
+            verify = (
+                user_info.data.connections.discord is not None
+                and user_info.data.connections.discord.id == event_session.user.id
+            )
+            if verify is False:
+                await UniMessage(Lang.bind.verify_failed(game='TETR.IO')).finish()
+            await create_or_update_bind(
+                session=session,
+                user=nb_user,
+                game_platform=GAME_TYPE,
+                game_account=bind.game_account,
+                verify=verify,
+            )
+            user, avatar_revision = await gather(player.user, player.avatar_revision)
+            await UniMessage.image(
+                raw=await render_image(
+                    Bind(
+                        platform='TETR.IO',
+                        type='success',
+                        user=People(
+                            avatar=str(
+                                URL(f'http://{get_self_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(),
+                        ),
+                        bot=People(
+                            avatar=await get_avatar(
+                                (
+                                    bot_user := await interface.get_user(event_session.self_id)
+                                    or UninfoUser(id=event_session.self_id)
+                                ),
+                                'Data URI',
+                                '../../static/logo/logo.svg',
+                            ),
+                            name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
+                        ),
+                        prompt=Lang.prompt.io_check(),
+                        lang=get_lang(),
+                    ),
+                )
+            ).finish()
+except ImportError:
+    pass
+
+
+@alc.assign('TETRIO.verify')
+async def _(event_session: Uninfo):
+    async with trigger(
+        session_persist_id=await get_session_persist_id(event_session),
+        game_platform=GAME_TYPE,
+        command_type='verify',
+        command_args=[],
+    ):
+        await UniMessage(Lang.bind.only_discord()).finish()

nonebot_plugin_tetris_stats/games/top/__init__.py

@@ -1,8 +1,9 @@
 from arclet.alconna import Arg, ArgFlag
-from nonebot_plugin_alconna import Args, At, Subcommand
+from nonebot_plugin_alconna import Args, At, Option, Subcommand
 
+from ...utils.duration import parse_duration
 from ...utils.exception import MessageFormatError
-from ...utils.typing import Me
+from ...utils.typedefs import Me
 from .. import add_block_handlers, alc, command
 from .api import Player
 from .constant import USER_NAME
@@ -29,6 +30,20 @@ command.add(
             ),
             help_text='绑定 TOP 账号',
         ),
+        Subcommand(
+            'unbind',
+            help_text='解除绑定 TOP 账号',
+        ),
+        Subcommand(
+            'config',
+            Option(
+                '--default-compare',
+                Arg('compare', parse_duration, notice='对比时间距离'),
+                alias=['-DC', 'DefaultCompare'],
+                help_text='设置默认对比时间距离',
+            ),
+            help_text='TOP 查询个性化配置',
+        ),
         Subcommand(
             'query',
             Args(
@@ -45,15 +60,39 @@ command.add(
                     flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
                 ),
             ),
+            Option(
+                '--compare',
+                Arg('compare', parse_duration),
+                alias=['-C'],
+                help_text='指定对比时间距离',
+            ),
             help_text='查询 TOP 游戏信息',
         ),
         help_text='TOP 游戏相关指令',
     )
 )
 
-alc.shortcut('(?i:top)(?i:绑定|绑|bind)', {'command': 'tstats TOP bind', 'humanized': 'top绑定'})
-alc.shortcut('(?i:top)(?i:查询|查|query|stats)', {'command': 'tstats TOP query', 'humanized': 'top查'})
+alc.shortcut(
+    '(?i:top)(?i:绑定|绑|bind)',
+    command='tstats TOP bind',
+    humanized='top绑定',
+)
+alc.shortcut(
+    '(?i:top)(?i:解除绑定|解绑|unbind)',
+    command='tstats TOP unbind',
+    humanized='top解绑',
+)
+alc.shortcut(
+    '(?i:top)(?i:查询|查|query|stats)',
+    command='tstats TOP query',
+    humanized='top查',
+)
+alc.shortcut(
+    '(?i:top)(?i:配置|配|config)',
+    command='tstats TOP config',
+    humanized='top配置',
+)
 
 add_block_handlers(alc.assign('TOP.query'))
 
-from . import bind, query  # noqa: E402, F401
+from . import bind, config, query, unbind  # noqa: E402, F401

nonebot_plugin_tetris_stats/games/top/api/models.py

@@ -10,6 +10,8 @@ from .schemas.user_profile import UserProfile
 
 
 class TOPHistoricalData(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_top_hist_data'
+
     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 Profile']] = mapped_column(String(16), index=True)

nonebot_plugin_tetris_stats/games/top/bind.py

@@ -1,29 +1,27 @@
+from secrets import choice
+
 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_uninfo import QryItrface, Uninfo
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
-from nonebot_plugin_userinfo import BotUserInfo, EventUserInfo, UserInfo
 
+from ...config.config import global_config
 from ...db import BindStatus, create_or_update_bind, trigger
-from ...utils.host import HostPage, get_self_netloc
+from ...i18n import Lang
 from ...utils.image import get_avatar
-from ...utils.render import Bind, render
+from ...utils.lang import get_lang
+from ...utils.render import render_image
 from ...utils.render.schemas.base import People
-from ...utils.screenshot import screenshot
+from ...utils.render.schemas.bind import Bind
 from . import alc
 from .api import Player
 from .constant import GAME_TYPE
 
 
 @alc.assign('TOP.bind')
-async def _(
-    nb_user: User,
-    account: Player,
-    event_session: EventSession,
-    event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
-    bot_info: UserInfo = BotUserInfo(),  # noqa: B008
-):
+async def _(nb_user: User, account: Player, event_session: Uninfo, interface: QryItrface):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
@@ -39,24 +37,32 @@ async def _(
                 game_account=user.unique_identifier,
             )
         if bind_status in (BindStatus.SUCCESS, BindStatus.UPDATE):
-            async with HostPage(
-                await render(
-                    'v1/binding',
+            await UniMessage.image(
+                raw=await render_image(
                     Bind(
                         platform=GAME_TYPE,
-                        status='unknown',
+                        type='unknown',
                         user=People(
-                            avatar=await get_avatar(event_user_info, 'Data URI', None),
+                            avatar=await get_avatar(
+                                event_session.user,
+                                'Data URI',
+                                None,
+                            ),
                             name=user.user_name,
                         ),
                         bot=People(
-                            avatar=await get_avatar(bot_info, 'Data URI', '../../static/logo/logo.svg'),
-                            name=bot_info.user_name,
+                            avatar=await get_avatar(
+                                (
+                                    bot_user := await interface.get_user(event_session.self_id)
+                                    or UninfoUser(id=event_session.self_id)
+                                ),
+                                'Data URI',
+                                '../../static/logo/logo.svg',
+                            ),
+                            name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                         ),
-                        command='top查我',
+                        prompt=Lang.prompt.top_check(),
+                        lang=get_lang(),
                     ),
                 )
-            ) as page_hash:
-                await UniMessage.image(
-                    raw=await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
-                ).finish()
+            ).finish()

nonebot_plugin_tetris_stats/games/top/config.py

@@ -0,0 +1,32 @@
+from datetime import timedelta
+
+from nonebot_plugin_alconna.uniseg import UniMessage
+from nonebot_plugin_orm import async_scoped_session
+from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
+from nonebot_plugin_user import User
+from sqlalchemy import select
+
+from ...db import trigger
+from ...i18n import Lang
+from . import alc
+from .constant import GAME_TYPE
+from .models import TOPUserConfig
+
+
+@alc.assign('TOP.config')
+async def _(user: User, session: async_scoped_session, event_session: Uninfo, compare: timedelta):
+    async with trigger(
+        session_persist_id=await get_session_persist_id(event_session),
+        game_platform=GAME_TYPE,
+        command_type='config',
+        command_args=[f'--default-compare {compare}'],
+    ):
+        config = (await session.scalars(select(TOPUserConfig).where(TOPUserConfig.id == user.id))).one_or_none()
+        if config is None:
+            config = TOPUserConfig(id=user.id, compare_delta=compare)
+            session.add(config)
+        else:
+            config.compare_delta = compare
+        await session.commit()
+        await UniMessage(Lang.bind.config_success()).finish()

nonebot_plugin_tetris_stats/games/top/constant.py

@@ -1,4 +1,4 @@
-from re import compile
+from re import compile  # noqa: A004
 from typing import Literal
 
 from yarl import URL

nonebot_plugin_tetris_stats/games/top/models.py

@@ -0,0 +1,12 @@
+from datetime import timedelta
+
+from nonebot_plugin_orm import Model
+from sqlalchemy import Interval
+from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column
+
+
+class TOPUserConfig(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_top_u_cfg'
+
+    id: Mapped[int] = mapped_column(primary_key=True)
+    compare_delta: Mapped[timedelta | None] = mapped_column(Interval(native=True), nullable=True)

nonebot_plugin_tetris_stats/games/top/query.py

@@ -1,63 +1,143 @@
+from datetime import datetime, timedelta, timezone
+
 from nonebot.adapters import Event
 from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import At
-from nonebot_plugin_alconna.uniseg import UniMessage
-from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_alconna.uniseg import Image, UniMessage
+from nonebot_plugin_orm import AsyncSession, get_session
+from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
+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 ...db import query_bind_info, resolve_compare_delta, trigger
 from ...i18n import Lang
 from ...utils.exception import FallbackError
-from ...utils.host import HostPage, get_self_netloc
+from ...utils.lang import get_lang
 from ...utils.metrics import TetrisMetricsBasicWithLPM, get_metrics
-from ...utils.render import render
+from ...utils.render import render_image
 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 ...utils.render.schemas.base import People, Trending
+from ...utils.render.schemas.v1.top.info import Data as InfoData
+from ...utils.render.schemas.v1.top.info import Info
+from ...utils.typedefs import Me
 from . import alc
 from .api import Player
+from .api.models import TOPHistoricalData
 from .api.schemas.user_profile import Data, UserProfile
 from .constant import GAME_TYPE
+from .models import TOPUserConfig
+
+UTC = timezone.utc
+
+
+async def get_compare_profile(session: AsyncSession, user_name: str, target_time: datetime) -> UserProfile | None:
+    before = await session.scalar(
+        select(TOPHistoricalData)
+        .where(
+            TOPHistoricalData.user_unique_identifier == user_name,
+            TOPHistoricalData.api_type == 'User Profile',
+            TOPHistoricalData.update_time <= target_time,
+        )
+        .order_by(TOPHistoricalData.update_time.desc())
+        .limit(1)
+    )
+    after = await session.scalar(
+        select(TOPHistoricalData)
+        .where(
+            TOPHistoricalData.user_unique_identifier == user_name,
+            TOPHistoricalData.api_type == 'User Profile',
+            TOPHistoricalData.update_time >= target_time,
+        )
+        .order_by(TOPHistoricalData.update_time.asc())
+        .limit(1)
+    )
+    if before is None:
+        selected = after
+    elif after is None:
+        selected = before
+    else:
+        selected = (
+            before
+            if abs((target_time - before.update_time).total_seconds())
+            <= abs((target_time - after.update_time).total_seconds())
+            else after
+        )
+    if selected is None or not isinstance(selected.data, UserProfile):
+        return None
+    return selected.data
+
+
+def compare_metrics(
+    current: TetrisMetricsBasicWithLPM, compare: TetrisMetricsBasicWithLPM | None
+) -> tuple[Trending, Trending]:
+    if compare is None:
+        return Trending.KEEP, Trending.KEEP
+    return Trending.compare(compare.lpm, current.lpm), Trending.compare(compare.apm, current.apm)
 
 
 @alc.assign('TOP.query')
-async def _(event: Event, matcher: Matcher, target: At | Me, event_session: EventSession):
+async def _(  # noqa: PLR0913
+    user: NBUser,
+    event: Event,
+    matcher: Matcher,
+    target: At | Me,
+    event_session: Uninfo,
+    compare: timedelta | None = None,
+):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
         command_type='query',
-        command_args=[],
+        command_args=[f'--compare {compare}'] if compare 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()
+                    event_session.scope, target.target if isinstance(target, At) else event.get_user_id()
                 ),
                 game_platform=GAME_TYPE,
             )
-        if bind is None:
-            await matcher.finish('未查询到绑定信息')
+            if bind is None:
+                await matcher.finish(Lang.bind.not_found())
+            compare_delta = await resolve_compare_delta(TOPUserConfig, session, user.id, compare)
+            player = Player(user_name=bind.game_account, trust=True)
+            profile = await player.get_profile()
+            compare_profile = await get_compare_profile(
+                session,
+                profile.user_name,
+                datetime.now(tz=UTC) - compare_delta,
+            )
         await (
             UniMessage.i18n(Lang.interaction.warning.unverified)
-            + await make_query_result(await Player(user_name=bind.game_account, trust=True).get_profile())
+            + (
+                UniMessage('\n')
+                if not (result := await make_query_result(profile, compare_profile)).has(Image)
+                else UniMessage()
+            )
+            + result
         ).finish()
 
 
 @alc.assign('TOP.query')
-async def _(account: Player, event_session: EventSession):
+async def _(user: NBUser, account: Player, event_session: Uninfo, compare: timedelta | None = None):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
         command_type='query',
-        command_args=[],
+        command_args=[f'--compare {compare}'] if compare is not None else [],
     ):
-        await (await make_query_result(await account.get_profile())).finish()
+        async with get_session() as session:
+            compare_delta = await resolve_compare_delta(TOPUserConfig, session, user.id, compare)
+            profile = await account.get_profile()
+            compare_profile = await get_compare_profile(
+                session,
+                profile.user_name,
+                datetime.now(tz=UTC) - compare_delta,
+            )
+        await (await make_query_result(profile, compare_profile)).finish()
 
 
 def get_avg_metrics(data: list[Data]) -> TetrisMetricsBasicWithLPM:
@@ -69,46 +149,61 @@ def get_avg_metrics(data: list[Data]) -> TetrisMetricsBasicWithLPM:
     return get_metrics(lpm=total_lpm / num, apm=total_apm / num)
 
 
-async def make_query_image(profile: UserProfile) -> bytes:
+async def make_query_image(profile: UserProfile, compare: UserProfile | None) -> 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),
+    compare_today = get_metrics(lpm=compare.today.lpm, apm=compare.today.apm) if compare and compare.today else None
+    compare_history = get_avg_metrics(compare.total) if compare is not None and compare.total is not None else None
+    today_lpm_trending, today_apm_trending = compare_metrics(today, compare_today)
+    history_lpm_trending, history_apm_trending = compare_metrics(history, compare_history)
+    return await render_image(
+        Info(
+            user=People(avatar=get_avatar(profile.user_name), name=profile.user_name),
+            today=InfoData(
+                pps=today.pps,
+                lpm=today.lpm,
+                lpm_trending=today_lpm_trending,
+                apm=today.apm,
+                apl=today.apl,
+                apm_trending=today_apm_trending,
             ),
-        )
-    ) as page_hash:
-        return await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
+            historical=InfoData(
+                pps=history.pps,
+                lpm=history.lpm,
+                lpm_trending=history_lpm_trending,
+                apm=history.apm,
+                apl=history.apl,
+                apm_trending=history_apm_trending,
+            ),
+            lang=get_lang(),
+        ),
+    )
 
 
 def make_query_text(profile: UserProfile) -> UniMessage:
     message = ''
     if profile.today is not None:
         today = get_metrics(lpm=profile.today.lpm, apm=profile.today.apm)
-        message += f'用户 {profile.user_name} 24小时内统计数据为: '
-        message += f"\nL'PM: {today.lpm} ( {today.pps} pps )"
-        message += f'\nAPM: {today.apm} ( x{today.apl} )'
+        message += Lang.stats.daily_stats(name=profile.user_name)
+        message += Lang.stats.lpm(lpm=today.lpm, pps=today.pps)
+        message += Lang.stats.apm(apm=today.apm, apl=today.apl)
     else:
-        message += f'用户 {profile.user_name} 暂无24小时内统计数据'
+        message += Lang.stats.no_daily(name=profile.user_name)
     if profile.total is not None:
         total = get_avg_metrics(profile.total)
-        message += '\n历史统计数据为: '
-        message += f"\nL'PM: {total.lpm} ( {total.pps} pps )"
-        message += f'\nAPM: {total.apm} ( x{total.apl} )'
+        message += Lang.stats.history_stats()
+        message += Lang.stats.lpm(lpm=total.lpm, pps=total.pps)
+        message += Lang.stats.apm(apm=total.apm, apl=total.apl)
     else:
-        message += '\n暂无历史统计数据'
+        message += Lang.stats.no_history()
     return UniMessage(message)
 
 
-async def make_query_result(profile: UserProfile) -> UniMessage:
+async def make_query_result(profile: UserProfile, compare: UserProfile | None) -> UniMessage:
     try:
-        return UniMessage.image(raw=await make_query_image(profile))
+        return UniMessage.image(raw=await make_query_image(profile, compare))
     except FallbackError:
         ...
     return make_query_text(profile)

nonebot_plugin_tetris_stats/games/top/unbind.py

@@ -0,0 +1,75 @@
+from secrets import choice
+
+from nonebot_plugin_alconna.uniseg import UniMessage
+from nonebot_plugin_orm import get_session
+from nonebot_plugin_uninfo import QryItrface, Uninfo
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
+from nonebot_plugin_user import User
+from nonebot_plugin_waiter import suggest  # type: ignore[import-untyped]
+
+from ...config.config import global_config
+from ...db import query_bind_info, remove_bind, trigger
+from ...i18n import Lang
+from ...utils.image import get_avatar
+from ...utils.lang import get_lang
+from ...utils.render import render_image
+from ...utils.render.schemas.base import People
+from ...utils.render.schemas.bind import Bind
+from . import alc
+from .api import Player
+from .constant import GAME_TYPE
+
+
+@alc.assign('TOP.unbind')
+async def _(
+    nb_user: User,
+    event_session: Uninfo,
+    interface: QryItrface,
+):
+    async with (
+        trigger(
+            session_persist_id=await get_session_persist_id(event_session),
+            game_platform=GAME_TYPE,
+            command_type='unbind',
+            command_args=[],
+        ),
+        get_session() as session,
+    ):
+        if (bind := await query_bind_info(session=session, user=nb_user, game_platform=GAME_TYPE)) is None:
+            await UniMessage(Lang.bind.no_account(game='TOP')).finish()
+        resp = await suggest(Lang.bind.confirm_unbind(), ['是', '否'])
+        if resp is None or resp.extract_plain_text() == '否':
+            return
+        player = Player(user_name=bind.game_account, trust=True)
+        user = await player.user
+        await UniMessage.image(
+            raw=await render_image(
+                Bind(
+                    platform='TOP',
+                    type='unbind',
+                    user=People(
+                        avatar=await get_avatar(
+                            event_session.user,
+                            'Data URI',
+                            None,
+                        ),
+                        name=user.user_name,
+                    ),
+                    bot=People(
+                        avatar=await get_avatar(
+                            (
+                                bot_user := await interface.get_user(event_session.self_id)
+                                or UninfoUser(id=event_session.self_id)
+                            ),
+                            'Data URI',
+                            '../../static/logo/logo.svg',
+                        ),
+                        name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
+                    ),
+                    prompt=Lang.prompt.top_bind(),
+                    lang=get_lang(),
+                ),
+            )
+        ).send()
+        await remove_bind(session=session, user=nb_user, game_platform=GAME_TYPE)

nonebot_plugin_tetris_stats/games/tos/__init__.py

@@ -1,8 +1,9 @@
 from arclet.alconna import Arg, ArgFlag
-from nonebot_plugin_alconna import Args, At, Subcommand
+from nonebot_plugin_alconna import Args, At, Option, Subcommand
 
+from ...utils.duration import parse_duration
 from ...utils.exception import MessageFormatError
-from ...utils.typing import Me
+from ...utils.typedefs import Me
 from .. import add_block_handlers, alc, command
 from .api import Player
 from .constant import USER_NAME
@@ -34,6 +35,20 @@ command.add(
             ),
             help_text='绑定 茶服 账号',
         ),
+        Subcommand(
+            'unbind',
+            help_text='解除绑定 TOS 账号',
+        ),
+        Subcommand(
+            'config',
+            Option(
+                '--default-compare',
+                Arg('compare', parse_duration, notice='对比时间距离'),
+                alias=['-DC', 'DefaultCompare'],
+                help_text='设置默认对比时间距离',
+            ),
+            help_text='茶服 查询个性化配置',
+        ),
         Subcommand(
             'query',
             Args(
@@ -50,15 +65,39 @@ command.add(
                     flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL],
                 ),
             ),
+            Option(
+                '--compare',
+                Arg('compare', parse_duration),
+                alias=['-C'],
+                help_text='指定对比时间距离',
+            ),
             help_text='查询 茶服 游戏信息',
         ),
         help_text='茶服 游戏相关指令',
     )
 )
 
-alc.shortcut('(?i:tos|茶服)(?i:绑定|绑|bind)', {'command': 'tstats TOS bind', 'humanized': '茶服绑定'})
-alc.shortcut('(?i:tos|茶服)(?i:查询|查|query|stats)', {'command': 'tstats TOS query', 'humanized': '茶服查'})
+alc.shortcut(
+    '(?i:tos|茶服)(?i:绑定|绑|bind)',
+    command='tstats TOS bind',
+    humanized='茶服绑定',
+)
+alc.shortcut(
+    '(?i:tos|茶服)(?i:解除绑定|解绑|unbind)',
+    command='tstats TOS unbind',
+    humanized='茶服解绑',
+)
+alc.shortcut(
+    '(?i:tos|茶服)(?i:查询|查|query|stats)',
+    command='tstats TOS query',
+    humanized='茶服查',
+)
+alc.shortcut(
+    '(?i:tos|茶服)(?i:配置|配|config)',
+    command='tstats TOS config',
+    humanized='茶服配置',
+)
 
 add_block_handlers(alc.assign('TOS.query'))
 
-from . import bind, query  # noqa: E402, F401
+from . import bind, config, query, unbind  # noqa: E402, F401

nonebot_plugin_tetris_stats/games/tos/api/models.py

@@ -11,8 +11,10 @@ from .schemas.user_profile import UserProfile
 
 
 class TOSHistoricalData(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_tos_hist_data'
+
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
-    user_unique_identifier: Mapped[str] = mapped_column(String(24), index=True)
+    user_unique_identifier: Mapped[str] = mapped_column(String(256), index=True)
     api_type: Mapped[Literal['User Info', 'User Profile']] = mapped_column(String(16), index=True)
     data: Mapped[UserInfoSuccess | UserProfile] = mapped_column(
         PydanticType(get_model=[], models={UserInfoSuccess, UserProfile})

nonebot_plugin_tetris_stats/games/tos/api/player.py

@@ -64,11 +64,11 @@ class Player:
                 query = {'teaId': self.teaid}
             else:
                 path = 'getUsernameInfo'
-                query = {'username': cast(str, self.user_name)}
+                query = {'username': cast('str', self.user_name)}
             raw_user_info = await request.failover_request(
                 [i / path % query for i in BASE_URL], failover_code=[502], failover_exc=(TimeoutException,)
             )
-            user_info: UserInfo = type_validate_json(UserInfo, raw_user_info)  # type: ignore[arg-type]
+            user_info: UserInfo = type_validate_json(UserInfo, raw_user_info)  # type: ignore[arg-type]  # pyright: ignore[reportArgumentType]
             if not isinstance(user_info, UserInfoSuccess):
                 msg = f'用户信息请求错误:\n{user_info.error}'
                 raise RequestError(msg)
@@ -91,7 +91,7 @@ class Player:
         if self._user_profile.get(params) is None:
             raw_user_profile = await request.failover_request(
                 [
-                    i / 'getProfile' % {'id': self.teaid or cast(str, self.user_name), **other_parameter}
+                    i / 'getProfile' % {'id': self.teaid or cast('str', self.user_name), **other_parameter}
                     for i in BASE_URL
                 ],
                 failover_code=[502],

nonebot_plugin_tetris_stats/games/tos/bind.py

@@ -1,16 +1,20 @@
+from secrets import choice
+
 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_uninfo import QryItrface, Uninfo
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
-from nonebot_plugin_userinfo import BotUserInfo, EventUserInfo, UserInfo
 
+from ...config.config import global_config
 from ...db import BindStatus, create_or_update_bind, trigger
-from ...utils.host import HostPage, get_self_netloc
+from ...i18n import Lang
 from ...utils.image import get_avatar
-from ...utils.render import Bind, render
+from ...utils.lang import get_lang
+from ...utils.render import render_image
 from ...utils.render.schemas.base import People
-from ...utils.screenshot import screenshot
+from ...utils.render.schemas.bind import Bind
 from . import alc
 from .api import Player
 from .constant import GAME_TYPE
@@ -20,9 +24,8 @@ from .constant import GAME_TYPE
 async def _(
     nb_user: User,
     account: Player,
-    event_session: EventSession,
-    event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
-    bot_info: UserInfo = BotUserInfo(),  # noqa: B008
+    event_session: Uninfo,
+    interface: QryItrface,
 ):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
@@ -40,23 +43,32 @@ async def _(
             )
         user_info = await account.get_info()
         if bind_status in (BindStatus.SUCCESS, BindStatus.UPDATE):
-            async with HostPage(
-                await render(
-                    'v1/binding',
+            await UniMessage.image(
+                raw=await render_image(
                     Bind(
                         platform=GAME_TYPE,
-                        status='unknown',
+                        type='unknown',
                         user=People(
-                            avatar=await get_avatar(event_user_info, 'Data URI', None), name=user_info.data.name
+                            avatar=await get_avatar(
+                                event_session.user,
+                                'Data URI',
+                                None,
+                            ),
+                            name=user_info.data.name,
                         ),
                         bot=People(
-                            avatar=await get_avatar(bot_info, 'Data URI', '../../static/logo/logo.svg'),
-                            name=bot_info.user_remark or bot_info.user_displayname or bot_info.user_name,
+                            avatar=await get_avatar(
+                                (
+                                    bot_user := await interface.get_user(event_session.self_id)
+                                    or UninfoUser(id=event_session.self_id)
+                                ),
+                                'Data URI',
+                                '../../static/logo/logo.svg',
+                            ),
+                            name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                         ),
-                        command='茶服查我',
+                        prompt=Lang.prompt.tos_check(),
+                        lang=get_lang(),
                     ),
                 )
-            ) as page_hash:
-                await UniMessage.image(
-                    raw=await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
-                ).finish()
+            ).finish()

nonebot_plugin_tetris_stats/games/tos/config.py

@@ -0,0 +1,32 @@
+from datetime import timedelta
+
+from nonebot_plugin_alconna.uniseg import UniMessage
+from nonebot_plugin_orm import async_scoped_session
+from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
+from nonebot_plugin_user import User
+from sqlalchemy import select
+
+from ...db import trigger
+from ...i18n import Lang
+from . import alc
+from .constant import GAME_TYPE
+from .models import TOSUserConfig
+
+
+@alc.assign('TOS.config')
+async def _(user: User, session: async_scoped_session, event_session: Uninfo, compare: timedelta):
+    async with trigger(
+        session_persist_id=await get_session_persist_id(event_session),
+        game_platform=GAME_TYPE,
+        command_type='config',
+        command_args=[f'--default-compare {compare}'],
+    ):
+        config = (await session.scalars(select(TOSUserConfig).where(TOSUserConfig.id == user.id))).one_or_none()
+        if config is None:
+            config = TOSUserConfig(id=user.id, compare_delta=compare)
+            session.add(config)
+        else:
+            config.compare_delta = compare
+        await session.commit()
+        await UniMessage(Lang.bind.config_success()).finish()

nonebot_plugin_tetris_stats/games/tos/constant.py

@@ -1,4 +1,4 @@
-from re import compile
+from re import compile  # noqa: A004
 from typing import Literal
 
 from yarl import URL

nonebot_plugin_tetris_stats/games/tos/models.py

@@ -0,0 +1,12 @@
+from datetime import timedelta
+
+from nonebot_plugin_orm import Model
+from sqlalchemy import Interval
+from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column
+
+
+class TOSUserConfig(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_tos_u_cfg'
+
+    id: Mapped[int] = mapped_column(primary_key=True)
+    compare_delta: Mapped[timedelta | None] = mapped_column(Interval(native=True), nullable=True)

nonebot_plugin_tetris_stats/games/tos/query.py

@@ -1,34 +1,45 @@
 from asyncio import gather
-from datetime import timedelta
+from collections.abc import Iterable
+from datetime import datetime, timedelta, timezone
 from http import HTTPStatus
 from typing import Literal, NamedTuple
+from zoneinfo import ZoneInfo
 
 from nonebot.adapters import Event
 from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import At
-from nonebot_plugin_alconna.uniseg import UniMessage
-from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_alconna.uniseg import Image, UniMessage
+from nonebot_plugin_orm import AsyncSession, get_session
+from nonebot_plugin_uninfo import Uninfo, User
+from nonebot_plugin_uninfo.orm import get_session_persist_id
+from nonebot_plugin_user import User as NBUser
 from nonebot_plugin_user import get_user
-from nonebot_plugin_userinfo import EventUserInfo, UserInfo
+from sqlalchemy import select
 
-from ...db import query_bind_info, trigger
+from ...db import query_bind_info, resolve_compare_delta, trigger
 from ...i18n import Lang
-from ...utils.exception import RequestError
-from ...utils.host import HostPage, get_self_netloc
+from ...utils.chart import get_split, get_value_bounds, handle_history_data
+from ...utils.exception import FallbackError, RequestError
 from ...utils.image import get_avatar
+from ...utils.lang import get_lang
 from ...utils.metrics import TetrisMetricsProWithLPMADPM, get_metrics
-from ...utils.render import render
+from ...utils.render import render_image
 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 ...utils.render.schemas.base import HistoryData, People, Trending
+from ...utils.render.schemas.v1.base import History
+from ...utils.render.schemas.v1.tos.info import Info, Multiplayer, Singleplayer
+from ...utils.time_it import time_it
+from ...utils.typedefs import Me, Number
 from . import alc
 from .api import Player
+from .api.models import TOSHistoricalData
 from .api.schemas.user_info import UserInfoSuccess
+from .api.schemas.user_profile import Data as UserProfileData
+from .api.schemas.user_profile import UserProfile
 from .constant import GAME_TYPE
+from .models import TOSUserConfig
+
+UTC = timezone.utc
 
 
 def add_special_handlers(
@@ -36,17 +47,18 @@ def add_special_handlers(
 ) -> None:
     @alc.assign('TOS.query')
     async def _(
+        user: NBUser,
         event: Event,
         target: At | Me,
-        event_session: EventSession,
-        event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
+        event_session: Uninfo,
+        compare: timedelta | None = None,
     ):
         if isinstance(event, match_event):
             async with trigger(
                 session_persist_id=await get_session_persist_id(event_session),
                 game_platform=GAME_TYPE,
                 command_type='query',
-                command_args=[],
+                command_args=[f'--compare {compare}'] if compare is not None else [],
             ):
                 player = Player(
                     teaid=f'{teaid_prefix}{target.target}'
@@ -55,14 +67,14 @@ def add_special_handlers(
                     trust=True,
                 )
                 try:
-                    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, None if isinstance(target, At) else event_user_info
+                    async with get_session() as session:
+                        await (
+                            await make_query_result(
+                                player,
+                                await resolve_compare_delta(TOSUserConfig, session, user.id, compare),
+                                None if isinstance(target, At) else event_session.user,
                             )
                         ).finish()
-                    await make_query_text(user_info, game_data).finish()
                 except RequestError as e:
                     if e.status_code == HTTPStatus.BAD_REQUEST and '未找到此用户' in e.message:
                         return
@@ -101,112 +113,269 @@ except ImportError:
 
 
 @alc.assign('TOS.query')
-async def _(
+async def _(  # noqa: PLR0913
+    user: NBUser,
     event: Event,
     matcher: Matcher,
     target: At | Me,
-    event_session: EventSession,
-    event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
+    event_session: Uninfo,
+    compare: timedelta | 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 (
+        trigger(
+            session_persist_id=await get_session_persist_id(event_session),
+            game_platform=GAME_TYPE,
+            command_type='query',
+            command_args=[f'--compare {compare}'] if compare is not None else [],
+        ),
+        get_session() as session,
     ):
-        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,
-            )
+        bind = await query_bind_info(
+            session=session,
+            user=await get_user(event_session.scope, target.target if isinstance(target, At) else event.get_user_id()),
+            game_platform=GAME_TYPE,
+        )
         if bind is None:
-            await matcher.finish('未查询到绑定信息')
-        message = UniMessage.i18n(Lang.interaction.warning.unverified)
+            await matcher.finish(Lang.bind.not_found())
         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, None if isinstance(target, At) else event_user_info
+        await (
+            UniMessage.i18n(Lang.interaction.warning.unverified)
+            + (
+                UniMessage('\n')
+                if not (
+                    result := await make_query_result(
+                        player,
+                        await resolve_compare_delta(TOSUserConfig, session, user.id, compare),
+                        None if isinstance(target, At) else event_session.user,
                     )
-                )
-            ).finish()
-        await (message + make_query_text(user_info, game_data)).finish()
+                ).has(Image)
+                else UniMessage()
+            )
+            + result
+        ).finish()
 
 
 @alc.assign('TOS.query')
-async def _(account: Player, event_session: EventSession):
-    async with trigger(
-        session_persist_id=await get_session_persist_id(event_session),
-        game_platform=GAME_TYPE,
-        command_type='query',
-        command_args=[],
+async def _(user: NBUser, account: Player, event_session: Uninfo, compare: timedelta | 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'--compare {compare}'] if compare is not None else [],
+        ),
+        get_session() as session,
     ):
-        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, None)).finish()
-        await make_query_text(user_info, game_data).finish()
+        await (
+            await make_query_result(
+                account,
+                await resolve_compare_delta(TOSUserConfig, session, user.id, compare),
+                None,
+            )
+        ).finish()
 
 
 class GameData(NamedTuple):
     game_num: int
     metrics: TetrisMetricsProWithLPMADPM
-    OR: Number
+    or_: Number
     dspp: Number
     ge: Number
 
 
+class GameAccumulator:
+    def __init__(self, target_num: int) -> None:
+        self._target_num = max(1, target_num)
+        self._weighted_total_lpm = 0.0
+        self._weighted_total_apm = 0.0
+        self._weighted_total_adpm = 0.0
+        self._total_time = 0.0
+        self._total_attack = 0
+        self._total_dig = 0
+        self._total_offset = 0
+        self._total_pieces = 0
+        self._total_receive = 0
+        self._num = 0
+
+    @property
+    def num(self) -> int:
+        return self._num
+
+    @property
+    def reached_target(self) -> bool:
+        return self._num >= self._target_num
+
+    def add(self, data: UserProfileData) -> bool:
+        # 排除单人局和时间为 0 的游戏
+        # 茶: 不计算没挖掘的局, 即使 apm 和 lpm 也如此
+        if data.num_players == 1 or data.time == 0:
+            return False
+        seconds = data.time / 1000
+        self._weighted_total_lpm += 24 * data.pieces
+        self._weighted_total_apm += 60 * data.attack
+        self._weighted_total_adpm += 60 * (data.attack + data.dig)
+        self._total_attack += data.attack
+        self._total_dig += data.dig
+        self._total_offset += data.offset
+        self._total_pieces += data.pieces
+        self._total_receive += data.receive
+        self._total_time += seconds
+        self._num += 1
+        return True
+
+    def to_game_data(self) -> GameData | None:
+        if self._num == 0 or self._total_time == 0:
+            return None
+        metrics = get_metrics(
+            lpm=self._weighted_total_lpm / self._total_time,
+            apm=self._weighted_total_apm / self._total_time,
+            adpm=self._weighted_total_adpm / self._total_time,
+        )
+        return GameData(
+            game_num=self._num,
+            metrics=metrics,
+            or_=self._total_offset / self._total_receive * 100 if self._total_receive else 0.0,
+            dspp=self._total_dig / self._total_pieces if self._total_pieces else 0.0,
+            ge=2 * ((self._total_attack * self._total_dig) / self._total_pieces**2) if self._total_pieces else 0.0,
+        )
+
+
+def get_game_data_from_profile(profile: UserProfile, query_num: int = 50) -> GameData | None:
+    accumulator = GameAccumulator(query_num)
+    for row in profile.data:
+        if accumulator.reached_target:
+            break
+        accumulator.add(row)
+    return accumulator.to_game_data()
+
+
+def get_game_data_from_profiles(profiles: Iterable[UserProfile], query_num: int = 50) -> GameData | None:
+    accumulator = GameAccumulator(query_num)
+    for profile in profiles:
+        for row in profile.data:
+            if accumulator.reached_target:
+                return accumulator.to_game_data()
+            accumulator.add(row)
+    return accumulator.to_game_data()
+
+
 async def get_game_data(player: Player, query_num: int = 50) -> GameData | None:
     """获取游戏数据"""
     user_profile = await player.get_profile()
-    if user_profile.data == []:
-        return None
-    weighted_total_lpm = weighted_total_apm = weighted_total_adpm = total_time = 0.0
-    total_attack = total_dig = total_offset = total_pieses = total_receive = num = 0
-    for i in user_profile.data:
-        # 排除单人局和时间为0的游戏
-        # 茶: 不计算没挖掘的局, 即使apm和lpm也如此
-        if i.num_players == 1 or i.time == 0 or i.dig is None:
-            continue
-        # 加权计算
-        time = i.time / 1000
-        lpm = 24 * (i.pieces / time)
-        apm = (i.attack / time) * 60
-        adpm = ((i.attack + i.dig) / time) * 60
-        weighted_total_lpm += lpm * time
-        weighted_total_apm += apm * time
-        weighted_total_adpm += adpm * time
-        total_attack += i.attack
-        total_dig += i.dig
-        total_offset += i.offset
-        total_pieses += i.pieces
-        total_receive += i.receive
-        total_time += time
-        num += 1
-        if num >= query_num:
-            break
-    if num == 0:
-        return None
-    # 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
+    return get_game_data_from_profile(user_profile, query_num)
+
+
+async def get_compare_profile(
+    session: AsyncSession, unique_identifier: str, target_time: datetime
+) -> UserProfile | None:
+    before = await session.scalar(
+        select(TOSHistoricalData)
+        .where(
+            TOSHistoricalData.user_unique_identifier == unique_identifier,
+            TOSHistoricalData.api_type == 'User Profile',
+            TOSHistoricalData.update_time <= target_time,
+        )
+        .order_by(TOSHistoricalData.update_time.desc())
+        .limit(1)
     )
-    return GameData(
-        game_num=num,
-        metrics=metrics,
-        OR=total_offset / total_receive * 100,
-        dspp=total_dig / total_pieses,
-        ge=2 * ((total_attack * total_dig) / total_pieses**2),
+    after = await session.scalar(
+        select(TOSHistoricalData)
+        .where(
+            TOSHistoricalData.user_unique_identifier == unique_identifier,
+            TOSHistoricalData.api_type == 'User Profile',
+            TOSHistoricalData.update_time >= target_time,
+        )
+        .order_by(TOSHistoricalData.update_time.asc())
+        .limit(1)
+    )
+    if before is None:
+        selected = after
+    elif after is None:
+        selected = before
+    else:
+        selected = (
+            before
+            if abs((target_time - before.update_time).total_seconds())
+            <= abs((target_time - after.update_time).total_seconds())
+            else after
+        )
+    if selected is None or not isinstance(selected.data, UserProfile):
+        return None
+    return selected.data
+
+
+@time_it
+async def get_historical_data(unique_identifier: str) -> list[HistoryData]:
+    async with get_session() as session:
+        user_infos = (
+            await session.scalars(
+                select(TOSHistoricalData)
+                .where(TOSHistoricalData.user_unique_identifier == unique_identifier)
+                .where(TOSHistoricalData.api_type == 'User Info')
+                .where(
+                    TOSHistoricalData.update_time
+                    > (
+                        datetime.now(ZoneInfo('Asia/Shanghai')).replace(hour=0, minute=0, second=0, microsecond=0)
+                        - timedelta(days=9)
+                    ).replace(tzinfo=timezone.utc)
+                )
+                .order_by(TOSHistoricalData.id.asc())
+            )
+        ).all()
+        if user_infos:
+            extra_info = (
+                await session.scalars(
+                    select(TOSHistoricalData)
+                    .where(TOSHistoricalData.id < user_infos[0].id)
+                    .where(TOSHistoricalData.user_unique_identifier == unique_identifier)
+                    .where(TOSHistoricalData.api_type == 'User Info')
+                    .limit(1)
+                )
+            ).one_or_none()
+            if extra_info is not None:
+                user_infos = [extra_info, *user_infos]
+    return [
+        HistoryData(score=float(i.data.data.rating_now), record_at=i.update_time.astimezone(ZoneInfo('Asia/Shanghai')))
+        for i in user_infos
+        if isinstance(i.data, UserInfoSuccess)
+    ]
+
+
+class Trends(NamedTuple):
+    lpm: Trending = Trending.KEEP
+    apm: Trending = Trending.KEEP
+    adpm: Trending = Trending.KEEP
+
+
+async def get_trends(player: Player, compare_delta: timedelta) -> Trends:
+    game_data = await get_game_data(player)
+    if game_data is None:
+        raise FallbackError
+    async with get_session() as session:
+        compare_profile = await get_compare_profile(
+            session,
+            (await player.user).teaid,
+            datetime.now(tz=UTC) - compare_delta,
+        )
+        if compare_profile is None or (old_game_data := get_game_data_from_profile(compare_profile)) is None:
+            raise FallbackError
+    return Trends(
+        lpm=Trending.compare(old_game_data.metrics.lpm, game_data.metrics.lpm),
+        apm=Trending.compare(old_game_data.metrics.apm, game_data.metrics.apm),
+        adpm=Trending.compare(old_game_data.metrics.adpm, game_data.metrics.adpm),
     )
 
 
-async def make_query_image(user_info: UserInfoSuccess, game_data: GameData, event_user_info: UserInfo | None) -> bytes:
+async def make_query_image(
+    player: Player,
+    compare_delta: timedelta,
+    event_user_info: User | None,
+) -> bytes:
+    user_info, game_data = await gather(player.get_info(), get_game_data(player))
+    if game_data is None:
+        raise FallbackError
     metrics = game_data.metrics
+    trends = await get_trends(player, compare_delta)
     sprint_value = (
         (
             f'{duration:.3f}s'
@@ -216,57 +385,83 @@ async def make_query_image(user_info: UserInfoSuccess, game_data: GameData, even
         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)
-                    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,
-                    lpm=metrics.lpm,
-                    apm=metrics.apm,
-                    apl=metrics.apl,
-                    vs=metrics.vs,
-                    adpm=metrics.adpm,
-                    adpl=metrics.adpl,
-                ),
-                radar=Radar(
-                    app=(app := (metrics.apm / (60 * metrics.pps))),
-                    OR=game_data.OR,
-                    dspp=game_data.dspp,
-                    ci=150 * game_data.dspp - 125 * app + 50 * (metrics.vs / metrics.apm) - 25,
-                    ge=game_data.ge,
+    data = handle_history_data(await get_historical_data(user_info.data.teaid))
+    values = get_value_bounds([i.score for i in data])
+    return await render_image(
+        Info(
+            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,
+            ),
+            multiplayer=Multiplayer(
+                history=History(
+                    data=data,
+                    max_value=values.value_max,
+                    min_value=values.value_min,
+                    split_interval=(split := get_split(value_bound=values, min_value=0)).split_value,
+                    offset=split.offset,
                 ),
+                rating=round(float(user_info.data.rating_now), 2),
+                rd=round(float(user_info.data.rd_now), 2),
+                lpm=metrics.lpm,
+                pps=metrics.pps,
+                lpm_trending=trends.lpm,
+                apm=metrics.apm,
+                apl=metrics.apl,
+                apm_trending=trends.apm,
+                adpm=metrics.adpm,
+                vs=metrics.vs,
+                adpl=metrics.adpl,
+                adpm_trending=trends.adpm,
+                app=(app := (metrics.apm / (60 * metrics.pps))),
+                or_=game_data.or_,
+                dspp=game_data.dspp,
+                ci=150 * game_data.dspp - 125 * app + 50 * (metrics.vs / metrics.apm) - 25,
+                ge=game_data.ge,
+            ),
+            singleplayer=Singleplayer(
                 sprint=sprint_value,
                 challenge=f'{int(user_info.data.pb_challenge):,}' if user_info.data.pb_challenge != '0' else 'N/A',
                 marathon=f'{int(user_info.data.pb_marathon):,}' if user_info.data.pb_marathon != '0' else 'N/A',
             ),
-        )
-    ) as page_hash:
-        return await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
+            lang=get_lang(),
+        ),
+    )
 
 
-def make_query_text(user_info: UserInfoSuccess, game_data: GameData | None) -> UniMessage:
+async def make_query_text(player: Player) -> UniMessage:
+    user_info, game_data = await gather(player.get_info(), get_game_data(player))
     user_data = user_info.data
-    message = f'用户 {user_data.name} ({user_data.teaid}) '
+    message = Lang.stats.user_info(name=user_data.name, id=user_data.teaid)
     if user_data.ranked_games == '0':
-        message += '暂无段位统计数据'
+        message += Lang.stats.no_rank()
     else:
-        message += f', 段位分 {round(float(user_data.rating_now),2)}±{round(float(user_data.rd_now),2)} ({round(float(user_data.vol_now),2)}) '
+        message += Lang.stats.rank_info(
+            rating=round(float(user_data.rating_now), 2),
+            rd=round(float(user_data.rd_now), 2),
+            vol=round(float(user_data.vol_now), 2),
+        )
     if game_data is None:
-        message += ', 暂无游戏数据'
+        message += Lang.stats.no_game()
     else:
-        message += f', 最近 {game_data.game_num} 局数据'
-        message += f"\nL'PM: {game_data.metrics.lpm} ( {game_data.metrics.pps} pps )"
-        message += f'\nAPM: {game_data.metrics.apm} ( x{game_data.metrics.apl} )'
-        message += f'\nADPM: {game_data.metrics.adpm} ( x{game_data.metrics.adpl} ) ( {game_data.metrics.vs}vs )'
-    message += f'\n40L: {float(user_data.pb_sprint)/1000:.2f}s' if user_data.pb_sprint != '2147483647' else ''
-    message += f'\nMarathon: {user_data.pb_marathon}' if user_data.pb_marathon != '0' else ''
-    message += f'\nChallenge: {user_data.pb_challenge}' if user_data.pb_challenge != '0' else ''
+        message += Lang.stats.recent_games(count=game_data.game_num)
+        message += Lang.stats.lpm(lpm=game_data.metrics.lpm, pps=game_data.metrics.pps)
+        message += Lang.stats.apm(apm=game_data.metrics.apm, apl=game_data.metrics.apl)
+        message += Lang.stats.adpm(adpm=game_data.metrics.adpm, adpl=game_data.metrics.adpl, vs=game_data.metrics.vs)
+    if user_data.pb_sprint != '2147483647':
+        message += Lang.stats.sprint_pb(time=f'{float(user_data.pb_sprint) / 1000:.2f}')
+    if user_data.pb_marathon != '0':
+        message += Lang.stats.marathon_pb(score=user_data.pb_marathon)
+    if user_data.pb_challenge != '0':
+        message += Lang.stats.challenge_pb(score=user_data.pb_challenge)
     return UniMessage(message)
+
+
+async def make_query_result(player: Player, compare_delta: timedelta, event_user_info: User | None) -> UniMessage:
+    try:
+        return UniMessage.image(raw=await make_query_image(player, compare_delta, event_user_info))
+    except FallbackError:
+        ...
+    return await make_query_text(player)

nonebot_plugin_tetris_stats/games/tos/unbind.py

@@ -0,0 +1,70 @@
+from secrets import choice
+
+from nonebot_plugin_alconna.uniseg import UniMessage
+from nonebot_plugin_orm import get_session
+from nonebot_plugin_uninfo import QryItrface, Uninfo
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
+from nonebot_plugin_user import User
+from nonebot_plugin_waiter import suggest  # type: ignore[import-untyped]
+
+from ...config.config import global_config
+from ...db import query_bind_info, remove_bind, trigger
+from ...utils.image import get_avatar
+from ...utils.lang import get_lang
+from ...utils.render import render_image
+from ...utils.render.schemas.base import People
+from ...utils.render.schemas.bind import Bind
+from . import alc
+from .api import Player
+from .constant import GAME_TYPE
+
+
+@alc.assign('TOS.unbind')
+async def _(
+    nb_user: User,
+    event_session: Uninfo,
+    interface: QryItrface,
+):
+    async with (
+        trigger(
+            session_persist_id=await get_session_persist_id(event_session),
+            game_platform=GAME_TYPE,
+            command_type='unbind',
+            command_args=[],
+        ),
+        get_session() as session,
+    ):
+        if (bind := await query_bind_info(session=session, user=nb_user, game_platform=GAME_TYPE)) is None:
+            await UniMessage('您还未绑定 TOS 账号').finish()
+        resp = await suggest('您确定要解绑吗?', ['是', '否'])
+        if resp is None or resp.extract_plain_text() == '否':
+            return
+        player = Player(user_name=bind.game_account, trust=True)
+        user = await player.user
+        await UniMessage.image(
+            raw=await render_image(
+                Bind(
+                    platform='TOS',
+                    type='unbind',
+                    user=People(
+                        avatar=await get_avatar(event_session.user, 'Data URI', None),
+                        name=user.name,
+                    ),
+                    bot=People(
+                        avatar=await get_avatar(
+                            (
+                                bot_user := await interface.get_user(event_session.self_id)
+                                or UninfoUser(id=event_session.self_id)
+                            ),
+                            'Data URI',
+                            '../../static/logo/logo.svg',
+                        ),
+                        name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
+                    ),
+                    prompt='茶服绑定{游戏ID}',
+                    lang=get_lang(),
+                ),
+            )
+        ).send()
+        await remove_bind(session=session, user=nb_user, game_platform=GAME_TYPE)

nonebot_plugin_tetris_stats/i18n/.lang.schema.json

@@ -67,6 +67,19 @@
           }
         }
       }
+    },
+    "template": {
+      "title": "Template",
+      "description": "Scope 'template' of lang item",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "template_language": {
+          "title": "template_language",
+          "description": "value of lang item type 'template_language'",
+          "type": "string"
+        }
+      }
     }
   }
 }

nonebot_plugin_tetris_stats/i18n/.template.json

@@ -11,6 +11,59 @@
     {
       "scope": "error",
       "types": [{ "subtype": "MessageFormatError", "types": ["TETR.IO", "TOS", "TOP"] }]
+    },
+    { "scope": "template", "types": ["template_language"] },
+    {
+      "scope": "bind",
+      "types": [
+        "not_found",
+        "no_account",
+        "confirm_unbind",
+        "config_success",
+        "verify_already",
+        "verify_failed",
+        "only_discord"
+      ]
+    },
+    {
+      "scope": "record",
+      "types": ["not_found", "blitz", "sprint"]
+    },
+    {
+      "scope": "stats",
+      "types": [
+        "user_info",
+        "no_rank",
+        "rank_info",
+        "no_game",
+        "recent_games",
+        "daily_stats",
+        "no_daily",
+        "history_stats",
+        "no_history",
+        "lpm",
+        "apm",
+        "adpm",
+        "sprint_pb",
+        "marathon_pb",
+        "challenge_pb"
+      ]
+    },
+    {
+      "scope": "template_ui",
+      "types": ["invalid_tag", "update_success", "update_failed"]
+    },
+    {
+      "scope": "help",
+      "types": ["usage"]
+    },
+    {
+      "scope": "prompt",
+      "types": ["io_check", "io_bind", "top_check", "top_bind", "tos_check", "tos_bind"]
+    },
+    {
+      "scope": "retry",
+      "types": ["message"]
     }
   ]
 }

nonebot_plugin_tetris_stats/i18n/__init__.py

@@ -1,7 +1,7 @@
 # This file is @generated by tarina.lang CLI tool
 # It is not intended for manual editing.
 
-# ruff: noqa: E402, F401, PLC0414
+# ruff: noqa: E402
 
 from pathlib import Path