Merge pull request #61 from tresabhi/1.15.9

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.20 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

.github/workflows/cd-asia-ratings-latest.yml

@@ -1,34 +0,0 @@
-name: CD Asia Ratings Latest
-
-on:
-  schedule:
-    - cron: "0 0 * * *"
-
-jobs:
-  host:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Use node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: "npm"
-
-      - name: Install Yarn
-        run: npm install --location=global yarn
-
-      - name: Use node_modules cache
-        uses: actions/cache@v3
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=asia --latest

.github/workflows/cd-asia-ratings-leaderboards.yml

@@ -1,34 +0,0 @@
-name: CD Asia Ratings Leaderboards
-
-on:
-  schedule:
-    - cron: "0 17 * * *"
-
-jobs:
-  host:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Use node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: "npm"
-
-      - name: Install Yarn
-        run: npm install --location=global yarn
-
-      - name: Use node_modules cache
-        uses: actions/cache@v3
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=asia

.github/workflows/cd-docs.yml

@@ -2,7 +2,7 @@ name: CD Docs
 
 on:
   push:
-    branches: [main]
+    branches: main
 
 jobs:
   build:

.github/workflows/cd-host.yml

@@ -29,4 +29,4 @@ jobs:
           unzip bot.zip
 
       - name: Run bot
-        run: NODE_ENV=production GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} WARGAMING_APPLICATION_ID=${{ WARGAMING_APPLICATION_ID }} node --enable-source-maps --trace-warnings bot/index.cjs
+        run: NODE_ENV=production GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DISCORD_BLITZ_DB=${{ secrets.DISCORD_BLITZ_DB }} node --enable-source-maps index.cjs

.github/workflows/cd-ratings-asia.yml

@@ -1,8 +1,12 @@
-name: CD Europe Ratings Latest
+name: CD Ratings Asia
+
+# latest: '0 0 * * *'
+# asia midnight: '0 17 * * *'
 
 on:
   schedule:
-    - cron: "0 0 * * *"
+    - cron: '0 0 * * *'
+    - cron: '0 17 * * *'
 
 jobs:
   host:
@@ -16,7 +20,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: "npm"
+          cache: 'npm'
 
       - name: Install Yarn
         run: npm install --location=global yarn
@@ -24,11 +28,11 @@ jobs:
       - name: Use node_modules cache
         uses: actions/cache@v3
         with:
-          path: "**/node_modules"
+          path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install dependencies
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=eu --latest
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=asia --target=${{ github.event.schedule == '0 0 * * *' && 'latest' || 'midnight' }}

.github/workflows/cd-ratings-eu.yml

@@ -1,8 +1,12 @@
-name: CD North America Ratings Latest
+name: CD Ratings Europe
+
+# latest: '0 0 * * *'
+# eu midnight: '0 23 * * *'
 
 on:
   schedule:
     - cron: '0 0 * * *'
+    - cron: '0 23 * * *'
 
 jobs:
   host:
@@ -31,4 +35,4 @@ jobs:
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=na --latest
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=eu --target=${{ github.event.schedule == '0 0 * * *' && 'latest' || 'midnight' }}

.github/workflows/cd-ratings-na.yml

@@ -1,8 +1,12 @@
-name: CD Europe Ratings Leaderboards
+name: CD Ratings North America
+
+# latest: '0 0 * * *'
+# na midnight: '0 5 * * *'
 
 on:
   schedule:
-    - cron: "0 23 * * *"
+    - cron: '0 0 * * *'
+    - cron: '0 5 * * *'
 
 jobs:
   host:
@@ -16,7 +20,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: "npm"
+          cache: 'npm'
 
       - name: Install Yarn
         run: npm install --location=global yarn
@@ -24,11 +28,11 @@ jobs:
       - name: Use node_modules cache
         uses: actions/cache@v3
         with:
-          path: "**/node_modules"
+          path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install dependencies
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=eu
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=na --target=${{ github.event.schedule == '0 0 * * *' && 'latest' || 'midnight' }}

.github/workflows/ci-build-bot.yml

@@ -1,6 +1,6 @@
-name: CI Build
+name: CI Build Bot
 
-on: [push, pull_request]
+on: push
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/ci-build-docs.yml

@@ -1,6 +1,6 @@
-name: CI Build
+name: CI Build Docs
 
-on: [push, pull_request]
+on: push
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/ci-build-website.yml

@@ -1,6 +1,6 @@
-name: CI Build
+name: CI Build Website
 
-on: [push, pull_request]
+on: push
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/ci-version.yml

@@ -1,8 +1,6 @@
-name: CD North America Ratings Leaderboards
+name: CI Version
 
-on:
+on: push
-  schedule:
-    - cron: '0 5 * * *'
 
 jobs:
   host:
@@ -31,4 +29,4 @@ jobs:
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=na
+        run: yarn lint:version

.gitignore

@@ -13,4 +13,5 @@ test.*
 /docs/.vitepress/cache
 servers.csv
 .next/
-tsconfig.tsbuildinfo
+tsconfig.tsbuildinfo
+temp/

.vscode/settings.json

