Merge branch 'dev' of https://github.com/tresabhi/blitzkrieg into dev

.github/workflows/cd-assets.yml

@@ -2,9 +2,10 @@ name: CD Build Assets
 
 on:
   push:
+    branches: main
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 2 * * *'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

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

@@ -1,11 +1,7 @@
-name: CD Ratings Asia
-
-# latest: '0 0 * * *'
-# asia midnight: '0 17 * * *'
+name: CD Rating Asia
 
 on:
   schedule:
-    - cron: '0 0 * * *'
     - cron: '0 17 * * *'
 
 jobs:
@@ -35,4 +31,4 @@ jobs:
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DISCORD_BLITZ_DB=${{ secrets.DISCORD_BLITZ_DB }} yarn publish:ratingsleaderboard --region=asia --target=${{ github.event.schedule == '0 0 * * *' && 'latest' || 'midnight' }}
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DISCORD_BLITZ_DB=${{ secrets.DISCORD_BLITZ_DB }} yarn publish:ratingleaderboard --region=asia --target=midnight --production

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

@@ -1,11 +1,7 @@
-name: CD Ratings Europe
-
-# latest: '0 0 * * *'
-# eu midnight: '0 23 * * *'
+name: CD Rating Europe
 
 on:
   schedule:
-    - cron: '0 0 * * *'
     - cron: '0 23 * * *'
 
 jobs:
@@ -35,4 +31,4 @@ jobs:
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DISCORD_BLITZ_DB=${{ secrets.DISCORD_BLITZ_DB }} yarn publish:ratingsleaderboard --region=eu --target=${{ github.event.schedule == '0 0 * * *' && 'latest' || 'midnight' }}
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DISCORD_BLITZ_DB=${{ secrets.DISCORD_BLITZ_DB }} yarn publish:ratingleaderboard --region=eu --target=midnight --production

.github/workflows/cd-rating-latest.yml

@@ -0,0 +1,34 @@
+name: CD Rating North America
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  host:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Use node
+        uses: actions/setup-node@v4
+        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 all leaderboards
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DISCORD_BLITZ_DB=${{ secrets.DISCORD_BLITZ_DB }} yarn publish:ratingleaderboard --region=na,asia,eu --target=latest --production

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

@@ -1,11 +1,7 @@
-name: CD Ratings North America
-
-# latest: '0 0 * * *'
-# na midnight: '0 5 * * *'
+name: CD Rating North America
 
 on:
   schedule:
-    - cron: '0 0 * * *'
     - cron: '0 5 * * *'
 
 jobs:
@@ -35,4 +31,4 @@ jobs:
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DISCORD_BLITZ_DB=${{ secrets.DISCORD_BLITZ_DB }} yarn publish:ratingsleaderboard --region=na --target=${{ github.event.schedule == '0 0 * * *' && 'latest' || 'midnight' }}
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DISCORD_BLITZ_DB=${{ secrets.DISCORD_BLITZ_DB }} yarn publish:ratingleaderboard --region=na --target=midnight --production

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

@@ -33,6 +33,9 @@ jobs:
       - name: Install dependencies
         run: yarn
 
+      - name: Add fixed sharp
+        run: yarn add [email protected] --ignore-engines
+
       - name: Build
         run: yarn build:bot
 

.gitignore

@@ -8,7 +8,6 @@ dist/
 dist.*
 yarn-error.log
 /test.*
-test.*
 /docs/.vitepress/dist
 /docs/.vitepress/cache
 servers.csv
@@ -18,4 +17,6 @@ temp/
 /.yarn
 /.VSCodeCounter
 /.yarn
-depots
+depots
+public/sitemap*.xml
+public/robots.txt

.vscode/settings.json

@@ -16,6 +16,7 @@
     "betakrieg",
     "BINORMAL",
     "Binormals",
+    "BKRL",
     "bkwd",
     "blitzstars",
     "Camo",
@@ -99,8 +100,7 @@
     "POSITIVEZ",
     "Promisable",
     "Pyogenics",
-    "ratingsleaderboard",
-    "ratingsplot",
+    "ratingleaderboard",
     "raycaster",
     "researchable",
     "Resvg",

docs/changelogs/1.17.1.md

@@ -0,0 +1,8 @@
+# Blitzkrieg 1.17.1
+
+Some stability fixes.
+
+## Technical Changes
+
+- `sharp` is now included in the build instead of having being installed before runtime.
+- Png converter cache is now more memory efficient.

docs/changelogs/1.17.2.md

@@ -0,0 +1,13 @@
+# Blitzkrieg 1.17.2
+
+Introducing the new `/research` command!
+
+## Features
+
+- Added the `/research` command
+  - Type in the name of a tech tree tank you desire to research and this command will list all the expenses in researching all tanks in that line
+  - The starting tank is inferred automatically by the tanks you own
+    - This may be a bit inaccurate because of the lack of accurate information Wargaming provides about owned tanks
+  - You are also manually provide a starting tank and a user to see the progress on a line for
+- Replaced Vercel Analytics (which collapsed under the insane amount of traffic on the website) with Google Analytics
+- Spaced armor can now be toggled in the Tankopedia armor sandbox

docs/changelogs/1.18.0.md

@@ -0,0 +1,19 @@
+# Blitzkrieg 1.18.0
+
+Introducing the new `/rating` command!
+
+## Features
+
+- `/rating` command
+  - Features statistics on today's performance in ratings
+  - The included stats are battles, winrate, damage, survival, and kills
+  - This command also features the score, rank, and league you are at plus the reward you'll get if you are high enough on the leaderboard
+- `/ratings`, the old leaderboard command, has been renamed `/rating-leaderboard`
+  - Reward icons have been removed from the leaderboard
+
+## Technical Changes
+
+- Rating leaderboards are now built in a more action-efficient manner.
+  - This version also introduces the BKRL (Blitzkrieg rating leaderboard) file format which is an efficient way to store entire leaderboards of regions to disk (1 MB per 40,000 users).
+  - Latest archival actions now build all regions at once in a single action.
+- The sharp module is now included in the build.

docs/guide/bkrl.md

@@ -0,0 +1,45 @@
+# Blitzkrieg Rating Leaderboard
+
+A straightforward way of storing the entire World of Tanks Blitz rating leaderboard to disk.
+
+```cpp
+primary BlitzkriegRatingLeaderboard {
+  utf8"BKRL" magic;
+  Header header;
+  primary Body<header> body;
+}
+
+Header {
+  uint16 version; // always 1
+  Format format;
+  uint32 count;
+}
+
+Format enum<uint8> {
+  Base,
+  Superset1,
+}
+
+Body<Header header> match<header.format> {
+  Base {
+    primary {
+      uint32 id;
+      uint16 score;
+    }[header.count] entries;
+  };
+
+  Superset1 {
+    primary {
+      uint32 id;
+      uint16 score;
+
+      uint32 battles;
+      uint32 wins;
+      uint32 survived;
+
+      uint32 damage;
+      uint32 kills;
+    }[header.count] entries;
+  };
+}
+```

docs/guide/cdon.md

@@ -1,7 +1,5 @@
 # Cedilla Object Notation
 
-This documentation uses an experimental binary notation syntax called "Buffer Up".
-
 1. JSON compressed as CDON, written directly to disk (a direct 50% reduction).
 2. CDON further compressed with LZ4 (a clean 90% reduction).
 3. The raw JSON file as fetched from a random data source.
@@ -19,7 +17,7 @@ primary CedillaObjectNotation {
 }
 
 Header {
-  uint16 version;
+  uint16 version; // always 1
   FSFormat fsFormat;
   StringTable<fsFormat> stringTable;
 }

docs/guide/introduction.md

