Merge pull request #22 from tresabhi/1.11.0

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

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,34 @@
+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

@@ -16,18 +16,14 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
 
-    strategy:
-      matrix:
-        node-version: [18.x]
-
     steps:
-      - name: Get code
+      - name: Checkout
         uses: actions/checkout@v3
 
       - name: Use node
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 18
           cache: 'npm'
 
       - name: Install Yarn

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

@@ -0,0 +1,34 @@
+name: CD Europe 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=eu --latest

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

@@ -0,0 +1,34 @@
+name: CD Europe Ratings Leaderboards
+
+on:
+  schedule:
+    - cron: "0 23 * * *"
+
+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=eu

.github/workflows/cd-host.yml

@@ -1,4 +1,4 @@
-name: Host
+name: CD Host
 
 on:
   schedule:
@@ -12,15 +12,12 @@ concurrency:
 jobs:
   host:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [18.x]
 
     steps:
       - name: Use node
         uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 18
 
       - name: Download release assets
         run: |

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

@@ -0,0 +1,34 @@
+name: CD North America 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=na --latest

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

@@ -0,0 +1,34 @@
+name: CD North America Ratings Leaderboards
+
+on:
+  schedule:
+    - cron: '0 5 * * *'
+
+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=na

.github/workflows/ci-build.yml

@@ -11,18 +11,14 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [18.x]
-
     steps:
-      - name: Get code
+      - name: Checkout
         uses: actions/checkout@v3
 
       - name: Use node
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 18
           cache: 'npm'
 
       - name: Install Yarn

.gitignore

@@ -5,9 +5,10 @@ package-lock.json
 /playwright-report/
 /playwright/.cache/
 dist/
+dist.*
 yarn-error.log
-dist.zip
 commands.txt
 /test.*
 /docs/.vitepress/dist
-/docs/.vitepress/cache
+/docs/.vitepress/cache
+servers.csv

.vscode/settings.json

@@ -7,12 +7,16 @@
     "cleandist",
     "customperiod",
     "Everytime",
+    "fullstats",
     "fuzzysort",
     "kranvagn",
+    "Leaderboard",
+    "leaderboards",
     "outfile",
     "ownedtanks",
     "playerachievements",
     "playerinfo",
+    "ratingsleaderboard",
     "Resvg",
     "roboto",
     "searchclans",
@@ -22,15 +26,19 @@
     "Smri",
     "startcase",
     "statsfull",
+    "Stringifying",
     "strvk",
+    "subnation",
     "tankaverages",
     "tankopedia",
     "tankstats",
+    "tresabhi",
     "Unicum",
     "Unregistering",
     "vickers",
     "vitepress",
     "wargaming",
+    "webp",
     "winrate"
   ],
   "deno.enable": false,

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+the [Official Discord Server](https://discord.gg/nDt7AjGJQH).
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 TrèsAbhi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

docs/.vitepress/theme/index.ts

@@ -1,16 +1,16 @@
 // https://vitepress.dev/guide/custom-theme
-import { h } from 'vue'
-import Theme from 'vitepress/theme'
-import './style.css'
+import { h } from 'vue';
+import Theme from 'vitepress/theme';
+import './style.css';
 
 export default {
   extends: Theme,
   Layout: () => {
     return h(Theme.Layout, null, {
       // https://vitepress.dev/guide/extending-default-theme#layout-slots
-    })
+    });
   },
   enhanceApp({ app, router, siteData }) {
     // ...
-  }
-}
+  },
+};

docs/.vitepress/theme/style.css

@@ -7,7 +7,7 @@
  * Colors
  * -------------------------------------------------------------------------- */
 
- :root {
+:root {
   --vp-c-brand: #646cff;
   --vp-c-brand-light: #747bff;
   --vp-c-brand-lighter: #9499ff;
@@ -88,4 +88,3 @@
 .DocSearch {
   --docsearch-primary-color: var(--vp-c-brand) !important;
 }
-

docs/changelogs/1.10.0.md

@@ -0,0 +1,37 @@
+# Blitzkrieg 1.10.0
+
+This update addresses many readability issues that users have reported over time.
+
+## Changes
+
+- `/ownedtanks`
+  - Tanks are now displayed in two columns
+  - Collector and premium tanks now have their own colors
+  - Tank types are also displayed
+  - A stylistic image of the tank is also displayed for each tank to the right
+- `/fullstats`
+  - Was previously called `/statsfull`; this was changed to avoid the clutter that would show up when searching for `/stats`
+  - Added four catagories in which all the stats are sorted into
+  - Catagories now have backgrounds to compartmentalize them
+- `/evolution`
+  - Gave the axis markings a high contrast color
+  - Added a label for the x axis affirming that it is plotted over the number of battles
+- `/today`
+  - Added a border to all the rows to compartmentalize them
+  - This command can now generate embeds too
+  - Removed survivability
+  - Added a limit option to cut off after a certain number of tanks played (this is mainly intended to be used by streamers to limit the content of the embeds)
+  - Tanks are now displayed in order of the most recent battle
+- `/help`
+  - A significant amount of subcommands were added
+  - These new subcommands now return normal Discord messages instead of embeds in favor of readability
+  - The contents of the replies are directly fetched from the Blitzkrieg documentation
+- Time zones
+  - What is considered a "day's worth of battles" has been adjusted as the "reset time" was the same for all Blitz servers
+  - The reset time is now dependent on the server of the player
+  - Use `/help timezones` to learn more
+
+## Technical Changes
+
+- All themes have been merged to leverage Bepaint's suffixes
+- Switched to Node module resolution

docs/changelogs/1.10.1.md

@@ -0,0 +1,7 @@
+# Blitzkrieg 1.10.1
+
+This is a bit of an experiment.
+
+## Technical Changes
+
+- Every midnight in the Central North American Time, a permanent record of the entire ratings leaderboard will be stored for North America

docs/changelogs/1.10.2.md

@@ -0,0 +1,10 @@
+# Blitzkrieg 1.10.2
+
+The experiment in Blitzkrieg `1.10.1` was a bit of a failure so here are a few changes.
+
+## Fixes
+
+- North American leaderboards are now saved in the `na` directory instead of `asia`
+- Dependencies are now installed before the script is ran
+- Added leaderboards for all regions
+- All regions now have their own separate cron timings

docs/changelogs/1.11.0.md

@@ -0,0 +1,22 @@
+# Blitzkrieg 1.11.0
+
+I am going on vacation so I thought I'd publish this a bit prematurely without all the planned features.
+
+## Changes
+
+- Added `/ratings`
+  - This command currently only has the `leagues` subcommand group
+  - Displays the top players in a league
+  - Also shows the changes in their positions and scores since last region midnight
+  - Use `/help timezones` to know when Blitzkrieg records the leaderboard
+- Blitzkrieg now internally generates and keeps a permanent record of all leaderboards updated every `UTC+0` midnight
+  - This approach will allow us to capture the absolute latest state of the leaderboard before it is wiped for the next season
+
+## Fixed
+
+- Removed region "Europe" in `/verify` example
+
+## Technical Changes
+
+- Add scripts were upgraded to TypeScript
+- Secrets now only throw errors if they're used when not provided

docs/changelogs/1.9.3.md

@@ -0,0 +1,14 @@
+# Blitzkrieg 1.9.3
+
+A few fixes before we tackle the next major release.
+
+## Fixes
+
+- `/stats`, `/evolution`, and `/statsfull` now properly handle unowned or unplayed tanks
+
+## Technical Changes
+
+- Added a `Command` suffix after all command exports
+- Added a `Route` suffix after all route exports
+- Moved `tankopedia` and `tankaverages` into a runtime cache
+  - But, this time, it's a promise so we get the best of both worlds

docs/changelogs/1.9.4.md

@@ -0,0 +1,12 @@
+# Blitzkrieg 1.9.4
+
+Haha, I lied. More fixes.
+
+## Fixes
+
+- Tank names once again show when searching for tank stats
+- Tier weights now ignore tanks without entries in the `tankopedia`
+
+## Technical Changes
+
+- All `tankopedia` derivatives are now promises

docs/changelogs/1.9.5.md

@@ -0,0 +1,9 @@
+# Blitzkrieg 1.9.5
+
+Hopefully this is the last round of fixes for Blitzkrieg `1.9`.
+
+## Fixes
+
+- All commands have been tweaked to work even with a lack of a tankopedia entry
+  - This should fix test tanks not showing up
+- `/today` now properly preserves all WN8 entries

docs/guide/about.md

@@ -0,0 +1,10 @@
+# About
+
+Blitzkrieg is a multipurpose bot for anything and everything World of Tanks Blitz.
+
+- Track statistics
+- Find inactive players in a clan
+- Lookup owned tanks
+- Create embeds for streams
+- Track a player/tanks statistical evolution
+- ...and a variety of other similar things

docs/guide/embeds.md

@@ -0,0 +1,23 @@
+# Embeds
+
+Embeds are generated by a few commands as a URL that can be loaded in a browser/streaming software.
+
+## Creating Embeds
+
+1. Use a command of your liking (for example, `/stats`).
+2. Customize the command however you like and the URL generated for the embed will match your needs.
+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.
+2. Copy the URL from your browser.
+3. Paste the URL into a Browser Source.
+4. Set the refresh rate/FPS to something very low like `0.0167` (that's 1 frame every 60 seconds).
+
+## How Embeds Behave
+
+- They load like any normal website albeit with a significant delay.
+- They auto refresh every `60s`.
+- 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/invite.md

@@ -0,0 +1,10 @@
+# Inviting the Bot
+
+It's quite simple really. Just follow the steps below:
+
+1. Join a Discord server that already has Blitzkrieg installed or [the official Discord Server](https://discord.gg/nDt7AjGJQH).
+2. Click on the bot's profile.
+3. Click the "Add to Server" button under the bot's name and ID.
+4. Select what server you want it in and see what permissions you seem fit for the bot.
+
+Voila! You're ready to go.

docs/guide/timezones.md

@@ -0,0 +1,9 @@
+# Timezones
+
+What is considered a "day's worth of games" is determined by the reset time. The reset time is generally at midnight everyday after which newer games are counted towards the next day. Reset times vary from region to region:
+
+- North America: `UTC-5:00` (Central North American Time midnight)
+- Europe: `UTC+1:00` (Central European Time midnight)
+- Asia: `UTC+7:00` (Central Asia Standard Time midnight)
+
+**Reset times are different from Blitz Stars** (Blitz Stars resets at 5:00 am locally relative to the user opening their website). Inconsistencies with Blitz Stars only occur with sleep-deprived players and players who play in the wrong region.

package.json

@@ -1,25 +1,29 @@
 {
   "name": "blitzkrieg",
-  "version": "1.9.0",
+  "version": "1.10.2",
   "description": "",
   "main": "src/server.ts",
   "type": "module",
   "scripts": {
-    "build:bot": "node scripts/build --build=bot",
-    "build:server": "node scripts/build --build=server",
+    "build:bot": "vite-node --script scripts/build --build=bot",
+    "build:server": "vite-node --script scripts/build --build=server",
     "build:docs": "vitepress build docs",
-    "build": "node scripts/build --build=all",
+    "build:ratingsleaderboard": "vite-node --script scripts/buildRatingsLeaderboard",
+    "build": "vite-node --script scripts/build --build=all",
     "dev:bot": "yarn build:bot --dev && yarn start:bot",
     "dev:server": "yarn build:server --dev && yarn start:server",
     "dev:docs": "vitepress dev docs",
     "start:bot": "node --enable-source-maps --trace-warnings dist/bot.cjs",
     "start:server": "node --enable-source-maps --trace-warnings dist/server.cjs",
     "host:docs": "vitepress preview docs",
+    "publish:ratingsleaderboard": "vite-node --script scripts/buildRatingsLeaderboard --publish",
     "zip": "zip -r dist.zip dist",
-    "lint": "npx tsc"
+    "lint": "npx tsc",
+    "format": "prettier --write \"**/*.@(json|js|jsx|css|md|ts|tsx|html|xml|yml|gltf)\""
   },
   "license": "MIT",
   "dependencies": {
+    "@octokit/rest": "^20.0.1",
     "@radix-ui/colors": "^0.1.8",
     "@resvg/resvg-js": "^2.4.1",
     "bepaint": "^0.1.0-beta.3",
@@ -27,11 +31,13 @@
     "esbuild": "^0.18.10",
     "escape-html": "^1.0.3",
     "express": "^4.18.2",
+    "false": "^0.0.4",
     "fuzzysort": "^2.0.4",
     "lodash": "^4.17.21",
     "markdown-escape": "^2.0.0",
     "react": "^18.2.0",
     "satori": "^0.9.1",
+    "vite-node": "^0.33.0",
     "vitepress-plugin-auto-sidebar": "^1.1.0"
   },
   "devDependencies": {
@@ -42,6 +48,7 @@
     "@types/markdown-escape": "^1.1.0",
     "@types/node": "^20.2.1",
     "@types/react": "^18.2.7",
+    "prettier": "^3.0.0",
     "typescript": "^5.0.4",
     "vitepress": "^1.0.0-beta.3"
   }

scripts/build.js

@@ -1,87 +0,0 @@
-import { build } from 'esbuild';
-import { copyFile, mkdir, rm, writeFile } from 'fs/promises';
-import { argv } from 'process';
-
-const isProd = !argv.includes('--dev');
-const buildAll = argv.includes('--build=all');
-const buildBot = argv.includes('--build=bot') | buildAll;
-const buildServer = argv.includes('--build=server') | buildAll;
-
-if (isProd) {
-  // only remove in production to ensure no time is wasted in dev
-  console.log('🟡 Removing dist...');
-  await rm('dist', { recursive: true, force: true });
-  console.log('✅ Dist removed');
-
-  console.log('🟡 Creating dist...');
-  await mkdir('dist');
-  console.log('✅ Dist created');
-
-  console.log('🟡 Caching tankopedia...');
-  fetch('https://www.blitzstars.com/bs-tankopedia.json')
-    .then((response) => response.text())
-    .then((tankopedia) => writeFile('./dist/tankopedia.json', tankopedia))
-    .then(() => console.log('✅ Tankopedia cached'));
-
-  console.log('🟡 Caching tank averages...');
-  fetch('https://www.blitzstars.com/api/tankaverages.json')
-    .then((response) => response.json())
-    .then((individualTankAverages) => {
-      const tankAverages = {};
-
-      individualTankAverages.forEach((individualTankAverage) => {
-        tankAverages[individualTankAverage.tank_id] = individualTankAverage;
-      });
-
-      return writeFile(
-        './dist/tankaverages.json',
-        JSON.stringify(tankAverages),
-      );
-    })
-    .then(() => console.log('✅ Tank averages cached'));
-
-  console.log('🟡 Copying package.json...');
-  copyFile('package.dist.json', 'dist/package.json').then(() =>
-    console.log('✅ package.json copied'),
-  );
-}
-
-const commonOptions = {
-  platform: 'node',
-  loader: {
-    '.node': 'copy',
-    '.ttf': 'file',
-  },
-
-  bundle: true,
-  sourcemap: true,
-  minifyIdentifiers: false, // causes errors
-  minifySyntax: isProd,
-  minifyWhitespace: isProd,
-
-  logLevel: isProd ? 'info' : 'silent',
-};
-
-if (buildBot) {
-  console.log('🟡 Building bot...');
-  build({
-    ...commonOptions,
-
-    entryPoints: ['src/bot.ts'],
-    outfile: 'dist/bot.cjs',
-  }).then(() => {
-    console.log('✅ Bot built');
-  });
-}
-
-if (buildServer) {
-  console.log('🟡 Building server...');
-  build({
-    ...commonOptions,
-
-    entryPoints: ['src/server.ts'],
-    outfile: 'dist/server.cjs',
-  }).then(() => {
-    console.log('✅ Server built');
-  });
-}

scripts/build.ts

@@ -0,0 +1,62 @@
+import { BuildOptions, build } from 'esbuild';
+import { copyFile, mkdir, rm } from 'fs/promises';
+import { argv } from 'process';
+
+const isProd = !argv.includes('--dev');
+const buildAll = argv.includes('--build=all');
+const buildBot = argv.includes('--build=bot') || buildAll;
+const buildServer = argv.includes('--build=server') || buildAll;
+
+if (isProd) {
+  // only remove in production to ensure no time is wasted in dev
+  console.log('Removing dist...');
+  await rm('dist', { recursive: true, force: true });
+  console.log('Dist removed');
+
+  console.log('Creating dist...');
+  await mkdir('dist');
+  console.log('Dist created');
+
+  console.log('Copying package.json...');
+  copyFile('package.dist.json', 'dist/package.json').then(() =>
+    console.log('package.json copied'),
+  );
+}
+
+const commonOptions: BuildOptions = {
+  platform: 'node',
+  loader: {
+    '.node': 'copy',
+    '.ttf': 'file',
+  },
+
+  bundle: true,
+  sourcemap: true,
+  minifyIdentifiers: false, // causes errors
+  minifySyntax: isProd,
+  minifyWhitespace: isProd,
+
+  logLevel: isProd ? 'info' : 'silent',
+};
+
+if (buildBot) {
+  console.log('Building bot...');
+  build({
+    ...commonOptions,
+
+    entryPoints: ['src/bot.ts'],
+    outfile: 'dist/bot.cjs',
+  }).then(() => console.log('Bot built'));
+}
+
+if (buildServer) {
+  console.log('Building server...');
+  build({
+    ...commonOptions,
+
+    entryPoints: ['src/server.ts'],
+    outfile: 'dist/server.cjs',
+  }).then(() => {
+    console.log('Server built');
+  });
+}

scripts/buildRatingsLeaderboard.ts

@@ -0,0 +1,137 @@
+import { Octokit } from '@octokit/rest';
+import { rm, writeFile } from 'fs/promises';
+import { argv, env } from 'process';
+import {
+  RatingsInfo,
+  RatingsNeighbors,
+  RatingsPlayer,
+} from '../src/commands/ratings';
+import commitMultipleFiles from './commitMultipleFiles.js';
+
+/*
+ * 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.
+ * na/ratings/49/latest.json: the absolute latest leaderboard recorded at UTC+0 midnight
+ * na/ratings/49/midnight.json: last midnight's leaderboard relative to the region
+ */
+
+export type BlitzkriegRatingsLeaderboard = { id: number; score: number }[];
+
+const publish = argv.includes('--publish');
+const latest = argv.includes('--latest');
+const server = argv.find((arg) => arg.startsWith('--region='))?.split('=')[1];
+
+if (!server) throw new Error('Region parameter not specified');
+
+const NEIGHBORS = 1000;
+const PLAYERS = await fetch(
+  `https://${server}.wotblitz.com/en/api/rating-leaderboards/season/`,
+)
+  .then((response) => response.json() as Promise<RatingsInfo>)
+  .then((data) => data.count);
+
+const players: Record<number, RatingsPlayer> = {};
+const leaderboard: BlitzkriegRatingsLeaderboard = [];
+let registered = 0;
+
+async function branchFromPlayer(id: number) {
+  const { neighbors } = await fetch(
+    `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];
+
+  const branches: Promise<void>[] = [];
+  if (!players[firstPlayer.number])
+    branches.push(branchFromPlayer(firstPlayer.spa_id));
+  if (!players[lastPlayer.number])
+    branches.push(branchFromPlayer(lastPlayer.spa_id));
+
+  neighbors.forEach((neighbor) => {
+    if (players[neighbor.number]) return;
+
+    players[neighbor.number] = neighbor;
+    registered++;
+  });
+
+  console.log(
+    `Registered ${registered} / ${PLAYERS} (${(
+      (registered / PLAYERS) *
+      100
+    ).toFixed(2)}%)`,
+  );
+
+  await Promise.all(branches);
+}
+
+async function branchFromLeague(id: number) {
+  const { result } = await fetch(
+    `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];
+
+  await Promise.all([
+    branchFromPlayer(firstPlayer.spa_id),
+    branchFromPlayer(lastPlayer.spa_id),
+  ]);
+}
+
+console.log('Branching from leagues...');
+await Promise.all([
+  branchFromLeague(0),
+  branchFromLeague(1),
+  branchFromLeague(2),
+  branchFromLeague(3),
+  branchFromLeague(4),
+]);
+
+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`);
+
+  leaderboard[index] = {
+    id: listing.spa_id,
+    score: listing.score,
+  };
+}
+
+const leaderboardJSON = JSON.stringify(leaderboard);
+
+if (publish) {
+  const octokit = new Octokit({ auth: env.GH_TOKEN });
+
+  const info = await fetch(
+    `https://${server}.wotblitz.com/en/api/rating-leaderboards/season/`,
+  ).then((response) => response.json() as Promise<RatingsInfo>);
+  const normalizedServer = server === 'na' ? 'com' : server;
+
+  const infoPath = `${normalizedServer}/ratings/${info.current_season}/info.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',
+    'main',
+    new Date().toString(),
+    [
+      { path: infoPath, content: infoJSON },
+      { path: leaderboardPath, content: leaderboardJSON },
+    ],
+  );
+} else {
+  console.log('Writing to disk...');
+  await rm('dist.json', { force: true });
+  await writeFile('dist.json', leaderboardJSON);
+}

scripts/commitMultipleFiles.ts

@@ -0,0 +1,70 @@
+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/bot.ts

@@ -1,9 +1,10 @@
+import { Octokit } from '@octokit/rest';
 import { Client, GatewayIntentBits } from 'discord.js';
-import { DISCORD_TOKEN } from './core/node/arguments.js';
-import { registerErrorHandlers } from './events/error.js';
-import guildMemberAdd from './events/guildMemberAdd.js';
-import interactionCreate from './events/interactionCreate/index.js';
-import ready from './events/ready.js';
+import { secrets } from './core/node/secrets';
+import { registerErrorHandlers } from './events/error';
+import guildMemberAdd from './events/guildMemberAdd';
+import interactionCreate from './events/interactionCreate';
+import ready from './events/ready';
 
 export const client = new Client({
   intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMembers],
@@ -12,5 +13,7 @@ export const client = new Client({
   .on('guildMemberAdd', guildMemberAdd)
   .on('interactionCreate', interactionCreate);
 
+export const octokit = new Octokit({ auth: secrets.GH_TOKEN });
+
 registerErrorHandlers();
-client.login(DISCORD_TOKEN);
+client.login(secrets.DISCORD_TOKEN);

src/commands/debug.ts

@@ -1,16 +1,16 @@
 import { SlashCommandBuilder } from 'discord.js';
 import packageJSON from '../../package.json' assert { type: 'json' };
-import { client } from '../bot.js';
-import { tankopedia } from '../core/blitz/tankopedia.js';
-import { tankAverages } from '../core/blitzstars/tankAverages.js';
-import embedInfo from '../core/discord/embedInfo.js';
-import markdownTable from '../core/discord/markdownTable.js';
-import getClientId from '../core/node/getClientId.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
+import { client } from '../bot';
+import { tankopedia } from '../core/blitz/tankopedia';
+import { tankAverages } from '../core/blitzstars/tankAverages';
+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();
 
-export default {
+export const debugCommand: CommandRegistry = {
   inProduction: true,
   inDevelopment: false,
   inPublic: true,
@@ -19,7 +19,7 @@ export default {
     .setName('debug')
     .setDescription('Debug information about the bot'),
 
-  handler(interaction) {
+  async handler(interaction) {
     const currentTime = new Date().getTime();
     const uptime = currentTime - executionStart;
 
@@ -37,9 +37,9 @@ export default {
             (uptime / 1000) % 60,
           )}s ${Math.floor(uptime % 1000)}ms`,
         ],
-        ['Tankopedia cached', `${tankopedia !== undefined}`],
-        ['Tank averages cached', `${tankAverages !== undefined}`],
+        ['Tankopedia cached', `${(await tankopedia) !== undefined}`],
+        ['Tank averages cached', `${(await tankAverages) !== undefined}`],
       ]),
     );
   },