@@ -1,47 +1,79 @@
 {
   "cSpell.words": [
+    "AABBOX",
     "Abhi",
     "accountinfo",
+    "alphatest",
+    "apcr",
+    "atgm",
     "bepaint",
+    "BINORMAL",
     "blitzstars",
     "cleandist",
+    "cockroackdb",
+    "corsproxy",
+    "CUBETEXCOORD",
     "customperiod",
     "deburr",
+    "decalmask",
     "diacriticless",
+    "dvpl",
+    "DVPLCRC",
     "Everytime",
+    "FASTNAME",
     "fullstats",
     "fuzzysort",
+    "gamemode",
+    "immer",
+    "JOINTINDEX",
+    "JOINTWEIGHT",
     "kranvagn",
+    "krieg",
     "Leaderboard",
     "leaderboards",
+    "MURICA",
+    "normalmap",
+    "Oopsy",
+    "outdir",
     "outfile",
     "ownedtanks",
     "playerachievements",
     "playerinfo",
     "ratingsleaderboard",
+    "ratingsplot",
+    "researchable",
     "Resvg",
     "roboto",
+    "SCPG",
     "searchclans",
     "searchplayers",
     "searchtanks",
     "SKLLD",
     "Smri",
+    "Specularity",
     "startcase",
     "statsfull",
+    "steamapps",
     "Stringifying",
     "strvk",
     "subnation",
     "tankaverages",
     "tankopedia",
+    "tankopedias",
     "tankstats",
+    "TEXCOORD",
     "tresabhi",
     "Unicum",
     "Unregistering",
     "vickers",
     "vitepress",
+    "Vovko",
     "wargaming",
     "webp",
     "winrate",
+    "wotblitz",
+    "XMLDVPL",
+    "YAMLDVPL",
     "zustand"
   ],
   "deno.enable": false,

README.md

@@ -1,21 +1,23 @@
-# blitzkrieg
+# Blitzkrieg
 
-A Discord bot for anything and everything related to World of Tanks Blitz.
+[![built with Codeium](https://codeium.com/badges/main)](https://codeium.com)
 
-## Invite the Bot
+Tools for everything World of Tanks Blitz
 
-Join the [Discord server](https://discord.gg/nDt7AjGJQH), click on the bot's profile, and click "Add to Server".
+## Invite the bot
 
-## Using
+Go to [application directory for Blitzkrieg](https://discord.com/application-directory/1097673957865443370) and click "Add to Server." Voila! You're ready to go.
 
-### Installing dependencies
+![Blitzkrieg application directory](https://i.imgur.com/JlEA0J1.png)
 
-```bash
+## Visit the website
-yarn
-```
 
-### Running
+### https://blitz-krieg.vercel.app/
 
-```bash
+![Blitzkrieg website](https://i.imgur.com/eRIZe5P.png)
-yarn start discord-token=<token> wargaming-application-id=<id>
+
-```
+## Visit the documentation website
+
+### https://tresabhi.github.io/blitzkrieg/
+
+![Blitzkrieg documentation website](https://i.imgur.com/TOt5fMx.png)

discord.json

@@ -8,5 +8,7 @@
   "sklld_peasant_role": "896878529512370228",
 
   "tres_guild_id": "734786591205359697",
-  "tres_log_channel": "1109262265850544148"
+  "tres_log_channel": "1109262265850544148",
+
+  "test_guild_id": "1124729294829142116"
 }

docs/.vitepress/config.ts

@@ -13,7 +13,7 @@ export default defineConfig({
   themeConfig: {
     nav: [
       { text: 'Home', link: '/' },
-      { text: 'Guide', link: '/guide/about' },
+      { text: 'Guide', link: '/guide/introduction' },
     ],
 
     sidebar: [

docs/changelogs/1.13.1.md

@@ -0,0 +1,17 @@
+# Blitzkrieg 1.13.1
+
+The quickest minor update in town 🤠
+
+## Changes
+
+- Added a title, description, and icon to the website
+- Added display options to the session tracker
+
+## Fixes
+
+- Center aligned stats in breakdown to work better on low width devices
+- Center aligned the Blitzkrieg logo in the navbar
+
+## Technical Changes
+
+- Added up-to-date information to `README.md` and embed docs

docs/changelogs/1.13.2.md

@@ -0,0 +1,7 @@
+# Blitzkrieg 1.13.2
+
+One lonely albeit important fix.
+
+## Fixes
+
+- Gradients for `/stats` now use Radix's new hex values

docs/changelogs/1.13.3.md

@@ -0,0 +1,7 @@
+# Blitzkrieg 1.13.3
+
+Streamer's delight!
+
+## Features
+
+- Added config context menu for the session tracker embed

docs/changelogs/1.14.0.md

@@ -0,0 +1,45 @@
+# Blitzkrieg 1.14.0
+
+Elegance has never been met like this before
+
+## Features
+
+- Added `/link`
+  - Unlike `/verify`, `/link` links you Discord and Blitz accounts across all servers
+  - This command does not change your nickname
+  - `/link` now simply displays a deprecation message
+  - Usernames can still be inputted per-command to override your linked account
+- `/stats` and `/full-stats` are now way simpler
+  - `/stats <type> <period>` has been replaced with `/stats <30|60|90|...>` (likewise, `/full-stats`)
+  - These commands now have filters without having to opt into `multi-tank`
+- Added `/breakdown`
+  - Unlike `/today`, `/breakdown` lets you select any period of time
+  - `/breakdown` now simply displays a deprecation message
+- `/about commands` are now sorted alphabetically
+- Added a `/reset` button to the options dropdown and embed context-menu
+
+## Changes
+
+- Simplified no ongoing ratings season edge case
+- Updated welcome message for Skilled server to use `/link` and other up-to-date information
+- Tier weights are now reported in Arabic numerals instead of Roman
+- Removed tank images from `/owned-tanks`
+  - Wargaming messed up their API and almost no tanks have any images anymore
+
+## Fixes
+
+- Banners now use a more economical `.webp` format just like the home page
+- Removed unused color palettes
+
+## Technical changes
+
+- Guild commands are now handled more efficiently
+- Removed nickname-based Blitz username inference
+- Code split a lot of common functionalities
+- Re-arranged `core` folder
+- Added midnight and latest ratings leaderboard caches
+- Merged renderers into their primary user files
+- Added sharding
+  - Disabled for now but good for future proofing
+- Switched to a way cleaner logging schema
+- Hosting is now done in 6 hour periods instead of 5

docs/changelogs/1.14.1.md

@@ -0,0 +1,17 @@
+# Blitzkrieg 1.14.1
+
+Oopsy daisy, a memory leak!
+
+## Changes
+
+- Simplified message for users to use `/link`
+
+## Fixes
+
+- Fixed a memory leak in the render thread manager
+
+## Technical changes
+
+- Added `UserError` extending `Error`
+  - This lets the bot avoid spamming the debug console for mistakes users make
+- Reduced render threads to 2

docs/changelogs/1.14.2.md

@@ -0,0 +1,8 @@
+# Blitzkrieg 1.14.2
+
+A late night hot fix for my homies
+
+## Fixes
+
+- Clan info is now fetched using `clan_id` instead of `account_id`
+- Generic stats row names are now bounded by a max width

docs/changelogs/1.14.3.md

@@ -0,0 +1,24 @@
+# Blitzkrieg 1.14.3
+
+Pull your brush out and start polishing.
+
+## Changes
+
+![HisRoyalFatness' career breakdown](https://i.imgur.com/GhgMTnS.png)
+
+- Rows in `/breakdown` are now chunked into `8` per image
+  - This is true unless the number of pages exceeds `10` in which case the rows are even distributed across all `10` pages
+  - `10` is the maximum number of images that Discord allows
+- Short region names are used in username autocomplete instead of their full names
+  - Example: "North America" is "NA" now
+
+## Fixes
+
+- Removed reference to username inference in the username option description
+- Removed an unnecessary type `asd` that did absolutely nothing used nowhere
+
+## Technical changes
+
+- Image orders are now preserved even if processed in parallel and all completed out of order
+- `fetchBlitz` is now throttled to `10` requests per second
+  - Request overflows are managed by queueing

docs/changelogs/1.14.4.md

@@ -0,0 +1,7 @@
+# Blitzkrieg 1.14.4
+
+Streamers get some knowledge today
+
+## Changes
+
+- Added a video in the embed button prompt

docs/changelogs/1.15.0.md

@@ -0,0 +1,72 @@
+# Blitzkrieg 1.15.0
+
+Ratings will never be the same.
+
+## Features
+
+![Blitzkrieg Ratings. Elevate your game. Keep it simple.](https://i.imgur.com/7PZVAGQ.png)
+
+- Blitzkrieg ratings leaderboard
+  - Available at https://blitz-krieg.vercel.app/tools/ratings
+  - **Highly experimental; [please report bugs on Discord server](https://discord.gg/nDt7AjGJQH)**
+    - Current season leaderboards are live meaning that there may be scores and positions that are out of order
+  - Options
+    - Regions can be swapped between NA, EU, and Asia
+    - The current season and all archived season (from 49 and onwards) are available
+  - Jump: used to jump to certain players
+    - Score: finds the first player with at least your desired score
+    - Position: finds the player at that position
+    - League: finds the top-most player in that league
+    - Player: finds the player
+    - **Jumping to scores and positions for the current season is a compounding function (hence the loading screen) and is limited to the speed of Wargaming's APIs which is pretty darn slow**
+  - Page controls
+    - Flip between pages left and right
+    - 33 players are loaded at once
+    - Left control is disabled on the first page and vice versa
+    - Page turning controls are also disabled if the next/previous page hasn't loaded yet
+    - Page numbers can be manually typed in the text field too
+    - This is available both at the top and the bottom of the screen
+  - Players
+    - Shows the position of the player
+    - Shows the player nickname and clan name
+      - "Deleted player ID" us shown when loading a deleted player
+      - A skeleton is shown when the player and clan is loading
+    - Shows the player percentile
+    - Shows reward for the position
+      - This is blank when there is no reward
+      - This column isn't available for archived seasons
+    - Shows the score
+      - A skeleton is shown when loading
+    - Click on a row to highlight it
+      - Using a jump button also highlights a row
+- `/credits`: thanks who helped made this project
+
+## Changes
+
+- Error messages that user face are now even more simplified
+- Increased username and clan autocomplete size limits to `25`
+- Added capability for per-page accent theming
+  - Example: the ratings page is red while the session tracker is blue
+- Simplified welcome message for SKLLD clan server
+
+## Technical Changes
+
+- Isolated tankopedia info
+- Implemented `corsproxy.io` for non-timeout tolerant endpoints
+- Latest archived season number is now data driven
+- Ratings archives are now public
+  - This eliminates the need of `octokit`
+- Ratings leaderboard archiver is now error tolerant
+  - Fetch attempts are made every `1000ms`
+- Blitz errors are now managed better freeing up the queue faster
+- Isolated first archived season number
+- Added more advanced PSAs
+  - These can now feature images or embeds
+  - These can now modify message contents
+  - These can also now be secret
+
+## Experimental Changes
+
+- Added tankopedia extractor
+  - Retrieves tankopedia data from the game files
+  - This is not utilized as of right now

docs/changelogs/1.15.1.md

@@ -0,0 +1,24 @@
+# Blitzkrieg 1.15.1
+
+'MURICA!
+
+## Changes
+
+- "Neighbor" is now spelled in the American way
+- Updated documentation website with the latest information
+
+## Fixes
+
+- Fixed the guide link on the documentation website
+
+## Technical features
+
+- Added capability to fetch patiently while also parsing the JSON
+
+## Technical changes
+
+- Removed neighbor relative position caching
+
+## Technical fixes
+
+- `/ratings` now uses the non-caching APIs

docs/changelogs/1.15.2.md

@@ -0,0 +1,9 @@
+# Blitzkrieg 1.15.2
+
+Infinity reduced to a finite value.
+
+## Fixes
+
+- Added a maximum value to the jump to position button
+- Removed neighbor checking for the seeding player
+  - This fixes the jump to position button not loading at all

docs/changelogs/1.15.3.md

@@ -0,0 +1,30 @@
+# Blitzkrieg 1.15.3
+
+The bot now gets more expressive!
+
+## Features
+
+- The bot can now have presence messages; examples:
+  - "Living in {number} servers"
+  - "Server {number} users"
+  - "Observing {number} channels"
+  - More will be added in the future! Give me some ideas
+
+## Changes
+
+- Moved `/credits` to `/about creators`
+- `/debug` command now ditches embeds and has better information to serve
+
+## Technical Features
+
+- Added a workflow and lint for package and changelog version miss match
+
+## Technical Changes
+
+- Removed manual trigger for Asian latest ratings leaderboard archiver
+- Leaderboard archiver now accepts an explicit target like `midnight` or `latest`
+- Combined midnight and latest leaderboard archival workflow into one file
+
+## Technical Fixed
+
+- Reviewed all workflow triggers and updated them

docs/changelogs/1.15.4.md

@@ -0,0 +1,13 @@
+# Blitzkrieg 1.15.4
+
+Unlocking future potential
+
+## Technical Changes
+
+- Moved the word "Ratings" to the front of the workflow name
+- Renamed `blitzkrieg-db` to `blitzkrieg-assets`
+- Moved the region folders from the root to `regions`
+
+## Technical Fixes
+
+- The ratings leaderboard archiver now correctly skips undefined players

docs/changelogs/1.15.5.md

@@ -0,0 +1,7 @@
+# Blitzkrieg 1.15.5
+
+Oops, this should've been in the last patch.
+
+## Fixes
+
+- User and channel cache is now guild cache exhaustive

docs/changelogs/1.15.6.md

@@ -0,0 +1,11 @@
+# Blitzkrieg 1.15.6
+
+This should have also been in the last update lol.
+
+## Changes
+
+- Changed the format of `/about creators` and added one more person
+
+## Fixes
+
+- Archived ratings leaderboards are now fetched from the correct URL path

docs/changelogs/1.15.7.md

@@ -0,0 +1,20 @@
+# Blitzkrieg 1.15.7
+
+Simple yet powerful theming options for the session tracker
+
+## Features
+
+- The accent color of the session tracker (hence the embed too) can now be tweaked
+  - Access this setting via the dropdown from Options > Accent color
+
+## Fixes
+
+- Reimplemented the commas for last numbers in the overflow count of the ratings leaderboard
+  - For example, "+1234567 more" will now read "+1,234,567 more"
+
+## Technical Features
+
+- Added class names for more in-depth customization for those who are comfortable with CSS
+  - `session-tracker-root`
+  - `session-tracker-row`
+  - `session-tracker-row-stat`

docs/changelogs/1.15.8.md

@@ -0,0 +1,9 @@
+# Blitzkrieg 1.15.8
+
+A request fulfilled \:\)
+
+## Features
+
+- Added custom titles in session tracker
+  - Change the title through Options > Edit title...
+- Colors are shown when selecting a theme color for the session tracker

docs/changelogs/1.15.9.md

@@ -0,0 +1,13 @@
+# Blitzkrieg 1.15.9
+
+~~Curiosity killed the cat~~ Ratings killed the Blitzkrieg
+
+## Fixes
+
+- Deleted ratings players are now handled properly
+
+## Technical Fixes
+
+- Latest archived season number
+  - Is now cached properly
+  - Is now fetched in a chaining fashion correctly

docs/guide/creators.md

@@ -0,0 +1,5 @@
+# Creators
+
+- **TrèsAbhi** `@tresabhi`: Creator and main programmer
+- **Prince_NA** `@prince_na`: Game advisor & tester
+- **Vovko**: Technical advisor

docs/guide/embeds.md

@@ -1,23 +1,23 @@
 # Embeds
 
-Embeds are generated by a few commands as a URL that can be loaded in a browser/streaming software.
+Embeds are URLs generated by commands or tools that represent the "naked" version of the respective command or tool
 
 ## Creating Embeds
 
-1. Use a command of your liking (for example, `/stats`).
+1. Use a command or tool and click on "Embed" if it's available
-2. Customize the command however you like and the URL generated for the embed will match your needs.
+2. Make sure to tweak the settings of the command or tool because embeds replicate everything
-3. Send the command and when the bot is "done thinking," an "Embed" button will appear below the bot's reply.
 
 ## Using Embeds in Streaming Softwares
 
-1. Click on the "Embed" button.
+1. Click on the "Embed" button
-2. Copy the URL from your browser.
+   - If this was generated by a command, copy the URL from the browser
-3. Paste the URL into a Browser Source.
+   - If this was generated by a tool, the URL has been copied to your clipboard already
-4. Set the refresh rate/FPS to something very low like `0.0167` (that's 1 frame every 60 seconds).
+2. Paste this URL into your streaming service as a "Browser Source"
+   - Tool embeds use local storage so data won't be transferred from you browser to your streaming software
+   - Make sure to visit the tool's page in your streaming software (using the "Interact" feature) and then open the embed
+   - Set your browser source refresh rate to `1Hz` because that's how fast embeds refresh
 
 ## How Embeds Behave
 
-- They load like any normal website albeit with a significant delay.
+- They load like any normal website
-- They auto refresh every `60s`.
+- They auto refresh every `1s`
-- All embeds and images generated by Blitzkrieg have a width of `640px` but the height varies and must be found manually through trial and error.
-  - It's okay to have a Browser Source that has a height larger than needed as Blitzkrieg embeds are transparent.

docs/guide/install.md

@@ -1,17 +0,0 @@
-# Installing Blitzkrieg
-
-It's easy as 1, 2, 3!
-
-## Step 1
-
-Join a server that already has Blitzkrieg or [join our official Discord server](https://discord.gg/nDt7AjGJQH).
-
-## Step 2
-
-View the bot's profile and click "Add to Server".
-
-<video src="https://i.imgur.com/Zq0P3m2.mp4" autoplay loop muted width=320 title="how to install"></video>
-
-## Step 3
-
-Review the permissions the bot is asking for and add it to your server!

docs/guide/introduction.md

@@ -1,6 +1,10 @@
 # Introduction
 
-Blitzkrieg is a multipurpose bot for anything and everything World of Tanks Blitz.
+🎉 Services for everything and anything World of Tanks Blitz
+
+## Bot
+
+Blitzkrieg is available as a Discord bot and can be [installed very easily](/guide/invite).
 
 - Track statistics
 - Find inactive players in a clan
@@ -8,3 +12,11 @@ Blitzkrieg is a multipurpose bot for anything and everything World of Tanks Blit
 - Create embeds for streams
 - Track a player/tanks statistical evolution
 - ...and a variety of other similar things
+
+## Website
+
+Provides a bunch of very helpful tools; https://blitz-krieg.vercel.app/
+
+- Session tracker
+- Ratings leaderboard
+- Way more to come

docs/index.md

@@ -12,10 +12,10 @@ hero:
   actions:
     - theme: brand
       text: Add to Discord Server
-      link: guide/install
+      link: /guide/invite
     - theme: alt
       text: Guide
-      link: /guide/about
+      link: /guide/introduction
 
 features:
   - title: Clean and Efficient UI

next.config.js

@@ -1,12 +1,13 @@
 import { createVanillaExtractPlugin } from '@vanilla-extract/next-plugin';
 
-const withVanillaExtract = createVanillaExtractPlugin();
+const withVanillaExtract = createVanillaExtractPlugin({ tests: /\.css$/ });
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   ...withVanillaExtract(),
 
   distDir: 'dist/website',
+  reactStrictMode: false,
 };
 
 export default nextConfig;

package.dist.json

@@ -1,7 +0,0 @@
-{
-  "main": "server.js",
-  "type": "module",
-  "scripts": {
-    "start": "node --enable-source-maps --trace-warnings server.cjs"
-  }
-}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "blitzkrieg",
-  "version": "1.13.0",
+  "version": "1.15.9",
-  "description": "🎉 All-in-one Discord bot for everything World of Tanks Blitz",
+  "description": "🎉 Tools for everything World of Tanks Blitz",
   "main": "src/server.ts",
   "type": "module",
   "scripts": {
@@ -9,10 +9,13 @@
     "build:website": "next build",
     "build:docs": "vitepress build docs",
     "build:ratingsleaderboard": "vite-node --script scripts/buildRatingsLeaderboard",
+    "build:assets": "vite-node --script scripts/buildAssets",
+    "build:test": "vite-node --script scripts/buildTest",
+    "build:ratingsplot": "vite-node --script scripts/buildRatingsPlot",
     "dev:bot": "yarn build:bot && yarn start:bot",
     "dev:docs": "vitepress dev docs",
     "dev:website": "next dev",
-    "start:bot": "node --enable-source-maps --trace-warnings dist/bot/index.cjs",
+    "start:bot": "node --enable-source-maps dist/bot/index.cjs",
     "start:website": "next start",
     "host:docs": "vitepress preview docs",
     "publish:ratingsleaderboard": "vite-node --script scripts/buildRatingsLeaderboard --publish",
@@ -20,47 +23,67 @@
     "lint": "npx tsc",
     "lint:website": "next lint",
     "format": "prettier --write \"**/*.@(json|js|jsx|css|md|ts|tsx|html|xml|yml|gltf)\"",
+    "lint:version": "vite-node --script scripts/checkVersionMissMatch",
     "knip": "knip",
     "update": "yarn upgrade --latest"
   },
   "license": "MIT",
   "dependencies": {
+    "@octokit/plugin-throttling": "^8.1.3",
     "@octokit/rest": "^20.0.1",
+    "@prisma/client": "^5.4.1",
     "@radix-ui/colors": "^3.0.0-rc.4",
     "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/themes": "^1.1.2",
+    "@radix-ui/themes": "^2.0.1",
+    "@react-three/drei": "^9.90.1",
+    "@react-three/fiber": "^8.15.12",
     "@resvg/resvg-js": "^2.4.1",
     "@vanilla-extract/css": "^1.13.0",
     "bepaint": "^0.1.0-beta.3",
+    "decompress": "^4.2.1",
     "discord.js": "^14.13.0",
     "dotenv": "^16.3.1",
     "esbuild": "^0.19.3",
     "express": "^4.18.2",
+    "false": "^0.0.4",
     "fuzzysort": "^2.0.4",
+    "immer": "^10.0.2",
+    "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "markdown-escape": "^2.0.0",
-    "next": "^13.5.2",
+    "next": "^14.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-fuzzysort": "^1.0.1",
     "satori": "^0.10.8",
+    "sharp": "^0.33.0",
+    "three": "^0.159.0",
     "vite-node": "^0.34.5",
     "vitepress": "^1.0.0-rc.20",
     "vitepress-plugin-auto-sidebar": "^1.1.0",
+    "yaml": "^2.3.4",
     "zustand": "^4.4.1"
   },
   "devDependencies": {
     "@total-typescript/ts-reset": "^0.5.1",
+    "@types/decompress": "^4.2.6",
     "@types/escape-html": "^1.0.2",
     "@types/express": "^4.17.18",
+    "@types/js-yaml": "^4.0.8",
     "@types/lodash": "^4.14.199",
+    "@types/lz4": "^0.6.4",
     "@types/markdown-escape": "^1.1.0",
     "@types/node": "^20.6.5",
     "@types/react": "^18.2.22",
+    "@types/three": "^0.159.0",
     "@vanilla-extract/next-plugin": "^2.3.1",
     "compare-versions": "^6.1.0",
-    "knip": "^2.27.1",
+    "crc": "^4.3.2",
+    "fast-xml-parser": "^4.3.2",
+    "knip": "^3.4.0",
+    "lz4": "^0.6.5",
     "prettier": "^3.0.3",
+    "prisma": "^5.4.1",
     "typescript": "^5.2.2"
   }
 }

prisma/migrations/20231009152251_use_big_int/migration.sql

@@ -0,0 +1,8 @@
+-- CreateTable
+CREATE TABLE "discord_blitz" (
+    "discord" INT8 NOT NULL,
+    "region" STRING NOT NULL,
+    "blitz" INT4 NOT NULL,
+
+    CONSTRAINT "discord_blitz_pkey" PRIMARY KEY ("discord")
+);

prisma/migrations/migration_lock.toml

@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (i.e. Git)
+provider = "cockroachdb"

prisma/schema.prisma

@@ -0,0 +1,14 @@
+generator client {
+  provider = "prisma-client-js"
+}
+
+datasource db {
+  provider = "cockroachdb"
+  url      = env("DISCORD_BLITZ_DB")
+}
+
+model discord_blitz {
+  discord BigInt @id
+  region  String
+  blitz   Int
+}

scripts/build.ts

@@ -1,27 +1,44 @@
 import { build } from 'esbuild';
+import { cp, readdir } from 'fs/promises';
 
-console.log('Building bot...');
+readdir('src/workers').then((workers) => {
+  const files = [
+    'bot',
+    'index',
 
-await build({
+    ...workers.map((file) => `workers/${file.replace('.ts', '')}`),
-  entryPoints: ['src/bot.ts'],
+  ];
-  outfile: 'dist/bot/index.cjs',
 
-  platform: 'node',
+  build({
-  tsconfig: 'tsconfig.esbuild.json',
+    entryPoints: files.map((file) => `src/${file}.ts`),
-  loader: {
+    outdir: 'dist/bot',
-    '.node': 'copy',
-    '.ttf': 'file',
-  },
-  format: 'cjs',
-  jsx: 'transform',
 
-  bundle: true,
+    platform: 'node',
-  sourcemap: true,
+    tsconfig: 'tsconfig.esbuild.json',
-  minifyIdentifiers: false, // cause goofy errors
+    loader: {
-  minifySyntax: true,
+      '.node': 'copy',
-  minifyWhitespace: true,
+      '.ttf': 'file',
+    },
+    format: 'cjs',
+    jsx: 'transform',
+    outExtension: {
+      '.js': '.cjs',
+    },
 
-  logLevel: 'info',
+    bundle: true,
+    sourcemap: true,
+    minifyIdentifiers: false, // causes goofy errors
+    minifySyntax: true,
+    minifyWhitespace: true,
+
+    logLevel: 'info',
+  });
 });
 
-console.log('Built bot');
+// copy schema.prisma
+cp('prisma/schema.prisma', 'dist/bot/schema.prisma');
+readdir('node_modules/prisma').then((files) =>
+  files
+    .filter((file) => file.endsWith('.node'))
+    .map((file) => cp(`node_modules/prisma/${file}`, `dist/bot/${file}`)),
+);

scripts/buildAssets.ts

@@ -0,0 +1,544 @@
+import { config } from 'dotenv';
+import { existsSync } from 'fs';
+import { mkdir, readdir, rm } from 'fs/promises';
+import { argv } from 'process';
+import sharp from 'sharp';
+import { TankType } from '../src/components/Tanks';
+import { NATION_IDS } from '../src/constants/nations';
+import { SCPGStream } from '../src/core/blitz/SCPGStream';
+import { readBase64DVPL } from '../src/core/blitz/readBase64DVPL';
+import { readDVPLFile } from '../src/core/blitz/readDVPLFile';
+import { readStringDVPL } from '../src/core/blitz/readStringDVPL';
+import { readXMLDVPL } from '../src/core/blitz/readXMLDVPL';
+import { readYAMLDVPL } from '../src/core/blitz/readYAMLDVPL';
+import { toUniqueId } from '../src/core/blitz/toUniqueId';
+import commitMultipleFiles, {
+  FileChange,
+} from '../src/core/blitzkrieg/commitMultipleFiles';
+import { BlitzkriegGunDefinitions } from '../src/core/blitzkrieg/definitions/guns';
+import {
+  BlitzkriegShellDefinitions,
+  ShellType,
+} from '../src/core/blitzkrieg/definitions/shells';
+import {
+  BlitzkriegTankDefinitions,
+  Tier,
+} from '../src/core/blitzkrieg/definitions/tanks';
+import { BlitzkriegTurretDefinitions } from '../src/core/blitzkrieg/definitions/turrets';
+
+config();
+
+// WARNING! MOST OF THESE TYPES ARE NOT EXHAUSTIVE!
+
+interface VehicleDefinitionList {
+  [key: string]: {
+    id: number;
+    userString: string;
+    shortUserString?: string;
+    description: string;
+    price: number | { gold: ''; '#text': number };
+    sellPrice?: { gold: ''; '#text': number };
+    enrichmentPermanentCost: number;
+    notInShop?: boolean;
+    tags: string;
+    level: number;
+    combatRole?: Record<string, string>;
+    configurationModes: string;
+  };
+}
+interface TurretDefinitionsList {
+  nextAvailableId: number;
+  ids: Record<string, number>;
+}
+interface GunDefinitionsList {
+  nextAvailableId: number;
+  ids: Record<string, number>;
+  shared: {
+    [key: string]: {
+      userString: string;
+      tags: string;
+      level: number;
+      pitchLimits: string;
+      burst?: { count: number; rate: number };
+      clip?: { count: number; rate: number };
+      shots: {
+        [key: string]: {
+          speed: number;
+          piercingPower: string;
+        };
+      };
+    };
+  };
+}
+type ShellKind =
+  | 'ARMOR_PIERCING'
+  | 'ARMOR_PIERCING_CR'
+  | 'HIGH_EXPLOSIVE'
+  | 'HOLLOW_CHARGE';
+type ShellDefinitionsList = Record<
+  string,
+  {
+    id: number;
+    userString: string;
+    icon: string;
+    kind: ShellKind;
+    caliber: number;
+    damage: { armor: number; devices: number };
+    normalizationAngle: number;
+    ricochetAngle: number;
+  }
+> & {
+  icons: Record<string, string>;
+};
+interface VehicleDefinitions {
+  turrets0: {
+    [key: string]: {
+      userString: number;
+      level: number;
+      yawLimits: string | string[];
+      guns: {
+        [key: string]: {
+          maxAmmo: number;
+          pitchLimits?: string | string[];
+        };
+      };
+    };
+  };
+}
+interface Strings {
+  [key: string]: string;
+}
+type BlitzTankType = 'AT-SPG' | 'lightTank' | 'mediumTank' | 'heavyTank';
+interface TankParameters {
+  resourcesPath: {
+    smallIconPath: string;
+    bigIconPath: string;
+    blitzModelPath: string;
+  };
+}
+
+const blitzTankTypeToBlitzkrieg: Record<BlitzTankType, TankType> = {
+  'AT-SPG': 'tank_destroyer',
+  lightTank: 'light',
+  mediumTank: 'medium',
+  heavyTank: 'heavy',
+};
+const blitzShellKindToBLitzkrieg: Record<ShellKind, ShellType> = {
+  ARMOR_PIERCING: 'ap',
+  ARMOR_PIERCING_CR: 'ap_cr',
+  HIGH_EXPLOSIVE: 'he',
+  HOLLOW_CHARGE: 'hc',
+};
+const DATA =
+  'C:/Program Files (x86)/Steam/steamapps/common/World of Tanks Blitz/Data';
+const LANGUAGE = 'en';
+const DOI = {
+  vehicleDefinitions: 'XML/item_defs/vehicles',
+  strings: 'Strings',
+  tankParameters: '3d/Tanks/Parameters',
+  smallIcons: 'Gfx/UI/BattleScreenHUD/SmallTankIcons',
+  bigIcons: 'Gfx/UI/BigTankIcons',
+  flags: 'Gfx/Lobby/flags',
+  '3d': '3d',
+  bigShellIcons: 'Gfx/Shared/tank-supply/ammunition/big',
+};
+
+const allTargets = argv.includes('--all-targets');
+const targets = argv
+  .find((argument) => argument.startsWith('--target'))
+  ?.split('=')[1]
+  .split(',');
+
+if (!targets && !allTargets) throw new Error('No target(s) specified');
+
+if (allTargets || targets?.includes('definitions')) {
+  console.log('Building tank definitions...');
+
+  const tankDefinitions: BlitzkriegTankDefinitions = {};
+  const turretDefinitions: BlitzkriegTurretDefinitions = {};
+  const gunDefinitions: BlitzkriegGunDefinitions = {};
+  const shellDefinitions: BlitzkriegShellDefinitions = {};
+  const nations = await readdir(`${DATA}/${DOI.vehicleDefinitions}`).then(
+    (nations) => nations.filter((nation) => nation !== 'common'),
+  );
+  const strings = await readYAMLDVPL<Strings>(
+    `${DATA}/${DOI.strings}/${LANGUAGE}.yaml.dvpl`,
+  );
+
+  await Promise.all(
+    nations.map(async (nation) => {
+      const tankList = await readXMLDVPL<{ root: VehicleDefinitionList }>(
+        `${DATA}/${DOI.vehicleDefinitions}/${nation}/list.xml.dvpl`,
+      );
+      const turretList = await readXMLDVPL<{
+        root: TurretDefinitionsList;
+      }>(
+        `${DATA}/${DOI.vehicleDefinitions}/${nation}/components/turrets.xml.dvpl`,
+      );
+      const gunList = await readXMLDVPL<{
+        root: GunDefinitionsList;
+      }>(
+        `${DATA}/${DOI.vehicleDefinitions}/${nation}/components/guns.xml.dvpl`,
+      );
+      const shellList = await readXMLDVPL<{
+        root: ShellDefinitionsList;
+      }>(
+        `${DATA}/${DOI.vehicleDefinitions}/${nation}/components/shells.xml.dvpl`,
+      );
+
+      for (const tankKey in tankList.root) {
+        const tank = tankList.root[tankKey];
+        const tankDefinition = await readXMLDVPL<{ root: VehicleDefinitions }>(
+          `${DATA}/${DOI.vehicleDefinitions}/${nation}/${tankKey}.xml.dvpl`,
+        );
+        const tankId = toUniqueId(nation, tank.id);
+        const tankTags = tank.tags.split(' ');
+        const tankTurrets = Object.keys(tankDefinition.root.turrets0).map(
+          (turretKey) => {
+            const turret = tankDefinition.root.turrets0[turretKey];
+            const turretId = toUniqueId(nation, turretList.root.ids[turretKey]);
+            const turretGuns = Object.keys(turret.guns).map((gunKey) => {
+              const turretGunEntry = turret.guns[gunKey];
+              const gunId = toUniqueId(nation, gunList.root.ids[gunKey]);
+              const gun = gunList.root.shared[gunKey];
+              const pitchLimitsRaw =
+                turretGunEntry.pitchLimits ?? gun.pitchLimits;
+              const gunShells = Object.keys(gun.shots).map((shellKey) => {
+                const turretShellEntry = gun.shots[shellKey];
+                const shell = shellList.root[shellKey];
+                const shellId = toUniqueId(nation, shell.id);
+
+                shellDefinitions[shellId] = {
+                  id: shellId,
+                  name:
+                    strings[shell.userString] ?? shellKey.replaceAll('_', ' '),
+                  speed: turretShellEntry.speed,
+                  damage: {
+                    armor: shell.damage.armor,
+                    devices: shell.damage.devices,
+                  },
+                  caliber: shell.caliber,
+                  normalization: shell.normalizationAngle,
+                  ricochet: shell.ricochetAngle,
+                  type: blitzShellKindToBLitzkrieg[shell.kind],
+                  icon: shell.icon,
+                };
+
+                return shellId;
+              });
+
+              gunDefinitions[gunId] = {
+                id: gunId,
+                pitch: (typeof pitchLimitsRaw === 'string'
+                  ? pitchLimitsRaw
+                  : pitchLimitsRaw.at(-1)!
+                )
+                  .split(' ')
+                  .map(Number) as [number, number],
+                name: strings[gun.userString] ?? gunKey.replaceAll('_', ' '),
+                tier: gun.level as Tier,
+                shells: gunShells,
+              };
+
+              return gunId;
+            });
+
+            turretDefinitions[turretId] = {
+              id: turretId,
+              name:
+                strings[turret.userString] ??
+                turretKey
+                  .replaceAll('_', ' ')
+                  .replace(/^(Turret ([0-9] )?)+/, ''),
+              tier: turret.level as Tier,
+              yaw: (typeof turret.yawLimits === 'string'
+                ? turret.yawLimits
+                : turret.yawLimits.at(-1)!
+              )
+                .split(' ')
+                .map(Number) as [number, number],
+              guns: turretGuns,
+            };
+
+            return turretId;
+          },
+        );
+
+        tankDefinitions[tankId] = {
+          id: tankId,
+          name:
+            (tank.shortUserString
+              ? strings[tank.shortUserString]
+              : undefined) ??
+            strings[tank.userString] ??
+            tankKey.replaceAll('_', ' '),
+          nation,
+          tree_type: (tank.sellPrice ? 'gold' in tank.sellPrice : false)
+            ? 'collector'
+            : (typeof tank.price === 'number' ? false : 'gold' in tank.price)
+              ? 'premium'
+              : 'researchable',
+          tier: tank.level as Tier,
+          type: blitzTankTypeToBlitzkrieg[tankTags[0] as BlitzTankType],
+          testing: tankTags.includes('testTank') ? true : undefined,
+          turrets: tankTurrets,
+        };
+      }
+    }),
+  );
+
+  console.log('Committing tank definitions...');
+  await commitMultipleFiles(
+    'tresabhi',
+    'blitzkrieg-assets',
+    'main',
+    'definitions',
+    [
+      {
+        content: JSON.stringify(tankDefinitions),
+        encoding: 'utf-8',
+        path: 'definitions/tanks.json',
+      },
+      {
+        content: JSON.stringify(turretDefinitions),
+        encoding: 'utf-8',
+        path: 'definitions/turrets.json',
+      },
+      {
+        content: JSON.stringify(gunDefinitions),
+        encoding: 'utf-8',
+        path: 'definitions/guns.json',
+      },
+      {
+        content: JSON.stringify(shellDefinitions),
+        encoding: 'utf-8',
+        path: 'definitions/shells.json',
+      },
+    ],
+
+    true,
+  );
+}
+
+if (
+  allTargets ||
+  targets?.includes('bigTankIcons') ||
+  targets?.includes('smallTankIcons')
+) {
+  console.log('Building tank icons...');
+
+  const changes: FileChange[] = [];
+  const nations = await readdir(`${DATA}/${DOI.vehicleDefinitions}`).then(
+    (nations) => nations.filter((nation) => nation !== 'common'),
+  );
+
+  await Promise.all(
+    nations.map(async (nation) => {
+      const tanks = await readXMLDVPL<{ root: VehicleDefinitionList }>(
+        `${DATA}/${DOI.vehicleDefinitions}/${nation}/list.xml.dvpl`,
+      );
+
+      for (const tankIndex in tanks.root) {
+        const tank = tanks.root[tankIndex];
+        const nationVehicleId = tank.id;
+        const id = (nationVehicleId << 8) + (NATION_IDS[nation] << 4) + 1;
+        const parameters = await readYAMLDVPL<TankParameters>(
+          `${DATA}/${DOI.tankParameters}/${nation}/${tankIndex}.yaml.dvpl`,
+        );
+        const small = `${DATA}/${parameters.resourcesPath.smallIconPath
+          .replace(/~res:\//, '')
+          .replace(/\..+/, '')}.packed.webp.dvpl`;
+        const big = `${DATA}/${parameters.resourcesPath.bigIconPath
+          .replace(/~res:\//, '')
+          .replace(/\..+/, '')}.packed.webp.dvpl`;
+
+        if (allTargets || targets?.includes('bigTankIcons')) {
+          changes.push({
+            content: await readBase64DVPL(big),
+            encoding: 'base64',
+            path: `icons/big/${id}.webp`,
+          });
+        }
+        if (allTargets || targets?.includes('smallTankIcons')) {
+          changes.push({
+            content: await readBase64DVPL(small),
+            encoding: 'base64',
+            path: `icons/small/${id}.webp`,
+          });
+        }
+      }
+    }),
+  );
+
+  console.log('Committing tank icons...');
+  await commitMultipleFiles(
+    'tresabhi',
+    'blitzkrieg-assets',
+    'main',
+    'tank icons',
+    changes,
+    true,
+  );
+}
+
+if (allTargets || targets?.includes('scratchedFlags')) {
+  console.log('Building scratched flags...');
+
+  const flags = await readdir(`${DATA}/${DOI.flags}`);
+
+  console.log('Committing scratched flags...');
+  commitMultipleFiles(
+    'tresabhi',
+    'blitzkrieg-assets',
+    'main',
+    'scratched flags',
+    await Promise.all(
+      flags
+        .filter(
+          (flag) =>
+            flag.startsWith('flag_tutor-tank_') &&
+            !flag.endsWith('@2x.packed.webp.dvpl'),
+        )
+        .map(async (flag) => {
+          const content = await readBase64DVPL(`${DATA}/${DOI.flags}/${flag}`);
+          const name = flag.match(/flag_tutor-tank_(.+)\.packed\.webp/)![1];
+
+          return {
+            content,
+            encoding: 'base64',
+            path: `flags/scratched/${name}.webp`,
+          } satisfies FileChange;
+        }),
+    ),
+    true,
+  );
+}
+
+if (allTargets || targets?.includes('circleFlags')) {
+  const flags = await readdir(`${DATA}/${DOI.flags}`);
+
+  commitMultipleFiles(
+    'tresabhi',
+    'blitzkrieg-assets',
+    'main',
+    'circle flags',
+    await Promise.all(
+      flags
+        .filter(
+          (flag) =>
+            flag.startsWith('flag_profile-stat_') &&
+            !flag.endsWith('@2x.packed.webp.dvpl'),
+        )
+        .map(async (flag) => {
+          const content = await readBase64DVPL(`${DATA}/${DOI.flags}/${flag}`);
+          const name = flag.match(/flag_profile-stat_(.+)\.packed\.webp/)![1];
+
+          return {
+            content,
+            encoding: 'base64',
+            path: `flags/circle/${name}.webp`,
+          } satisfies FileChange;
+        }),
+    ),
+    true,
+  );
+}
+
+if (allTargets || targets?.includes('tankModels')) {
+  console.log('Building tank models...');
+
+  if (existsSync('dist/assets/models')) {
+    await rm('dist/assets/models', { recursive: true });
+  }
+  await mkdir('dist/assets/models', { recursive: true });
+
+  const changes: FileChange[] = [];
+  const nations = await readdir(`${DATA}/${DOI.vehicleDefinitions}`).then(
+    (nations) => nations.filter((nation) => nation !== 'common'),
+  );
+
+  await Promise.all(
+    nations.map(async (nation) => {
+      const tanks = await readXMLDVPL<{ root: VehicleDefinitionList }>(
+        `${DATA}/${DOI.vehicleDefinitions}/${nation}/list.xml.dvpl`,
+      );
+
+      for (const tankIndex in tanks.root) {
+        const tank = tanks.root[tankIndex];
+        const nationVehicleId = tank.id;
+        const id = (nationVehicleId << 8) + (NATION_IDS[nation] << 4) + 1;
+
+        // if (id !== 897) continue;
+        console.log(`Building model ${id} @ ${nation}/${tankIndex}`);
+
+        const parameters = await readYAMLDVPL<TankParameters>(
+          `${DATA}/${DOI.tankParameters}/${nation}/${tankIndex}.yaml.dvpl`,
+        );
+        const sc2Path = parameters.resourcesPath.blitzModelPath;
+        const scgPath = parameters.resourcesPath.blitzModelPath.replace(
+          /\.sc2$/,
+          '.scg',
+        );
+        const sc2Stream = await SCPGStream.fromDVPLFile(
+          `${DATA}/${DOI['3d']}/${sc2Path}.dvpl`,
+        );
+        const scgStream = await SCPGStream.fromDVPLFile(
+          `${DATA}/${DOI['3d']}/${scgPath}.dvpl`,
+        );
+
+        const sc2 = sc2Stream.consumeSC2();
+        const scg = scgStream.consumeSCG();
+      }
+    }),
+  );
+}
+
+if (allTargets || targets?.includes('shellIcons')) {
+  console.log('Building shell icons...');
+
+  const image = sharp(
+    await readDVPLFile(
+      `${DATA}/${DOI.bigShellIcons}/texture0.packed.webp.dvpl`,
+    ),
+  );
+
+  const changes = await Promise.all(
+    (await readdir(`${DATA}/${DOI.bigShellIcons}`))
+      .filter((file) => file.endsWith('_l.txt.dvpl'))
+      .map(async (file) => {
+        const name = file.match(/(.+)_l\.txt\.dvpl/)![1];
+        const sizes = (
+          await readStringDVPL(`${DATA}/${DOI.bigShellIcons}/${file}`)
+        )
+          .split('\n')[4]
+          .split(' ')
+          .map(Number);
+
+        return {
+          content: (
+            await image
+              .clone()
+              .extract({
+                left: sizes[0],
+                top: sizes[1],
+                width: sizes[2],
+                height: sizes[3],
+              })
+              .toBuffer()
+          ).toString('base64'),
+          encoding: 'base64',
+          path: `shells/${name}.webp`,
+        } satisfies FileChange;
+      }),
+  );
+
+  console.log('Committing shell icons...');
+  commitMultipleFiles(
+    'tresabhi',
+    'blitzkrieg-assets',
+    'main',
+    'shell icons',
+    changes,
+    true,
+  );
+}

scripts/buildRatingsLeaderboard.ts

@@ -6,32 +6,35 @@ import {
   RatingsNeighbors,
   RatingsPlayer,
 } from '../src/commands/ratings';
-import commitMultipleFiles from './commitMultipleFiles.js';
+import commitMultipleFiles from '../src/core/blitzkrieg/commitMultipleFiles.js';
+import { patientFetchJSON } from '../src/core/blitzkrieg/patientFetchJSON';
 
 /*
  * Central North American Time (UTC-5): use 0 5 * * *.
  * Central European Time (UTC+1): use 0 23 * * *.
  * Central Asia Standard Time (UTC+7): use 0 17 * * *.
  *
- * na/ratings/49/info.json: season info like rewards, start & end time, etc.
+ * [region]/ratings/[season]/info.json: season info like rewards, start & end time, etc.
- * na/ratings/49/latest.json: the absolute latest leaderboard recorded at UTC+0 midnight
+ * [region]/ratings/[season]/latest.json: the absolute latest leaderboard recorded at UTC+0 midnight
- * na/ratings/49/midnight.json: last midnight's leaderboard relative to the region
+ * [region]/ratings/[season]/midnight.json: last midnight's leaderboard relative to the region
  */
 
-export type BlitzkriegRatingsLeaderboard = { id: number; score: number }[];
+export type BlitzkriegRatingsLeaderboardEntry = { id: number; score: number };
+export type BlitzkriegRatingsLeaderboard = BlitzkriegRatingsLeaderboardEntry[];
 
 const publish = argv.includes('--publish');
-const latest = argv.includes('--latest');
+const target = argv
+  .find((arg) => arg.startsWith('--target='))
+  ?.split('=')[1] as 'midnight' | 'latest' | undefined;
 const server = argv.find((arg) => arg.startsWith('--region='))?.split('=')[1];
 
+if (!target) throw new Error('Target parameter not specified');
 if (!server) throw new Error('Region parameter not specified');
 
-const NEIGHBORS = 1000;
+const NEIGHBORS = 2 ** 8;
-const PLAYERS = await fetch(
+const PLAYERS = await patientFetchJSON<RatingsInfo>(
   `https://${server}.wotblitz.com/en/api/rating-leaderboards/season/`,
-)
+).then((data) => (data.detail === undefined ? data.count : undefined));
-  .then((response) => response.json() as Promise<RatingsInfo>)
-  .then((data) => (data.detail === undefined ? data.count : undefined));
 
 if (PLAYERS === undefined) {
   throw new Error('No current ratings season running');
@@ -42,9 +45,9 @@ const leaderboard: BlitzkriegRatingsLeaderboard = [];
 let registered = 0;
 
 async function branchFromPlayer(id: number) {
-  const { neighbors } = await fetch(
+  const { neighbors } = await patientFetchJSON<RatingsNeighbors>(
     `https://${server}.wotblitz.com/en/api/rating-leaderboards/user/${id}/?neighbors=${NEIGHBORS}`,
-  ).then((response) => response.json() as Promise<RatingsNeighbors>);
+  );
 
   const firstPlayer = neighbors[0];
   const lastPlayer = neighbors[neighbors.length - 1];
@@ -73,9 +76,9 @@ async function branchFromPlayer(id: number) {
 }
 
 async function branchFromLeague(id: number) {
-  const { result } = await fetch(
+  const { result } = await patientFetchJSON<{ result: RatingsPlayer[] }>(
     `https://${server}.wotblitz.com/en/api/rating-leaderboards/league/${id}/top/`,
-  ).then((response) => response.json() as Promise<{ result: RatingsPlayer[] }>);
+  );
 
   const firstPlayer = result[0];
   const lastPlayer = result[result.length - 1];
@@ -98,7 +101,10 @@ await Promise.all([
 console.log('Converting to an array...');
 for (let index = 0; index < PLAYERS; index++) {
   const listing = players[index + 1];
-  if (!listing) console.warn(`Position ${index + 1} had no player`);
+  if (!listing) {
+    console.warn(`Position ${index + 1} had no player`);
+    continue;
+  }
 
   leaderboard[index] = {
     id: listing.spa_id,
@@ -110,31 +116,23 @@ const leaderboardJSON = JSON.stringify(leaderboard);
 
 if (publish) {
   const octokit = new Octokit({ auth: env.GH_TOKEN });
-
+  const info = await patientFetchJSON<RatingsInfo & { detail: undefined }>(
-  const info = await fetch(
     `https://${server}.wotblitz.com/en/api/rating-leaderboards/season/`,
-  ).then(
-    (response) =>
-      response.json() as Promise<RatingsInfo & { detail: undefined }>,
   );
   const normalizedServer = server === 'na' ? 'com' : server;
-
+  const infoPath = `regions/${normalizedServer}/ratings/${info.current_season}/info.json`;
-  const infoPath = `${normalizedServer}/ratings/${info.current_season}/info.json`;
+  const leaderboardPath = `regions/${normalizedServer}/ratings/${info.current_season}/${target}.json`;
-  const leaderboardPath = `${normalizedServer}/ratings/${info.current_season}/${
-    latest ? 'latest' : 'midnight'
-  }.json`;
   const infoJSON = JSON.stringify(info);
 
   console.log(`Publishing to season ${info.current_season}...`);
   commitMultipleFiles(
-    octokit,
     'tresabhi',
-    'blitzkrieg-db',
+    'blitzkrieg-assets',
     'main',
     new Date().toString(),
     [
-      { path: infoPath, content: infoJSON },
+      { path: infoPath, content: infoJSON, encoding: 'utf-8' },
-      { path: leaderboardPath, content: leaderboardJSON },
+      { path: leaderboardPath, content: leaderboardJSON, encoding: 'utf-8' },
     ],
   );
 } else {

scripts/buildRatingsPlot.ts

@@ -0,0 +1,46 @@
+import { writeFile } from 'fs/promises';
+import { Region } from '../src/constants/regions';
+import { getRatingsNeighbors } from '../src/core/blitz/getRatingsNeighbors';
+
+const REGION: Region = 'com';
+const PLAYER = 1041988373;
+const ITERATIONS = 2 ** 4;
+const MAX_NEIGHBORS = 2 ** 7;
+const data: [number, number][] = [];
+let finished = 0;
+
+for (let index = 0; index < ITERATIONS; index++) {
+  const neighbors = Math.round((Math.random() * MAX_NEIGHBORS) / 2) * 2;
+  const start = Date.now();
+
+  console.log(`🟡 Iteration ${index} with ${neighbors} neighbors`);
+
+  try {
+    await getRatingsNeighbors(REGION, PLAYER, neighbors);
+
+    finished++;
+    console.log(
+      `🟢 (${Math.round(
+        100 * (finished / ITERATIONS),
+      )}%) Iteration ${index} with ${neighbors} neighbors`,
+    );
+
+    const end = Date.now();
+    const time = end - start;
+
+    data.push([neighbors, time]);
+  } catch (error) {
+    console.log(
+      `🔴 Iteration ${index} with ${neighbors} neighbors\n\n${error}`,
+    );
+  }
+}
+
+console.log('🟢 Done, sorting');
+data.sort(([neighborsA], [neighborsB]) => neighborsA - neighborsB);
+
+console.log('🟢 Writing');
+writeFile(
+  'dist/ratingsPlot.csv',
+  data.map(([neighbors, time]) => `${neighbors},${time}`).join('\n'),
+);

scripts/checkVersionMissMatch.ts

@@ -0,0 +1,12 @@
+import { readdir } from 'fs/promises';
+import packageJSON from '../package.json';
+
+const { version } = packageJSON;
+const changelogs = await readdir('docs/changelogs');
+const hasVersion = changelogs.includes(`${version}.md`);
+
+if (hasVersion) {
+  console.log(`Version ${version} found in changelogs`);
+} else {
+  throw new Error(`Version ${version} not found in changelogs`);
+}

scripts/commitMultipleFiles.ts

@@ -1,70 +0,0 @@
-import { Octokit } from '@octokit/rest';
-
-export default async function commitMultipleFiles(
-  octokit: Octokit,
-  owner: string,
-  repo: string,
-  branch: string,
-  message: string,
-  changes: { path: string; content: string }[],
-) {
-  // Get the latest commit SHA on the specified branch
-  const { data: refData } = await octokit.git.getRef({
-    owner,
-    repo,
-    ref: `heads/${branch}`,
-  });
-  const latestCommitSha = refData.object.sha;
-
-  // Get the tree SHA for the latest commit
-  const { data: commitData } = await octokit.git.getCommit({
-    owner,
-    repo,
-    commit_sha: latestCommitSha,
-  });
-  const treeSha = commitData.tree.sha;
-
-  // Create blobs for each file
-  const blobs = await Promise.all(
-    changes.map(async (change) => {
-      const { data: blobData } = await octokit.git.createBlob({
-        owner,
-        repo,
-        content: change.content,
-        encoding: 'utf-8',
-      });
-
-      return {
-        sha: blobData.sha,
-        path: change.path,
-        mode: '100644',
-        type: 'blob',
-      } as const;
-    }),
-  );
-
-  // Create a new tree with the new blobs
-  const { data: treeData } = await octokit.git.createTree({
-    owner,
-    repo,
-    base_tree: treeSha,
-    tree: blobs,
-  });
-
-  // Create a new commit with the new tree
-  const { data: newCommitData } = await octokit.git.createCommit({
-    owner,
-    repo,
-    message,
-    tree: treeData.sha,
-    parents: [latestCommitSha],
-  });
-
-  // Update the branch reference to point to the new commit
-  await octokit.git.updateRef({
-    owner,
-    repo,
-    ref: `heads/${branch}`,
-    sha: newCommitData.sha,
-  });
-}

src/app/api/[region]/ratings/current/info/route.ts

@@ -0,0 +1,10 @@
+import { NextResponse } from 'next/server';
+import { Region } from '../../../../../../constants/regions';
+import getRatingsInfo from '../../../../../../core/blitz/getRatingsInfo';
+
+export async function GET(
+  request: Request,
+  { params }: { params: { region: Region } },
+) {
+  return NextResponse.json(await getRatingsInfo(params.region));
+}

src/app/api/[region]/ratings/current/league/[league]/route.ts

@@ -0,0 +1,12 @@
+import { NextResponse } from 'next/server';
+import { Region } from '../../../../../../../constants/regions';
+import { getRatingsLeague } from '../../../../../../../core/blitz/getRatingsLeague';
+
+export async function GET(
+  request: Request,
+  { params }: { params: { region: Region; league: number } },
+) {
+  return NextResponse.json(
+    await getRatingsLeague(params.region, params.league, true),
+  );
+}

src/app/api/[region]/ratings/current/search/[username]/route.ts

@@ -0,0 +1,12 @@
+import { NextResponse } from 'next/server';
+import { Region } from '../../../../../../../constants/regions';
+import { searchCurrentRatingsPlayers } from '../../../../../../../core/blitz/searchCurrentRatingsPlayers';
+
+export async function GET(
+  request: Request,
+  { params }: { params: { region: Region; username: string } },
+) {
+  return NextResponse.json(
+    await searchCurrentRatingsPlayers(params.region, params.username),
+  );
+}

src/app/api/tankopedia/route.ts

@@ -1,6 +0,0 @@
-import { NextResponse } from 'next/server';
-import { tankopedia } from '../../../core/blitz/tankopedia';
-
-export async function GET() {
-  return NextResponse.json(await tankopedia);
-}

src/app/embeds/session/page.tsx

@@ -1,17 +1,23 @@
 'use client';
 
+import { ContextMenu } from '@radix-ui/themes';
 import { useEffect, useState } from 'react';
 import * as Breakdown from '../../../components/Breakdown';
 import { TreeTypeEnum } from '../../../components/Tanks';
 import { WARGAMING_APPLICATION_ID } from '../../../constants/wargamingApplicationID';
-import calculateWN8 from '../../../core/blitz/calculateWN8';
+import fetchBlitz from '../../../core/blitz/fetchBlitz';
-import { diffNormalizedTankStats } from '../../../core/blitz/diffNormalizedTankStats';
+import {
-import getWN8Percentile from '../../../core/blitz/getWN8Percentile';
+  BlitzkriegTankDefinition,
-import getWargamingResponse from '../../../core/blitz/getWargamingResponse';
+  tankDefinitions,
-import { TankopediaEntry, tankopedia } from '../../../core/blitz/tankopedia';
+} from '../../../core/blitzkrieg/definitions/tanks';
 import { tankAverages } from '../../../core/blitzstars/tankAverages';
-import { useSession } from '../../../stores/session';
+import calculateWN8 from '../../../core/statistics/calculateWN8';
+import { deltaTankStats } from '../../../core/statistics/deltaTankStats';
+import getWN8Percentile from '../../../core/statistics/getWN8Percentile';
+import { resetSession, useSession } from '../../../stores/session';
 import { IndividualTankStats, TanksStats } from '../../../types/tanksStats';
+import { CustomColumnDisplay } from '../../tools/session/components/CustomColumn';
+import { Menu } from '../../tools/session/components/Menu';
 
 const REFRESH_RATE = 1 / 5;
 
@@ -24,7 +30,7 @@ export default function SessionPage() {
 
         list: {
           stats: IndividualTankStats;
-          tankopedia?: TankopediaEntry;
+          tankDefinitions?: BlitzkriegTankDefinition;
           career: IndividualTankStats;
           currentWN8?: number;
           careerWN8?: number;
@@ -70,7 +76,7 @@ export default function SessionPage() {
     async function recalculateDiff() {
       if (session.isTracking) {
         const { id, region } = session;
-        const careerRaw = await getWargamingResponse<TanksStats>(
+        const careerRaw = await fetchBlitz<TanksStats>(
           `https://api.wotblitz.${region}/wotb/tanks/stats/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
         );
         const career = careerRaw[id].reduce<
@@ -82,7 +88,7 @@ export default function SessionPage() {
           }),
           {},
         );
-        const awaitedTankopedia = await tankopedia;
+        const awaitedTankDefinitions = await tankDefinitions;
         const awaitedTankAverages = await tankAverages;
         const careerWN8 =
           careerRaw[id].reduce(
@@ -108,12 +114,12 @@ export default function SessionPage() {
 
           list: (
             Object.values(
-              diffNormalizedTankStats(session.tankStats, career),
+              deltaTankStats(session.tankStats, career),
             ) as IndividualTankStats[]
           ).map((stats) => {
             return {
               stats,
-              tankopedia: awaitedTankopedia[stats.tank_id],
+              tankDefinitions: awaitedTankDefinitions[stats.tank_id],
               career: career[stats.tank_id],
               currentWN8: awaitedTankAverages[stats.tank_id]
                 ? calculateWN8(
@@ -139,136 +145,186 @@ export default function SessionPage() {
     return () => clearInterval(interval);
   }, [session]);
 
+  const totalRowStats: Record<
+    CustomColumnDisplay,
+    Breakdown.RowStatItem | undefined
+  > = {
+    battles: {
+      title: 'Battles',
+      current: sessionBattles?.toLocaleString(),
+      career: tankStatsArray
+        .reduce((accumulator, stats) => accumulator + stats.all.battles, 0)
+        .toLocaleString(),
+    },
+    winrate: {
+      title: 'Winrate',
+      current: sessionBattles ? `${(100 * sessionWinrate).toFixed(2)}%` : '--',
+      career: `${(100 * careerWinrate).toFixed(2)}%`,
+      delta: sessionBattles === 0 ? 0 : sessionWinrate - careerWinrate,
+    },
+    wn8: (() => {
+      if (!diff) return undefined;
+
+      const battlesWithWN8 = diff.list.reduce(
+        (accumulator, { currentWN8, stats }) =>
+          (currentWN8 === undefined ? 0 : stats.all.battles) + accumulator,
+        0,
+      );
+      const currentWN8 =
+        diff.list.reduce(
+          (accumulator, { currentWN8, stats }) =>
+            stats.all.battles * (currentWN8 ?? 0) + accumulator,
+          0,
+        ) / battlesWithWN8!;
+
+      return {
+        title: 'WN8',
+        current: battlesWithWN8
+          ? Math.round(currentWN8!).toLocaleString()
+          : '--',
+        percentile: battlesWithWN8 ? getWN8Percentile(currentWN8!) : undefined,
+        career: Math.round(diff.careerWN8).toLocaleString(),
+      };
+    })(),
+    damage: {
+      title: 'Damage',
+      delta: sessionBattles === 0 ? 0 : currentDamage - careerDamage,
+      current: sessionBattles
+        ? Math.round(currentDamage).toLocaleString()
+        : '--',
+      career: Math.round(careerDamage).toLocaleString(),
+    },
+    none: undefined,
+  };
+
   return (
-    <Breakdown.Root>
+    <ContextMenu.Root>
-      {session.isTracking && since !== undefined && diff !== undefined && (
+      <ContextMenu.Trigger>
-        <Breakdown.Row
+        <div>
-          title={`Since ${since.toLocaleString(undefined, {
+          <Breakdown.Root>
-            hour: 'numeric',
+            {session.showTotal &&
-            minute: 'numeric',
+              session.isTracking &&
-            hour12: true,
+              since !== undefined &&
-            month: 'short',
+              diff !== undefined && (
-            year: 'numeric',
+                <Breakdown.Row
-            day: 'numeric',
+                  color={session.color}
-          })}`}
+                  minimized={!session.showCareer}
-          stats={[
+                  title={session.title}
-            {
+                  stats={session.customColumns.map((customColumn) => {
-              title: 'Battles',
+                    const rowStat = totalRowStats[customColumn.display];
-              current: sessionBattles!.toLocaleString(),
-              career: tankStatsArray
-                .reduce(
-                  (accumulator, stats) => accumulator + stats.all.battles,
-                  0,
-                )
-                .toLocaleString(),
-            },
-            {
-              title: 'Winrate',
-              current: sessionBattles
-                ? `${(100 * sessionWinrate).toFixed(2)}%`
-                : '--',
-              career: `${(100 * careerWinrate).toFixed(2)}%`,
-              delta: sessionBattles === 0 ? 0 : sessionWinrate - careerWinrate,
-            },
-            (() => {
-              const battlesWithWN8 = diff.list.reduce(
-                (accumulator, { currentWN8, stats }) =>
-                  (currentWN8 === undefined ? 0 : stats.all.battles) +
-                  accumulator,
-                0,
-              );
-              const currentWN8 =
-                diff.list.reduce(
-                  (accumulator, { currentWN8, stats }) =>
-                    stats.all.battles * (currentWN8 ?? 0) + accumulator,
-                  0,
-                ) / battlesWithWN8;
 
-              return {
+                    if (!rowStat) return undefined;
-                title: 'WN8',
-                current: battlesWithWN8
-                  ? Math.round(currentWN8).toLocaleString()
-                  : '--',
-                percentile: battlesWithWN8
-                  ? getWN8Percentile(currentWN8)
-                  : undefined,
-                career: Math.round(diff.careerWN8).toLocaleString(),
-              };
-            })(),
-            {
-              title: 'Damage',
-              delta: sessionBattles === 0 ? 0 : currentDamage - careerDamage,
-              current: sessionBattles
-                ? Math.round(currentDamage).toLocaleString()
-                : '--',
-              career: Math.round(careerDamage).toLocaleString(),
-            },
-          ]}
-        />
-      )}
 
-      {diff?.list
+                    return {
-        .sort((a, b) => b.stats.last_battle_time - a.stats.last_battle_time)
+                      ...rowStat,
-        .map(({ stats, tankopedia, career, careerWN8, currentWN8 }) => (
+                      delta:
-          <Breakdown.Row
+                        customColumn.showDelta &&
-            key={stats.tank_id}
+                        rowStat.percentile === undefined
-            title={tankopedia?.name ?? `Unknown tank ${stats.tank_id}`}
+                          ? rowStat.delta
-            type="tank"
+                          : undefined,
-            tankType={tankopedia?.type}
+                    };
-            treeType={(() => {
+                  })}
-              if (tankopedia?.is_collectible) return TreeTypeEnum.Collector;
+                />
-              if (tankopedia?.is_premium) return TreeTypeEnum.Premium;
+              )}
-            })()}
+
-            stats={[
+            {diff?.list
-              {
+              .sort(
-                title: 'Battles',
+                (a, b) => b.stats.last_battle_time - a.stats.last_battle_time,
-                current: stats.all.battles.toLocaleString(),
+              )
-                career: career.all.battles.toLocaleString(),
+              .map(
-              },
+                ({ stats, tankDefinitions, career, careerWN8, currentWN8 }) => {
-              {
+                  const rowStats: Record<
-                title: 'Winrate',
+                    CustomColumnDisplay,
-                current: `${(
+                    Breakdown.RowStatItem | undefined
-                  100 *
+                  > = {
-                  (stats.all.wins / stats.all.battles)
+                    battles: {
-                ).toFixed(2)}%`,
+                      title: 'Battles',
-                career: `${(
+                      current: stats.all.battles.toLocaleString(),
-                  100 *
+                      career: career.all.battles.toLocaleString(),
-                  (career.all.wins / career.all.battles)
+                    },
-                ).toFixed(2)}%`,
+                    winrate: {
-                delta:
+                      title: 'Winrate',
-                  stats.all.wins / stats.all.battles -
+                      current: `${(
-                  career.all.wins / career.all.battles,
+                        100 *
-              },
+                        (stats.all.wins / stats.all.battles)
-              {
+                      ).toFixed(2)}%`,
-                title: 'WN8',
+                      career: `${(
-                current:
+                        100 *
-                  currentWN8 === undefined
+                        (career.all.wins / career.all.battles)
-                    ? undefined
+                      ).toFixed(2)}%`,
-                    : Math.round(currentWN8).toLocaleString(),
+                      delta:
-                career:
+                        stats.all.wins / stats.all.battles -
-                  careerWN8 === undefined
+                        career.all.wins / career.all.battles,
-                    ? undefined
+                    },
-                    : Math.round(careerWN8).toLocaleString(),
+                    wn8: {
-                percentile:
+                      title: 'WN8',
-                  currentWN8 === undefined
+                      current:
-                    ? undefined
+                        currentWN8 === undefined
-                    : getWN8Percentile(currentWN8),
+                          ? undefined
-              },
+                          : Math.round(currentWN8).toLocaleString(),
-              {
+                      career:
-                title: 'Damage',
+                        careerWN8 === undefined
-                current: Math.round(
+                          ? undefined
-                  stats.all.damage_dealt / stats.all.battles,
+                          : Math.round(careerWN8).toLocaleString(),
-                ).toLocaleString(),
+                      percentile:
-                career: Math.round(
+                        currentWN8 === undefined
-                  career.all.damage_dealt / career.all.battles,
+                          ? undefined
-                ).toLocaleString(),
+                          : getWN8Percentile(currentWN8),
-                delta:
+                    },
-                  stats.all.damage_dealt / stats.all.battles -
+                    damage: {
-                  career.all.damage_dealt / career.all.battles,
+                      title: 'Damage',
-              },
+                      current: Math.round(
-            ]}
+                        stats.all.damage_dealt / stats.all.battles,
-          />
+                      ).toLocaleString(),
-        ))}
+                      career: Math.round(
-    </Breakdown.Root>
+                        career.all.damage_dealt / career.all.battles,
+                      ).toLocaleString(),
+                      delta:
+                        stats.all.damage_dealt / stats.all.battles -
+                        career.all.damage_dealt / career.all.battles,
+                    },
+                    none: undefined,
+                  };
+
+                  return (
+                    <Breakdown.Row
+                      color={session.color}
+                      key={stats.tank_id}
+                      minimized={!session.showCareer}
+                      title={
+                        tankDefinitions?.name ?? `Unknown tank ${stats.tank_id}`
+                      }
+                      type="tank"
+                      tankType={tankDefinitions?.type}
+                      treeType={(() => {
+                        if (tankDefinitions?.tree_type === 'collector')
+                          return TreeTypeEnum.Collector;
+                        if (tankDefinitions?.tree_type === 'premium')
+                          return TreeTypeEnum.Premium;
+                      })()}
+                      stats={session.customColumns.map((customColumn) => {
+                        const rowStat = rowStats[customColumn.display];
+
+                        if (!rowStat) return undefined;
+
+                        return {
+                          ...rowStat,
+                          delta:
+                            customColumn.showDelta &&
+                            rowStat.percentile === undefined
+                              ? rowStat.delta
+                              : undefined,
+                        };
+                      })}
+                    />
+                  );
+                },
+              )}
+          </Breakdown.Root>
+        </div>
+      </ContextMenu.Trigger>
+
+      <Menu reset={resetSession} Builder={ContextMenu} />
+    </ContextMenu.Root>
   );
 }

src/app/layout.tsx

@@ -25,9 +25,18 @@ export default function RootLayout({ children }: RootLayoutProps) {
 
   return (
     <html lang="en" className={robotoFlex.className}>
+      <head>
+        <title>Blitzkrieg</title>
+        <meta
+          name="description"
+          content="🎉 Tools for everything World of Tanks Blitz"
+        />
+      </head>
+
       <body
         style={{
           margin: 0,
+          paddingTop: isEmbed ? 0 : '3.25rem',
           background: isEmbed
             ? 'transparent'
             : 'url(https://i.imgur.com/PhS06NJ.png)',
@@ -37,7 +46,8 @@ export default function RootLayout({ children }: RootLayoutProps) {
           appearance="dark"
           panelBackground="translucent"
           radius="full"
-          accentColor="blue"
+          suppressHydrationWarning
+          suppressContentEditableWarning
         >
           {!isEmbed && <Navbar />}
 

src/app/tools/layout.tsx

@@ -11,7 +11,7 @@ interface ToolsLayoutProps {
 
 export default function ToolsLayout({ children }: ToolsLayoutProps) {
   const pathname = usePathname();
-  const toolId = pathname.split('/').at(-1);
+  const toolId = pathname.split('/').at(2);
   const tool = TOOLS.find((tool) => tool.id === toolId);
 
   return (
@@ -19,17 +19,32 @@ export default function ToolsLayout({ children }: ToolsLayoutProps) {
       <div
         style={{
           height: 128,
-          backgroundImage: `url(/assets/banners/${toolId}.png)`,
-          backgroundSize: 'cover',
-          backgroundPosition: 'center',
           boxShadow: `inset 0 -192px 128px -128px ${theme.colors.appBackground1}`,
           display: 'flex',
           alignItems: 'center',
           justifyContent: 'center',
           gap: 4,
           flexDirection: 'column',
+          position: 'relative',
+          overflow: 'hidden',
         }}
       >
+        <div
+          style={{
+            position: 'absolute',
+            backgroundImage: `url(/assets/banners/${toolId}.webp)`,
+            backgroundSize: 'cover',
+            backgroundPosition: 'center',
+            width: '100%',
+            height: '100%',
+            top: 0,
+            left: 0,
+            zIndex: -1,
+            filter: 'blur(4px)',
+            transform: 'scale(calc((128 + 8) / 128))',
+          }}
+        />
+
         <span
           style={{
             color: theme.colors.textHighContrast,

src/app/tools/ratings/components/PageTurner/index.css.ts

@@ -0,0 +1,13 @@
+import { keyframes, style } from '@vanilla-extract/css';
+
+const spinKeyframes = keyframes({
+  from: { transform: 'rotate(0deg)' },
+  to: { transform: 'rotate(360deg)' },
+});
+
+export const infiniteSpin = style({
+  animationName: spinKeyframes,
+  animationIterationCount: 'infinite',
+  animationTimingFunction: 'linear',
+  animationDuration: '1s',
+});

src/app/tools/ratings/components/PageTurner/index.tsx

@@ -0,0 +1,97 @@
+import {
+  CaretLeftIcon,
+  CaretRightIcon,
+  SymbolIcon,
+} from '@radix-ui/react-icons';
+import { Button, Flex, TextField } from '@radix-ui/themes';
+import { range } from 'lodash';
+import { useEffect, useRef } from 'react';
+import { infiniteSpin } from './index.css';
+
+interface PageTurnerProps {
+  leaderboard: Record<number, number>;
+  page: number;
+  rowsPerPage: number;
+  pages: number;
+  onPageChange: (page: number, isButtonClick: boolean) => void;
+  totalPlayers: number;
+}
+
+export function PageTurner({
+  page,
+  rowsPerPage,
+  onPageChange,
+  pages,
+  leaderboard,
+  totalPlayers,
+}: PageTurnerProps) {
+  const pageInput = useRef<HTMLInputElement>(null);
+  const rightLoading = range(
+    page * rowsPerPage,
+    Math.min(totalPlayers - 1, page * rowsPerPage + rowsPerPage + 1),
+  ).some((index) => !(index in leaderboard));
+  const leftLoading = range(
+    Math.max(0, page * rowsPerPage - 1),
+    Math.max(0, page * rowsPerPage - rowsPerPage - 1) + 1,
+  ).some((index) => !(index in leaderboard));
+
+  useEffect(() => {
+    if (pageInput.current) pageInput.current.value = `${page + 1}`;
+  }, [page]);
+
+  return (
+    <Flex justify="center" wrap="wrap" gap="2">
+      <Flex gap="2">
+        <Button
+          variant="soft"
+          onClick={() => onPageChange(Math.max(page - 1, 0), true)}
+          disabled={page === 0 || leftLoading}
+        >
+          {leftLoading ? (
+            <SymbolIcon className={infiniteSpin} />
+          ) : (
+            <CaretLeftIcon />
+          )}
+        </Button>
+        <TextField.Root>
+          <TextField.Slot>Page</TextField.Slot>
+          <TextField.Input
+            type="number"
+            ref={pageInput}
+            style={{ width: 64, textAlign: 'center' }}
+            min={1}
+            max={pages}
+            onBlur={(event) => {
+              onPageChange(
+                Math.max(
+                  0,
+                  Math.min(pages - 1, event.target.valueAsNumber - 1),
+                ),
+                false,
+              );
+            }}
+            onKeyDown={(event) => {
+              if (event.key === 'Enter') {
+                (event.target as HTMLInputElement).blur();
+              }
+            }}
+          />
+          <TextField.Slot>out of {pages}</TextField.Slot>
+        </TextField.Root>
+        <Button
+          variant="soft"
+          onClick={() => {
+            onPageChange(Math.min(page + 1, pages - 1), true);
+          }}
+          disabled={page === pages - 1 || rightLoading}
+        >
+          {rightLoading ? (
+            <SymbolIcon className={infiniteSpin} />
+          ) : (
+            <CaretRightIcon />
+          )}
+        </Button>
+      </Flex>
+    </Flex>
+  );
+}

src/app/tools/session/components/CustomColumn.tsx

@@ -0,0 +1,61 @@
+import { ContextMenu, DropdownMenu } from '@radix-ui/themes';
+import mutateSession, { useSession } from '../../../../stores/session';
+
+export type CustomColumnDisplay =
+  | 'battles'
+  | 'winrate'
+  | 'wn8'
+  | 'damage'
+  | 'none';
+
+const NO_DELTA: CustomColumnDisplay[] = ['battles', 'wn8', 'none'];
+
+interface CustomColumn {
+  Builder: typeof DropdownMenu | typeof ContextMenu;
+  column: number;
+}
+
+export function CustomColumn({ column, Builder }: CustomColumn) {
+  const customColumn = useSession((state) => state.customColumns[column]);
+
+  return (
+    <Builder.Sub>
+      <Builder.SubTrigger>Column {column + 1}</Builder.SubTrigger>
+
+      <Builder.SubContent>
+        <Builder.RadioGroup
+          value={customColumn.display}
+          onValueChange={(event) =>
+            mutateSession((draft) => {
+              draft.customColumns[column].display =
+                event as CustomColumnDisplay;
+            })
+          }
+        >
+          <Builder.RadioItem value="battles">Battles</Builder.RadioItem>
+          <Builder.RadioItem value="winrate">Winrate</Builder.RadioItem>
+          <Builder.RadioItem value="wn8">WN8</Builder.RadioItem>
+          <Builder.RadioItem value="damage">Damage</Builder.RadioItem>
+          <Builder.RadioItem value="none">None</Builder.RadioItem>
+        </Builder.RadioGroup>
+
+        {!NO_DELTA.includes(customColumn.display) && (
+          <>
+            <Builder.Separator />
+
+            <Builder.CheckboxItem
+              checked={customColumn.showDelta}
+              onCheckedChange={(checked) =>
+                mutateSession((draft) => {
+                  draft.customColumns[column].showDelta = checked;
+                })
+              }
+            >
+              Show delta
+            </Builder.CheckboxItem>
+          </>
+        )}
+      </Builder.SubContent>
+    </Builder.Sub>
+  );
+}

src/app/tools/session/components/Menu.tsx

@@ -0,0 +1,136 @@
+import {
+  Button,
+  ContextMenu,
+  Dialog,
+  DropdownMenu,
+  Flex,
+  Heading,
+  TextField,
+} from '@radix-ui/themes';
+import { createColors } from 'bepaint';
+import { useRef, useState } from 'react';
+import {
+  ACCENT_COLORS,
+  AccentColor,
+  GRAY_COLORS,
+  GrayColor,
+  PALETTES,
+} from '../../../../constants/radixColors';
+import { useSession } from '../../../../stores/session';
+import { CustomColumn } from './CustomColumn';
+
+interface ContextMenuProps {
+  Builder: typeof DropdownMenu | typeof ContextMenu;
+  reset: () => void;
+}
+
+export function Menu({ Builder, reset }: ContextMenuProps) {
+  const session = useSession();
+  const [showTitleEditor, setShowTitleEditor] = useState(false);
+  const titleInput = useRef<HTMLInputElement>(null);
+
+  return (
+    <>
+      <Dialog.Root open={showTitleEditor} onOpenChange={setShowTitleEditor}>
+        <Dialog.Content>
+          <Flex direction="column" gap="4">
+            <Heading size="4">Edit title</Heading>
+
+            <Flex gap="2" style={{ width: '100%' }}>
+              <TextField.Root style={{ flex: 1 }}>
+                <TextField.Input
+                  ref={titleInput}
+                  defaultValue={session.title}
+                  placeholder="Enter title..."
+                  onKeyDown={(event) => {
+                    if (event.key === 'Enter' && titleInput.current) {
+                      setShowTitleEditor(false);
+                      useSession.setState({ title: titleInput.current!.value });
+                    }
+                  }}
+                />
+              </TextField.Root>
+
+              <Dialog.Close>
+                <Button
+                  onClick={() =>
+                    useSession.setState({ title: titleInput.current!.value })
+                  }
+                >
+                  Set
+                </Button>
+              </Dialog.Close>
+            </Flex>
+          </Flex>
+        </Dialog.Content>
+      </Dialog.Root>
+
+      <Builder.Content>
+        <Builder.Sub>
+          <Builder.SubTrigger>Accent color</Builder.SubTrigger>
+
+          <Builder.SubContent>
+            <Builder.RadioGroup
+              value={session.color}
+              onValueChange={(value) =>
+                useSession.setState({ color: value as AccentColor | GrayColor })
+              }
+            >
+              {[...ACCENT_COLORS, ...GRAY_COLORS].map((color) => (
+                <Builder.RadioItem value={color} key={color}>
+                  <Flex gap="2" align="center">
+                    <div
+                      style={{
+                        backgroundColor: createColors(PALETTES[color])
+                          .solidBackground,
+                        width: 16,
+                        height: 16,
+                        borderRadius: '100%',
+                      }}
+                    />
+                    {`${color.charAt(0).toUpperCase()}${color.slice(1)}`}
+                  </Flex>
+                </Builder.RadioItem>
+              ))}
+            </Builder.RadioGroup>
+          </Builder.SubContent>
+        </Builder.Sub>
+
+        <Builder.Separator />
+
+        <Builder.Item onClick={() => setShowTitleEditor(true)}>
+          Edit title...
+        </Builder.Item>
+        <CustomColumn Builder={Builder} column={0} />
+        <CustomColumn Builder={Builder} column={1} />
+        <CustomColumn Builder={Builder} column={2} />
+        <CustomColumn Builder={Builder} column={3} />
+
+        <Builder.Separator />
+
+        <Builder.CheckboxItem
+          checked={session.showTotal}
+          onCheckedChange={(checked) =>
+            useSession.setState({ showTotal: checked })
+          }
+        >
+          Show total
+        </Builder.CheckboxItem>
+        <Builder.CheckboxItem
+          checked={session.showCareer}
+          onCheckedChange={(checked) =>
+            useSession.setState({ showCareer: checked })
+          }
+        >
+          Show career
+        </Builder.CheckboxItem>
+
+        <Builder.Separator />
+
+        <Builder.Item color="red" onClick={reset}>
+          Reset
+        </Builder.Item>
+      </Builder.Content>
+    </>
+  );
+}

src/app/tools/session/page.tsx

@@ -1,6 +1,11 @@
 'use client';
 
-import { CopyIcon, PersonIcon, ReloadIcon } from '@radix-ui/react-icons';
+import {
+  CaretDownIcon,
+  CopyIcon,
+  PersonIcon,
+  ReloadIcon,
+} from '@radix-ui/react-icons';
 import {
   AlertDialog,
   Button,
@@ -9,24 +14,19 @@ import {
   Flex,
   Text,
   TextField,
-  Tooltip,
 } from '@radix-ui/themes';
 import { debounce } from 'lodash';
-import { ChangeEvent, useRef, useState } from 'react';
+import { ChangeEvent, useEffect, useRef, useState } from 'react';
 import PageWrapper from '../../../components/PageWrapper';
-import { REGION_NAMES, Region } from '../../../constants/regions';
+import { REGION_NAMES } from '../../../constants/regions';
-import { WARGAMING_APPLICATION_ID } from '../../../constants/wargamingApplicationID';
+import searchPlayersAcrossRegions, {
-import getWargamingResponse from '../../../core/blitz/getWargamingResponse';
-import listPlayers, {
   AccountListWithServer,
-} from '../../../core/blitz/listPlayers';
+} from '../../../core/blitz/searchPlayersAcrossRegions';
-import { useSession } from '../../../stores/session';
+import { resetSession, setSession, useSession } from '../../../stores/session';
-import { NormalizedTankStats, TanksStats } from '../../../types/tanksStats';
 import SessionPage from '../../embeds/session/page';
+import { Menu } from './components/Menu';
 import * as styles from './page.css';
 
-// 1 once per 5 seconds
-
 export default function Page() {
   const input = useRef<HTMLInputElement>(null);
   const [searchResults, setSearchResults] = useState<
@@ -36,7 +36,7 @@ export default function Page() {
   const handleChange = debounce(
     async (event: ChangeEvent<HTMLInputElement>) => {
       if (event.target.value) {
-        setSearchResults(await listPlayers(event.target.value));
+        setSearchResults(await searchPlayersAcrossRegions(event.target.value));
       } else {
         setSearchResults(undefined);
         setShowSearchResults(false);
@@ -46,40 +46,12 @@ export default function Page() {
   );
   const session = useSession();
 
-  async function setSession(region: Region, id: number, nickname: string) {
+  useEffect(() => {
-    input.current!.value = nickname;
+    if (session.isTracking) input.current!.value = session.nickname;
-
+  }, [session]);
-    const rawTankStats = (
-      await getWargamingResponse<TanksStats>(
-        `https://api.wotblitz.${region}/wotb/tanks/stats/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
-      )
-    )[id];
-    const tankStats = rawTankStats.reduce<NormalizedTankStats>(
-      (accumulator, tank) => ({
-        ...accumulator,
-        [tank.tank_id]: tank,
-      }),
-      {},
-    );
-
-    useSession.setState({
-      isTracking: true,
-      id,
-      region,
-      nickname,
-      tankStats,
-      time: Date.now(),
-    });
-  }
-
-  function reset() {
-    const session = useSession.getState();
-    if (!session.isTracking) return;
-    setSession(session.region, session.id, session.nickname);
-  }
 
   return (
-    <PageWrapper>
+    <PageWrapper color="blue">
       <div className={styles.toolBar}>
         <div style={{ flex: 1, boxSizing: 'border-box', position: 'relative' }}>
           <TextField.Root>
@@ -150,10 +122,11 @@ export default function Page() {
           <AlertDialog.Root>
             <AlertDialog.Trigger>
               <Button
+                variant="soft"
                 onClick={(event) => {
-                  if (!session.promptBeforeReset) {
+                  if (!session.resetPrompt) {
                     event.preventDefault();
-                    reset();
+                    resetSession();
                   }
                 }}
                 className={styles.toolbarButton}
@@ -180,7 +153,7 @@ export default function Page() {
                     mr="1"
                     onCheckedChange={(checked) =>
                       useSession.setState({
-                        promptBeforeReset: !checked,
+                        resetPrompt: !checked,
                       })
                     }
                   />
@@ -196,7 +169,7 @@ export default function Page() {
                 </AlertDialog.Cancel>
 
                 <AlertDialog.Action>
-                  <Button variant="solid" color="red" onClick={reset}>
+                  <Button variant="solid" color="red" onClick={resetSession}>
                     Reset
                   </Button>
                 </AlertDialog.Action>
@@ -204,18 +177,74 @@ export default function Page() {
             </AlertDialog.Content>
           </AlertDialog.Root>
 
-          <Tooltip content="Copy to clipboard">
+          <AlertDialog.Root>
-            <Button
+            <AlertDialog.Trigger>
-              className={styles.toolbarButton}
+              <Button
-              onClick={() =>
+                variant="soft"
-                navigator.clipboard.writeText(
+                className={styles.toolbarButton}
-                  `${location.origin}/embeds/session`,
+                onClick={(event) => {
-                )
+                  if (!session.embedPrompt) {
-              }
+                    event.preventDefault();
-            >
+                    resetSession();
-              <CopyIcon width="16" height="16" /> Embed
+                  }
-            </Button>
+
-          </Tooltip>
+                  navigator.clipboard.writeText(
+                    `${location.origin}/embeds/session`,
+                  );
+                }}
+              >
+                <CopyIcon width="16" height="16" /> Embed
+              </Button>
+            </AlertDialog.Trigger>
+
+            <AlertDialog.Content>
+              <AlertDialog.Title>
+                Copied link to your clipboard
+              </AlertDialog.Title>
+              <AlertDialog.Description>
+                Instructions for streamers:
+                <iframe
+                  style={{
+                    width: '100%',
+                    aspectRatio: '16 / 9',
+                    border: 'none',
+                  }}
+                  src="https://www.youtube-nocookie.com/embed/e--GwjyrJAE?si=ftEiCmpbMI2FUY5N"
+                  title="YouTube video player"
+                  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+                ></iframe>
+              </AlertDialog.Description>
+
+              <Text size="2">
+                <Checkbox
+                  mr="1"
+                  onCheckedChange={(checked) =>
+                    useSession.setState({
+                      embedPrompt: !checked,
+                    })
+                  }
+                />
+                Don't show this again
+              </Text>
+
+              <Flex gap="3" mt="4">
+                <AlertDialog.Cancel>
+                  <Button variant="soft">Got it!</Button>
+                </AlertDialog.Cancel>
+              </Flex>
+            </AlertDialog.Content>
+          </AlertDialog.Root>
+
+          <DropdownMenu.Root>
+            <DropdownMenu.Trigger>
+              <Button variant="soft" className={styles.toolbarButton}>
+                Options
+                <CaretDownIcon />
+              </Button>
+            </DropdownMenu.Trigger>
+
+            <Menu Builder={DropdownMenu} reset={resetSession} />
+          </DropdownMenu.Root>
         </div>
       </div>
 

src/app/tools/tankopedia/[id]/page.tsx

@@ -0,0 +1,250 @@
+'use client';
+
+import { ArrowLeftIcon, CaretRightIcon } from '@radix-ui/react-icons';
+import {
+  Button,
+  Card,
+  Checkbox,
+  Dialog,
+  Flex,
+  Heading,
+  Slider,
+  Tabs,
+  Text,
+  Theme,
+  Tooltip,
+} from '@radix-ui/themes';
+import { OrbitControls } from '@react-three/drei';
+import { Canvas } from '@react-three/fiber';
+import Link from 'next/link';
+import { use, useEffect, useState } from 'react';
+import { Flag } from '../../../../components/Flag';
+import PageWrapper from '../../../../components/PageWrapper';
+import { asset } from '../../../../core/blitzkrieg/asset';
+import { gunDefinitions } from '../../../../core/blitzkrieg/definitions/guns';
+import { shellDefinitions } from '../../../../core/blitzkrieg/definitions/shells';
+import {
+  TIER_ROMAN_NUMERALS,
+  tankDefinitions,
+  tanksDefinitionsArray,
+} from '../../../../core/blitzkrieg/definitions/tanks';
+import { turretDefinitions } from '../../../../core/blitzkrieg/definitions/turrets';
+import * as styles from '../page.css';
+
+type Mode = 'model' | 'armor';
+
+export default function Page({ params }: { params: { id: string } }) {
+  const id = parseInt(params.id);
+  const awaitedTankDefinitions = use(tankDefinitions);
+  const awaitedTanksDefinitionsArray = use(tanksDefinitionsArray);
+  const awaitedTurretDefinitions = use(turretDefinitions);
+  const awaitedGunDefinitions = use(gunDefinitions);
+  const awaitedShellDefinitions = use(shellDefinitions);
+  const tank = awaitedTankDefinitions[id];
+  const [turret, setTurret] = useState(
+    awaitedTurretDefinitions[tank.turrets[0]],
+  );
+  const [gun, setGun] = useState(awaitedGunDefinitions[turret.guns[0]]);
+  const [crew, setCrew] = useState(100);
+  const [versusTank, setVersusTank] = useState(
+    awaitedTanksDefinitionsArray[0].id,
+  );
+  const [mode, setMode] = useState<Mode>('model');
+
+  console.log(versusTank);
+
+  useEffect(() => setGun(awaitedGunDefinitions[turret.guns[0]]), [turret]);
+
+  return (
+    <PageWrapper>
+      <Flex gap="8" direction="column">
+        <Flex gap="4" direction="column">
+          <Flex justify="between" align="center">
+            <Link
+              href="/tools/tankopedia"
+              style={{ color: 'unset', textDecoration: 'none' }}
+            >
+              <Flex gap="1" align="center">
+                <ArrowLeftIcon />
+                <Text>Back to tankopedia</Text>
+              </Flex>
+            </Link>
+
+            <Flex gap="2" align="center">
+              <Flag nation={tank.nation} />
+              <Heading>{tank.name}</Heading>
+            </Flex>
+          </Flex>
+
+          <Card style={{ position: 'relative' }}>
+            <Flex direction="column" gap="2">
+              <Tabs.Root
+                value={mode}
+                onValueChange={(value) => setMode(value as Mode)}
+              >
+                <Tabs.List>
+                  <Tabs.Trigger value="model">Model</Tabs.Trigger>
+                  <Tabs.Trigger value="armor">Armor</Tabs.Trigger>
+                </Tabs.List>
+              </Tabs.Root>
+
+              <div style={{ height: '50vh', maxHeight: 576 }}>
+                <Canvas onPointerDown={(event) => event.preventDefault()}>
+                  <OrbitControls />
+
+                  <ambientLight />
+                  <directionalLight />
+
+                  <mesh>
+                    <torusKnotGeometry args={[undefined, undefined, 128, 16]} />
+                    <meshStandardMaterial color="cyan" />
+                  </mesh>
+                </Canvas>
+              </div>
+
+              {mode === 'armor' && (
+                <Flex gap="2" align="center" className={styles.enhancedArmor}>
+                  <Checkbox defaultChecked />
+                  <Text>Enhanced armor</Text>
+                </Flex>
+              )}
+            </Flex>
+          </Card>
+
+          {mode === 'armor' && (
+            <Card>
+              <Flex align="center" justify="between" gap="2">
+                <Flex align="center" gap="4">
+                  <Text>Versus</Text>
+
+                  <Dialog.Root>
+                    <Dialog.Trigger>
+                      <Button variant="ghost">
+                        {awaitedTankDefinitions[versusTank].name}
+                        <CaretRightIcon />
+                      </Button>
+                    </Dialog.Trigger>
+
+                    <Dialog.Content>Do something lol</Dialog.Content>
+                  </Dialog.Root>
+                </Flex>
+
+                <Flex gap="2" align="center">
+                  <Checkbox defaultChecked />
+                  <Text>Calibrated shells</Text>
+                </Flex>
+
+                <Flex gap="1">
+                  <Button variant="solid" radius="small">
+                    <img src={asset('shells/ap.webp')} width={24} height={24} />
+                  </Button>
+                  <Button variant="soft" radius="small" color="gray">
+                    <img
+                      src={asset('shells/hc_premium.webp')}
+                      width={24}
+                      height={24}
+                    />
+                  </Button>
+                  <Button variant="soft" radius="small" color="gray">
+                    <img src={asset('shells/he.webp')} width={24} height={24} />
+                  </Button>
+                </Flex>
+              </Flex>
+            </Card>
+          )}
+        </Flex>
+
+        <Flex gap="6" direction="column">
+          <Heading>Build</Heading>
+
+          <Flex gap="2" direction="column">
+            <Heading size="5" weight="regular">
+              Modules
+            </Heading>
+            <Theme radius="small">
+              <Flex gap="4">
+                <Flex gap="1">
+                  {tank.turrets.map((turretId) => {
+                    const thisTurret = awaitedTurretDefinitions[turretId];
+
+                    return (
+                      <Tooltip content={thisTurret.name}>
+                        <Button
+                          onClick={() => setTurret(thisTurret)}
+                          variant={
+                            turret.id === thisTurret.id ? 'solid' : 'soft'
+                          }
+                        >
+                          <img
+                            src="/images/modules/turret.png"
+                            width={32}
+                            height={32}
+                          />
+                          {TIER_ROMAN_NUMERALS[thisTurret.tier]}
+                        </Button>
+                      </Tooltip>
+                    );
+                  })}
+                </Flex>
+
+                <Flex gap="1">
+                  {turret.guns.map((gunId, index) => {
+                    const thisGun = awaitedGunDefinitions[gunId];
+
+                    return (
+                      <Tooltip content={thisGun.name}>
+                        <Button
+                          onClick={() => setGun(thisGun)}
+                          variant={gun.id === thisGun.id ? 'solid' : 'soft'}
+                        >
+                          <img
+                            src="/images/modules/gun.png"
+                            width={32}
+                            height={32}
+                          />
+                          {TIER_ROMAN_NUMERALS[thisGun.tier]}
+                        </Button>
+                      </Tooltip>
+                    );
+                  })}
+                </Flex>
+              </Flex>
+            </Theme>
+          </Flex>
+
+          <Flex gap="2" direction="column">
+            <Heading size="5" weight="regular">
+              Crew
+            </Heading>
+
+            <Flex gap="4" align="center">
+              <Text>{crew}%</Text>
+
+              <Slider
+                style={{ flex: 1 }}
+                value={[crew]}
+                min={50}
+                max={100}
+                onValueChange={([crew]) => setCrew(crew)}
+              />
+            </Flex>
+          </Flex>
+        </Flex>
+
+        <Flex gap="2" direction="column">
+          <Heading size="5">Shells</Heading>
+
+          {gun.shells.map((shellId) => {
+            const shell = awaitedShellDefinitions[shellId];
+
+            return (
+              <Text>
+                {shell.name} ({shell.type}): {shell.damage.armor}
+              </Text>
+            );
+          })}
+        </Flex>
+      </Flex>
+    </PageWrapper>
+  );
+}

src/app/tools/tankopedia/components/Options/index.css.ts

@@ -0,0 +1,17 @@
+import { style } from '@vanilla-extract/css';
+
+export const splitFilters = style({
+  '@media': {
+    'screen and (min-width: 513px)': {
+      display: 'none',
+    },
+  },
+});
+
+export const oneLineFilters = style({
+  '@media': {
+    'screen and (max-width: 512px)': {
+      display: 'none',
+    },
+  },
+});

src/app/tools/tankopedia/components/Options/index.tsx

@@ -0,0 +1,388 @@
+'use client';
+
+import { CaretDownIcon } from '@radix-ui/react-icons';
+import { Button, DropdownMenu, Flex } from '@radix-ui/themes';
+import { use } from 'react';
+import { Flag } from '../../../../../components/Flag';
+import {
+  TANK_TYPES,
+  TREE_TYPES,
+  TREE_TYPE_ICONS,
+  TREE_TYPE_IMAGES,
+  TreeTypeEnum,
+} from '../../../../../components/Tanks';
+import {
+  NATIONS,
+  TIERS,
+  TIER_ROMAN_NUMERALS,
+} from '../../../../../core/blitzkrieg/definitions/tanks';
+import mutateTankopedia, {
+  TankopediaTestTankDisplay,
+  useTankopedia,
+} from '../../../../../stores/tankopedia';
+import * as styles from './index.css';
+
+export function Options() {
+  const nations = use(NATIONS);
+  const tankopediaState = useTankopedia();
+
+  return (
+    <Flex justify="center" direction="column" gap="2">
+      <Flex gap="2" style={{ flex: 1 }} wrap="wrap">
+        <Button
+          color="red"
+          onClick={() =>
+            useTankopedia.setState({
+              filters: {
+                nations: [],
+                tiers: [],
+                treeTypes: [],
+                types: [],
+                test: 'include',
+              },
+            })
+          }
+        >
+          Clear
+        </Button>
+        <DropdownMenu.Root>
+          <DropdownMenu.Trigger>
+            <Button variant="soft">
+              Test tanks
+              <CaretDownIcon />
+            </Button>
+          </DropdownMenu.Trigger>
+          <DropdownMenu.Content>
+            <DropdownMenu.RadioGroup
+              value={tankopediaState.filters.test}
+              onValueChange={(value) =>
+                mutateTankopedia((draft) => {
+                  draft.filters.test = value as TankopediaTestTankDisplay;
+                })
+              }
+            >
+              <DropdownMenu.RadioItem value="include">
+                Include
+              </DropdownMenu.RadioItem>
+              <DropdownMenu.RadioItem value="exclude">
+                Exclude
+              </DropdownMenu.RadioItem>
+              <DropdownMenu.RadioItem value="only">Only</DropdownMenu.RadioItem>
+            </DropdownMenu.RadioGroup>
+          </DropdownMenu.Content>
+        </DropdownMenu.Root>
+        <Flex style={{ flex: 1 }}>
+          {TREE_TYPES.map((type, index) => (
+            <Button
+              key={type}
+              variant={
+                tankopediaState.filters.treeTypes.includes(type)
+                  ? 'solid'
+                  : 'soft'
+              }
+              style={{
+                flex: 1,
+                margin: -0.5,
+                borderTopLeftRadius: index === 0 ? undefined : 0,
+                borderBottomLeftRadius: index === 0 ? undefined : 0,
+                borderTopRightRadius:
+                  index === TREE_TYPES.length - 1 ? undefined : 0,
+                borderBottomRightRadius:
+                  index === TREE_TYPES.length - 1 ? undefined : 0,
+              }}
+              onClick={() =>
+                mutateTankopedia((draft) => {
+                  if (draft.filters.treeTypes.includes(type)) {
+                    draft.filters.treeTypes = draft.filters.treeTypes.filter(
+                      (preexistingType) => preexistingType !== type,
+                    );
+                  } else {
+                    draft.filters.treeTypes.push(type);
+                  }
+                })
+              }
+            >
+              <img
+                src={TREE_TYPE_IMAGES[type]}
+                style={{ width: '1em', height: '1em' }}
+              />
+            </Button>
+          ))}
+        </Flex>
+        <Flex style={{ flex: 1 }}>
+          {[...TANK_TYPES].reverse().map((type, index) => (
+            <Button
+              key={type}
+              variant={
+                tankopediaState.filters.types.includes(type) ? 'solid' : 'soft'
+              }
+              style={{
+                flex: 1,
+                margin: -0.5,
+                borderTopLeftRadius: index === 0 ? undefined : 0,
+                borderBottomLeftRadius: index === 0 ? undefined : 0,
+                borderTopRightRadius:
+                  index === TANK_TYPES.length - 1 ? undefined : 0,
+                borderBottomRightRadius:
+                  index === TANK_TYPES.length - 1 ? undefined : 0,
+              }}
+              onClick={() =>
+                mutateTankopedia((draft) => {
+                  if (draft.filters.types.includes(type)) {
+                    draft.filters.types = draft.filters.types.filter(
+                      (preexistingType) => preexistingType !== type,
+                    );
+                  } else {
+                    draft.filters.types.push(type);
+                  }
+                })
+              }
+            >
+              <img
+                src={TREE_TYPE_ICONS[TreeTypeEnum.TechTree][type]}
+                style={{ width: '1em', height: '1em' }}
+              />
+            </Button>
+          ))}
+        </Flex>
+        <Flex
+          direction="column"
+          className={styles.splitFilters}
+          style={{ width: '100%' }}
+        >
+          <Flex>
+            {[...TIERS]
+              .reverse()
+              .slice(0, 5)
+              .map((tier, index) => (
+                <Button
+                  key={tier}
+                  variant={
+                    tankopediaState.filters.tiers.includes(tier)
+                      ? 'solid'
+                      : 'soft'
+                  }
+                  style={{
+                    flex: 1,
+                    margin: -0.5,
+                    borderTopLeftRadius: index === 0 ? undefined : 0,
+                    borderBottomLeftRadius: 0,
+                    borderTopRightRadius:
+                      index === TIERS.length - Math.round(TIERS.length / 2) - 1
+                        ? undefined
+                        : 0,
+                    borderBottomRightRadius: 0,
+                  }}
+                  onClick={() =>
+                    mutateTankopedia((draft) => {
+                      if (draft.filters.tiers.includes(tier)) {
+                        draft.filters.tiers = draft.filters.tiers.filter(
+                          (preexistingTier) => preexistingTier !== tier,
+                        );
+                      } else {
+                        draft.filters.tiers.push(tier);
+                      }
+                    })
+                  }
+                >
+                  {TIER_ROMAN_NUMERALS[tier]}
+                </Button>
+              ))}
+          </Flex>
+          <Flex>
+            {[...TIERS]
+              .reverse()
+              .slice(5, 10)
+              .map((tier, index) => (
+                <Button
+                  key={tier}
+                  variant={
+                    tankopediaState.filters.tiers.includes(tier)
+                      ? 'solid'
+                      : 'soft'
+                  }
+                  style={{
+                    flex: 1,
+                    margin: -0.5,
+                    borderTopLeftRadius: 0,
+                    borderBottomLeftRadius: index === 0 ? undefined : 0,
+                    borderTopRightRadius: 0,
+                    borderBottomRightRadius:
+                      index === TIERS.length - Math.round(TIERS.length / 2) - 1
+                        ? undefined
+                        : 0,
+                  }}
+                  onClick={() =>
+                    mutateTankopedia((draft) => {
+                      if (draft.filters.tiers.includes(tier)) {
+                        draft.filters.tiers = draft.filters.tiers.filter(
+                          (preexistingTier) => preexistingTier !== tier,
+                        );
+                      } else {
+                        draft.filters.tiers.push(tier);
+                      }
+                    })
+                  }
+                >
+                  {TIER_ROMAN_NUMERALS[tier]}
+                </Button>
+              ))}
+          </Flex>
+        </Flex>
+        <Flex
+          direction="column"
+          className={styles.splitFilters}
+          style={{ width: '100%' }}
+        >
+          <Flex>
+            {nations.slice(0, 5).map((nation, index) => (
+              <Button
+                key={nation}
+                variant={
+                  tankopediaState.filters.nations.includes(nation)
+                    ? 'solid'
+                    : 'soft'
+                }
+                style={{
+                  flex: 1,
+                  margin: -0.5,
+                  borderTopLeftRadius: index === 0 ? undefined : 0,
+                  borderBottomLeftRadius: 0,
+                  borderTopRightRadius:
+                    index === nations.length - Math.round(nations.length / 2)
+                      ? undefined
+                      : 0,
+                  borderBottomRightRadius:
+                    index === nations.length - 1 ? undefined : 0,
+                }}
+                onClick={() =>
+                  mutateTankopedia((draft) => {
+                    if (draft.filters.nations.includes(nation)) {
+                      draft.filters.nations = draft.filters.nations.filter(
+                        (preexistingType) => preexistingType !== nation,
+                      );
+                    } else {
+                      draft.filters.nations.push(nation);
+                    }
+                  })
+                }
+              >
+                <Flag nation={nation} />
+              </Button>
+            ))}
+          </Flex>
+
+          <Flex>
+            {nations.slice(5, 10).map((nation, index) => (
+              <Button
+                key={nation}
+                variant={
+                  tankopediaState.filters.nations.includes(nation)
+                    ? 'solid'
+                    : 'soft'
+                }
+                style={{
+                  flex: 1,
+                  margin: -0.5,
+                  borderTopLeftRadius: 0,
+                  borderBottomLeftRadius: index === 0 ? undefined : 0,
+                  borderTopRightRadius:
+                    index === nations.length - 1 ? undefined : 0,
+                  borderBottomRightRadius:
+                    index ===
+                    nations.length - Math.round(nations.length / 2) - 1
+                      ? undefined
+                      : 0,
+                }}
+                onClick={() =>
+                  mutateTankopedia((draft) => {
+                    if (draft.filters.nations.includes(nation)) {
+                      draft.filters.nations = draft.filters.nations.filter(
+                        (preexistingType) => preexistingType !== nation,
+                      );
+                    } else {
+                      draft.filters.nations.push(nation);
+                    }
+                  })
+                }
+              >
+                <Flag nation={nation} />
+              </Button>
+            ))}
+          </Flex>
+        </Flex>
+      </Flex>
+
+      <Flex gap="2" style={{ flex: 1 }} wrap="wrap">
+        <Flex className={styles.oneLineFilters} style={{ flex: 1 }}>
+          {[...TIERS].reverse().map((tier, index) => (
+            <Button
+              key={tier}
+              variant={
+                tankopediaState.filters.tiers.includes(tier) ? 'solid' : 'soft'
+              }
+              style={{
+                flex: 1,
+                margin: -0.5,
+                borderTopLeftRadius: index === 0 ? undefined : 0,
+                borderBottomLeftRadius: index === 0 ? undefined : 0,
+                borderTopRightRadius:
+                  index === TIERS.length - 1 ? undefined : 0,
+                borderBottomRightRadius:
+                  index === TIERS.length - 1 ? undefined : 0,
+              }}
+              onClick={() =>
+                mutateTankopedia((draft) => {
+                  if (draft.filters.tiers.includes(tier)) {
+                    draft.filters.tiers = draft.filters.tiers.filter(
+                      (preexistingTier) => preexistingTier !== tier,
+                    );
+                  } else {
+                    draft.filters.tiers.push(tier);
+                  }
+                })
+              }
+            >
+              {TIER_ROMAN_NUMERALS[tier]}
+            </Button>
+          ))}
+        </Flex>
+        <Flex className={styles.oneLineFilters} style={{ flex: 1 }}>
+          {nations.map((nation, index) => (
+            <Button
+              key={nation}
+              variant={
+                tankopediaState.filters.nations.includes(nation)
+                  ? 'solid'
+                  : 'soft'
+              }
+              style={{
+                flex: 1,
+                margin: -0.5,
+                borderTopLeftRadius: index === 0 ? undefined : 0,
+                borderBottomLeftRadius: index === 0 ? undefined : 0,
+                borderTopRightRadius:
+                  index === nations.length - 1 ? undefined : 0,
+                borderBottomRightRadius:
+                  index === nations.length - 1 ? undefined : 0,
+              }}
+              onClick={() =>
+                mutateTankopedia((draft) => {
+                  if (draft.filters.nations.includes(nation)) {
+                    draft.filters.nations = draft.filters.nations.filter(
+                      (preexistingType) => preexistingType !== nation,
+                    );
+                  } else {
+                    draft.filters.nations.push(nation);
+                  }
+                })
+              }
+            >
+              <Flag nation={nation} />
+            </Button>
+          ))}
+        </Flex>
+      </Flex>
+    </Flex>
+  );
+}

src/app/tools/tankopedia/components/PageTurner.tsx

@@ -0,0 +1,77 @@
+import { CaretLeftIcon, CaretRightIcon } from '@radix-ui/react-icons';
+import { Button, Flex, TextField } from '@radix-ui/themes';
+import { useEffect, useRef } from 'react';
+import { BlitzkriegTankDefinition } from '../../../../core/blitzkrieg/definitions/tanks';
+
+interface PageTurnerProps {
+  page: number;
+  setPage: (page: number) => void;
+  searchedList: BlitzkriegTankDefinition[];
+  tanksPerPage: number;
+}
+
+export function PageTurner({
+  page,
+  setPage,
+  searchedList,
+  tanksPerPage,
+}: PageTurnerProps) {
+  const pageInput = useRef<HTMLInputElement>(null);
+
+  useEffect(() => {
+    if (pageInput.current) pageInput.current.value = `${page + 1}`;
+  }, [page]);
+
+  return (
+    <Flex align="center" justify="center" gap="2">
+      <Button
+        variant="soft"
+        disabled={page === 0}
+        onClick={() => setPage(Math.max(0, page - 1))}
+      >
+        <CaretLeftIcon />
+      </Button>
+      <TextField.Root>
+        <TextField.Slot>Page</TextField.Slot>
+        <TextField.Input
+          defaultValue={1}
+          type="number"
+          ref={pageInput}
+          min={1}
+          max={Math.floor(searchedList.length / tanksPerPage) + 1}
+          style={{ width: 64, textAlign: 'center' }}
+          onBlur={(event) => {
+            setPage(
+              Math.max(
+                0,
+                Math.min(
+                  Math.floor(searchedList.length / tanksPerPage),
+                  event.target.valueAsNumber - 1,
+                ),
+              ),
+            );
+          }}
+          onKeyDown={(event) => {
+            if (event.key === 'Enter') {
+              (event.target as HTMLInputElement).blur();
+            }
+          }}
+        />
+        <TextField.Slot>
+          out of {Math.floor(searchedList.length / tanksPerPage) + 1}
+        </TextField.Slot>
+      </TextField.Root>
+      <Button
+        variant="soft"
+        disabled={Math.floor(searchedList.length / tanksPerPage) === page}
+        onClick={() =>
+          setPage(
+            Math.min(Math.floor(searchedList.length / tanksPerPage), page + 1),
+          )
+        }
+      >
+        <CaretRightIcon />
+      </Button>
+    </Flex>
+  );
+}

src/app/tools/tankopedia/page.css.ts

@@ -0,0 +1,57 @@
+import { style } from '@vanilla-extract/css';
+import { theme } from '../../../stitches.config';
+
+export const listing = style({});
+
+export const flag = style({
+  transitionDuration: theme.durations.regular,
+  left: '0',
+  top: '0',
+
+  [`.${listing}:hover &, .${listing}:active &`]: {
+    transform: 'translateX(-25%)',
+    filter: 'blur(3rem)',
+  },
+});
+
+export const listingShadow = style({
+  boxShadow: `inset 128px -128px 128px -128px ${theme.colors.appBackground1}`,
+
+  [`.${listing}:hover &, .${listing}:active &`]: {
+    boxShadow: `inset 0 0 0 -128px ${theme.colors.appBackground1}`,
+  },
+});
+
+export const listingLabel = style({
+  transition: `transform ${theme.durations.regular}`,
+  transform: 'translateY(0)',
+
+  [`.${listing}:hover &, .${listing}:active &`]: {
+    transform: 'translateY(200%)',
+  },
+});
+
+export const listingImage = style({
+  transition: `transform ${theme.durations.regular}`,
+  position: 'absolute',
+  left: '50%',
+
+  [`.${listing}:hover &, .${listing}:active &`]: {
+    transform: 'translate(-25%, 10%)',
+  },
+});
+
+export const enhancedArmor = style({
+  '@media': {
+    'screen and (min-width: 400px)': {
+      position: 'absolute',
+      right: 16,
+      top: 16,
+    },
+
+    'screen and (max-width: 399px)': {
+      // left: 16,
+      // bottom: 16,
+    },
+  },
+});

src/app/tools/tankopedia/page.tsx

@@ -0,0 +1,329 @@
+'use client';
+
+import { slateDark } from '@radix-ui/colors';
+import {
+  CaretDownIcon,
+  CaretUpIcon,
+  MagnifyingGlassIcon,
+} from '@radix-ui/react-icons';
+import {
+  Button,
+  Card,
+  DropdownMenu,
+  Flex,
+  Inset,
+  Text,
+  TextField,
+} from '@radix-ui/themes';
+import { go } from 'fuzzysort';
+import { Suspense, use, useEffect, useMemo, useRef, useState } from 'react';
+import PageWrapper from '../../../components/PageWrapper';
+import { asset } from '../../../core/blitzkrieg/asset';
+import {
+  BlitzkriegTankDefinition,
+  TANK_ICONS,
+  TANK_ICONS_COLLECTOR,
+  TANK_ICONS_PREMIUM,
+  TIER_ROMAN_NUMERALS,
+  tanksDefinitionsArray,
+} from '../../../core/blitzkrieg/definitions/tanks';
+import { tankIcon } from '../../../core/blitzkrieg/tankIcon';
+import { theme } from '../../../stitches.config';
+import mutateTankopedia, {
+  TankopediaSortBy,
+  TankopediaSortDirection,
+  useTankopedia,
+} from '../../../stores/tankopedia';
+import { Options } from './components/Options';
+import { PageTurner } from './components/PageTurner';
+import * as styles from './page.css';
+
+const TANKS_PER_PAGE = 3 * 2 ** 3;
+
+export default function Page() {
+  const tankopediaState = useTankopedia();
+  const awaitedTanks = use(tanksDefinitionsArray);
+  const input = useRef<HTMLInputElement>(null);
+  const searchableTanks = useMemo(
+    () =>
+      awaitedTanks
+        .filter(
+          (tank) =>
+            (tankopediaState.filters.tiers.length === 0
+              ? true
+              : tankopediaState.filters.tiers.includes(tank.tier)) &&
+            (tankopediaState.filters.types.length === 0
+              ? true
+              : tankopediaState.filters.types.includes(tank.type)) &&
+            (tankopediaState.filters.treeTypes.length === 0
+              ? true
+              : tankopediaState.filters.treeTypes.includes(tank.tree_type)) &&
+            (tankopediaState.filters.nations.length === 0
+              ? true
+              : tankopediaState.filters.nations.includes(tank.nation)) &&
+            (tankopediaState.filters.test === 'include'
+              ? true
+              : tankopediaState.filters.test === 'exclude'
+                ? !tank.testing
+                : tank.testing),
+        )
+        .sort((a, b) => {
+          let diff = 0;
+
+          if (tankopediaState.sort.by === 'tier') {
+            diff = a.tier - b.tier;
+          }
+          if (tankopediaState.sort.by === 'name') {
+            diff = a.name.localeCompare(b.name);
+          }
+
+          return tankopediaState.sort.direction === 'ascending' ? diff : -diff;
+        }),
+    [tankopediaState.filters, tankopediaState.sort],
+  );
+  const [searchedList, setSearchedList] = useState(searchableTanks);
+  const [page, setPage] = useState(0);
+  const [showFilters, setShowFilters] = useState(false);
+
+  useEffect(() => {
+    setSearchedList(searchableTanks);
+    if (input.current) input.current.value = '';
+  }, [searchableTanks]);
+
+  useEffect(() => {
+    setPage(
+      Math.min(
+        Math.max(0, page),
+        Math.ceil(searchedList.length / TANKS_PER_PAGE) - 1,
+      ),
+    );
+  }, [searchedList]);
+
+  return (
+    <PageWrapper size="wide" color="purple">
+      <Suspense fallback={<Text>Loading...</Text>}>
+        <Flex direction="column" gap="4">
+          <Flex gap="2">
+            <TextField.Root style={{ flex: 1 }}>
+              <TextField.Slot>
+                <MagnifyingGlassIcon height="16" width="16" />
+              </TextField.Slot>
+              <TextField.Input
+                ref={input}
+                placeholder="Search tanks..."
+                onChange={(event) => {
+                  if (event.target.value.length === 0) {
+                    setSearchedList(searchableTanks);
+                  } else {
+                    setSearchedList(
+                      go(event.target.value, searchableTanks, {
+                        keys: [
+                          'name',
+                          'id',
+                        ] satisfies (keyof BlitzkriegTankDefinition)[],
+                      }).map(({ obj }) => obj),
+                    );
+                  }
+                }}
+              />
+            </TextField.Root>
+
+            <DropdownMenu.Root>
+              <DropdownMenu.Trigger>
+                <Button variant="soft">
+                  Sort
+                  <CaretDownIcon />
+                </Button>
+              </DropdownMenu.Trigger>
+              <DropdownMenu.Content>
+                <DropdownMenu.Label>By</DropdownMenu.Label>
+                <DropdownMenu.RadioGroup
+                  value={tankopediaState.sort.by}
+                  onValueChange={(value) =>
+                    mutateTankopedia((draft) => {
+                      draft.sort.by = value as TankopediaSortBy;
+                    })
+                  }
+                >
+                  <DropdownMenu.RadioItem value="tier">
+                    Tier
+                  </DropdownMenu.RadioItem>
+                  <DropdownMenu.RadioItem value="name">
+                    Name
+                  </DropdownMenu.RadioItem>
+                </DropdownMenu.RadioGroup>
+
+                <DropdownMenu.Separator />
+
+                <DropdownMenu.Label>Direction</DropdownMenu.Label>
+                <DropdownMenu.RadioGroup
+                  value={tankopediaState.sort.direction}
+                  onValueChange={(value) =>
+                    mutateTankopedia((draft) => {
+                      draft.sort.direction = value as TankopediaSortDirection;
+                    })
+                  }
+                >
+                  <DropdownMenu.RadioItem value="ascending">
+                    Ascending
+                  </DropdownMenu.RadioItem>
+                  <DropdownMenu.RadioItem value="descending">
+                    Descending
+                  </DropdownMenu.RadioItem>
+                </DropdownMenu.RadioGroup>
+              </DropdownMenu.Content>
+            </DropdownMenu.Root>
+
+            <Button
+              variant="soft"
+              onClick={() => setShowFilters((state) => !state)}
+            >
+              Filters {showFilters ? <CaretUpIcon /> : <CaretDownIcon />}
+            </Button>
+          </Flex>
+
+          {showFilters && (
+            <Card>
+              <Suspense fallback={<Text>Loading...</Text>}>
+                <Options />
+              </Suspense>
+            </Card>
+          )}
+        </Flex>
+
+        <PageTurner
+          page={page}
+          setPage={setPage}
+          tanksPerPage={TANKS_PER_PAGE}
+          searchedList={searchedList}
+        />
+
+        <Flex wrap="wrap" gap="3" justify="center">
+          {searchedList
+            .map((tank) => (
+              <a
+                key={tank.id}
+                href={`/tools/tankopedia/${tank.id}`}
+                style={{
+                  flex: 1,
+                  textDecoration: 'none',
+                  color: 'unset',
+                }}
+              >
+                <Card className={styles.listing}>
+                  <Inset
+                    key={tank.id}
+                    style={{
+                      minWidth: 256,
+                      minHeight: 128,
+                      position: 'relative',
+                      display: 'flex',
+                    }}
+                  >
+                    <img
+                      className={styles.flag}
+                      src={asset(`flags/scratched/${tank.nation}.webp`)}
+                      style={{
+                        width: '100%',
+                        height: '100%',
+                        objectFit: 'contain',
+                        position: 'absolute',
+                      }}
+                    />
+
+                    <div
+                      style={{
+                        width: 256,
+                        height: 128,
+                      }}
+                      className={styles.listingImage}
+                    >
+                      <img
+                        src={tankIcon(tank.id)}
+                        style={{
+                          objectFit: 'contain',
+                          objectPosition: 'left center',
+                        }}
+                      />
+                    </div>
+
+                    <div
+                      className={styles.listingShadow}
+                      style={{
+                        width: '100%',
+                        height: '100%',
+                        position: 'absolute',
+                        transition: `box-shadow ${theme.durations.regular}`,
+                      }}
+                    />
+
+                    <Flex
+                      align="center"
+                      justify="between"
+                      className={styles.listingLabel}
+                      style={{
+                        position: 'absolute',
+                        bottom: 8,
+                        padding: '0 12px',
+                        width: '100%',
+                        boxSizing: 'border-box',
+                      }}
+                    >
+                      <Flex align="center" justify="center" gap="1">
+                        <img
+                          src={
+                            (tank.tree_type === 'collector'
+                              ? TANK_ICONS_COLLECTOR
+                              : tank.tree_type === 'premium'
+                                ? TANK_ICONS_PREMIUM
+                                : TANK_ICONS)[tank.type]
+                          }
+                          style={{ width: '1em', height: '1em' }}
+                        />
+                        <Text
+                          size="4"
+                          color={
+                            tank.tree_type === 'collector'
+                              ? 'blue'
+                              : tank.tree_type === 'premium'
+                                ? 'amber'
+                                : undefined
+                          }
+                          weight="medium"
+                          style={{
+                            color:
+                              tank.tree_type === 'researchable'
+                                ? slateDark.slate12
+                                : undefined,
+                            whiteSpace: 'nowrap',
+                            maxWidth: 160,
+                            display: 'block',
+                            textOverflow: 'ellipsis',
+                            overflow: 'hidden',
+                          }}
+                        >
+                          {tank.name}
+                        </Text>
+                      </Flex>
+
+                      <Text size="4" color="gray" highContrast={false}>
+                        {TIER_ROMAN_NUMERALS[tank.tier]}
+                      </Text>
+                    </Flex>
+                  </Inset>
+                </Card>
+              </a>
+            ))
+            .slice(page * TANKS_PER_PAGE, (page + 1) * TANKS_PER_PAGE)}
+        </Flex>
+
+        <PageTurner
+          page={page}
+          setPage={setPage}
+          tanksPerPage={TANKS_PER_PAGE}
+          searchedList={searchedList}
+        />
+      </Suspense>
+    </PageWrapper>
+  );
+}

src/bot.ts

@@ -1,6 +1,8 @@
+import { registerProcesses } from './core/blitzkrieg/processes';
+import { secrets } from './core/blitzkrieg/secrets';
 import { client } from './core/discord/client';
-import { secrets } from './core/node/secrets';
-import { registerErrorHandlers } from './events/error';
 
-registerErrorHandlers();
+// console.log(`🟡 Launching bot ${client.shard?.ids[0]}`);
+
+registerProcesses();
 client.login(secrets.DISCORD_TOKEN);

src/commands/about.ts

@@ -11,6 +11,7 @@ const DOCS = {
   introduction: 'guide/introduction',
   invite: 'guide/invite',
   timezones: 'guide/timezones',
+  creators: 'guide/creators',
 };
 const DOC_DESCRIPTIONS: Record<keyof typeof DOCS, string> = {
   permissions: 'The permissions needed for the bot to function',
@@ -18,6 +19,7 @@ const DOC_DESCRIPTIONS: Record<keyof typeof DOCS, string> = {
   introduction: 'About the bot',
   invite: 'How to invite the bot',
   timezones: 'How Blitzkrieg infers and uses your timezone',
+  creators: 'Who created the bot',
 };
 
 function addDocsSubcommands(option: SlashCommandSubcommandsOnlyBuilder) {
@@ -51,6 +53,7 @@ export const aboutCommand: CommandRegistry = {
         await Promise.all(COMMANDS_RAW)
       )
         .filter((registry) => registry.inPublic && registry.inProduction)
+        .sort((a, b) => (a.command.name < b.command.name ? -1 : 1))
         .map(
           (registry) =>
             `- \`/${registry.command.name}\`: ${registry.command.description}`,

src/commands/breakdown.tsx

@@ -0,0 +1,339 @@
+import { SlashCommandBuilder } from 'discord.js';
+import { chunk } from 'lodash';
+import * as Breakdown from '../components/Breakdown';
+import NoData, { NoDataType } from '../components/NoData';
+import TitleBar from '../components/TitleBar';
+import Wrapper from '../components/Wrapper';
+import { AllStats, getAccountInfo } from '../core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
+import getTankStats from '../core/blitz/getTankStats';
+import getTreeType from '../core/blitz/getTreeType';
+import { tankDefinitions } from '../core/blitzkrieg/definitions/tanks';
+import { filtersToDescription } from '../core/blitzkrieg/filtersToDescription';
+import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
+import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
+import { tankAverages } from '../core/blitzstars/tankAverages';
+import addFilterOptions from '../core/discord/addFilterOptions';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import autocompleteTanks from '../core/discord/autocompleteTanks';
+import autocompleteUsername from '../core/discord/autocompleteUsername';
+import buttonPrimary from '../core/discord/buttonPrimary';
+import commandToURL from '../core/discord/commandToURL';
+import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
+import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
+import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
+import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton';
+import resolvePeriodFromCommand, {
+  ResolvedPeriod,
+} from '../core/discord/resolvePeriodFromCommand';
+import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
+import resolvePlayerFromCommand, {
+  ResolvedPlayer,
+} from '../core/discord/resolvePlayerFromCommand';
+import calculateWN8 from '../core/statistics/calculateWN8';
+import { StatFilters, filterStats } from '../core/statistics/filterStats';
+import getWN8Percentile from '../core/statistics/getWN8Percentile';
+import { CommandRegistryRaw } from '../events/interactionCreate';
+
+const ROWS_PER_PAGE = 8;
+const MAX_PAGES = 10;
+
+async function render(
+  { region, id }: ResolvedPlayer,
+  { start, end, name }: ResolvedPeriod,
+  filters: StatFilters,
+) {
+  const awaitedTankDefinitions = await tankDefinitions;
+  const awaitedTankAverages = await tankAverages;
+  const statsInPeriod = await getStatsInPeriod(region, id, start, end);
+  const { filteredOrder } = await filterStats(statsInPeriod, filters);
+  const accountInfo = await getAccountInfo(region, id);
+  const clanData = await getClanAccountInfo(region, id, ['clan']);
+  const tankStats = await getTankStats(region, id);
+  const filterDescriptions = await filtersToDescription(filters);
+  const orderedCurrentStats: AllStats[] = [];
+  const orderedCareerStats: AllStats[] = [];
+  const orderedCurrentWN8: (number | undefined)[] = [];
+  const orderedCareerWN8: (number | undefined)[] = [];
+  const orderedCareerWN8Full: (number | undefined)[] = [];
+
+  filteredOrder.forEach((id) => {
+    const tankAveragesEntry = awaitedTankAverages[id];
+    const current = statsInPeriod.diff[id];
+    const career = tankStats.find((tank) => tank.tank_id === id)!.all;
+    const currentWN8 = tankAveragesEntry
+      ? calculateWN8(tankAveragesEntry.all, current)
+      : undefined;
+    const careerWN8 = tankAveragesEntry
+      ? calculateWN8(tankAveragesEntry.all, career)
+      : undefined;
+
+    orderedCurrentStats.push(current);
+    orderedCareerStats.push(career);
+    orderedCurrentWN8.push(currentWN8);
+    orderedCareerWN8.push(careerWN8);
+  });
+  tankStats.forEach((tank) => {
+    const tankAveragesEntry = awaitedTankAverages[tank.tank_id];
+
+    orderedCareerWN8Full.push(
+      tankAveragesEntry
+        ? calculateWN8(tankAveragesEntry.all, tank.all)
+        : undefined,
+    );
+  });
+
+  const currentBattles = orderedCurrentStats.reduce(
+    (accumulator, current) => accumulator + current.battles,
+    0,
+  );
+  const careerBattles = tankStats.reduce(
+    (accumulator, current) => accumulator + current.all.battles,
+    0,
+  );
+  const currentWinrate =
+    orderedCurrentStats.reduce(
+      (accumulator, current) => accumulator + current.wins,
+      0,
+    ) / currentBattles;
+  const careerWinrate =
+    tankStats.reduce(
+      (accumulator, current) => accumulator + current.all.wins,
+      0,
+    ) / careerBattles;
+  const currentWN8 =
+    orderedCurrentWN8.reduce<number>(
+      (accumulator, current, index) =>
+        accumulator + (current ?? 0) * orderedCurrentStats[index].battles,
+      0,
+    ) /
+    orderedCurrentStats.reduce(
+      (accumulator, current, index) =>
+        accumulator +
+        (orderedCurrentWN8[index] === undefined ? 0 : current.battles),
+      0,
+    );
+  const careerWN8 =
+    orderedCareerWN8Full.reduce<number>(
+      (accumulator, current) => accumulator + (current ?? 0),
+      0,
+    ) /
+    tankStats.reduce(
+      (accumulator, current, index) =>
+        accumulator +
+        (orderedCareerWN8Full[index] === undefined ? 0 : current.all.battles),
+      0,
+    );
+  const currentDamage =
+    orderedCurrentStats.reduce(
+      (accumulator, current) => accumulator + current.damage_dealt,
+      0,
+    ) / currentBattles;
+  const careerDamage =
+    tankStats.reduce(
+      (accumulator, current) => accumulator + current.all.damage_dealt,
+      0,
+    ) / careerBattles;
+
+  const children: JSX.Element[] = [];
+
+  if (filteredOrder.length > 0) {
+    children.push(
+      <Breakdown.Row
+        key={id}
+        type="summary"
+        title="Total"
+        stats={[
+          {
+            title: 'Battles',
+            current: currentBattles,
+            career: careerBattles,
+          },
+          {
+            title: 'Winrate',
+            current: `${(100 * currentWinrate).toFixed(2)}%`,
+            career: `${(100 * careerWinrate).toFixed(2)}%`,
+            delta: currentWinrate - careerWinrate,
+          },
+          {
+            title: 'WN8',
+            current:
+              currentWN8 === undefined
+                ? undefined
+                : Math.round(currentWN8).toLocaleString(),
+            career:
+              careerWN8 === undefined
+                ? undefined
+                : Math.round(careerWN8).toLocaleString(),
+            percentile:
+              currentWN8 === undefined
+                ? undefined
+                : getWN8Percentile(currentWN8),
+          },
+          {
+            title: 'Damage',
+            current: Math.round(currentDamage).toLocaleString(),
+            career: Math.round(careerDamage).toLocaleString(),
+            delta: currentDamage - careerDamage,
+          },
+        ]}
+      />,
+    );
+
+    await Promise.all(
+      filteredOrder.map(async (id, index) => {
+        const tankDefinition = awaitedTankDefinitions[id];
+        const current = orderedCurrentStats[index];
+        const career = orderedCareerStats[index];
+        const currentWN8 = orderedCurrentWN8[index];
+        const careerWN8 = orderedCareerWN8[index];
+
+        children.push(
+          <Breakdown.Row
+            key={id}
+            type="tank"
+            tankType={tankDefinition?.type}
+            treeType={tankDefinition ? await getTreeType(id) : undefined}
+            title={awaitedTankDefinitions[id].name}
+            stats={[
+              {
+                title: 'Battles',
+                current: current.battles.toLocaleString(),
+                career: career.battles.toLocaleString(),
+              },
+              {
+                title: 'Winrate',
+                current: `${(100 * (current.wins / current.battles)).toFixed(
+                  2,
+                )}%`,
+                career: `${(100 * (career.wins / career.battles)).toFixed(2)}%`,
+                delta:
+                  current.wins / current.battles - career.wins / career.battles,
+              },
+              {
+                title: 'WN8',
+                current:
+                  currentWN8 === undefined
+                    ? undefined
+                    : Math.round(currentWN8).toLocaleString(),
+                career:
+                  careerWN8 === undefined
+                    ? undefined
+                    : Math.round(careerWN8).toLocaleString(),
+                percentile:
+                  currentWN8 === undefined
+                    ? undefined
+                    : getWN8Percentile(currentWN8),
+              },
+              {
+                title: 'Damage',
+                current: Math.round(
+                  current.damage_dealt / current.battles,
+                ).toLocaleString(),
+                career: Math.round(
+                  career.damage_dealt / career.battles,
+                ).toLocaleString(),
+                delta:
+                  current.damage_dealt / current.battles -
+                  career.damage_dealt / career.battles,
+              },
+            ]}
+          />,
+        );
+      }),
+    );
+  }
+
+  const pages = chunk(
+    children,
+    Math.max(Math.ceil(children.length / MAX_PAGES), ROWS_PER_PAGE),
+  );
+
+  if (filteredOrder.length > 0) {
+    return pages
+      .map((page, index) => (
+        <Wrapper>
+          {index === 0 && (
+            <TitleBar
+              name={accountInfo.nickname}
+              image={
+                clanData?.clan
+                  ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanData?.clan?.emblem_set_id}.png`
+                  : undefined
+              }
+              description={`${name} • ${filterDescriptions}`}
+            />
+          )}
+
+          <Breakdown.Root>{page}</Breakdown.Root>
+        </Wrapper>
+      ))
+      .reverse();
+  } else {
+    return [
+      <Wrapper>
+        <TitleBar
+          name={accountInfo.nickname}
+          image={
+            clanData?.clan
+              ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanData?.clan?.emblem_set_id}.png`
+              : undefined
+          }
+          description={`${name} • ${filterDescriptions}`}
+        />
+
+        {filteredOrder.length === 0 && (
+          <NoData type={NoDataType.BattlesInPeriod} />
+        )}
+      </Wrapper>,
+    ];
+  }
+}
+
+export const breakdownCommand = new Promise<CommandRegistryRaw>(
+  async (resolve) => {
+    const command = await addFilterOptions(
+      new SlashCommandBuilder()
+        .setName('breakdown')
+        .setDescription("A period's breakdown by tanks played"),
+      (option) => option.addStringOption(addUsernameChoices),
+    );
+
+    resolve({
+      inProduction: true,
+      inPublic: true,
+
+      command,
+
+      async handler(interaction) {
+        const player = await resolvePlayerFromCommand(interaction);
+        const period = resolvePeriodFromCommand(player.region, interaction);
+        const filters = await getFiltersFromCommand(interaction);
+        const path = commandToURL(interaction, {
+          ...player,
+          ...getCustomPeriodParams(interaction),
+          ...filters,
+        });
+
+        return [
+          ...(await render(player, period, filters)),
+          buttonPrimary(path, 'Refresh'),
+          await getBlitzStarsLinkButton(player.region, player.id),
+        ];
+      },
+
+      autocomplete: (interaction) => {
+        autocompleteUsername(interaction);
+        autocompleteTanks(interaction);
+      },
+
+      async button(interaction) {
+        const player = await resolvePlayerFromButton(interaction);
+        const period = resolvePeriodFromButton(player.region, interaction);
+        const filters = getFiltersFromButton(interaction);
+
+        return await render(player, period, filters);
+      },
+    });
+  },
+);

src/commands/clanEvent.ts

@@ -1,97 +1,93 @@
-import { SlashCommandBuilder, escapeMarkdown } from 'discord.js';
+//  _____    _____ _    _          _      _         _____ ____  __  __ ______   ____          _____ _  __
-import markdownEscape from 'markdown-escape';
+// |_   _|  / ____| |  | |   /\   | |    | |       / ____/ __ \|  \/  |  ____| |  _ \   /\   / ____| |/ /
-import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
+//   | |   | (___ | |__| |  /  \  | |    | |      | |   | |  | | \  / | |__    | |_) | /  \ | |    | ' /
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
+//   | |    \___ \|  __  | / /\ \ | |    | |      | |   | |  | | |\/| |  __|   |  _ < / /\ \| |    |  <
-import { PlayerHistoriesRaw } from '../core/blitzstars/getPlayerHistories';
+//  _| |_   ____) | |  | |/ ____ \| |____| |____  | |___| |__| | |  | | |____  | |_) / ____ \ |____| . \
-import getTimeDaysAgo from '../core/blitzstars/getTimeDaysAgo';
+// |_____| |_____/|_|  |_/_/    \_\______|______|  \_____\____/|_|  |_|______| |____/_/    \_\_____|_|\_\
-import addClanChoices from '../core/discord/addClanChoices';
-import autocompleteClan from '../core/discord/autocompleteClan';
-import embedWarning from '../core/discord/embedWarning';
-import resolveClanFromCommand from '../core/discord/resolveClanFromCommand';
-import { CommandRegistry } from '../events/interactionCreate';
-import { AccountAchievements } from '../types/accountAchievements';
-import { AccountInfo } from '../types/accountInfo';
-import { ClanInfo } from '../types/clanInfo';
 
-export const clanEventCommand: CommandRegistry = {
+// import { SlashCommandBuilder, escapeMarkdown } from 'discord.js';
-  inProduction: false,
+// import markdownEscape from 'markdown-escape';
-  inPublic: true,
+// import { getAccountAchievements } from '../core/blitz/getAccountAchievements';
+// import { getAccountInfo } from '../core/blitz/getAccountInfo';
+// import { getClanInfo } from '../core/blitz/getClanInfo';
+// import { PlayerHistoriesRaw } from '../LEGACY_core/blitzstars/getPlayerHistories';
+// import getTimeDaysAgo from '../LEGACY_core/blitzstars/getTimeDaysAgo';
+// import addClanChoices from '../LEGACY_core/discord/addClanChoices';
+// import autocompleteClan from '../LEGACY_core/discord/autocompleteClan';
+// import embedWarning from '../LEGACY_core/discord/embedWarning';
+// import resolveClanFromCommand from '../LEGACY_core/discord/resolveClanFromCommand';
+// import { CommandRegistry } from '../events/interactionCreate';
 
-  command: new SlashCommandBuilder()
+// export const clanEventCommand: CommandRegistry = {
-    .setName('clan-event')
+//   inProduction: false,
-    .setDescription('Lists all inactive players')
+//   inPublic: true,
-    .addStringOption(addClanChoices),
 
-  async handler(interaction) {
+//   command: new SlashCommandBuilder()
-    const { region, id } = await resolveClanFromCommand(interaction);
+//     .setName('clan-event')
-    const clan = (
+//     .setDescription('Lists all inactive players')
-      await getWargamingResponse<ClanInfo>(
+//     .addStringOption(addClanChoices),
-        `https://api.wotblitz.${region}/wotb/clans/info/?application_id=${WARGAMING_APPLICATION_ID}&clan_id=${id}`,
-      )
-    )[id];
-    const memberIds = clan.members_ids.join(',');
-    const [players, achievements, previousJointVictories] = await Promise.all([
-      getWargamingResponse<AccountInfo>(
-        `https://api.wotblitz.${region}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${memberIds}`,
-      ),
-      getWargamingResponse<AccountAchievements>(
-        `https://api.wotblitz.${region}/wotb/account/achievements/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${memberIds}`,
-      ),
-      Promise.all(
-        clan.members_ids.map((id) =>
-          fetch(`https://www.blitzstars.com/api/playerstats/${id}`)
-            .then((response) => response.json() as Promise<PlayerHistoriesRaw>)
-            .then((data) => ({
-              id,
-              jointVictory: data[0]?.achievements.jointVictoryCount as
-                | number
-                | undefined,
-            })),
-        ),
-      ).then((data) =>
-        data.reduce<Record<number, number | undefined>>(
-          (accumulator, value) => ({
-            ...accumulator,
-            [value.id]: value.jointVictory,
-          }),
-          {},
-        ),
-      ),
-    ]);
-    const jointVictories = clan.members_ids.map((id) => ({
-      id,
-      joinVictory:
-        players[id].last_battle_time > getTimeDaysAgo(region, 1)
-          ? previousJointVictories[id] === undefined
-            ? 0
-            : achievements[id].max_series.jointVictory -
-              previousJointVictories[id]!
-          : 0,
-    }));
 
-    return [
+//   async handler(interaction) {
-      `# ${escapeMarkdown(clan.name)} [${escapeMarkdown(
+//     const { region, id } = await resolveClanFromCommand(interaction);
-        clan.tag,
+//     const clan = await getClanInfo(region, id);
-      )}]'s platoon wins today: ${(
+//     const [players, achievements, previousJointVictories] = await Promise.all([
-        jointVictories.reduce(
+//       getAccountInfo(region, clan.members_ids),
-          (accumulator, { joinVictory }) => accumulator + joinVictory,
+//       getAccountAchievements(region, clan.members_ids),
-          0,
+//       Promise.all(
-        ) / 2
+//         clan.members_ids.map((id) =>
-      ).toFixed(0)}\n${jointVictories
+//           fetch(`https://www.blitzstars.com/api/playerstats/${id}`)
-        .filter(({ joinVictory }) => joinVictory)
+//             .then((response) => response.json() as Promise<PlayerHistoriesRaw>)
-        .sort((a, b) => b.joinVictory - a.joinVictory)
+//             .then((data) => ({
-        .map(
+//               id,
-          ({ id, joinVictory }) =>
+//               jointVictory: data[0]?.achievements.jointVictoryCount as
-            `- ${markdownEscape(players[id].nickname)}: ${joinVictory}`,
+//                 | number
-        )
+//                 | undefined,
-        .join('\n')}`,
+//             })),
+//         ),
+//       ).then((data) =>
+//         data.reduce<Record<number, number | undefined>>(
+//           (accumulator, value) => ({
+//             ...accumulator,
+//             [value.id]: value.jointVictory,
+//           }),
+//           {},
+//         ),
+//       ),
+//     ]);
+//     const jointVictories = clan.members_ids.map((id) => ({
+//       id,
+//       joinVictory:
+//         players[id].last_battle_time > getTimeDaysAgo(region, 1)
+//           ? previousJointVictories[id] === undefined
+//             ? 0
+//             : achievements[id].max_series.jointVictory -
+//               previousJointVictories[id]!
+//           : 0,
+//     }));
 
-      embedWarning(
+//     return [
-        'This is an approximation!',
+//       `# ${escapeMarkdown(clan.name)} [${escapeMarkdown(
-        "Wargaming provides very little information about platoons publicly. Caveats:\n- Players in two different clans platooning artificially inflates the total count\n- Game-mode battles aren't counted since Wargaming doesn't publicly share that data\n- This command is also subject to Blitzkrieg's reset times (use `/about timezones` for more info)",
+//         clan.tag,
-      ),
+//       )}]'s platoon wins today: ${(
-    ];
+//         jointVictories.reduce(
-  },
+//           (accumulator, { joinVictory }) => accumulator + joinVictory,
+//           0,
+//         ) / 2
+//       ).toFixed(0)}\n${jointVictories
+//         .filter(({ joinVictory }) => joinVictory)
+//         .sort((a, b) => b.joinVictory - a.joinVictory)
+//         .map(
+//           ({ id, joinVictory }) =>
+//             `- ${markdownEscape(players[id].nickname)}: ${joinVictory}`,
+//         )
+//         .join('\n')}`,
 
-  autocomplete: autocompleteClan,
+//       embedWarning(
-};
+//         'This is an approximation!',
+//         "Wargaming provides very little information about platoons publicly. Caveats:\n- Players in two different clans platooning artificially inflates the total count\n- Game-mode battles aren't counted since Wargaming doesn't publicly share that data\n- This command is also subject to Blitzkrieg's reset times (use `/about timezones` for more info)",
+//       ),
+//     ];
+//   },
+
+//   autocomplete: autocompleteClan,
+// };

src/commands/debug.ts

@@ -1,11 +1,6 @@
 import { SlashCommandBuilder } from 'discord.js';
 import packageJSON from '../../package.json' assert { type: 'json' };
-import { tankopedia } from '../core/blitz/tankopedia';
-import { tankAverages } from '../core/blitzstars/tankAverages';
 import { client } from '../core/discord/client';
-import embedInfo from '../core/discord/embedInfo';
-import markdownTable from '../core/discord/markdownTable';
-import getClientId from '../core/node/getClientId';
 import { CommandRegistry } from '../events/interactionCreate';
 
 const executionStart = new Date().getTime();
@@ -21,24 +16,21 @@ export const debugCommand: CommandRegistry = {
   async handler(interaction) {
     const currentTime = new Date().getTime();
     const uptime = currentTime - executionStart;
+    const list = [
+      ['Version', packageJSON.version],
+      ['Shard', client.shard?.ids[0] ?? 'default'],
+      [
+        'Uptime',
+        `${Math.floor((uptime / 1000 / 60 / 60) % 24)}h ${Math.floor(
+          (uptime / 1000 / 60) % 60,
+        )}m ${Math.floor((uptime / 1000) % 60)}s ${Math.floor(
+          uptime % 1000,
+        )}ms`,
+      ],
+    ]
+      .map(([key, value]) => `- ${key}: ${value}`)
+      .join('\n');
 
-    return embedInfo(
+    return `# Debug\n\n${list}`;
-      `${client.user?.username} debug information`,
-      markdownTable([
-        ['Version', packageJSON.version],
-        ['Client ID', getClientId()],
-        ['Tag', interaction.client.user.tag],
-        [
-          'Uptime',
-          `${Math.floor(uptime / 1000 / 60 / 60 / 24)}d ${Math.floor(
-            (uptime / 1000 / 60 / 60) % 24,
-          )}h ${Math.floor((uptime / 1000 / 60) % 60)}m ${Math.floor(
-            (uptime / 1000) % 60,
-          )}s ${Math.floor(uptime % 1000)}ms`,
-        ],
-        ['Tankopedia cached', `${(await tankopedia) !== undefined}`],
-        ['Tank averages cached', `${(await tankAverages) !== undefined}`],
-      ]),
-    );
   },
 };

src/commands/eligible.ts

@@ -1,20 +1,18 @@
 import { SlashCommandBuilder } from 'discord.js';
-import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
+import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import calculateWN8 from '../core/blitz/calculateWN8';
+import { tankDefinitions } from '../core/blitzkrieg/definitions/tanks';
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import getPeriodNow from '../core/blitzkrieg/getPeriodNow';
-import sumStats from '../core/blitz/sumStats';
+import getTimeDaysAgo from '../core/blitzkrieg/getTimeDaysAgo';
-import { tankopedia } from '../core/blitz/tankopedia';
+import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
-import getDiffedTankStats from '../core/blitzstars/getDiffedTankStats';
-import getPeriodNow from '../core/blitzstars/getPeriodNow';
-import getTimeDaysAgo from '../core/blitzstars/getTimeDaysAgo';
 import { tankAverages } from '../core/blitzstars/tankAverages';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import embedNegative from '../core/discord/embedNegative';
 import embedPositive from '../core/discord/embedPositive';
 import markdownTable, { TableInput } from '../core/discord/markdownTable';
 import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+import calculateWN8 from '../core/statistics/calculateWN8';
+import sumStats from '../core/statistics/sumStats';
 import { CommandRegistry } from '../events/interactionCreate';
-import { AccountInfo } from '../types/accountInfo';
 import { PossiblyPromise } from '../types/possiblyPromise';
 
 export type SkilledClan = 'SKLLD' | 'SMRI';
@@ -48,20 +46,18 @@ export const eligibleCommand: CommandRegistry = {
 
   async handler(interaction) {
     const clan = interaction.options.getString('clan') as SkilledClan;
-    const { id, region: server } = await resolvePlayerFromCommand(interaction);
+    const { id, region: region } = await resolvePlayerFromCommand(interaction);
-    const accountInfo = await getWargamingResponse<AccountInfo>(
+    const accountInfo = await getAccountInfo(region, id);
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
-    );
     const problems: TableInput = [];
-    const title = `${accountInfo[id].nickname}'s eligibility for ${SKILLED_CLANS[clan]}`;
+    const title = `${accountInfo.nickname}'s eligibility for ${SKILLED_CLANS[clan]}`;
     let isEligible = false;
     let body = '';
 
     if (clan === 'SKLLD') {
-      const { diffed } = await getDiffedTankStats(
+      const { diff: diffed } = await getStatsInPeriod(
-        server,
+        region,
         id,
-        getTimeDaysAgo(server, 30),
+        getTimeDaysAgo(region, 30),
         getPeriodNow(),
       );
       const entries = Object.entries(diffed);
@@ -70,11 +66,11 @@ export const eligibleCommand: CommandRegistry = {
         (await entries.reduce<PossiblyPromise<number>>(
           async (accumulator, [tankIdString, stats]) => {
             const tankId = parseInt(tankIdString);
-            const tankopediaEntry = (await tankopedia)[tankId];
+            const tankDefinition = (await tankDefinitions)[tankId];
 
-            if (!tankopediaEntry) return accumulator;
+            if (!tankDefinition) return accumulator;
 
-            const tankTier = tankopediaEntry.tier;
+            const tankTier = tankDefinition.tier;
 
             return (await accumulator) + tankTier * stats.battles;
           },
@@ -83,9 +79,9 @@ export const eligibleCommand: CommandRegistry = {
         (await entries.reduce<PossiblyPromise<number>>(
           async (accumulator, [tankIdString, stats]) => {
             const tankId = parseInt(tankIdString);
-            const tankopediaEntry = (await tankopedia)[tankId];
+            const tankDefinition = (await tankDefinitions)[tankId];
 
-            if (!tankopediaEntry) return accumulator;
+            if (!tankDefinition) return accumulator;
 
             return stats.battles;
           },
@@ -114,7 +110,7 @@ export const eligibleCommand: CommandRegistry = {
           async (accumulator, [tankIdString, stats]) => {
             const tankId = parseInt(tankIdString);
 
-            if ((await tankopedia)[tankId]?.tier === 10) {
+            if ((await tankDefinitions)[tankId]?.tier === 10) {
               const tankStats = diffed[tankId];
               return (await accumulator) + tankStats.damage_dealt;
             } else return accumulator;
@@ -125,7 +121,7 @@ export const eligibleCommand: CommandRegistry = {
           async (accumulator, [tankIdString, stats]) => {
             const tankId = parseInt(tankIdString);
 
-            if ((await tankopedia)[tankId]?.tier === 10) {
+            if ((await tankDefinitions)[tankId]?.tier === 10) {
               const tankStats = diffed[tankId];
               return (await accumulator) + tankStats.battles;
             } else return accumulator;
@@ -171,7 +167,7 @@ export const eligibleCommand: CommandRegistry = {
             problems,
           )}`;
     } else if (clan === 'SMRI') {
-      const stats = accountInfo[id].statistics.all;
+      const stats = accountInfo.statistics.all;
 
       if (stats.battles < 1500) {
         problems.push([

src/commands/evolution.tsx

@@ -1,31 +1,142 @@
-import { SlashCommandBuilder } from 'discord.js';
+import {
-import { CYCLIC_API } from '../constants/cyclic';
+  SlashCommandBuilder,
-import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
+  SlashCommandSubcommandGroupBuilder,
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
+} from 'discord.js';
+import * as Graph from '../components/Graph';
+import NoData, { NoDataType } from '../components/NoData';
+import TitleBar from '../components/TitleBar';
+import Wrapper from '../components/Wrapper';
+import { getAccountInfo } from '../core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
 import resolveTankId from '../core/blitz/resolveTankId';
-import addStatTypeSubCommandGroups from '../core/discord/addStatTypeSubCommandGroups';
+import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL';
+import getTankHistories from '../core/blitzkrieg/getTankHistories';
+import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
+import getPlayerHistories from '../core/blitzstars/getPlayerHistories';
+import addPeriodSubCommands from '../core/discord/addPeriodSubCommands';
+import addTankChoices from '../core/discord/addTankChoices';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteTanks from '../core/discord/autocompleteTanks';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
-import interactionToURL from '../core/discord/interactionToURL';
+import buttonPrimary from '../core/discord/buttonPrimary';
-import linkButton from '../core/discord/linkButton';
+import commandToURL from '../core/discord/commandToURL';
-import primaryButton from '../core/discord/primaryButton';
+import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
 import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton';
-import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand';
+import resolvePeriodFromCommand, {
+  ResolvedPeriod,
+} from '../core/discord/resolvePeriodFromCommand';
 import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+import resolvePlayerFromCommand, {
+  ResolvedPlayer,
+} from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistryRaw } from '../events/interactionCreate';
-import evolution from '../renderers/evolution';
+
-import { StatType } from '../renderers/stats';
+type EvolutionStatType = 'player' | 'tank';
-import { AccountInfo } from '../types/accountInfo';
+
+async function render(
+  { region, id }: ResolvedPlayer,
+  { start, end, name }: ResolvedPeriod,
+  type: 'player' | 'tank',
+  tankId: number | null,
+) {
+  const accountInfo = await getAccountInfo(region, id);
+  const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+  const logo = clan ? emblemIdToURL(clan.emblem_set_id) : undefined;
+  const histories = await (type === 'player'
+    ? getPlayerHistories(region, id, {
+        start,
+        end,
+        includeLatestHistories: true,
+        includePreviousHistories: true,
+      })
+    : getTankHistories(region, id, {
+        tankId: tankId!,
+        start,
+        end,
+        includeLatestHistories: true,
+        includePreviousHistories: true,
+      }));
+  const plot = histories.map(
+    (history) =>
+      [
+        history.all.battles,
+        (history.all.wins / history.all.battles) * 100,
+      ] as Graph.PlotItem,
+  );
+  const times = histories.map((history) => history.last_battle_time);
+  const minTime = Math.min(...times);
+  const maxTime = Math.max(...times);
+  const ys = plot.map(([, y]) => y);
+  const xs = plot.map(([x]) => x);
+  const maxY = Math.max(...ys);
+  const minY = Math.min(...ys);
+  const maxX = Math.max(...xs);
+  const minX = Math.min(...xs);
+
+  return (
+    <Wrapper>
+      <TitleBar name={accountInfo.nickname} image={logo} description={name} />
+
+      {plot.length > 0 && (
+        <Graph.Root
+          verticalMargin={{
+            min: minY,
+            max: maxY,
+            suffix: '%',
+            precision: 2,
+          }}
+          horizontalMargin={{
+            min: minX,
+            max: maxX,
+            precision: 0,
+          }}
+          xMinLabel={new Date(minTime * 1000).toDateString()}
+          xMaxLabel={new Date(maxTime * 1000).toDateString()}
+        >
+          {Graph.Line({
+            color: Graph.LineColor.Red,
+            plot: plot,
+            minY,
+            maxY,
+          })}
+        </Graph.Root>
+      )}
+
+      {plot.length === 0 && <NoData type={NoDataType.BattlesInPeriod} />}
+    </Wrapper>
+  );
+}
 
 export const evolutionCommand = new Promise<CommandRegistryRaw>(
   async (resolve) => {
-    const command = await addStatTypeSubCommandGroups(
+    let playerGroup: SlashCommandSubcommandGroupBuilder;
-      new SlashCommandBuilder()
+    let tankGroup: SlashCommandSubcommandGroupBuilder;
-        .setName('evolution')
+    const command = new SlashCommandBuilder()
-        .setDescription('Evolution of statistics'),
+      .setName('evolution')
-      false,
+      .setDescription('Evolution of statistics')
-    );
+      .addSubcommandGroup((option) => {
+        playerGroup = option
+          .setName('player')
+          .setDescription('Player statistics');
+
+        return playerGroup;
+      })
+      .addSubcommandGroup((option) => {
+        tankGroup = option.setName('tank').setDescription('Tank statistics');
+
+        return tankGroup;
+      });
+
+    await Promise.all([
+      addPeriodSubCommands(playerGroup!, (option) =>
+        option.addStringOption(addUsernameChoices),
+      ),
+      addPeriodSubCommands(tankGroup!, (option) =>
+        option
+          .addStringOption(addTankChoices)
+          .addStringOption(addUsernameChoices),
+      ),
+    ]);
 
     resolve({
       inProduction: true,
@@ -34,37 +145,28 @@ export const evolutionCommand = new Promise<CommandRegistryRaw>(
       command,
 
       async handler(interaction) {
-        const commandGroup = interaction.options.getSubcommandGroup(
+        const commandGroup =
-          true,
+          interaction.options.getSubcommandGroup() as EvolutionStatType;
-        ) as StatType;
         const player = await resolvePlayerFromCommand(interaction);
         const period = resolvePeriodFromCommand(player.region, interaction);
         const tankIdRaw = interaction.options.getString('tank')!;
         const tankId =
           commandGroup === 'tank' ? await resolveTankId(tankIdRaw) : null;
-        const start = interaction.options.getInteger('start');
+        const path = commandToURL(interaction, {
-        const end = interaction.options.getInteger('end');
-        const { nickname } = (
-          await getWargamingResponse<AccountInfo>(
-            `https://api.wotblitz.${player.region}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${player.id}`,
-          )
-        )[player.id];
-        const path = interactionToURL(interaction, {
           ...player,
+          ...getCustomPeriodParams(interaction),
           tankId,
-          start,
-          end,
         });
 
+        getBlitzStarsLinkButton;
+
         return [
-          await evolution(commandGroup, period, player, tankId),
+          await render(player, period, commandGroup, tankId),
-          primaryButton(path, 'Refresh'),
+          buttonPrimary(path, 'Refresh'),
-          // linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
+          await getBlitzStarsLinkButton(
-          linkButton(
+            player.region,
-            `https://www.blitzstars.com/player/${player.region}/${nickname}${
+            player.id,
-              commandGroup === 'tank' ? `/tank/${tankId!}` : ''
+            tankId ?? undefined,
-            }`,
-            'BlitzStars',
           ),
         ];
       },
@@ -75,17 +177,17 @@ export const evolutionCommand = new Promise<CommandRegistryRaw>(
       },
 
       async button(interaction) {
-        const url = new URL(`${CYCLIC_API}/${interaction.customId}`);
+        const url = new URL(`https://example.com/${interaction.customId}`);
-        const path = url.pathname.split('/').filter(Boolean);
+        const path = url.pathname.split('/');
-        const commandGroup = path[1] as StatType;
+        const commandGroup = path[2] as EvolutionStatType;
         const player = await resolvePlayerFromButton(interaction);
         const period = resolvePeriodFromButton(player.region, interaction);
 
-        return await evolution(
+        return await render(
-          commandGroup,
-          period,
           player,
-          parseInt(url.searchParams.get('tankId')!),
+          period,
+          commandGroup,
+          parseInt(url.searchParams.get('tankId') ?? '0') || null,
         );
       },
     });

src/commands/fullStats.tsx

@@ -1,30 +1,76 @@
 import { SlashCommandBuilder } from 'discord.js';
-import { TreeTypeString } from '../components/Tanks';
+import GenericAllStats from '../components/GenericAllStats';
-import { CYCLIC_API } from '../constants/cyclic';
+import NoData, { NoDataType } from '../components/NoData';
-import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
+import TierWeights from '../components/TierWeights';
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import TitleBar from '../components/TitleBar';
-import resolveTankId from '../core/blitz/resolveTankId';
+import Wrapper from '../components/Wrapper';
-import addStatTypeSubCommandGroups from '../core/discord/addStatTypeSubCommandGroups';
+import { getAccountInfo } from '../core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
+import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL';
+import { filtersToDescription } from '../core/blitzkrieg/filtersToDescription';
+import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
+import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
+import addFilterOptions from '../core/discord/addFilterOptions';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteTanks from '../core/discord/autocompleteTanks';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
-import interactionToURL from '../core/discord/interactionToURL';
+import { buttonRefresh } from '../core/discord/buttonRefresh';
-import linkButton from '../core/discord/linkButton';
+import commandToURL from '../core/discord/commandToURL';
-import primaryButton from '../core/discord/primaryButton';
+import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
+import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
+import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
 import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton';
-import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand';
+import resolvePeriodFromCommand, {
+  ResolvedPeriod,
+} from '../core/discord/resolvePeriodFromCommand';
 import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+import resolvePlayerFromCommand, {
+  ResolvedPlayer,
+} from '../core/discord/resolvePlayerFromCommand';
+import { StatFilters, filterStats } from '../core/statistics/filterStats';
+import { getTierWeights } from '../core/statistics/getTierWeights';
 import { CommandRegistryRaw } from '../events/interactionCreate';
-import fullStats from '../renderers/fullStats';
+
-import { MultiTankFilters, StatType } from '../renderers/stats';
+async function render(
-import { AccountInfo } from '../types/accountInfo';
+  { region, id }: ResolvedPlayer,
+  { start, end, name }: ResolvedPeriod,
+  filters: StatFilters,
+) {
+  const { nickname } = await getAccountInfo(region, id);
+  const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+  const clanImage = clan ? emblemIdToURL(clan.emblem_set_id) : undefined;
+  const diffedTankStats = await getStatsInPeriod(region, id, start, end);
+  const { stats, supplementary, filteredOrder } = await filterStats(
+    diffedTankStats,
+    filters,
+  );
+  const filterDescriptions = await filtersToDescription(filters);
+  const tierWeights = await getTierWeights(diffedTankStats.diff, filteredOrder);
+
+  return (
+    <Wrapper>
+      <TitleBar
+        name={nickname}
+        image={clanImage}
+        description={`${name} • ${filterDescriptions}`}
+      />
+
+      {stats.battles === 0 && <NoData type={NoDataType.BattlesInPeriod} />}
+      {stats.battles > 0 && <TierWeights weights={tierWeights!} />}
+      {stats.battles > 0 && (
+        <GenericAllStats stats={stats} supplementaryStats={supplementary} />
+      )}
+    </Wrapper>
+  );
+}
 
 export const fullStatsCommand = new Promise<CommandRegistryRaw>(
   async (resolve) => {
-    const command = await addStatTypeSubCommandGroups(
+    const command = await addFilterOptions(
       new SlashCommandBuilder()
         .setName('full-stats')
         .setDescription('Full in-game statistics'),
+      (option) => option.addStringOption(addUsernameChoices),
     );
 
     resolve({
@@ -34,60 +80,20 @@ export const fullStatsCommand = new Promise<CommandRegistryRaw>(
       command,
 
       async handler(interaction) {
-        const commandGroup = interaction.options.getSubcommandGroup(
-          true,
-        ) as StatType;
         const player = await resolvePlayerFromCommand(interaction);
-        const resolvedPeriod = resolvePeriodFromCommand(
+        const period = resolvePeriodFromCommand(player.region, interaction);
-          player.region,
+        const filters = await getFiltersFromCommand(interaction);
-          interaction,
+        const path = commandToURL(interaction, {
-        );
-        const period = interaction.options.getString('period');
-        const tankIdRaw = interaction.options.getString('tank')!;
-        const tankId =
-          commandGroup === 'tank' ? await resolveTankId(tankIdRaw) : null;
-        const start = interaction.options.getInteger('start');
-        const end = interaction.options.getInteger('end');
-        const path = interactionToURL(interaction, {
           ...player,
-          tankId,
+          ...getCustomPeriodParams(interaction),
-          start,
+          ...filters,
-          end,
-          period,
         });
-        const { nickname } = (
-          await getWargamingResponse<AccountInfo>(
-            `https://api.wotblitz.${player.region}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${player.id}`,
-          )
-        )[player.id];
 
-        const tierOption = interaction.options.getString('tier');
+        return Promise.all([
-
+          render(player, period, filters),
-        return [
+          buttonRefresh(interaction, path),
-          await fullStats(
+          getBlitzStarsLinkButton(player.region, player.id),
-            commandGroup,
+        ]);
-            resolvedPeriod,
-            player,
-            commandGroup === 'tank'
-              ? tankId
-              : commandGroup === 'multi-tank'
-              ? ({
-                  'tank-type':
-                    interaction.options.getString('tank-type') ?? undefined,
-                  nation: interaction.options.getString('nation') ?? undefined,
-                  tier: tierOption ? parseInt(tierOption) : undefined,
-                  'tree-type': (interaction.options.getString('tree-type') ??
-                    undefined) as TreeTypeString | undefined,
-                } satisfies Partial<MultiTankFilters>)
-              : null,
-          ),
-          primaryButton(path, 'Refresh'),
-          // linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
-          linkButton(
-            `https://www.blitzstars.com/player/${player.region}/${nickname}`,
-            'BlitzStars',
-          ),
-        ];
       },
 
       autocomplete: (interaction) => {
@@ -96,18 +102,11 @@ export const fullStatsCommand = new Promise<CommandRegistryRaw>(
       },
 
       async button(interaction) {
-        const url = new URL(`${CYCLIC_API}/${interaction.customId}`);
-        const path = url.pathname.split('/').filter(Boolean);
-        const commandGroup = path[1] as StatType;
         const player = await resolvePlayerFromButton(interaction);
         const period = resolvePeriodFromButton(player.region, interaction);
+        const filters = getFiltersFromButton(interaction);
 
-        return await fullStats(
+        return await render(player, period, filters);
-          commandGroup,
-          period,
-          player,
-          parseInt(url.searchParams.get('tankId')!),
-        );
       },
     });
   },

src/commands/inactive.tsx

@@ -3,14 +3,12 @@ import GenericStats from '../components/GenericStats';
 import NoData, { NoDataType } from '../components/NoData';
 import TitleBar from '../components/TitleBar';
 import Wrapper from '../components/Wrapper';
-import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
+import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import { getClanInfo } from '../core/blitz/getClanInfo';
 import addClanChoices from '../core/discord/addClanChoices';
 import autocompleteClan from '../core/discord/autocompleteClan';
 import resolveClanFromCommand from '../core/discord/resolveClanFromCommand';
 import { CommandRegistry } from '../events/interactionCreate';
-import { AccountInfo } from '../types/accountInfo';
-import { ClanInfo } from '../types/clanInfo';
 
 const DEFAULT_THRESHOLD = 7;
 
@@ -36,24 +34,16 @@ export const inactiveCommand: CommandRegistry = {
     const threshold =
       interaction.options.getNumber('threshold')! ?? DEFAULT_THRESHOLD;
     const time = new Date().getTime() / 1000;
-    const clanData = (
+    const clanInfo = await getClanInfo(region, id);
-      await getWargamingResponse<ClanInfo>(
+    const accountInfo = await getAccountInfo(region, clanInfo.members_ids);
-        `https://api.wotblitz.${region}/wotb/clans/info/?application_id=${WARGAMING_APPLICATION_ID}&clan_id=${id}`,
+    const inactive = accountInfo
+      .map(
+        (account) =>
+          [
+            account.nickname,
+            (time - account.last_battle_time) / 60 / 60 / 24,
+          ] as [string, number],
       )
-    )[id];
-    const memberIds = clanData.members_ids;
-    const accounts = await getWargamingResponse<AccountInfo>(
-      `https://api.wotblitz.${region}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${memberIds.join(
-        ',',
-      )}`,
-    );
-    const inactive = memberIds
-      .map((memberId) => {
-        const member = accounts[memberId];
-        const inactiveDays = (time - member.last_battle_time) / 60 / 60 / 24;
-
-        return [member.nickname, inactiveDays] as [string, number];
-      })
       .filter(([, inactiveDays]) => inactiveDays >= threshold)
       .sort((a, b) => b[1] - a[1])
       .map(
@@ -64,8 +54,8 @@ export const inactiveCommand: CommandRegistry = {
     return (
       <Wrapper>
         <TitleBar
-          name={clanData.name}
+          name={clanInfo.name}
-          image={`https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanData.emblem_set_id}.png`}
+          image={`https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanInfo.emblem_set_id}.png`}
           description={`Inactive for ${threshold}+ Days • ${new Date().toDateString()}`}
         />
 

src/commands/link.tsx

@@ -0,0 +1,223 @@
+import { teal } from '@radix-ui/colors';
+import {
+  AttachmentBuilder,
+  GuildMemberRoleManager,
+  SlashCommandBuilder,
+} from 'discord.js';
+import markdownEscape from 'markdown-escape';
+import discord from '../../discord.json' assert { type: 'json' };
+import { Glow } from '../components/AllStatsOverview/components/WN8Display/components/Glow';
+import Wrapper from '../components/Wrapper';
+import { REGION_NAMES_SHORT, Region } from '../constants/regions';
+import { getAccountInfo } from '../core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
+import { linkBlitzAndDiscord } from '../core/blitzkrieg/discordBlitz';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import autocompleteUsername from '../core/discord/autocompleteUsername';
+import embedNegative from '../core/discord/embedNegative';
+import { CommandRegistry } from '../events/interactionCreate';
+import { theme } from '../stitches.config';
+
+const serverAndIdPattern = /(com|eu|asia)\/[0-9]+/;
+
+export const verifyCommand: CommandRegistry = {
+  inProduction: true,
+  inPublic: true,
+
+  command: new SlashCommandBuilder()
+    .setName('link')
+    .setDescription('Links your Blitz and Discord account')
+    .addStringOption((option) => addUsernameChoices(option).setRequired(true)),
+
+  async handler(interaction) {
+    const username = interaction.options.getString('username', true);
+
+    if (serverAndIdPattern.test(username)) {
+      const [region, idString] = username.split('/');
+      const id = parseInt(idString);
+      const discordId = parseInt(interaction.user.id);
+      const accountInfo = await getAccountInfo(region as Region, id);
+      const clanAccountInfo = await getClanAccountInfo(region as Region, id, [
+        'clan',
+      ]);
+
+      await linkBlitzAndDiscord(discordId, region as Region, id);
+
+      if (interaction.guildId === discord.sklld_guild_id) {
+        if (!interaction.guild?.members.me?.permissions.has('ManageRoles')) {
+          return embedNegative(
+            `${markdownEscape(interaction.user.username)} failed to verify`,
+            "I don't have the permission to change your manage roles.",
+          );
+        }
+
+        await (interaction.member!.roles as GuildMemberRoleManager).remove(
+          discord.sklld_verify_role,
+        );
+        await (interaction.member!.roles as GuildMemberRoleManager).add(
+          discord.sklld_peasant_role,
+        );
+      }
+
+      return (
+        <Wrapper fat>
+          <div
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'space-between',
+            }}
+          >
+            <Glow color={teal.teal9} rotation={90} />
+
+            <div
+              style={{
+                display: 'flex',
+                flexDirection: 'column',
+                alignItems: 'center',
+                justifyContent: 'center',
+                gap: 16,
+              }}
+            >
+              <div
+                style={{
+                  display: 'flex',
+                  gap: 8,
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                }}
+              >
+                <img
+                  src={
+                    interaction.user.avatarURL({ extension: 'png' }) ??
+                    'https://i.stack.imgur.com/l60Hf.png'
+                  }
+                  style={{
+                    width: 64,
+                    height: 64,
+                    borderRadius: 32,
+                    objectFit: 'cover',
+                  }}
+                />
+
+                <div
+                  style={{
+                    display: 'flex',
+                    flexDirection: 'column',
+                    gap: 4,
+                  }}
+                >
+                  <span
+                    style={{
+                      fontSize: 32,
+                      color: theme.colors.textHighContrast,
+                      fontWeight: 900,
+                      maxWidth: 240,
+                      overflow: 'hidden',
+                      textOverflow: 'ellipsis',
+                      whiteSpace: 'nowrap',
+                    }}
+                  >
+                    {interaction.user.displayName}
+                  </span>
+                  <span
+                    style={{
+                      fontSize: 16,
+                      color: theme.colors.textLowContrast,
+                    }}
+                  >
+                    @{interaction.user.username}
+                  </span>
+                </div>
+              </div>
+
+              <div
+                style={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  gap: 4,
+                  color: theme.colors.textLowContrast_teal,
+                }}
+              >
+                <img
+                  src="https://i.imgur.com/jIcRgog.png"
+                  style={{
+                    width: 16,
+                    height: 16,
+                  }}
+                />
+                <span style={{ fontSize: 16 }}>Accounts linked</span>
+              </div>
+
+              <div
+                style={{
+                  display: 'flex',
+                  gap: 8,
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                }}
+              >
+                {clanAccountInfo?.clan ? (
+                  <img
+                    style={{
+                      width: 64,
+                      height: 64,
+                      borderRadius: 32,
+                      objectFit: 'cover',
+                    }}
+                    src={`https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanAccountInfo?.clan?.emblem_set_id}.png`}
+                  />
+                ) : null}
+                <div
+                  style={{
+                    display: 'flex',
+                    flexDirection: 'column',
+                    gap: 4,
+                  }}
+                >
+                  <span
+                    style={{
+                      fontSize: 32,
+                      color: theme.colors.textHighContrast,
+                      fontWeight: 900,
+                      maxWidth: 240,
+                      overflow: 'hidden',
+                      textOverflow: 'ellipsis',
+                      whiteSpace: 'nowrap',
+                    }}
+                  >
+                    {accountInfo.nickname}
+                  </span>
+                  <span
+                    style={{
+                      fontSize: 16,
+                      color: theme.colors.textLowContrast,
+                    }}
+                  >
+                    {clanAccountInfo?.clan
+                      ? `[${clanAccountInfo?.clan?.tag}] - `
+                      : ''}
+                    {REGION_NAMES_SHORT[region as Region]}
+                  </span>
+                </div>
+              </div>
+            </div>
+
+            <Glow color={teal.teal9} rotation={-90} />
+          </div>
+        </Wrapper>
+      );
+    } else {
+      return [
+        embedNegative(
+          'Please select from the options',
+          'Follow the procedure like the video above. The search results may take a while to show up.',
+        ),
+        new AttachmentBuilder('https://i.imgur.com/2p6GFgC.gif'),
+      ];
+    }
+  },
+
+  autocomplete: autocompleteUsername,
+};

src/commands/ownedTanks.tsx

@@ -3,46 +3,24 @@ import NoData, { NoDataType } from '../components/NoData';
 import * as Tanks from '../components/Tanks';
 import TitleBar from '../components/TitleBar';
 import Wrapper from '../components/Wrapper';
-import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
+import { encyclopediaInfo } from '../core/blitz/encyclopediaInfo';
+import { getAccountInfo } from '../core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
 import getTankStats from '../core/blitz/getTankStats';
 import getTreeType from '../core/blitz/getTreeType';
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
-import resolveTankName from '../core/blitz/resolveTankName';
 import {
+  BlitzkriegTankDefinition,
   TIER_ROMAN_NUMERALS,
-  TankopediaEntry,
   Tier,
-  tankopedia,
+  tankDefinitions,
-  tankopediaInfo,
+} from '../core/blitzkrieg/definitions/tanks';
-} from '../core/blitz/tankopedia';
+import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL';
+import { tankIcon } from '../core/blitzkrieg/tankIcon';
 import addTierChoices from '../core/discord/addTierChoices';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
 import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistry } from '../events/interactionCreate';
-import { AccountInfo } from '../types/accountInfo';
-import { PlayerClanData } from '../types/playerClanData';
-
-const COMP_TANKS = [
-  // light tanks
-  24321, // t-100 lt
-  20257, // sheridan
-  3649, // bat chat
-  19537, // vickers
-
-  // heavy tanks
-  6145, // is-4
-  7169, // is-7
-  10785, // t110e5
-  12161, // strvk
-  4481, // kranvagn
-  22817, // m6 yoh
-  6225, // fv215b
-  5425, // wz 113
-  7297, // 60tp
-  58641, // vk 72
-  6753, // type 71
-];
 
 export const ownedTanksCommand: CommandRegistry = {
   inProduction: true,
@@ -58,30 +36,26 @@ export const ownedTanksCommand: CommandRegistry = {
     const tier = Number(interaction.options.getString('tier'));
     const account = await resolvePlayerFromCommand(interaction);
     const { id, region: server } = account;
-    const accountInfo = await getWargamingResponse<AccountInfo>(
+    const accountInfo = await getAccountInfo(server, id);
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
-    );
     const tankStats = await getTankStats(server, id);
     const filteredTanks = (
       await Promise.all(
         tankStats.map(async (tankData) => ({
-          tankopedia: (await tankopedia)[tankData.tank_id]!,
+          tankDefinitions: (await tankDefinitions)[tankData.tank_id]!,
-          tank_id: tankData.tank_id,
+          id: tankData.tank_id,
         })),
       )
-    ).filter((tank) => tank.tankopedia?.tier === tier);
+    ).filter((tank) => tank.tankDefinitions?.tier === tier);
-    const clanData = await getWargamingResponse<PlayerClanData>(
+    const clanAccountInfo = await getClanAccountInfo(server, id, ['clan']);
-      `https://api.wotblitz.${server}/wotb/clans/accountinfo/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}&extra=clan`,
+    const groupedTanks: Record<string, BlitzkriegTankDefinition[]> = {};
-    );
-    const groupedTanks: Record<string, TankopediaEntry[]> = {};
     const nations: string[] = [];
 
     filteredTanks.forEach((tank) => {
-      if (groupedTanks[tank.tankopedia.nation] === undefined) {
+      if (groupedTanks[tank.tankDefinitions.nation] === undefined) {
-        groupedTanks[tank.tankopedia.nation] = [tank.tankopedia];
+        groupedTanks[tank.tankDefinitions.nation] = [tank.tankDefinitions];
-        nations.push(tank.tankopedia.nation);
+        nations.push(tank.tankDefinitions.nation);
       } else {
-        groupedTanks[tank.tankopedia.nation].push(tank.tankopedia);
+        groupedTanks[tank.tankDefinitions.nation].push(tank.tankDefinitions);
       }
     });
 
@@ -90,18 +64,13 @@ export const ownedTanksCommand: CommandRegistry = {
     return (
       <Wrapper>
         <TitleBar
-          name={accountInfo[id].nickname}
+          name={accountInfo.nickname}
-          nameDiscriminator={
-            clanData[id]?.clan ? `[${clanData[id]?.clan?.tag}]` : undefined
-          }
           image={
-            clanData[id]?.clan
+            clanAccountInfo?.clan
-              ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanData[id]?.clan?.emblem_set_id}.png`
+              ? emblemIdToURL(clanAccountInfo.clan.emblem_set_id)
               : undefined
           }
-          description={`Tier ${
+          description={`Tier ${TIER_ROMAN_NUMERALS[tier as Tier]} tanks`}
-            TIER_ROMAN_NUMERALS[tier as Tier]
-          } tanks • ${new Date().toDateString()}`}
         />
 
         {filteredTanks.length === 0 && <NoData type={NoDataType.TanksFound} />}
@@ -117,7 +86,7 @@ export const ownedTanksCommand: CommandRegistry = {
               return (
                 <Tanks.Root>
                   <Tanks.Title>
-                    {(await tankopediaInfo).vehicle_nations[nation]}
+                    {(await encyclopediaInfo).vehicle_nations[nation]}
                   </Tanks.Title>
 
                   <Tanks.Row>
@@ -125,11 +94,11 @@ export const ownedTanksCommand: CommandRegistry = {
                       {await Promise.all(
                         leftColumn.map(async (tank) => (
                           <Tanks.Item
-                            key={tank.tank_id}
+                            key={tank.id}
-                            name={await resolveTankName(tank.tank_id)}
+                            name={tank.name}
                             tankType={tank.type}
-                            image={tank.images?.normal}
+                            image={tankIcon(tank.id)}
-                            treeType={await getTreeType(tank.tank_id)}
+                            treeType={await getTreeType(tank.id)}
                           />
                         )),
                       )}
@@ -138,11 +107,11 @@ export const ownedTanksCommand: CommandRegistry = {
                       {await Promise.all(
                         rightColumn.map(async (tank) => (
                           <Tanks.Item
-                            key={tank.tank_id}
+                            key={tank.id}
-                            name={await resolveTankName(tank.tank_id)}
+                            name={tank.name}
                             tankType={tank.type}
-                            image={tank.images?.normal}
+                            image={tankIcon(tank.id)}
-                            treeType={await getTreeType(tank.tank_id)}
+                            treeType={await getTreeType(tank.id)}
                           />
                         )),
                       )}
@@ -158,17 +127,3 @@ export const ownedTanksCommand: CommandRegistry = {
 
   autocomplete: autocompleteUsername,
 };
-
-// TODO: make this work in the future
-// console.log('Caching tank images...');
-// TANKS.then((tanks) =>
-//   jsxToSvg(
-//     <div style={{ display: 'flex' }}>
-//       {tanks.map(({ images, tank_id }) => {
-//         return (
-//           images.normal && <img key={tank_id} src={images.normal} width={0} />
-//         );
-//       })}
-//     </div>,
-//   ),
-// ).then(() => console.log('Cached tank images'));

src/commands/playerAchievements.ts

@@ -1,16 +1,14 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { startCase } from 'lodash';
 import markdownEscape from 'markdown-escape';
-import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
+import { getAccountAchievements } from '../core/blitz/getAccountAchievements';
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import { getAccountInfo } from '../core/blitz/getAccountInfo';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
 import embedInfo from '../core/discord/embedInfo';
 import markdownTable, { TableInputEntry } from '../core/discord/markdownTable';
 import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistry } from '../events/interactionCreate';
-import { AccountAchievements } from '../types/accountAchievements';
-import { AccountInfo } from '../types/accountInfo';
 
 type SortBy = 'name' | 'count';
 
@@ -35,22 +33,17 @@ export const playerAchievementsCommand: CommandRegistry = {
   async handler(interaction) {
     const sortBy = (interaction.options.getString('sort') ?? 'name') as SortBy;
     const account = await resolvePlayerFromCommand(interaction);
-    const { id, region: server } = account;
+    const { id, region: region } = account;
-    const accounts = await getWargamingResponse<AccountInfo>(
+    const accountInfo = await getAccountInfo(region, id);
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
+    const accountsAchievements = await getAccountAchievements(region, id);
-    );
+    const accountAchievements = accountsAchievements;
-    const accountsAchievements =
-      await getWargamingResponse<AccountAchievements>(
-        `https://api.wotblitz.${server}/wotb/account/achievements/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
-      );
-    const accountAchievements = accountsAchievements[id];
     const compound = {
       ...accountAchievements.achievements,
       ...accountAchievements.max_series,
     };
 
     return embedInfo(
-      `${markdownEscape(accounts[id].nickname)}'s information`,
+      `${markdownEscape(accountInfo.nickname)}'s information`,
 
       markdownTable(
         Object.keys(compound)

src/commands/playerInfo.ts

@@ -1,14 +1,12 @@
 import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
+import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
 import embedInfo from '../core/discord/embedInfo';
 import markdownTable from '../core/discord/markdownTable';
 import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistry } from '../events/interactionCreate';
-import { AccountInfo } from '../types/accountInfo';
 
 export const playerInfoCommand: CommandRegistry = {
   inProduction: true,
@@ -21,11 +19,8 @@ export const playerInfoCommand: CommandRegistry = {
 
   async handler(interaction) {
     const account = await resolvePlayerFromCommand(interaction);
-    const { id, region: server } = account;
+    const { id, region: region } = account;
-    const accounts = await getWargamingResponse<AccountInfo>(
+    const accountInfo = await getAccountInfo(region, id);
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
-    );
-    const accountInfo = accounts[id];
 
     return embedInfo(
       `${markdownEscape(accountInfo.nickname)}'s information`,

src/commands/ratings.tsx

@@ -4,28 +4,30 @@ import {
   SlashCommandSubcommandBuilder,
   SlashCommandSubcommandGroupBuilder,
 } from 'discord.js';
+import { range } from 'lodash';
 import { BlitzkriegRatingsLeaderboard } from '../../scripts/buildRatingsLeaderboard';
 import * as Leaderboard from '../components/Leaderboard';
 import TitleBar from '../components/TitleBar';
 import Wrapper from '../components/Wrapper';
+import { LEAGUES } from '../constants/leagues';
+import { FIRST_ARCHIVED_RATINGS_SEASON } from '../constants/ratings';
 import { REGION_NAMES_SHORT, Region } from '../constants/regions';
-import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
+import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import getArchivedRatingsInfo from '../core/blitz/getArchivedRatingsInfo';
+import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
 import getRatingsInfo from '../core/blitz/getRatingsInfo';
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import { getRatingsLeague } from '../core/blitz/getRatingsLeague';
-import regionToRegionSubdomain from '../core/blitz/regionToRegionSubdomain';
+import { getRatingsNeighbors } from '../core/blitz/getRatingsNeighbors';
-import getMidnightLeaderboard, {
+import { getArchivedLatestSeasonNumber } from '../core/blitzkrieg/getArchivedLatestSeasonNumber';
-  DATABASE_REPO,
+import getArchivedRatingsInfo from '../core/blitzkrieg/getArchivedRatingsInfo';
-} from '../core/database/getMidnightLeaderboard';
+import { getArchivedRatingsLeaderboard } from '../core/blitzkrieg/getArchivedRatingsLeaderboard';
+import getArchivedRatingsMidnightLeaderboard from '../core/blitzkrieg/getArchivedRatingsMidnightLeaderboard';
+import { UserError } from '../core/blitzkrieg/userError';
 import addRegionChoices from '../core/discord/addRegionChoices';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
+import embedNegative from '../core/discord/embedNegative';
 import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
-import { octokit } from '../core/github/octokit';
-import throwError from '../core/node/throwError';
 import { CommandRegistryRaw } from '../events/interactionCreate';
-import { AccountInfo } from '../types/accountInfo';
-import { PlayerClanData } from '../types/playerClanData';
 
 export interface RatingsPlayer {
   spa_id: number;
@@ -114,14 +116,6 @@ export interface RatingsNeighbors {
   neighbors: RatingsPlayer[];
 }
 
-const LEAGUES = [
-  { name: 'Diamond', minScore: 5000 },
-  { name: 'Platinum', minScore: 4000 },
-  { name: 'Gold', minScore: 3000 },
-  { name: 'Silver', minScore: 2000 },
-  { name: 'Bronze', minScore: 0 },
-];
-
 function addSubcommands(
   option: SlashCommandSubcommandGroupBuilder,
   addOptions = (option: SlashCommandSubcommandBuilder) => option,
@@ -130,14 +124,14 @@ function addSubcommands(
     .addSubcommand((option) =>
       addOptions(
         option
-          .setName('neighbours')
+          .setName('neighbors')
-          .setDescription('Your position and neighbours'),
+          .setDescription('Your position and neighbors'),
       )
         .addStringOption(addUsernameChoices)
         .addIntegerOption((option) =>
           option
             .setName('limit')
-            .setDescription('How many neighbours to display (default: 10)')
+            .setDescription('How many neighbors to display (default: 10)')
             .setRequired(false)
             .setMinValue(5)
             .setMaxValue(30),
@@ -172,25 +166,24 @@ function addSubcommands(
     );
 }
 
+const noOngoingSeason = embedNegative(
+  'No ongoing season',
+  "Wargaming didn't provide any data for this season.",
+);
+
 export const ratingsCommand = new Promise<CommandRegistryRaw>(
   async (resolve) => {
-    const seasonChoices = await octokit.repos
+    const latestArchivedSeasonNumber = await getArchivedLatestSeasonNumber();
-      .getContent({
+    const seasonChoices = range(
-        ...DATABASE_REPO,
+      FIRST_ARCHIVED_RATINGS_SEASON,
-        path: 'com/ratings',
+      latestArchivedSeasonNumber + 1,
-      })
+    ).map(
-      .then(({ data }) => {
+      (number) =>
-        if (!Array.isArray(data)) {
+        ({
-          throw throwError('Archived ratings data is malformed');
+          name: `Season ${number}`,
-        }
+          value: `${number}`,
-        return data.map(
+        }) satisfies APIApplicationCommandOptionChoice<string>,
-          (folder) =>
+    );
-            ({
-              name: `Season ${folder.name}`,
-              value: folder.name,
-            }) satisfies APIApplicationCommandOptionChoice<string>,
-        );
-      });
 
     const command = new SlashCommandBuilder()
       .setName('ratings')
@@ -236,7 +229,7 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
           | 'current';
         const subcommand = interaction.options.getSubcommand(true) as
           | 'league'
-          | 'neighbours';
+          | 'neighbors';
         const limit = interaction.options.getInteger('limit') ?? 10;
         const seasonOption = interaction.options.getString('season');
         const season = seasonOption ? parseInt(seasonOption) : undefined;
@@ -258,41 +251,27 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
           const region = interaction.options.getString('region') as Region;
           regionRatingsInfo = await (subcommandGroup === 'current'
             ? getRatingsInfo(region)
-            : getArchivedRatingsInfo(season!, region));
+            : getArchivedRatingsInfo(region, season!));
-          const regionSubdomain = regionToRegionSubdomain(region);
+
+          if (regionRatingsInfo.detail !== undefined) return noOngoingSeason;
+
           const result =
             subcommandGroup === 'current'
-              ? regionRatingsInfo.detail === undefined
+              ? await getRatingsLeague(region, leagueIndex).then(
-                ? await fetch(
+                  async (result) =>
-                    `https://${regionSubdomain}.wotblitz.com/en/api/rating-leaderboards/league/${leagueIndex}/top/`,
+                    result.slice(0, limit).map(
-                  )
+                      (player) =>
-                    .then((response) => response.json() as Promise<LeagueTop>)
+                        ({
-                    .then(async ({ result }) =>
+                          id: player.spa_id,
-                      result.slice(0, limit).map(
+                          score: player.score,
-                        (player) =>
+                          position: player.number,
-                          ({
+                          clan: player.clan_tag,
-                            id: player.spa_id,
+                          nickname: player.nickname,
-                            score: player.score,
+                        }) satisfies SimplifiedPlayer,
-                            position: player.number,
+                    ),
-                            clan: player.clan_tag,
+                )
-                            nickname: player.nickname,
+              : await getArchivedRatingsLeaderboard(region, season!).then(
-                          }) satisfies SimplifiedPlayer,
+                  async (players) => {
-                      ),
-                    )
-                : undefined
-              : await octokit.repos
-                  .getContent({
-                    ...DATABASE_REPO,
-                    path: `${region}/ratings/${season}/latest.json`,
-                  })
-                  .then(async ({ data }) => {
-                    if (Array.isArray(data) || data.type !== 'file') {
-                      throw throwError('Archived ratings data is malformed');
-                    }
-
-                    const players = (await fetch(data.download_url!).then(
-                      (response) => response.json(),
-                    )) as BlitzkriegRatingsLeaderboard;
                     const firstPlayerIndex =
                       leagueIndex === 0
                         ? 0
@@ -305,9 +284,10 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
                       firstPlayerIndex,
                       lastPlayerIndex + 1,
                     );
-                    const ids = trimmed.map((player) => player.id).join(',');
+                    const clanData = await getClanAccountInfo(
-                    const clanData = await getWargamingResponse<PlayerClanData>(
+                      region,
-                      `https://api.wotblitz.${region}/wotb/clans/accountinfo/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${ids}&extra=clan`,
+                      trimmed.map(({ id }) => id),
+                      ['clan'],
                     );
 
                     return trimmed.map(
@@ -318,118 +298,74 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
                           position: firstPlayerIndex + index + 1,
                           clan: clanData[player.id]?.clan?.tag,
                           nickname:
-                            clanData[player.id]?.account_name ??
+                            clanData[index]?.account_name ??
-                            `Unknown Player ${player.id}`,
+                            `Deleted ${player.id}`,
                         }) satisfies SimplifiedPlayer,
                     );
-                  });
+                  },
-          const leagueInfo =
+                );
-            regionRatingsInfo.detail === undefined
+          const leagueInfo = regionRatingsInfo.leagues[leagueIndex];
-              ? regionRatingsInfo.leagues[leagueIndex]
-              : undefined;
           midnightLeaderboard =
             subcommandGroup === 'current'
-              ? regionRatingsInfo.detail === undefined
+              ? await getArchivedRatingsMidnightLeaderboard(
-                ? await getMidnightLeaderboard(
+                  region,
-                    region,
+                  regionRatingsInfo.current_season,
-                    regionRatingsInfo.current_season,
+                )
-                  )
+              : await getArchivedRatingsMidnightLeaderboard(region, season!);
-                : undefined
-              : await getMidnightLeaderboard(region, season!);
 
           players = result;
           playersBefore = result ? result[0].position - 1 : 0;
           playersAfter =
-            regionRatingsInfo.detail === undefined && result !== undefined
+            regionRatingsInfo.count - result[result.length - 1].position;
-              ? regionRatingsInfo.count - result[result.length - 1].position
-              : 0;
           titleName = `${
             leagueInfo ? leagueInfo.title : 'No Ongoing Season'
           } - ${REGION_NAMES_SHORT[region]}`;
-          titleImage = leagueInfo
+          titleImage = leagueInfo.big_icon.startsWith('http')
-            ? leagueInfo.big_icon.startsWith('http')
+            ? leagueInfo.big_icon
-              ? leagueInfo.big_icon
+            : `https:${leagueInfo.big_icon}`;
-              : `https:${leagueInfo.big_icon}`
-            : undefined;
           titleDescription = `Top ${limit} players`;
         } else {
           const { region, id } = await resolvePlayerFromCommand(interaction);
           regionRatingsInfo =
             subcommandGroup === 'current'
               ? await getRatingsInfo(region)
-              : await octokit.repos
+              : await getArchivedRatingsInfo(region, season!);
-                  .getContent({
-                    ...DATABASE_REPO,
-                    path: `${region}/ratings/${season}/info.json`,
-                  })
-                  .then(async ({ data }) => {
-                    if (Array.isArray(data) || data.type !== 'file') {
-                      throw throwError('Archived ratings info is malformed');
-                    }
 
-                    const response = fetch(data.download_url!);
+          if (regionRatingsInfo.detail !== undefined) return noOngoingSeason;
-                    return (await response.then((response) =>
+
-                      response.json(),
+          const accountInfo = await getAccountInfo(region, id);
-                    )) as RatingsInfo;
+          const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
-                  });
-          const accountInfo = await getWargamingResponse<AccountInfo>(
-            `https://api.wotblitz.${region}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
-          );
-          const clan = (
-            await getWargamingResponse<PlayerClanData>(
-              `https://api.wotblitz.${region}/wotb/clans/accountinfo/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}&extra=clan`,
-            )
-          )[id]?.clan;
-          const regionSubdomain = regionToRegionSubdomain(region);
           const neighbors =
             subcommandGroup === 'current'
-              ? regionRatingsInfo.detail === undefined
+              ? await getRatingsNeighbors(
-                ? await fetch(
+                  region,
-                    `https://${regionSubdomain}.wotblitz.com/en/api/rating-leaderboards/user/${id}/?neighbors=${Math.round(
+                  id,
-                      limit / 2,
+                  Math.round(limit / 2),
-                    )}`,
+                ).then((players) =>
-                  )
+                  players.neighbors.map(
-                    .then(
+                    (player) =>
-                      (response) =>
+                      ({
-                        response.json() as Promise<RatingsNeighbors>,
+                        id: player.spa_id,
-                    )
+                        position: player.number,
-                    .then((players) =>
+                        score: player.score,
-                      players.neighbors.map(
+                        clan: player.clan_tag,
-                        (player) =>
+                        nickname: player.nickname,
-                          ({
+                      }) satisfies SimplifiedPlayer,
-                            id: player.spa_id,
+                  ),
-                            position: player.number,
+                )
-                            score: player.score,
+              : await getArchivedRatingsLeaderboard(region, season!).then(
-                            clan: player.clan_tag,
+                  async (players) => {
-                            nickname: player.nickname,
-                          }) satisfies SimplifiedPlayer,
-                      ),
-                    )
-                : undefined
-              : await octokit.repos
-                  .getContent({
-                    ...DATABASE_REPO,
-                    path: `${region}/ratings/${season}/latest.json`,
-                  })
-                  .then(async ({ data }) => {
-                    if (Array.isArray(data) || data.type !== 'file') {
-                      throw throwError(
-                        'Archived ratings latest data is malformed',
-                      );
-                    }
-
-                    const response = fetch(data.download_url!);
-                    const players = (await response.then((response) =>
-                      response.json(),
-                    )) as BlitzkriegRatingsLeaderboard;
                     const playerIndex = players.findIndex(
                       (player) => player.id === id,
                     );
 
                     if (playerIndex === -1) {
-                      throw throwError(
+                      throw new UserError(
-                        `${accountInfo[id].nickname} didn't player ratings in season ${season}`,
+                        `${accountInfo.nickname} didn't player ratings in season ${season}`,
-                        'This player did not participate in this season or did not get past calibration.',
+                        {
+                          cause:
+                            'This player did not participate in this season or did not get past calibration.',
+                        },
                       );
                     }
 
@@ -438,9 +374,10 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
                       playerIndex - halfRange,
                       playerIndex + halfRange + 1,
                     );
-                    const ids = trimmed.map((player) => player.id).join(',');
+                    const clanData = await getClanAccountInfo(
-                    const clanData = await getWargamingResponse<PlayerClanData>(
+                      region,
-                      `https://api.wotblitz.${region}/wotb/clans/accountinfo/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${ids}&extra=clan`,
+                      trimmed.map((player) => player.id),
+                      ['clan'],
                     );
 
                     return trimmed.map((player, index) => ({
@@ -450,49 +387,42 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
                       clan: clanData[player.id]!.clan?.tag,
                       nickname: clanData[player.id]!.account_name,
                     }));
-                  });
+                  },
+                );
           midnightLeaderboard =
             subcommandGroup === 'current'
-              ? regionRatingsInfo.detail === undefined
+              ? await getArchivedRatingsMidnightLeaderboard(
-                ? await getMidnightLeaderboard(
+                  region,
-                    region,
+                  regionRatingsInfo.current_season,
-                    regionRatingsInfo.current_season,
+                )
-                  )
+              : await getArchivedRatingsMidnightLeaderboard(region, season!);
-                : undefined
-              : await getMidnightLeaderboard(region, season!);
 
           if (clan && neighbors) titleNameDiscriminator = `[${clan.tag}]`;
 
           players = neighbors;
-          titleImage = neighbors
+          titleImage = clan
-            ? clan
+            ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clan.emblem_set_id}.png`
-              ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clan.emblem_set_id}.png`
-              : undefined
             : undefined;
           titleName = neighbors
-            ? accountInfo[id].nickname
+            ? accountInfo.nickname
             : `No Ongoing Season - ${REGION_NAMES_SHORT[region]}`;
-          titleDescription = 'Ratings neighbours';
+          titleDescription = 'Ratings neighbors';
           playersBefore = neighbors ? neighbors[0].position - 1 : 0;
           playersAfter =
-            regionRatingsInfo.detail === undefined
+            regionRatingsInfo.count - neighbors[neighbors.length - 1].position;
-              ? neighbors
-                ? regionRatingsInfo.count -
-                  neighbors[neighbors.length - 1].position
-                : 0
-              : 0;
           playerId = id;
         }
 
-        const items = players?.map((player) => {
+        const resolvedRegionRatingsInfo: typeof regionRatingsInfo & {
-          const reward =
+          detail: undefined;
-            regionRatingsInfo.detail === undefined
+        } = regionRatingsInfo;
-              ? regionRatingsInfo.rewards.find(
+
-                  (reward) =>
+        const items = players.map((player) => {
-                    player.position >= reward.from_position &&
+          const reward = resolvedRegionRatingsInfo.rewards.find(
-                    player.position <= reward.to_position,
+            (reward) =>
-                )
+              player.position >= reward.from_position &&
-              : undefined;
+              player.position <= reward.to_position,
+          );
           const midnightIndex = midnightLeaderboard?.findIndex(
             (item) => item.id === player.id,
           );
@@ -523,17 +453,22 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
             <TitleBar
               name={titleName}
               image={titleImage}
-              nameDiscriminator={titleNameDiscriminator}
+              description={titleDescription}
-              description={`${titleDescription} • ${new Date().toDateString()}`}
             />
 
             {items && (
               <Leaderboard.Root>
                 {playersBefore > 0 && (
-                  <Leaderboard.Gap number={playersBefore} />
+                  <Leaderboard.Gap
+                    message={`+ ${playersBefore.toLocaleString()} more`}
+                  />
                 )}
                 {items}
-                {playersAfter > 0 && <Leaderboard.Gap number={playersAfter} />}
+                {playersAfter > 0 && (
+                  <Leaderboard.Gap
+                    message={`+ ${playersAfter.toLocaleString()} more`}
+                  />
+                )}
               </Leaderboard.Root>
             )}
           </Wrapper>

src/commands/searchClans.ts

@@ -2,7 +2,7 @@ import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import { REGION_NAMES, Region } from '../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import fetchBlitz from '../core/blitz/fetchBlitz';
 import addClanChoices from '../core/discord/addClanChoices';
 import addRegionChoices from '../core/discord/addRegionChoices';
 import embedInfo from '../core/discord/embedInfo';
@@ -30,7 +30,7 @@ export const searchClansCommand: CommandRegistry = {
     const server = interaction.options.getString('region') as Region;
     const clan = interaction.options.getString('clan')!;
     const limit = interaction.options.getInteger('limit') ?? 25;
-    const clanList = await getWargamingResponse<ClanList>(
+    const clanList = await fetchBlitz<ClanList>(
       `https://api.wotblitz.${server}/wotb/clans/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${clan}&limit=${limit}`,
     );
 

src/commands/searchPlayers.ts

@@ -2,8 +2,11 @@ import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import { REGION_NAMES, Region } from '../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import fetchBlitz from '../core/blitz/fetchBlitz';
-import { AccountList, usernamePattern } from '../core/blitz/listPlayers';
+import {
+  AccountList,
+  usernamePattern,
+} from '../core/blitz/searchPlayersAcrossRegions';
 import addRegionChoices from '../core/discord/addRegionChoices';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import embedInfo from '../core/discord/embedInfo';
@@ -34,7 +37,7 @@ export const searchPlayersCommand: CommandRegistry = {
     const limit = interaction.options.getInteger('limit') ?? 25;
     const trimmedSearch = name.trim();
     const players = usernamePattern.test(trimmedSearch)
-      ? await getWargamingResponse<AccountList>(
+      ? await fetchBlitz<AccountList>(
           `https://api.wotblitz.${server}/wotb/account/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${encodeURIComponent(
             trimmedSearch,
           )}&limit=${limit}`,

src/commands/searchTanks.ts

@@ -1,7 +1,7 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { go } from 'fuzzysort';
 import markdownEscape from 'markdown-escape';
-import { TANK_NAMES_DIACRITICS } from '../core/blitz/tankopedia';
+import { tankNamesDiacritics } from '../core/blitzkrieg/definitions/tanks';
 import addTankChoices from '../core/discord/addTankChoices';
 import embedInfo from '../core/discord/embedInfo';
 import { CommandRegistry } from '../events/interactionCreate';
@@ -25,7 +25,7 @@ export const searchTanksCommand: CommandRegistry = {
   async handler(interaction) {
     const tank = interaction.options.getString('tank')!;
     const limit = interaction.options.getInteger('limit') ?? 25;
-    const results = go(tank, await TANK_NAMES_DIACRITICS, {
+    const results = go(tank, await tankNamesDiacritics, {
       limit,
       keys: ['combined'],
     }).map((result) => result.obj.original);

src/commands/stats.tsx

@@ -1,28 +1,68 @@
 import { SlashCommandBuilder } from 'discord.js';
-import { TreeTypeString } from '../components/Tanks';
+import AllStatsOverview from '../components/AllStatsOverview';
-import { CYCLIC_API } from '../constants/cyclic';
+import NoData, { NoDataType } from '../components/NoData';
-import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
+import TitleBar from '../components/TitleBar';
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import Wrapper from '../components/Wrapper';
-import resolveTankId from '../core/blitz/resolveTankId';
+import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import addStatTypeSubCommandGroups from '../core/discord/addStatTypeSubCommandGroups';
+import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
+import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL';
+import { filtersToDescription } from '../core/blitzkrieg/filtersToDescription';
+import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
+import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
+import addFilterOptions from '../core/discord/addFilterOptions';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteTanks from '../core/discord/autocompleteTanks';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
-import interactionToURL from '../core/discord/interactionToURL';
+import { buttonRefresh } from '../core/discord/buttonRefresh';
-import linkButton from '../core/discord/linkButton';
+import commandToURL from '../core/discord/commandToURL';
-import primaryButton from '../core/discord/primaryButton';
+import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
+import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
+import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
 import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton';
-import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand';
+import resolvePeriodFromCommand, {
+  ResolvedPeriod,
+} from '../core/discord/resolvePeriodFromCommand';
 import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+import resolvePlayerFromCommand, {
+  ResolvedPlayer,
+} from '../core/discord/resolvePlayerFromCommand';
+import { StatFilters, filterStats } from '../core/statistics/filterStats';
 import { CommandRegistryRaw } from '../events/interactionCreate';
-import stats, { MultiTankFilters, StatType } from '../renderers/stats';
+
-import { AccountInfo } from '../types/accountInfo';
+async function render(
+  { region, id }: ResolvedPlayer,
+  { start, end, name }: ResolvedPeriod,
+  filters: StatFilters,
+) {
+  const { nickname } = await getAccountInfo(region, id);
+  const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+  const clanImage = clan ? emblemIdToURL(clan.emblem_set_id) : undefined;
+  const diffedTankStats = await getStatsInPeriod(region, id, start, end);
+  const { stats, supplementary } = await filterStats(diffedTankStats, filters);
+  const filterDescriptions = await filtersToDescription(filters);
+
+  return (
+    <Wrapper>
+      <TitleBar
+        name={nickname}
+        image={clanImage}
+        description={`${name} • ${filterDescriptions}`}
+      />
+
+      {!stats.battles && <NoData type={NoDataType.BattlesInPeriod} />}
+      {stats.battles > 0 && (
+        <AllStatsOverview stats={stats} supplementaryStats={supplementary} />
+      )}
+    </Wrapper>
+  );
+}
 
 export const statsCommand = new Promise<CommandRegistryRaw>(async (resolve) => {
-  const command = await addStatTypeSubCommandGroups(
+  const command = await addFilterOptions(
     new SlashCommandBuilder()
       .setName('stats')
       .setDescription('Regular battles statistics'),
+    (option) => option.addStringOption(addUsernameChoices),
   );
 
   resolve({
@@ -32,60 +72,20 @@ export const statsCommand = new Promise<CommandRegistryRaw>(async (resolve) => {
     command,
 
     async handler(interaction) {
-      const commandGroup = interaction.options.getSubcommandGroup(
-        true,
-      ) as StatType;
       const player = await resolvePlayerFromCommand(interaction);
-      const resolvedPeriod = resolvePeriodFromCommand(
+      const period = resolvePeriodFromCommand(player.region, interaction);
-        player.region,
+      const filters = await getFiltersFromCommand(interaction);
-        interaction,
+      const path = commandToURL(interaction, {
-      );
-      const period = interaction.options.getString('period');
-      const tankIdRaw = interaction.options.getString('tank')!;
-      const tankId =
-        commandGroup === 'tank' ? await resolveTankId(tankIdRaw) : null;
-      const start = interaction.options.getInteger('start');
-      const end = interaction.options.getInteger('end');
-      const path = interactionToURL(interaction, {
         ...player,
-        tankId,
+        ...getCustomPeriodParams(interaction),
-        start,
+        ...filters,
-        end,
-        period,
       });
-      const { nickname } = (
-        await getWargamingResponse<AccountInfo>(
-          `https://api.wotblitz.${player.region}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${player.id}`,
-        )
-      )[player.id];
 
-      const tierOption = interaction.options.getString('tier');
+      return Promise.all([
-
+        render(player, period, filters),
-      return [
+        buttonRefresh(interaction, path),
-        await stats(
+        getBlitzStarsLinkButton(player.region, player.id),
-          commandGroup,
+      ]);
-          resolvedPeriod,
-          player,
-          commandGroup === 'tank'
-            ? tankId
-            : commandGroup === 'multi-tank'
-            ? ({
-                'tank-type':
-                  interaction.options.getString('tank-type') ?? undefined,
-                nation: interaction.options.getString('nation') ?? undefined,
-                tier: tierOption ? parseInt(tierOption) : undefined,
-                'tree-type': (interaction.options.getString('tree-type') ??
-                  undefined) as TreeTypeString | undefined,
-              } satisfies Partial<MultiTankFilters>)
-            : null,
-        ),
-        primaryButton(path, 'Refresh'),
-        // linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
-        linkButton(
-          `https://www.blitzstars.com/player/${player.region}/${nickname}`,
-          'BlitzStars',
-        ),
-      ];
     },
 
     autocomplete: (interaction) => {
@@ -94,27 +94,11 @@ export const statsCommand = new Promise<CommandRegistryRaw>(async (resolve) => {
     },
 
     async button(interaction) {
-      const url = new URL(`${CYCLIC_API}/${interaction.customId}`);
-      const path = url.pathname.split('/').filter(Boolean);
-      const commandGroup = path[1] as StatType;
       const player = await resolvePlayerFromButton(interaction);
       const period = resolvePeriodFromButton(player.region, interaction);
+      const filters = getFiltersFromButton(interaction);
 
-      return await stats(
+      return await render(player, period, filters);
-        commandGroup,
-        period,
-        player,
-        commandGroup === 'tank'
-          ? parseInt(url.searchParams.get('tankId')!)
-          : commandGroup === 'multi-tank'
-          ? ({
-              'tank-type': url.searchParams.get('tank-type')!,
-              nation: url.searchParams.get('nation')!,
-              tier: parseInt(url.searchParams.get('tier')!),
-              'tree-type': url.searchParams.get('tree-type') as TreeTypeString,
-            } satisfies MultiTankFilters)
-          : null,
-      );
     },
   });
 });

src/commands/today.tsx

@@ -1,83 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
-import addUsernameChoices from '../core/discord/addUsernameChoices';
-import autocompleteUsername from '../core/discord/autocompleteUsername';
-import interactionToURL from '../core/discord/interactionToURL';
-import linkButton from '../core/discord/linkButton';
-import primaryButton from '../core/discord/primaryButton';
-import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
-import { CommandRegistry } from '../events/interactionCreate';
-import today from '../renderers/today';
-import { AccountInfo } from '../types/accountInfo';
-
-export const todayCommand: CommandRegistry = {
-  inProduction: true,
-  inPublic: true,
-
-  command: new SlashCommandBuilder()
-    .setName('today')
-    .setDescription('A general daily breakdown of your performance')
-    .addStringOption(addUsernameChoices)
-    .addIntegerOption((option) =>
-      option
-        .setName('cutoff')
-        .setDescription(
-          'The maximum number of tanks to display (default: Infinity)',
-        )
-        .setRequired(false)
-        .setMinValue(1),
-    )
-    .addIntegerOption((option) =>
-      option
-        .setName('maximized')
-        .setDescription(
-          'The number of rows with full stats after which all are collapsed (default: 4)',
-        )
-        .setMinValue(0)
-        .setRequired(false),
-    )
-    .addBooleanOption((option) =>
-      option
-        .setName('show-total')
-        .setDescription('Show the total stats at the top (default: true)')
-        .setRequired(false),
-    ),
-
-  async handler(interaction) {
-    const player = await resolvePlayerFromCommand(interaction);
-    const cutoff = interaction.options.getInteger('cutoff') ?? undefined;
-    const maximized = interaction.options.getInteger('maximized') ?? undefined;
-    const showTotal = interaction.options.getBoolean('show-total') ?? undefined;
-    const { nickname } = (
-      await getWargamingResponse<AccountInfo>(
-        `https://api.wotblitz.${player.region}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${player.id}`,
-      )
-    )[player.id];
-    const path = interactionToURL(interaction, {
-      ...player,
-      cutoff,
-      maximized,
-      'show-total': showTotal,
-    });
-
-    return [
-      await today(player, cutoff, maximized, showTotal, false),
-      primaryButton(path, 'Refresh'),
-      // linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
-      linkButton(
-        `https://www.blitzstars.com/player/${player.region}/${nickname}`,
-        'BlitzStars',
-      ),
-    ];
-  },
-
-  autocomplete: autocompleteUsername,
-
-  async button(interaction) {
-    const player = await resolvePlayerFromButton(interaction);
-
-    return await today(player);
-  },
-};

src/commands/verify.ts

@@ -1,82 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import markdownEscape from 'markdown-escape';
-import discord from '../../discord.json' assert { type: 'json' };
-import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
-import getWargamingResponse from '../core/blitz/getWargamingResponse';
-import addUsernameChoices from '../core/discord/addUsernameChoices';
-import autocompleteUsername from '../core/discord/autocompleteUsername';
-import embedNegative from '../core/discord/embedNegative';
-import embedPositive from '../core/discord/embedPositive';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
-import { CommandRegistry } from '../events/interactionCreate';
-import { AccountInfo } from '../types/accountInfo';
-import { PlayerClanData } from '../types/playerClanData';
-
-export const verifyCommand: CommandRegistry = {
-  inProduction: true,
-  inPublic: true,
-
-  command: new SlashCommandBuilder()
-    .setName('verify')
-    .setDescription("Set's the user's username to their in-game name")
-    .addStringOption((option) => addUsernameChoices(option).setRequired(true)),
-
-  async handler(interaction) {
-    const blitzAccount = await resolvePlayerFromCommand(interaction);
-    const { id, region: server } = blitzAccount;
-    const accountInfo = await getWargamingResponse<AccountInfo>(
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
-    );
-    const clanData = await getWargamingResponse<PlayerClanData>(
-      `https://api.wotblitz.${server}/wotb/clans/accountinfo/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}&extra=clan`,
-    );
-    const clan = clanData[id]?.clan;
-    const clanTag = clan ? ` [${clan!.tag}]` : '';
-    const member =
-      interaction.member &&
-      interaction.guild?.members.cache.get(interaction.member?.user.id);
-
-    if (!interaction.guild?.members.me?.permissions.has('ManageNicknames')) {
-      return embedNegative(
-        `${markdownEscape(interaction.user.username)} failed to verify`,
-        "I don't have the permission to change your nickname.",
-      );
-    }
-    if (!interaction.member || !member) {
-      return embedNegative(
-        `${interaction.user.username} is not in this server`,
-        "I couldn't find this person in this server. Did they leave?",
-      );
-    }
-
-    try {
-      await member.setNickname(`${accountInfo[id].nickname}${clanTag}`);
-
-      if (interaction.guildId === discord.sklld_guild_id) {
-        if (!interaction.guild?.members.me?.permissions.has('ManageRoles')) {
-          return embedNegative(
-            `${markdownEscape(interaction.user.username)} failed to verify`,
-            "I don't have the permission to change your manage roles.",
-          );
-        }
-
-        await member.roles.remove(discord.sklld_verify_role);
-        await member.roles.add(discord.sklld_peasant_role);
-      }
-
-      return embedPositive(
-        `${interaction.user.username} is verified`,
-        `The user is now verified as ${markdownEscape(
-          accountInfo[id].nickname,
-        )}${markdownEscape(clanTag)}`,
-      );
-    } catch (error) {
-      return embedNegative(
-        `${interaction.user.username} failed to verify`,
-        "I can't change your nickname because you have higher permissions than me. Try setting your nickname to your Blitz username manually.",
-      );
-    }
-  },
-
-  autocomplete: autocompleteUsername,
-};

src/components/AllStatsOverview/components/WN8Display/components/Glow.tsx

@@ -1,32 +1,28 @@
-import { Percentile } from '../../../../../constants/percentiles';
-import hslToHex from '../../../../../core/node/hslToHex';
-import { PERCENTILE_COLORS } from '../../../../PercentileIndicator';
-
-export enum GlowSide {
-  Top,
-  Bottom,
-}
-
 export interface GlowProps {
-  percentile: Percentile;
+  color: string;
-  side: GlowSide;
+  direction?: 'default' | 'reverse';
+  rotation?: number;
 }
 
-export function Glow({ percentile, side }: GlowProps) {
+export function Glow({
-  const color = PERCENTILE_COLORS[percentile];
+  color,
-  const color1 = hslToHex(color);
+  direction = 'default',
-  const color2 = `${color1}00`;
+  rotation = 0,
+}: GlowProps) {
+  const color1 = color;
+  const color2 = `${color}00`;
 
   const background = `linear-gradient(${
-    side === GlowSide.Top ? 0 : 180
+    direction === 'default' ? 0 : 180
   }deg, ${color1} 0%, ${color2} 100%)`;
 
   return (
     <div
       style={{
         display: 'flex',
-        alignItems: side === GlowSide.Top ? 'flex-end' : 'flex-start',
+        alignItems: direction === 'default' ? 'flex-end' : 'flex-start',
         justifyContent: 'center',
+        transform: `rotate(${rotation}deg)`,
       }}
     >
       <div style={{ height: 54, width: 16, background }} />

src/components/AllStatsOverview/components/WN8Display/index.tsx

@@ -1,8 +1,8 @@
 import { Percentile } from '../../../../constants/percentiles';
-import getWN8Percentile from '../../../../core/blitz/getWN8Percentile';
+import getWN8Percentile from '../../../../core/statistics/getWN8Percentile';
 import { theme } from '../../../../stitches.config';
 import { PERCENTILE_COLORS } from '../../../PercentileIndicator';
-import { Glow, GlowSide } from './components/Glow';
+import { Glow } from './components/Glow';
 
 export interface WN8DisplayProps {
   WN8?: number;
@@ -37,7 +37,7 @@ export function WN8Display({ WN8 }: WN8DisplayProps) {
         gap: -16,
       }}
     >
-      <Glow percentile={percentile} side={GlowSide.Top} />
+      <Glow color={PERCENTILE_COLORS[percentile]} />
 
       <div
         style={{
@@ -71,7 +71,7 @@ export function WN8Display({ WN8 }: WN8DisplayProps) {
         </span>
       </div>
 
-      <Glow percentile={percentile} side={GlowSide.Bottom} />
+      <Glow color={PERCENTILE_COLORS[percentile]} direction="reverse" />
     </div>
   );
 }