@@ -18,5 +18,5 @@ Blitzkrieg is available as a Discord bot and can be [installed very easily](/gui
 Provides a bunch of very helpful tools; https://blitz-krieg.vercel.app/
 
 - Session tracker
-- Ratings leaderboard
+- Rating leaderboard
 - Way more to come

next-sitemap.config.cjs

@@ -0,0 +1,6 @@
+/** @type {import('next-sitemap').IConfig} */
+module.exports = {
+  siteUrl: process.env.SITE_URL || 'https://blitz-krieg.vercel.app',
+  generateRobotsTxt: true,
+  sourceDir: 'dist/website',
+};

package.json

@@ -1,24 +1,23 @@
 {
   "name": "blitzkrieg",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "🎉 Tools for everything World of Tanks Blitz",
   "main": "src/server.ts",
   "type": "module",
   "scripts": {
-    "build:bot": "vite-node --script scripts/build",
-    "build:website": "next build",
+    "build:bot": "vite-node --script scripts/build --production",
+    "build:website": "next build && next-sitemap --config next-sitemap.config.cjs",
     "build:docs": "vitepress build docs",
-    "build:ratingsleaderboard": "vite-node --script scripts/buildRatingsLeaderboard",
+    "build:ratingleaderboard": "vite-node --script scripts/buildRatingLeaderboard",
     "build:assets": "vite-node --max_old_space_size=16384 --script scripts/buildAssets/index",
     "build:test": "vite-node --script scripts/buildTest",
-    "build:ratingsplot": "vite-node --script scripts/buildRatingsPlot",
-    "dev:bot": "yarn build:bot && yarn start:bot",
+    "dev:bot": "vite-node --script scripts/build --production && yarn start:bot",
     "dev:docs": "vitepress dev docs",
     "dev:website": "next dev",
     "start:bot": "node --enable-source-maps dist/bot/index.cjs",
     "start:website": "next start",
     "host:docs": "vitepress preview docs",
-    "publish:ratingsleaderboard": "vite-node --script scripts/buildRatingsLeaderboard --publish",
+    "publish:ratingleaderboard": "vite-node --script scripts/buildRatingLeaderboard --publish",
     "setup:patches": "vite-node --script scripts/applyPatches",
     "lint": "npx tsc",
     "lint:website": "next lint",
@@ -43,7 +42,6 @@
     "@resvg/resvg-js": "^2.4.1",
     "@types/three": "^0.160.0",
     "@vanilla-extract/css": "^1.13.0",
-    "@vercel/analytics": "^1.2.2",
     "bepaint": "^0.1.0-beta.3",
     "decompress": "^4.2.1",
     "discord.js": "^14.13.0",
@@ -58,6 +56,7 @@
     "lz4js": "^0.2.0",
     "markdown-escape": "^2.0.0",
     "next": "^14.1.0",
+    "next-sitemap": "^4.2.3",
     "parse-dds": "^1.2.1",
     "postprocessing": "^6.34.1",
     "react": "^18.2.0",
@@ -66,7 +65,7 @@
     "react-fuzzysort": "^1.0.1",
     "react-promise-suspense": "^0.3.4",
     "react-spinners": "^0.13.8",
-    "satori": "^0.10.8",
+    "satori": "^0.10.13",
     "sharp": "0.33.1",
     "three": "0.159.0",
     "three-stdlib": "^2.29.4",

scripts/build.ts

@@ -1,5 +1,9 @@
+import { exec } from 'child_process';
 import { build } from 'esbuild';
 import { cp, readdir } from 'fs/promises';
+import { argv } from 'process';
+
+const isProduction = argv.includes('--production');
 
 readdir('src/workers').then((workers) => {
   const files = [
@@ -25,6 +29,7 @@ readdir('src/workers').then((workers) => {
       '.js': '.cjs',
     },
 
+    external: ['sharp'],
     bundle: true,
     sourcemap: true,
     minifyIdentifiers: false, // causes goofy errors
@@ -42,3 +47,11 @@ readdir('node_modules/prisma').then((files) =>
     .filter((file) => file.endsWith('.node'))
     .map((file) => cp(`node_modules/prisma/${file}`, `dist/bot/${file}`)),
 );
+
+if (isProduction) {
+  // install fixed sharp
+  console.log('Installing fixed sharp...');
+  exec('yarn init -y && yarn add [email protected] --ignore-engines', {
+    cwd: 'dist/bot',
+  });
+}

scripts/buildRatingLeaderboard.ts

@@ -0,0 +1,199 @@
+import { chunk } from 'lodash';
+import { argv } from 'process';
+import {
+  RatingInfo,
+  RatingNeighbors,
+  RatingPlayer,
+} from '../src/commands/ratingLeaderboard';
+import { RegionSubdomain } from '../src/constants/regions';
+import { getAccountInfo } from '../src/core/blitz/getAccountInfo';
+import regionSubdomainToRegion from '../src/core/blitz/regionSubdomainToRegion';
+import { commitAssets } from '../src/core/blitzkrieg/commitAssets';
+import { FileChange } from '../src/core/blitzkrieg/commitMultipleFiles.js';
+import { patientFetchJSON } from '../src/core/blitzkrieg/patientFetchJSON';
+import { superCompress } from '../src/core/blitzkrieg/superCompress';
+import {
+  BkrlBaseEntry,
+  BkrlFormat,
+  BkrlSuperset1Entry,
+  BkrlWriteStream,
+} from '../src/core/streams/bkrl';
+import { CdonValue, CdonWriteStream } from '../src/core/streams/cdon';
+
+/*
+ * 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 * * *.
+ */
+
+const production = argv.includes('--production');
+const target = argv
+  .find((arg) => arg.startsWith('--target='))
+  ?.split('=')[1] as 'midnight' | 'latest' | undefined;
+const regionSubdomains = argv
+  .find((arg) => arg.startsWith('--region='))
+  ?.split('=')[1];
+
+if (!target) throw new Error('Target parameter not specified');
+if (!regionSubdomains) throw new Error('Region parameter not specified');
+
+regionSubdomains.split(',').forEach(async (regionSubdomain) => {
+  const region = regionSubdomainToRegion(regionSubdomain as RegionSubdomain);
+
+  console.log(`Building ${target} rating leaderboard for ${region}`);
+
+  const NEIGHBORS = 2 ** 8;
+  const PLAYERS = await patientFetchJSON<RatingInfo>(
+    `https://${regionSubdomain}.wotblitz.com/en/api/rating-leaderboards/season/`,
+  ).then((data) => (data.detail === undefined ? data.count : undefined));
+
+  if (PLAYERS === undefined) {
+    throw new Error('No current rating season running');
+  }
+
+  const players: Record<number, RatingPlayer> = {};
+  const leaderboard: BkrlBaseEntry[] = [];
+  let registered = 0;
+
+  async function branchFromPlayer(id: number) {
+    const { neighbors } = await patientFetchJSON<RatingNeighbors>(
+      `https://${regionSubdomain}.wotblitz.com/en/api/rating-leaderboards/user/${id}/?neighbors=${NEIGHBORS}`,
+    );
+
+    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 patientFetchJSON<{ result: RatingPlayer[] }>(
+      `https://${regionSubdomain}.wotblitz.com/en/api/rating-leaderboards/league/${id}/top/`,
+    );
+
+    const firstPlayer = result[0];
+    const lastPlayer = result.at(-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) {
+      leaderboard[index] = { id: listing.spa_id, score: listing.score };
+    } else {
+      console.warn(`Position ${index + 1} had no player`);
+      leaderboard[index] = { id: 0, score: 0 };
+    }
+  }
+
+  console.log('Requesting further stats...');
+  const comprehensiveLeaderboard: BkrlSuperset1Entry[] = [];
+  let chunkIndex = 0;
+  for (const leaderboardChunk of chunk(leaderboard, 100)) {
+    console.log(
+      `Chunk ${chunkIndex + 1} of ${Math.ceil(leaderboard.length / 100)}`,
+    );
+
+    const stats = await getAccountInfo(
+      region,
+      leaderboardChunk.map(({ id }) => id),
+      ['statistics.rating'],
+    );
+
+    stats.forEach((stat, index) => {
+      const trueIndex = chunkIndex * 100 + index;
+      comprehensiveLeaderboard[trueIndex] =
+        leaderboardChunk[index].id === 0 ||
+        stat?.statistics.rating === undefined
+          ? {
+              battles: 0,
+              damage: 0,
+              id: 0,
+              kills: 0,
+              score: 0,
+              survived: 0,
+              wins: 0,
+            }
+          : {
+              id: leaderboardChunk[index].id,
+              score: leaderboardChunk[index].score,
+              battles: stat.statistics.rating.battles,
+              damage: stat.statistics.rating.damage_dealt,
+              kills: stat.statistics.rating.frags,
+              survived: stat.statistics.rating.survived_battles,
+              wins: stat.statistics.rating.wins,
+            };
+    });
+
+    chunkIndex++;
+  }
+
+  const info = await patientFetchJSON<RatingInfo & { detail: undefined }>(
+    `https://${regionSubdomain}.wotblitz.com/en/api/rating-leaderboards/season/`,
+  );
+  const normalizedServer = regionSubdomain === 'na' ? 'com' : regionSubdomain;
+  const infoContent = new CdonWriteStream().cdon(
+    info as unknown as CdonValue,
+  ).uint8Array;
+  const leaderboardWriteStream = new BkrlWriteStream();
+
+  leaderboardWriteStream.bkrl({
+    format: BkrlFormat.Superset1,
+    entries: comprehensiveLeaderboard,
+  });
+
+  const changes: FileChange[] = [
+    {
+      path: `regions/${normalizedServer}/rating/${info.current_season}/info.cdon.lz4`,
+      content: superCompress(infoContent),
+      encoding: 'base64',
+    },
+    {
+      path: `regions/${normalizedServer}/rating/${info.current_season}/${target}.bkrl`,
+      content: Buffer.from(leaderboardWriteStream.uint8Array).toString(
+        'base64',
+      ),
+      encoding: 'base64',
+    },
+  ];
+
+  commitAssets(
+    `rating leaderboard ${regionSubdomain} ${target}`,
+    changes,
+    production,
+  );
+});

scripts/buildRatingsLeaderboard.ts

@@ -1,140 +0,0 @@
-import { rm, writeFile } from 'fs/promises';
-import { argv } from 'process';
-import {
-  RatingsInfo,
-  RatingsNeighbors,
-  RatingsPlayer,
-} from '../src/commands/ratings';
-import commitMultipleFiles from '../src/core/blitzkrieg/commitMultipleFiles.js';
-import { patientFetchJSON } from '../src/core/blitzkrieg/patientFetchJSON';
-
-/*
- * Central North American Time (UTC-5): use 0 5 * * *.
- * Central European Time (UTC+1): use 0 23 * * *.
- * Central Asia Standard Time (UTC+7): use 0 17 * * *.
- *
- * [region]/ratings/[season]/info.json: season info like rewards, start & end time, etc.
- * [region]/ratings/[season]/latest.json: the absolute latest leaderboard recorded at UTC+0 midnight
- * [region]/ratings/[season]/midnight.json: last midnight's leaderboard relative to the region
- */
-
-export type BlitzkriegRatingsLeaderboardEntry = { id: number; score: number };
-export type BlitzkriegRatingsLeaderboard = BlitzkriegRatingsLeaderboardEntry[];
-
-const publish = argv.includes('--publish');
-const target = argv
-  .find((arg) => arg.startsWith('--target='))
-  ?.split('=')[1] as 'midnight' | 'latest' | undefined;
-const server = argv.find((arg) => arg.startsWith('--region='))?.split('=')[1];
-
-if (!target) throw new Error('Target parameter not specified');
-if (!server) throw new Error('Region parameter not specified');
-
-const NEIGHBORS = 2 ** 8;
-const PLAYERS = await patientFetchJSON<RatingsInfo>(
-  `https://${server}.wotblitz.com/en/api/rating-leaderboards/season/`,
-).then((data) => (data.detail === undefined ? data.count : undefined));
-
-if (PLAYERS === undefined) {
-  throw new Error('No current ratings season running');
-}
-
-const players: Record<number, RatingsPlayer> = {};
-const leaderboard: BlitzkriegRatingsLeaderboard = [];
-let registered = 0;
-
-async function branchFromPlayer(id: number) {
-  const { neighbors } = await patientFetchJSON<RatingsNeighbors>(
-    `https://${server}.wotblitz.com/en/api/rating-leaderboards/user/${id}/?neighbors=${NEIGHBORS}`,
-  );
-
-  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 patientFetchJSON<{ result: RatingsPlayer[] }>(
-    `https://${server}.wotblitz.com/en/api/rating-leaderboards/league/${id}/top/`,
-  );
-
-  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`);
-    continue;
-  }
-
-  leaderboard[index] = {
-    id: listing.spa_id,
-    score: listing.score,
-  };
-}
-
-const leaderboardJSON = JSON.stringify(leaderboard);
-
-if (publish) {
-  const info = await patientFetchJSON<RatingsInfo & { detail: undefined }>(
-    `https://${server}.wotblitz.com/en/api/rating-leaderboards/season/`,
-  );
-  const normalizedServer = server === 'na' ? 'com' : server;
-  const infoPath = `regions/${normalizedServer}/ratings/${info.current_season}/info.json`;
-  const leaderboardPath = `regions/${normalizedServer}/ratings/${info.current_season}/${target}.json`;
-  const infoJSON = JSON.stringify(info);
-
-  console.log(`Publishing to season ${info.current_season}...`);
-  commitMultipleFiles(
-    'tresabhi',
-    'blitzkrieg-assets',
-    'main',
-    new Date().toString(),
-    [
-      { path: infoPath, content: infoJSON, encoding: 'utf-8' },
-      { path: leaderboardPath, content: leaderboardJSON, encoding: 'utf-8' },
-    ],
-  );
-} else {
-  console.log('Writing to disk...');
-  await rm('dist.json', { force: true });
-  await writeFile('dist.json', leaderboardJSON);
-}

scripts/buildRatingsPlot.ts

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

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

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

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

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

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

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

src/app/layout.tsx

@@ -3,12 +3,12 @@
 import { CaretRightIcon } from '@radix-ui/react-icons';
 import { AlertDialog, Button, Flex, Text, Theme } from '@radix-ui/themes';
 import '@radix-ui/themes/styles.css';
-import { Analytics } from '@vercel/analytics/react';
 import { config } from 'dotenv';
 import { Roboto_Flex } from 'next/font/google';
 import { usePathname } from 'next/navigation';
 import { ReactNode, useEffect, useState } from 'react';
 import { SkyLine } from '../assets/art/SkyLine';
+import { Analytics } from '../components/Analytics';
 import Navbar from '../components/Navbar';
 import PageWrapper from '../components/PageWrapper';
 import isDev from '../core/blitzkrieg/isDev';
@@ -51,6 +51,7 @@ export default function RootLayout({ children }: RootLayoutProps) {
           name="description"
           content="🎉 Tools for everything World of Tanks Blitz"
         />
+        <Analytics />
       </head>
 
       <body
@@ -60,8 +61,6 @@ export default function RootLayout({ children }: RootLayoutProps) {
           backgroundColor: isEmbed ? 'transparent' : undefined,
         }}
       >
-        <Analytics />
-
         <Theme
           appearance="dark"
           panelBackground="translucent"

src/app/tools/rating/page.tsx

@@ -15,11 +15,11 @@ import { produce } from 'immer';
 import { debounce, range } from 'lodash';
 import { ChangeEvent, useEffect, useRef, useState } from 'react';
 import { create } from 'zustand';
-import { RatingsInfo, RatingsPlayer } from '../../../commands/ratings';
+import { RatingInfo, RatingPlayer } from '../../../commands/ratingLeaderboard';
 import PageWrapper from '../../../components/PageWrapper';
 import { Skeleton } from '../../../components/Skeleton';
 import { LEAGUES } from '../../../constants/leagues';
-import { FIRST_ARCHIVED_RATINGS_SEASON } from '../../../constants/ratings';
+import { FIRST_MINIMAL_ARCHIVED_RATING_SEASON } from '../../../constants/rating';
 import {
   REGIONS,
   Region,
@@ -28,17 +28,17 @@ import {
 import { WARGAMING_APPLICATION_ID } from '../../../constants/wargamingApplicationID';
 import fetchBlitz from '../../../core/blitz/fetchBlitz';
 import { getClanAccountInfo } from '../../../core/blitz/getClanAccountInfo';
-import getRatingsInfo from '../../../core/blitz/getRatingsInfo';
-import { getRatingsLeague } from '../../../core/blitz/getRatingsLeague';
-import { getRatingsNeighbors } from '../../../core/blitz/getRatingsNeighbors';
-import { searchCurrentRatingsPlayers } from '../../../core/blitz/searchCurrentRatingsPlayers';
+import getRatingInfo from '../../../core/blitz/getRatingInfo';
+import { getRatingLeague } from '../../../core/blitz/getRatingLeague';
+import { getRatingNeighbors } from '../../../core/blitz/getRatingNeighbors';
+import { searchCurrentRatingPlayers } from '../../../core/blitz/searchCurrentRatingPlayers';
 import {
   AccountList,
   AccountListItem,
 } from '../../../core/blitz/searchPlayersAcrossRegions';
 import { getArchivedLatestSeasonNumber } from '../../../core/blitzkrieg/getArchivedLatestSeasonNumber';
-import getArchivedRatingsInfo from '../../../core/blitzkrieg/getArchivedRatingsInfo';
-import { getArchivedRatingsLeaderboard } from '../../../core/blitzkrieg/getArchivedRatingsLeaderboard';
+import getArchivedRatingInfo from '../../../core/blitzkrieg/getArchivedRatingInfo';
+import { getArchivedRatingLeaderboard } from '../../../core/blitzkrieg/getArchivedRatingLeaderboard';
 import { theme } from '../../../stitches.config';
 import { PageTurner } from './components/PageTurner';
 
@@ -51,7 +51,7 @@ interface NameCacheEntry {
 }
 type NameCache = Record<Region, Record<number, NameCacheEntry | null>>;
 type LeaderboardCache = Record<Region, Record<number, Record<number, number>>>;
-type InfoCache = Record<Region, Record<number, RatingsInfo | undefined>>;
+type InfoCache = Record<Region, Record<number, RatingInfo | undefined>>;
 type ScoreCache = Record<Region, Record<number, Record<number, number>>>;
 
 const useNameCache = create<NameCache>(() => ({
@@ -93,7 +93,7 @@ export default function Page() {
     { type: 'id'; id: number } | { type: 'position'; position: number } | null
   >(null);
 
-  const ratingsInfo = useInfoCache()[region][season];
+  const ratingInfo = useInfoCache()[region][season];
   const [latestArchivedSeasonNumber, setLatestArchivedSeasonNumber] = useState<
     number | null
   >(null);
@@ -111,7 +111,7 @@ export default function Page() {
   });
 
   const pages = Math.ceil(
-    (ratingsInfo && ratingsInfo.detail === undefined ? ratingsInfo?.count : 1) /
+    (ratingInfo && ratingInfo.detail === undefined ? ratingInfo?.count : 1) /
       ROWS_PER_PAGE,
   );
 
@@ -122,8 +122,8 @@ export default function Page() {
     (async () => {
       const newInfo =
         season === 0
-          ? await getRatingsInfo(region)
-          : await getArchivedRatingsInfo(region, season);
+          ? await getRatingInfo(region)
+          : await getArchivedRatingInfo(region, season);
       useInfoCache.setState(
         produce((draft: InfoCache) => {
           draft[region][season] = newInfo;
@@ -140,7 +140,7 @@ export default function Page() {
         const results = (
           await Promise.all(
             range(0, 5).map(async (league: number) => {
-              const data = await getRatingsLeague(region, league);
+              const data = await getRatingLeague(region, league);
               leaguePositionCache.current[region][league] = data[0].number - 1;
 
               return data;
@@ -178,12 +178,12 @@ export default function Page() {
         );
       })();
     } else {
-      getArchivedRatingsLeaderboard(region, season).then((results) => {
+      getArchivedRatingLeaderboard(region, season).then((results) => {
         useLeaderboardCache.setState(
           produce((draft: LeaderboardCache) => {
             if (!(season in draft[region])) draft[region][season] = {};
 
-            results.forEach((result, index) => {
+            results.entries.forEach((result, index) => {
               draft[region][season][index] = result.id;
             });
           }),
@@ -192,7 +192,7 @@ export default function Page() {
           produce((draft: ScoreCache) => {
             if (!(season in draft[region])) draft[region][season] = {};
 
-            results.forEach((result) => {
+            results.entries.forEach((result) => {
               draft[region][season][result.id] = result.score;
             });
           }),
@@ -213,7 +213,7 @@ export default function Page() {
   }, [leaderboard[region]?.[season] && 0 in leaderboard[region][season]]);
   // neighboring page caching for all seasons
   useEffect(() => {
-    if (!ratingsInfo || ratingsInfo?.detail) return;
+    if (!ratingInfo || ratingInfo?.detail) return;
 
     if (season === 0) {
       const middleIndex = page * ROWS_PER_PAGE + ROWS_PER_PAGE / 2;
@@ -236,7 +236,7 @@ export default function Page() {
       const ids = range(
         Math.max(0, (page - 1) * ROWS_PER_PAGE),
         Math.min(
-          ratingsInfo.count - 1,
+          ratingInfo.count - 1,
           (page + 1) * ROWS_PER_PAGE + ROWS_PER_PAGE,
         ),
       )
@@ -265,7 +265,7 @@ export default function Page() {
     page,
     region,
     season,
-    ratingsInfo?.detail,
+    ratingInfo?.detail,
     leaderboard[region][season] !== undefined &&
       0 in leaderboard[region][season],
   ]);
@@ -279,7 +279,7 @@ export default function Page() {
   async function cacheNeighbors(
     id: number,
     size: number,
-  ): Promise<RatingsPlayer[] | null> {
+  ): Promise<RatingPlayer[] | null> {
     const radius = Math.round(size / 2);
     const targetPosition = Object.entries(leaderboard[region][season]).find(
       ([, player]) => id === player,
@@ -303,7 +303,7 @@ export default function Page() {
       }
     }
 
-    const { neighbors } = await getRatingsNeighbors(region, id, size, true);
+    const { neighbors } = await getRatingNeighbors(region, id, size, true);
 
     useLeaderboardCache.setState(
       produce((draft: LeaderboardCache) => {
@@ -341,11 +341,11 @@ export default function Page() {
     return neighbors;
   }
   async function jumpToPosition(position: number) {
-    if (!ratingsInfo || ratingsInfo?.detail) return;
+    if (!ratingInfo || ratingInfo?.detail) return;
 
     const targetPosition = Math.min(
-      ratingsInfo.count - 1,
-      Math.max(0, Math.min(position, ratingsInfo.count - 1)),
+      ratingInfo.count - 1,
+      Math.max(0, Math.min(position, ratingInfo.count - 1)),
     );
 
     if (season === 0) {
@@ -378,7 +378,7 @@ export default function Page() {
       const loadingDirection = Math.sign(targetPosition - closestPosition);
       let seedingPlayer = closestPlayerId as number;
       let targetPositionAcquired = false;
-      let neighbors: RatingsPlayer[] | null;
+      let neighbors: RatingPlayer[] | null;
 
       setLoadingProgress([0, closestPositionDistance]);
 
@@ -423,7 +423,7 @@ export default function Page() {
     }
   }
   async function jumpToScore() {
-    if (!ratingsInfo || ratingsInfo?.detail) return;
+    if (!ratingInfo || ratingInfo?.detail) return;
 
     const targetScore = scoreInput.current!.valueAsNumber;
 
@@ -522,7 +522,7 @@ export default function Page() {
     } else {
       let playerIndex = -1;
 
-      for (let index = ratingsInfo.count; index >= 0; index--) {
+      for (let index = ratingInfo.count; index >= 0; index--) {
         if (!(index in leaderboard[region][season])) continue;
 
         if (scores[leaderboard[region][season][index]] >= targetScore) {
@@ -545,7 +545,7 @@ export default function Page() {
   }
 
   const totalPlayers =
-    !ratingsInfo?.detail && ratingsInfo?.count ? ratingsInfo.count : undefined;
+    !ratingInfo?.detail && ratingInfo?.count ? ratingInfo.count : undefined;
 
   return (
     <PageWrapper color="orange">
@@ -573,7 +573,7 @@ export default function Page() {
             <Select.Trigger style={{ flex: 1 }} />
 
             <Select.Content>
-              {ratingsInfo?.detail === undefined && (
+              {ratingInfo?.detail === undefined && (
                 <Select.Item value="0">Current season</Select.Item>
               )}
 
@@ -582,7 +582,7 @@ export default function Page() {
 
                 {latestArchivedSeasonNumber &&
                   range(
-                    FIRST_ARCHIVED_RATINGS_SEASON,
+                    FIRST_MINIMAL_ARCHIVED_RATING_SEASON,
                     latestArchivedSeasonNumber + 1,
                   )
                     .map((season) => (
@@ -681,8 +681,8 @@ export default function Page() {
                   <Select.Trigger />
 
                   <Select.Content>
-                    {ratingsInfo?.detail === undefined &&
-                      ratingsInfo?.leagues.map(({ index, title }) => (
+                    {ratingInfo?.detail === undefined &&
+                      ratingInfo?.leagues.map(({ index, title }) => (
                         <Select.Item key={index} value={`${index}`}>
                           {title}
                         </Select.Item>
@@ -714,11 +714,7 @@ export default function Page() {
                             );
                           }
                         } else {
-                          if (
-                            !ratingsInfo ||
-                            ratingsInfo.detail ||
-                            !leaderboard
-                          )
+                          if (!ratingInfo || ratingInfo.detail || !leaderboard)
                             return;
 
                           const minScore =
@@ -727,7 +723,7 @@ export default function Page() {
 
                           for (
                             let index = 0;
-                            index < ratingsInfo.count;
+                            index < ratingInfo.count;
                             index++
                           ) {
                             if (
@@ -779,7 +775,7 @@ export default function Page() {
                             setSearchLoading(true);
 
                             const accountList =
-                              await searchCurrentRatingsPlayers(
+                              await searchCurrentRatingPlayers(
                                 region,
                                 trimmedSearch,
                               );
@@ -885,12 +881,12 @@ export default function Page() {
                                 id: player.account_id,
                               });
                             } else {
-                              if (!ratingsInfo || ratingsInfo.detail) return;
+                              if (!ratingInfo || ratingInfo.detail) return;
                               let playerIndex = -1;
 
                               for (
                                 let index = 0;
-                                index < ratingsInfo.count;
+                                index < ratingInfo.count;
                                 index++
                               ) {
                                 if (
@@ -951,9 +947,7 @@ export default function Page() {
       </Flex>
 
       <PageTurner
-        totalPlayers={
-          (ratingsInfo?.detail ? undefined : ratingsInfo?.count) ?? 0
-        }
+        totalPlayers={(ratingInfo?.detail ? undefined : ratingInfo?.count) ?? 0}
         leaderboard={leaderboard[region][season] ?? {}}
         rowsPerPage={ROWS_PER_PAGE}
         page={page}
@@ -982,7 +976,7 @@ export default function Page() {
           page * ROWS_PER_PAGE,
           Math.min(
             page * ROWS_PER_PAGE + ROWS_PER_PAGE,
-            ratingsInfo?.detail ? 0 : (ratingsInfo?.count ?? 1) - 1,
+            ratingInfo?.detail ? 0 : (ratingInfo?.count ?? 1) - 1,
           ),
         ).map((index) => {
           const id = leaderboard[region][season]?.[index];
@@ -994,8 +988,8 @@ export default function Page() {
               : highlightedPlayer.position === index
             : false;
           const reward =
-            !ratingsInfo?.detail && ratingsInfo?.rewards
-              ? ratingsInfo.rewards.find(
+            !ratingInfo?.detail && ratingInfo?.rewards
+              ? ratingInfo.rewards.find(
                   (reward) =>
                     reward.from_position <= position &&
                     reward.to_position >= position,
@@ -1090,9 +1084,7 @@ export default function Page() {
       </Table.Root>
 
       <PageTurner
-        totalPlayers={
-          (ratingsInfo?.detail ? undefined : ratingsInfo?.count) ?? 0
-        }
+        totalPlayers={(ratingInfo?.detail ? undefined : ratingInfo?.count) ?? 0}
         rowsPerPage={ROWS_PER_PAGE}
         leaderboard={leaderboard[region][season] ?? {}}
         page={page}

src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx

@@ -8,6 +8,7 @@ import { Button, DropdownMenu, Flex } from '@radix-ui/themes';
 import { RefObject } from 'react';
 import { Pose, poseEvent } from '../../../../../../../core/blitzkrieg/pose';
 import mutateTankopediaPersistent, {
+  mutateTankopediaTemporary,
   useTankopediaPersistent,
 } from '../../../../../../../stores/tankopedia';
 import { ENVIRONMENTS } from '../../Lighting';
@@ -30,6 +31,9 @@ export function Options({ isFullScreen, canvasWrapper }: OptionsProps) {
   const wireframe = useTankopediaPersistent(
     (state) => state.model.visual.wireframe,
   );
+  const showSpacedArmor = useTankopediaPersistent(
+    (state) => state.model.visual.showSpacedArmor,
+  );
   const opaque = useTankopediaPersistent((state) => state.model.visual.opaque);
   const fullScreenAvailable =
     typeof document !== 'undefined' && document.fullscreenEnabled;
@@ -81,6 +85,20 @@ export function Options({ isFullScreen, canvasWrapper }: OptionsProps) {
           <DropdownMenu.Content>
             <DropdownMenu.Label>Armor</DropdownMenu.Label>
 
+            <DropdownMenu.CheckboxItem
+              checked={showSpacedArmor}
+              onCheckedChange={(checked) => {
+                mutateTankopediaPersistent((draft) => {
+                  draft.model.visual.showSpacedArmor = checked;
+                });
+                mutateTankopediaTemporary((draft) => {
+                  draft.shot = undefined;
+                });
+              }}
+            >
+              Spaced armor
+            </DropdownMenu.CheckboxItem>
+
             <DropdownMenu.CheckboxItem
               checked={greenPenetration}
               onCheckedChange={(checked) => {

src/commands/evolution.tsx

@@ -7,7 +7,7 @@ import TitleBar from '../components/TitleBar';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
 import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
 import resolveTankId from '../core/blitz/resolveTankId';
-import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL';
+import { emblemURL } from '../core/blitzkrieg/emblemURL';
 import getTankHistories from '../core/blitzkrieg/getTankHistories';
 import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
 import getPlayerHistories from '../core/blitzstars/getPlayerHistories';
@@ -41,7 +41,7 @@ async function render(
 ) {
   const accountInfo = await getAccountInfo(region, id);
   const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
-  const logo = clan ? emblemIdToURL(clan.emblem_set_id) : undefined;
+  const logo = clan ? emblemURL(clan.emblem_set_id) : undefined;
   const histories = await (type === 'player'
     ? getPlayerHistories(region, id, {
         start,

src/commands/fullStats.tsx

@@ -6,7 +6,7 @@ import TierWeights from '../components/TierWeights';
 import TitleBar from '../components/TitleBar';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
 import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
-import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL';
+import { emblemURL } from '../core/blitzkrieg/emblemURL';
 import { filtersToDescription } from '../core/blitzkrieg/filtersToDescription';
 import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
 import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
@@ -40,7 +40,7 @@ async function render(
 ) {
   const { nickname } = await getAccountInfo(region, id);
   const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
-  const clanImage = clan ? emblemIdToURL(clan.emblem_set_id) : undefined;
+  const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
   const diffedTankStats = await getStatsInPeriod(
     region,
     id,

src/commands/link.tsx

@@ -2,7 +2,7 @@ import { teal } from '@radix-ui/colors';
 import { GuildMemberRoleManager } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import discord from '../../discord.json' assert { type: 'json' };
-import { Glow } from '../components/AllStatsOverview/components/WN8Display/components/Glow';
+import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow';
 import CommandWrapper from '../components/CommandWrapper';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
 import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';

src/commands/rating.tsx

@@ -0,0 +1,487 @@
+import markdownEscape from 'markdown-escape';
+import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow';
+import CommandWrapper from '../components/CommandWrapper';
+import { DeltaCaret } from '../components/DeltaCaret';
+import TitleBar from '../components/TitleBar';
+import { getAccountInfo } from '../core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
+import { getLeagueFromScore } from '../core/blitz/getLeagueFromScore';
+import getRatingInfo from '../core/blitz/getRatingInfo';
+import { getRatingNeighbors } from '../core/blitz/getRatingNeighbors';
+import { normalizeLeagueIcon } from '../core/blitz/normalizeLeagueIcon';
+import { emblemURL } from '../core/blitzkrieg/emblemURL';
+import { getArchivedRatingLeaderboard } from '../core/blitzkrieg/getArchivedRatingLeaderboard';
+import { webpToPng } from '../core/blitzkrieg/iconPng';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+import { translator } from '../core/localization/translator';
+import { deltaBkrlBlitzStats } from '../core/statistics/deltaBkrlBlitzStats';
+import { BkrlFormat } from '../core/streams/bkrl';
+import { CommandRegistry } from '../events/interactionCreate';
+import { theme } from '../stitches.config';
+
+const LEAGUE_ACCENT = [
+  '_purple',
+  '_sand',
+  '_amber',
+  '_mauve',
+  '_brown',
+] as const;
+
+export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
+  resolve({
+    command:
+      createLocalizedCommand('rating').addStringOption(addUsernameChoices),
+
+    inProduction: true,
+    inPublic: true,
+
+    async handler(interaction) {
+      const { t, translate } = translator(interaction.locale);
+      const { id, region } = await resolvePlayerFromCommand(interaction);
+      const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+      const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
+      const leaderboard = await getArchivedRatingLeaderboard(region, 53);
+
+      if (leaderboard.format === BkrlFormat.Base) {
+        throw new Error(
+          'Encountered bkrl minimal format in latest season. Wait till next cron?',
+        );
+      }
+
+      const ratingInfo = await getRatingInfo(region);
+      const accountInfo = await getAccountInfo(region, id, [
+        'statistics.rating',
+      ]);
+      const statsIndex = leaderboard.entries.findIndex(
+        (entry) => entry.id === id,
+      );
+      const statsA = leaderboard.entries[statsIndex];
+      const numberA = statsIndex + 1;
+      const statsB1 = accountInfo.statistics.rating!;
+      const [statsB2] = (await getRatingNeighbors(region, id, 0)).neighbors;
+      const league = getLeagueFromScore(statsB2.score);
+
+      if (ratingInfo.detail) {
+        throw new Error(`Rating info not available for ${region}`);
+      }
+      if (!statsA) {
+        return t`bot.commands.rating.errors.unrecorded_stats`;
+      }
+      if (!statsB1) {
+        return translate('bot.commands.rating.errors.no_participation', [
+          markdownEscape(accountInfo.nickname),
+        ]);
+      }
+
+      const reward = ratingInfo.rewards.find(
+        (reward) =>
+          statsB2.number >= reward.from_position &&
+          statsB2.number <= reward.to_position,
+      );
+      const positionDelta = statsB2.number - numberA;
+      const delta = deltaBkrlBlitzStats(
+        statsA,
+        accountInfo.statistics.rating!,
+        statsB2,
+      );
+      const leagueTheme = LEAGUE_ACCENT[league.index];
+
+      return (
+        <CommandWrapper>
+          <TitleBar
+            title={accountInfo.nickname}
+            image={clanImage}
+            description={`${t`bot.commands.rating.body.subtitle`} • ${new Date().toLocaleDateString(
+              interaction.locale,
+            )}`}
+          />
+
+          <div
+            style={{
+              position: 'relative',
+              display: 'flex',
+              overflow: 'hidden',
+            }}
+          >
+            <div
+              style={{
+                position: 'relative',
+                padding: 16,
+                backgroundColor: theme.colors[`appBackground2${leagueTheme}`],
+                borderRadius: 4,
+                border: `1px solid ${theme.colors[`componentInteractive${leagueTheme}`]}`,
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'space-between',
+                width: '100%',
+              }}
+            >
+              {reward === undefined && (
+                <Glow
+                  endOpacity={3 / 4}
+                  color={theme.colors[`solidBackground${leagueTheme}`]}
+                  style={{
+                    transform: 'translateX(-16px) rotate(90deg)',
+                  }}
+                />
+              )}
+
+              <div
+                style={{
+                  display: 'flex',
+                  gap: 8,
+                  justifyContent: 'center',
+                  alignItems: 'center',
+                }}
+              >
+                <img
+                  style={{
+                    width: 64,
+                    height: 64,
+                    objectFit: 'contain',
+                  }}
+                  src={normalizeLeagueIcon(
+                    ratingInfo.leagues[league.index].big_icon,
+                  )}
+                />
+
+                <div
+                  style={{
+                    display: 'flex',
+                    flexDirection: 'column',
+                  }}
+                >
+                  <div
+                    style={{
+                      display: 'flex',
+                      alignItems: 'center',
+                      justifyContent: 'flex-start',
+                    }}
+                  >
+                    <span
+                      style={{
+                        color: theme.colors[`textHighContrast${leagueTheme}`],
+                        fontSize: 24,
+                        fontWeight: 900,
+                      }}
+                    >
+                      {statsB2.score.toLocaleString(interaction.locale)}
+                    </span>
+                    {delta.score !== 0 && (
+                      <>
+                        <DeltaCaret delta={delta.score} />
+                        <span
+                          style={{
+                            color:
+                              delta.score > 0
+                                ? theme.colors.textLowContrast_green
+                                : theme.colors.textLowContrast_red,
+                            fontSize: 16,
+                          }}
+                        >
+                          {Math.abs(delta.score).toLocaleString(
+                            interaction.locale,
+                          )}
+                        </span>
+                      </>
+                    )}
+                  </div>
+
+                  <div
+                    style={{
+                      display: 'flex',
+                      alignItems: 'center',
+                      justifyContent: 'flex-start',
+                    }}
+                  >
+                    <span
+                      style={{
+                        color: theme.colors[`textLowContrast${leagueTheme}`],
+                        fontSize: 16,
+                      }}
+                    >
+                      #{statsB2.number.toLocaleString(interaction.locale)}
+                    </span>
+                    {positionDelta !== 0 && (
+                      <>
+                        <DeltaCaret delta={positionDelta} />
+                        <span
+                          style={{
+                            color:
+                              positionDelta > 0
+                                ? theme.colors.textLowContrast_green
+                                : theme.colors.textLowContrast_red,
+                            fontSize: 16,
+                          }}
+                        >
+                          {Math.abs(positionDelta).toLocaleString(
+                            interaction.locale,
+                          )}
+                        </span>
+                      </>
+                    )}
+                  </div>
+                </div>
+              </div>
+
+              {reward && (
+                <div
+                  style={{
+                    display: 'flex',
+                    gap: 8,
+                    justifyContent: 'center',
+                    alignItems: 'center',
+                  }}
+                >
+                  <div
+                    style={{
+                      display: 'flex',
+                      flexDirection: 'column',
+                    }}
+                  >
+                    <div
+                      style={{
+                        display: 'flex',
+                        alignItems: 'center',
+                        justifyContent: 'flex-end',
+                      }}
+                    >
+                      <span
+                        style={{
+                          color: theme.colors[`textHighContrast${leagueTheme}`],
+                          fontSize: 16,
+                          maxWidth: 136,
+                          textAlign: 'right',
+                          whiteSpace: 'nowrap',
+                          textOverflow: 'ellipsis',
+                          overflow: 'hidden',
+                        }}
+                      >
+                        {reward.type === 'vehicle'
+                          ? reward.vehicle.user_string
+                          : reward.stuff.title}
+                      </span>
+                    </div>
+
+                    <div
+                      style={{
+                        display: 'flex',
+                        alignItems: 'center',
+                        justifyContent: 'flex-end',
+                      }}
+                    >
+                      <span
+                        style={{
+                          color: theme.colors[`textLowContrast${leagueTheme}`],
+                          fontSize: 16,
+                        }}
+                      >
+                        Reward
+                        {reward.type === 'stuff' ? ` x${reward.count}` : ''}
+                      </span>
+                    </div>
+                  </div>
+
+                  <img
+                    style={{
+                      width: 64,
+                      height: 64,
+                      objectFit: 'cover',
+                    }}
+                    src={await webpToPng(
+                      reward.type === 'vehicle'
+                        ? reward.vehicle.preview_image_url
+                        : reward.stuff.image_url,
+                    )}
+                  />
+                </div>
+              )}
+
+              {reward === undefined && (
+                <Glow
+                  endOpacity={3 / 4}
+                  color={theme.colors[`solidBackground${leagueTheme}`]}
+                  style={{
+                    transform: 'translateX(16px) rotate(-90deg)',
+                  }}
+                />
+              )}
+            </div>
+
+            {/* separated because fragment middle man invalidates relative parent: https://github.com/vercel/satori/issues/605 */}
+            {reward && (
+              <Glow
+                direction="reverse"
+                color={theme.colors[`solidBackground${leagueTheme}`]}
+                style={{
+                  position: 'absolute',
+                  top: -40,
+                  left: '50%',
+                  transform: 'translateX(-50%)',
+                }}
+              />
+            )}
+            {reward && (
+              <Glow
+                color={theme.colors[`solidBackground${leagueTheme}`]}
+                style={{
+                  position: 'absolute',
+                  bottom: -40,
+                  left: '50%',
+                  transform: 'translateX(-50%)',
+                }}
+              />
+            )}
+          </div>
+
+          <div style={{ padding: '8px 0', display: 'flex' }}>
+            <div
+              style={{
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                gap: 4,
+                flex: 1,
+                flexDirection: 'column',
+              }}
+            >
+              <span
+                style={{
+                  fontSize: 24,
+                  color: theme.colors.textHighContrast,
+                  fontWeight: 'bold',
+                }}
+              >
+                {delta.battles.toLocaleString(interaction.locale)}
+              </span>
+              <span
+                style={{
+                  fontSize: 16,
+                  color: theme.colors.textLowContrast,
+                }}
+              >
+                Battles
+              </span>
+            </div>
+            <div
+              style={{
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                gap: 4,
+                flex: 1,
+                flexDirection: 'column',
+              }}
+            >
+              <span
+                style={{
+                  fontSize: 24,
+                  color: theme.colors.textHighContrast,
+                  fontWeight: 'bold',
+                }}
+              >
+                {(100 * (delta.wins / delta.battles)).toFixed(0)}%
+              </span>
+              <span
+                style={{
+                  fontSize: 16,
+                  color: theme.colors.textLowContrast,
+                }}
+              >
+                Winrate
+              </span>
+            </div>
+            <div
+              style={{
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                gap: 4,
+                flex: 1,
+                flexDirection: 'column',
+              }}
+            >
+              <span
+                style={{
+                  fontSize: 24,
+                  color: theme.colors.textHighContrast,
+                  fontWeight: 'bold',
+                }}
+              >
+                {Math.round(delta.damage / delta.battles).toLocaleString(
+                  interaction.locale,
+                )}
+              </span>
+              <span
+                style={{
+                  fontSize: 16,
+                  color: theme.colors.textLowContrast,
+                }}
+              >
+                Damage
+              </span>
+            </div>
+            <div
+              style={{
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                gap: 4,
+                flex: 1,
+                flexDirection: 'column',
+              }}
+            >
+              <span
+                style={{
+                  fontSize: 24,
+                  color: theme.colors.textHighContrast,
+                  fontWeight: 'bold',
+                }}
+              >
+                {(100 * (delta.survived / delta.battles)).toFixed(0)}%
+              </span>
+              <span
+                style={{
+                  fontSize: 16,
+                  color: theme.colors.textLowContrast,
+                }}
+              >
+                Survival
+              </span>
+            </div>
+            <div
+              style={{
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                gap: 4,
+                flex: 1,
+                flexDirection: 'column',
+              }}
+            >
+              <span
+                style={{
+                  fontSize: 24,
+                  color: theme.colors.textHighContrast,
+                  fontWeight: 'bold',
+                }}
+              >
+                {(delta.kills / delta.battles).toFixed(2)}
+              </span>
+              <span
+                style={{
+                  fontSize: 16,
+                  color: theme.colors.textLowContrast,
+                }}
+              >
+                Kills
+              </span>
+            </div>
+          </div>
+        </CommandWrapper>
+      );
+    },
+  });
+});

src/commands/ratingLeaderboard.tsx

@@ -0,0 +1,513 @@
+import {
+  APIApplicationCommandOptionChoice,
+  Locale,
+  SlashCommandSubcommandBuilder,
+} from 'discord.js';
+import { range } from 'lodash';
+import markdownEscape from 'markdown-escape';
+import CommandWrapper from '../components/CommandWrapper';
+import * as Leaderboard from '../components/Leaderboard';
+import TitleBar from '../components/TitleBar';
+import { LEAGUES } from '../constants/leagues';
+import { FIRST_MINIMAL_ARCHIVED_RATING_SEASON } from '../constants/rating';
+import { Region } from '../constants/regions';
+import { getAccountInfo } from '../core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
+import getRatingInfo from '../core/blitz/getRatingInfo';
+import { getRatingLeague } from '../core/blitz/getRatingLeague';
+import { getRatingNeighbors } from '../core/blitz/getRatingNeighbors';
+import { isOnGoingRatingSeason } from '../core/blitz/isOnGoingRatingSeason';
+import { getArchivedLatestSeasonNumber } from '../core/blitzkrieg/getArchivedLatestSeasonNumber';
+import getArchivedRatingInfo from '../core/blitzkrieg/getArchivedRatingInfo';
+import { getArchivedRatingLeaderboard } from '../core/blitzkrieg/getArchivedRatingLeaderboard';
+import getArchivedRatingMidnightLeaderboard from '../core/blitzkrieg/getArchivedRatingMidnightLeaderboard';
+import addRegionChoices from '../core/discord/addRegionChoices';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import autocompleteUsername from '../core/discord/autocompleteUsername';
+import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
+import { localizationObject } from '../core/discord/localizationObject';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+import { translator } from '../core/localization/translator';
+import { BkrlDiscriminatedEntries } from '../core/streams/bkrl';
+import { CommandRegistry } from '../events/interactionCreate';
+import { UserError } from '../hooks/userError';
+
+export interface RatingPlayer {
+  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: RatingPlayer[];
+}
+
+export type RatingReward = {
+  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_image_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 RatingLeague {
+  title: string;
+  small_icon: string;
+  big_icon: string;
+  background: string;
+  index: number;
+  percentile: number;
+}
+
+export type RatingInfo =
+  | {
+      detail: undefined;
+
+      title: string;
+      icon: string | null;
+      start_at: string;
+      finish_at: string;
+      current_season: number;
+      updated_at: string;
+      count: number;
+
+      rewards: RatingReward[];
+      leagues: RatingLeague[];
+    }
+  | { detail: { error: string } };
+
+export interface RatingNeighbors {
+  neighbors: RatingPlayer[];
+}
+
+interface SimplifiedPlayer {
+  id: number;
+  score: number;
+  position: number;
+  clan: string | undefined;
+  nickname: string;
+}
+
+const DEFAULT_LIMIT = 10;
+
+export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
+  async (resolve) => {
+    const latestArchivedSeasonNumber = await getArchivedLatestSeasonNumber();
+    const onGoingSeason = await isOnGoingRatingSeason();
+    const seasonNumbers = range(
+      FIRST_MINIMAL_ARCHIVED_RATING_SEASON,
+      latestArchivedSeasonNumber + (onGoingSeason ? 1 : 0) + 1,
+    );
+
+    function addOptions(option: SlashCommandSubcommandBuilder) {
+      const { t, translate } = translator(Locale.EnglishUS);
+
+      return option
+        .addIntegerOption((option) =>
+          option
+            .setName(t`bot.commands.rating_leaderboard.options.limit`)
+            .setNameLocalizations(
+              localizationObject(
+                'bot.commands.rating_leaderboard.options.limit',
+              ),
+            )
+            .setDescription(
+              translate(
+                'bot.commands.rating_leaderboard.options.limit.description',
+                [`${DEFAULT_LIMIT}`],
+              ),
+            )
+            .setDescriptionLocalizations(
+              localizationObject(
+                'bot.commands.rating_leaderboard.options.limit.description',
+                [`${DEFAULT_LIMIT}`],
+              ),
+            )
+            .setRequired(false)
+            .setMinValue(5)
+            .setMaxValue(30),
+        )
+        .addStringOption((option) =>
+          option
+            .setName(t`bot.commands.rating_leaderboard.options.season`)
+            .setNameLocalizations(
+              localizationObject(
+                'bot.commands.rating_leaderboard.options.season',
+              ),
+            )
+            .setDescription(
+              translate(
+                'bot.commands.rating_leaderboard.options.season.description',
+              ),
+            )
+            .setDescriptionLocalizations(
+              localizationObject(
+                'bot.commands.rating_leaderboard.options.season.description',
+              ),
+            )
+            .setRequired(false)
+            .addChoices(
+              ...seasonNumbers
+                .map((number, index) => {
+                  const current =
+                    index === seasonNumbers.length - 1 && onGoingSeason;
+
+                  return {
+                    name: current
+                      ? translate(
+                          'bot.commands.rating_leaderboard.options.season.choices.current',
+                          [`${number}`],
+                        )
+                      : `${number}`,
+                    value: `${number}`,
+                    name_localizations: current
+                      ? localizationObject(
+                          'bot.commands.rating_leaderboard.options.season.choices.current',
+                          [`${number}`],
+                        )
+                      : undefined,
+                  } satisfies APIApplicationCommandOptionChoice<string>;
+                })
+                .reverse(),
+            ),
+        );
+    }
+
+    resolve({
+      inProduction: true,
+      inPublic: true,
+
+      command: createLocalizedCommand('rating-leaderboard', [
+        {
+          subcommand: 'neighbors',
+          modify(option: SlashCommandSubcommandBuilder) {
+            option.addStringOption(addUsernameChoices);
+            addOptions(option);
+          },
+        },
+        {
+          subcommand: 'league',
+          modify(option: SlashCommandSubcommandBuilder) {
+            option
+              .addStringOption((option) => {
+                const { t, translate } = translator(Locale.EnglishUS);
+
+                return option
+                  .setName(t`bot.commands.rating_leaderboard.options.league`)
+                  .setNameLocalizations(
+                    localizationObject(
+                      'bot.commands.rating_leaderboard.options.league',
+                    ),
+                  )
+                  .setDescription(
+                    translate(
+                      'bot.commands.rating_leaderboard.options.league.description',
+                    ),
+                  )
+                  .setDescriptionLocalizations(
+                    localizationObject(
+                      'bot.commands.rating_leaderboard.options.league.description',
+                    ),
+                  )
+                  .addChoices(
+                    ...LEAGUES.map(
+                      ({ name }, value) =>
+                        ({
+                          name: translate(`common.leagues.${name}`),
+                          value: `${value}`,
+                          name_localizations: localizationObject(
+                            `common.leagues.${name}`,
+                          ),
+                        }) satisfies APIApplicationCommandOptionChoice<string>,
+                    ),
+                  )
+                  .setRequired(true);
+              })
+              .addStringOption(addRegionChoices);
+            addOptions(option);
+          },
+        },
+      ]),
+
+      // BIG TODO: title seems to be in english
+
+      async handler(interaction) {
+        const { t, translate } = translator(interaction.locale);
+        const subcommand = interaction.options.getSubcommand(true) as
+          | 'league'
+          | 'neighbors';
+        const limit = interaction.options.getInteger('limit') ?? DEFAULT_LIMIT;
+        const seasonOption = interaction.options.getString('season');
+        const season = seasonOption
+          ? parseInt(seasonOption)
+          : onGoingSeason
+            ? latestArchivedSeasonNumber + 1
+            : latestArchivedSeasonNumber;
+        const isCurrentSeason = season === latestArchivedSeasonNumber + 1;
+        let titleName: string;
+        let titleImage: string | undefined;
+        let titleDescription: string;
+        let playersAfter: number;
+        let players: SimplifiedPlayer[] | undefined;
+        let midnightLeaderboard: BkrlDiscriminatedEntries | null;
+        let playerId: number | undefined;
+        let regionRatingInfo: RatingInfo;
+
+        if (subcommand === 'league') {
+          const leagueIndex = parseInt(
+            interaction.options.getString('league')!,
+          );
+          const region = interaction.options.getString('region') as Region;
+          regionRatingInfo = await (isCurrentSeason
+            ? getRatingInfo(region)
+            : getArchivedRatingInfo(region, season!));
+
+          if (regionRatingInfo.detail !== undefined)
+            return t`bot.commands.rating_leaderboard.body.no_ongoing_season`;
+
+          const result = isCurrentSeason
+            ? await getRatingLeague(region, leagueIndex).then(async (result) =>
+                result.slice(0, limit).map(
+                  (player) =>
+                    ({
+                      id: player.spa_id,
+                      score: player.score,
+                      position: player.number,
+                      clan: player.clan_tag,
+                      nickname: player.nickname,
+                    }) satisfies SimplifiedPlayer,
+                ),
+              )
+            : await getArchivedRatingLeaderboard(region, season!).then(
+                async (players) => {
+                  const firstPlayerIndex =
+                    leagueIndex === 0
+                      ? 0
+                      : players.entries.findIndex(
+                          (player) =>
+                            player.score < LEAGUES[leagueIndex - 1].minScore,
+                        );
+                  const lastPlayerIndex = firstPlayerIndex + limit - 1;
+                  const trimmed = players.entries.slice(
+                    firstPlayerIndex,
+                    lastPlayerIndex + 1,
+                  );
+                  const clanData = await getClanAccountInfo(
+                    region,
+                    trimmed.map(({ id }) => id),
+                    ['clan'],
+                  );
+
+                  return trimmed.map(
+                    (player, index) =>
+                      ({
+                        id: player.id,
+                        score: player.score,
+                        position: firstPlayerIndex + index + 1,
+                        clan: clanData[player.id]?.clan?.tag,
+                        nickname:
+                          clanData[index]?.account_name ??
+                          translate(
+                            'bot.commands.rating_leaderboard.body.deleted_player',
+                            [`${player.id}`],
+                          ),
+                      }) satisfies SimplifiedPlayer,
+                  );
+                },
+              );
+          const leagueInfo = regionRatingInfo.leagues[leagueIndex];
+          midnightLeaderboard = isCurrentSeason
+            ? await getArchivedRatingMidnightLeaderboard(
+                region,
+                regionRatingInfo.current_season,
+              )
+            : await getArchivedRatingMidnightLeaderboard(region, season!);
+
+          players = result;
+          playersAfter =
+            regionRatingInfo.count - result[result.length - 1].position;
+          titleName = `${
+            leagueInfo
+              ? translate(`common.leagues.${LEAGUES[leagueInfo.index].name}`)
+              : ''
+          } - ${translate(`common.regions.short.${region}`)}`;
+          titleImage = leagueInfo.big_icon.startsWith('http')
+            ? leagueInfo.big_icon
+            : `https:${leagueInfo.big_icon}`;
+          titleDescription = translate(
+            'bot.commands.rating_leaderboard.body.top_players',
+            [`${limit}`],
+          );
+        } else {
+          const { region, id } = await resolvePlayerFromCommand(interaction);
+          regionRatingInfo = isCurrentSeason
+            ? await getRatingInfo(region)
+            : await getArchivedRatingInfo(region, season!);
+
+          if (regionRatingInfo.detail !== undefined)
+            return t`bot.commands.rating_leaderboard.body.no_ongoing_season`;
+
+          const accountInfo = await getAccountInfo(region, id);
+          const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+          const neighbors = isCurrentSeason
+            ? await getRatingNeighbors(region, id, Math.round(limit / 2)).then(
+                (players) =>
+                  players.neighbors.map(
+                    (player) =>
+                      ({
+                        id: player.spa_id,
+                        position: player.number,
+                        score: player.score,
+                        clan: player.clan_tag,
+                        nickname: player.nickname,
+                      }) satisfies SimplifiedPlayer,
+                  ),
+              )
+            : await getArchivedRatingLeaderboard(region, season!).then(
+                async (players) => {
+                  const playerIndex = players.entries.findIndex(
+                    (player) => player.id === id,
+                  );
+
+                  if (playerIndex === -1) {
+                    throw new UserError(
+                      translate(
+                        'bot.commands.rating_leaderboard.body.no_participation',
+                        [markdownEscape(accountInfo.nickname), `${season}`],
+                      ),
+                    );
+                  }
+
+                  const halfRange = Math.round(limit / 2);
+                  const trimmed = players.entries.slice(
+                    playerIndex - halfRange,
+                    playerIndex + halfRange + 1,
+                  );
+                  const clanData = await getClanAccountInfo(
+                    region,
+                    trimmed.map((player) => player.id),
+                    ['clan'],
+                  );
+
+                  return trimmed.map((player, index) => ({
+                    id: player.id,
+                    score: player.score,
+                    position: playerIndex + index + 1,
+                    clan: clanData[index]?.clan?.tag,
+                    nickname: clanData[index]
+                      ? clanData[index]!.account_name
+                      : `Deleted ${player.id}`,
+                  }));
+                },
+              );
+          midnightLeaderboard = isCurrentSeason
+            ? await getArchivedRatingMidnightLeaderboard(
+                region,
+                regionRatingInfo.current_season,
+              )
+            : await getArchivedRatingMidnightLeaderboard(region, season!);
+
+          players = neighbors;
+          titleImage = clan
+            ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clan.emblem_set_id}.png`
+            : undefined;
+          titleName = neighbors ? accountInfo.nickname : '';
+          titleDescription = t`bot.commands.rating_leaderboard.body.neighbors`;
+          playersAfter =
+            regionRatingInfo.count - neighbors[neighbors.length - 1].position;
+          playerId = id;
+        }
+
+        const items = players.map((player) => {
+          const midnightIndex = midnightLeaderboard?.entries.findIndex(
+            (item) => item.id === player.id,
+          );
+          const midnightScore =
+            midnightIndex === undefined
+              ? player.score
+              : midnightLeaderboard!.entries[midnightIndex].score;
+          const midnightPosition =
+            midnightIndex === undefined ? player.position : midnightIndex + 1;
+
+          return (
+            <Leaderboard.Item
+              nickname={player.nickname}
+              score={player.score}
+              position={player.position}
+              clan={player.clan}
+              deltaScore={player.score - midnightScore}
+              deltaPosition={midnightPosition - player.position}
+              key={player.id}
+              highlight={player.id === playerId}
+            />
+          );
+        });
+
+        return (
+          <CommandWrapper>
+            <TitleBar
+              title={titleName}
+              image={titleImage}
+              description={titleDescription}
+            />
+
+            {items && (
+              <Leaderboard.Root>
+                {items}
+                {playersAfter > 0 && (
+                  <Leaderboard.Gap
+                    message={translate(
+                      'bot.commands.rating_leaderboard.body.more',
+                      [`${playersAfter.toLocaleString(interaction.locale)}`],
+                    )}
+                  />
+                )}
+              </Leaderboard.Root>
+            )}
+          </CommandWrapper>
+        );
+      },
+
+      autocomplete: autocompleteUsername,
+    });
+  },
+);

src/commands/ratings.tsx

@@ -1,505 +0,0 @@
-import {
-  APIApplicationCommandOptionChoice,
-  Locale,
-  SlashCommandSubcommandBuilder,
-} from 'discord.js';
-import { range } from 'lodash';
-import markdownEscape from 'markdown-escape';
-import { BlitzkriegRatingsLeaderboard } from '../../scripts/buildRatingsLeaderboard';
-import CommandWrapper from '../components/CommandWrapper';
-import * as Leaderboard from '../components/Leaderboard';
-import TitleBar from '../components/TitleBar';
-import { LEAGUES } from '../constants/leagues';
-import { FIRST_ARCHIVED_RATINGS_SEASON } from '../constants/ratings';
-import { Region } from '../constants/regions';
-import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
-import getRatingsInfo from '../core/blitz/getRatingsInfo';
-import { getRatingsLeague } from '../core/blitz/getRatingsLeague';
-import { getRatingsNeighbors } from '../core/blitz/getRatingsNeighbors';
-import { isOnGoingRatingsSeason } from '../core/blitz/isOnGoingRatingsSeason';
-import { getArchivedLatestSeasonNumber } from '../core/blitzkrieg/getArchivedLatestSeasonNumber';
-import getArchivedRatingsInfo from '../core/blitzkrieg/getArchivedRatingsInfo';
-import { getArchivedRatingsLeaderboard } from '../core/blitzkrieg/getArchivedRatingsLeaderboard';
-import getArchivedRatingsMidnightLeaderboard from '../core/blitzkrieg/getArchivedRatingsMidnightLeaderboard';
-import addRegionChoices from '../core/discord/addRegionChoices';
-import addUsernameChoices from '../core/discord/addUsernameChoices';
-import autocompleteUsername from '../core/discord/autocompleteUsername';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { localizationObject } from '../core/discord/localizationObject';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
-import { UserError } from '../hooks/userError';
-
-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 type RatingsInfo =
-  | {
-      detail: undefined;
-
-      title: string;
-      icon: string | null;
-      start_at: string;
-      finish_at: string;
-      current_season: number;
-      updated_at: string;
-      count: number;
-
-      rewards: RatingsReward[];
-      leagues: RatingsLeague[];
-    }
-  | { detail: { error: string } };
-
-export interface RatingsNeighbors {
-  neighbors: RatingsPlayer[];
-}
-
-interface SimplifiedPlayer {
-  id: number;
-  score: number;
-  position: number;
-  clan: string | undefined;
-  nickname: string;
-}
-
-const DEFAULT_LIMIT = 10;
-
-export const ratingsCommand = new Promise<CommandRegistry>(async (resolve) => {
-  const latestArchivedSeasonNumber = await getArchivedLatestSeasonNumber();
-  const onGoingSeason = await isOnGoingRatingsSeason();
-  const seasonNumbers = range(
-    FIRST_ARCHIVED_RATINGS_SEASON,
-    latestArchivedSeasonNumber + (onGoingSeason ? 1 : 0) + 1,
-  );
-
-  function addOptions(option: SlashCommandSubcommandBuilder) {
-    const { t, translate } = translator(Locale.EnglishUS);
-
-    return option
-      .addIntegerOption((option) =>
-        option
-          .setName(t`bot.commands.ratings.options.limit`)
-          .setNameLocalizations(
-            localizationObject('bot.commands.ratings.options.limit'),
-          )
-          .setDescription(
-            translate('bot.commands.ratings.options.limit.description', [
-              `${DEFAULT_LIMIT}`,
-            ]),
-          )
-          .setDescriptionLocalizations(
-            localizationObject(
-              'bot.commands.ratings.options.limit.description',
-              [`${DEFAULT_LIMIT}`],
-            ),
-          )
-          .setRequired(false)
-          .setMinValue(5)
-          .setMaxValue(30),
-      )
-      .addStringOption((option) =>
-        option
-          .setName(t`bot.commands.ratings.options.season`)
-          .setNameLocalizations(
-            localizationObject('bot.commands.ratings.options.season'),
-          )
-          .setDescription(
-            translate('bot.commands.ratings.options.season.description'),
-          )
-          .setDescriptionLocalizations(
-            localizationObject(
-              'bot.commands.ratings.options.season.description',
-            ),
-          )
-          .setRequired(false)
-          .addChoices(
-            ...seasonNumbers
-              .map((number, index) => {
-                const current =
-                  index === seasonNumbers.length - 1 && onGoingSeason;
-
-                return {
-                  name: current
-                    ? translate(
-                        'bot.commands.ratings.options.season.choices.current',
-                        [`${number}`],
-                      )
-                    : `${number}`,
-                  value: `${number}`,
-                  name_localizations: current
-                    ? localizationObject(
-                        'bot.commands.ratings.options.season.choices.current',
-                        [`${number}`],
-                      )
-                    : undefined,
-                } satisfies APIApplicationCommandOptionChoice<string>;
-              })
-              .reverse(),
-          ),
-      );
-  }
-
-  resolve({
-    inProduction: true,
-    inPublic: true,
-
-    command: createLocalizedCommand('ratings', [
-      {
-        subcommand: 'neighbors',
-        modify(option: SlashCommandSubcommandBuilder) {
-          option.addStringOption(addUsernameChoices);
-          addOptions(option);
-        },
-      },
-      {
-        subcommand: 'league',
-        modify(option: SlashCommandSubcommandBuilder) {
-          option
-            .addStringOption((option) => {
-              const { t, translate } = translator(Locale.EnglishUS);
-
-              return option
-                .setName(t`bot.commands.ratings.options.league`)
-                .setNameLocalizations(
-                  localizationObject('bot.commands.ratings.options.league'),
-                )
-                .setDescription(
-                  translate('bot.commands.ratings.options.league.description'),
-                )
-                .setDescriptionLocalizations(
-                  localizationObject(
-                    'bot.commands.ratings.options.league.description',
-                  ),
-                )
-                .addChoices(
-                  ...LEAGUES.map(
-                    ({ name }, value) =>
-                      ({
-                        name: translate(`common.leagues.${name}`),
-                        value: `${value}`,
-                        name_localizations: localizationObject(
-                          `common.leagues.${name}`,
-                        ),
-                      }) satisfies APIApplicationCommandOptionChoice<string>,
-                  ),
-                )
-                .setRequired(true);
-            })
-            .addStringOption(addRegionChoices);
-          addOptions(option);
-        },
-      },
-    ]),
-
-    // BIG TODO: title seems to be in english
-
-    async handler(interaction) {
-      const { t, translate } = translator(interaction.locale);
-      const subcommand = interaction.options.getSubcommand(true) as
-        | 'league'
-        | 'neighbors';
-      const limit = interaction.options.getInteger('limit') ?? DEFAULT_LIMIT;
-      const seasonOption = interaction.options.getString('season');
-      const season = seasonOption
-        ? parseInt(seasonOption)
-        : onGoingSeason
-          ? latestArchivedSeasonNumber + 1
-          : latestArchivedSeasonNumber;
-      const isCurrentSeason = season === latestArchivedSeasonNumber + 1;
-      let titleName: string;
-      let titleImage: string | undefined;
-      let titleDescription: string;
-      let playersAfter: number;
-      let players: SimplifiedPlayer[] | undefined;
-      let midnightLeaderboard: BlitzkriegRatingsLeaderboard | undefined;
-      let playerId: number | undefined;
-      let regionRatingsInfo: RatingsInfo;
-
-      if (subcommand === 'league') {
-        const leagueIndex = parseInt(interaction.options.getString('league')!);
-        const region = interaction.options.getString('region') as Region;
-        regionRatingsInfo = await (isCurrentSeason
-          ? getRatingsInfo(region)
-          : getArchivedRatingsInfo(region, season!));
-
-        if (regionRatingsInfo.detail !== undefined)
-          return t`bot.commands.ratings.body.no_ongoing_season`;
-
-        const result = isCurrentSeason
-          ? await getRatingsLeague(region, leagueIndex).then(async (result) =>
-              result.slice(0, limit).map(
-                (player) =>
-                  ({
-                    id: player.spa_id,
-                    score: player.score,
-                    position: player.number,
-                    clan: player.clan_tag,
-                    nickname: player.nickname,
-                  }) satisfies SimplifiedPlayer,
-              ),
-            )
-          : await getArchivedRatingsLeaderboard(region, season!).then(
-              async (players) => {
-                const firstPlayerIndex =
-                  leagueIndex === 0
-                    ? 0
-                    : players.findIndex(
-                        (player) =>
-                          player.score < LEAGUES[leagueIndex - 1].minScore,
-                      );
-                const lastPlayerIndex = firstPlayerIndex + limit - 1;
-                const trimmed = players.slice(
-                  firstPlayerIndex,
-                  lastPlayerIndex + 1,
-                );
-                const clanData = await getClanAccountInfo(
-                  region,
-                  trimmed.map(({ id }) => id),
-                  ['clan'],
-                );
-
-                return trimmed.map(
-                  (player, index) =>
-                    ({
-                      id: player.id,
-                      score: player.score,
-                      position: firstPlayerIndex + index + 1,
-                      clan: clanData[player.id]?.clan?.tag,
-                      nickname:
-                        clanData[index]?.account_name ??
-                        translate('bot.commands.ratings.body.deleted_player', [
-                          `${player.id}`,
-                        ]),
-                    }) satisfies SimplifiedPlayer,
-                );
-              },
-            );
-        const leagueInfo = regionRatingsInfo.leagues[leagueIndex];
-        midnightLeaderboard = isCurrentSeason
-          ? await getArchivedRatingsMidnightLeaderboard(
-              region,
-              regionRatingsInfo.current_season,
-            )
-          : await getArchivedRatingsMidnightLeaderboard(region, season!);
-
-        players = result;
-        playersAfter =
-          regionRatingsInfo.count - result[result.length - 1].position;
-        titleName = `${
-          leagueInfo
-            ? translate(`common.leagues.${LEAGUES[leagueInfo.index].name}`)
-            : ''
-        } - ${translate(`common.regions.short.${region}`)}`;
-        titleImage = leagueInfo.big_icon.startsWith('http')
-          ? leagueInfo.big_icon
-          : `https:${leagueInfo.big_icon}`;
-        titleDescription = translate('bot.commands.ratings.body.top_players', [
-          `${limit}`,
-        ]);
-      } else {
-        const { region, id } = await resolvePlayerFromCommand(interaction);
-        regionRatingsInfo = isCurrentSeason
-          ? await getRatingsInfo(region)
-          : await getArchivedRatingsInfo(region, season!);
-
-        if (regionRatingsInfo.detail !== undefined)
-          return t`bot.commands.ratings.body.no_ongoing_season`;
-
-        const accountInfo = await getAccountInfo(region, id);
-        const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
-        const neighbors = isCurrentSeason
-          ? await getRatingsNeighbors(region, id, Math.round(limit / 2)).then(
-              (players) =>
-                players.neighbors.map(
-                  (player) =>
-                    ({
-                      id: player.spa_id,
-                      position: player.number,
-                      score: player.score,
-                      clan: player.clan_tag,
-                      nickname: player.nickname,
-                    }) satisfies SimplifiedPlayer,
-                ),
-            )
-          : await getArchivedRatingsLeaderboard(region, season!).then(
-              async (players) => {
-                const playerIndex = players.findIndex(
-                  (player) => player.id === id,
-                );
-
-                if (playerIndex === -1) {
-                  throw new UserError(
-                    translate('bot.commands.ratings.body.no_participation', [
-                      markdownEscape(accountInfo.nickname),
-                      `${season}`,
-                    ]),
-                  );
-                }
-
-                const halfRange = Math.round(limit / 2);
-                const trimmed = players.slice(
-                  playerIndex - halfRange,
-                  playerIndex + halfRange + 1,
-                );
-                const clanData = await getClanAccountInfo(
-                  region,
-                  trimmed.map((player) => player.id),
-                  ['clan'],
-                );
-
-                return trimmed.map((player, index) => ({
-                  id: player.id,
-                  score: player.score,
-                  position: playerIndex + index + 1,
-                  clan: clanData[index]?.clan?.tag,
-                  nickname: clanData[index]
-                    ? clanData[index]!.account_name
-                    : `Deleted ${player.id}`,
-                }));
-              },
-            );
-        midnightLeaderboard = isCurrentSeason
-          ? await getArchivedRatingsMidnightLeaderboard(
-              region,
-              regionRatingsInfo.current_season,
-            )
-          : await getArchivedRatingsMidnightLeaderboard(region, season!);
-
-        players = neighbors;
-        titleImage = clan
-          ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clan.emblem_set_id}.png`
-          : undefined;
-        titleName = neighbors ? accountInfo.nickname : '';
-        titleDescription = t`bot.commands.ratings.body.neighbors`;
-        playersAfter =
-          regionRatingsInfo.count - neighbors[neighbors.length - 1].position;
-        playerId = id;
-      }
-
-      const resolvedRegionRatingsInfo: typeof regionRatingsInfo & {
-        detail: undefined;
-      } = regionRatingsInfo;
-
-      const items = players.map((player) => {
-        const reward = resolvedRegionRatingsInfo.rewards.find(
-          (reward) =>
-            player.position >= reward.from_position &&
-            player.position <= reward.to_position,
-        );
-        const midnightIndex = midnightLeaderboard?.findIndex(
-          (item) => item.id === player.id,
-        );
-        const midnightScore =
-          midnightIndex === undefined
-            ? player.score
-            : midnightLeaderboard![midnightIndex].score;
-        const midnightPosition =
-          midnightIndex === undefined ? player.position : midnightIndex + 1;
-
-        return (
-          <Leaderboard.Item
-            nickname={player.nickname}
-            score={player.score}
-            position={player.position}
-            clan={player.clan}
-            reward={reward}
-            deltaScore={player.score - midnightScore}
-            deltaPosition={midnightPosition - player.position}
-            key={player.id}
-            highlight={player.id === playerId}
-          />
-        );
-      });
-
-      return (
-        <CommandWrapper>
-          <TitleBar
-            title={titleName}
-            image={titleImage}
-            description={titleDescription}
-          />
-
-          {items && (
-            <Leaderboard.Root>
-              {items}
-              {playersAfter > 0 && (
-                <Leaderboard.Gap
-                  message={translate('bot.commands.ratings.body.more', [
-                    `${playersAfter.toLocaleString(interaction.locale)}`,
-                  ])}
-                />
-              )}
-            </Leaderboard.Root>
-          )}
-        </CommandWrapper>
-      );
-    },
-
-    autocomplete: autocompleteUsername,
-  });
-});

src/commands/research.tsx

@@ -8,8 +8,8 @@ import getTankStats from '../core/blitz/getTankStats';
 import resolveTankId from '../core/blitz/resolveTankId';
 import { asset } from '../core/blitzkrieg/asset';
 import { buildTechTreeLine } from '../core/blitzkrieg/buildTechTreeLine';
-import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL';
-import { iconPng } from '../core/blitzkrieg/iconPng';
+import { emblemURL } from '../core/blitzkrieg/emblemURL';
+import { webpToPng } from '../core/blitzkrieg/iconPng';
 import { resolveAncestry } from '../core/blitzkrieg/resolveAncestry';
 import { tankDefinitions } from '../core/blitzkrieg/tankDefinitions';
 import {
@@ -17,6 +17,7 @@ import {
   TIER_ROMAN_NUMERALS,
 } from '../core/blitzkrieg/tankDefinitions/constants';
 import { tankIconPng } from '../core/blitzkrieg/tankIconPng';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteTanks from '../core/discord/autocompleteTanks';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
 import { localizationObject } from '../core/discord/localizationObject';
@@ -31,7 +32,6 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
     inProduction: true,
     inPublic: true,
-    inPreview: true,
 
     command: createLocalizedCommand('research')
       .addStringOption((option) =>
@@ -67,7 +67,8 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
           )
           .setAutocomplete(true)
           .setRequired(false),
-      ),
+      )
+      .addStringOption(addUsernameChoices),
 
     async handler(interaction) {
       const { t, translate } = translator(interaction.locale);
@@ -154,7 +155,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
       const line = [...techTreeLine, startingTankId].reverse();
       const { nickname } = await getAccountInfo(region, id);
       const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
-      const clanImage = clan ? emblemIdToURL(clan.emblem_set_id) : undefined;
+      const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
       const costs = await Promise.all(
         line.map(async (id) => {
           const tank = awaitedTankDefinitions[id];
@@ -275,7 +276,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                   }}
                 >
                   <img
-                    src={await iconPng(asset('icons/currencies/xp.webp'))}
+                    src={await webpToPng(asset('icons/currencies/xp.webp'))}
                     width={16}
                     height={16}
                   />
@@ -285,8 +286,9 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                       color: theme.colors.textHighContrast,
                     }}
                   >
+                    Experience:{' '}
                     {costs
-                      .reduce((a, b) => a + b.purchase + b.equipment, 0)
+                      .reduce((a, b) => a + (b.research ?? 0) + b.upgrades, 0)
                       .toLocaleString(interaction.locale)}
                   </span>
                 </div>
@@ -299,7 +301,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                   }}
                 >
                   <img
-                    src={await iconPng(asset('icons/currencies/silver.webp'))}
+                    src={await webpToPng(asset('icons/currencies/silver.webp'))}
                     width={16}
                     height={16}
                   />
@@ -309,8 +311,34 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                       color: theme.colors.textHighContrast,
                     }}
                   >
+                    Purchase:{' '}
                     {costs
-                      .reduce((a, b) => a + (b.research ?? 0) + b.upgrades, 0)
+                      .reduce((a, b) => a + b.purchase, 0)
+                      .toLocaleString(interaction.locale)}
+                  </span>
+                </div>
+
+                <div
+                  style={{
+                    display: 'flex',
+                    gap: 4,
+                    alignItems: 'center',
+                  }}
+                >
+                  <img
+                    src={await webpToPng(asset('icons/currencies/silver.webp'))}
+                    width={16}
+                    height={16}
+                  />
+                  <span
+                    style={{
+                      fontSize: 16,
+                      color: theme.colors.textHighContrast,
+                    }}
+                  >
+                    Equipment:{' '}
+                    {costs
+                      .reduce((a, b) => a + b.equipment, 0)
                       .toLocaleString(interaction.locale)}
                   </span>
                 </div>
@@ -424,7 +452,9 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                         }}
                       >
                         <img
-                          src={await iconPng(asset('icons/currencies/xp.webp'))}
+                          src={await webpToPng(
+                            asset('icons/currencies/xp.webp'),
+                          )}
                           width={16}
                           height={16}
                         />
@@ -451,7 +481,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                           }}
                         >
                           <img
-                            src={await iconPng(
+                            src={await webpToPng(
                               asset('icons/currencies/free-xp.webp'),
                             )}
                             width={16}
@@ -478,7 +508,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                         }}
                       >
                         <img
-                          src={await iconPng(
+                          src={await webpToPng(
                             asset('icons/currencies/silver.webp'),
                           )}
                           width={16}
@@ -506,7 +536,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                         }}
                       >
                         <img
-                          src={await iconPng(
+                          src={await webpToPng(
                             asset('icons/currencies/silver.webp'),
                           )}
                           width={16}

src/commands/stats.tsx

@@ -5,7 +5,7 @@ import NoData from '../components/NoData';
 import TitleBar from '../components/TitleBar';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
 import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
-import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL';
+import { emblemURL } from '../core/blitzkrieg/emblemURL';
 import { filtersToDescription } from '../core/blitzkrieg/filtersToDescription';
 import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
 import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
@@ -38,7 +38,7 @@ async function render(
 ) {
   const { nickname } = await getAccountInfo(region, id);
   const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
-  const clanImage = clan ? emblemIdToURL(clan.emblem_set_id) : undefined;
+  const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
   const diffedTankStats = await getStatsInPeriod(
     region,
     id,

src/components/AllStatsOverview/components/HeroStat/components/Glow.tsx

@@ -0,0 +1,50 @@
+import { ComponentProps } from 'react';
+
+export interface GlowProps extends ComponentProps<'div'> {
+  color: string;
+  direction?: 'default' | 'reverse';
+  rotation?: number;
+  startOpacity?: number;
+  endOpacity?: number;
+}
+
+const width = 16;
+
+export function Glow({
+  color,
+  direction = 'default',
+  rotation = 0,
+  style,
+  startOpacity = 0,
+  endOpacity = 1,
+  ...props
+}: GlowProps) {
+  const color1 = `${color}${Math.round(endOpacity * 255)
+    .toString(16)
+    .padStart(2, '0')}`;
+  const color2 = `${color}${Math.round(startOpacity * 255)
+    .toString(16)
+    .padStart(2, '0')}`;
+  const background = `linear-gradient(${
+    direction === 'default' ? 0 : 180
+  }deg, ${color1} 0%, ${color2} 100%)`;
+
+  return (
+    <div
+      style={{
+        display: 'flex',
+        alignItems: direction === 'default' ? 'flex-end' : 'flex-start',
+        justifyContent: 'center',
+        transform: `rotate(${rotation}deg)`,
+        ...style,
+      }}
+      {...props}
+    >
+      <div style={{ height: 54, width, background }} />
+      <div style={{ height: 72, width, background }} />
+      <div style={{ height: 80, width, background }} />
+      <div style={{ height: 72, width, background }} />
+      <div style={{ height: 54, width, background }} />
+    </div>
+  );
+}

src/components/AllStatsOverview/components/HeroStat/index.tsx

@@ -1,5 +1,6 @@
 import { Locale } from 'discord.js';
 import { Percentile } from '../../../../constants/percentiles';
+import { SupplementaryStats } from '../../../../core/blitz/getAccountInfo';
 import { translator } from '../../../../core/localization/translator';
 import getWN8Percentile from '../../../../core/statistics/getWN8Percentile';
 import { theme } from '../../../../stitches.config';
@@ -7,16 +8,19 @@ import { PERCENTILE_COLORS } from '../../../PercentileIndicator/constants';
 import { Glow } from './components/Glow';
 
 export interface WN8DisplayProps {
-  wn8?: number;
+  stats: SupplementaryStats;
   locale: Locale;
 }
 
-export function WN8Display({ wn8, locale }: WN8DisplayProps) {
-  const percentile =
-    wn8 === undefined ? Percentile.VeryBad : getWN8Percentile(wn8);
-  const color = PERCENTILE_COLORS[percentile];
+export function HeroStat({ stats, locale }: WN8DisplayProps) {
   const { translate } = translator(locale);
 
+  const percentile =
+    stats.WN8 === undefined ? Percentile.VeryBad : getWN8Percentile(stats.WN8);
+  const color = PERCENTILE_COLORS[percentile];
+  const heroStat = stats.WN8 === undefined ? '--' : stats.WN8.toFixed(0);
+  const subtitle = translate(`common.wn8_percentile.${percentile}`);
+
   return (
     <div
       style={{
@@ -43,23 +47,32 @@ export function WN8Display({ wn8, locale }: WN8DisplayProps) {
           gap: -4,
         }}
       >
-        <span
+        <div
           style={{
-            fontWeight: 900,
-            fontSize: 32,
-            color: theme.colors.textHighContrast,
+            display: 'flex',
+            flexDirection: 'column',
+            alignItems: 'center',
+            justifyContent: 'center',
           }}
         >
-          {wn8 === undefined ? '--' : wn8.toFixed(0)}
-        </span>
-        <span
-          style={{
-            fontSize: 16,
-            color: theme.colors.textHighContrast,
-          }}
-        >
-          {translate(`common.wn8_percentile.${percentile}`)}
-        </span>
+          <span
+            style={{
+              fontWeight: 900,
+              fontSize: 32,
+              color: theme.colors.textHighContrast,
+            }}
+          >
+            {heroStat}
+          </span>
+          <span
+            style={{
+              fontSize: 16,
+              color: theme.colors.textHighContrast,
+            }}
+          >
+            {subtitle}
+          </span>
+        </div>
       </div>
 
       <Glow color={color} direction="reverse" />

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

@@ -1,35 +0,0 @@
-export interface GlowProps {
-  color: string;
-  direction?: 'default' | 'reverse';
-  rotation?: number;
-}
-
-export function Glow({
-  color,
-  direction = 'default',
-  rotation = 0,
-}: GlowProps) {
-  const color1 = color;
-  const color2 = `${color}00`;
-
-  const background = `linear-gradient(${
-    direction === 'default' ? 0 : 180
-  }deg, ${color1} 0%, ${color2} 100%)`;
-
-  return (
-    <div
-      style={{
-        display: 'flex',
-        alignItems: direction === 'default' ? 'flex-end' : 'flex-start',
-        justifyContent: 'center',
-        transform: `rotate(${rotation}deg)`,
-      }}
-    >
-      <div style={{ height: 54, width: 16, background }} />
-      <div style={{ height: 72, width: 16, background }} />
-      <div style={{ height: 80, width: 16, background }} />
-      <div style={{ height: 72, width: 16, background }} />
-      <div style={{ height: 54, width: 16, background }} />
-    </div>
-  );
-}

src/components/AllStatsOverview/index.tsx

@@ -1,14 +1,23 @@
 import { Locale } from 'discord.js';
-import { AllStats, SupplementaryStats } from '../../core/blitz/getAccountInfo';
+import { SupplementaryStats } from '../../core/blitz/getAccountInfo';
 import { translator } from '../../core/localization/translator';
-import { WN8Display } from './components/WN8Display';
+import { HeroStat } from './components/HeroStat';
 import {
   WN8SurroundingStat,
   WN8SurroundingStatAlign,
 } from './components/WN8SurroundingStat';
 
 export interface AllStatsOverviewProps {
-  stats: AllStats;
+  stats: {
+    battles: number;
+    wins: number;
+    damage_dealt: number;
+    damage_received: number;
+    survived_battles: number;
+    hits: number;
+    shots: number;
+    frags: number;
+  };
   supplementaryStats: SupplementaryStats;
   locale: Locale;
 }
@@ -24,6 +33,7 @@ export default function AllStatsOverview({
     <div
       style={{
         display: 'flex',
+        alignItems: 'center',
         gap: -64,
         width: '100%',
       }}
@@ -38,18 +48,18 @@ export default function AllStatsOverview({
         }}
       >
         <WN8SurroundingStat
-          label={t`bot.commands.stats.body.battles`}
+          label={t`bot.common.hero_stats.battles`}
           value={stats.battles.toLocaleString()}
           align={WN8SurroundingStatAlign.Right}
         />
         <WN8SurroundingStat
-          label={t`bot.commands.stats.body.winrate`}
+          label={t`bot.common.hero_stats.winrate`}
           value={`${(100 * (stats.wins / stats.battles)).toFixed(2)}%`}
           align={WN8SurroundingStatAlign.Right}
           padded
         />
         <WN8SurroundingStat
-          label={t`bot.commands.stats.body.damage`}
+          label={t`bot.common.hero_stats.damage`}
           value={Math.round(
             stats.damage_dealt / stats.battles,
           ).toLocaleString()}
@@ -57,13 +67,13 @@ export default function AllStatsOverview({
           padded
         />
         <WN8SurroundingStat
-          label={t`bot.commands.stats.body.damage_ratio`}
+          label={t`bot.common.hero_stats.damage_ratio`}
           value={(stats.damage_dealt / stats.damage_received).toFixed(2)}
           align={WN8SurroundingStatAlign.Right}
         />
       </div>
 
-      <WN8Display locale={locale} wn8={supplementaryStats.WN8} />
+      <HeroStat locale={locale} stats={supplementaryStats} />
 
       <div
         style={{
@@ -74,29 +84,26 @@ export default function AllStatsOverview({
         }}
       >
         <WN8SurroundingStat
-          label={t`bot.commands.stats.body.tier`}
+          label={t`bot.common.hero_stats.tier`}
           value={
             supplementaryStats.tier ? supplementaryStats.tier.toFixed(2) : '--'
           }
         />
         <WN8SurroundingStat
-          label={t`bot.commands.stats.body.survival`}
+          label={t`bot.common.hero_stats.survival`}
           value={`${(100 * (stats.survived_battles / stats.battles)).toFixed(
             2,
           )}%`}
           padded
         />
         <WN8SurroundingStat
-          label={t`bot.commands.stats.body.accuracy`}
+          label={t`bot.common.hero_stats.accuracy`}
           value={`${(100 * (stats.hits / stats.shots)).toFixed(2)}%`}
           padded
         />
         <WN8SurroundingStat
-          label={t`bot.commands.stats.body.kill_ratio`}
-          value={(
-            stats.frags /
-            (stats.battles - stats.survived_battles)
-          ).toFixed(2)}
+          label={t`bot.common.hero_stats.kills`}
+          value={(stats.frags / stats.battles).toFixed(2)}
         />
       </div>
     </div>

src/components/Analytics.tsx

@@ -0,0 +1,21 @@
+export function Analytics() {
+  return (
+    <>
+      <script
+        async
+        src="https://www.googletagmanager.com/gtag/js?id=G-98NTMRHRP9"
+      />
+      <script
+        dangerouslySetInnerHTML={{
+          __html: `
+            window.dataLayer = window.dataLayer || [];
+            function gtag(){dataLayer.push(arguments);}
+            gtag('js', new Date());
+
+            gtag('config', 'G-98NTMRHRP9');
+          `,
+        }}
+      />
+    </>
+  );
+}

src/components/Armor/components/CoreArmorSceneComponent/index.tsx

@@ -48,6 +48,7 @@ export function CoreArmorSceneComponent({
       explosionRadius: { value: null },
       greenPenetration: { value: null },
       opaque: { value: null },
+      useSpacedArmor: { value: null },
 
       resolution: { value: new Vector2() },
       spacedArmorBuffer: { value: null },
@@ -75,6 +76,7 @@ export function CoreArmorSceneComponent({
     ) {
       material.uniforms.greenPenetration.value = visual.greenPenetration;
       material.uniforms.opaque.value = visual.opaque || visual.wireframe;
+      material.uniforms.useSpacedArmor.value = visual.showSpacedArmor;
       material.wireframe = visual.wireframe;
     }
     async function handleProtagonistEquipmentChange(

src/components/Armor/components/CoreArmorSceneComponent/shaders/fragment.glsl

@@ -14,6 +14,7 @@ uniform float damage;
 uniform float explosionRadius;
 uniform bool greenPenetration;
 uniform bool opaque;
+uniform bool useSpacedArmor;
 
 uniform highp sampler2D spacedArmorBuffer;
 uniform highp sampler2D spacedArmorDepth;
@@ -49,7 +50,7 @@ void main() {
     float coreArmorDistance = depthToDistance(gl_FragCoord.z);
     float distanceFromSpacedArmor = coreArmorDistance - spacedArmorDistance;
 
-    if (isUnderSpacedArmor) {
+    if (useSpacedArmor && isUnderSpacedArmor) {
       float spacedArmorThickness = spacedArmorBufferFragment.r * penetration;
       remainingPenetration -= spacedArmorThickness;
 

src/components/Armor/components/SpacedArmorSceneComponent/index.tsx

@@ -18,6 +18,7 @@ import { useDuel } from '../../../../stores/duel';
 import {
   Shot,
   ShotLayerBase,
+  useTankopediaPersistent,
   useTankopediaTemporary,
 } from '../../../../stores/tankopedia';
 import { ArmorType } from '../SpacedArmorScene';
@@ -115,12 +116,20 @@ export function SpacedArmorSceneComponent({
             pushLogs(shellNormal, filterIntersections(event.intersections), 0);
 
             function filterIntersections(intersectionsRaw: Intersection[]) {
-              const intersectionsAll = intersectionsRaw.filter(
+              const showSpacedArmor =
+                useTankopediaPersistent.getState().model.visual.showSpacedArmor;
+              const intersectionsTyped = intersectionsRaw.filter(
                 ({ object }) => object.userData.type !== undefined,
               ) as ArmorMeshIntersection[];
-              const intersectionsWithDuplicates = intersectionsAll.slice(
+              const intersectionsFiltered = intersectionsTyped.filter(
+                ({ object }) =>
+                  showSpacedArmor
+                    ? true
+                    : object.userData.type === ArmorType.Core,
+              );
+              const intersectionsWithDuplicates = intersectionsFiltered.slice(
                 0,
-                intersectionsAll.findIndex(
+                intersectionsFiltered.findIndex(
                   ({ object }) => object.userData.type === ArmorType.Core,
                 ) + 1,
               );

src/components/CommandWrapper.tsx

@@ -16,6 +16,7 @@ export default function CommandWrapper({ children, fat }: CommandWrapperProps) {
         gap: 16,
         width: 480,
         color: theme.colors.textHighContrast,
+        position: 'relative',
         background: theme.colors.appBackground1,
       }}
     >

src/components/DeltaCaret.tsx

@@ -0,0 +1,20 @@
+interface DeltaCaretProps {
+  delta: number;
+}
+
+export function DeltaCaret({ delta }: DeltaCaretProps) {
+  return (
+    <img
+      style={{
+        width: 16,
+        height: 16,
+        objectFit: 'contain',
+      }}
+      src={
+        delta > 0
+          ? 'https://i.imgur.com/gjI4a5f.png'
+          : 'https://i.imgur.com/lLGZygN.png'
+      }
+    />
+  );
+}

src/components/Leaderboard/components/Item.tsx

@@ -1,5 +1,4 @@
 import { ComponentProps } from 'react';
-import { RatingsReward } from '../../../commands/ratings';
 import { theme } from '../../../stitches.config';
 
 interface ItemProps extends ComponentProps<'div'> {
@@ -7,22 +6,16 @@ interface ItemProps extends ComponentProps<'div'> {
   deltaPosition?: number;
   score?: number;
   deltaScore?: number;
-  reward?: RatingsReward;
   nickname: string;
   clan?: string;
   highlight?: boolean;
 }
 
-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,
   highlight,
@@ -120,40 +113,8 @@ export function Item({
         </div>
       )}
 
-      <div
-        style={{
-          flex: 1,
-          display: 'flex',
-          alignItems: 'center',
-          justifyContent: 'flex-end',
-          gap: 4,
-        }}
-      >
-        {reward && (
-          <img
-            style={{ width: 16, height: 16, objectFit: 'cover' }}
-            src={normalizeImage(
-              reward.type === 'vehicle'
-                ? reward.vehicle.image_url
-                : reward.stuff.image_url,
-            )}
-            width={16}
-            height={16}
-          />
-        )}
-        {reward && reward.count > 1 && (
-          <span
-            style={{
-              color: highlight
-                ? theme.colors.textLowContrast_blue
-                : theme.colors.textLowContrast,
-              fontSize: 16,
-            }}
-          >
-            x {reward.count.toLocaleString()}
-          </span>
-        )}
-      </div>
+      {/* TODO: lol remove this spacer div for a better solution */}
+      <div style={{ flex: 1 }} />
 
       <div
         style={{
@@ -189,6 +150,7 @@ export function Item({
             }
           />
         )}
+
         {score !== undefined && (
           <span
             style={{

src/components/NoData/index.tsx

@@ -3,7 +3,11 @@ import { translator } from '../../core/localization/translator';
 import { theme } from '../../stitches.config';
 
 interface NoDataProps {
-  type: 'battles_in_period' | 'players_in_period' | 'tanks_found';
+  type:
+    | 'battles_in_period'
+    | 'players_in_period'
+    | 'tanks_found'
+    | 'battles_in_season';
   locale: Locale;
 }
 

src/components/TitleBar.tsx

@@ -15,6 +15,7 @@ export default function TitleBar({ title, image, description }: TitleBarProps) {
         flexDirection: 'column',
         justifyContent: 'center',
         alignItems: 'center',
+        padding: '8px 0px',
       }}
     >
       <div

src/constants/leagues.ts

@@ -1,7 +1,7 @@
 export const LEAGUES = [
-  { name: 'diamond', minScore: 5000 },
-  { name: 'platinum', minScore: 4000 },
-  { name: 'gold', minScore: 3000 },
-  { name: 'silver', minScore: 2000 },
-  { name: 'bronze', minScore: 0 },
+  { name: 'diamond', minScore: 5000, index: 0 },
+  { name: 'platinum', minScore: 4000, index: 1 },
+  { name: 'gold', minScore: 3000, index: 2 },
+  { name: 'silver', minScore: 2000, index: 3 },
+  { name: 'bronze', minScore: -Infinity, index: 4 },
 ];

src/constants/rating.ts

@@ -0,0 +1,2 @@
+export const FIRST_MINIMAL_ARCHIVED_RATING_SEASON = 49;
+export const FIRST_COMPREHENSIVE1_ARCHIVED_RATING_SEASON = 53;

src/constants/ratings.ts

@@ -1 +0,0 @@
-export const FIRST_ARCHIVED_RATINGS_SEASON = 49;

src/constants/tools.ts

@@ -18,9 +18,9 @@ export const TOOLS: Tool[] = [
     description: 'Blitz tank encyclopedia',
   },
   {
-    id: 'ratings',
-    title: 'Ratings',
-    description: 'Ratings gamemode leaderboards',
+    id: 'rating',
+    title: 'Rating leaderboard',
+    description: 'Full rating gamemode leaderboard',
   },
   {
     id: 'discord',

src/core/blitz/extractModel/index.ts

@@ -57,7 +57,7 @@ export async function extractModel(data: string, path: string) {
         material.setBaseColorTexture(
           document
             .createTexture(node.materialName)
-            .setMimeType('image/png')
+            .setMimeType('image/jpeg')
             .setImage(
               await readTexture(
                 `${data}/3d/${dirname(path)}/${textures.albedo}`,
@@ -70,7 +70,7 @@ export async function extractModel(data: string, path: string) {
           material.setMetallicRoughnessTexture(
             document
               .createTexture(node.materialName)
-              .setMimeType('image/png')
+              .setMimeType('image/jpeg')
               .setImage(
                 await readTexture(
                   `${data}/3d/${dirname(path)}/${textures.baseRMMap}`,
@@ -86,7 +86,7 @@ export async function extractModel(data: string, path: string) {
           material.setNormalTexture(
             document
               .createTexture(node.materialName)
-              .setMimeType('image/png')
+              .setMimeType('image/jpeg')
               .setImage(
                 await readTexture(
                   `${data}/3d/${dirname(path)}/${
@@ -102,7 +102,7 @@ export async function extractModel(data: string, path: string) {
           material.setOcclusionTexture(
             document
               .createTexture(node.materialName)
-              .setMimeType('image/png')
+              .setMimeType('image/jpeg')
               .setImage(
                 await readTexture(
                   `${data}/3d/${dirname(path)}/${textures.miscMap}`,

src/core/blitz/fetchBlitz.ts

@@ -1,3 +1,5 @@
+import { patientFetch } from '../blitzkrieg/patientFetch';
+
 type BlitzResponse<Data extends object> =
   | {
       status: 'error';
@@ -23,7 +25,7 @@ async function manageQueue() {
     }, 1000);
 
     const { url, resolve } = queue.shift()!;
-    const data = (await fetch(url)
+    const data = (await patientFetch(url)
       .then((response) => response.json())
       .catch((error) => ({ status: 'error', error }))) as BlitzResponse<
       typeof resolve

src/core/blitz/getAccountInfo.ts

@@ -24,7 +24,6 @@ export interface AllStats {
 }
 
 export interface SupplementaryStats {
-  // if undefined, WN8 is not available for tanks without averages
   WN8?: number;
   tier?: number;
 }
@@ -51,6 +50,28 @@ export interface ClanStats {
   dropped_capture_points: number;
 }
 
+export interface RatingStats {
+  spotted: number;
+  calibration_battles_left: number;
+  hits: number;
+  frags: number;
+  recalibration_start_time: number;
+  mm_rating: number;
+  wins: number;
+  losses: number;
+  is_recalibration: boolean;
+  capture_points: number;
+  battles: number;
+  damage_dealt: number;
+  damage_received: number;
+  shots: number;
+  frags8p: number;
+  xp: number;
+  win_and_survived: number;
+  survived_battles: number;
+  dropped_capture_points: number;
+}
+
 interface IndividualAccountInfo {
   account_id: number;
   created_at: number;
@@ -61,6 +82,7 @@ interface IndividualAccountInfo {
   statistics: {
     all: AllStats;
     clan: ClanStats;
+    rating?: RatingStats;
     frags: null | number;
   };
 }
@@ -74,11 +96,11 @@ export async function getAccountInfo<
   ReturnType = Ids extends number
     ? IndividualAccountInfo
     : IndividualAccountInfo[],
->(region: Region, ids: Ids) {
+>(region: Region, ids: Ids, extra: string[] = []) {
   const object = await fetchBlitz<AccountInfo>(
     `https://api.wotblitz.${region}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${normalizeIds(
       ids,
-    )}`,
+    )}${extra.length === 0 ? '' : `&extra=${extra.join(',')}`}`,
   );
 
   if (typeof ids === 'number') {

src/core/blitz/getLeagueFromScore.ts

@@ -0,0 +1,5 @@
+import { LEAGUES } from '../../constants/leagues';
+
+export function getLeagueFromScore(score: number) {
+  return LEAGUES.find(({ minScore }) => score >= minScore)!;
+}

src/core/blitz/getRatingInfo.ts

@@ -1,26 +1,26 @@
-import { RatingsInfo } from '../../commands/ratings';
+import { RatingInfo } from '../../commands/ratingLeaderboard';
 import { Region } from '../../constants/regions';
 import { context } from '../blitzkrieg/context';
 import { patientFetch } from '../blitzkrieg/patientFetch';
 import regionToRegionSubdomain from './regionToRegionSubdomain';
 
-const ratingsInfoCache: Partial<Record<Region, RatingsInfo>> = {};
+const cache: Partial<Record<Region, RatingInfo>> = {};
 
-export default async function getRatingsInfo(region: Region) {
-  if (ratingsInfoCache[region]) return ratingsInfoCache[region]!;
+export default async function getRatingInfo(region: Region) {
+  if (cache[region]) return cache[region]!;
 
   const response = await patientFetch(
     context === 'website'
-      ? `/api/${region}/ratings/current/info`
+      ? `/api/${region}/rating/current/info`
       : `https://${regionToRegionSubdomain(
           region,
         )}.wotblitz.com/en/api/rating-leaderboards/season/`,
     undefined,
     { cache: 'no-store' },
   );
-  const data = (await response.json()) as RatingsInfo;
+  const data = (await response.json()) as RatingInfo;
 
-  ratingsInfoCache[region] = data;
+  cache[region] = data;
 
   return data;
 }

src/core/blitz/getRatingLeague.ts

@@ -1,10 +1,10 @@
-import { LeagueTop, RatingsPlayer } from '../../commands/ratings';
+import { LeagueTop, RatingPlayer } from '../../commands/ratingLeaderboard';
 import { Region } from '../../constants/regions';
 import { context } from '../blitzkrieg/context';
 import { patientFetch } from '../blitzkrieg/patientFetch';
 import regionToRegionSubdomain from './regionToRegionSubdomain';
 
-export async function getRatingsLeague(
+export async function getRatingLeague(
   region: Region,
   league: number,
   usePatientFetcher = false,
@@ -15,7 +15,7 @@ export async function getRatingsLeague(
       : fetch(url, { cache: 'no-store' });
   const response = await fetcher(
     context === 'website'
-      ? `/api/${region}/ratings/current/league/${league}`
+      ? `/api/${region}/rating/current/league/${league}`
       : `https://${regionToRegionSubdomain(
           region,
         )}.wotblitz.com/en/api/rating-leaderboards/league/${league}/top/`,
@@ -23,6 +23,6 @@ export async function getRatingsLeague(
   const json = await response.json();
 
   return context === 'website'
-    ? (json as RatingsPlayer[])
+    ? (json as RatingPlayer[])
     : (json as LeagueTop).result;
 }

src/core/blitz/getRatingNeighbors.ts

@@ -1,10 +1,10 @@
-import { RatingsNeighbors } from '../../commands/ratings';
+import { RatingNeighbors } from '../../commands/ratingLeaderboard';
 import { Region } from '../../constants/regions';
 import { patientFetch } from '../blitzkrieg/patientFetch';
 import { withCORSProxy } from '../blitzkrieg/withCORSProxy';
 import regionToRegionSubdomain from './regionToRegionSubdomain';
 
-export async function getRatingsNeighbors(
+export async function getRatingNeighbors(
   region: Region,
   id: number,
   count: number,
@@ -21,7 +21,7 @@ export async function getRatingsNeighbors(
       )}.wotblitz.com/en/api/rating-leaderboards/user/${id}/?neighbors=${count}`,
     ),
   );
-  const json = (await response.json()) as RatingsNeighbors;
+  const json = (await response.json()) as RatingNeighbors;
 
   return json;
 }

src/core/blitz/isOnGoingRatingSeason.ts

@@ -0,0 +1,6 @@
+import getRatingInfo from './getRatingInfo';
+
+export async function isOnGoingRatingSeason() {
+  const ratingInfo = await getRatingInfo('com');
+  return ratingInfo.detail === undefined;
+}

src/core/blitz/isOnGoingRatingsSeason.ts

@@ -1,6 +0,0 @@
-import getRatingsInfo from './getRatingsInfo';
-
-export async function isOnGoingRatingsSeason() {
-  const ratingsInfo = await getRatingsInfo('com');
-  return ratingsInfo.detail === undefined;
-}

src/core/blitz/normalizeLeagueIcon.ts

@@ -0,0 +1,3 @@
+export function normalizeLeagueIcon(url: string) {
+  return url.startsWith('http') ? url : `https:${url}`;
+}

src/core/blitz/regionSubdomainToRegion.ts

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

src/core/blitz/searchCurrentRatingPlayers.ts

@@ -2,7 +2,7 @@ import { Region } from '../../constants/regions';
 import { context } from '../blitzkrieg/context';
 import regionToRegionSubdomain from './regionToRegionSubdomain';
 
-type CurrentRatingsPlayerSearch = Record<
+type CurrentRatingPlayerSearch = Record<
   number,
   {
     spa_id: number;
@@ -24,20 +24,17 @@ type CurrentRatingsPlayerSearch = Record<
   )
 >;
 
-export async function searchCurrentRatingsPlayers(
-  region: Region,
-  name: string,
-) {
+export async function searchCurrentRatingPlayers(region: Region, name: string) {
   const encodedSearch = encodeURIComponent(name);
   const response = await fetch(
     context === 'website'
-      ? `/api/${region}/ratings/current/search/${encodedSearch}`
+      ? `/api/${region}/rating/current/search/${encodedSearch}`
       : `https://${regionToRegionSubdomain(
           region,
         )}.wotblitz.com/en/api/rating-leaderboards/search/?prefix=${encodedSearch}`,
     { cache: 'no-store' },
   );
-  const accountList = (await response.json()) as CurrentRatingsPlayerSearch;
+  const accountList = (await response.json()) as CurrentRatingPlayerSearch;
 
   return accountList;
 }

src/core/blitzkrieg/emblemURL.ts

@@ -1,3 +1,3 @@
-export function emblemIdToURL(emblemId: number) {
+export function emblemURL(emblemId: number) {
   return `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${emblemId}.png`;
 }

src/core/blitzkrieg/getArchivedLatestSeasonNumber.ts

@@ -1,4 +1,4 @@
-import getRatingsInfo from '../blitz/getRatingsInfo';
+import getRatingInfo from '../blitz/getRatingInfo';
 
 interface GitHubTrees {
   tree: { path: string; url: string }[];
@@ -11,9 +11,9 @@ export async function getArchivedLatestSeasonNumber() {
     return cachedLatestArchivedSeasonNumber;
   }
 
-  const ratingsInfo = await getRatingsInfo('com');
+  const ratingInfo = await getRatingInfo('com');
 
-  if (ratingsInfo.detail) {
+  if (ratingInfo.detail) {
     const regionsURL = (
       (await fetch(
         'https://api.github.com/repos/tresabhi/blitzkrieg-assets/git/trees/main',
@@ -24,14 +24,14 @@ export async function getArchivedLatestSeasonNumber() {
         response.json(),
       )) as GitHubTrees
     ).tree.find(({ path }) => path === 'com')!.url;
-    const ratingsURL = (
+    const ratingURL = (
       (await fetch(comURL).then((response) => response.json())) as {
         tree: [{ url: string }];
       }
     ).tree[0].url;
     const latestSeason = Math.max(
       ...(
-        (await fetch(ratingsURL).then((response) => response.json())) as {
+        (await fetch(ratingURL).then((response) => response.json())) as {
           tree: { path: string }[];
         }
       ).tree.map(({ path }) => Number(path)),
@@ -39,7 +39,7 @@ export async function getArchivedLatestSeasonNumber() {
 
     cachedLatestArchivedSeasonNumber = latestSeason;
   } else {
-    cachedLatestArchivedSeasonNumber = ratingsInfo.current_season - 1;
+    cachedLatestArchivedSeasonNumber = ratingInfo.current_season - 1;
   }
 
   return cachedLatestArchivedSeasonNumber;

src/core/blitzkrieg/getArchivedRatingInfo.ts

@@ -0,0 +1,38 @@
+import { RatingInfo } from '../../commands/ratingLeaderboard';
+import { Region } from '../../constants/regions';
+import { asset } from './asset';
+import { superDecompress } from './superDecompress';
+
+const cache: Record<
+  Region,
+  Record<
+    number,
+    RatingInfo & {
+      detail: undefined;
+    }
+  >
+> = {
+  com: {},
+  eu: {},
+  asia: {},
+};
+
+export default async function getArchivedRatingInfo(
+  region: Region,
+  season: number,
+) {
+  if (!cache[region][season]) {
+    const info = await fetch(
+      asset(`regions/${region}/rating/${season}/info.cdon.lz4`),
+    )
+      .then((response) => response.arrayBuffer())
+      .then((buffer) =>
+        superDecompress<RatingInfo & { detail: undefined }>(
+          new Uint8Array(buffer),
+        ),
+      );
+    cache[region][season] = info;
+  }
+
+  return cache[region][season];
+}

src/core/blitzkrieg/getArchivedRatingLeaderboard.ts

@@ -0,0 +1,25 @@
+import { Region } from '../../constants/regions';
+import { BkrlDiscriminatedEntries, BkrlReadStream } from '../streams/bkrl';
+import { asset } from './asset';
+
+const cache: Record<Region, Record<number, BkrlDiscriminatedEntries>> = {
+  asia: {},
+  eu: {},
+  com: {},
+};
+
+export async function getArchivedRatingLeaderboard(
+  region: Region,
+  season: number,
+) {
+  if (!cache[region][season]) {
+    const info = await fetch(
+      asset(`regions/${region}/rating/${season}/latest.bkrl`),
+    )
+      .then((response) => response.arrayBuffer())
+      .then((buffer) => new BkrlReadStream(buffer).bkrl());
+    cache[region][season] = info;
+  }
+
+  return cache[region][season];
+}

src/core/blitzkrieg/getArchivedRatingMidnightLeaderboard.ts

@@ -0,0 +1,29 @@
+import { Region } from '../../constants/regions';
+import { BkrlDiscriminatedEntries, BkrlReadStream } from '../streams/bkrl';
+import { asset } from './asset';
+
+const cache: Record<Region, Record<number, BkrlDiscriminatedEntries | null>> = {
+  com: {},
+  eu: {},
+  asia: {},
+};
+
+export default async function getArchivedRatingMidnightLeaderboard(
+  region: Region,
+  season: number,
+) {
+  if (!cache[region][season]) {
+    const info = await fetch(
+      asset(`regions/${region}/rating/${season}/midnight.bkrl`),
+    )
+      .then((response) =>
+        response.status === 404 ? null : response.arrayBuffer(),
+      )
+      .then((buffer) =>
+        buffer === null ? null : new BkrlReadStream(buffer).bkrl(),
+      );
+    cache[region][season] = info;
+  }
+
+  return cache[region][season];
+}

src/core/blitzkrieg/getArchivedRatingsInfo.ts

@@ -1,36 +0,0 @@
-import { RatingsInfo } from '../../commands/ratings';
-import { Region } from '../../constants/regions';
-
-const INFO_CACHE: Record<
-  Region,
-  Record<
-    number,
-    RatingsInfo & {
-      detail: undefined;
-    }
-  >
-> = {
-  com: {},
-  eu: {},
-  asia: {},
-};
-
-export default async function getArchivedRatingsInfo(
-  region: Region,
-  season: number,
-) {
-  if (INFO_CACHE[region][season]) {
-    return INFO_CACHE[region][season];
-  }
-
-  const response = await fetch(
-    `https://raw.githubusercontent.com/tresabhi/blitzkrieg-assets/main/regions/${region}/ratings/${season}/info.json`,
-  );
-  const jsonContent = (await response.json()) as RatingsInfo & {
-    detail: undefined;
-  };
-
-  INFO_CACHE[region][season] = jsonContent;
-
-  return jsonContent;
-}

src/core/blitzkrieg/getArchivedRatingsLeaderboard.ts

@@ -1,28 +0,0 @@
-import { BlitzkriegRatingsLeaderboard } from '../../../scripts/buildRatingsLeaderboard';
-import { Region } from '../../constants/regions';
-
-const LEADERBOARD_CACHE: Record<
-  Region,
-  Record<number, BlitzkriegRatingsLeaderboard>
-> = {
-  asia: {},
-  eu: {},
-  com: {},
-};
-
-export async function getArchivedRatingsLeaderboard(
-  region: Region,
-  season: number,
-) {
-  if (LEADERBOARD_CACHE[region][season]) {
-    return LEADERBOARD_CACHE[region][season];
-  }
-
-  const response = await fetch(
-    `https://raw.githubusercontent.com/tresabhi/blitzkrieg-assets/main/regions/${region}/ratings/${season}/latest.json`,
-  );
-  const json = (await response.json()) as BlitzkriegRatingsLeaderboard;
-  LEADERBOARD_CACHE[region][season] = json;
-
-  return json;
-}

src/core/blitzkrieg/getArchivedRatingsMidnightLeaderboard.ts

@@ -1,34 +0,0 @@
-import { BlitzkriegRatingsLeaderboard } from '../../../scripts/buildRatingsLeaderboard';
-import { Region } from '../../constants/regions';
-
-const MIDNIGHT_LEADERBOARD_CACHE: Record<
-  Region,
-  Record<number, BlitzkriegRatingsLeaderboard>
-> = {
-  com: {},
-  eu: {},
-  asia: {},
-};
-
-export default async function getArchivedRatingsMidnightLeaderboard(
-  region: Region,
-  season: number,
-) {
-  if (MIDNIGHT_LEADERBOARD_CACHE[region][season]) {
-    return MIDNIGHT_LEADERBOARD_CACHE[region][season];
-  }
-
-  try {
-    const response = await fetch(
-      `https://raw.githubusercontent.com/tresabhi/blitzkrieg-assets/main/regions/${region}/ratings/${season}/midnight.json`,
-    );
-    const json = (await response.json()) as BlitzkriegRatingsLeaderboard;
-    MIDNIGHT_LEADERBOARD_CACHE[region][season] = json;
-
-    return json;
-  } catch (error) {
-    console.warn(
-      `No midnight leaderboard found for season ${season}, region ${region}`,
-    );
-  }
-}

src/core/blitzkrieg/iconPng.ts

@@ -1,14 +1,16 @@
 import sharp from 'sharp';
 
-const cache: Record<string, string> = {};
+const cache: Record<string, Buffer> = {};
 
-export async function iconPng(url: string) {
-  if (cache[url]) return cache[url];
+export async function webpToPng(url: string) {
+  if (!url.endsWith('.webp')) return url;
 
-  const imageResponse = await fetch(url);
-  const imageBufferWEBP = await imageResponse.arrayBuffer();
-  const imageBufferPNG = await sharp(imageBufferWEBP).png().toBuffer();
-  cache[url] = `data:image/png;base64,${imageBufferPNG.toString('base64')}`;
+  if (!cache[url]) {
+    const imageResponse = await fetch(url);
+    const imageBufferWEBP = await imageResponse.arrayBuffer();
+    const imageBufferPNG = await sharp(imageBufferWEBP).png().toBuffer();
+    cache[url] = imageBufferPNG;
+  }
 
-  return cache[url];
+  return `data:image/png;base64,${cache[url].toString('base64')}`;
 }

src/core/blitzkrieg/readTexture/index.ts

@@ -36,7 +36,7 @@ export async function readTexture(path: string, mutation?: TextureMutation) {
         raw.data[index + 3] = 255;
       }
 
-      return await sharp(raw.data, { raw }).png().toBuffer();
+      return await sharp(raw.data, { raw }).jpeg().toBuffer();
     }
 
     case TextureMutation.RoughnessMetallicness: {
@@ -45,16 +45,16 @@ export async function readTexture(path: string, mutation?: TextureMutation) {
       });
       const metallicness = sharp(raw.data, { raw })
         .extractChannel('green')
-        .png()
+        .jpeg()
         .toBuffer();
       const roughness = sharp(raw.data, { raw })
         .extractChannel('alpha')
-        .png()
+        .jpeg()
         .toBuffer();
 
       return await newImage
         .joinChannel(await Promise.all([roughness, metallicness]))
-        .png()
+        .jpeg()
         .toBuffer();
     }
 
@@ -65,15 +65,15 @@ export async function readTexture(path: string, mutation?: TextureMutation) {
        */
       return await sharp(raw.data, { raw })
         .extractChannel('alpha')
-        .png()
+        .jpeg()
         .toBuffer();
     }
 
     case TextureMutation.Albedo: {
-      return await sharp(raw.data, { raw }).removeAlpha().png().toBuffer();
+      return await sharp(raw.data, { raw }).removeAlpha().jpeg().toBuffer();
     }
 
     default:
-      return await sharp(raw.data, { raw }).png().toBuffer();
+      return await sharp(raw.data, { raw }).jpeg().toBuffer();
   }
 }

src/core/blitzkrieg/tankIconPng.ts

@@ -1,6 +1,6 @@
-import { iconPng } from './iconPng';
+import { webpToPng } from './iconPng';
 import { tankIcon } from './tankIcon';
 
 export function tankIconPng(id: number) {
-  return iconPng(tankIcon(id));
+  return webpToPng(tankIcon(id));
 }

src/core/blitzstars/getStatsInPeriod/index.ts

@@ -69,7 +69,7 @@ export default async function getStatsInPeriod(
       return get(latest.all) - get(previous.all);
     }
 
-    // check if there was a change in battles as games in ratings do update last_battle_time
+    // check if there was a change in battles as games in rating do update last_battle_time
     if (d((a) => a.battles) > 0) {
       diff[tankId] = {
         battles: d((a) => a.battles),

src/core/statistics/deltaBkrlBlitzStats.ts

@@ -0,0 +1,18 @@
+import { RatingPlayer } from '../../commands/ratingLeaderboard';
+import { RatingStats } from '../blitz/getAccountInfo';
+import { BkrlSuperset1Entry } from '../streams/bkrl';
+
+export function deltaBkrlBlitzStats(
+  a: BkrlSuperset1Entry,
+  b1: RatingStats,
+  b2: RatingPlayer,
+) {
+  return {
+    battles: b1.battles - a.battles,
+    damage: b1.damage_dealt - a.damage,
+    kills: b1.frags - a.kills,
+    survived: b1.survived_battles - a.survived,
+    wins: b1.wins - a.wins,
+    score: b2.score - a.score,
+  } satisfies Omit<BkrlSuperset1Entry, 'id'>;
+}

src/core/statistics/deltaTankStats.ts

@@ -5,60 +5,55 @@ import {
 } from '../../types/tanksStats';
 
 export function deltaTankStats(
-  a: NormalizedTankStats,
-  b: NormalizedTankStats,
+  aRaw: NormalizedTankStats,
+  bRaw: NormalizedTankStats,
   time?: number,
 ) {
-  const bTanks = Object.keys(b);
+  const bTanks = Object.keys(bRaw);
   const changedTanks = bTanks.filter((id) => {
     return (
-      a[id as unknown as number]?.all.battles !==
-        b[id as unknown as number].all.battles &&
+      aRaw[id as unknown as number]?.all.battles !==
+        bRaw[id as unknown as number].all.battles &&
       (time === undefined
         ? true
-        : b[id as unknown as number].last_battle_time > time)
+        : bRaw[id as unknown as number].last_battle_time > time)
     );
   });
   const diff = changedTanks.map((id) => {
-    const aTank = a[id as unknown as number] ?? emptyIndividualTankStats;
-    const bTank = b[id as unknown as number];
+    const a = aRaw[id as unknown as number] ?? emptyIndividualTankStats;
+    const b = bRaw[id as unknown as number];
 
     const tankDiff = {
-      account_id: bTank.account_id,
-      battle_life_time: bTank.battle_life_time,
-      frags: (bTank.frags ?? aTank.frags ?? 0) - (aTank.frags ?? 0),
-      max_frags: Math.max(aTank.max_frags, bTank.max_frags),
-      in_garage: bTank.in_garage,
-      max_xp: Math.max(aTank.max_xp, bTank.max_xp),
-      in_garage_updated: bTank.in_garage_updated,
-      last_battle_time: Math.max(
-        bTank.last_battle_time,
-        aTank.last_battle_time,
-      ),
-      mark_of_mastery: bTank.mark_of_mastery,
-      tank_id: bTank.tank_id,
+      account_id: b.account_id,
+      battle_life_time: b.battle_life_time,
+      frags: (b.frags ?? a.frags ?? 0) - (a.frags ?? 0),
+      max_frags: Math.max(a.max_frags, b.max_frags),
+      in_garage: b.in_garage,
+      max_xp: Math.max(a.max_xp, b.max_xp),
+      in_garage_updated: b.in_garage_updated,
+      last_battle_time: Math.max(b.last_battle_time, a.last_battle_time),
+      mark_of_mastery: b.mark_of_mastery,
+      tank_id: b.tank_id,
 
       all: {
-        battles: bTank.all.battles - aTank.all.battles,
-        wins: bTank.all.wins - aTank.all.wins,
-        capture_points: bTank.all.capture_points - aTank.all.capture_points,
-        damage_dealt: bTank.all.damage_dealt - aTank.all.damage_dealt,
-        damage_received: bTank.all.damage_received - aTank.all.damage_received,
+        battles: b.all.battles - a.all.battles,
+        wins: b.all.wins - a.all.wins,
+        capture_points: b.all.capture_points - a.all.capture_points,
+        damage_dealt: b.all.damage_dealt - a.all.damage_dealt,
+        damage_received: b.all.damage_received - a.all.damage_received,
         dropped_capture_points:
-          bTank.all.dropped_capture_points - aTank.all.dropped_capture_points,
-        frags: bTank.all.frags - aTank.all.frags,
-        frags8p: bTank.all.frags8p - aTank.all.frags8p,
-        hits: bTank.all.hits - aTank.all.hits,
-        losses: bTank.all.losses - aTank.all.losses,
-        max_frags: Math.max(aTank.max_frags, bTank.max_frags),
-        max_xp: Math.max(aTank.max_xp, bTank.max_xp),
-        shots: bTank.all.shots - aTank.all.shots,
-        spotted: bTank.all.spotted - aTank.all.spotted,
-        survived_battles:
-          bTank.all.survived_battles - aTank.all.survived_battles,
-        win_and_survived:
-          bTank.all.win_and_survived - aTank.all.win_and_survived,
-        xp: bTank.all.xp - aTank.all.xp,
+          b.all.dropped_capture_points - a.all.dropped_capture_points,
+        frags: b.all.frags - a.all.frags,
+        frags8p: b.all.frags8p - a.all.frags8p,
+        hits: b.all.hits - a.all.hits,
+        losses: b.all.losses - a.all.losses,
+        max_frags: Math.max(a.max_frags, b.max_frags),
+        max_xp: Math.max(a.max_xp, b.max_xp),
+        shots: b.all.shots - a.all.shots,
+        spotted: b.all.spotted - a.all.spotted,
+        survived_battles: b.all.survived_battles - a.all.survived_battles,
+        win_and_survived: b.all.win_and_survived - a.all.win_and_survived,
+        xp: b.all.xp - a.all.xp,
       },
     } satisfies IndividualTankStats;
 

src/core/statistics/filterStats.ts

@@ -1,4 +1,5 @@
 import { TreeType } from '../../components/Tanks';
+import { SupplementaryStats } from '../blitz/getAccountInfo';
 import { tankDefinitions } from '../blitzkrieg/tankDefinitions';
 import { DiffedTankStats } from '../blitzstars/getStatsInPeriod';
 import { tankAverages } from '../blitzstars/tankAverages';
@@ -68,7 +69,7 @@ export async function filterStats(
             : accumulator,
         0,
       ) / battlesOfTanksWithTankDefinition,
-  };
+  } satisfies SupplementaryStats;
 
   return { stats, supplementary, filteredOrder };
 }

src/core/streams/bkrl.ts

@@ -0,0 +1,142 @@
+import { times } from 'lodash';
+import { ReadStream, WriteStream } from './buffer';
+
+export enum BkrlFormat {
+  Base,
+  Superset1,
+}
+
+export interface BkrlBaseEntry {
+  id: number;
+  score: number;
+}
+
+export interface BkrlSuperset1Entry {
+  id: number;
+  score: number;
+
+  battles: number;
+  wins: number;
+  survived: number;
+
+  damage: number;
+  kills: number;
+}
+
+export type BkrlDiscriminatedEntries =
+  | {
+      format: BkrlFormat.Base;
+      entries: BkrlBaseEntry[];
+    }
+  | {
+      format: BkrlFormat.Superset1;
+      entries: BkrlSuperset1Entry[];
+    };
+
+export class BkrlReadStream extends ReadStream {
+  bkrl() {
+    this.magic();
+    const header = this.header();
+    return this.body(header);
+  }
+
+  body(header: ReturnType<typeof this.header>): BkrlDiscriminatedEntries {
+    switch (header.format) {
+      case BkrlFormat.Base: {
+        return {
+          format: BkrlFormat.Base,
+          entries: times(
+            header.count,
+            () =>
+              ({
+                id: this.uint32(),
+                score: this.uint16(),
+              }) satisfies BkrlBaseEntry,
+          ),
+        };
+      }
+
+      case BkrlFormat.Superset1: {
+        return {
+          format: BkrlFormat.Superset1,
+          entries: times(
+            header.count,
+            () =>
+              ({
+                id: this.uint32(),
+                score: this.uint16(),
+
+                battles: this.uint32(),
+                wins: this.uint32(),
+                survived: this.uint32(),
+
+                damage: this.uint32(),
+                kills: this.uint32(),
+              }) satisfies BkrlSuperset1Entry,
+          ),
+        };
+      }
+    }
+  }
+
+  header() {
+    return {
+      version: this.uint16(),
+      format: this.uint8() as BkrlFormat,
+      count: this.uint32(),
+    };
+  }
+
+  magic() {
+    const magic = this.utf8(4);
+
+    if (magic !== 'BKRL') {
+      throw new Error(`Invalid BKRL magic number: "${magic}"`);
+    }
+  }
+}
+
+export class BkrlWriteStream extends WriteStream {
+  bkrl(discriminatedEntries: BkrlDiscriminatedEntries) {
+    this.magic();
+    this.header(discriminatedEntries);
+    this.body(discriminatedEntries);
+  }
+
+  body(discriminatedEntries: BkrlDiscriminatedEntries) {
+    switch (discriminatedEntries.format) {
+      case BkrlFormat.Base: {
+        discriminatedEntries.entries.forEach((entry) => {
+          this.uint32(entry.id);
+          this.uint16(entry.score);
+        });
+        break;
+      }
+
+      case BkrlFormat.Superset1: {
+        discriminatedEntries.entries.forEach((entry) => {
+          this.uint32(entry.id);
+          this.uint16(entry.score);
+
+          this.uint32(entry.battles);
+          this.uint32(entry.wins);
+          this.uint32(entry.survived);
+
+          this.uint32(entry.damage);
+          this.uint32(entry.kills);
+        });
+        break;
+      }
+    }
+  }
+
+  header(discriminatedEntries: BkrlDiscriminatedEntries) {
+    this.uint16(1);
+    this.uint8(discriminatedEntries.format);
+    this.uint32(discriminatedEntries.entries.length);
+  }
+
+  magic() {
+    this.utf8('BKRL');
+  }
+}

src/core/streams/cdon.ts

@@ -48,7 +48,7 @@ export class CdonReadStream extends ReadStream {
     const magic = this.utf8(4);
 
     if (magic !== 'CDON') {
-      throw new Error(`Invalid Cdon magic number: "${magic}"`);
+      throw new Error(`Invalid CDON magic number: "${magic}"`);
     }
   }
 

src/events/interactionCreate/index.ts

@@ -25,7 +25,8 @@ import { ownedTanksCommand } from '../../commands/ownedTanks';
 import { permissionsCommand } from '../../commands/permissions';
 import { pingCommand } from '../../commands/ping';
 import { playerInfoCommand } from '../../commands/playerInfo';
-import { ratingsCommand } from '../../commands/ratings';
+import { ratingCommand } from '../../commands/rating';
+import { ratingLeaderboardCommand } from '../../commands/ratingLeaderboard';
 import { researchCommand } from '../../commands/research';
 import { searchClansCommand } from '../../commands/searchClans';
 import { searchPlayersCommand } from '../../commands/searchPlayers';
@@ -92,9 +93,10 @@ export const COMMANDS_RAW: Promise<CommandRegistry>[] = [
   pingCommand,
   evolutionCommand,
   statsCommand,
-  ratingsCommand,
+  ratingLeaderboardCommand,
   todayCommand,
   researchCommand,
+  ratingCommand,
 ];
 
 export const commands = Promise.allSettled(COMMANDS_RAW).then((rawCommands) => {

src/lang/en-US.json

@@ -174,6 +174,7 @@
 
       "no_data": {
         "battles_in_period": "No battles played in this period",
+        "battles_in_season": "No battles played in this season",
         "players_in_period": "No players in this period",
         "tanks_found": "No tanks found"
       },
@@ -192,6 +193,17 @@
         "get_help": "Help Discord server",
         "uncaught_error": "# Blitzkrieg ran into an error!\nWe're so sorry about this. Feel free to [join the official Discord server](https://discord.gg/nDt7AjGJQH) to get help.",
         "preview": "# This command is in preview\n\nYou can only access this command in [the official Discord server](https://discord.gg/nDt7AjGJQH). The command will be generally available soon."
+      },
+
+      "hero_stats": {
+        "battles": "Battles",
+        "winrate": "Winrate",
+        "damage": "Damage",
+        "damage_ratio": "Damage ratio",
+        "tier": "Tier",
+        "survival": "Survival",
+        "accuracy": "Accuracy",
+        "kills": "Kills"
       }
     },
 
@@ -414,9 +426,9 @@
         }
       },
 
-      "ratings": {
-        "$": "ratings",
-        "description": "Ratings battles statistics",
+      "rating_leaderboard": {
+        "$": "rating-leaderboard",
+        "description": "Rating battles statistics",
 
         "subcommands": {
           "neighbors": {
@@ -453,10 +465,10 @@
 
         "body": {
           "top_players": "Top %s players",
-          "no_participation": "# %s didn't play ratings in season %s\n\nThis player did not participate in this season or did not get past calibration.",
-          "no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running ratings season.",
+          "no_participation": "# %s didn't play rating in season %s\n\nThis player did not participate in this season or did not get past calibration.",
+          "no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running rating season.",
           "deleted_player": "Deleted %s",
-          "neighbors": "Ratings neighbors",
+          "neighbors": "Rating neighbors",
           "more": "+ %s more"
         }
       },
@@ -468,18 +480,7 @@
 
       "stats": {
         "$": "stats",
-        "description": "Quick statistics for a period",
-
-        "body": {
-          "battles": "Battles",
-          "winrate": "Winrate",
-          "damage": "Damage",
-          "damage_ratio": "Damage ratio",
-          "tier": "Tier",
-          "survival": "Survival",
-          "accuracy": "Accuracy",
-          "kill_ratio": "Kill ratio"
-        }
+        "description": "Quick statistics for a period"
       },
 
       "owned_tanks": {
@@ -500,7 +501,7 @@
           "view_channels": "View channels: needed to find the message the refresh button was used on",
           "read_message_history": "Read message history: needed to find the message to refresh",
           "attach_files": "Attach files: needed to add images to image-based commands",
-          "external_emojis": "External emojis: needed add national flags and tank class emojis"
+          "external_emojis": "External emojis: needed to add national flags and tank class emojis"
         }
       },
 
@@ -538,6 +539,20 @@
           "created": "Created",
           "last_battle": "Last battle"
         }
+      },
+
+      "rating": {
+        "$": "rating-session",
+        "description": "Rating player's statistics",
+
+        "body": {
+          "subtitle": "Today's rating statistics"
+        },
+
+        "errors": {
+          "no_participation": "# %s hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
+          "unrecorded_stats": "# Statistics currently unavailable\n\nWargaming may be currently be facing server downtime. If there is an on-going season, statistics should be available withing 24 hours."
+        }
       }
     }
   },

src/lang/es-ES.json

@@ -137,10 +137,10 @@
           "description": "Región"
         },
         "tier": {
-          "$": "tier",
-          "description": "Tier",
+          "$": "nivel",
+          "description": "Nivel",
           "choices": {
-            "tier": "Tier %s - %s"
+            "tier": "Nivel %s - %s"
           }
         }
       },
@@ -152,10 +152,11 @@
       },
       "filters": {
         "none": "Sin filtros",
-        "tier": "Tier %s"
+        "tier": "Nivel %s"
       },
       "no_data": {
         "battles_in_period": "No hay batallas jugadas en este período",
+        "battles_in_season": "No hay batallas jugadas en esta temporada",
         "players_in_period": "No hay jugadores en este período",
         "tanks_found": "No se encontraron tanques"
       },
@@ -170,10 +171,52 @@
         "tank_id_not_found": "# Tanque no encontrado\nNo se pudo encontrar al tanque del ID \"%s\". Prueba escribiendo el nombre del tanque en vez de un número.",
         "no_tank_stats": "# No hay estadísticas de tanque disponibles\nEste jugador no tiene estadísticas disponibles. Este podría no ser el jugador que estás buscando.",
         "get_help": "Servidor de ayuda de Discord",
-        "uncaught_error": "# ¡Blitzkrieg sufrió un error!\nLo sentimos mucho. Siéntete libre de [unirte al servidor oficial de Discord](https://discord.gg/nDt7AjGJQH) para obtener ayuda."
+        "uncaught_error": "# ¡Blitzkrieg sufrió un error!\nLo sentimos mucho. Siéntete libre de [unirte al servidor oficial de Discord](https://discord.gg/nDt7AjGJQH) para obtener ayuda.",
+        "preview": "# Este comando es una vista previa\n\nSolo puedes acceder a este comando en [el servidor oficial de Discord](https://discord.gg/nDt7AjGJQH). Generalmente este comando estará disponible pronto."
+      },
+      "hero_stats": {
+        "battles": "Batallas",
+        "winrate": "Tasa de victorias",
+        "damage": "Daño",
+        "damage_ratio": "Relación de daño",
+        "tier": "Nivel",
+        "survival": "Supervivencia",
+        "accuracy": "Precisión",
+        "kills": "Bajas"
       }
     },
     "commands": {
+      "research": {
+        "$": "investigar",
+        "description": "Enumera los gastos por investigar una línea",
+        "options": {
+          "target_tank": {
+            "$": "tanque-objetivo",
+            "description": "El último tanque a investigar en la línea"
+          },
+          "starting_tank": {
+            "$": "tanque-inicial",
+            "description": "El tanque inicial en la línea (se deduce automáticamente si no se proporciona)"
+          }
+        },
+        "body": {
+          "subtitle": "Investigar",
+          "total": "Total",
+          "research": "Investigar: %s",
+          "upgrades": "Mejoras: %s",
+          "purchase": "Comprar: %s",
+          "equipment": "Equipamiento: %s",
+          "estimation": "# ¡Esto es una estimación!\n\nEsta lista podría incluir tanques ya investigados debido a la información errónea que proporciona Wargaming. Si puedes, prueba proporcionando un `tanque-inicial` de la línea al usar el comando."
+        },
+        "errors": {
+          "non_tech_tree": "# %s no está en el árbol tecnológico\n\nNo puedes investigar un tanque prémium o coleccionista.",
+          "tier_1": "# %s es un nivel I\n\nLos tanque de nivel I están siempre desbloqueados gratuitamente para todos los jugadores.",
+          "already_researched": "# %s ya está investigado\n\nPrueba proporcionando un `tanque-inicial` al usar el comando para ver los totales para una línea que ya has investigado.",
+          "start_end_equal": "# %s fue proporcionado dos veces\n\nAsegúrate de que `tanque-inicial` y `tanque-objetivo` son diferentes.",
+          "tanks_not_on_line": "# %s y %s no están en la misma línea\n\nAsegúrate de que `tanque-inicial` y `tanque-objetivo` están en la misma línea del árbol tecnológico.",
+          "unordered": "# %s de nivel superior a %s\n\nAsegúrate de proporcionar %s como el `tanque-inicial` en su lugar ya que es el tanque de nivel inferior."
+        }
+      },
       "about": {
         "$": "sobre",
         "description": "Toda la información que necesitas sobre el bot",
@@ -278,13 +321,13 @@
             "lethality": {
               "$": "Letalidad",
               "average_damage": "Daño promedio",
-              "damage_per_tier": "Daño por tier",
+              "damage_per_tier": "Daño por nivel",
               "damage_ratio": "Relación de daño",
               "average_kills": "Promedio de bajas"
             },
             "miscellaneous": {
               "$": "Misceláneo",
-              "average_tier": "Tier promedio",
+              "average_tier": "Nivel promedio",
               "average_spots": "Promedio de detecciones",
               "average_xp": "Promedio de XP",
               "kills_to_death_ratio": "Relación bajas-muertes"
@@ -335,13 +378,13 @@
           "no_results": "No se encontraron jugadores"
         }
       },
-      "ratings": {
-        "$": "clasificación",
-        "description": "Estadísticas de batallas en clasificación",
+      "rating_leaderboard": {
+        "$": "rating-leaderboard",
+        "description": "Rating battles statistics",
         "subcommands": {
           "neighbors": {
             "$": "vecinos",
-            "description": "Jugadores vecinos en la tabla de posiciones"
+            "description": "Neighboring players on the leaderboard"
           },
           "league": {
             "$": "liga",
@@ -351,7 +394,7 @@
         "options": {
           "limit": {
             "$": "límite",
-            "description": "Cuántos vecinos mostrar (predeterminado: %s)"
+            "description": "Cuántos vecinos a mostrar (predeterminado: %s)"
           },
           "season": {
             "$": "temporada",
@@ -366,11 +409,11 @@
           }
         },
         "body": {
-          "top_players": "Top %s jugadores",
-          "no_participation": "# %s no jugó clasificación en la temporada %s\n\nEl jugador no participó en esta temporada o no completó su calibración.",
-          "no_ongoing_season": "# No hay temporada en curso\n\nActualmente no hay ninguna temporada de clasificación.",
+          "top_players": "Mejores %s jugadores",
+          "no_participation": "# %s didn't play rating in season %s\n\nThis player did not participate in this season or did not get past calibration.",
+          "no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running rating season.",
           "deleted_player": "%s eliminado",
-          "neighbors": "Vecinos de clasificación",
+          "neighbors": "Rating neighbors",
           "more": "+ %s más"
         }
       },
@@ -380,23 +423,13 @@
       },
       "stats": {
         "$": "estadísticas",
-        "description": "Estadísticas rápidas para un período",
-        "body": {
-          "battles": "Batallas",
-          "winrate": "Tasa de victorias",
-          "damage": "Daño",
-          "damage_ratio": "Relación de daño",
-          "tier": "Tier",
-          "survival": "Supervivencia",
-          "accuracy": "Precisión",
-          "kill_ratio": "Relación de bajas"
-        }
+        "description": "Estadísticas rápidas para un período"
       },
       "owned_tanks": {
         "$": "tanques-propios",
-        "description": "Muestra todos los tanques propios en un tier",
+        "description": "Muestra todos los tanques propios en un nivel",
         "body": {
-          "subtitle": "Tanques de tier %s"
+          "title": "# Tanques de %s de nivel %s\n\n"
         }
       },
       "permissions": {
@@ -404,9 +437,10 @@
         "description": "Comprueba si el bot tiene los permisos requeridos para funcionar",
         "body": {
           "title": "# Permisos\n\n%s",
-          "view_channels": "Ver canales: necesario para que funcione el botón de actualizar",
-          "read_message_history": "Leer el historial de mensajes: necesario para que el botón de actualizar pueda encontrar el mensaje a actualizar",
-          "attach_files": "Adjuntar archivos: necesario para que funcionen los comandos basados en imágenes"
+          "view_channels": "Ver canales: necesario para encontrar el mensaje en el cual el botón \"actualizar\" fue usado",
+          "read_message_history": "Leer historial de mensajes: necesario para encontrar el mensaje a actualizar",
+          "attach_files": "Adjuntar archivos: necesario para añadir imágenes a los comandos basados en estas",
+          "external_emojis": "Emoticonos externos: necesario para añadir emoticonos de banderas nacionales y clases de tanque"
         }
       },
       "ping": {
@@ -439,6 +473,17 @@
           "created": "Creado",
           "last_battle": "Última batalla"
         }
+      },
+      "rating": {
+        "$": "rating-session",
+        "description": "Rating player's statistics",
+        "body": {
+          "subtitle": "Today's rating statistics"
+        },
+        "errors": {
+          "no_participation": "# %s hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
+          "unrecorded_stats": "# Estadísticas no disponibles actualmente\n\nWargaming podría estar sufriendo una caída del servidor. Si hay alguna temporada en curso, las estadísticas deberían estar disponibles en 24 horas."
+        }
       }
     }
   },

src/lang/hr.json

@@ -156,6 +156,7 @@
       },
       "no_data": {
         "battles_in_period": "No battles played in this period",
+        "battles_in_season": "No battles played in this season",
         "players_in_period": "No players in this period",
         "tanks_found": "No tanks found"
       },
@@ -170,10 +171,52 @@
         "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"%s\". Try typing the name of the tank instead of a number.",
         "no_tank_stats": "# No tank stats available\nThis player doesn't have any stats available. This may not be the player you are looking for.",
         "get_help": "Help Discord server",
-        "uncaught_error": "# Blitzkrieg ran into an error!\nWe're so sorry about this. Feel free to [join the official Discord server](https://discord.gg/nDt7AjGJQH) to get help."
+        "uncaught_error": "# Blitzkrieg ran into an error!\nWe're so sorry about this. Feel free to [join the official Discord server](https://discord.gg/nDt7AjGJQH) to get help.",
+        "preview": "# This command is in preview\n\nYou can only access this command in [the official Discord server](https://discord.gg/nDt7AjGJQH). The command will be generally available soon."
+      },
+      "hero_stats": {
+        "battles": "Battles",
+        "winrate": "Winrate",
+        "damage": "Damage",
+        "damage_ratio": "Damage ratio",
+        "tier": "Tier",
+        "survival": "Survival",
+        "accuracy": "Accuracy",
+        "kills": "Kills"
       }
     },
     "commands": {
+      "research": {
+        "$": "research",
+        "description": "Lists the expenses in researching a line",
+        "options": {
+          "target_tank": {
+            "$": "target-tank",
+            "description": "The final tank to research in the line"
+          },
+          "starting_tank": {
+            "$": "starting-tank",
+            "description": "The starting tank in the line (inferred automatically if not provided)"
+          }
+        },
+        "body": {
+          "subtitle": "Research",
+          "total": "Total",
+          "research": "Research: %s",
+          "upgrades": "Upgrades: %s",
+          "purchase": "Purchase: %s",
+          "equipment": "Equipment: %s",
+          "estimation": "# This is an estimation!\n\nThis list may include already researched tanks because of the inaccurate information Wargaming provides. Try providing a `starting-tank` from the line when using the command if you can."
+        },
+        "errors": {
+          "non_tech_tree": "# %s is not on the tech tree\n\nYou cannot research a premium/collector tank.",
+          "tier_1": "# %s is a tier I\n\nTier I tanks are always unlocked for free for all players.",
+          "already_researched": "# %s is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
+          "start_end_equal": "# %s was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
+          "tanks_not_on_line": "# %s and %s are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
+          "unordered": "# %s higher tiered to %s\n\nMake sure to provide %s as the `starting-tank` instead as it is the lower tiered tank."
+        }
+      },
       "about": {
         "$": "about",
         "description": "All the info you need about the bot",
@@ -335,9 +378,9 @@
           "no_results": "No players found"
         }
       },
-      "ratings": {
-        "$": "ratings",
-        "description": "Ratings battles statistics",
+      "rating_leaderboard": {
+        "$": "rating-leaderboard",
+        "description": "Rating battles statistics",
         "subcommands": {
           "neighbors": {
             "$": "neighbors",
@@ -367,10 +410,10 @@
         },
         "body": {
           "top_players": "Top %s players",
-          "no_participation": "# %s didn't play ratings in season %s\n\nThis player did not participate in this season or did not get past calibration.",
-          "no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running ratings season.",
+          "no_participation": "# %s didn't play rating in season %s\n\nThis player did not participate in this season or did not get past calibration.",
+          "no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running rating season.",
           "deleted_player": "Deleted %s",
-          "neighbors": "Ratings neighbors",
+          "neighbors": "Rating neighbors",
           "more": "+ %s more"
         }
       },
@@ -380,23 +423,13 @@
       },
       "stats": {
         "$": "stats",
-        "description": "Quick statistics for a period",
-        "body": {
-          "battles": "Battles",
-          "winrate": "Winrate",
-          "damage": "Damage",
-          "damage_ratio": "Damage ratio",
-          "tier": "Tier",
-          "survival": "Survival",
-          "accuracy": "Accuracy",
-          "kill_ratio": "Kill ratio"
-        }
+        "description": "Quick statistics for a period"
       },
       "owned_tanks": {
         "$": "owned-tanks",
         "description": "Shows all own tanks in a tier",
         "body": {
-          "subtitle": "Tier %s tanks"
+          "title": "# %s's owned tier %s tanks\n\n"
         }
       },
       "permissions": {
@@ -404,9 +437,10 @@
         "description": "Checks wether the bot has the required permissions to function",
         "body": {
           "title": "# Permissions\n\n%s",
-          "view_channels": "View channels: needed for the refresh button to work",
-          "read_message_history": "Read message history: needed for the refresh button to find the message to refresh",
-          "attach_files": "Attach files: needed for image-based commands to work"
+          "view_channels": "View channels: needed to find the message the refresh button was used on",
+          "read_message_history": "Read message history: needed to find the message to refresh",
+          "attach_files": "Attach files: needed to add images to image-based commands",
+          "external_emojis": "External emojis: needed to add national flags and tank class emojis"
         }
       },
       "ping": {
@@ -439,6 +473,17 @@
           "created": "Created",
           "last_battle": "Last battle"
         }
+      },
+      "rating": {
+        "$": "rating-session",
+        "description": "Rating player's statistics",
+        "body": {
+          "subtitle": "Today's rating statistics"
+        },
+        "errors": {
+          "no_participation": "# %s hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
+          "unrecorded_stats": "# Statistics currently unavailable\n\nWargaming may be currently be facing server downtime. If there is an on-going season, statistics should be available withing 24 hours."
+        }
       }
     }
   },

src/stitches.config.ts

@@ -2,8 +2,13 @@ import {
   amberDark,
   amberDarkA,
   blueDark,
+  brownDark,
+  greenDark,
+  mauveDark,
   orangeDark,
   purpleDark,
+  redDark,
+  sandDark,
   slate,
   slateDark,
   slateDarkA,
@@ -26,6 +31,11 @@ export const theme = {
     ...createColors(purpleDark, 'purple'),
     ...createColors(blueDark, 'blue'),
     ...createColors(tealDark, 'teal'),
+    ...createColors(greenDark, 'green'),
+    ...createColors(redDark, 'red'),
+    ...createColors(brownDark, 'brown'),
+    ...createColors(mauveDark, 'mauve'),
+    ...createColors(sandDark, 'sand'),
   },
 
   borderStyles: {

src/stores/tankopedia.ts

@@ -23,6 +23,7 @@ export interface TankopediaPersistent {
       showGrid: boolean;
       greenPenetration: boolean;
       showEnvironment: boolean;
+      showSpacedArmor: boolean;
     };
   };
   sort: {
@@ -123,6 +124,7 @@ export const useTankopediaPersistent = create<TankopediaPersistent>()(
     subscribeWithSelector<TankopediaPersistent>(() => ({
       model: {
         visual: {
+          showSpacedArmor: true,
           wireframe: false,
           opaque: false,
           environment: ENVIRONMENTS[0],

yarn.lock

@@ -339,6 +339,11 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@corex/deepmerge@^4.0.43":
+  version "4.0.43"
+  resolved "https://registry.yarnpkg.com/@corex/deepmerge/-/deepmerge-4.0.43.tgz#9bd42559ebb41cc5a7fb7cfeea5f231c20977dca"
+  integrity sha512-N8uEMrMPL0cu/bdboEWpQYb/0i2K5Qn8eCsxzOmxSggJbbQte7ljMRoXm917AbntqTGOzdTu+vP3KOOzoC70HQ==
+
 "@discordjs/builders@^1.7.0":
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.7.0.tgz#e2478c7e55b0f4c40837edb8f102bce977323a37"
@@ -785,6 +790,11 @@
   resolved "https://registry.yarnpkg.com/@next/env/-/env-14.1.0.tgz#43d92ebb53bc0ae43dcc64fb4d418f8f17d7a341"
   integrity sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw==
 
+"@next/env@^13.4.3":
+  version "13.5.6"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-13.5.6.tgz#c1148e2e1aa166614f05161ee8f77ded467062bc"
+  integrity sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw==
+
 "@next/[email protected]":
   version "14.1.0"
   resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.1.0.tgz#70a57c87ab1ae5aa963a3ba0f4e59e18f4ecea39"
@@ -2361,13 +2371,6 @@
     debug "^4.3.1"
     loader-utils "^2.0.0"
 
-"@vercel/analytics@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@vercel/analytics/-/analytics-1.2.2.tgz#715d8f203a170c06ba36b363e03b048c03060d5d"
-  integrity sha512-X0rctVWkQV1e5Y300ehVNqpOfSOufo7ieA5PIdna8yX/U7Vjz0GFsGf4qvAhxV02uQ2CVt7GYcrFfddXXK2Y4A==
-  dependencies:
-    server-only "^0.0.1"
-
 "@vitejs/plugin-vue@^5.0.4":
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.0.4.tgz#508d6a0f2440f86945835d903fcc0d95d1bb8a37"
@@ -3413,7 +3416,7 @@ fast-deep-equal@^2.0.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
   integrity sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==
 
-[email protected], fast-glob@^3.3.2:
+[email protected], fast-glob@^3.2.12, fast-glob@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -4238,7 +4241,7 @@ minimatch@^9.0.0, minimatch@^9.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-[email protected], minimist@^1.2.5:
+[email protected], minimist@^1.2.5, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -4314,6 +4317,16 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
+next-sitemap@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/next-sitemap/-/next-sitemap-4.2.3.tgz#5db3f650351a51e84b9fd6b58c5af2f9257b5058"
+  integrity sha512-vjdCxeDuWDzldhCnyFCQipw5bfpl4HmZA7uoo3GAaYGjGgfL4Cxb1CiztPuWGmS+auYs7/8OekRS8C2cjdAsjQ==
+  dependencies:
+    "@corex/deepmerge" "^4.0.43"
+    "@next/env" "^13.4.3"
+    fast-glob "^3.2.12"
+    minimist "^1.2.8"
+
 next@^14.1.0:
   version "14.1.0"
   resolved "https://registry.yarnpkg.com/next/-/next-14.1.0.tgz#b31c0261ff9caa6b4a17c5af019ed77387174b69"
@@ -4971,7 +4984,7 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-satori@^0.10.8:
+satori@^0.10.13:
   version "0.10.13"
   resolved "https://registry.yarnpkg.com/satori/-/satori-0.10.13.tgz#658a9920f55268d2002819387a80a0b6d4bdc262"
   integrity sha512-klCwkVYMQ/ZN5inJLHzrUmGwoRfsdP7idB5hfpJ1jfiJk1ErDitK8Hkc6Kll1+Ox2WtqEuGecSZLnmup3CGzvQ==
@@ -5049,11 +5062,6 @@ [email protected]:
     parseurl "~1.3.3"
     send "0.18.0"
 
-server-only@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/server-only/-/server-only-0.0.1.tgz#0f366bb6afb618c37c9255a314535dc412cd1c9e"
-  integrity sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==
-
 set-function-length@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425"