-} satisfies CommandRegistry;
+};

src/commands/eligible.ts

@@ -1,20 +1,21 @@
 import { SlashCommandBuilder } from 'discord.js';
-import calculateWN8 from '../core/blitz/calculateWN8.js';
-import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import sumStats from '../core/blitz/sumStats.js';
-import { tankopedia } from '../core/blitz/tankopedia.js';
-import getPeriodNow from '../core/blitzstars/getPeriodNow.js';
-import getPeriodStart from '../core/blitzstars/getPeriodStart.js';
-import getTankStatsDiffed from '../core/blitzstars/getTankStatsDiffed.js';
-import { tankAverages } from '../core/blitzstars/tankAverages.js';
-import addUsernameChoices from '../core/discord/addUsernameChoices.js';
-import embedNegative from '../core/discord/embedNegative.js';
-import embedPositive from '../core/discord/embedPositive.js';
-import markdownTable, { TableInput } from '../core/discord/markdownTable.js';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand.js';
-import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
-import { AccountInfo } from '../types/accountInfo.js';
+import calculateWN8 from '../core/blitz/calculateWN8';
+import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import sumStats from '../core/blitz/sumStats';
+import { tankopedia } from '../core/blitz/tankopedia';
+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 { secrets } from '../core/node/secrets';
+import { CommandRegistry } from '../events/interactionCreate';
+import { AccountInfo } from '../types/accountInfo';
+import { PossiblyPromise } from '../types/possiblyPromise';
 
 export type SkilledClan = 'SKLLD' | 'SMRI';
 
@@ -23,7 +24,7 @@ export const SKILLED_CLANS: Record<SkilledClan, string> = {
   SMRI: 'Samurai',
 };
 
-export default {
+export const eligibleCommand: CommandRegistry = {
   inProduction: true,
   inDevelopment: false,
   inPublic: false,
@@ -48,9 +49,9 @@ export default {
 
   async handler(interaction) {
     const clan = interaction.options.getString('clan') as SkilledClan;
-    const { id, server } = await resolvePlayerFromCommand(interaction);
+    const { id, region: server } = await resolvePlayerFromCommand(interaction);
     const accountInfo = await getWargamingResponse<AccountInfo>(
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
+      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${secrets.WARGAMING_APPLICATION_ID}&account_id=${id}`,
     );
     const problems: TableInput = [];
     const title = `${accountInfo[id].nickname}'s eligibility for ${SKILLED_CLANS[clan]}`;
@@ -58,50 +59,80 @@ export default {
     let body = '';
 
     if (clan === 'SKLLD') {
-      const tankStatsOverTime = await getTankStatsDiffed(
+      const { diffed } = await getDiffedTankStats(
         server,
         id,
-        getPeriodStart('30'),
+        getTimeDaysAgo(server, 30),
         getPeriodNow(),
       );
-      const entries = Object.entries(tankStatsOverTime);
+      const entries = Object.entries(diffed);
       const stats = sumStats(entries.map(([, stats]) => stats));
       const averageTier =
-        entries.reduce((accumulator, [tankIdString, stats]) => {
-          const tankId = parseInt(tankIdString);
-          const tankTier = tankopedia[tankId].tier;
+        (await entries.reduce<PossiblyPromise<number>>(
+          async (accumulator, [tankIdString, stats]) => {
+            const tankId = parseInt(tankIdString);
+            const tankopediaEntry = (await tankopedia)[tankId];
 
-          return accumulator + tankTier * stats.battles;
-        }, 0) / stats.battles;
+            if (!tankopediaEntry) return accumulator;
+
+            const tankTier = tankopediaEntry.tier;
+
+            return (await accumulator) + tankTier * stats.battles;
+          },
+          0,
+        )) /
+        (await entries.reduce<PossiblyPromise<number>>(
+          async (accumulator, [tankIdString, stats]) => {
+            const tankId = parseInt(tankIdString);
+            const tankopediaEntry = (await tankopedia)[tankId];
+
+            if (!tankopediaEntry) return accumulator;
+
+            return stats.battles;
+          },
+          0,
+        ));
       const WN8 =
-        entries.reduce((accumulator, [tankIdString, stats]) => {
-          const tankId = parseInt(tankIdString);
+        (await entries.reduce<PossiblyPromise<number>>(
+          async (accumulator, [tankIdString, stats]) => {
+            const tankId = parseInt(tankIdString);
 
-          // edge case where new tanks don't have averages
-          if (tankAverages[tankId]) {
-            const tankWN8 = calculateWN8(tankAverages[tankId].all, stats);
+            // edge case where new tanks don't have averages
+            if ((await tankAverages)[tankId]) {
+              const tankWN8 = calculateWN8(
+                (await tankAverages)[tankId].all,
+                stats,
+              );
 
-            if (isNaN(tankWN8)) return accumulator;
-            return accumulator + tankWN8 * stats.battles;
-          } else return accumulator;
-        }, 0) / stats.battles;
+              if (isNaN(tankWN8)) return accumulator;
+              return (await accumulator) + tankWN8 * stats.battles;
+            } else return accumulator;
+          },
+          0,
+        )) / stats.battles;
       const tier10Damage =
-        entries.reduce((accumulator, [tankIdString, stats]) => {
-          const tankId = parseInt(tankIdString);
+        (await entries.reduce<PossiblyPromise<number>>(
+          async (accumulator, [tankIdString, stats]) => {
+            const tankId = parseInt(tankIdString);
 
-          if (tankopedia[tankId]?.tier === 10) {
-            const tankStats = tankStatsOverTime[tankId];
-            return accumulator + tankStats.damage_dealt;
-          } else return accumulator;
-        }, 0) /
-        entries.reduce((accumulator, [tankIdString, stats]) => {
-          const tankId = parseInt(tankIdString);
+            if ((await tankopedia)[tankId]?.tier === 10) {
+              const tankStats = diffed[tankId];
+              return (await accumulator) + tankStats.damage_dealt;
+            } else return accumulator;
+          },
+          0,
+        )) /
+        (await entries.reduce<PossiblyPromise<number>>(
+          async (accumulator, [tankIdString, stats]) => {
+            const tankId = parseInt(tankIdString);
 
-          if (tankopedia[tankId]?.tier === 10) {
-            const tankStats = tankStatsOverTime[tankId];
-            return accumulator + tankStats.battles;
-          } else return accumulator;
-        }, 0);
+            if ((await tankopedia)[tankId]?.tier === 10) {
+              const tankStats = diffed[tankId];
+              return (await accumulator) + tankStats.battles;
+            } else return accumulator;
+          },
+          0,
+        ));
 
       if (stats.battles < 126) {
         problems.push(['Battles', `${stats.battles} (${stats.battles - 126})`]);
@@ -169,4 +200,4 @@ export default {
 
     return (isEligible ? embedPositive : embedNegative)(title, body);
   },
-} satisfies CommandRegistry;
+};

src/commands/evolution.tsx

@@ -1,26 +1,26 @@
 import { SlashCommandBuilder } from 'discord.js';
-import { CYCLIC_API } from '../constants/cyclic.js';
-import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import resolveTankId from '../core/blitz/resolveTankId.js';
-import addStatTypeSubCommandGroups from '../core/discord/addStatTypeSubCommandGroups.js';
-import autocompleteTanks from '../core/discord/autocompleteTanks.js';
-import autocompleteUsername from '../core/discord/autocompleteUsername.js';
-import interactionToURL from '../core/discord/interactionToURL.js';
-import linkButton from '../core/discord/linkButton.js';
-import primaryButton from '../core/discord/primaryButton.js';
-import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton.js';
-import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand.js';
-import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton.js';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand.js';
-import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
-import evolution from '../renderers/evolution.js';
-import { StatType } from '../renderers/statsfull.js';
-import { AccountInfo } from '../types/accountInfo.js';
+import { CYCLIC_API } from '../constants/cyclic';
+import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import resolveTankId from '../core/blitz/resolveTankId';
+import addStatTypeSubCommandGroups from '../core/discord/addStatTypeSubCommandGroups';
+import autocompleteTanks from '../core/discord/autocompleteTanks';
+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 resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton';
+import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand';
+import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+import { secrets } from '../core/node/secrets';
+import { CommandRegistry } from '../events/interactionCreate';
+import evolution from '../renderers/evolution';
+import { StatType } from '../renderers/fullStats';
+import { AccountInfo } from '../types/accountInfo';
 
-export default {
+export const evolutionCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
+  inDevelopment: false,
   inPublic: true,
 
   command: addStatTypeSubCommandGroups(
@@ -34,14 +34,15 @@ export default {
       true,
     ) as StatType;
     const player = await resolvePlayerFromCommand(interaction);
-    const period = resolvePeriodFromCommand(interaction);
+    const period = resolvePeriodFromCommand(player.region, interaction);
     const tankIdRaw = interaction.options.getString('tank')!;
-    const tankId = commandGroup === 'tank' ? resolveTankId(tankIdRaw) : null;
+    const tankId =
+      commandGroup === 'tank' ? await resolveTankId(tankIdRaw) : null;
     const start = interaction.options.getInteger('start');
     const end = interaction.options.getInteger('end');
     const { nickname } = (
       await getWargamingResponse<AccountInfo>(
-        `https://api.wotblitz.${player.server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${player.id}`,
+        `https://api.wotblitz.${player.region}/wotb/account/info/?application_id=${secrets.WARGAMING_APPLICATION_ID}&account_id=${player.id}`,
       )
     )[player.id];
     const path = interactionToURL(interaction, {
@@ -56,7 +57,7 @@ export default {
       primaryButton(path, 'Refresh'),
       // linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
       linkButton(
-        `https://www.blitzstars.com/player/${player.server}/${nickname}${
+        `https://www.blitzstars.com/player/${player.region}/${nickname}${
           commandGroup === 'tank' ? `/tank/${tankId!}` : ''
         }`,
         'BlitzStars',
@@ -73,8 +74,8 @@ export default {
     const url = new URL(`${CYCLIC_API}/${interaction.customId}`);
     const path = url.pathname.split('/').filter(Boolean);
     const commandGroup = path[1] as StatType;
-    const period = resolvePeriodFromButton(interaction);
     const player = await resolvePlayerFromButton(interaction);
+    const period = resolvePeriodFromButton(player.region, interaction);
 
     return await evolution(
       commandGroup,
@@ -83,4 +84,4 @@ export default {
       parseInt(url.searchParams.get('tankId')!),
     );
   },
-} satisfies CommandRegistry;
+};

src/commands/fullStats.tsx

@@ -1,30 +1,30 @@
 import { SlashCommandBuilder } from 'discord.js';
-import { CYCLIC_API } from '../constants/cyclic.js';
-import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import resolveTankId from '../core/blitz/resolveTankId.js';
-import addStatTypeSubCommandGroups from '../core/discord/addStatTypeSubCommandGroups.js';
-import autocompleteTanks from '../core/discord/autocompleteTanks.js';
-import autocompleteUsername from '../core/discord/autocompleteUsername.js';
-import interactionToURL from '../core/discord/interactionToURL.js';
-import linkButton from '../core/discord/linkButton.js';
-import primaryButton from '../core/discord/primaryButton.js';
-import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton.js';
-import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand.js';
-import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton.js';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand.js';
-import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
-import statsfull, { StatType } from '../renderers/statsfull.js';
-import { AccountInfo } from '../types/accountInfo.js';
+import { CYCLIC_API } from '../constants/cyclic';
+import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import resolveTankId from '../core/blitz/resolveTankId';
+import addStatTypeSubCommandGroups from '../core/discord/addStatTypeSubCommandGroups';
+import autocompleteTanks from '../core/discord/autocompleteTanks';
+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 resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton';
+import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand';
+import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+import { secrets } from '../core/node/secrets';
+import { CommandRegistry } from '../events/interactionCreate';
+import fullStats, { StatType } from '../renderers/fullStats';
+import { AccountInfo } from '../types/accountInfo';
 
-export default {
+export const fullStatsCommand: CommandRegistry = {
   inProduction: true,
   inDevelopment: false,
   inPublic: true,
 
   command: addStatTypeSubCommandGroups(
     new SlashCommandBuilder()
-      .setName('statsfull')
+      .setName('fullstats')
       .setDescription('Full in-game statistics'),
   ),
 
@@ -33,9 +33,10 @@ export default {
       true,
     ) as StatType;
     const player = await resolvePlayerFromCommand(interaction);
-    const period = resolvePeriodFromCommand(interaction);
+    const period = resolvePeriodFromCommand(player.region, interaction);
     const tankIdRaw = interaction.options.getString('tank')!;
-    const tankId = commandGroup === 'tank' ? resolveTankId(tankIdRaw) : null;
+    const tankId =
+      commandGroup === 'tank' ? await resolveTankId(tankIdRaw) : null;
     const start = interaction.options.getInteger('start');
     const end = interaction.options.getInteger('end');
     const path = interactionToURL(interaction, {
@@ -46,16 +47,16 @@ export default {
     });
     const { nickname } = (
       await getWargamingResponse<AccountInfo>(
-        `https://api.wotblitz.${player.server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${player.id}`,
+        `https://api.wotblitz.${player.region}/wotb/account/info/?application_id=${secrets.WARGAMING_APPLICATION_ID}&account_id=${player.id}`,
       )
     )[player.id];
 
     return [
-      await statsfull(commandGroup, period, player, tankId),
+      await fullStats(commandGroup, period, player, tankId),
       primaryButton(path, 'Refresh'),
       // linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
       linkButton(
-        `https://www.blitzstars.com/player/${player.server}/${nickname}`,
+        `https://www.blitzstars.com/player/${player.region}/${nickname}`,
         'BlitzStars',
       ),
     ];
@@ -70,14 +71,14 @@ export default {
     const url = new URL(`${CYCLIC_API}/${interaction.customId}`);
     const path = url.pathname.split('/').filter(Boolean);
     const commandGroup = path[1] as StatType;
-    const period = resolvePeriodFromButton(interaction);
     const player = await resolvePlayerFromButton(interaction);
+    const period = resolvePeriodFromButton(player.region, interaction);
 
-    return await statsfull(
+    return await fullStats(
       commandGroup,
       period,
       player,
       parseInt(url.searchParams.get('tankId')!),
     );
   },
-} satisfies CommandRegistry;
+};

src/commands/help.ts

@@ -1,36 +1,66 @@
-import { SlashCommandBuilder } from 'discord.js';
-import discord from '../../discord.json' assert { type: 'json' };
-import { client } from '../bot.js';
-import embedInfo from '../core/discord/embedInfo.js';
 import {
-  CommandRegistry,
-  guildCommands,
-  publicCommands,
-} from '../events/interactionCreate/index.js';
+  SlashCommandBuilder,
+  SlashCommandSubcommandsOnlyBuilder,
+} from 'discord.js';
+import { COMMANDS_RAW, CommandRegistry } from '../events/interactionCreate';
 
-export default {
+const RAW_PATH = `https://raw.githubusercontent.com/tresabhi/blitzkrieg/main/docs/`;
+const DOCS = {
+  permissions: 'guide/permissions',
+  embeds: 'guide/embeds',
+  about: 'guide/about',
+  invite: 'guide/invite',
+  timezones: 'guide/timezones',
+};
+const DOC_DESCRIPTIONS: Record<keyof typeof DOCS, string> = {
+  permissions: 'The permissions needed for the bot to function',
+  embeds: 'How embeds work',
+  about: 'About the bot',
+  invite: 'How to invite the bot',
+  timezones: 'How Blitzkrieg infers and uses your timezone',
+};
+
+function addDocsSubcommands(option: SlashCommandSubcommandsOnlyBuilder) {
+  Object.entries(DOC_DESCRIPTIONS).forEach(([key, value]) => {
+    option.addSubcommand((sub) => sub.setName(key).setDescription(value));
+  });
+
+  return option;
+}
+
+export const helpCommand: CommandRegistry = {
   inProduction: true,
   inDevelopment: false,
   inPublic: true,
 
-  command: new SlashCommandBuilder()
-    .setName('help')
-    .setDescription('All the help you need about the bot'),
+  command: addDocsSubcommands(
+    new SlashCommandBuilder()
+      .setName('help')
+      .setDescription('All the help you need about the bot')
+      .addSubcommand((option) =>
+        option
+          .setName('commands')
+          .setDescription('List of all commands and their descriptions'),
+      ),
+  ),
 
   handler(interaction) {
-    return embedInfo(
-      `${client.user?.username} help`,
-      `**About**\n${
-        client.user?.username
-      } automates many mundane tasks and provide statistics in numerous flexible ways.\n\nMade by TresAbhi from the Skilled [SKLLD] clan.\nGitHub: https://github.com/tresabhi/blitzkrieg\nDiscord server: https://discord.gg/nDt7AjGJQH\nSkilled server: https://discord.gg/ZPvcEG7DS8\n\n**Commands**\n${(interaction.guildId ===
-      discord.sklld_guild_id
-        ? [...guildCommands, ...publicCommands]
-        : publicCommands
+    const subcommand = interaction.options.getSubcommand();
+
+    if (subcommand === 'commands') {
+      return `# Commands\n\nBlitzkrieg offers the following commands:\n\n${COMMANDS_RAW.filter(
+        (registry) => registry.inPublic && registry.inProduction,
       )
-        .map((command) => `**/${command.name}**: ${command.description}`)
-        .join(
-          '\n',
-        )}\n\n*I am a new bot; I may make mistakes and go offline unexpectedly from time to time.*`,
-    );
+        .map(
+          (registry) =>
+            `- \`/${registry.command.name}\`: ${registry.command.description}`,
+        )
+        .join('\n')}`;
+    }
+
+    const url = `${RAW_PATH}${DOCS[subcommand as keyof typeof DOCS]}.md`;
+    const content = fetch(url).then((response) => response.text());
+
+    return content;
   },
-} satisfies CommandRegistry;
+};

src/commands/inactive.tsx

@@ -1,22 +1,22 @@
 import { SlashCommandBuilder } from 'discord.js';
-import GenericStats from '../components/GenericStats/index.js';
-import NoData, { NoDataType } from '../components/NoData.js';
-import PoweredBy, { PoweredByType } from '../components/PoweredBy.js';
-import TitleBar from '../components/TitleBar.js';
-import Wrapper from '../components/Wrapper.js';
-import { BLITZ_SERVERS } from '../constants/servers.js';
-import getBlitzClan from '../core/blitz/getBlitzClan.js';
-import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import addClanChoices from '../core/discord/addClanChoices.js';
-import autocompleteClan from '../core/discord/autocompleteClan.js';
-import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
-import { AccountInfo } from '../types/accountInfo.js';
-import { ClanInfo } from '../types/clanInfo.js';
+import GenericStats from '../components/GenericStats';
+import NoData, { NoDataType } from '../components/NoData';
+import PoweredBy, { PoweredByType } from '../components/PoweredBy';
+import TitleBar from '../components/TitleBar';
+import Wrapper from '../components/Wrapper';
+import { REGION_NAMES } from '../constants/regions';
+import getBlitzClan from '../core/blitz/getBlitzClan';
+import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import addClanChoices from '../core/discord/addClanChoices';
+import autocompleteClan from '../core/discord/autocompleteClan';
+import { secrets } from '../core/node/secrets';
+import { CommandRegistry } from '../events/interactionCreate';
+import { AccountInfo } from '../types/accountInfo';
+import { ClanInfo } from '../types/clanInfo';
 
 const DEFAULT_THRESHOLD = 7;
 
-export default {
+export const inactiveCommand: CommandRegistry = {
   inProduction: true,
   inDevelopment: false,
   inPublic: true,
@@ -42,14 +42,14 @@ export default {
     const time = new Date().getTime() / 1000;
     const clanData = (
       await getWargamingResponse<ClanInfo>(
-        `https://api.wotblitz.${server}/wotb/clans/info/?application_id=${WARGAMING_APPLICATION_ID}&clan_id=${id}`,
+        `https://api.wotblitz.${server}/wotb/clans/info/?application_id=${secrets.WARGAMING_APPLICATION_ID}&clan_id=${id}`,
       )
     )[id];
     const memberIds = clanData.members_ids;
     const accounts = await getWargamingResponse<AccountInfo>(
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${memberIds.join(
-        ',',
-      )}`,
+      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${
+        secrets.WARGAMING_APPLICATION_ID
+      }&account_id=${memberIds.join(',')}`,
     );
     const inactive = memberIds
       .map((memberId) => {
@@ -72,7 +72,7 @@ export default {
           nameDiscriminator="(Inactivity)"
           image={`https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanData.emblem_set_id}.png`}
           description={`${threshold}+ Days • ${new Date().toDateString()} • ${
-            BLITZ_SERVERS[server]
+            REGION_NAMES[server]
           }`}
         />
 
@@ -85,4 +85,4 @@ export default {
   },
 
   autocomplete: autocompleteClan,
-} satisfies CommandRegistry;
+};

src/commands/ownedTanks.tsx

@@ -1,24 +1,26 @@
 import { SlashCommandBuilder } from 'discord.js';
-import NoData, { NoDataType } from '../components/NoData.js';
-import PoweredBy, { PoweredByType } from '../components/PoweredBy.js';
-import * as Tanks from '../components/Tanks/index.js';
-import TitleBar from '../components/TitleBar.js';
-import Wrapper from '../components/Wrapper.js';
-import { BLITZ_SERVERS } from '../constants/servers.js';
-import getTankStats from '../core/blitz/getTankStats.js';
-import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
+import NoData, { NoDataType } from '../components/NoData';
+import PoweredBy, { PoweredByType } from '../components/PoweredBy';
+import * as Tanks from '../components/Tanks';
+import TitleBar from '../components/TitleBar';
+import Wrapper from '../components/Wrapper';
+import { REGION_NAMES } from '../constants/regions';
+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 {
   TIER_ROMAN_NUMERALS,
   Tier,
   tankopedia,
-} from '../core/blitz/tankopedia.js';
-import addUsernameChoices from '../core/discord/addUsernameChoices.js';
-import autocompleteUsername from '../core/discord/autocompleteUsername.js';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand.js';
-import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
-import { AccountInfo } from '../types/accountInfo.js';
-import { PlayerClanData } from '../types/playerClanData.js';
+} from '../core/blitz/tankopedia';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import autocompleteUsername from '../core/discord/autocompleteUsername';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+import { secrets } from '../core/node/secrets';
+import { CommandRegistry } from '../events/interactionCreate';
+import { AccountInfo } from '../types/accountInfo';
+import { PlayerClanData } from '../types/playerClanData';
 
 const COMP_TANKS = [
   // light tanks
@@ -41,7 +43,7 @@ const COMP_TANKS = [
   6753, // type 71
 ];
 
-export default {
+export const ownedTanksCommand: CommandRegistry = {
   inProduction: true,
   inDevelopment: false,
   inPublic: true,
@@ -72,21 +74,28 @@ export default {
   async handler(interaction) {
     const tier = Number(interaction.options.getString('tier'));
     const account = await resolvePlayerFromCommand(interaction);
-    const { id, server } = account;
+    const { id, region: server } = account;
     const accountInfo = await getWargamingResponse<AccountInfo>(
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
+      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${secrets.WARGAMING_APPLICATION_ID}&account_id=${id}`,
     );
     const tankStats = await getTankStats(server, id);
-    const tanks = tankStats
-      .map((tankData) => tankopedia[tankData.tank_id])
-      .filter((tank) => tank?.tier === tier);
+    const tanks = (
+      await Promise.all(
+        tankStats.map(async (tankData) => ({
+          ...(await tankopedia)[tankData.tank_id],
+          tank_id: tankData.tank_id,
+        })),
+      )
+    ).filter((tank) => tank?.tier === tier);
     const clanData = await getWargamingResponse<PlayerClanData>(
-      `https://api.wotblitz.${server}/wotb/clans/accountinfo/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}&extra=clan`,
+      `https://api.wotblitz.${server}/wotb/clans/accountinfo/?application_id=${secrets.WARGAMING_APPLICATION_ID}&account_id=${id}&extra=clan`,
     );
+    const leftColumnSize = Math.ceil(tanks.length / 2);
+    const leftColumn = tanks.slice(0, leftColumnSize);
+    const rightColumn = tanks.slice(leftColumnSize);
 
     return (
       <Wrapper>
-        {/* TODO: integrate some of these into title bar */}
         <TitleBar
           name={accountInfo[id].nickname}
           nameDiscriminator={`(Tier ${TIER_ROMAN_NUMERALS[tier as Tier]})`}
@@ -96,7 +105,7 @@ export default {
               : undefined
           }
           description={`Owned tanks • ${new Date().toDateString()} • ${
-            BLITZ_SERVERS[server]
+            REGION_NAMES[server]
           }`}
         />
 
@@ -104,14 +113,32 @@ export default {
 
         {tanks.length > 0 && (
           <Tanks.Root>
-            {tanks.map((tank) => (
-              <Tanks.Item
-                key={tank.tank_id}
-                name={tank.name}
-                type={tank.type}
-                icon={tank.images.normal}
-              />
-            ))}
+            <Tanks.Column>
+              {await Promise.all(
+                leftColumn.map(async (tank) => (
+                  <Tanks.Item
+                    key={tank.tank_id}
+                    name={await resolveTankName(tank.tank_id)}
+                    tankType={tank.type}
+                    image={tank.images?.normal}
+                    treeType={await getTreeType(tank.tank_id)}
+                  />
+                )),
+              )}
+            </Tanks.Column>
+            <Tanks.Column>
+              {await Promise.all(
+                rightColumn.map(async (tank) => (
+                  <Tanks.Item
+                    key={tank.tank_id}
+                    name={await resolveTankName(tank.tank_id)}
+                    tankType={tank.type}
+                    image={tank.images?.normal}
+                    treeType={await getTreeType(tank.tank_id)}
+                  />
+                )),
+              )}
+            </Tanks.Column>
           </Tanks.Root>
         )}
 
@@ -121,4 +148,4 @@ export default {
   },
 
   autocomplete: autocompleteUsername,
-} satisfies CommandRegistry;
+};

src/commands/ping.ts

@@ -1,7 +1,7 @@
 import { SlashCommandBuilder } from 'discord.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
+import { CommandRegistry } from '../events/interactionCreate';
 
-export default {
+export const pingCommand: CommandRegistry<true> = {
   inProduction: true,
   inDevelopment: false,
   inPublic: true,
@@ -30,4 +30,4 @@ export default {
     const executionTime = Date.now() - executionStart;
     interaction.editReply(`Pong 🏓 - ${executionTime}ms`);
   },
-} satisfies CommandRegistry<true>;
+};

src/commands/playerAchievements.ts

@@ -1,22 +1,20 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { startCase } from 'lodash';
 import markdownEscape from 'markdown-escape';
-import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import addUsernameChoices from '../core/discord/addUsernameChoices.js';
-import autocompleteUsername from '../core/discord/autocompleteUsername.js';
-import embedInfo from '../core/discord/embedInfo.js';
-import markdownTable, {
-  TableInputEntry,
-} from '../core/discord/markdownTable.js';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand.js';
-import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
-import { AccountAchievements } from '../types/accountAchievements.js';
-import { AccountInfo } from '../types/accountInfo.js';
+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, { TableInputEntry } from '../core/discord/markdownTable';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+import { secrets } from '../core/node/secrets';
+import { CommandRegistry } from '../events/interactionCreate';
+import { AccountAchievements } from '../types/accountAchievements';
+import { AccountInfo } from '../types/accountInfo';
 
 type SortBy = 'name' | 'count';
 
-export default {
+export const playerAchievementsCommand: CommandRegistry = {
   inProduction: true,
   inDevelopment: false,
   inPublic: true,
@@ -38,13 +36,13 @@ export default {
   async handler(interaction) {
     const sortBy = (interaction.options.getString('sort') ?? 'name') as SortBy;
     const account = await resolvePlayerFromCommand(interaction);
-    const { id, server } = account;
+    const { id, region: server } = account;
     const accounts = await getWargamingResponse<AccountInfo>(
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
+      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${secrets.WARGAMING_APPLICATION_ID}&account_id=${id}`,
     );
     const accountsAchievements =
       await getWargamingResponse<AccountAchievements>(
-        `https://api.wotblitz.${server}/wotb/account/achievements/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
+        `https://api.wotblitz.${server}/wotb/account/achievements/?application_id=${secrets.WARGAMING_APPLICATION_ID}&account_id=${id}`,
       );
     const accountAchievements = accountsAchievements[id];
     const compound = {
@@ -75,4 +73,4 @@ export default {
   },
 
   autocomplete: autocompleteUsername,
-} satisfies CommandRegistry;
+};

src/commands/playerInfo.ts

@@ -1,16 +1,16 @@
 import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import addUsernameChoices from '../core/discord/addUsernameChoices.js';
-import autocompleteUsername from '../core/discord/autocompleteUsername.js';
-import embedInfo from '../core/discord/embedInfo.js';
-import markdownTable from '../core/discord/markdownTable.js';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand.js';
-import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
-import { AccountInfo } from '../types/accountInfo.js';
+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 { secrets } from '../core/node/secrets';
+import { CommandRegistry } from '../events/interactionCreate';
+import { AccountInfo } from '../types/accountInfo';
 
-export default {
+export const playerInfoCommand: CommandRegistry = {
   inProduction: true,
   inDevelopment: false,
   inPublic: true,
@@ -22,9 +22,9 @@ export default {
 
   async handler(interaction) {
     const account = await resolvePlayerFromCommand(interaction);
-    const { id, server } = account;
+    const { id, region: server } = account;
     const accounts = await getWargamingResponse<AccountInfo>(
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
+      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${secrets.WARGAMING_APPLICATION_ID}&account_id=${id}`,
     );
     const accountInfo = accounts[id];
 
@@ -57,4 +57,4 @@ export default {
   },
 
   autocomplete: autocompleteUsername,
-} satisfies CommandRegistry;
+};

src/commands/ratings.tsx

@@ -0,0 +1,262 @@
+import { SlashCommandBuilder, SlashCommandSubcommandBuilder } from 'discord.js';
+import { BlitzkriegRatingsLeaderboard } from '../../scripts/buildRatingsLeaderboard';
+import { octokit } from '../bot';
+import * as Leaderboard from '../components/Leaderboard';
+import TitleBar from '../components/TitleBar';
+import Wrapper from '../components/Wrapper';
+import { REGION_NAMES, Region } from '../constants/regions';
+import regionToRegionSubdomain from '../core/blitz/regionToRegionSubdomain';
+import addRegionChoices from '../core/discord/addRegionChoices';
+import { CommandRegistry } from '../events/interactionCreate';
+
+export interface RatingsPlayer {
+  spa_id: number;
+  mmr: number;
+  season_number: number;
+  calibrationBattlesLeft: number;
+  number: number;
+  percentile: number;
+  skip: boolean;
+  updated_at: string;
+  score: number;
+  nickname: string;
+  clan_tag: string;
+}
+
+export interface LeagueTop {
+  result: RatingsPlayer[];
+}
+
+export type RatingsReward = {
+  from_position: number;
+  to_position: number;
+  count: number;
+} & (
+  | {
+      type: 'vehicle';
+
+      vehicle: {
+        id: number;
+        name: string;
+        nation: string;
+        subnation: string;
+        use_subnation_flag: boolean;
+        type_slug: string;
+        level: number;
+        roman_level: string;
+        user_string: string;
+        image_url: string;
+        preview_url: string;
+        is_premium: boolean;
+        is_collectible: boolean;
+      };
+    }
+  | {
+      type: 'stuff';
+
+      stuff: {
+        name: string;
+        count: number;
+        title: string;
+        image_url: string;
+        type: string;
+
+        sizes: {};
+      };
+    }
+);
+
+export interface RatingsLeague {
+  title: string;
+  small_icon: string;
+  big_icon: string;
+  background: string;
+  index: number;
+  percentile: number;
+}
+
+export interface RatingsInfo {
+  title: string;
+  icon: string | null;
+  start_at: string;
+  finish_at: string;
+  current_season: number;
+  updated_at: string;
+  count: number;
+
+  rewards: RatingsReward[];
+  leagues: RatingsLeague[];
+}
+
+export interface RatingsNeighbors {
+  neighbors: RatingsPlayer[];
+}
+
+console.log('Caching ratings info...');
+const ratingsInfo = fetch(
+  'https://na.wotblitz.com/en/api/rating-leaderboards/season/',
+)
+  .then((response) => response.json() as Promise<RatingsInfo>)
+  .then((info) => {
+    console.log('Cached ratings info');
+    return info;
+  });
+
+function optionalParameters(option: SlashCommandSubcommandBuilder) {
+  return option
+    .addStringOption(addRegionChoices)
+    .addIntegerOption((option) =>
+      option
+        .setName('limit')
+        .setDescription('How many rows to display (default: 10)')
+        .setRequired(false)
+        .setMinValue(5)
+        .setMaxValue(30),
+    );
+}
+
+const LEAGUE_INDEXES = ['diamond', 'platinum', 'gold', 'silver', 'bronze'];
+
+export const DATABASE_REPO = { owner: 'tresabhi', repo: 'blitzkrieg-db' };
+
+export const ratingsCommand: CommandRegistry = {
+  inProduction: true,
+  inDevelopment: true,
+  inPublic: true,
+  inPreview: true,
+
+  command: new SlashCommandBuilder()
+    .setName('ratings')
+    .setDescription('Ratings battles statistics')
+    .addSubcommandGroup((option) =>
+      option
+        .setName('league')
+        .setDescription('Top league players')
+        .addSubcommand((option) =>
+          optionalParameters(
+            option
+              .setName('diamond')
+              .setDescription('Top Diamond League players'),
+          ),
+        )
+        .addSubcommand((option) =>
+          optionalParameters(
+            option
+              .setName('platinum')
+              .setDescription('Top Platinum League players'),
+          ),
+        )
+        .addSubcommand((option) =>
+          optionalParameters(
+            option.setName('gold').setDescription('Top Gold League players'),
+          ),
+        )
+        .addSubcommand((option) =>
+          optionalParameters(
+            option
+              .setName('silver')
+              .setDescription('Top Silver League players'),
+          ),
+        )
+        .addSubcommand((option) =>
+          optionalParameters(
+            option
+              .setName('bronze')
+              .setDescription('Top Bronze League players'),
+          ),
+        ),
+    ),
+
+  async handler(interaction) {
+    const subcommandGroup = interaction.options.getSubcommandGroup(true);
+
+    if (subcommandGroup === 'league') {
+      const limit = interaction.options.getInteger('limit') ?? 10;
+      const subcommand = interaction.options.getSubcommand(true);
+      const leagueIndex = LEAGUE_INDEXES.indexOf(subcommand);
+      const region = interaction.options.getString('region') as Region;
+      const regionSubdomain = regionToRegionSubdomain(region);
+      const result = await fetch(
+        `https://${regionSubdomain}.wotblitz.com/en/api/rating-leaderboards/league/${leagueIndex}/top/`,
+      )
+        .then((response) => response.json() as Promise<LeagueTop>)
+        .then(({ result }) => result.slice(0, limit));
+      const awaitedInfo = await ratingsInfo;
+      const leagueInfo = awaitedInfo.leagues[leagueIndex];
+      const midnightLeaderboard = await octokit.repos
+        .getContent({
+          ...DATABASE_REPO,
+          path: `${region}/ratings/${awaitedInfo.current_season}/midnight.json`,
+        })
+        .then(({ data }) => {
+          if (!Array.isArray(data) && data.type === 'file') {
+            const content = Buffer.from(data.content, 'base64').toString();
+            const jsonContent = JSON.parse(
+              content,
+            ) as BlitzkriegRatingsLeaderboard;
+
+            return jsonContent;
+          }
+        })
+        .catch(() => console.warn('No midnight leaderboard found'));
+      const items = await Promise.all(
+        result.map(async (player) => {
+          const reward = awaitedInfo.rewards.find(
+            (reward) =>
+              player.number >= reward.from_position &&
+              player.number <= reward.to_position,
+          );
+          const midnightIndex = midnightLeaderboard?.findIndex(
+            (item) => item.id === player.spa_id,
+          );
+          const midnightScore =
+            midnightIndex === undefined
+              ? player.score
+              : midnightLeaderboard![midnightIndex].score;
+          const midnightPosition =
+            midnightIndex === undefined ? player.number : midnightIndex + 1;
+
+          return (
+            <Leaderboard.Item
+              nickname={player.nickname}
+              score={player.score}
+              position={player.number}
+              clan={player.clan_tag}
+              reward={reward}
+              deltaScore={player.score - midnightScore}
+              deltaPosition={midnightPosition - player.number}
+              key={player.spa_id}
+            />
+          );
+        }),
+      );
+
+      const playersBefore = result[0].number - 1;
+      const playersAfter = awaitedInfo.count - result[result.length - 1].number;
+
+      return (
+        <Wrapper>
+          <TitleBar
+            name={leagueInfo.title}
+            image={
+              leagueInfo.big_icon.startsWith('http')
+                ? leagueInfo.big_icon
+                : `https:${leagueInfo.big_icon}`
+            }
+            description={`Top ${limit} players • ${new Date().toDateString()} • ${
+              REGION_NAMES[region]
+            }`}
+          />
+
+          <Leaderboard.Root>
+            {playersBefore > 0 && <Leaderboard.Gap number={playersBefore} />}
+            {items}
+            {playersAfter > 0 && <Leaderboard.Gap number={playersAfter} />}
+          </Leaderboard.Root>
+        </Wrapper>
+      );
+    }
+
+    return [];
+  },
+};

src/commands/searchClans.ts

@@ -1,15 +1,15 @@
 import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import { BLITZ_SERVERS, BlitzServer } from '../constants/servers.js';
-import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import addClanChoices from '../core/discord/addClanChoices.js';
-import addServerChoices from '../core/discord/addServerChoices.js';
-import embedInfo from '../core/discord/embedInfo.js';
-import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
-import { ClanList } from '../types/clanList.js';
+import { REGION_NAMES, Region } from '../constants/regions';
+import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import addClanChoices from '../core/discord/addClanChoices';
+import addRegionChoices from '../core/discord/addRegionChoices';
+import embedInfo from '../core/discord/embedInfo';
+import { secrets } from '../core/node/secrets';
+import { CommandRegistry } from '../events/interactionCreate';
+import { ClanList } from '../types/clanList';
 
-export default {
+export const searchClansCommand: CommandRegistry = {
   inProduction: true,
   inDevelopment: false,
   inPublic: true,
@@ -17,7 +17,7 @@ export default {
   command: new SlashCommandBuilder()
     .setName('searchclans')
     .setDescription('Search clans')
-    .addStringOption(addServerChoices)
+    .addStringOption(addRegionChoices)
     .addStringOption((option) => addClanChoices(option).setAutocomplete(false))
     .addIntegerOption((option) =>
       option
@@ -28,15 +28,15 @@ export default {
     ),
 
   async handler(interaction) {
-    const server = interaction.options.getString('server') as BlitzServer;
+    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>(
-      `https://api.wotblitz.${server}/wotb/clans/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${clan}&limit=${limit}`,
+      `https://api.wotblitz.${server}/wotb/clans/list/?application_id=${secrets.WARGAMING_APPLICATION_ID}&search=${clan}&limit=${limit}`,
     );
 
     return embedInfo(
-      `Clan search for "${markdownEscape(clan)}" in ${BLITZ_SERVERS[server]}`,
+      `Clan search for "${markdownEscape(clan)}" in ${REGION_NAMES[server]}`,
       clanList.length === 0
         ? 'No clans found.'
         : `\`\`\`\n${clanList
@@ -44,4 +44,4 @@ export default {
             .join('\n')}\n\`\`\``,
     );
   },
-} satisfies CommandRegistry;
+};

src/commands/searchPlayers.ts

@@ -1,16 +1,16 @@
 import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import { BLITZ_SERVERS, BlitzServer } from '../constants/servers.js';
-import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import { usernamePattern } from '../core/blitz/listPlayers.js';
-import addServerChoices from '../core/discord/addServerChoices.js';
-import addUsernameChoices from '../core/discord/addUsernameChoices.js';
-import embedInfo from '../core/discord/embedInfo.js';
-import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
-import { AccountList } from '../types/accountList.js';
+import { REGION_NAMES, Region } from '../constants/regions';
+import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import { usernamePattern } from '../core/blitz/listPlayers';
+import addRegionChoices from '../core/discord/addRegionChoices';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import embedInfo from '../core/discord/embedInfo';
+import { secrets } from '../core/node/secrets';
+import { CommandRegistry } from '../events/interactionCreate';
+import { AccountList } from '../types/accountList';
 
-export default {
+export const searchPlayersCommand: CommandRegistry = {
   inProduction: true,
   inDevelopment: false,
   inPublic: true,
@@ -18,7 +18,7 @@ export default {
   command: new SlashCommandBuilder()
     .setName('searchplayers')
     .setDescription('Search players in a Blitz server')
-    .addStringOption(addServerChoices)
+    .addStringOption(addRegionChoices)
     .addStringOption((option) =>
       addUsernameChoices(option).setAutocomplete(false).setRequired(true),
     )
@@ -31,20 +31,20 @@ export default {
     ),
 
   async handler(interaction) {
-    const server = interaction.options.getString('server') as BlitzServer;
+    const server = interaction.options.getString('region') as Region;
     const name = interaction.options.getString('username')!;
     const limit = interaction.options.getInteger('limit') ?? 25;
     const trimmedSearch = name.trim();
     const players = usernamePattern.test(trimmedSearch)
       ? await getWargamingResponse<AccountList>(
-          `https://api.wotblitz.${server}/wotb/account/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${encodeURIComponent(
-            trimmedSearch,
-          )}&limit=${limit}`,
+          `https://api.wotblitz.${server}/wotb/account/list/?application_id=${
+            secrets.WARGAMING_APPLICATION_ID
+          }&search=${encodeURIComponent(trimmedSearch)}&limit=${limit}`,
         )
       : [];
 
     return embedInfo(
-      `Player search for "${markdownEscape(name)}" in ${BLITZ_SERVERS[server]}`,
+      `Player search for "${markdownEscape(name)}" in ${REGION_NAMES[server]}`,
       `\`\`\`${
         players.length === 0
           ? 'No players found.'
@@ -52,4 +52,4 @@ export default {
       }\`\`\``,
     );
   },
-} satisfies CommandRegistry;
+};

src/commands/searchTanks.ts

@@ -1,12 +1,12 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { go } from 'fuzzysort';
 import markdownEscape from 'markdown-escape';
-import { TANK_NAMES } from '../core/blitz/tankopedia.js';
-import addTankChoices from '../core/discord/addTankChoices.js';
-import embedInfo from '../core/discord/embedInfo.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
+import { TANK_NAMES } from '../core/blitz/tankopedia';
+import addTankChoices from '../core/discord/addTankChoices';
+import embedInfo from '../core/discord/embedInfo';
+import { CommandRegistry } from '../events/interactionCreate';
 
-export default {
+export const searchTanksCommand: CommandRegistry = {
   inProduction: true,
   inDevelopment: false,
   inPublic: true,
@@ -26,7 +26,7 @@ export default {
   async handler(interaction) {
     const tank = interaction.options.getString('tank')!;
     const limit = interaction.options.getInteger('limit') ?? 25;
-    const results = go(tank, TANK_NAMES, { limit }).map(
+    const results = go(tank, await TANK_NAMES, { limit }).map(
       (result) => result.target,
     );
 
@@ -37,4 +37,4 @@ export default {
         : `\`\`\`\n${results.join('\n')}\n\`\`\``,
     );
   },
-} satisfies CommandRegistry;
+};

src/commands/stats.tsx

@@ -1,32 +1,32 @@
 import { SlashCommandBuilder } from 'discord.js';
-import { CYCLIC_API } from '../constants/cyclic.js';
-import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import resolveTankId from '../core/blitz/resolveTankId.js';
-import addStatTypeSubCommandGroups from '../core/discord/addStatTypeSubCommandGroups.js';
-import autocompleteTanks from '../core/discord/autocompleteTanks.js';
-import autocompleteUsername from '../core/discord/autocompleteUsername.js';
-import interactionToURL from '../core/discord/interactionToURL.js';
-import linkButton from '../core/discord/linkButton.js';
-import primaryButton from '../core/discord/primaryButton.js';
-import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton.js';
-import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand.js';
-import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton.js';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand.js';
-import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
-import stats from '../renderers/stats.js';
-import { StatType } from '../renderers/statsfull.js';
-import { AccountInfo } from '../types/accountInfo.js';
+import { CYCLIC_API } from '../constants/cyclic';
+import getWargamingResponse from '../core/blitz/getWargamingResponse';
+import resolveTankId from '../core/blitz/resolveTankId';
+import addStatTypeSubCommandGroups from '../core/discord/addStatTypeSubCommandGroups';
+import autocompleteTanks from '../core/discord/autocompleteTanks';
+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 resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton';
+import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand';
+import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+import { secrets } from '../core/node/secrets';
+import { CommandRegistry } from '../events/interactionCreate';
+import { StatType } from '../renderers/fullStats';
+import stats from '../renderers/stats';
+import { AccountInfo } from '../types/accountInfo';
 
-export default {
+export const statsCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
+  inDevelopment: false,
   inPublic: true,
 
   command: addStatTypeSubCommandGroups(
     new SlashCommandBuilder()
       .setName('stats')
-      .setDescription('In-game statistics'),
+      .setDescription('Regular battles statistics'),
   ),
 
   async handler(interaction) {
@@ -34,9 +34,10 @@ export default {
       true,
     ) as StatType;
     const player = await resolvePlayerFromCommand(interaction);
-    const period = resolvePeriodFromCommand(interaction);
+    const period = resolvePeriodFromCommand(player.region, interaction);
     const tankIdRaw = interaction.options.getString('tank')!;
-    const tankId = commandGroup === 'tank' ? resolveTankId(tankIdRaw) : null;
+    const tankId =
+      commandGroup === 'tank' ? await resolveTankId(tankIdRaw) : null;
     const start = interaction.options.getInteger('start');
     const end = interaction.options.getInteger('end');
     const path = interactionToURL(interaction, {
@@ -47,7 +48,7 @@ export default {
     });
     const { nickname } = (
       await getWargamingResponse<AccountInfo>(
-        `https://api.wotblitz.${player.server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${player.id}`,
+        `https://api.wotblitz.${player.region}/wotb/account/info/?application_id=${secrets.WARGAMING_APPLICATION_ID}&account_id=${player.id}`,
       )
     )[player.id];
 
@@ -56,7 +57,7 @@ export default {
       primaryButton(path, 'Refresh'),
       linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
       linkButton(
-        `https://www.blitzstars.com/player/${player.server}/${nickname}`,
+        `https://www.blitzstars.com/player/${player.region}/${nickname}`,
         'BlitzStars',
       ),
     ];
@@ -71,8 +72,8 @@ export default {
     const url = new URL(`${CYCLIC_API}/${interaction.customId}`);
     const path = url.pathname.split('/').filter(Boolean);
     const commandGroup = path[1] as StatType;
-    const period = resolvePeriodFromButton(interaction);
     const player = await resolvePlayerFromButton(interaction);
+    const period = resolvePeriodFromButton(player.region, interaction);
 
     return await stats(
       commandGroup,
@@ -81,4 +82,4 @@ export default {
       parseInt(url.searchParams.get('tankId')!),
     );
   },
-} satisfies CommandRegistry;
+};

src/commands/today.tsx

@@ -1,18 +1,19 @@
 import { SlashCommandBuilder } from 'discord.js';
-import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import addUsernameChoices from '../core/discord/addUsernameChoices.js';
-import autocompleteUsername from '../core/discord/autocompleteUsername.js';
-import interactionToURL from '../core/discord/interactionToURL.js';
-import linkButton from '../core/discord/linkButton.js';
-import primaryButton from '../core/discord/primaryButton.js';
-import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton.js';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand.js';
-import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
-import today from '../renderers/today.js';
-import { AccountInfo } from '../types/accountInfo.js';
+import { CYCLIC_API } from '../constants/cyclic';
+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 { secrets } from '../core/node/secrets';
+import { CommandRegistry } from '../events/interactionCreate';
+import today from '../renderers/today';
+import { AccountInfo } from '../types/accountInfo';
 
-export default {
+export const todayCommand: CommandRegistry = {
   inProduction: true,
   inDevelopment: false,
   inPublic: true,
@@ -20,23 +21,33 @@ export default {
   command: new SlashCommandBuilder()
     .setName('today')
     .setDescription('A general daily breakdown of your performance')
-    .addStringOption(addUsernameChoices),
+    .addStringOption(addUsernameChoices)
+    .addIntegerOption((option) =>
+      option
+        .setName('limit')
+        .setDescription(
+          'The maximum number of tanks to display (default: Infinity)',
+        )
+        .setRequired(false)
+        .setMinValue(1),
+    ),
 
   async handler(interaction) {
     const player = await resolvePlayerFromCommand(interaction);
+    const limit = interaction.options.getInteger('limit') ?? Infinity;
     const { nickname } = (
       await getWargamingResponse<AccountInfo>(
-        `https://api.wotblitz.${player.server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${player.id}`,
+        `https://api.wotblitz.${player.region}/wotb/account/info/?application_id=${secrets.WARGAMING_APPLICATION_ID}&account_id=${player.id}`,
       )
     )[player.id];
     const path = interactionToURL(interaction, player);
 
     return [
-      await today(player),
+      await today(player, limit, false),
       primaryButton(path, 'Refresh'),
-      // linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
+      linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
       linkButton(
-        `https://www.blitzstars.com/player/${player.server}/${nickname}`,
+        `https://www.blitzstars.com/player/${player.region}/${nickname}`,
         'BlitzStars',
       ),
     ];
@@ -49,4 +60,4 @@ export default {
 
     return await today(player);
   },
-} satisfies CommandRegistry;
+};

src/commands/verify.ts

@@ -1,18 +1,18 @@
 import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import discord from '../../discord.json' assert { type: 'json' };
-import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import addUsernameChoices from '../core/discord/addUsernameChoices.js';
-import autocompleteUsername from '../core/discord/autocompleteUsername.js';
-import embedNegative from '../core/discord/embedNegative.js';
-import embedPositive from '../core/discord/embedPositive.js';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand.js';
-import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
-import { CommandRegistry } from '../events/interactionCreate/index.js';
-import { AccountInfo } from '../types/accountInfo.js';
-import { PlayerClanData } from '../types/playerClanData.js';
+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 { secrets } from '../core/node/secrets';
+import { CommandRegistry } from '../events/interactionCreate';
+import { AccountInfo } from '../types/accountInfo';
+import { PlayerClanData } from '../types/playerClanData';
 
-export default {
+export const verifyCommand: CommandRegistry = {
   inProduction: true,
   inDevelopment: false,
   inPublic: true,
@@ -24,12 +24,12 @@ export default {
 
   async handler(interaction) {
     const blitzAccount = await resolvePlayerFromCommand(interaction);
-    const { id, server } = blitzAccount;
+    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}`,
+      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${secrets.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`,
+      `https://api.wotblitz.${server}/wotb/clans/accountinfo/?application_id=${secrets.WARGAMING_APPLICATION_ID}&account_id=${id}&extra=clan`,
     );
     const clan = clanData[id]?.clan;
     const clanTag = clan ? ` [${clan!.tag}]` : '';
@@ -80,4 +80,4 @@ export default {
   },
 
   autocomplete: autocompleteUsername,
-} satisfies CommandRegistry;
+};

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

@@ -1,6 +1,6 @@
-import { Percentile } from '../../../../../constants/percentiles.js';
-import hslToHex from '../../../../../core/node/hslToHex.js';
-import { PERCENTILE_COLORS } from '../../../../PercentileIndicator.js';
+import { Percentile } from '../../../../../constants/percentiles';
+import hslToHex from '../../../../../core/node/hslToHex';
+import { PERCENTILE_COLORS } from '../../../../PercentileIndicator';
 
 export enum GlowSide {
   Top,

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

@@ -1,8 +1,8 @@
-import { Percentile } from '../../../../constants/percentiles.js';
-import getWN8Percentile from '../../../../core/blitz/getWN8Percentile.js';
-import { theme } from '../../../../stitches.config.js';
-import { PERCENTILE_COLORS } from '../../../PercentileIndicator.js';
-import { Glow, GlowSide } from './components/Glow.js';
+import { Percentile } from '../../../../constants/percentiles';
+import getWN8Percentile from '../../../../core/blitz/getWN8Percentile';
+import { theme } from '../../../../stitches.config';
+import { PERCENTILE_COLORS } from '../../../PercentileIndicator';
+import { Glow, GlowSide } from './components/Glow';
 
 export interface WN8DisplayProps {
   WN8?: number;

src/components/AllStatsOverview/components/WN8SurroundingStat.tsx

@@ -1,4 +1,4 @@
-import { theme } from '../../../stitches.config.js';
+import { theme } from '../../../stitches.config';
 
 export enum WN8SurroundingStatAlign {
   Left,

src/components/AllStatsOverview/index.tsx

@@ -1,9 +1,9 @@
-import { AllStats, SupplementaryStats } from '../../types/accountInfo.js';
-import { WN8Display } from './components/WN8Display/index.js';
+import { AllStats, SupplementaryStats } from '../../types/accountInfo';
+import { WN8Display } from './components/WN8Display';
 import {
   WN8SurroundingStat,
   WN8SurroundingStatAlign,
-} from './components/WN8SurroundingStat.js';
+} from './components/WN8SurroundingStat';
 
 export interface AllStatsOverviewProps {
   stats: AllStats;
@@ -69,7 +69,9 @@ export default function AllStatsOverview({
       >
         <WN8SurroundingStat
           label="Tier"
-          value={supplementaryStats.tier.toFixed(2)}
+          value={
+            supplementaryStats.tier ? supplementaryStats.tier.toFixed(2) : '--'
+          }
         />
         <WN8SurroundingStat
           label="Survival"

src/components/Breakdown/components/Root.tsx

@@ -6,7 +6,7 @@ export interface RootProps {
 
 export function Root({ children }: RootProps) {
   return (
-    <div style={{ display: 'flex', flexDirection: 'column', gap: 16 }}>
+    <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
       {children}
     </div>
   );

src/components/Breakdown/components/Row.tsx

@@ -1,6 +1,7 @@
-import getWN8Percentile from '../../../core/blitz/getWN8Percentile.js';
-import { RowDiscriminator } from './RowDiscriminator.js';
-import { RowStat } from './RowStat.js';
+import getWN8Percentile from '../../../core/blitz/getWN8Percentile';
+import { theme } from '../../../stitches.config';
+import { RowDiscriminator } from './RowDiscriminator';
+import { RowStat } from './RowStat';
 
 export interface RowProps {
   name: string;
@@ -10,14 +11,17 @@ export interface RowProps {
   careerWN8?: number;
   damage: number;
   careerDamage: number;
-  survival: number;
-  careerSurvival: number;
   battles: number;
   careerBattles: number;
   icon?: string;
+  minimized: boolean;
+  isListing: boolean;
+  naked?: boolean;
 }
 
 export function Row({
+  isListing,
+  minimized,
   name,
   winrate,
   careerWinrate,
@@ -25,44 +29,46 @@ export function Row({
   careerWN8,
   damage,
   careerDamage,
-  survival,
-  careerSurvival,
   battles,
   careerBattles,
   icon,
+  naked,
 }: RowProps) {
   return (
-    <div style={{ display: 'flex', gap: 16 }}>
-      <RowDiscriminator name={name} icon={icon} />
+    <div
+      style={{
+        display: 'flex',
+        borderRadius: 4,
+        backgroundColor: isListing
+          ? theme.colors.componentInteractive
+          : theme.colors.appBackground2,
+        padding: 8,
+      }}
+    >
+      <RowDiscriminator minimized={minimized} name={name} icon={icon} />
 
       <RowStat
-        name="Winrate"
+        minimized={minimized}
+        name={`Winrate • ${(careerWinrate * 100).toFixed(2)}%`}
         value={`${(winrate * 100).toFixed(2)}%`}
-        career={`${(careerWinrate * 100).toFixed(2)}%`}
         delta={winrate - careerWinrate}
       />
       <RowStat
-        name="WN8"
+        minimized={minimized}
+        name={`WN8 • ${careerWN8 === undefined ? '--' : careerWN8.toFixed(0)}`}
         value={WN8 === undefined ? '--' : WN8.toFixed(0)}
-        career={careerWN8 === undefined ? '--' : careerWN8.toFixed(0)}
         percentile={WN8 === undefined ? undefined : getWN8Percentile(WN8)}
       />
       <RowStat
-        name="Damage"
-        value={damage.toFixed(2)}
-        career={careerDamage.toFixed(2)}
+        minimized={minimized}
+        name={`Damage • ${careerDamage.toFixed(0)}`}
+        value={damage.toFixed(0)}
         delta={damage - careerDamage}
       />
       <RowStat
-        name="Survival"
-        value={`${(survival * 100).toFixed(2)}%`}
-        career={`${(careerSurvival * 100).toFixed(2)}%`}
-        delta={survival - careerSurvival}
-      />
-      <RowStat
-        name="Battles"
+        minimized={minimized}
+        name={`Battles • ${careerBattles.toFixed(0)}`}
         value={battles.toFixed(0)}
-        career={careerBattles.toFixed(0)}
       />
     </div>
   );

src/components/Breakdown/components/RowDiscriminator.tsx

@@ -1,11 +1,16 @@
-import { theme } from '../../../stitches.config.js';
+import { theme } from '../../../stitches.config';
 
 export interface RowDiscriminatorProps {
   name: string;
   icon?: string;
+  minimized: boolean;
 }
 
-export function RowDiscriminator({ name, icon }: RowDiscriminatorProps) {
+export function RowDiscriminator({
+  name,
+  icon,
+  minimized,
+}: RowDiscriminatorProps) {
   return (
     <div
       style={{
@@ -19,7 +24,7 @@ export function RowDiscriminator({ name, icon }: RowDiscriminatorProps) {
         justifyContent: 'center',
       }}
     >
-      {icon && (
+      {!minimized && icon && (
         <img
           src={icon}
           height={0}

src/components/Breakdown/components/RowStat.tsx

@@ -1,21 +1,21 @@
-import { Percentile } from '../../../constants/percentiles.js';
-import { theme } from '../../../stitches.config.js';
-import PercentileIndicator from '../../PercentileIndicator.js';
+import { Percentile } from '../../../constants/percentiles';
+import { theme } from '../../../stitches.config';
+import PercentileIndicator from '../../PercentileIndicator';
 
 export interface RowStatProps {
   name: string;
-  value: string;
-  career: string;
+  value: string | number;
   delta?: number;
   percentile?: Percentile;
+  minimized?: boolean;
 }
 
 export function RowStat({
   name,
   value,
-  career,
   delta,
   percentile,
+  minimized,
 }: RowStatProps) {
   return (
     <div
@@ -28,10 +28,6 @@ export function RowStat({
         flex: 1,
       }}
     >
-      <span style={{ color: theme.colors.textLowContrast, fontSize: 12 }}>
-        {career}
-      </span>
-
       <div
         style={{
           display: 'flex',
@@ -58,16 +54,17 @@ export function RowStat({
           style={{
             color: theme.colors.textHighContrast,
             fontSize: 16,
-            fontWeight: 'bold',
           }}
         >
           {value}
         </span>
       </div>
 
-      <span style={{ color: theme.colors.textLowContrast, fontSize: 12 }}>
-        {name}
-      </span>
+      {!minimized && (
+        <span style={{ color: theme.colors.textLowContrast, fontSize: 12 }}>
+          {name}
+        </span>
+      )}
     </div>
   );
 }

src/components/Breakdown/index.ts

@@ -1,4 +1,4 @@
-export * from './components/Root.js';
-export * from './components/Row.js';
-export * from './components/RowDiscriminator.js';
-export * from './components/RowStat.js';
+export * from './components/Root';
+export * from './components/Row';
+export * from './components/RowDiscriminator';
+export * from './components/RowStat';

src/components/GenericAllStats.tsx

@@ -1,57 +0,0 @@
-import getWN8Percentile from '../core/blitz/getWN8Percentile.js';
-import isNumber from '../core/node/isNumber.js';
-import { AllStats, SupplementaryStats } from '../types/accountInfo.js';
-import GenericStats from './GenericStats/index.js';
-
-export interface GenericAllStatsProps {
-  stats: AllStats;
-  supplementaryStats?: SupplementaryStats;
-}
-
-export default function GenericAllStats({
-  stats,
-  supplementaryStats,
-}: GenericAllStatsProps) {
-  const damageRatio = stats.damage_dealt / stats.damage_received;
-  const killsToDeathRatio =
-    stats.frags / (stats.battles - stats.survived_battles);
-
-  return (
-    <GenericStats
-      stats={[
-        ['Winrate', `${(100 * (stats.wins / stats.battles)).toFixed(2)}%`],
-        [
-          'WN8',
-          supplementaryStats
-            ? isNumber(supplementaryStats.WN8)
-              ? supplementaryStats.WN8!.toFixed(0)
-              : '--'
-            : undefined,
-          isNumber(supplementaryStats?.WN8)
-            ? getWN8Percentile(supplementaryStats!.WN8!)
-            : undefined,
-        ],
-        [
-          'Survival',
-          `${(100 * (stats.survived_battles / stats.battles)).toFixed(2)}%`,
-        ],
-        ['Accuracy', `${((stats.hits / stats.shots) * 100).toFixed(2)}%`],
-        ['Battles', stats.battles],
-        ['Wins', stats.wins],
-        ['Losses', stats.losses],
-        ['Average damage', (stats.damage_dealt / stats.battles).toFixed(0)],
-        ['Average tier', supplementaryStats?.tier.toFixed(2)],
-        ['Average XP', (stats.xp / stats.battles).toFixed(0)],
-        ['Average shots', (stats.shots / stats.battles).toFixed(2)],
-        ['Average hits', (stats.hits / stats.battles).toFixed(2)],
-        ['Average kills', (stats.frags / stats.battles).toFixed(2)],
-        ['Average spots', (stats.spotted / stats.battles).toFixed(2)],
-        ['Damage ratio', isFinite(damageRatio) ? damageRatio.toFixed(2) : '--'],
-        [
-          'Kills to death ratio',
-          isFinite(killsToDeathRatio) ? killsToDeathRatio.toFixed(2) : '--',
-        ],
-      ]}
-    />
-  );
-}

src/components/GenericAllStats/components/Card.tsx

@@ -0,0 +1,91 @@
+import { Percentile } from '../../../constants/percentiles';
+import { theme } from '../../../stitches.config';
+import PercentileIndicator from '../../PercentileIndicator';
+
+export interface CardItem {
+  label: string;
+  value: string | number | undefined;
+  percentile?: Percentile;
+}
+
+export interface CardProps {
+  items: CardItem[];
+  title: string;
+}
+
+export function Card({ items, title }: CardProps) {
+  return (
+    <div
+      style={{
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 16,
+        flex: 1,
+        borderRadius: 4,
+        backgroundColor: theme.colors.componentInteractive,
+        padding: 8,
+      }}
+    >
+      <span
+        style={{
+          color: theme.colors.textHighContrast,
+          fontSize: 24,
+        }}
+      >
+        {title}
+      </span>
+
+      <div
+        style={{
+          display: 'flex',
+          flexDirection: 'column',
+          gap: 8,
+        }}
+      >
+        {items.map((item) => (
+          <div
+            style={{
+              display: 'flex',
+              gap: 8,
+              alignItems: 'center',
+              justifyContent: 'center',
+            }}
+          >
+            <span style={{ fontSize: 16, color: theme.colors.textLowContrast }}>
+              {item.label}
+            </span>
+
+            <div
+              style={{
+                flex: 1,
+                height: 1,
+                borderRadius: 0.5,
+                backgroundColor: theme.colors.borderNonInteractive,
+              }}
+            />
+
+            <div
+              style={{
+                display: 'flex',
+                gap: 4,
+                alignItems: 'center',
+                justifyContent: 'center',
+              }}
+            >
+              {item.percentile !== undefined && (
+                <PercentileIndicator percentile={item.percentile} />
+              )}
+              <span
+                style={{ fontSize: 16, color: theme.colors.textHighContrast }}
+              >
+                {item.value === undefined || Number.isNaN(item.value)
+                  ? '--'
+                  : item.value}
+              </span>
+            </div>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+}

src/components/GenericAllStats/components/Root.tsx

@@ -0,0 +1,17 @@
+export interface RootProps {
+  children: React.ReactNode;
+}
+
+export function Root({ children }: RootProps) {
+  return (
+    <div
+      style={{
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 8,
+      }}
+    >
+      {children}
+    </div>
+  );
+}

src/components/GenericAllStats/components/Row.tsx

@@ -0,0 +1,7 @@
+export interface RowProps {
+  children: React.ReactNode;
+}
+
+export function Row({ children }: RowProps) {
+  return <div style={{ display: 'flex', gap: 8 }}>{children}</div>;
+}

src/components/GenericAllStats/index.tsx

@@ -0,0 +1,124 @@
+import getWN8Percentile from '../../core/blitz/getWN8Percentile';
+import isNumber from '../../core/node/isNumber';
+import { AllStats, SupplementaryStats } from '../../types/accountInfo';
+import { Card } from './components/Card';
+import { Root } from './components/Root';
+import { Row } from './components/Row';
+
+// TODO: remove the .js endings
+
+export interface GenericAllStatsProps {
+  stats: AllStats;
+  supplementaryStats?: SupplementaryStats;
+}
+
+export default function GenericAllStats({
+  stats,
+  supplementaryStats,
+}: GenericAllStatsProps) {
+  const damageRatio = stats.damage_dealt / stats.damage_received;
+  const killsToDeathRatio =
+    stats.frags / (stats.battles - stats.survived_battles);
+
+  return (
+    <Root>
+      <Row>
+        <Card
+          title="Games"
+          items={[
+            {
+              label: 'Winrate',
+              value: `${(100 * (stats.wins / stats.battles)).toFixed(2)}%`,
+            },
+            {
+              label: 'Battles',
+              value: stats.battles,
+            },
+            {
+              label: 'Wins / Losses',
+              value: `${stats.wins} / ${stats.losses}`,
+            },
+          ]}
+        />
+        <Card
+          title="Efficiency"
+          items={[
+            {
+              label: 'WN8',
+              value:
+                supplementaryStats && isNumber(supplementaryStats.WN8)
+                  ? supplementaryStats.WN8!.toFixed(0)
+                  : undefined,
+              percentile: isNumber(supplementaryStats?.WN8)
+                ? getWN8Percentile(supplementaryStats!.WN8!)
+                : undefined,
+            },
+            {
+              label: 'Survival',
+              value: `${(
+                100 *
+                (stats.survived_battles / stats.battles)
+              ).toFixed(2)}%`,
+            },
+            {
+              label: 'Accuracy',
+              value: `${((stats.hits / stats.shots) * 100).toFixed(2)}%`,
+            },
+          ]}
+        />
+      </Row>
+      <Row>
+        <Card
+          title="Lethality"
+          items={[
+            {
+              label: 'Average damage',
+              value: (stats.damage_dealt / stats.battles).toFixed(0),
+            },
+            {
+              label: 'Damage per tier',
+              value: supplementaryStats?.tier
+                ? (
+                    stats.damage_dealt /
+                    stats.battles /
+                    supplementaryStats.tier
+                  ).toFixed(0)
+                : undefined,
+            },
+            {
+              label: 'Damage ratio',
+              value: isFinite(damageRatio) ? damageRatio.toFixed(2) : undefined,
+            },
+            {
+              label: 'Average kills',
+              value: (stats.frags / stats.battles).toFixed(0),
+            },
+          ]}
+        />
+        <Card
+          title="Efficiency"
+          items={[
+            {
+              label: 'Average tier',
+              value: supplementaryStats?.tier?.toFixed(2),
+            },
+            {
+              label: 'Average spots',
+              value: (stats.spotted / stats.battles).toFixed(2),
+            },
+            {
+              label: 'Average XP',
+              value: (stats.xp / stats.battles).toFixed(0),
+            },
+            {
+              label: 'Kills to death ratio',
+              value: isFinite(killsToDeathRatio)
+                ? killsToDeathRatio.toFixed(2)
+                : undefined,
+            },
+          ]}
+        />
+      </Row>
+    </Root>
+  );
+}

src/components/GenericStats/components/GenericStatsColumn.tsx

@@ -1,5 +1,5 @@
-import { Stat } from '../index.js';
-import GenericStatsRow from './GenericStatsRow.js';
+import { Stat } from '..';
+import GenericStatsRow from './GenericStatsRow';
 
 export interface GenericStatsColumnProps {
   stats: Stat[];

src/components/GenericStats/components/GenericStatsRow.tsx

@@ -1,6 +1,6 @@
-import { theme } from '../../../stitches.config.js';
-import PercentileIndicator from '../../PercentileIndicator.js';
-import { Stat } from '../index.js';
+import { Stat } from '..';
+import { theme } from '../../../stitches.config';
+import PercentileIndicator from '../../PercentileIndicator';
 
 export interface GenericStatsRowProps {
   stat: Stat;

src/components/GenericStats/index.tsx

@@ -1,5 +1,5 @@
-import { Percentile } from '../../constants/percentiles.js';
-import GenericStatsColumn from './components/GenericStatsColumn.js';
+import { Percentile } from '../../constants/percentiles';
+import GenericStatsColumn from './components/GenericStatsColumn';
 
 export type Stat =
   | [string, string | number | undefined]

src/components/Graph/components/Line.tsx

@@ -1,5 +1,5 @@
 import { blue, green, red, slateDark } from '@radix-ui/colors';
-import { GRAPH_HEIGHT, GRAPH_WIDTH } from './Root.js';
+import { GRAPH_HEIGHT, GRAPH_WIDTH } from './Root';
 
 export enum LineColor {
   Red,

src/components/Graph/components/Margin.tsx

@@ -1,6 +1,6 @@
 import { times } from 'lodash';
-import { theme } from '../../../stitches.config.js';
-import { MarginInputProps } from './Root.js';
+import { theme } from '../../../stitches.config';
+import { MarginInputProps } from './Root';
 
 export enum MarginOrientation {
   Vertical,
@@ -37,7 +37,7 @@ export function Margin({
           key={index}
           style={{
             fontSize: 16,
-            color: theme.colors.textLowContrast,
+            color: theme.colors.textHighContrast,
           }}
         >
           {`${(

src/components/Graph/components/Root.tsx

@@ -1,7 +1,7 @@
 import { times } from 'lodash';
 import { ReactNode } from 'react';
-import { theme } from '../../../stitches.config.js';
-import { Margin, MarginOrientation } from './Margin.js';
+import { theme } from '../../../stitches.config';
+import { Margin, MarginOrientation } from './Margin';
 
 export const GRAPH_WIDTH = 544;
 export const GRAPH_HEIGHT = 320;
@@ -20,6 +20,7 @@ export interface RootProps {
   separations?: number;
   xMinLabel: string;
   xMaxLabel: string;
+  xTitle: string;
 }
 
 export function Root({
@@ -29,6 +30,7 @@ export function Root({
   separations = 5,
   xMinLabel,
   xMaxLabel,
+  xTitle,
 }: RootProps) {
   return (
     <div style={{ display: 'flex', flexDirection: 'column', gap: 16 }}>
@@ -39,10 +41,10 @@ export function Root({
           justifyContent: 'space-between',
         }}
       >
-        <span style={{ fontSize: 16, color: theme.colors.textLowContrast }}>
+        <span style={{ fontSize: 16, color: theme.colors.textHighContrast }}>
           {xMinLabel}
         </span>
-        <span style={{ fontSize: 16, color: theme.colors.textLowContrast }}>
+        <span style={{ fontSize: 16, color: theme.colors.textHighContrast }}>
           {xMaxLabel}
         </span>
       </div>
@@ -88,6 +90,19 @@ export function Root({
           orientation={MarginOrientation.Horizontal}
         />
       )}
+
+      <div
+        style={{
+          paddingLeft: 64,
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+        }}
+      >
+        <span style={{ fontSize: 16, color: theme.colors.textLowContrast }}>
+          {xTitle}
+        </span>
+      </div>
     </div>
   );
 }

src/components/Graph/index.ts

@@ -1,3 +1,3 @@
-export * from './components/Line.js';
-export * from './components/Margin.js';
-export * from './components/Root.js';
+export * from './components/Line';
+export * from './components/Margin';
+export * from './components/Root';

src/components/Leaderboard/components/Gap.tsx

@@ -0,0 +1,29 @@
+import { theme } from '../../../stitches.config';
+
+export interface GapProps {
+  number: number;
+}
+
+export function Gap({ number }: GapProps) {
+  return (
+    <div
+      style={{
+        display: 'flex',
+        padding: 8,
+        backgroundColor: theme.colors.componentNonInteractive,
+        borderRadius: 4,
+        alignItems: 'center',
+        justifyContent: 'center',
+      }}
+    >
+      <span
+        style={{
+          color: theme.colors.textLowContrast,
+          fontSize: 16,
+        }}
+      >
+        + {number.toLocaleString()} more
+      </span>
+    </div>
+  );
+}

src/components/Leaderboard/components/Item.tsx

@@ -0,0 +1,170 @@
+import { RatingsReward } from '../../../commands/ratings';
+import { theme } from '../../../stitches.config';
+
+export interface ItemProps {
+  position: number;
+  deltaPosition?: number;
+  score: number;
+  deltaScore?: number;
+  reward?: RatingsReward;
+  nickname: string;
+  clan?: string;
+}
+
+function normalizeImage(url: string) {
+  return url.endsWith('.webp') ? 'https://i.imgur.com/ZniCzbO.png' : url;
+}
+
+export function Item({
+  position,
+  deltaPosition,
+  score,
+  deltaScore,
+  reward,
+  nickname,
+  clan,
+}: ItemProps) {
+  return (
+    <div
+      style={{
+        display: 'flex',
+        padding: 8,
+        backgroundColor: theme.colors.componentInteractive,
+        borderRadius: 4,
+        alignItems: 'center',
+        justifyContent: 'center',
+        gap: 8,
+      }}
+    >
+      <span
+        style={{
+          color: theme.colors.textLowContrast,
+          fontSize: 16,
+        }}
+      >
+        {position.toLocaleString()}.
+      </span>
+
+      <div
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          gap: 4,
+        }}
+      >
+        <span
+          style={{
+            color: theme.colors.textHighContrast,
+            fontSize: 16,
+          }}
+        >
+          {nickname}
+        </span>
+        {clan && (
+          <span
+            style={{
+              color: theme.colors.textLowContrast,
+              fontSize: 16,
+            }}
+          >
+            [{clan}]
+          </span>
+        )}
+      </div>
+
+      {deltaPosition !== undefined && deltaPosition !== 0 && (
+        <div
+          style={{
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            gap: 4,
+          }}
+        >
+          <img
+            style={{
+              width: 8,
+              height: 8,
+            }}
+            src={
+              deltaPosition > 0
+                ? 'https://i.imgur.com/qbjiXa1.png'
+                : 'https://i.imgur.com/3uyNhun.png'
+            }
+          />
+          <span
+            style={{
+              color: theme.colors.textLowContrast,
+              fontSize: 16,
+            }}
+          >
+            {Math.abs(deltaPosition).toLocaleString()}
+          </span>
+        </div>
+      )}
+
+      <div
+        style={{
+          flex: 1,
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          gap: 4,
+        }}
+      >
+        {reward && (
+          <img
+            style={{ width: 16, height: 16, objectFit: 'cover' }}
+            src={normalizeImage(
+              reward.type === 'vehicle'
+                ? reward.vehicle.image_url
+                : reward.stuff.image_url,
+            )}
+          />
+        )}
+        {reward && reward.count > 1 && (
+          <span
+            style={{
+              color: theme.colors.textLowContrast,
+              fontSize: 16,
+            }}
+          >
+            x {reward.count.toLocaleString()}
+          </span>
+        )}
+      </div>
+
+      <div
+        style={{
+          display: 'flex',
+          gap: 4,
+          alignItems: 'center',
+          justifyContent: 'center',
+        }}
+      >
+        {deltaScore !== 0 && deltaScore !== undefined && (
+          <span style={{ color: theme.colors.textLowContrast, fontSize: 16 }}>
+            {Math.abs(deltaScore).toLocaleString()}
+          </span>
+        )}
+        {deltaScore !== 0 && deltaScore !== undefined && (
+          <img
+            style={{
+              width: 8,
+              height: 8,
+            }}
+            src={
+              deltaScore > 0
+                ? 'https://i.imgur.com/qbjiXa1.png'
+                : 'https://i.imgur.com/3uyNhun.png'
+            }
+          />
+        )}
+        <span style={{ color: theme.colors.textHighContrast, fontSize: 16 }}>
+          {score.toLocaleString()}
+        </span>
+      </div>
+    </div>
+  );
+}

src/components/Leaderboard/components/Root.tsx

@@ -0,0 +1,13 @@
+import { ReactNode } from 'react';
+
+export interface RootProps {
+  children: ReactNode;
+}
+
+export function Root({ children }: RootProps) {
+  return (
+    <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
+      {children}
+    </div>
+  );
+}

src/components/Leaderboard/index.ts

@@ -0,0 +1,3 @@
+export * from './components/Gap';
+export * from './components/Item';
+export * from './components/Root';

src/components/NoData.tsx

@@ -1,4 +1,4 @@
-import { theme } from '../stitches.config.js';
+import { theme } from '../stitches.config';
 
 export enum NoDataType {
   BattlesInPeriod,

src/components/PercentileIndicator.tsx

@@ -10,7 +10,7 @@ import {
   teal,
   yellow,
 } from '@radix-ui/colors';
-import { Percentile } from '../constants/percentiles.js';
+import { Percentile } from '../constants/percentiles';
 
 export interface PercentileIndicatorProps {
   percentile: Percentile;

src/components/PoweredBy.tsx

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { theme } from '../stitches.config.js';
+import { theme } from '../stitches.config';
 
 export enum PoweredByType {
   BlitzStars,

src/components/Tanks/components/Column.tsx

@@ -0,0 +1,20 @@
+import { ReactNode } from 'react';
+
+export interface ColumnProps {
+  children: ReactNode;
+}
+
+export function Column({ children }: ColumnProps) {
+  return (
+    <div
+      style={{
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 8,
+        flex: 1,
+      }}
+    >
+      {children}
+    </div>
+  );
+}

src/components/Tanks/components/Item.tsx

@@ -1,35 +1,78 @@
-import { TANK_ICONS, TankType } from '../../../core/blitz/tankopedia.js';
+import {
+  TANK_ICONS,
+  TANK_ICONS_COLLECTOR,
+  TANK_ICONS_PREMIUM,
+} from '../../../core/blitz/tankopedia';
+import { theme } from '../../../stitches.config';
 
-export interface ItemProps {
-  icon?: string;
-  type: TankType;
-  name: string;
+export enum TreeType {
+  TechTree,
+  Premium,
+  Collector,
 }
 
-export function Item({ icon, type, name }: ItemProps) {
+export interface ItemProps {
+  image?: string;
+  tankType?: string;
+  name: string;
+  treeType: TreeType;
+}
+
+const TREE_TYPE_COLOR = {
+  [TreeType.TechTree]: '',
+  [TreeType.Premium]: '_amber',
+  [TreeType.Collector]: '_blue',
+} as const;
+
+const TREE_TYPE_ICONS = {
+  [TreeType.TechTree]: TANK_ICONS,
+  [TreeType.Premium]: TANK_ICONS_PREMIUM,
+  [TreeType.Collector]: TANK_ICONS_COLLECTOR,
+};
+
+export function Item({ image, tankType, name, treeType }: ItemProps) {
   return (
     <div
       style={{
-        flex: 1,
-        minWidth: 128,
-        height: 128,
         display: 'flex',
-        flexDirection: 'column',
-        alignItems: 'center',
-        justifyContent: 'center',
+        height: 32,
+        paddingLeft: 8,
+        paddingRight: 8,
         overflow: 'hidden',
+        alignItems: 'center',
+        borderRadius: 4,
+        backgroundColor:
+          theme.colors[`componentInteractive${TREE_TYPE_COLOR[treeType]}`],
       }}
     >
-      {icon && <img src={icon} style={{ flex: 1, objectFit: 'contain' }} />}
-
-      <div style={{ display: 'flex', margin: 'auto', gap: 4 }}>
-        <img src={TANK_ICONS[type]} style={{ width: 14, height: 14 }} />
+      <div
+        style={{
+          display: 'flex',
+          gap: 4,
+          flex: 1,
+          alignItems: 'center',
+          justifyContent: 'flex-start',
+          overflow: 'hidden',
+        }}
+      >
+        {tankType && (
+          <img
+            src={TREE_TYPE_ICONS[treeType][tankType]}
+            style={{ width: 14, height: 14 }}
+          />
+        )}
         <span
-          style={{ fontSize: 16, textAlign: 'center', whiteSpace: 'nowrap' }}
+          style={{
+            fontSize: 16,
+            whiteSpace: 'nowrap',
+            color: theme.colors[`textLowContrast${TREE_TYPE_COLOR[treeType]}`],
+          }}
         >
           {name}
         </span>
       </div>
+
+      {image && <img src={image} style={{ flex: 1 }} />}
     </div>
   );
 }

src/components/Tanks/components/Root.tsx

@@ -9,10 +9,7 @@ export function Root({ children }: RootProps) {
     <div
       style={{
         display: 'flex',
-        flexWrap: 'wrap',
-        gap: 16,
-        alignItems: 'center',
-        justifyContent: 'center',
+        gap: 8,
       }}
     >
       {children}

src/components/Tanks/index.ts

@@ -1,2 +1,3 @@
-export * from './components/Item.js';
-export * from './components/Root.js';
+export * from './components/Column';
+export * from './components/Item';
+export * from './components/Root';

src/components/TierWeights.tsx

@@ -1,5 +1,5 @@
-import { TIER_ROMAN_NUMERALS, Tier } from '../core/blitz/tankopedia.js';
-import { themeLight } from '../stitches.config.js';
+import { TIER_ROMAN_NUMERALS, Tier } from '../core/blitz/tankopedia';
+import { theme } from '../stitches.config';
 
 export type TierWeightsRecord = Partial<Record<Tier, number>>;
 
@@ -14,9 +14,9 @@ export default function TierWeights({ weights }: TierWeightsProps) {
         <div
           key={tier}
           style={{
-            backgroundColor: themeLight.colors.appBackground1,
+            backgroundColor: theme.colors.appBackground1_light,
             flex: weight,
-            color: themeLight.colors.textHighContrast,
+            color: theme.colors.textHighContrast_light,
             display: 'flex',
             alignItems: 'center',
             justifyContent: 'center',

src/components/TitleBar.tsx

@@ -1,5 +1,5 @@
-import isDev from '../core/node/isDev.js';
-import { theme } from '../stitches.config.js';
+import isDev from '../core/node/isDev';
+import { theme } from '../stitches.config';
 
 export interface TitleBarProps {
   name: string;

src/components/Wrapper.tsx

@@ -1,11 +1,12 @@
 import { ReactNode } from 'react';
-import { theme } from '../stitches.config.js';
+import { theme } from '../stitches.config';
 
 export interface WrapperProps {
   children: ReactNode;
+  naked?: boolean;
 }
 
-export default function Wrapper({ children }: WrapperProps) {
+export default function Wrapper({ children, naked }: WrapperProps) {
   return (
     <div
       style={{
@@ -14,8 +15,11 @@ export default function Wrapper({ children }: WrapperProps) {
         padding: 16,
         gap: 32,
         width: 640,
-        background: 'url(https://i.imgur.com/PhS06NJ.png)',
         color: theme.colors.textHighContrast,
+
+        ...(!naked && {
+          background: 'url(https://i.imgur.com/PhS06NJ.png)',
+        }),
       }}
     >
       {children}

src/constants/regions.ts

@@ -0,0 +1,14 @@
+export type Region = 'com' | 'eu' | 'asia';
+export type RegionSubdomain = 'na' | 'eu' | 'asia';
+
+export const REGION_NAMES: Record<Region, string> = {
+  com: 'North America',
+  eu: 'Europe',
+  asia: 'Asia',
+};
+
+export const REGION_SUBDOMAIN_NAMES: Record<RegionSubdomain, string> = {
+  na: 'North America',
+  eu: 'Europe',
+  asia: 'Asia',
+};

src/constants/servers.ts

@@ -1,7 +0,0 @@
-export type BlitzServer = 'com' | 'eu' | 'asia';
-
-export const BLITZ_SERVERS: Record<BlitzServer, string> = {
-  com: 'North America',
-  eu: 'Europe',
-  asia: 'Asia',
-};

src/core/blitz/calculateWN8.ts

@@ -1,4 +1,4 @@
-import { AllStats } from '../../types/accountInfo.js';
+import { AllStats } from '../../types/accountInfo';
 
 /**
  * Formula from https://web.archive.org/web/20190105064817/http://wiki.wnefficiency.net/pages/WN8

src/core/blitz/diffStats.ts

@@ -1,4 +1,4 @@
-import { AllStats } from '../../types/accountInfo.js';
+import { AllStats } from '../../types/accountInfo';
 
 export default function diffStats(stats1: AllStats, stats2: AllStats) {
   function diff(value: (allStats: AllStats) => number) {

src/core/blitz/getBlitzClan.ts

@@ -1,12 +1,12 @@
-import { BlitzServer } from '../../constants/servers.js';
-import { serverAndIdPattern } from '../discord/resolvePlayerFromCommand.js';
-import throwError from '../node/throwError.js';
-import listClans from './listClans.js';
+import { Region } from '../../constants/regions';
+import { serverAndIdPattern } from '../discord/resolvePlayerFromCommand';
+import throwError from '../node/throwError';
+import listClans from './listClans';
 
 export default async function getBlitzClan(clan: string) {
   if (serverAndIdPattern.test(clan)) {
     const [server, accountId] = clan.split('/');
-    return { server: server as BlitzServer, id: Number(accountId) };
+    return { server: server as Region, id: Number(accountId) };
   } else {
     const accounts = await listClans(clan);
 

src/core/blitz/getTankStats.ts

@@ -1,18 +1,18 @@
-import { BLITZ_SERVERS, BlitzServer } from '../../constants/servers.js';
-import { TanksStats } from '../../types/tanksStats.js';
-import { WARGAMING_APPLICATION_ID } from '../node/arguments.js';
-import throwError from '../node/throwError.js';
-import getWargamingResponse from './getWargamingResponse.js';
+import { REGION_NAMES, Region } from '../../constants/regions';
+import { TanksStats } from '../../types/tanksStats';
+import { secrets } from '../node/secrets';
+import throwError from '../node/throwError';
+import getWargamingResponse from './getWargamingResponse';
 
-export default async function getTankStats(server: BlitzServer, id: number) {
+export default async function getTankStats(server: Region, id: number) {
   const tankStats = await getWargamingResponse<TanksStats>(
-    `https://api.wotblitz.${server}/wotb/tanks/stats/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
+    `https://api.wotblitz.${server}/wotb/tanks/stats/?application_id=${secrets.WARGAMING_APPLICATION_ID}&account_id=${id}`,
   );
 
   if (tankStats[id] === null) {
     throw throwError(
       'No tank stats available',
-      `Wargaming says there is no tank stats for this account. This account may not have any battles/tanks or exist in the ${BLITZ_SERVERS[server]} server.`,
+      `Wargaming says there is no tank stats for this account. This account may not have any battles/tanks or exist in the ${REGION_NAMES[server]} server.`,
     );
   }
 

src/core/blitz/getTreeType.ts

@@ -0,0 +1,11 @@
+import { TreeType } from '../../components/Tanks';
+import { tankopedia } from './tankopedia';
+
+export default async function getTreeType(id: number) {
+  const entry = (await tankopedia)[id];
+
+  if (entry?.is_collectible) return TreeType.Collector;
+  if (entry?.is_premium) return TreeType.Premium;
+
+  return TreeType.TechTree;
+}

src/core/blitz/getWN8Percentile.ts

@@ -1,4 +1,4 @@
-import { Percentile } from '../../constants/percentiles.js';
+import { Percentile } from '../../constants/percentiles';
 
 export const WN8_PERCENTILES: [number, Percentile][] = [
   [0, Percentile.VeryBad],

src/core/blitz/getWargamingResponse.ts

@@ -1,4 +1,4 @@
-import throwError from '../node/throwError.js';
+import throwError from '../node/throwError';
 
 export type WargamingResponse<Data extends object> =
   | {

src/core/blitz/listClans.ts

@@ -1,7 +1,7 @@
-import { BlitzServer } from '../../constants/servers.js';
-import { Clan, ClanList } from '../../types/clanList.js';
-import { WARGAMING_APPLICATION_ID } from '../node/arguments.js';
-import getWargamingResponse from './getWargamingResponse.js';
+import { Region } from '../../constants/regions';
+import { Clan, ClanList } from '../../types/clanList';
+import { secrets } from '../node/secrets';
+import getWargamingResponse from './getWargamingResponse';
 
 export type ClanListWithServer = (Clan & {
   server: 'com' | 'eu' | 'asia';
@@ -15,33 +15,33 @@ export default async function listClans(search: string, limit = 9) {
   return (
     await Promise.all([
       getWargamingResponse<ClanList>(
-        `https://api.wotblitz.com/wotb/clans/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${search}&limit=${normalizedLimit}`,
+        `https://api.wotblitz.com/wotb/clans/list/?application_id=${secrets.WARGAMING_APPLICATION_ID}&search=${search}&limit=${normalizedLimit}`,
       ).then(
         (value) =>
           value &&
           value.map((account) => ({
             ...account,
-            server: 'com' as BlitzServer,
+            server: 'com' as Region,
           })),
       ),
       getWargamingResponse<ClanList>(
-        `https://api.wotblitz.eu/wotb/clans/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${search}&limit=${normalizedLimit}`,
+        `https://api.wotblitz.eu/wotb/clans/list/?application_id=${secrets.WARGAMING_APPLICATION_ID}&search=${search}&limit=${normalizedLimit}`,
       ).then(
         (value) =>
           value &&
           value.map((account) => ({
             ...account,
-            server: 'eu' as BlitzServer,
+            server: 'eu' as Region,
           })),
       ),
       getWargamingResponse<ClanList>(
-        `https://api.wotblitz.asia/wotb/clans/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${search}&limit=${normalizedLimit}`,
+        `https://api.wotblitz.asia/wotb/clans/list/?application_id=${secrets.WARGAMING_APPLICATION_ID}&search=${search}&limit=${normalizedLimit}`,
       ).then(
         (value) =>
           value &&
           value.map((account) => ({
             ...account,
-            server: 'asia' as BlitzServer,
+            server: 'asia' as Region,
           })),
       ),
     ])

src/core/blitz/listPlayers.ts

@@ -1,7 +1,7 @@
-import { BlitzServer } from '../../constants/servers.js';
-import { Account, AccountList } from '../../types/accountList.js';
-import { WARGAMING_APPLICATION_ID } from '../node/arguments.js';
-import getWargamingResponse from './getWargamingResponse.js';
+import { Region } from '../../constants/regions';
+import { Account, AccountList } from '../../types/accountList';
+import { secrets } from '../node/secrets';
+import getWargamingResponse from './getWargamingResponse';
 
 export type AccountListWithServer = (Account & {
   server: 'com' | 'eu' | 'asia';
@@ -19,33 +19,33 @@ export default async function listPlayers(search: string, limit = 9) {
     return (
       await Promise.all([
         getWargamingResponse<AccountList>(
-          `https://api.wotblitz.com/wotb/account/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${encodedSearch}&limit=${normalizedLimit}`,
+          `https://api.wotblitz.com/wotb/account/list/?application_id=${secrets.WARGAMING_APPLICATION_ID}&search=${encodedSearch}&limit=${normalizedLimit}`,
         ).then(
           (value) =>
             value &&
             value.map((account) => ({
               ...account,
-              server: 'com' as BlitzServer,
+              server: 'com' as Region,
             })),
         ),
         getWargamingResponse<AccountList>(
-          `https://api.wotblitz.eu/wotb/account/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${encodedSearch}&limit=${normalizedLimit}`,
+          `https://api.wotblitz.eu/wotb/account/list/?application_id=${secrets.WARGAMING_APPLICATION_ID}&search=${encodedSearch}&limit=${normalizedLimit}`,
         ).then(
           (value) =>
             value &&
             value.map((account) => ({
               ...account,
-              server: 'eu' as BlitzServer,
+              server: 'eu' as Region,
             })),
         ),
         getWargamingResponse<AccountList>(
-          `https://api.wotblitz.asia/wotb/account/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${encodedSearch}&limit=${normalizedLimit}`,
+          `https://api.wotblitz.asia/wotb/account/list/?application_id=${secrets.WARGAMING_APPLICATION_ID}&search=${encodedSearch}&limit=${normalizedLimit}`,
         ).then(
           (value) =>
             value &&
             value.map((account) => ({
               ...account,
-              server: 'asia' as BlitzServer,
+              server: 'asia' as Region,
             })),
         ),
       ])

src/core/blitz/regionToRegionSubdomain.ts

@@ -0,0 +1,7 @@
+import { Region, RegionSubdomain } from '../../constants/regions';
+
+export default function regionToRegionSubdomain(
+  regionDomain: Region,
+): RegionSubdomain {
+  return regionDomain === 'com' ? 'na' : regionDomain;
+}

src/core/blitz/resolveTankId.ts

@@ -1,12 +1,12 @@
 import { go } from 'fuzzysort';
-import throwError from '../node/throwError.js';
-import { TANKS, tankopedia } from './tankopedia.js';
+import throwError from '../node/throwError';
+import { TANKS, tankopedia } from './tankopedia';
 
-export default function resolveTankId(tank: string) {
+export default async function resolveTankId(tank: string) {
   const number = parseInt(tank);
 
   if (Number.isNaN(number)) {
-    const searchResult = go(tank, TANKS, { keys: ['name'], limit: 1 });
+    const searchResult = go(tank, await TANKS, { keys: ['name'], limit: 1 });
 
     if (searchResult.length === 0) {
       throw throwError(
@@ -17,7 +17,7 @@ export default function resolveTankId(tank: string) {
       return searchResult[0].obj.tank_id;
     }
   } else {
-    if (tankopedia[number]) {
+    if ((await tankopedia)[number]) {
       return number;
     } else {
       throw throwError(

src/core/blitz/resolveTankName.ts

@@ -1,6 +1,6 @@
-import { tankopedia } from './tankopedia.js';
+import { tankopedia } from './tankopedia';
 
-export default function resolveTankName(tankId: number) {
-  const tankopediaName = tankopedia[tankId].name;
+export default async function resolveTankName(tankId: number) {
+  const tankopediaName = (await tankopedia)[tankId]?.name;
   return tankopediaName ? tankopediaName : `Unknown Tank ${tankId}`;
 }

src/core/blitz/sumStats.ts

@@ -1,5 +1,5 @@
-import { AllStats } from '../../types/accountInfo.js';
-import { emptyAllStats } from '../blitzstars/getTankStatsDiffed.js';
+import { AllStats } from '../../types/accountInfo';
+import { emptyAllStats } from '../blitzstars/getDiffedTankStats';
 
 export default function sumStats(allStatsCollection: AllStats[]) {
   return allStatsCollection.reduce((accumulated, current) => {

src/core/blitz/tankopedia.ts

@@ -1,41 +1,58 @@
-import { readFileSync } from 'fs';
-import { join } from 'path';
-
-export type TankType = 'AT-SPG' | 'lightTank' | 'mediumTank' | 'heavyTank';
-
 export interface TankopediaEntry {
   name: string;
   nation: string;
   is_premium: boolean;
+  is_collectible: boolean;
   tier: number;
   cost: { price_credit: number; price_gold: number };
   images: { preview: string; normal: string };
   tank_id: number;
-  type: TankType;
+  type: string;
   description: string;
 }
 
 export interface Tankopedia {
-  [id: number]: TankopediaEntry;
+  [id: number]: TankopediaEntry | undefined;
 }
 
-export const tankopedia = (
-  JSON.parse(
-    readFileSync(join(__dirname, 'tankopedia.json')) as unknown as string,
-  ) as { data: Tankopedia }
-).data;
-const entries = Object.entries(tankopedia);
-export const TANK_IDS = entries.map(([, { tank_id }]) => tank_id as number);
-export const TANKS = entries.map(([, entry]) => entry as TankopediaEntry);
-export const TANK_NAMES = entries.map(([, { name }]) => name);
+console.log('Caching tankopedia...');
+export const tankopedia = fetch('https://www.blitzstars.com/bs-tankopedia.json')
+  .then((response) => response.json())
+  .then((wrapperTankopedia) => {
+    console.log('Tankopedia cached');
+    return (wrapperTankopedia as { data: Tankopedia }).data;
+  });
+const entries = new Promise<TankopediaEntry[]>(async (resolve) => {
+  resolve(Object.entries(await tankopedia).map(([, entry]) => entry));
+});
+export const TANKS = new Promise<TankopediaEntry[]>(async (resolve) => {
+  resolve((await entries).map((entry) => entry));
+});
+export const TANK_NAMES = new Promise<string[]>(async (resolve) => {
+  resolve((await entries).map(({ name }) => name));
+});
 
-export const TANK_ICONS: Record<TankType, string> = {
+export const TANK_ICONS: Record<string, string> = {
   'AT-SPG': 'https://i.imgur.com/BIHSEH0.png',
   lightTank: 'https://i.imgur.com/CSNha5V.png',
   mediumTank: 'https://i.imgur.com/wvf3ltm.png',
   heavyTank: 'https://i.imgur.com/ECeqlZa.png',
 };
 
+export const TANK_ICONS_PREMIUM: Record<string, string> = {
+  'AT-SPG': 'https://i.imgur.com/TCu3EdR.png',
+  lightTank: 'https://i.imgur.com/zdkpTRb.png',
+  mediumTank: 'https://i.imgur.com/3z7eHX6.png',
+  heavyTank: 'https://i.imgur.com/P3vbmyA.png',
+};
+
+export const TANK_ICONS_COLLECTOR: Record<string, string> = {
+  'AT-SPG': 'https://i.imgur.com/WTjeirB.png',
+  lightTank: 'https://i.imgur.com/EwhtKkU.png',
+  mediumTank: 'https://i.imgur.com/u8YDMBh.png',
+  heavyTank: 'https://i.imgur.com/8xRf3nc.png',
+};
+
 export type Tier = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
 
 export const TIER_ROMAN_NUMERALS: Record<Tier, string> = {