fix: use root node modules

* New translations en.json (Russian)

* New translations en.json (Russian)

* New translations en.json (Russian)

.github/workflows/assets.yml

@@ -1,4 +1,4 @@
-name: Build Assets
+name: Assets
 
 on:
   push:
@@ -6,30 +6,30 @@ on:
 
   workflow_dispatch:
     inputs:
-      cdn_branch:
+      asset_repo:
+        type: choice
+        required: false
+        description: What asset repo to write to
+        options:
+          - blitzkit/assets
+          - blitzkit/assets-preview
+          - blitzkit/assets-dev
+        default: blitzkit/assets
+
+      archive_url:
         type: string
         required: false
-        default: main
-        description: What CDN branch to write to
-      zip_url:
-        type: string
-        required: false
-        description: ZIP URL to download instead of Steam client
-      zip_root:
-        type: string
-        required: false
-        description: Root dir of ZIP which houses the executable and Data dir
+        description: Archive URL to download instead of Steam client
 
   schedule:
-    - cron: '0 2 * * *'
+    - cron: "0 2 * * *"
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.cdn_branch }}
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.asset_repo }}
   cancel-in-progress: true
 
 env:
   DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}
   DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
   DATABASE_URL: ${{ secrets.DATABASE_URL }}
   VIDEOS_SHEET: ${{ secrets.VIDEOS_SHEET }}
@@ -37,8 +37,8 @@ env:
   WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
   WOTB_DLC_CDN: ${{ secrets.WOTB_DLC_CDN }}
   PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
-  PUBLIC_ASSET_REPO: blitzkit/assets
-  PUBLIC_ASSET_BRANCH: main
+  PUBLIC_ASSET_REPO: ${{ github.event.inputs.asset_repo != '' && github.event.inputs.asset_repo || secrets.PUBLIC_ASSET_REPO }}
+  PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
   WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
   WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
   PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
@@ -54,100 +54,28 @@ env:
   PUBLIC_ASSET_FAST_USER: blitzkit
   PUBLIC_ASSET_FAST_REPO: assets
   PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
+  STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
+  STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
 
 jobs:
-  download_client:
-    name: Download client
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: (ZIP) Maximize build space
-        if: github.event.inputs.zip_url != ''
-        uses: easimon/maximize-build-space@master
-        with:
-          root-reserve-mb: 512
-          swap-size-mb: 1024
-          remove-dotnet: 'true'
-
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.GH_TOKEN }}
-
-      - name: (Steam) Setup bun
-        uses: oven-sh/setup-bun@v1
-        if: github.event.inputs.zip_url == ''
-
-      - name: (Steam) Install dependencies
-        if: github.event.inputs.zip_url == ''
-        run: bun install
-
-      - name: (Steam) Setup DepotDownloader
-        if: github.event.inputs.zip_url == ''
-        run: bun run setup:depotdownloader
-
-      - name: (Steam) Download client
-        if: github.event.inputs.zip_url == ''
-        run: |
-          chmod +x ./temp/depotDownloader/DepotDownloader
-          ./temp/depotDownloader/DepotDownloader -q -os windows -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}"
-
-      - name: (Steam) Apply patches
-        if: github.event.inputs.zip_url == ''
-        run: bun setup:patches --depot
-
-      - name: (ZIP) Download client
-        if: github.event.inputs.zip_url != ''
-        env:
-          ZIP_URL: ${{ github.event.inputs.zip_url }}
-          ZIP_ROOT: ${{ github.event.inputs.zip_root }}
-        run: |
-          wget -q -O client.zip $ZIP_URL
-          unzip -q client.zip -d client
-          rm client.zip
-          mkdir -p depots/444202/0
-          mv client/$ZIP_ROOT/* depots/444202/0
-
-      - name: Archive depots
-        uses: actions/upload-artifact@v4
-        with:
-          name: depots
-          path: depots
-
   build_assets:
     name: Build assets
     runs-on: ubuntu-latest
-    needs: download_client
 
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
-
-      - name: Setup bun
-        uses: oven-sh/setup-bun@v1
-
-      - name: Install dependencies
-        run: bun install
-
-      - name: Lint
-        run: bun run lint:website
-
-      - name: Download depots
-        uses: actions/download-artifact@v4
+      - uses: arduino/setup-protoc@v3
         with:
-          name: depots
-          path: depots
+          repo-token: ${{ secrets.GH_TOKEN }}
+      - uses: oven-sh/setup-bun@v1
+      - run: bun run setup
 
       - name: AppArmor hack
         run: echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
 
-      - name: Start server and build assets
-        run: |
-          bun dev:website --verbosepa & 
-          SERVER_PID=$!
-
-          bun run build:assets --all-targets --depot --production
-
-          kill $SERVER_PID || true
+      - name: Build assets
+        run: bun run build:assets --all-targets --manual

.github/workflows/averages.yml

@@ -3,7 +3,7 @@ name: Averages
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 8 * * *'
+    - cron: "0 8 * * *"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -15,7 +15,7 @@ env:
   PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
   PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
   PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
-  ALLOW_ROBOTS: 'true'
+  ALLOW_ROBOTS: "true"
   WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
   PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
   PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
@@ -25,6 +25,7 @@ env:
   PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
   PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
   PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
 jobs:
   build:
@@ -32,16 +33,20 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.GH_TOKEN }}
       - uses: oven-sh/setup-bun@v1
-
-      - name: Install dependencies
-        run: bun install
+      - uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GH_TOKEN }}
+      - run: bun run setup
 
       - name: Build averages
         env:
           PUBLIC_ASSET_BRANCH: main
           DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+
           DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
           DATABASE_URL: ${{ secrets.DATABASE_URL }}
           VIDEOS_SHEET: ${{ secrets.VIDEOS_SHEET }}

.github/workflows/build-bot.yml

@@ -1,4 +1,4 @@
-name: Build Bot
+name: Bot
 
 on:
   push:
@@ -15,13 +15,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.GH_TOKEN }}
       - uses: oven-sh/setup-bun@v1
-
-      - name: Install dependencies
-        run: bun install
-
-      - name: Build Prisma
-        run: bun run build:prisma
+      - uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GH_TOKEN }}
+      - run: bun run setup
 
       - name: Build bot
         run: bun run build:bot

.github/workflows/discover-ids.yml

@@ -1,9 +1,9 @@
-name: Discover IDs
+name: IDs
 
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1'
+    - cron: "0 0 * * 1"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -11,11 +11,11 @@ concurrency:
 
 env:
   DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}
   DATABASE_URL: ${{ secrets.DATABASE_URL }}
   PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
   PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
   PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
 jobs:
   build:
@@ -23,10 +23,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.GH_TOKEN }}
       - uses: oven-sh/setup-bun@v1
-
-      - name: Install dependencies
-        run: bun install
+      - uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GH_TOKEN }}
+      - run: bun run setup
 
       - name: Discover IDs
         run: bun build:ids --production

.github/workflows/host-bot.yml

@@ -1,10 +1,10 @@
-name: Host Bot
+name: Host
 
 on:
   push:
     branches: main
   schedule:
-    - cron: '0 */5 * * *'
+    - cron: "0 */5 * * *"
   workflow_dispatch:
   release:
     types: [created, published, released, edited]
@@ -22,6 +22,20 @@ env:
   PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
   PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
   PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
+  PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
+  ALLOW_ROBOTS: ${{ secrets.ALLOW_ROBOTS }}
+  WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
+  PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
+  PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
+  GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
+  WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
+  WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
+  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
+  PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
+  PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
+  PUBLIC_GUIDE_WEBSITE: ${{ secrets.PUBLIC_GUIDE_WEBSITE }}
+  SERVICING: ${{ secrets.SERVICING }}
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
 jobs:
   host:
@@ -29,8 +43,9 @@ jobs:
 
     steps:
       - uses: oven-sh/setup-bun@v1
-      #        with:
-      #          bun-version: 1.1.33
+      - uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GH_TOKEN }}
 
       - name: Download release assets
         run: |

.github/workflows/rating-asia.yml

@@ -3,7 +3,29 @@ name: Rating Asia
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 17 * * *'
+    - cron: "0 17 * * *"
+
+env:
+  PUBLIC_ASSET_BRANCH: main
+  PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
+  DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
+  DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
+  DATABASE_URL: ${{ secrets.DATABASE_URL }}
+  PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
+  PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
+  PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
+  PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
+  ALLOW_ROBOTS: "true"
+  WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
+  PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
+  PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
+  GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
+  WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
+  WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
+  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
+  PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
+  PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
 jobs:
   host:
@@ -11,31 +33,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.GH_TOKEN }}
       - uses: oven-sh/setup-bun@v1
-
-      - name: Install dependencies
-        run: bun install
+      - uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GH_TOKEN }}
+      - run: bun run setup
 
       - name: Generate leaderboard
-        env:
-          PUBLIC_ASSET_BRANCH: main
-          PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
-          DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
-          PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
-          PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
-          PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
-          ALLOW_ROBOTS: 'true'
-          WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
-          PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
-          PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
-          GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
-          WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
-          WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
-          PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
-          PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
-          PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
         run: bun build:ratingleaderboard --region=asia

.github/workflows/rating-eu.yml

@@ -3,7 +3,29 @@ name: Rating Europe
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 23 * * *'
+    - cron: "0 23 * * *"
+
+env:
+  PUBLIC_ASSET_BRANCH: main
+  PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
+  DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
+  DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
+  DATABASE_URL: ${{ secrets.DATABASE_URL }}
+  PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
+  PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
+  PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
+  PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
+  ALLOW_ROBOTS: "true"
+  WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
+  PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
+  PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
+  GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
+  WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
+  WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
+  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
+  PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
+  PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
 jobs:
   host:
@@ -11,31 +33,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.GH_TOKEN }}
       - uses: oven-sh/setup-bun@v1
-
-      - name: Install dependencies
-        run: bun install
+      - uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GH_TOKEN }}
+      - run: bun run setup
 
       - name: Generate leaderboard
-        env:
-          PUBLIC_ASSET_BRANCH: main
-          PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
-          DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
-          PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
-          PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
-          PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
-          ALLOW_ROBOTS: 'true'
-          WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
-          PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
-          PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
-          GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
-          WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
-          WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
-          PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
-          PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
-          PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
         run: bun build:ratingleaderboard --region=eu

.github/workflows/rating-na.yml

@@ -3,7 +3,29 @@ name: Rating North America
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 5 * * *'
+    - cron: "0 5 * * *"
+
+env:
+  PUBLIC_ASSET_BRANCH: main
+  PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
+  DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
+  DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
+  DATABASE_URL: ${{ secrets.DATABASE_URL }}
+  PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
+  PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
+  PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
+  PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
+  ALLOW_ROBOTS: "true"
+  WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
+  PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
+  PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
+  GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
+  WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
+  WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
+  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
+  PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
+  PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
 jobs:
   host:
@@ -11,31 +33,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.GH_TOKEN }}
       - uses: oven-sh/setup-bun@v1
-
-      - name: Install dependencies
-        run: bun install
+      - uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GH_TOKEN }}
+      - run: bun run setup
 
       - name: Generate leaderboard
-        env:
-          PUBLIC_ASSET_BRANCH: main
-          PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
-          DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
-          PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
-          PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
-          PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
-          ALLOW_ROBOTS: 'true'
-          WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
-          PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
-          PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
-          GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
-          WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
-          WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
-          PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
-          PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
-          PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
         run: bun build:ratingleaderboard --region=com

.github/workflows/reviews.yml

@@ -11,12 +11,13 @@ concurrency:
 
 env:
   DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}
   DATABASE_URL: ${{ secrets.DATABASE_URL }}
   PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
   PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
   GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
   PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
+  PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
 
 jobs:
   build:
@@ -27,11 +28,11 @@ jobs:
         with:
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
-
       - uses: oven-sh/setup-bun@v1
-
-      - name: Install dependencies
-        run: bun install
+      - uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GH_TOKEN }}
+      - run: bun run setup
 
       - name: Find reviews
-        run: bun packages/scripts/src/reviews.ts
+        run: bun run build:reviews

.github/workflows/website.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
 
   schedule:
-    - cron: '0 4 * * *'
+    - cron: "0 4 * * *"
 
 permissions:
   contents: read
@@ -31,6 +31,7 @@ env:
   PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
   PUBLIC_GUIDE_WEBSITE: ${{ secrets.PUBLIC_GUIDE_WEBSITE }}
   SERVICING: ${{ secrets.SERVICING }}
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
 jobs:
   build:
@@ -41,12 +42,12 @@ jobs:
         with:
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
-
       - uses: oven-sh/setup-bun@v1
+      - uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GH_TOKEN }}
       - uses: actions/configure-pages@v5
-
-      - name: Install dependencies
-        run: bun install
+      - run: bun run setup
 
       - name: Build website
         run: bun run build:website

.gitignore

@@ -24,7 +24,32 @@ public/sitemap*
 target
 # packages/core/src/protos/*.ts
 /.vercel
-/.astro
+.astro
 .vercel
 /src
-/packages/bot/src/prisma
+/packages/bot/src/prisma
+dev-dist
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "submodules/blitzkit-closed"]
-	path = submodules/blitzkit-closed
-	url = https://github.com/tresabhi/blitzkit-closed
-[submodule "submodules/CUE4Parse"]
-	path = submodules/CUE4Parse
-	url = https://github.com/FabianFG/CUE4Parse
-[submodule "submodules/blitzkit-internal"]
-	path = submodules/blitzkit-internal
-	url = https://github.com/blitzkit/internal
+[submodule "packages/closed"]
+	path = packages/closed
+	url = https://github.com/blitzkit/closed.git

.prettierrc

@@ -1,7 +0,0 @@
-{
-  "trailingComma": "all",
-  "tabWidth": 2,
-  "semi": true,
-  "singleQuote": true,
-  "printWidth": 80
-}

.vscode/settings.json

@@ -11,6 +11,7 @@
     "analyticsreporting",
     "APAC",
     "apcr",
+    "appinfo",
     "applypatches",
     "artefacts",
     "astrojs",
@@ -21,6 +22,7 @@
     "AYUV",
     "battleresults",
     "bbox",
+    "beforeinstallprompt",
     "bepaint",
     "betakrieg",
     "BINORMAL",
@@ -33,12 +35,14 @@
     "blitzkit",
     "blitzrinth",
     "blitzstars",
+    "bufbuild",
     "cacheable",
     "Callouts",
     "Camo",
     "Carro",
     "CCPAOPTOUT",
     "CDON",
+    "clanid",
     "classname",
     "cleandist",
     "closedkrieg",
@@ -61,8 +65,10 @@
     "deburr",
     "decalmask",
     "decompressor",
+    "dedup",
     "defence",
     "degressive",
+    "depotdownloader",
     "devkrieg",
     "diacriticless",
     "DIDS",
@@ -73,21 +79,26 @@
     "DVPLCRC",
     "dvpm",
     "dxgi",
+    "easimon",
     "echarts",
     "Everytime",
     "FASTNAME",
+    "favicons",
     "flexdirection",
+    "fontsource",
     "FOURCC",
     "frameloop",
     "fsformat",
     "Fullscreen",
     "fullstats",
     "fuzzysort",
+    "gamemode",
     "gameplay",
     "glsl",
     "GLTF",
     "gtag",
     "haha",
+    "Herdbreaker",
     "highp",
     "iife",
     "imgur",
@@ -101,6 +112,7 @@
     "leaderboards",
     "lerp",
     "LINEARSIZE",
+    "linktarget",
     "lmao",
     "loadouts",
     "loddist",
@@ -123,6 +135,7 @@
     "NEGATIVEX",
     "NEGATIVEY",
     "NEGATIVEZ",
+    "networkidle",
     "NITROPAY",
     "nivo",
     "nmatname",
@@ -133,11 +146,13 @@
     "Oopsy",
     "opentest",
     "OPTML",
+    "otemp",
     "outdir",
     "outfile",
     "ownedtanks",
     "padder",
     "partytown",
+    "patchnotes",
     "PIXELFORMAT",
     "playerachievements",
     "playerinfo",
@@ -150,10 +165,15 @@
     "Promisable",
     "proto",
     "protobuf",
+    "protoc",
     "protos",
+    "proxyclient",
+    "prunestrings",
     "Pyogenics",
     "ratingleaderboard",
     "raycaster",
+    "Redirector",
+    "Relogin",
     "researchable",
     "Resvg",
     "rizz",
@@ -167,6 +187,7 @@
     "searchtanks",
     "SHAREDEXP",
     "SKLLD",
+    "smoothstep",
     "Smri",
     "Specularity",
     "SSAO",
@@ -186,6 +207,7 @@
     "tankopedia",
     "tankopedias",
     "tankstats",
+    "tauri",
     "texconv",
     "TEXCOORD",
     "tresabhi",
@@ -200,12 +222,14 @@
     "Unregistering",
     "unrotate",
     "unwrapper",
+    "userns",
     "vercel",
     "vickers",
     "vitepress",
     "Vovko",
     "wargaming",
     "webp",
+    "wgpkg",
     "whitespaces",
     "WHSS",
     "winrate",
@@ -222,12 +246,7 @@
     "yolo",
     "youtuber",
     "youtubers",
-    "zoomable",
-    "zustand"
+    "zoomable"
   ],
-  "deno.enable": false,
-  "deno.unstable": false,
-  "cSpell.enableFiletypes": ["glsl", "proto3"],
-  "typescript.tsdk": "node_modules\\typescript\\lib",
-  "liveServer.settings.multiRootWorkspaceName": "blitzkit"
+  "typescript.tsdk": "node_modules\\typescript\\lib"
 }

README.md

@@ -1,13 +1,47 @@
-## BlitzKit
+# BlitzKit
 
-Your premier source for all things Blitz.
+Tools for everything and anything, World of Tanks Blitz.
 
-### https://blitzkit.app/
+This GitHub repository contains the code for BlitzKit and all its services. If you are here, looking to use BlitzKit, go to https://blitzkit.app/.
 
-![BlitzKit website](https://i.imgur.com/KaxUxmt.png)
+If you intend to contribute to the code, note that you may need to check out sensitive, closed-source submodules to locally develop certain aspects of BlitzKit. Communicate with `@tresabhi` on Discord to get started or discuss sensitive content, such as environment variables or submodules.
 
-## Invite the bot
+## Packages
 
-Go to [application directory for BlitzKit](https://discord.com/application-directory/1097673957865443370) and click "Add to Server." Voila! You're ready to go.
+| Package                              | Title                | Source                                                                                                                                                                                     | Memo                                                                                                                     |
+| ------------------------------------ | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------ |
+| [packages/app](packages/app)         | BlitzKit             | [Play Store](https://play.google.com/store/apps/details?id=com.tresabhi.blitzkit), [App Store](https://apps.apple.com/app/4321), [Microsoft Store](https://apps.microsoft.com/detail/zyxw) | The native app of BlitzKit for all platforms. Unavailable from stores at this time.                                      |
+| [packages/bot](packages/bot)         | BlitzKit Discord Bot | [Discord Application Directory](https://discord.com/discovery/applications/1097673957865443370)                                                                                            | The one-in-all Discord bot for statistics.                                                                               |
+| [packages/core](packages/core)       |                      |                                                                                                                                                                                            | Mutual internal code shared between all other packages.                                                                  |
+| [packages/i18n](packages/i18n)       |                      | [Crowdin](https://crowdin.com/project/blitzkrieg)                                                                                                                                          | Translations served as JSON shared across all other packages, including some utility code.                               |
+| [packages/scripts](packages/scripts) |                      |                                                                                                                                                                                            | CLI utilities for the development and deployment of BlitzKit services.                                                   |
+| [packages/varuna](packages/varuna)   | Varuna               | [NPM](https://www.npmjs.com/package/varuna)                                                                                                                                                | React and Astro-oriented state management library, awaiting separation from BlitzKit. Unavailable from NPM at this time. |
+| [packages/website](packages/website) | BlitzKit             | https://blitzkit.app                                                                                                                                                                       | The BlitzKit website provides a wide range of tools, APIs, and interconnects all other services.                         |
 
-![BlitzKit application directory](https://i.imgur.com/YWCtOuJ.png)
+## Submodules
+
+| Submodule                                              | Title     | Source                                                | Memo                                                                                                                                                                        |
+| ------------------------------------------------------ | --------- | ----------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [submodules/blitzkit-closed](packages/blitzkit-closed) | ClosedKit | [blitzkit/closed](https://github.com/blitzkit/closed) | Closed source, sensitive code hidden from the public to prevent bad actors from abusing the game. Discuss with `@tresabhi` on Discord for **special permission** to access. |
+
+## Environment Variables
+
+| Name                                                          | Source                                                                           | BlitzKit Default                    | Memo                                                                                                                                |
+| ------------------------------------------------------------- | -------------------------------------------------------------------------------- | ----------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
+| `PUBLIC_WARGAMING_APPLICATION_ID`                             | [Wargaming Developer's Room](https://developers.wargaming.net/)                  |                                     | Application ID needed to communicate with Wargaming APIs.                                                                           |
+| `PUBLIC_PROMOTE_OPENTEST`                                     |                                                                                  | `false`                             | Optional boolean dictating whether the website advertises [the opentest subdomain of BlitzKit](https://opentest.blitzkit.app/).     |
+| `ALLOW_ROBOTS`                                                |                                                                                  | `true`                              | Toggles between `Allow: /` and `Disallow: /` in the website's `/robots.txt`. This is usually `false` for all BlitzKit's subdomains. |
+| `WOTB_GLOSSARY`, `WOTB_GLOSSARY_DOMAIN`, `WOTB_GLOSSARY_PATH` |                                                                                  |                                     |                                                                                                                                     |
+| `PUBLIC_GOOGLE_TAG_MANAGER_ID`                                | [Google Tag Manager](https://tagmanager.google.com/)                             | `G-GL2JVHCGPQ`                      | Google Tag Manager's unique identifier for analytical purposes.                                                                     |
+| `PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID`                         | [Google Analytics](https://analytics.google.com/)                                | `430711767`                         | Google Analytics' unique property ID for [BlitzKit's apex domain](https://blitzkit.app/) and subdomains.                            |
+| `GOOGLE_APPLICATION_CREDENTIALS`                              | [Google Cloud](https://cloud.google.com/)                                        |                                     | Google Cloud's API key, primarily used for ranking popular tanks and finding relevant tank review videos in Tankopedia.             |
+| `PUBLIC_DISCORD_SERVER_ID`                                    | [BlitzKit Discord Server](https://discord.gg/nDt7AjGJQH)                         | `734786591205359697`                | BlitzKit Discord Server's id.                                                                                                       |
+| `PUBLIC_ASSET_BASE`                                           | [blitzkit/assets](https://github.com/blitzkit/assets)                            | `https://blitzkit.github.io/assets` | The root domain and path that serves the external assets like tank models and icons.                                                |
+| `PUBLIC_BRANCH`                                               |                                                                                  | `main`                              | The branch that the website is operating on. This is completely nominal.                                                            |
+| `PUBLIC_GUIDE_WEBSITE`                                        | [GuidesBlitz](https://guidesblitz.com/)                                          | `https://guidesblitz.com`           | The website that serves the encyclopedia-like content in BlitzKit.                                                                  |
+| `SERVICING`                                                   |                                                                                  | `false`                             | Wether the website is down for servicing.                                                                                           |
+| `DISCORD_CLIENT_ID`                                           | [Discord Developer Portal](https://discord.com/developers/applications)          | `1097673957865443370`               | The BlitzKit Discord Bot's user ID.                                                                                                 |
+| `GH_TOKEN`                                                    | [GitHub Fine-Grained Tokens](https://github.com/settings/personal-access-tokens) |                                     | The GitHub API key used for checking out private submodules and pushing content to the asset repository.                            |
+| `DISCORD_TOKEN`                                               | [Discord Developer Portal](https://discord.com/developers/applications)          |                                     | The Discord API Key for the BlitzKit Discord Bot.                                                                                   |
+| `DATABASE_URL`                                                | [CockroachDB](https://www.cockroachlabs.com/)                                    |                                     | The CockroachDB-SQL database URL used to link Wargaming and Discord users.                                                          |
+| `WOTB_DLC_CDN`                                                |                                                                                  |                                     |                                                                                                                                     |

docs/changelogs/1.27.18.md

@@ -0,0 +1,11 @@
+# BlitzKit 1.27.18
+
+## Features
+
+- Added a mini-game to BlitzKit similar to "Guess Who's That Pokemon" but with tanks: http://blitzkit.vercel.app/guess
+- Switched to a new renderer for better lighting for the Tankopedia
+
+## Fixes
+
+- The loading bar for the Tankopedia sandbox now shows up again
+- Removed a lot of dead code, improving performance

docs/changelogs/1.27.19.md

@@ -0,0 +1,18 @@
+# BlitzKit 1.27.19
+
+Two updates in a day? I just got a little excited by the new Tankopedia lighting.
+
+## Features
+
+- The camera is now lower down in the Tankopedia, giving the tank a more heroic feel
+- Tanks are better framed across all devices, minimizing whitespace
+- Added a skip button for the reload visualizer to skip to the next event
+
+## Fixes
+
+- Removed the useless "show grid" setting
+- Taking screenshots now no longer includes the scene props like the floor
+- The subtler color contrast for the advanced highlighting has now been reverted back to the higher contrast
+- The shot display card is now properly aligned as a proper table again
+- Tank modules are once again considered in the penetration tester
+- Tank filters in the antagonist selector in the Tankopedia sandbox are now properly aligned

docs/changelogs/1.27.20.md

@@ -0,0 +1,13 @@
+# BlitzKit 1.27.20
+
+It's all technical updates! The HD tanks will be rolled out over the span of few days.
+
+## Technical Changes
+
+- Shadows are disabled if your framerate drops below 30fps
+- Pages that redirect to other pages (like the old /tools/tankopedia) now load a few hundred times faster
+- Replaced Zustand with a custom state manager called Varuna with the goal to rewrite a significant portion of the website to not require any React for rendering increasing performance
+- The transition wireframe in the Tankopedia sandbox now uses a lower quality model for performance reasons
+- Tanks with PBR now use the correct maximum resolution textures
+  - This is a significant update as you can now literally see individual splats of dust on tanks and scratches haha
+- Baked the ambient occlusion maps into the textures, hence reducing the overall model load times even with higher resolution textures

docs/changelogs/1.28.0.md

@@ -0,0 +1,16 @@
+# BlitzKit 1.28.0
+
+BlitzKit, as an app and the new Mixer tool!
+
+## Features
+
+- Created the BlitzKit app that can be downloaded on most devices
+- Re-did the BlitzKit logo to be a bit warmer
+- Added the Mixer tool which lets you combine tank models into Frankensteins
+- Updated all dependencies to the latest version for a decent performance boost
+
+## Fixes
+
+- BlitzKit no longer forgets persistent data if the app crashes without properly closing
+- The tools list in the navbar no longer overflows into the neighboring elements on certain devices
+- Added keying to a few places, speeding up re-rendering

docs/changelogs/1.28.1.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.28.1
+
+## Fixes
+
+- The lights no longer crash the Mixer tool

docs/changelogs/1.28.2.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.28.2
+
+## Fixes
+
+- BlitzKit no longer tries to redirect translated pages to the same page, over and over again

docs/changelogs/1.28.3.md

@@ -0,0 +1,18 @@
+# BlitzKit 1.28.3
+
+## Features
+
+- Turrets and guns can now be rotated in Mixer without any pitch or yaw limits
+- Added nation icons to the search results for Guesser
+- The table now occupies the whole screen in Compare
+- Added the ability to log in with a Wargaming account in the navbar
+- Added owned/unowned filters in the Tankopedia filters
+- Revamped Tankopedia quick controls to be more accessible and obvious
+
+## Fixes
+
+- Missing tank icons across the website have been fixed
+- Events of starting and stopping of the transform tanks now use an asynchronous event instead of a reactive state, making them faster
+- Removed a hook call on root context, speeding up load times
+- Tankopedia's pitch input now follows the same sign convention as the pitch and yaw visualizer
+- Shadows are no longer disabled when the scene is unloaded when the user scrolls away from the canvas

docs/changelogs/1.28.4.md

@@ -0,0 +1,10 @@
+# BlitzKit 1.28.4
+
+## Fixes
+
+- The tank names in the Tankopedia sandbox now have less margin from the navbar
+- Controls in the Tankopedia sandbox are now shown in all modes, except for the advanced highlighting button which only appears in the dynamic armor mode
+- The settings page now reacts to input again
+- The settings page now has a tab title and description for search engines
+- Added support for transparent textures, fixing tanks like the Herdbreaker and the WZ-132-1
+- The tank filters in the Performance and Tier-List tools work once again

docs/changelogs/1.29.0.md

@@ -0,0 +1,12 @@
+# BlitzKit 1.29.0
+
+## Features
+
+- Added the Playlist tool
+  - Don't know what to play today? Let BlitzKit do the thinking!
+  - Navigate to [the tool on BlitzKit](https://blitzkit.app/playlist)
+  - Make sure you login with your Wargaming account to unlock all features like live tracking and filtering by owned tanks
+  - Use filters to pick tiers, nations, etc. then hit Generate playlist
+  - BlitzKit will generate a checklist for you to go through as you play
+  - Don't like the order of tanks? Hit Shuffle, Sort by Last played and Least played, or straight up remove tanks from the list by using the (-) button
+  - If you're logged in, BlitzKit will automatically check off tanks as you play them

docs/changelogs/1.29.1.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.29.1
+
+## Technical Changes
+
+- Recreated the full dependency tree for BlitzKit

docs/changelogs/1.29.2.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.29.2
+
+## Technical Changes
+
+- Implemented new workflow capabilities to deploy BlitzKit OpenTest and Preview remotely, from any device

docs/changelogs/1.29.3.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.29.3
+
+## Technical Changes
+
+- Added a significantly more memory and network efficient AssetUploader abstraction

docs/changelogs/1.29.4.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.29.4
+
+## Technical Changes
+
+- BlitzKit now partially downloads game files instead of the entire game, allowing for faster updates

docs/changelogs/1.29.5.md

@@ -0,0 +1,11 @@
+# BlitzKit 1.29.5
+
+## Features
+
+- Added new lighting to be a bit softer on tanks
+- Added a button with the sun icon to toggle high graphics
+- Added a new reveal and transition animation between tabs
+
+## Fixes
+
+- Track wheels on some tanks no longer look translucent

docs/changelogs/1.29.6.md

@@ -0,0 +1,18 @@
+# BlitzKit 1.29.6
+
+## Features
+
+- Simplified the ownership and test tank filters in the tank search
+- Renamed "Guess the tank" to simply "Guess"
+- The player count value in the Performance tool is now set to Total by default
+- Added Compare-like red/green highlighting to the Performance tool
+
+## Changes
+
+- Removed the last updated info bar in Performance for some more screen real estate
+
+## Fixes
+
+- The remove played tanks in the Playlist tool now shows even when logged out
+- The Guess game now has a page title
+- The compare table now occupies the minimum width possible instead of expanding all columns excessively

package.json

@@ -1,26 +1,23 @@
 {
   "name": "blitzkit",
+  "version": "1.29.6",
+  "license": "BlitzKit License",
   "private": true,
-  "version": "1.27.17",
-  "description": "🎉 Tools for everything World of Tanks Blitz",
-  "type": "module",
-  "types": "./types.d.ts",
-  "workspaces": [
-    "packages/*"
-  ],
   "scripts": {
     "build:assets": "cd packages/scripts && bun run build:assets",
     "build:averages": "bun --filter=@blitzkit/scripts run build:averages",
     "build:bot": "cd packages/scripts && bun run build:bot",
-    "build:website": "bun build:prisma --no-hints && cd packages/website && bun run build",
+    "build:website": "cd packages/website && bun run build",
     "build:prisma": "prisma generate",
-    "build:sitemap": "bun scripts/sitemap.ts",
-    "build:docs": "vitepress build docs",
+    "build:proxyclient": "cd packages/scripts && bun run build:proxyclient",
+    "build:catalogitemaccesssor": "cd packages/scripts && bun run build:catalogitemaccesssor",
     "build:ratingleaderboard": "cd packages/scripts && bun run build:ratingleaderboard",
+    "build:app": "cd packages/app && bun run build",
     "dev:bot": "bun run build:bot --dev && bun start:bot",
     "start:bot": "bun dist/bot/main.js",
     "dev:docs": "vitepress dev docs",
     "dev:website": "cd packages/website && bun run dev",
+    "dev:app": "cd packages/app && bun run dev",
     "dev": "bun run dev:website",
     "dev:api": "bun --filter=@blitzkit/api run dev",
     "setup:depotdownloader": "bun --filter=@blitzkit/scripts run setup:depotdownloader",
@@ -33,27 +30,21 @@
     "update": "yarn upgrade --latest",
     "tunnel": "cloudflared tunnel --url http://localhost:3000",
     "discoverids": "scripts/discoverIds.ts",
-    "build:protos": "bun packages/scripts/src/protos.ts",
+    "build:protos": "cd packages/scripts && bun run build:protos",
     "preview:website": "cd packages/website && bun run preview",
     "build:reviews": "cd packages/scripts && bun build:reviews",
     "build:ids": "cd packages/scripts && bun build:ids",
-    "prunestrings": "cd packages/scripts && bun prunestrings"
+    "prunestrings": "cd packages/scripts && bun prunestrings",
+    "setup": "bun install && bun run build:prisma && bun run build:protos && bun run build:proxyclient",
+    "patchnotes": "cd packages/scripts && bun run patchnotes"
   },
-  "license": "MIT",
+  "type": "module",
+  "workspaces": [
+    "packages/*"
+  ],
   "dependencies": {
-    "cheerio": "^1.1.2",
-    "googleapis": "^144.0.0",
-    "lodash-es": "^4.17.21",
-    "protobufjs": "^7.5.2",
-    "quicklime": "^1.2.0",
-    "sharp": "^0.33.5"
-  },
-  "devDependencies": {
-    "@types/bun": "latest",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.14.1",
-    "prettier": "^3.5.3",
-    "prisma": "^6.6.0",
-    "typescript": "^5.8.3"
+    "@prisma/client": "^6.18.0",
+    "prisma": "^6.18.0",
+    "typescript": "^5.9.3"
   }
 }

packages/app/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "@blitzkit/app",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc && vite build",
+    "preview": "vite preview",
+    "tauri": "tauri"
+  },
+  "dependencies": {
+    "@tauri-apps/api": "^2",
+    "@tauri-apps/plugin-opener": "^2",
+    "@tauri-apps/cli": "^2",
+    "vite": "^6.0.3",
+    "typescript": "~5.6.2"
+  }
+}

packages/app/src-tauri/.gitignore

@@ -0,0 +1,7 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/
+
+# Generated by Tauri
+# will have schema files for capabilities auto-completion
+/gen/schemas

packages/app/src-tauri/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "blitzkit"
+version = "0.1.0"
+description = "A Tauri App"
+authors = ["you"]
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+# The `_lib` suffix may seem redundant but it is necessary
+# to make the lib name unique and wouldn't conflict with the bin name.
+# This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519
+name = "blitzkit_lib"
+crate-type = ["staticlib", "cdylib", "rlib"]
+
+[build-dependencies]
+tauri-build = { version = "2", features = [] }
+
+[dependencies]
+tauri = { version = "2", features = [] }
+tauri-plugin-opener = "2"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+

packages/app/src-tauri/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    tauri_build::build()
+}

packages/app/src-tauri/capabilities/default.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "../gen/schemas/desktop-schema.json",
+  "identifier": "default",
+  "description": "Capability for the main window",
+  "windows": ["main"],
+  "permissions": [
+    "core:default",
+    "opener:default"
+  ]
+}

packages/app/src-tauri/src/lib.rs

@@ -0,0 +1,14 @@
+// Learn more about Tauri commands at https://tauri.app/develop/calling-rust/
+#[tauri::command]
+fn greet(name: &str) -> String {
+    format!("Hello, {}! You've been greeted from Rust!", name)
+}
+
+#[cfg_attr(mobile, tauri::mobile_entry_point)]
+pub fn run() {
+    tauri::Builder::default()
+        .plugin(tauri_plugin_opener::init())
+        .invoke_handler(tauri::generate_handler![greet])
+        .run(tauri::generate_context!())
+        .expect("error while running tauri application");
+}

packages/app/src-tauri/src/main.rs

@@ -0,0 +1,27 @@
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+use std::process::{Command, Stdio};
+use tauri::Manager;
+
+fn main() {
+  tauri::Builder::default()
+    .setup(|app| {
+      let app_handle = app.handle();
+
+      let entry = app_handle
+        .path_resolver()
+        .resolve_resource("../../dist/website/server/entry.mjs")
+        .expect("failed to resolve server.ts");
+
+      Command::new("bun")
+        .arg("run")
+        .arg(entry)
+        .stderr(Stdio::null())
+        .spawn()
+        .expect("failed to start Bun server");
+
+      Ok(())
+    })
+    .run(tauri::generate_context!())
+    .expect("error while running Tauri app");
+}

packages/app/src-tauri/tauri.conf.json

@@ -0,0 +1,38 @@
+{
+  "$schema": "https://schema.tauri.app/config/2",
+  "productName": "blitzkit",
+  "version": "0.1.0",
+  "identifier": "com.tresabhi.blitzkit",
+  "build": {
+    "beforeDevCommand": "cd ../website && bun run dev",
+    "_beforeBuildCommand": "cd ../website && bun run build",
+    "frontendDist": "../../../dist/website/client",
+    "devUrl": "http://localhost:4321"
+  },
+  "app": {
+    "withGlobalTauri": true,
+    "windows": [
+      {
+        "url": "http://localhost:4321",
+        "title": "BlitzKit",
+        "fullscreen": false,
+        "resizable": true,
+        "maximized": true
+      }
+    ],
+    "security": {
+      "csp": null
+    }
+  },
+  "bundle": {
+    "active": true,
+    "targets": "all",
+    "icon": [
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/[email protected]",
+      "icons/icon.icns",
+      "icons/icon.ico"
+    ]
+  }
+}

packages/app/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "extends": ["../../tsconfig.json"],
+  "compilerOptions": {
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "skipLibCheck": true,
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true
+  }
+}

packages/bot/package.json

@@ -1,26 +1,34 @@
 {
   "name": "@blitzkit/bot",
-  "private": true,
-  "type": "module",
-  "types": "src/types.d.ts",
   "dependencies": {
     "@blitzkit/core": "workspace:*",
     "@blitzkit/i18n": "workspace:*",
-    "satori": "^0.10.14",
-    "@resvg/resvg-js": "^2.6.2",
-    "discord.js": "^14.16.3",
-    "react": "^18.3.1",
     "@radix-ui/colors": "^3.0.0",
-    "fuzzysort": "^2.0.4",
+    "@radix-ui/themes": "^3.2.1",
+    "@resvg/resvg-js": "^2.6.2",
+    "@types/adm-zip": "^0.5.7",
+    "@types/lodash-es": "^4.17.12",
+    "@types/markdown-escape": "^1.1.3",
+    "@types/react": "^19.2.2",
+    "adm-zip": "^0.5.16",
     "bepaint": "^0.1.0-beta.3",
-    "dotenv": "^16.4.5",
-    "markdown-escape": "^2.0.0"
+    "discord.js": "^14.22.1",
+    "dotenv": "^17.2.2",
+    "fuzzysort": "^3.1.0",
+    "lodash-es": "^4.17.21",
+    "markdown-escape": "^2.0.0",
+    "pickleparser": "^0.2.1",
+    "prisma": "^6.17.1",
+    "protobufjs": "^7.5.4",
+    "react": "^19.2.0",
+    "satori": "^0.18.3",
+    "sharp": "^0.34.4"
   },
+  "private": true,
   "scripts": {
     "dev": "bun --watch src/main.ts",
     "start": "bun src/main.ts"
   },
-  "devDependencies": {
-    "@types/markdown-escape": "^1.1.3"
-  }
+  "type": "module",
+  "types": "src/types.d.ts"
 }

packages/bot/src/commands/about.ts

@@ -1,28 +1,31 @@
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { translator } from '../core/localization/translator';
-import { COMMANDS_RAW, CommandRegistry } from '../events/interactionCreate';
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { translator } from "../core/localization/translator";
+import {
+  COMMANDS_RAW,
+  type CommandRegistry,
+} from "../events/interactionCreate";
 
 const subcommands = [
-  'embeds',
-  'introduction',
-  'invite',
-  'timezones',
-  'credits',
+  "embeds",
+  "introduction",
+  "invite",
+  "timezones",
+  "credits",
 ] as const;
 type Subcommand = (typeof subcommands)[number];
 
 const DOCS: Record<Subcommand, string> = {
-  embeds: 'guide/embeds',
-  introduction: 'guide/introduction',
-  invite: 'guide/invite',
-  timezones: 'guide/timezones',
-  credits: 'about/credits',
+  embeds: "guide/embeds",
+  introduction: "guide/introduction",
+  invite: "guide/invite",
+  timezones: "guide/timezones",
+  credits: "about/credits",
 };
 
 export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
   resolve({
-    command: createLocalizedCommand('about', [
-      { subcommand: 'commands' },
+    command: createLocalizedCommand("about", [
+      { subcommand: "commands" },
       ...subcommands.map((subcommand) => ({ subcommand })),
     ]),
 
@@ -30,7 +33,7 @@ export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
       const subcommand = interaction.options.getSubcommand();
       const { strings } = translator(interaction.locale);
 
-      if (subcommand === 'commands') {
+      if (subcommand === "commands") {
         return `${strings.bot.commands.about.subcommands.commands.body}${(
           await Promise.all(COMMANDS_RAW)
         )
@@ -40,7 +43,7 @@ export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
             (b.command.name_localizations?.[interaction.locale] ??
               b.command.name)
               ? -1
-              : 1,
+              : 1
           )
           .map(
             (registry) =>
@@ -51,9 +54,9 @@ export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
                 registry.command.description_localizations?.[
                   interaction.locale
                 ] ?? registry.command.description
-              }`,
+              }`
           )
-          .join('\n')}`;
+          .join("\n")}`;
       }
 
       const url = `https://raw.githubusercontent.com/tresabhi/blitzkit/main/docs/${DOCS[subcommand as Subcommand]}.md`;

packages/bot/src/commands/auction.ts

@@ -1,144 +0,0 @@
-import {
-  BlitzTankClass,
-  Region,
-  regionToRegionSubdomain,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { tankDefinitions } from '../core/blitzkit/nonBlockingPromises';
-import { chunkLines } from '../core/discord/chunkLines';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
-
-type Auction = null | {
-  count: number;
-  has_next: boolean;
-  results: Result[];
-};
-
-type Result =
-  | {
-      id?: number;
-      type: 'vehicle';
-      countable?: boolean;
-      entity?: Entity;
-      initial_count: number;
-      current_count: number;
-      saleable?: boolean;
-      available_from?: Date;
-      available_before?: Date;
-      price?: Price;
-      next_price: Price | null;
-      available: true;
-      display?: boolean;
-      next_price_datetime: Date;
-      next_price_timestamp: number;
-    }
-  | {
-      available: false;
-      type: 'vehicle';
-    };
-
-interface Entity {
-  id: number;
-  name: string;
-  nation: string;
-  subnation: string;
-  use_subnation_flag: boolean;
-  type_slug: BlitzTankClass;
-  level: number;
-  roman_level: string;
-  user_string: string;
-  image_url: string;
-  preview_image_url: string;
-  is_premium: boolean;
-  is_collectible: boolean;
-}
-
-interface Price {
-  currency: Currency;
-  value: number;
-}
-
-interface Currency {
-  name: 'gold';
-  count: number;
-  title: 'Gold';
-  image_url: string;
-  sizes: unknown;
-  type: 'currency';
-}
-
-const WARNING_COUNT = 500;
-
-export const auctionCommand = new Promise<CommandRegistry>((resolve) => {
-  resolve({
-    command: createLocalizedCommand('auction'),
-
-    async handler(interaction) {
-      const { strings } = translator(interaction.locale);
-      const awaitedTankDefinitions = await tankDefinitions;
-      const region: Region = 'com';
-      const pageSize = 80;
-      const saleable = true;
-      const data = await fetch(
-        `https://${regionToRegionSubdomain(
-          region,
-        )}.wotblitz.com/en/api/events/items/auction/?page_size=${
-          pageSize
-        }&type[]=vehicle&saleable=${saleable}`,
-      ).then((response) => response.json() as Promise<Auction>);
-
-      if (data === null) {
-        return strings.bot.commands.auction.errors.no_auction;
-      }
-
-      const saleableTanks = data.results.filter((result) => result.available);
-      const nextPricesTimestamp = saleableTanks[0].next_price_timestamp;
-
-      const title = `# ${strings.bot.commands.auction.body.title}`;
-      const subtitle = `${literals(strings.bot.commands.auction.body.subtitle, [
-        `${saleableTanks.length} / ${data.results.length}`,
-        `<t:${nextPricesTimestamp}:R>`,
-        '<https://wotblitz.com/auction/>',
-      ])}`;
-      const body = saleableTanks.map((data, index) => {
-        const tank = awaitedTankDefinitions.tanks[data.entity!.id];
-
-        if (!tank) return '';
-
-        const name = `[${tank.name}](<https://blitzkit.app/tanks/${
-          tank.slug
-        }>)`;
-        const next =
-          data.next_price === null
-            ? ''
-            : `\n-# ${literals(strings.bot.commands.auction.body.next, [
-                `<:gold:1317173197082333244> ${data.next_price.value.toLocaleString(
-                  interaction.locale,
-                )}`,
-              ])}`;
-        const available = literals(
-          strings.bot.commands.auction.body.available,
-          [
-            data.current_count.toLocaleString(interaction.locale),
-            data.initial_count.toLocaleString(interaction.locale),
-          ],
-        );
-        const isOut = data.current_count === 0;
-        const outString = isOut ? '~~' : '';
-        const isLow = data.current_count <= WARNING_COUNT;
-
-        return `${index + 1}. ${
-          outString
-        }${name} <:gold:1317173197082333244> ${data.price!.value.toLocaleString(
-          interaction.locale,
-        )}${outString}\n-#${isLow ? ' ‼️ ' : ' '}${available}${isOut ? '' : next}`;
-      });
-      const header = `${title}\n${subtitle}`;
-      const lines = [header, ...body];
-
-      return chunkLines(lines, '\n\n');
-    },
-  });
-});

packages/bot/src/commands/breakdown/index.tsx

@@ -13,7 +13,7 @@ import { resolvePeriodFromButton } from '../../core/discord/resolvePeriodFromBut
 import { resolvePeriodFromCommand } from '../../core/discord/resolvePeriodFromCommand';
 import { resolvePlayerFromButton } from '../../core/discord/resolvePlayerFromButton';
 import { resolvePlayerFromCommand } from '../../core/discord/resolvePlayerFromCommand';
-import { CommandRegistry } from '../../events/interactionCreate';
+import type { CommandRegistry } from '../../events/interactionCreate';
 import { renderBreakdown } from './render';
 
 export const breakdownCommand = new Promise<CommandRegistry>(

packages/bot/src/commands/breakdown/render.tsx

@@ -1,28 +1,28 @@
 import {
-  BlitzStats,
+  type BlitzStats,
   calculateWN8,
   getAccountInfo,
   getClanAccountInfo,
   getTankStats,
   getWN8Percentile,
   TankDefinition,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import { chunk } from 'lodash-es';
-import * as Breakdown from '../../components/Breakdown';
-import { CommandWrapper } from '../../components/CommandWrapper';
-import { NoData } from '../../components/NoData';
-import { TitleBar } from '../../components/TitleBar';
-import { filtersToDescription } from '../../core/blitzkit/filtersToDescription';
-import { tankDefinitions } from '../../core/blitzkit/nonBlockingPromises';
-import { UserError } from '../../core/blitzkit/userError';
-import { filterStats, StatFilters } from '../../core/blitzstars/filterStats';
-import { getStatsInPeriod } from '../../core/blitzstars/getStatsInPeriod';
-import { blitzStarsTankAverages } from '../../core/blitzstars/tankAverages';
-import { ResolvedPeriod } from '../../core/discord/resolvePeriodFromCommand';
-import { ResolvedPlayer } from '../../core/discord/resolvePlayerFromCommand';
-import { translator } from '../../core/localization/translator';
+} from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import { chunk } from "lodash-es";
+import * as Breakdown from "../../components/Breakdown";
+import { CommandWrapper } from "../../components/CommandWrapper";
+import { NoData } from "../../components/NoData";
+import { TitleBar } from "../../components/TitleBar";
+import { filtersToDescription } from "../../core/blitzkit/filtersToDescription";
+import { tankDefinitions } from "../../core/blitzkit/nonBlockingPromises";
+import { UserError } from "../../core/blitzkit/userError";
+import { filterStats, type StatFilters } from "../../core/blitzstars/filterStats";
+import { getStatsInPeriod } from "../../core/blitzstars/getStatsInPeriod";
+import { blitzStarsTankAverages } from "../../core/blitzstars/tankAverages";
+import type { ResolvedPeriod } from "../../core/discord/resolvePeriodFromCommand";
+import type { ResolvedPlayer } from "../../core/discord/resolvePlayerFromCommand";
+import { translator } from "../../core/localization/translator";
 
 const ROWS_PER_PAGE = 8;
 const MAX_PAGES = 9;
@@ -31,7 +31,7 @@ export async function renderBreakdown(
   { region, id }: ResolvedPlayer,
   { start, end, name }: ResolvedPeriod,
   filters: StatFilters,
-  locale: Locale,
+  locale: Locale
 ) {
   const { strings, unwrap } = translator(locale);
   const awaitedTankDefinitions = await tankDefinitions;
@@ -39,7 +39,7 @@ export async function renderBreakdown(
   const statsInPeriod = await getStatsInPeriod(region, id, start, end, locale);
   const { filteredOrder } = await filterStats(statsInPeriod, filters);
   const accountInfo = await getAccountInfo(region, id);
-  const clanData = await getClanAccountInfo(region, id, ['clan']);
+  const clanData = await getClanAccountInfo(region, id, ["clan"]);
   const tankStats = await getTankStats(region, id);
   const filterDescriptions = await filtersToDescription(filters, locale);
   const orderedCurrentStats: BlitzStats[] = [];
@@ -74,63 +74,63 @@ export async function renderBreakdown(
     orderedCareerWN8Full.push(
       tankAveragesEntry
         ? calculateWN8(tankAveragesEntry.all, tank.all)
-        : undefined,
+        : undefined
     );
   });
 
   const currentBattles = orderedCurrentStats.reduce(
     (accumulator, current) => accumulator + current.battles,
-    0,
+    0
   );
   const careerBattles = tankStats.reduce(
     (accumulator, current) => accumulator + current.all.battles,
-    0,
+    0
   );
   const currentWinrate =
     orderedCurrentStats.reduce(
       (accumulator, current) => accumulator + current.wins,
-      0,
+      0
     ) / currentBattles;
   const careerWinrate =
     tankStats.reduce(
       (accumulator, current) => accumulator + current.all.wins,
-      0,
+      0
     ) / careerBattles;
   const currentWN8 =
     orderedCurrentWN8.reduce<number>(
       (accumulator, current, index) =>
         accumulator + (current ?? 0) * orderedCurrentStats[index].battles,
-      0,
+      0
     ) /
     orderedCurrentStats.reduce(
       (accumulator, current, index) =>
         accumulator +
         (orderedCurrentWN8[index] === undefined ? 0 : current.battles),
-      0,
+      0
     );
   const careerWN8 =
     orderedCareerWN8Full.reduce<number>(
       (accumulator, current) => accumulator + (current ?? 0),
-      0,
+      0
     ) /
     tankStats.reduce(
       (accumulator, current, index) =>
         accumulator +
         (orderedCareerWN8Full[index] === undefined ? 0 : current.all.battles),
-      0,
+      0
     );
   const currentDamage =
     orderedCurrentStats.reduce(
       (accumulator, current) => accumulator + current.damage_dealt,
-      0,
+      0
     ) / currentBattles;
   const careerDamage =
     tankStats.reduce(
       (accumulator, current) => accumulator + current.all.damage_dealt,
-      0,
+      0
     ) / careerBattles;
 
-  const children: JSX.Element[] = [];
+  const children: React.JSX.Element[] = [];
 
   if (filteredOrder.length > 0) {
     children.push(
@@ -172,7 +172,7 @@ export async function renderBreakdown(
             delta: currentDamage - careerDamage,
           },
         ]}
-      />,
+      />
     );
 
     filteredOrder.forEach((id, index) => {
@@ -193,9 +193,9 @@ export async function renderBreakdown(
           title={
             tankDefinition
               ? unwrap(tankDefinition.name)
-              : literals(strings.bot.commands.breakdown.body.unknown_tank, [
-                  `${id}`,
-                ])
+              : literals(strings.bot.commands.breakdown.body.unknown_tank, {
+                  id,
+                })
           }
           stats={[
             {
@@ -206,7 +206,7 @@ export async function renderBreakdown(
             {
               title: strings.bot.commands.breakdown.body.winrate,
               current: `${(100 * (current.wins / current.battles)).toFixed(
-                2,
+                2
               )}%`,
               career: `${(100 * (career.wins / career.battles)).toFixed(2)}%`,
               delta:
@@ -230,24 +230,24 @@ export async function renderBreakdown(
             {
               title: strings.bot.commands.breakdown.body.damage,
               current: Math.round(
-                current.damage_dealt / current.battles,
+                current.damage_dealt / current.battles
               ).toLocaleString(),
               career: Math.round(
-                career.damage_dealt / career.battles,
+                career.damage_dealt / career.battles
               ).toLocaleString(),
               delta:
                 current.damage_dealt / current.battles -
                 career.damage_dealt / career.battles,
             },
           ]}
-        />,
+        />
       );
     });
   }
 
   const pages = chunk(
     children,
-    Math.max(Math.ceil(children.length / MAX_PAGES), ROWS_PER_PAGE),
+    Math.max(Math.ceil(children.length / MAX_PAGES), ROWS_PER_PAGE)
   );
 
   if (filteredOrder.length > 0) {

packages/bot/src/commands/debug.ts

@@ -1,14 +1,14 @@
-import packageJSON from '../../../../package.json';
-import { client } from '../core/discord/client';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+import packageJSON from "../../../../package.json";
+import { client } from "../core/discord/client";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { translator } from "../core/localization/translator";
+import type { CommandRegistry } from "../events/interactionCreate";
 
 const executionStart = new Date().getTime();
 
 export const debugCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
-    command: createLocalizedCommand('debug'),
+    command: createLocalizedCommand("debug"),
 
     async handler(interaction) {
       const { strings } = translator(interaction.locale);
@@ -23,15 +23,15 @@ export const debugCommand = new Promise<CommandRegistry>((resolve) => {
         [
           strings.bot.commands.debug.body.uptime,
           `${Math.floor((uptime / 1000 / 60 / 60) % 24)}h ${Math.floor(
-            (uptime / 1000 / 60) % 60,
+            (uptime / 1000 / 60) % 60
           )}m ${Math.floor((uptime / 1000) % 60)}s ${Math.floor(
-            uptime % 1000,
+            uptime % 1000
           )}ms`,
         ],
       ];
       return `${strings.bot.commands.debug.body.title}${list
         .map(([key, value]) => `- ${key}: ${value}`)
-        .join('\n')}`;
+        .join("\n")}`;
     },
   });
 });

packages/bot/src/commands/evolution.tsx

@@ -1,48 +1,48 @@
-import { emblemURL, getAccountInfo, getClanAccountInfo } from '@blitzkit/core';
-import { Locale, SlashCommandSubcommandGroupBuilder } from 'discord.js';
-import { CommandWrapper } from '../components/CommandWrapper';
-import * as Graph from '../components/Graph';
-import { LineColor } from '../components/Graph/components/Line/constants';
-import { NoData } from '../components/NoData';
-import { TitleBar } from '../components/TitleBar';
-import { resolveTankId } from '../core/blitz/resolveTankId';
-import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
-import { getPlayerHistories } from '../core/blitzstars/getPlayerHistories';
-import { getTankHistories } from '../core/blitzstars/getTankHistories';
-import { addPeriodSubCommands } from '../core/discord/addPeriodSubCommands';
-import { addTankChoices } from '../core/discord/addTankChoices';
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
-import { autocompleteTanks } from '../core/discord/autocompleteTanks';
-import { autocompleteUsername } from '../core/discord/autocompleteUsername';
-import { buttonRefresh } from '../core/discord/buttonRefresh';
-import { commandToURL } from '../core/discord/commandToURL';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
-import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton';
+import { emblemURL, getAccountInfo, getClanAccountInfo } from "@blitzkit/core";
+import { Locale, SlashCommandSubcommandGroupBuilder } from "discord.js";
+import { CommandWrapper } from "../components/CommandWrapper";
+import * as Graph from "../components/Graph";
+import { LineColor } from "../components/Graph/components/Line/constants";
+import { NoData } from "../components/NoData";
+import { TitleBar } from "../components/TitleBar";
+import { resolveTankId } from "../core/blitz/resolveTankId";
+import { getBlitzStarsLinkButton } from "../core/blitzstars/getBlitzStarsLinkButton";
+import { getPlayerHistories } from "../core/blitzstars/getPlayerHistories";
+import { getTankHistories } from "../core/blitzstars/getTankHistories";
+import { addPeriodSubCommands } from "../core/discord/addPeriodSubCommands";
+import { addTankChoices } from "../core/discord/addTankChoices";
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
+import { autocompleteTanks } from "../core/discord/autocompleteTanks";
+import { autocompleteUsername } from "../core/discord/autocompleteUsername";
+import { buttonRefresh } from "../core/discord/buttonRefresh";
+import { commandToURL } from "../core/discord/commandToURL";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { getCustomPeriodParams } from "../core/discord/getCustomPeriodParams";
+import { resolvePeriodFromButton } from "../core/discord/resolvePeriodFromButton";
 import {
-  ResolvedPeriod,
+  type ResolvedPeriod,
   resolvePeriodFromCommand,
-} from '../core/discord/resolvePeriodFromCommand';
-import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton';
+} from "../core/discord/resolvePeriodFromCommand";
+import { resolvePlayerFromButton } from "../core/discord/resolvePlayerFromButton";
 import {
-  ResolvedPlayer,
+  type ResolvedPlayer,
   resolvePlayerFromCommand,
-} from '../core/discord/resolvePlayerFromCommand';
-import { CommandRegistry } from '../events/interactionCreate';
+} from "../core/discord/resolvePlayerFromCommand";
+import type { CommandRegistry } from "../events/interactionCreate";
 
-type EvolutionStatType = 'player' | 'tank';
+type EvolutionStatType = "player" | "tank";
 
 async function render(
   { region, id }: ResolvedPlayer,
   { start, end, name }: ResolvedPeriod,
-  type: 'player' | 'tank',
+  type: "player" | "tank",
   tankId: number | null,
-  locale: Locale,
+  locale: Locale
 ) {
   const accountInfo = await getAccountInfo(region, id);
-  const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+  const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan;
   const logo = clan ? emblemURL(clan.emblem_set_id) : undefined;
-  const histories = await (type === 'player'
+  const histories = await (type === "player"
     ? getPlayerHistories(region, id, {
         start,
         end,
@@ -61,7 +61,7 @@ async function render(
       [
         history.all.battles,
         (history.all.wins / history.all.battles) * 100,
-      ] as Graph.PlotItem,
+      ] as Graph.PlotItem
   );
   const times = histories.map((history) => history.last_battle_time);
   const minTime = Math.min(...times);
@@ -82,7 +82,7 @@ async function render(
           verticalMargin={{
             min: minY,
             max: maxY,
-            suffix: '%',
+            suffix: "%",
             precision: 2,
           }}
           horizontalMargin={{
@@ -110,22 +110,22 @@ async function render(
 export const evolutionCommand = new Promise<CommandRegistry>(
   async (resolve) => {
     resolve({
-      command: createLocalizedCommand('evolution', [
+      command: createLocalizedCommand("evolution", [
         {
-          group: 'player',
+          group: "player",
           modify(option: SlashCommandSubcommandGroupBuilder) {
             addPeriodSubCommands(option, (option) =>
-              option.addStringOption(addUsernameChoices),
+              option.addStringOption(addUsernameChoices)
             );
           },
         },
         {
-          group: 'tank',
+          group: "tank",
           modify(option: SlashCommandSubcommandGroupBuilder) {
             addPeriodSubCommands(option, (option) =>
               option
                 .addStringOption(addTankChoices)
-                .addStringOption(addUsernameChoices),
+                .addStringOption(addUsernameChoices)
             );
           },
         },
@@ -136,9 +136,9 @@ export const evolutionCommand = new Promise<CommandRegistry>(
           interaction.options.getSubcommandGroup() as EvolutionStatType;
         const player = await resolvePlayerFromCommand(interaction);
         const period = resolvePeriodFromCommand(player.region, interaction);
-        const tankIdRaw = interaction.options.getString('tank')!;
+        const tankIdRaw = interaction.options.getString("tank")!;
         const tankId =
-          commandGroup === 'tank'
+          commandGroup === "tank"
             ? await resolveTankId(tankIdRaw, interaction.locale)
             : null;
         const path = commandToURL(interaction, {
@@ -153,13 +153,13 @@ export const evolutionCommand = new Promise<CommandRegistry>(
             period,
             commandGroup,
             tankId,
-            interaction.locale,
+            interaction.locale
           ),
           buttonRefresh(interaction, path),
           await getBlitzStarsLinkButton(
             player.region,
             player.id,
-            tankId ?? undefined,
+            tankId ?? undefined
           ),
         ];
       },
@@ -171,7 +171,7 @@ export const evolutionCommand = new Promise<CommandRegistry>(
 
       async button(interaction) {
         const url = new URL(`https://example.com/${interaction.customId}`);
-        const path = url.pathname.split('/');
+        const path = url.pathname.split("/");
         const commandGroup = path[2] as EvolutionStatType;
         const player = await resolvePlayerFromButton(interaction);
         const period = resolvePeriodFromButton(player.region, interaction);
@@ -180,10 +180,10 @@ export const evolutionCommand = new Promise<CommandRegistry>(
           player,
           period,
           commandGroup,
-          parseInt(url.searchParams.get('tankId') ?? '0') || null,
-          interaction.locale,
+          parseInt(url.searchParams.get("tankId") ?? "0") || null,
+          interaction.locale
         );
       },
     });
-  },
+  }
 );

packages/bot/src/commands/fullStats.tsx

@@ -11,7 +11,7 @@ import { NoData } from '../components/NoData';
 import { TierWeights } from '../components/TierWeights';
 import { TitleBar } from '../components/TitleBar';
 import { filtersToDescription } from '../core/blitzkit/filtersToDescription';
-import { filterStats, StatFilters } from '../core/blitzstars/filterStats';
+import { filterStats, type StatFilters } from '../core/blitzstars/filterStats';
 import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
 import { getStatsInPeriod } from '../core/blitzstars/getStatsInPeriod';
 import { addPeriodicFilterOptions } from '../core/discord/addPeriodicFilterOptions';
@@ -26,15 +26,15 @@ import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
 import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
 import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton';
 import {
-  ResolvedPeriod,
+  type ResolvedPeriod,
   resolvePeriodFromCommand,
 } from '../core/discord/resolvePeriodFromCommand';
 import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton';
 import {
-  ResolvedPlayer,
+  type ResolvedPlayer,
   resolvePlayerFromCommand,
 } from '../core/discord/resolvePlayerFromCommand';
-import { CommandRegistry } from '../events/interactionCreate';
+import type { CommandRegistry } from '../events/interactionCreate';
 
 async function render(
   { region, id }: ResolvedPlayer,

packages/bot/src/commands/inactive.tsx

@@ -1,44 +1,44 @@
-import { getAccountInfo, getClanInfo } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import { CommandWrapper } from '../components/CommandWrapper';
-import { GenericStats } from '../components/GenericStats';
-import { NoData } from '../components/NoData';
-import { TitleBar } from '../components/TitleBar';
-import { addClanChoices } from '../core/discord/addClanChoices';
-import { autocompleteClan } from '../core/discord/autocompleteClan';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { localizationObject } from '../core/discord/localizationObject';
-import { resolveClanFromCommand } from '../core/discord/resolveClanFromCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+import { getAccountInfo, getClanInfo } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import { CommandWrapper } from "../components/CommandWrapper";
+import { GenericStats } from "../components/GenericStats";
+import { NoData } from "../components/NoData";
+import { TitleBar } from "../components/TitleBar";
+import { addClanChoices } from "../core/discord/addClanChoices";
+import { autocompleteClan } from "../core/discord/autocompleteClan";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { localizationObject } from "../core/discord/localizationObject";
+import { resolveClanFromCommand } from "../core/discord/resolveClanFromCommand";
+import { translator } from "../core/localization/translator";
+import type { CommandRegistry } from "../events/interactionCreate";
 
 const DEFAULT_THRESHOLD = 7;
 
 export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
-    command: createLocalizedCommand('inactive')
+    command: createLocalizedCommand("inactive")
       .addStringOption(addClanChoices)
       .addNumberOption((option) => {
         const { strings } = translator(Locale.EnglishUS);
 
         return option
-          .setName('threshold')
+          .setName("threshold")
           .setNameLocalizations(
             localizationObject(
               (strings) => strings.bot.commands.inactive.options.threshold.name,
               undefined,
-              true,
-            ),
+              true
+            )
           )
           .setDescription(
-            strings.bot.commands.inactive.options.threshold.description,
+            strings.bot.commands.inactive.options.threshold.description
           )
           .setDescriptionLocalizations(
             localizationObject(
               (strings) =>
-                strings.bot.commands.inactive.options.threshold.description,
-            ),
+                strings.bot.commands.inactive.options.threshold.description
+            )
           )
           .setMinValue(0);
       }),
@@ -47,7 +47,7 @@ export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
       const { strings } = translator(interaction.locale);
       const { region, id } = await resolveClanFromCommand(interaction);
       const threshold =
-        interaction.options.getNumber('threshold')! ?? DEFAULT_THRESHOLD;
+        interaction.options.getNumber("threshold")! ?? DEFAULT_THRESHOLD;
       const time = new Date().getTime() / 1000;
       const clanInfo = await getClanInfo(region, id);
       const accountInfo = await getAccountInfo(region, clanInfo.members_ids);
@@ -57,7 +57,7 @@ export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
             [
               account.nickname,
               (time - account.last_battle_time) / 60 / 60 / 24,
-            ] as [string, number],
+            ] as [string, number]
         )
         .filter(([, inactiveDays]) => inactiveDays >= threshold)
         .sort((a, b) => b[1] - a[1])
@@ -65,10 +65,10 @@ export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
           ([name, days]) =>
             [
               name,
-              literals(strings.bot.commands.inactive.body.listing, [
-                days.toFixed(0),
-              ]),
-            ] as [string, string],
+              literals(strings.bot.commands.inactive.body.listing, {
+                days: days.toFixed(0),
+              }),
+            ] as [string, string]
         );
       const hasInactiveMembers = inactive.length > 0;
 
@@ -79,7 +79,7 @@ export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
             image={`https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanInfo.emblem_set_id}.png`}
             description={`${literals(
               strings.bot.commands.inactive.body.subtitle,
-              [`${threshold}`],
+              { days: threshold }
             )} • ${new Date().toLocaleDateString(interaction.locale)}`}
           />
 

packages/bot/src/commands/link.tsx

@@ -9,7 +9,7 @@ import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
 import { embedInfo } from '../core/discord/embedInfo';
 import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
 import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+import type { CommandRegistry } from '../events/interactionCreate';
 import { theme } from '../stitches.config';
 
 export const verifyCommand = new Promise<CommandRegistry>((resolve) => {

packages/bot/src/commands/ownedTanks.tsx

@@ -5,31 +5,31 @@ import {
   flags,
   getAccountInfo,
   getTankStats,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import markdownEscape from 'markdown-escape';
+} from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import markdownEscape from "markdown-escape";
 import {
   gameDefinitions,
   tankDefinitions,
-} from '../core/blitzkit/nonBlockingPromises';
-import { addTierChoices } from '../core/discord/addTierChoices';
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
-import { autocompleteUsername } from '../core/discord/autocompleteUsername';
-import { chunkLines } from '../core/discord/chunkLines';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+} from "../core/blitzkit/nonBlockingPromises";
+import { addTierChoices } from "../core/discord/addTierChoices";
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
+import { autocompleteUsername } from "../core/discord/autocompleteUsername";
+import { chunkLines } from "../core/discord/chunkLines";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { resolvePlayerFromCommand } from "../core/discord/resolvePlayerFromCommand";
+import { translator } from "../core/localization/translator";
+import { type CommandRegistry } from "../events/interactionCreate";
 
 export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
-    command: createLocalizedCommand('owned-tanks')
+    command: createLocalizedCommand("owned-tanks")
       .addStringOption(addTierChoices)
       .addStringOption(addUsernameChoices),
 
     async handler(interaction) {
       const { strings, unwrap } = translator(interaction.locale);
-      const tier = Number(interaction.options.getString('tier'));
+      const tier = Number(interaction.options.getString("tier"));
       const { id, region } = await resolvePlayerFromCommand(interaction);
       const accountInfo = await getAccountInfo(region, id);
       const tankStats = await getTankStats(region, id);
@@ -43,7 +43,7 @@ export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
           tankStats.map(async (tankData) => ({
             tankDefinitions: (await tankDefinitions).tanks[tankData.tank_id]!,
             id: tankData.tank_id,
-          })),
+          }))
         )
       ).filter((tank) => tank.tankDefinitions?.tier === tier);
       const groupedTanks: Record<string, TankDefinition[]> = {};
@@ -60,25 +60,25 @@ export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
 
       const awaitedTankDefinitions = await tankDefinitions;
       const awaitedGameDefinitions = await gameDefinitions;
-      const title = literals(strings.bot.commands.owned_tanks.body.title, [
-        markdownEscape(accountInfo.nickname),
-        TIER_ROMAN_NUMERALS[tier],
-      ]);
+      const title = literals(strings.bot.commands.owned_tanks.body.title, {
+        name: markdownEscape(accountInfo.nickname),
+        tier: TIER_ROMAN_NUMERALS[tier],
+      });
       const tankList = tankStats
         .map(({ tank_id }) => awaitedTankDefinitions.tanks[tank_id])
         .filter((tank) => tank.tier === tier)
         .sort(
           (a, b) =>
-            TANK_CLASSES.indexOf(a.class) - TANK_CLASSES.indexOf(b.class),
+            TANK_CLASSES.indexOf(a.class) - TANK_CLASSES.indexOf(b.class)
         )
         .sort(
           (a, b) =>
             awaitedGameDefinitions.nations.indexOf(a.nation) -
-            awaitedGameDefinitions.nations.indexOf(b.nation),
+            awaitedGameDefinitions.nations.indexOf(b.nation)
         )
         .map(
           (tank) =>
-            `[${flags[tank.nation]} ${markdownEscape(unwrap(tank.name))}](<https://blitzkit.app/tanks/${tank.slug}>)`,
+            `[${flags[tank.nation]} ${markdownEscape(unwrap(tank.name))}](<https://blitzkit.app/tanks/${tank.slug}>)`
         );
       const lines = [title, ...tankList];
 

packages/bot/src/commands/permissions.ts

@@ -1,11 +1,11 @@
-import { literals } from '@blitzkit/i18n';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+import { literals } from "@blitzkit/i18n";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { translator } from "../core/localization/translator";
+import { CommandRegistry } from "../events/interactionCreate";
 
 export const permissionsCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
-    command: createLocalizedCommand('permissions'),
+    command: createLocalizedCommand("permissions"),
 
     async handler(interaction) {
       const { strings } = translator(interaction.locale);
@@ -14,33 +14,33 @@ export const permissionsCommand = new Promise<CommandRegistry>((resolve) => {
         new Date().getDay() === 5 && new Date().getDate() === 13;
       const permissions = [
         [
-          interaction.appPermissions?.has('ViewChannel'),
+          interaction.appPermissions?.has("ViewChannel"),
           strings.bot.commands.permissions.body.view_channels,
         ],
         [
-          interaction.appPermissions?.has('ReadMessageHistory'),
+          interaction.appPermissions?.has("ReadMessageHistory"),
           strings.bot.commands.permissions.body.read_message_history,
         ],
         [
-          interaction.appPermissions?.has('AttachFiles'),
+          interaction.appPermissions?.has("AttachFiles"),
           strings.bot.commands.permissions.body.attach_files,
         ],
         [
-          interaction.appPermissions?.has('UseExternalEmojis'),
+          interaction.appPermissions?.has("UseExternalEmojis"),
           strings.bot.commands.permissions.body.external_emojis,
         ],
       ];
       const body = permissions
         .map(([hasPermission, description]) => {
           if (hasPermission) {
-            return `${isFridayThe13th ? '😇' : '✅'} ${description}`;
+            return `${isFridayThe13th ? "😇" : "✅"} ${description}`;
           } else {
-            return `${isFridayThe13th ? '💀' : '❌'} ${description}`;
+            return `${isFridayThe13th ? "💀" : "❌"} ${description}`;
           }
         })
-        .join('\n');
+        .join("\n");
 
-      return literals(strings.bot.commands.permissions.body.title, [body]);
+      return literals(strings.bot.commands.permissions.body.title, { body });
     },
   });
 });

packages/bot/src/commands/ping.ts

@@ -1,15 +1,15 @@
-import { literals } from '@blitzkit/i18n';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+import { literals } from "@blitzkit/i18n";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { translator } from "../core/localization/translator";
+import type { CommandRegistry } from "../events/interactionCreate";
 
 export const pingCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
     handlesInteraction: true,
 
-    command: createLocalizedCommand('ping', [
-      { subcommand: 'blitzkit' },
-      { subcommand: 'wotb' },
+    command: createLocalizedCommand("ping", [
+      { subcommand: "blitzkit" },
+      { subcommand: "wotb" },
     ]),
 
     async handler(interaction) {
@@ -17,17 +17,17 @@ export const pingCommand = new Promise<CommandRegistry>((resolve) => {
       const subcommand = interaction.options.getSubcommand();
       const executionStart = Date.now();
 
-      if (subcommand === 'blitzkit') {
+      if (subcommand === "blitzkit") {
         await interaction.editReply(strings.bot.commands.ping.body.pong);
       } else {
-        await fetch('https://api.wotblitz.com/');
+        await fetch("https://api.wotblitz.com/");
       }
 
       const executionTime = Date.now() - executionStart;
       interaction.editReply(
-        literals(strings.bot.commands.ping.body.pong_with_time, [
-          `${Math.round(executionTime)}`,
-        ]),
+        literals(strings.bot.commands.ping.body.pong_with_time, {
+          time: executionTime.toFixed(0),
+        })
       );
     },
   });

packages/bot/src/commands/playerInfo.ts

@@ -1,19 +1,19 @@
-import { getAccountInfo } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import markdownEscape from 'markdown-escape';
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
-import { autocompleteUsername } from '../core/discord/autocompleteUsername';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { embedInfo } from '../core/discord/embedInfo';
-import { markdownTable } from '../core/discord/markdownTable';
-import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+import { getAccountInfo } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import markdownEscape from "markdown-escape";
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
+import { autocompleteUsername } from "../core/discord/autocompleteUsername";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { embedInfo } from "../core/discord/embedInfo";
+import { markdownTable } from "../core/discord/markdownTable";
+import { resolvePlayerFromCommand } from "../core/discord/resolvePlayerFromCommand";
+import { translator } from "../core/localization/translator";
+import { CommandRegistry } from "../events/interactionCreate";
 
 export const playerInfoCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
     command:
-      createLocalizedCommand('player-info').addStringOption(addUsernameChoices),
+      createLocalizedCommand("player-info").addStringOption(addUsernameChoices),
 
     async handler(interaction) {
       const { strings } = translator(interaction.locale);
@@ -22,9 +22,9 @@ export const playerInfoCommand = new Promise<CommandRegistry>((resolve) => {
       const accountInfo = await getAccountInfo(region, id);
 
       return embedInfo(
-        literals(strings.bot.commands.player_info.body.title, [
-          markdownEscape(accountInfo.nickname),
-        ]),
+        literals(strings.bot.commands.player_info.body.title, {
+          name: markdownEscape(accountInfo.nickname),
+        }),
 
         markdownTable([
           [
@@ -51,16 +51,16 @@ export const playerInfoCommand = new Promise<CommandRegistry>((resolve) => {
           [
             strings.bot.commands.player_info.body.created,
             new Date(accountInfo.created_at * 1000).toLocaleDateString(
-              interaction.locale,
+              interaction.locale
             ),
           ],
           [
             strings.bot.commands.player_info.body.last_battle,
             new Date(accountInfo.last_battle_time * 1000).toLocaleDateString(
-              interaction.locale,
+              interaction.locale
             ),
           ],
-        ]),
+        ])
       );
     },
 

packages/bot/src/commands/rating.tsx

@@ -8,42 +8,42 @@ import {
   getRatingInfo,
   getRatingNeighbors,
   imgur,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { SlashCommandSubcommandBuilder } from 'discord.js';
-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 { normalizeLeagueIcon } from '../core/blitz/normalizeLeagueIcon';
-import { iconPng } from '../core/blitzkit/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 { CommandRegistry } from '../events/interactionCreate';
-import { theme } from '../stitches.config';
+} from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { SlashCommandSubcommandBuilder } from "discord.js";
+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 { normalizeLeagueIcon } from "../core/blitz/normalizeLeagueIcon";
+import { iconPng } from "../core/blitzkit/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 type { CommandRegistry } from "../events/interactionCreate";
+import { theme } from "../stitches.config";
 
 const LEAGUE_ACCENT = [
-  '_purple',
-  '_sand',
-  '_amber',
-  '_mauve',
-  '_brown',
+  "_purple",
+  "_sand",
+  "_amber",
+  "_mauve",
+  "_brown",
 ] as const;
 
 export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
-    command: createLocalizedCommand('rating', [
+    command: createLocalizedCommand("rating", [
       {
-        subcommand: 'today',
+        subcommand: "today",
         modify(option: SlashCommandSubcommandBuilder) {
           option.addStringOption(addUsernameChoices);
         },
       },
       {
-        subcommand: 'season',
+        subcommand: "season",
         modify(option: SlashCommandSubcommandBuilder) {
           option.addStringOption(addUsernameChoices);
         },
@@ -52,11 +52,11 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
 
     async handler(interaction) {
       const subcommand = interaction.options.getSubcommand(true) as
-        | 'season'
-        | 'today';
+        | "season"
+        | "today";
       const { strings } = translator(interaction.locale);
       const { id, region } = await resolvePlayerFromCommand(interaction);
-      const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+      const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan;
       const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
 
       const ratingInfo = await getRatingInfo(region);
@@ -67,20 +67,20 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
 
       const leaderboard = await getArchivedRatingLeaderboard(
         region,
-        ratingInfo.current_season - (subcommand === 'today' ? 0 : 1),
+        ratingInfo.current_season - (subcommand === "today" ? 0 : 1)
       );
 
-      if (leaderboard.version!.$case === 'v1') {
+      if (leaderboard.version!.$case === "v1") {
         throw new Error(
-          'Encountered bkrl minimal format in latest season. Wait till next cron?',
+          "Encountered bkrl minimal format in latest season. Wait till next cron?"
         );
       }
 
       const accountInfo = await getAccountInfo(region, id, [
-        'statistics.rating',
+        "statistics.rating",
       ]);
       const statsIndex = leaderboard.version!.value.entries.findIndex(
-        (entry) => entry.id === id,
+        (entry) => entry.id === id
       );
       const statsA = leaderboard
         ? leaderboard.version!.value.entries[statsIndex!]
@@ -90,9 +90,9 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
       const statsB2Array = (await getRatingNeighbors(region, id, 0)).neighbors;
 
       if (statsB2Array === undefined) {
-        return literals(strings.bot.commands.rating.errors.no_participation, [
-          markdownEscape(accountInfo.nickname),
-        ]);
+        return literals(strings.bot.commands.rating.errors.no_participation, {
+          name: markdownEscape(accountInfo.nickname),
+        });
       }
 
       const [statsB2] = statsB2Array;
@@ -102,15 +102,15 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
         return strings.bot.commands.rating.errors.unrecorded_stats;
       }
       if (!statsB1) {
-        return literals(strings.bot.commands.rating.errors.no_participation, [
-          markdownEscape(accountInfo.nickname),
-        ]);
+        return literals(strings.bot.commands.rating.errors.no_participation, {
+          name: markdownEscape(accountInfo.nickname),
+        });
       }
 
       const reward = ratingInfo.rewards.find(
         (reward) =>
           statsB2.number >= reward.from_position &&
-          statsB2.number <= reward.to_position,
+          statsB2.number <= reward.to_position
       );
       const positionDelta = leaderboard
         ? statsB2.number - positionA!
@@ -118,11 +118,11 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
       const delta = deltaBkrlBlitzStats(
         statsA,
         accountInfo.statistics.rating!,
-        statsB2,
+        statsB2
       );
       const leagueTheme = LEAGUE_ACCENT[league.index];
       let rewardImage = reward
-        ? reward.type === 'vehicle'
+        ? reward.type === "vehicle"
           ? reward.vehicle.preview_image_url
           : reward.stuff.image_url
         : undefined;
@@ -131,7 +131,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
         const { ok } = await fetch(rewardImage);
 
         if (!ok) {
-          rewardImage = imgur('kP88vqr');
+          rewardImage = imgur("kP88vqr");
         }
       }
 
@@ -147,24 +147,24 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
 
           <div
             style={{
-              position: 'relative',
-              display: 'flex',
-              overflow: 'hidden',
+              position: "relative",
+              display: "flex",
+              overflow: "hidden",
             }}
           >
             <div
               style={{
-                position: 'relative',
+                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%',
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "space-between",
+                width: "100%",
               }}
             >
               {reward === undefined && (
@@ -172,17 +172,17 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                   endOpacity={3 / 4}
                   color={theme.colors[`solidBackground${leagueTheme}`]}
                   style={{
-                    transform: 'translateX(-16px) rotate(90deg)',
+                    transform: "translateX(-16px) rotate(90deg)",
                   }}
                 />
               )}
 
               <div
                 style={{
-                  display: 'flex',
+                  display: "flex",
                   gap: 8,
-                  justifyContent: 'center',
-                  alignItems: 'center',
+                  justifyContent: "center",
+                  alignItems: "center",
                 }}
               >
                 <img
@@ -190,24 +190,24 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                   style={{
                     width: 64,
                     height: 64,
-                    objectFit: 'contain',
+                    objectFit: "contain",
                   }}
                   src={normalizeLeagueIcon(
-                    ratingInfo.leagues[league.index].big_icon,
+                    ratingInfo.leagues[league.index].big_icon
                   )}
                 />
 
                 <div
                   style={{
-                    display: 'flex',
-                    flexDirection: 'column',
+                    display: "flex",
+                    flexDirection: "column",
                   }}
                 >
                   <div
                     style={{
-                      display: 'flex',
-                      alignItems: 'center',
-                      justifyContent: 'flex-start',
+                      display: "flex",
+                      alignItems: "center",
+                      justifyContent: "flex-start",
                     }}
                   >
                     <span
@@ -232,7 +232,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                           }}
                         >
                           {Math.abs(delta.score).toLocaleString(
-                            interaction.locale,
+                            interaction.locale
                           )}
                         </span>
                       </>
@@ -241,9 +241,9 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
 
                   <div
                     style={{
-                      display: 'flex',
-                      alignItems: 'center',
-                      justifyContent: 'flex-start',
+                      display: "flex",
+                      alignItems: "center",
+                      justifyContent: "flex-start",
                     }}
                   >
                     <span
@@ -267,7 +267,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                           }}
                         >
                           {Math.abs(positionDelta).toLocaleString(
-                            interaction.locale,
+                            interaction.locale
                           )}
                         </span>
                       </>
@@ -279,23 +279,23 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
               {reward && (
                 <div
                   style={{
-                    display: 'flex',
+                    display: "flex",
                     gap: 8,
-                    justifyContent: 'center',
-                    alignItems: 'center',
+                    justifyContent: "center",
+                    alignItems: "center",
                   }}
                 >
                   <div
                     style={{
-                      display: 'flex',
-                      flexDirection: 'column',
+                      display: "flex",
+                      flexDirection: "column",
                     }}
                   >
                     <div
                       style={{
-                        display: 'flex',
-                        alignItems: 'center',
-                        justifyContent: 'flex-end',
+                        display: "flex",
+                        alignItems: "center",
+                        justifyContent: "flex-end",
                       }}
                     >
                       <span
@@ -303,13 +303,13 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                           color: theme.colors[`textHighContrast${leagueTheme}`],
                           fontSize: 16,
                           maxWidth: 136,
-                          textAlign: 'right',
-                          whiteSpace: 'nowrap',
-                          textOverflow: 'ellipsis',
-                          overflow: 'hidden',
+                          textAlign: "right",
+                          whiteSpace: "nowrap",
+                          textOverflow: "ellipsis",
+                          overflow: "hidden",
                         }}
                       >
-                        {reward.type === 'vehicle'
+                        {reward.type === "vehicle"
                           ? reward.vehicle.user_string
                           : reward.stuff.title}
                       </span>
@@ -317,9 +317,9 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
 
                     <div
                       style={{
-                        display: 'flex',
-                        alignItems: 'center',
-                        justifyContent: 'flex-end',
+                        display: "flex",
+                        alignItems: "center",
+                        justifyContent: "flex-end",
                       }}
                     >
                       <span
@@ -329,7 +329,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                         }}
                       >
                         Reward
-                        {reward.type === 'stuff' ? ` x${reward.count}` : ''}
+                        {reward.type === "stuff" ? ` x${reward.count}` : ""}
                       </span>
                     </div>
                   </div>
@@ -338,7 +338,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                     style={{
                       width: 64,
                       height: 64,
-                      objectFit: 'cover',
+                      objectFit: "cover",
                     }}
                     src={await iconPng(rewardImage!)}
                   />
@@ -350,7 +350,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                   endOpacity={3 / 4}
                   color={theme.colors[`solidBackground${leagueTheme}`]}
                   style={{
-                    transform: 'translateX(16px) rotate(-90deg)',
+                    transform: "translateX(16px) rotate(-90deg)",
                   }}
                 />
               )}
@@ -362,10 +362,10 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                 direction="reverse"
                 color={theme.colors[`solidBackground${leagueTheme}`]}
                 style={{
-                  position: 'absolute',
+                  position: "absolute",
                   top: -40,
-                  left: '50%',
-                  transform: 'translateX(-50%)',
+                  left: "50%",
+                  transform: "translateX(-50%)",
                 }}
               />
             )}
@@ -373,32 +373,32 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
               <Glow
                 color={theme.colors[`solidBackground${leagueTheme}`]}
                 style={{
-                  position: 'absolute',
+                  position: "absolute",
                   bottom: -40,
-                  left: '50%',
-                  transform: 'translateX(-50%)',
+                  left: "50%",
+                  transform: "translateX(-50%)",
                 }}
               />
             )}
           </div>
 
           {delta.battles > 0 && (
-            <div style={{ padding: '8px 0', display: 'flex' }}>
+            <div style={{ padding: "8px 0", display: "flex" }}>
               <div
                 style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
                   gap: 4,
                   flex: 1,
-                  flexDirection: 'column',
+                  flexDirection: "column",
                 }}
               >
                 <span
                   style={{
                     fontSize: 24,
                     color: theme.colors.textHighContrast,
-                    fontWeight: 'bold',
+                    fontWeight: "bold",
                   }}
                 >
                   {delta.battles.toLocaleString(interaction.locale)}
@@ -414,19 +414,19 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
               </div>
               <div
                 style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
                   gap: 4,
                   flex: 1,
-                  flexDirection: 'column',
+                  flexDirection: "column",
                 }}
               >
                 <span
                   style={{
                     fontSize: 24,
                     color: theme.colors.textHighContrast,
-                    fontWeight: 'bold',
+                    fontWeight: "bold",
                   }}
                 >
                   {(100 * (delta.wins / delta.battles)).toFixed(0)}%
@@ -442,23 +442,23 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
               </div>
               <div
                 style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
                   gap: 4,
                   flex: 1,
-                  flexDirection: 'column',
+                  flexDirection: "column",
                 }}
               >
                 <span
                   style={{
                     fontSize: 24,
                     color: theme.colors.textHighContrast,
-                    fontWeight: 'bold',
+                    fontWeight: "bold",
                   }}
                 >
                   {Math.round(delta.damage / delta.battles).toLocaleString(
-                    interaction.locale,
+                    interaction.locale
                   )}
                 </span>
                 <span
@@ -472,19 +472,19 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
               </div>
               <div
                 style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
                   gap: 4,
                   flex: 1,
-                  flexDirection: 'column',
+                  flexDirection: "column",
                 }}
               >
                 <span
                   style={{
                     fontSize: 24,
                     color: theme.colors.textHighContrast,
-                    fontWeight: 'bold',
+                    fontWeight: "bold",
                   }}
                 >
                   {(100 * (delta.survived / delta.battles)).toFixed(0)}%
@@ -500,19 +500,19 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
               </div>
               <div
                 style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
                   gap: 4,
                   flex: 1,
-                  flexDirection: 'column',
+                  flexDirection: "column",
                 }}
               >
                 <span
                   style={{
                     fontSize: 24,
                     color: theme.colors.textHighContrast,
-                    fontWeight: 'bold',
+                    fontWeight: "bold",
                   }}
                 >
                   {(delta.kills / delta.battles).toFixed(2)}

packages/bot/src/commands/ratingLeaderboard.tsx

@@ -10,30 +10,30 @@ import {
   imgur,
   isOnGoingRatingSeason,
   LEAGUES,
-  RatingInfo,
+  type RatingInfo,
   RatingLeaderboard,
-  Region,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
+  type Region,
+} from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
 import {
-  APIApplicationCommandOptionChoice,
+  type APIApplicationCommandOptionChoice,
   Locale,
   SlashCommandSubcommandBuilder,
-} from 'discord.js';
-import { range } from 'lodash-es';
-import markdownEscape from 'markdown-escape';
-import { CommandWrapper } from '../components/CommandWrapper';
-import * as Leaderboard from '../components/Leaderboard';
-import { TitleBar } from '../components/TitleBar';
-import { UserError } from '../core/blitzkit/userError';
-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';
+} from "discord.js";
+import { range } from "lodash-es";
+import markdownEscape from "markdown-escape";
+import { CommandWrapper } from "../components/CommandWrapper";
+import * as Leaderboard from "../components/Leaderboard";
+import { TitleBar } from "../components/TitleBar";
+import { UserError } from "../core/blitzkit/userError";
+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 type { CommandRegistry } from "../events/interactionCreate";
 
 interface SimplifiedPlayer {
   id: number;
@@ -51,7 +51,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
     const onGoingSeason = await isOnGoingRatingSeason();
     const seasonNumbers = range(
       FIRST_MINIMAL_ARCHIVED_RATING_SEASON,
-      latestArchivedSeasonNumber + (onGoingSeason ? 1 : 0) + 1,
+      latestArchivedSeasonNumber + (onGoingSeason ? 1 : 0) + 1
     );
 
     function addOptions(option: SlashCommandSubcommandBuilder) {
@@ -66,51 +66,50 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                 (strings) =>
                   strings.bot.commands.rating_leaderboard.options.limit.name,
                 undefined,
-                true,
-              ),
+                true
+              )
             )
             .setDescription(
               literals(
                 strings.bot.commands.rating_leaderboard.options.limit
                   .description,
-                [`${DEFAULT_LIMIT}`],
-              ),
+                { count: DEFAULT_LIMIT }
+              )
             )
             .setDescriptionLocalizations(
               localizationObject(
                 (strings) =>
                   strings.bot.commands.rating_leaderboard.options.limit
                     .description,
-                [`${DEFAULT_LIMIT}`],
-              ),
+                { count: DEFAULT_LIMIT }
+              )
             )
             .setRequired(false)
             .setMinValue(5)
-            .setMaxValue(30),
+            .setMaxValue(30)
         )
         .addStringOption((option) =>
           option
             .setName(
-              strings.bot.commands.rating_leaderboard.options.season.name,
+              strings.bot.commands.rating_leaderboard.options.season.name
             )
             .setNameLocalizations(
               localizationObject(
                 (strings) =>
                   strings.bot.commands.rating_leaderboard.options.season.name,
                 undefined,
-                true,
-              ),
+                true
+              )
             )
             .setDescription(
-              strings.bot.commands.rating_leaderboard.options.season
-                .description,
+              strings.bot.commands.rating_leaderboard.options.season.description
             )
             .setDescriptionLocalizations(
               localizationObject(
                 (strings) =>
                   strings.bot.commands.rating_leaderboard.options.season
-                    .description,
-              ),
+                    .description
+              )
             )
             .setRequired(false)
             .addChoices(
@@ -124,7 +123,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                       ? literals(
                           strings.bot.commands.rating_leaderboard.options.season
                             .choices.current,
-                          [`${number}`],
+                          { season: number }
                         )
                       : `${number}`,
                     value: `${number}`,
@@ -133,27 +132,27 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                           (strings) =>
                             strings.bot.commands.rating_leaderboard.options
                               .season.choices.current,
-                          [`${number}`],
+                          { season: number }
                         )
                       : undefined,
                   } satisfies APIApplicationCommandOptionChoice<string>;
                 })
-                .reverse(),
-            ),
+                .reverse()
+            )
         );
     }
 
     resolve({
-      command: createLocalizedCommand('rating-leaderboard', [
+      command: createLocalizedCommand("rating-leaderboard", [
         {
-          subcommand: 'neighbors',
+          subcommand: "neighbors",
           modify(option: SlashCommandSubcommandBuilder) {
             option.addStringOption(addUsernameChoices);
             addOptions(option);
           },
         },
         {
-          subcommand: 'league',
+          subcommand: "league",
           modify(option: SlashCommandSubcommandBuilder) {
             option
               .addStringOption((option) => {
@@ -161,7 +160,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
 
                 return option
                   .setName(
-                    strings.bot.commands.rating_leaderboard.options.league.name,
+                    strings.bot.commands.rating_leaderboard.options.league.name
                   )
                   .setNameLocalizations(
                     localizationObject(
@@ -169,19 +168,19 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                         strings.bot.commands.rating_leaderboard.options.league
                           .name,
                       undefined,
-                      true,
-                    ),
+                      true
+                    )
                   )
                   .setDescription(
                     strings.bot.commands.rating_leaderboard.options.league
-                      .description,
+                      .description
                   )
                   .setDescriptionLocalizations(
                     localizationObject(
                       (strings) =>
                         strings.bot.commands.rating_leaderboard.options.league
-                          .description,
-                    ),
+                          .description
+                    )
                   )
                   .addChoices(
                     ...LEAGUES.map(
@@ -195,10 +194,10 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                             (strings) =>
                               (
                                 strings.common.leagues as Record<string, string>
-                              )[name],
+                              )[name]
                           ),
-                        }) satisfies APIApplicationCommandOptionChoice<string>,
-                    ),
+                        }) satisfies APIApplicationCommandOptionChoice<string>
+                    )
                   )
                   .setRequired(true);
               })
@@ -213,10 +212,10 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
       async handler(interaction) {
         const { strings } = 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');
+          | "league"
+          | "neighbors";
+        const limit = interaction.options.getInteger("limit") ?? DEFAULT_LIMIT;
+        const seasonOption = interaction.options.getString("season");
         const season = seasonOption
           ? parseInt(seasonOption)
           : onGoingSeason
@@ -232,11 +231,11 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
         let playerId: number | undefined;
         let regionRatingInfo: RatingInfo | null;
 
-        if (subcommand === 'league') {
+        if (subcommand === "league") {
           const leagueIndex = parseInt(
-            interaction.options.getString('league')!,
+            interaction.options.getString("league")!
           );
-          const region = interaction.options.getString('region') as Region;
+          const region = interaction.options.getString("region") as Region;
           regionRatingInfo = await (isCurrentSeason
             ? getRatingInfo(region)
             : null);
@@ -259,8 +258,8 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                       position: player.number,
                       clan: player.clan_tag,
                       nickname: player.nickname,
-                    }) satisfies SimplifiedPlayer,
-                ),
+                    }) satisfies SimplifiedPlayer
+                )
               )
             : await getArchivedRatingLeaderboard(region, season!).then(
                 async (players) => {
@@ -269,17 +268,17 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                       ? 0
                       : players.version!.value.entries.findIndex(
                           (player) =>
-                            player.score < LEAGUES[leagueIndex - 1].minScore,
+                            player.score < LEAGUES[leagueIndex - 1].minScore
                         );
                   const lastPlayerIndex = firstPlayerIndex + limit - 1;
                   const trimmed = players.version!.value.entries.slice(
                     firstPlayerIndex,
-                    lastPlayerIndex + 1,
+                    lastPlayerIndex + 1
                   );
                   const clanData = await getClanAccountInfo(
                     region,
                     trimmed.map(({ id }) => id),
-                    ['clan'],
+                    ["clan"]
                   );
 
                   return trimmed.map(
@@ -294,16 +293,16 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                           literals(
                             strings.bot.commands.rating_leaderboard.body
                               .deleted_player,
-                            [`${player.id}`],
+                            { id: player.id }
                           ),
-                      }) satisfies SimplifiedPlayer,
+                      }) satisfies SimplifiedPlayer
                   );
-                },
+                }
               );
           const leagueInfo = LEAGUES[leagueIndex];
           archivedLeaderboard = await getArchivedRatingLeaderboard(
             region,
-            season,
+            season
           );
 
           players = result;
@@ -316,12 +315,12 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
               ? (strings.common.leagues as Record<string, string>)[
                   LEAGUES[leagueInfo.index].name
                 ]
-              : ''
+              : ""
           } - ${strings.common.regions.short[region]}`;
           titleImage = imgur(leagueInfo.icon);
           titleDescription = literals(
             strings.bot.commands.rating_leaderboard.body.top_players,
-            [`${limit}`],
+            { count: limit }
           );
         } else {
           const { region, id } = await resolvePlayerFromCommand(interaction);
@@ -338,7 +337,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
           }
 
           const accountInfo = await getAccountInfo(region, id);
-          const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+          const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan;
           const neighbors = isCurrentSeason
             ? await getRatingNeighbors(region, id, Math.round(limit / 2)).then(
                 (players) =>
@@ -350,13 +349,13 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                         score: player.score,
                         clan: player.clan_tag,
                         nickname: player.nickname,
-                      }) satisfies SimplifiedPlayer,
-                  ),
+                      }) satisfies SimplifiedPlayer
+                  )
               )
             : await getArchivedRatingLeaderboard(region, season!).then(
                 async (players) => {
                   const playerIndex = players.version!.value.entries.findIndex(
-                    (player) => player.id === id,
+                    (player) => player.id === id
                   );
 
                   if (playerIndex === -1) {
@@ -364,20 +363,20 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                       literals(
                         strings.bot.commands.rating_leaderboard.body
                           .no_participation,
-                        [markdownEscape(accountInfo.nickname), `${season}`],
-                      ),
+                        { player: markdownEscape(accountInfo.nickname), season }
+                      )
                     );
                   }
 
                   const halfRange = Math.round(limit / 2);
                   const trimmed = players.version!.value.entries.slice(
                     playerIndex - halfRange,
-                    playerIndex + halfRange + 1,
+                    playerIndex + halfRange + 1
                   );
                   const clanData = await getClanAccountInfo(
                     region,
                     trimmed.map((player) => player.id),
-                    ['clan'],
+                    ["clan"]
                   );
 
                   return trimmed.map((player, index) => ({
@@ -389,18 +388,18 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                       ? clanData[index]!.account_name
                       : `Deleted ${player.id}`,
                   }));
-                },
+                }
               );
           archivedLeaderboard = await getArchivedRatingLeaderboard(
             region,
-            season,
+            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 : '';
+          titleName = neighbors ? accountInfo.nickname : "";
           titleDescription =
             strings.bot.commands.rating_leaderboard.body.neighbors;
           playersAfter =
@@ -414,7 +413,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
         const items = players.map((player) => {
           const midnightIndex =
             archivedLeaderboard?.version!.value.entries.findIndex(
-              (item) => item.id === player.id,
+              (item) => item.id === player.id
             );
           const midnightScore =
             midnightIndex === undefined
@@ -453,7 +452,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                   <Leaderboard.Gap
                     message={literals(
                       strings.bot.commands.rating_leaderboard.body.more,
-                      [`${playersAfter.toLocaleString(interaction.locale)}`],
+                      { count: playersAfter.toLocaleString(interaction.locale) }
                     )}
                   />
                 )}
@@ -465,5 +464,5 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
 
       autocomplete: autocompleteUsername,
     });
-  },
+  }
 );

packages/bot/src/commands/replay.tsx

@@ -20,7 +20,7 @@ import { blitzStarsTankAverages } from '../core/blitzstars/tankAverages';
 import { buttonLink } from '../core/discord/buttonLink';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
 import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+import { type CommandRegistry } from '../events/interactionCreate';
 import { theme } from '../stitches.config';
 
 type WotInspectorReplaySubmission =

packages/bot/src/commands/research.tsx

@@ -8,31 +8,31 @@ import {
   TANK_ICONS,
   TankType,
   TIER_ROMAN_NUMERALS,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { escapeMarkdown, Locale } from 'discord.js';
-import { CommandWrapper } from '../components/CommandWrapper';
-import { TitleBar } from '../components/TitleBar';
-import { resolveTankId } from '../core/blitz/resolveTankId';
-import { buildTechTreeLine } from '../core/blitzkit/buildTechTreeLine';
-import { iconPng } from '../core/blitzkit/iconPng';
-import { tankDefinitions } from '../core/blitzkit/nonBlockingPromises';
-import { resolveAncestry } from '../core/blitzkit/resolveAncestry';
-import { tankIconPng } from '../core/blitzkit/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';
-import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
-import { theme } from '../stitches.config';
+} from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { escapeMarkdown, Locale } from "discord.js";
+import { CommandWrapper } from "../components/CommandWrapper";
+import { TitleBar } from "../components/TitleBar";
+import { resolveTankId } from "../core/blitz/resolveTankId";
+import { buildTechTreeLine } from "../core/blitzkit/buildTechTreeLine";
+import { iconPng } from "../core/blitzkit/iconPng";
+import { tankDefinitions } from "../core/blitzkit/nonBlockingPromises";
+import { resolveAncestry } from "../core/blitzkit/resolveAncestry";
+import { tankIconPng } from "../core/blitzkit/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";
+import { resolvePlayerFromCommand } from "../core/discord/resolvePlayerFromCommand";
+import { translator } from "../core/localization/translator";
+import { type CommandRegistry } from "../events/interactionCreate";
+import { theme } from "../stitches.config";
 
 export const researchCommand = new Promise<CommandRegistry>((resolve) => {
   const { strings } = translator(Locale.EnglishUS);
 
   resolve({
-    command: createLocalizedCommand('research')
+    command: createLocalizedCommand("research")
       .addStringOption((option) =>
         option
           .setName(strings.bot.commands.research.options.target_tank.name)
@@ -41,20 +41,20 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
               (strings) =>
                 strings.bot.commands.research.options.target_tank.name,
               undefined,
-              true,
-            ),
+              true
+            )
           )
           .setDescription(
-            strings.bot.commands.research.options.target_tank.description,
+            strings.bot.commands.research.options.target_tank.description
           )
           .setDescriptionLocalizations(
             localizationObject(
               (strings) =>
-                strings.bot.commands.research.options.target_tank.description,
-            ),
+                strings.bot.commands.research.options.target_tank.description
+            )
           )
           .setAutocomplete(true)
-          .setRequired(true),
+          .setRequired(true)
       )
       .addStringOption((option) =>
         option
@@ -64,20 +64,20 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
               (strings) =>
                 strings.bot.commands.research.options.starting_tank.name,
               undefined,
-              true,
-            ),
+              true
+            )
           )
           .setDescription(
-            strings.bot.commands.research.options.starting_tank.description,
+            strings.bot.commands.research.options.starting_tank.description
           )
           .setDescriptionLocalizations(
             localizationObject(
               (strings) =>
-                strings.bot.commands.research.options.starting_tank.description,
-            ),
+                strings.bot.commands.research.options.starting_tank.description
+            )
           )
           .setAutocomplete(true)
-          .setRequired(false),
+          .setRequired(false)
       )
       .addStringOption(addUsernameChoices),
 
@@ -85,11 +85,11 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
       const { strings, unwrap } = translator(interaction.locale);
       const awaitedTankDefinitions = await tankDefinitions;
       const targetTankId = await resolveTankId(
-        interaction.options.getString('target-tank', true),
+        interaction.options.getString("target-tank", true),
         interaction.locale,
-        true,
+        true
       );
-      const startingTankRaw = interaction.options.getString('starting-tank');
+      const startingTankRaw = interaction.options.getString("starting-tank");
       const targetTank = awaitedTankDefinitions.tanks[targetTankId];
       const { id, region } = await resolvePlayerFromCommand(interaction);
       let startingTankId: number;
@@ -99,46 +99,45 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
         startingTankId = await resolveTankId(
           startingTankRaw,
           interaction.locale,
-          true,
+          true
         );
 
         if (targetTankId === startingTankId) {
           return literals(
             strings.bot.commands.research.errors.start_end_equal,
-            [escapeMarkdown(unwrap(targetTank.name))],
+            { tank: escapeMarkdown(unwrap(targetTank.name)) }
           );
         }
 
         const startingTank = awaitedTankDefinitions.tanks[startingTankId];
 
         if (startingTank.tier > targetTank.tier) {
-          return literals(strings.bot.commands.research.errors.unordered, [
-            escapeMarkdown(unwrap(startingTank.name)),
-            escapeMarkdown(unwrap(targetTank.name)),
-            escapeMarkdown(unwrap(targetTank.name)),
-          ]);
+          return literals(strings.bot.commands.research.errors.unordered, {
+            tank_1: escapeMarkdown(unwrap(startingTank.name)),
+            tank_2: escapeMarkdown(unwrap(targetTank.name)),
+          });
         }
 
         if (!targetTankAncestry.includes(startingTankId)) {
           return literals(
             strings.bot.commands.research.errors.tanks_not_on_line,
-            [
-              escapeMarkdown(unwrap(targetTank.name)),
-              escapeMarkdown(unwrap(startingTank.name)),
-            ],
+            {
+              tank_1: escapeMarkdown(unwrap(targetTank.name)),
+              tank_2: escapeMarkdown(unwrap(startingTank.name)),
+            }
           );
         }
       } else {
         if (targetTank.type !== TankType.RESEARCHABLE) {
-          return literals(strings.bot.commands.research.errors.non_tech_tree, [
-            escapeMarkdown(unwrap(targetTank.name)),
-          ]);
+          return literals(strings.bot.commands.research.errors.non_tech_tree, {
+            tank: escapeMarkdown(unwrap(targetTank.name)),
+          });
         }
 
         if (targetTank.tier === 1) {
-          return literals(strings.bot.commands.research.errors.tier_1, [
-            escapeMarkdown(unwrap(targetTank.name)),
-          ]);
+          return literals(strings.bot.commands.research.errors.tier_1, {
+            tank: escapeMarkdown(unwrap(targetTank.name)),
+          });
         }
 
         const tankStats = await getTankStats(region, id);
@@ -150,18 +149,18 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
         if (tankStats.some(({ tank_id }) => tank_id === targetTankId)) {
           return literals(
             strings.bot.commands.research.errors.already_researched,
-            [escapeMarkdown(unwrap(targetTank.name))],
+            { tank: escapeMarkdown(unwrap(targetTank.name)) }
           );
         }
 
         const foundAncestor = targetTankAncestry.find(
           (id) =>
             awaitedTankDefinitions.tanks[id].tier === 1 ||
-            tankStats.some(({ tank_id }) => tank_id === id),
+            tankStats.some(({ tank_id }) => tank_id === id)
         );
 
         if (foundAncestor === undefined) {
-          throw new Error('No first owned tech tree found.');
+          throw new Error("No first owned tech tree found.");
         }
 
         startingTankId = foundAncestor;
@@ -169,12 +168,12 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
 
       const techTreeLine = await buildTechTreeLine(
         startingTankId,
-        targetTankId,
+        targetTankId
       );
 
       const line = [...techTreeLine, startingTankId].reverse();
       const { nickname } = await getAccountInfo(region, id);
-      const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+      const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan;
       const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
       const costs = await Promise.all(
         line.map(async (id) => {
@@ -187,18 +186,18 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
           tank.turrets.forEach((turret) => {
             if (
               turret.research_cost !== undefined &&
-              typeof turret.research_cost.research_cost_type!.value === 'number'
+              typeof turret.research_cost.research_cost_type!.value === "number"
             ) {
               turretXps.set(
                 turret.id,
-                turret.research_cost.research_cost_type!.value,
+                turret.research_cost.research_cost_type!.value
               );
             }
 
             turret.guns.forEach((gun) => {
               if (
                 gun.research_cost !== undefined &&
-                typeof gun.research_cost.research_cost_type!.value === 'number'
+                typeof gun.research_cost.research_cost_type!.value === "number"
               ) {
                 gunXps.set(gun.id, gun.research_cost.research_cost_type!.value);
               }
@@ -208,11 +207,11 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
           tank.engines.forEach((engine) => {
             if (
               engine.research_cost !== undefined &&
-              typeof engine.research_cost.research_cost_type!.value === 'number'
+              typeof engine.research_cost.research_cost_type!.value === "number"
             ) {
               engineXps.set(
                 engine.id,
-                engine.research_cost.research_cost_type!.value,
+                engine.research_cost.research_cost_type!.value
               );
             }
           });
@@ -220,11 +219,11 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
           tank.tracks.forEach((track) => {
             if (
               track.research_cost !== undefined &&
-              typeof track.research_cost.research_cost_type!.value === 'number'
+              typeof track.research_cost.research_cost_type!.value === "number"
             ) {
               trackXps.set(
                 track.id,
-                track.research_cost.research_cost_type!.value,
+                track.research_cost.research_cost_type!.value
               );
             }
           });
@@ -249,10 +248,10 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
             purchase: tank.price.value,
             equipment: equipmentPriceMatrix[tank.tier].reduce(
               (a, b) => a + 3 * b,
-              0,
+              0
             ),
           };
-        }),
+        })
       );
 
       const image = (
@@ -267,14 +266,14 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
 
           <div
             style={{
-              display: 'flex',
-              flexDirection: 'column',
+              display: "flex",
+              flexDirection: "column",
               gap: 8,
             }}
           >
             <div
               style={{
-                display: 'flex',
+                display: "flex",
                 borderRadius: 4,
                 backgroundColor: theme.colors.appBackground2,
                 border: theme.borderStyles.subtle,
@@ -285,10 +284,10 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
               <div
                 style={{
                   flex: 1,
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
-                  position: 'relative',
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
+                  position: "relative",
                   right: 24,
                 }}
               >
@@ -304,23 +303,23 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
               <div
                 style={{
                   flex: 1,
-                  display: 'flex',
-                  flexDirection: 'column',
-                  justifyContent: 'center',
+                  display: "flex",
+                  flexDirection: "column",
+                  justifyContent: "center",
                   gap: 8,
-                  padding: '16px 0',
+                  padding: "16px 0",
                 }}
               >
                 <div
                   style={{
-                    display: 'flex',
+                    display: "flex",
                     gap: 4,
-                    alignItems: 'center',
+                    alignItems: "center",
                   }}
                 >
                   <img
                     alt="XP icon"
-                    src={await iconPng(asset('icons/currencies/xp.webp'))}
+                    src={await iconPng(asset("icons/currencies/xp.webp"))}
                     width={16}
                     height={16}
                   />
@@ -330,7 +329,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                       color: theme.colors.textHighContrast,
                     }}
                   >
-                    Experience:{' '}
+                    Experience:{" "}
                     {costs
                       .reduce((a, b) => a + (b.research ?? 0) + b.upgrades, 0)
                       .toLocaleString(interaction.locale)}
@@ -339,14 +338,14 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
 
                 <div
                   style={{
-                    display: 'flex',
+                    display: "flex",
                     gap: 4,
-                    alignItems: 'center',
+                    alignItems: "center",
                   }}
                 >
                   <img
                     alt="Silver icon"
-                    src={await iconPng(asset('icons/currencies/silver.webp'))}
+                    src={await iconPng(asset("icons/currencies/silver.webp"))}
                     width={16}
                     height={16}
                   />
@@ -356,7 +355,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                       color: theme.colors.textHighContrast,
                     }}
                   >
-                    Purchase:{' '}
+                    Purchase:{" "}
                     {costs
                       .reduce((a, b) => a + b.purchase, 0)
                       .toLocaleString(interaction.locale)}
@@ -365,14 +364,14 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
 
                 <div
                   style={{
-                    display: 'flex',
+                    display: "flex",
                     gap: 4,
-                    alignItems: 'center',
+                    alignItems: "center",
                   }}
                 >
                   <img
                     alt="Silver icon"
-                    src={await iconPng(asset('icons/currencies/silver.webp'))}
+                    src={await iconPng(asset("icons/currencies/silver.webp"))}
                     width={16}
                     height={16}
                   />
@@ -382,7 +381,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                       color: theme.colors.textHighContrast,
                     }}
                   >
-                    Equipment:{' '}
+                    Equipment:{" "}
                     {costs
                       .reduce((a, b) => a + b.equipment, 0)
                       .toLocaleString(interaction.locale)}
@@ -399,7 +398,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                   <div
                     key={id}
                     style={{
-                      display: 'flex',
+                      display: "flex",
                       borderRadius: 4,
                       backgroundColor: theme.colors.appBackground2,
                       border: theme.borderStyles.subtle,
@@ -408,9 +407,9 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                     <div
                       style={{
                         width: 48,
-                        display: 'flex',
-                        alignItems: 'center',
-                        justifyContent: 'center',
+                        display: "flex",
+                        alignItems: "center",
+                        justifyContent: "center",
                       }}
                     >
                       <span
@@ -426,9 +425,9 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                     <div
                       style={{
                         flex: 1,
-                        display: 'flex',
-                        position: 'relative',
-                        right: '5%',
+                        display: "flex",
+                        position: "relative",
+                        right: "5%",
                       }}
                     >
                       <img
@@ -437,23 +436,23 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                         style={{
                           height: 100,
                           width: 100,
-                          objectFit: 'contain',
-                          position: 'absolute',
-                          left: '25%',
+                          objectFit: "contain",
+                          position: "absolute",
+                          left: "25%",
                           top: 0,
                         }}
                       />
 
                       <div
                         style={{
-                          display: 'flex',
+                          display: "flex",
                           gap: 4,
-                          alignItems: 'center',
-                          justifyContent: 'center',
-                          position: 'absolute',
+                          alignItems: "center",
+                          justifyContent: "center",
+                          position: "absolute",
                           bottom: 8,
-                          left: '50%',
-                          transform: 'translateX(-50%)',
+                          left: "50%",
+                          transform: "translateX(-50%)",
                         }}
                       >
                         <img
@@ -476,23 +475,23 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                     <div
                       style={{
                         flex: 1,
-                        display: 'flex',
-                        flexDirection: 'column',
-                        justifyContent: 'center',
+                        display: "flex",
+                        flexDirection: "column",
+                        justifyContent: "center",
                         gap: 8,
-                        padding: '16px 0',
+                        padding: "16px 0",
                       }}
                     >
                       <div
                         style={{
-                          display: 'flex',
+                          display: "flex",
                           gap: 4,
-                          alignItems: 'center',
+                          alignItems: "center",
                         }}
                       >
                         <img
                           alt="XP icon"
-                          src={await iconPng(asset('icons/currencies/xp.webp'))}
+                          src={await iconPng(asset("icons/currencies/xp.webp"))}
                           width={16}
                           height={16}
                         />
@@ -504,11 +503,11 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                         >
                           {literals(
                             strings.bot.commands.research.body.research,
-                            [
-                              `${costs[index].research?.toLocaleString(
-                                interaction.locale,
-                              )}`,
-                            ],
+                            {
+                              cost: costs[index].research?.toLocaleString(
+                                interaction.locale
+                              ),
+                            }
                           )}
                         </span>
                       </div>
@@ -516,15 +515,15 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                       {costs[index].upgrades > 0 && (
                         <div
                           style={{
-                            display: 'flex',
+                            display: "flex",
                             gap: 4,
-                            alignItems: 'center',
+                            alignItems: "center",
                           }}
                         >
                           <img
                             alt="Free XP icon"
                             src={await iconPng(
-                              asset('icons/currencies/free-xp.webp'),
+                              asset("icons/currencies/free-xp.webp")
                             )}
                             width={16}
                             height={16}
@@ -537,7 +536,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                           >
                             {literals(
                               strings.bot.commands.research.body.upgrades,
-                              [costs[index].upgrades.toLocaleString()],
+                              { cost: costs[index].upgrades.toLocaleString() }
                             )}
                           </span>
                         </div>
@@ -545,15 +544,15 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
 
                       <div
                         style={{
-                          display: 'flex',
+                          display: "flex",
                           gap: 4,
-                          alignItems: 'center',
+                          alignItems: "center",
                         }}
                       >
                         <img
                           alt="Silver icon"
                           src={await iconPng(
-                            asset('icons/currencies/silver.webp'),
+                            asset("icons/currencies/silver.webp")
                           )}
                           width={16}
                           height={16}
@@ -566,26 +565,26 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                         >
                           {literals(
                             strings.bot.commands.research.body.purchase,
-                            [
-                              costs[index].purchase.toLocaleString(
-                                interaction.locale,
+                            {
+                              cost: costs[index].purchase.toLocaleString(
+                                interaction.locale
                               ),
-                            ],
+                            }
                           )}
                         </span>
                       </div>
 
                       <div
                         style={{
-                          display: 'flex',
+                          display: "flex",
                           gap: 4,
-                          alignItems: 'center',
+                          alignItems: "center",
                         }}
                       >
                         <img
                           alt="Silver icon"
                           src={await iconPng(
-                            asset('icons/currencies/silver.webp'),
+                            asset("icons/currencies/silver.webp")
                           )}
                           width={16}
                           height={16}
@@ -598,18 +597,18 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                         >
                           {literals(
                             strings.bot.commands.research.body.equipment,
-                            [
-                              costs[index].equipment.toLocaleString(
-                                interaction.locale,
+                            {
+                              cost: costs[index].equipment.toLocaleString(
+                                interaction.locale
                               ),
-                            ],
+                            }
                           )}
                         </span>
                       </div>
                     </div>
                   </div>
                 );
-              }),
+              })
             )}
           </div>
         </CommandWrapper>
@@ -621,7 +620,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
     },
 
     autocomplete(interaction) {
-      autocompleteTanks(interaction, true, ['target-tank', 'starting-tank']);
+      autocompleteTanks(interaction, true, ["target-tank", "starting-tank"]);
     },
   });
 });

packages/bot/src/commands/searchClans.ts

@@ -1,23 +1,23 @@
-import { ClanList, fetchBlitz, Region } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import markdownEscape from 'markdown-escape';
-import { addClanChoices } from '../core/discord/addClanChoices';
-import { addRegionChoices } from '../core/discord/addRegionChoices';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { embedInfo } from '../core/discord/embedInfo';
-import { localizationObject } from '../core/discord/localizationObject';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+import { type ClanList, fetchBlitz, type Region } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import markdownEscape from "markdown-escape";
+import { addClanChoices } from "../core/discord/addClanChoices";
+import { addRegionChoices } from "../core/discord/addRegionChoices";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { embedInfo } from "../core/discord/embedInfo";
+import { localizationObject } from "../core/discord/localizationObject";
+import { translator } from "../core/localization/translator";
+import type { CommandRegistry } from "../events/interactionCreate";
 
 const DEFAULT_LIMIT = 25;
 
 export const searchClansCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
-    command: createLocalizedCommand('search-clans')
+    command: createLocalizedCommand("search-clans")
       .addStringOption(addRegionChoices)
       .addStringOption((option) =>
-        addClanChoices(option).setAutocomplete(false),
+        addClanChoices(option).setAutocomplete(false)
       )
       .addIntegerOption((option) => {
         const { strings } = translator(Locale.EnglishUS);
@@ -28,21 +28,21 @@ export const searchClansCommand = new Promise<CommandRegistry>((resolve) => {
             localizationObject(
               (strings) => strings.bot.commands.search_clans.options.limit.name,
               undefined,
-              true,
-            ),
+              true
+            )
           )
           .setDescription(
             literals(
               strings.bot.commands.search_clans.options.limit.description,
-              [`${DEFAULT_LIMIT}`],
-            ),
+              { limit: DEFAULT_LIMIT }
+            )
           )
           .setDescriptionLocalizations(
             localizationObject(
               (strings) =>
                 strings.bot.commands.search_clans.options.limit.description,
-              [`${DEFAULT_LIMIT}`],
-            ),
+              { limit: DEFAULT_LIMIT }
+            )
           )
           .setMinValue(1)
           .setMaxValue(100);
@@ -50,24 +50,24 @@ export const searchClansCommand = new Promise<CommandRegistry>((resolve) => {
 
     async handler(interaction) {
       const { strings } = translator(interaction.locale);
-      const region = interaction.options.getString('region') as Region;
-      const clan = interaction.options.getString('clan')!;
-      const limit = interaction.options.getInteger('limit') ?? DEFAULT_LIMIT;
-      const clanList = await fetchBlitz<ClanList>(region, 'clans/list', {
+      const region = interaction.options.getString("region") as Region;
+      const clan = interaction.options.getString("clan")!;
+      const limit = interaction.options.getInteger("limit") ?? DEFAULT_LIMIT;
+      const clanList = await fetchBlitz<ClanList>(region, "clans/list", {
         search: clan,
         limit,
       });
 
       return embedInfo(
-        literals(strings.bot.commands.search_clans.body.title, [
-          markdownEscape(clan),
-          strings.common.regions.normal[region],
-        ]),
+        literals(strings.bot.commands.search_clans.body.title, {
+          search: markdownEscape(clan),
+          region: strings.common.regions.normal[region],
+        }),
         clanList.length === 0
           ? strings.bot.commands.search_clans.body.no_results
           : `\`\`\`\n${clanList
               .map((clan) => `${clan.name} [${clan.tag}]`)
-              .join('\n')}\n\`\`\``,
+              .join("\n")}\n\`\`\``
       );
     },
   });

packages/bot/src/commands/searchPlayers.ts

@@ -1,19 +1,19 @@
 import {
-  AccountList,
+  type AccountList,
   fetchBlitz,
-  Region,
+  type Region,
   usernamePattern,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import markdownEscape from 'markdown-escape';
-import { addRegionChoices } from '../core/discord/addRegionChoices';
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { embedInfo } from '../core/discord/embedInfo';
-import { localizationObject } from '../core/discord/localizationObject';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+} from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import markdownEscape from "markdown-escape";
+import { addRegionChoices } from "../core/discord/addRegionChoices";
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { embedInfo } from "../core/discord/embedInfo";
+import { localizationObject } from "../core/discord/localizationObject";
+import { translator } from "../core/localization/translator";
+import type { CommandRegistry } from "../events/interactionCreate";
 
 const DEFAULT_LIMIT = 25;
 
@@ -21,10 +21,10 @@ export const searchPlayersCommand = new Promise<CommandRegistry>((resolve) => {
   const { strings } = translator(Locale.EnglishUS);
 
   resolve({
-    command: createLocalizedCommand('search-players')
+    command: createLocalizedCommand("search-players")
       .addStringOption(addRegionChoices)
       .addStringOption((option) =>
-        addUsernameChoices(option).setAutocomplete(false).setRequired(true),
+        addUsernameChoices(option).setAutocomplete(false).setRequired(true)
       )
       .addIntegerOption((option) =>
         option
@@ -34,49 +34,49 @@ export const searchPlayersCommand = new Promise<CommandRegistry>((resolve) => {
               (strings) =>
                 strings.bot.commands.search_players.options.limit.name,
               undefined,
-              true,
-            ),
+              true
+            )
           )
           .setDescription(
             literals(
               strings.bot.commands.search_players.options.limit.description,
-              [`${DEFAULT_LIMIT}`],
-            ),
+              { limit: DEFAULT_LIMIT }
+            )
           )
           .setDescriptionLocalizations(
             localizationObject(
               (strings) =>
                 strings.bot.commands.search_players.options.limit.description,
-              [`${DEFAULT_LIMIT}`],
-            ),
+              { limit: DEFAULT_LIMIT }
+            )
           )
           .setMinValue(1)
-          .setMaxValue(100),
+          .setMaxValue(100)
       ),
 
     async handler(interaction) {
       const { strings } = translator(interaction.locale);
-      const region = interaction.options.getString('region') as Region;
-      const name = interaction.options.getString('username')!;
-      const limit = interaction.options.getInteger('limit') ?? 25;
+      const region = interaction.options.getString("region") as Region;
+      const name = interaction.options.getString("username")!;
+      const limit = interaction.options.getInteger("limit") ?? 25;
       const trimmedSearch = name.trim();
       const players = usernamePattern.test(trimmedSearch)
-        ? await fetchBlitz<AccountList>(region, 'account/list', {
+        ? await fetchBlitz<AccountList>(region, "account/list", {
             search: trimmedSearch,
             limit,
           })
         : [];
 
       return embedInfo(
-        literals(strings.bot.commands.search_players.body.title, [
-          markdownEscape(trimmedSearch),
-          strings.common.regions.normal[region],
-        ]),
+        literals(strings.bot.commands.search_players.body.title, {
+          search: markdownEscape(trimmedSearch),
+          region: strings.common.regions.normal[region],
+        }),
         `\`\`\`${
           players.length === 0
             ? strings.bot.commands.search_players.body.no_results
-            : players.map((player) => player.nickname).join('\n')
-        }\`\`\``,
+            : players.map((player) => player.nickname).join("\n")
+        }\`\`\``
       );
     },
   });

packages/bot/src/commands/stats.tsx

@@ -1,50 +1,50 @@
-import { emblemURL, getAccountInfo, getClanAccountInfo } from '@blitzkit/core';
-import { Locale } from 'discord.js';
-import { AllStatsOverview } from '../components/AllStatsOverview';
-import { CommandWrapper } from '../components/CommandWrapper';
-import { NoData } from '../components/NoData';
-import { TitleBar } from '../components/TitleBar';
-import { filtersToDescription } from '../core/blitzkit/filtersToDescription';
-import { filterStats, StatFilters } from '../core/blitzstars/filterStats';
-import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
-import { getStatsInPeriod } from '../core/blitzstars/getStatsInPeriod';
-import { addPeriodicFilterOptions } from '../core/discord/addPeriodicFilterOptions';
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
-import { autocompleteTanks } from '../core/discord/autocompleteTanks';
-import { autocompleteUsername } from '../core/discord/autocompleteUsername';
-import { buttonRefresh } from '../core/discord/buttonRefresh';
-import { commandToURL } from '../core/discord/commandToURL';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
-import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
-import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
-import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton';
+import { emblemURL, getAccountInfo, getClanAccountInfo } from "@blitzkit/core";
+import { Locale } from "discord.js";
+import { AllStatsOverview } from "../components/AllStatsOverview";
+import { CommandWrapper } from "../components/CommandWrapper";
+import { NoData } from "../components/NoData";
+import { TitleBar } from "../components/TitleBar";
+import { filtersToDescription } from "../core/blitzkit/filtersToDescription";
+import { filterStats, type StatFilters } from "../core/blitzstars/filterStats";
+import { getBlitzStarsLinkButton } from "../core/blitzstars/getBlitzStarsLinkButton";
+import { getStatsInPeriod } from "../core/blitzstars/getStatsInPeriod";
+import { addPeriodicFilterOptions } from "../core/discord/addPeriodicFilterOptions";
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
+import { autocompleteTanks } from "../core/discord/autocompleteTanks";
+import { autocompleteUsername } from "../core/discord/autocompleteUsername";
+import { buttonRefresh } from "../core/discord/buttonRefresh";
+import { commandToURL } from "../core/discord/commandToURL";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { getCustomPeriodParams } from "../core/discord/getCustomPeriodParams";
+import { getFiltersFromButton } from "../core/discord/getFiltersFromButton";
+import { getFiltersFromCommand } from "../core/discord/getFiltersFromCommand";
+import { resolvePeriodFromButton } from "../core/discord/resolvePeriodFromButton";
 import {
-  ResolvedPeriod,
+  type ResolvedPeriod,
   resolvePeriodFromCommand,
-} from '../core/discord/resolvePeriodFromCommand';
-import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton';
+} from "../core/discord/resolvePeriodFromCommand";
+import { resolvePlayerFromButton } from "../core/discord/resolvePlayerFromButton";
 import {
-  ResolvedPlayer,
+  type ResolvedPlayer,
   resolvePlayerFromCommand,
-} from '../core/discord/resolvePlayerFromCommand';
-import { CommandRegistry } from '../events/interactionCreate';
+} from "../core/discord/resolvePlayerFromCommand";
+import type { CommandRegistry } from "../events/interactionCreate";
 
 async function render(
   { region, id }: ResolvedPlayer,
   { start, end, name }: ResolvedPeriod,
   filters: StatFilters,
-  locale: Locale,
+  locale: Locale
 ) {
   const { nickname } = await getAccountInfo(region, id);
-  const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+  const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan;
   const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
   const diffedTankStats = await getStatsInPeriod(
     region,
     id,
     start,
     end,
-    locale,
+    locale
   );
   const { stats, supplementary } = await filterStats(diffedTankStats, filters);
   const filterDescriptions = await filtersToDescription(filters, locale);
@@ -72,8 +72,8 @@ async function render(
 export const statsCommand = new Promise<CommandRegistry>(async (resolve) => {
   resolve({
     command: await addPeriodicFilterOptions(
-      createLocalizedCommand('stats'),
-      (option) => option.addStringOption(addUsernameChoices),
+      createLocalizedCommand("stats"),
+      (option) => option.addStringOption(addUsernameChoices)
     ),
 
     async handler(interaction) {

packages/bot/src/commands/today.ts

@@ -14,7 +14,7 @@ import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton
 import { resolvePeriodFromCommand } from '../core/discord/resolvePeriodFromCommand';
 import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton';
 import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
-import { CommandRegistry } from '../events/interactionCreate';
+import { type CommandRegistry } from '../events/interactionCreate';
 import { renderBreakdown } from './breakdown/render';
 
 export const todayCommand = new Promise<CommandRegistry>(async (resolve) => {

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

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

packages/bot/src/components/AllStatsOverview/index.tsx

@@ -1,7 +1,7 @@
 import {
   getWN8Percentile,
   Percentile,
-  SupplementaryStats,
+  type SupplementaryStats,
 } from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import { translator } from '../../core/localization/translator';

packages/bot/src/components/Breakdown/components/Root.tsx

@@ -1,4 +1,4 @@
-import { ReactNode } from 'react';
+import { type ReactNode } from "react";
 
 interface RootProps {
   children: ReactNode;
@@ -8,7 +8,7 @@ export function Root({ children }: RootProps) {
   return (
     <div
       className="session-tracker-root"
-      style={{ display: 'flex', flexDirection: 'column', gap: 8 }}
+      style={{ display: "flex", flexDirection: "column", gap: 8 }}
     >
       {children}
     </div>

packages/bot/src/components/Breakdown/components/Row.tsx

@@ -6,8 +6,8 @@ import {
 } from '@blitzkit/core';
 import { createColors } from 'bepaint';
 import {
-  AccentColor,
-  GrayColor,
+  type AccentColor,
+  type GrayColor,
   PALETTES,
 } from '../../../core/radix/radixColors';
 import { RowStat } from './RowStat';

packages/bot/src/components/Breakdown/components/RowStat.tsx

@@ -1,11 +1,11 @@
-import { Percentile } from '@blitzkit/core';
-import { createColors } from 'bepaint';
+import { Percentile } from "@blitzkit/core";
+import { createColors } from "bepaint";
 import {
-  AccentColor,
-  GrayColor,
+  type AccentColor,
+  type GrayColor,
   PALETTES,
-} from '../../../core/radix/radixColors';
-import { PercentileIndicator } from '../../PercentileIndicator';
+} from "../../../core/radix/radixColors";
+import { PercentileIndicator } from "../../PercentileIndicator";
 
 interface RowStatProps {
   name: string;
@@ -22,7 +22,7 @@ export function RowStat({
   delta,
   percentile,
   minimized = false,
-  color = 'slate',
+  color = "slate",
 }: RowStatProps) {
   const theme = createColors(PALETTES[`${color}Dark`]);
 
@@ -30,29 +30,29 @@ export function RowStat({
     <div
       className="session-tracker-row-stat"
       style={{
-        display: 'flex',
-        flexDirection: 'column',
+        display: "flex",
+        flexDirection: "column",
         gap: 4,
-        alignItems: 'center',
-        justifyContent: 'center',
+        alignItems: "center",
+        justifyContent: "center",
         flex: 1,
       }}
     >
       <div
         style={{
-          display: 'flex',
+          display: "flex",
           gap: 4,
-          alignItems: 'center',
-          justifyContent: 'center',
+          alignItems: "center",
+          justifyContent: "center",
         }}
       >
         {percentile === undefined && delta !== undefined && delta !== 0 && (
           <img
-            alt={delta > 0 ? 'Increase' : 'Decrease'}
+            alt={delta > 0 ? "Increase" : "Decrease"}
             src={
               (delta ?? 0) > 0
-                ? 'https://i.imgur.com/qbjiXa1.png'
-                : 'https://i.imgur.com/3uyNhun.png'
+                ? "https://i.imgur.com/qbjiXa1.png"
+                : "https://i.imgur.com/3uyNhun.png"
             }
             style={{ width: 12, height: 12 }}
           />
@@ -66,7 +66,7 @@ export function RowStat({
             color: theme.textHighContrast,
             fontWeight: 700,
             fontSize: 16,
-            textAlign: 'center',
+            textAlign: "center",
           }}
         >
           {value}
@@ -77,7 +77,7 @@ export function RowStat({
         <span
           style={{
             color: theme.textLowContrast,
-            textAlign: 'center',
+            textAlign: "center",
             fontSize: 12,
           }}
         >

packages/bot/src/components/CommandWrapper.tsx

@@ -1,5 +1,5 @@
-import { ReactNode } from 'react';
-import { theme } from '../stitches.config';
+import { type ReactNode } from "react";
+import { theme } from "../stitches.config";
 
 interface CommandWrapperProps {
   children: ReactNode;
@@ -10,14 +10,14 @@ export function CommandWrapper({ children, fat }: CommandWrapperProps) {
   return (
     <div
       style={{
-        display: 'flex',
-        flexDirection: 'column',
+        display: "flex",
+        flexDirection: "column",
         padding: `16px ${fat ? 0 : 16}px`,
         gap: 16,
-        width: '100%',
+        width: "100%",
         color: theme.colors.textHighContrast,
         backgroundColor: theme.colors.appBackground1,
-        position: 'relative',
+        position: "relative",
       }}
     >
       {children}

packages/bot/src/components/GenericAllStats/index.tsx

@@ -1,8 +1,8 @@
 import {
-  BlitzStats,
+  type BlitzStats,
   getWN8Percentile,
   isNumber,
-  SupplementaryStats,
+  type SupplementaryStats,
 } from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import { translator } from '../../core/localization/translator';

packages/bot/src/components/GenericStats/components/GenericStatsColumn.tsx

@@ -1,5 +1,5 @@
-import { GenericStat } from '..';
-import { GenericStatsRow } from './GenericStatsRow';
+import { type GenericStat } from "..";
+import { GenericStatsRow } from "./GenericStatsRow";
 
 interface GenericStatsColumnProps {
   stats: GenericStat[];
@@ -7,7 +7,7 @@ interface GenericStatsColumnProps {
 
 export function GenericStatsColumn({ stats }: GenericStatsColumnProps) {
   return (
-    <div style={{ flex: 1, display: 'flex', flexDirection: 'column', gap: 8 }}>
+    <div style={{ flex: 1, display: "flex", flexDirection: "column", gap: 8 }}>
       {stats.map((stat) => (
         <GenericStatsRow key={stat[0]} stat={stat} />
       ))}

packages/bot/src/components/GenericStats/components/GenericStatsRow.tsx

@@ -1,6 +1,6 @@
-import { GenericStat } from '..';
-import { theme } from '../../../stitches.config';
-import { PercentileIndicator } from '../../PercentileIndicator';
+import { type GenericStat } from "..";
+import { theme } from "../../../stitches.config";
+import { PercentileIndicator } from "../../PercentileIndicator";
 
 interface GenericStatsRowProps {
   stat: GenericStat;
@@ -10,18 +10,18 @@ export function GenericStatsRow({ stat }: GenericStatsRowProps) {
   return (
     <div
       style={{
-        display: 'flex',
-        justifyContent: 'space-between',
-        alignItems: 'center',
+        display: "flex",
+        justifyContent: "space-between",
+        alignItems: "center",
       }}
     >
       <span
         style={{
           color: theme.colors.textLowContrast,
           fontSize: 16,
-          whiteSpace: 'nowrap',
+          whiteSpace: "nowrap",
           maxWidth: 128,
-          overflow: 'hidden',
+          overflow: "hidden",
         }}
       >
         {stat[0]}
@@ -32,9 +32,9 @@ export function GenericStatsRow({ stat }: GenericStatsRowProps) {
           color: theme.colors.textHighContrast,
           fontWeight: 700,
           fontSize: 16,
-          display: 'flex',
-          alignItems: 'center',
-          justifyContent: 'center',
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "center",
           gap: 4,
         }}
       >

packages/bot/src/components/Graph/components/Margin/index.tsx

@@ -1,6 +1,6 @@
 import { times } from 'lodash-es';
 import { theme } from '../../../../stitches.config';
-import { MarginInputProps } from '../Root';
+import { type MarginInputProps } from '../Root';
 import { MarginOrientation } from './constants';
 
 interface MarginProps extends MarginInputProps {

packages/bot/src/components/Graph/components/Root/index.tsx

@@ -1,9 +1,9 @@
-import { times } from 'lodash-es';
-import { ReactNode } from 'react';
-import { theme } from '../../../../stitches.config';
-import { Margin } from '../Margin';
-import { MarginOrientation } from '../Margin/constants';
-import { GRAPH_HEIGHT, GRAPH_WIDTH } from './constants';
+import { times } from "lodash-es";
+import { type ReactNode } from "react";
+import { theme } from "../../../../stitches.config";
+import { Margin } from "../Margin";
+import { MarginOrientation } from "../Margin/constants";
+import { GRAPH_HEIGHT, GRAPH_WIDTH } from "./constants";
 
 export interface MarginInputProps {
   min: number;
@@ -32,12 +32,12 @@ export function Root({
   xTitle,
 }: RootProps) {
   return (
-    <div style={{ display: 'flex', flexDirection: 'column', gap: 16 }}>
+    <div style={{ display: "flex", flexDirection: "column", gap: 16 }}>
       <div
         style={{
           paddingLeft: 64,
-          display: 'flex',
-          justifyContent: 'space-between',
+          display: "flex",
+          justifyContent: "space-between",
         }}
       >
         <span style={{ fontSize: 16, color: theme.colors.textHighContrast }}>
@@ -48,7 +48,7 @@ export function Root({
         </span>
       </div>
 
-      <div style={{ display: 'flex', gap: 16 }}>
+      <div style={{ display: "flex", gap: 16 }}>
         {verticalMargin && (
           <Margin {...verticalMargin} verticalSeparations={separations} />
         )}
@@ -94,9 +94,9 @@ export function Root({
         <div
           style={{
             paddingLeft: 64,
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center',
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
           }}
         >
           <span style={{ fontSize: 16, color: theme.colors.textLowContrast }}>

packages/bot/src/components/Leaderboard/components/Item.tsx

@@ -1,7 +1,7 @@
-import { ComponentProps } from 'react';
-import { theme } from '../../../stitches.config';
+import { type ComponentProps } from "react";
+import { theme } from "../../../stitches.config";
 
-interface ItemProps extends ComponentProps<'div'> {
+interface ItemProps extends ComponentProps<"div"> {
   position: number;
   deltaPosition?: number;
   score?: number;
@@ -25,15 +25,15 @@ export function Item({
     <div
       {...props}
       style={{
-        cursor: 'pointer',
-        display: 'flex',
+        cursor: "pointer",
+        display: "flex",
         padding: 8,
         backgroundColor: highlight
           ? theme.colors.componentInteractive_blue
           : theme.colors.componentInteractive,
         borderRadius: 4,
-        alignItems: 'center',
-        justifyContent: 'center',
+        alignItems: "center",
+        justifyContent: "center",
         gap: 8,
       }}
     >
@@ -50,9 +50,9 @@ export function Item({
 
       <div
         style={{
-          display: 'flex',
-          alignItems: 'center',
-          justifyContent: 'center',
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "center",
           gap: 4,
         }}
       >
@@ -83,22 +83,22 @@ export function Item({
       {deltaPosition !== undefined && deltaPosition !== 0 && (
         <div
           style={{
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center',
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
             gap: 4,
           }}
         >
           <img
-            alt={deltaPosition > 0 ? 'Increase' : 'Decrease'}
+            alt={deltaPosition > 0 ? "Increase" : "Decrease"}
             style={{
               width: 8,
               height: 8,
             }}
             src={
               deltaPosition > 0
-                ? 'https://i.imgur.com/qbjiXa1.png'
-                : 'https://i.imgur.com/3uyNhun.png'
+                ? "https://i.imgur.com/qbjiXa1.png"
+                : "https://i.imgur.com/3uyNhun.png"
             }
           />
           <span
@@ -119,11 +119,11 @@ export function Item({
 
       <div
         style={{
-          display: 'flex',
+          display: "flex",
           gap: 4,
-          alignItems: 'center',
+          alignItems: "center",
           width: 96,
-          justifyContent: 'flex-end',
+          justifyContent: "flex-end",
         }}
       >
         {deltaScore !== 0 && deltaScore !== undefined && (
@@ -140,15 +140,15 @@ export function Item({
         )}
         {deltaScore !== 0 && deltaScore !== undefined && (
           <img
-            alt={deltaScore > 0 ? 'Increase' : 'Decrease'}
+            alt={deltaScore > 0 ? "Increase" : "Decrease"}
             style={{
               width: 8,
               height: 8,
             }}
             src={
               deltaScore > 0
-                ? 'https://i.imgur.com/qbjiXa1.png'
-                : 'https://i.imgur.com/3uyNhun.png'
+                ? "https://i.imgur.com/qbjiXa1.png"
+                : "https://i.imgur.com/3uyNhun.png"
             }
           />
         )}

packages/bot/src/components/Leaderboard/components/Root.tsx

@@ -1,4 +1,4 @@
-import { ReactNode } from 'react';
+import { type ReactNode } from 'react';
 
 interface RootProps {
   children: ReactNode;

packages/bot/src/components/Tanks/components/Column.tsx

@@ -1,4 +1,4 @@
-import { ReactNode } from 'react';
+import { type ReactNode } from 'react';
 
 interface ColumnProps {
   children: ReactNode;

packages/bot/src/components/Tanks/components/Root.tsx

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

packages/bot/src/components/Tanks/components/Row.tsx

@@ -1,4 +1,4 @@
-import { ReactNode } from 'react';
+import { type ReactNode } from "react";
 
 interface RowProps {
   children: ReactNode;
@@ -8,7 +8,7 @@ export function Row({ children }: RowProps) {
   return (
     <div
       style={{
-        display: 'flex',
+        display: "flex",
         gap: 8,
       }}
     >

packages/bot/src/components/TierWeights.tsx

@@ -1,5 +1,5 @@
-import { TierWeightsRecord } from '@blitzkit/core';
-import { theme } from '../stitches.config';
+import type { TierWeightsRecord } from "@blitzkit/core";
+import { theme } from "../stitches.config";
 
 interface TierWeightsProps {
   weights: TierWeightsRecord;
@@ -7,7 +7,7 @@ interface TierWeightsProps {
 
 export function TierWeights({ weights }: TierWeightsProps) {
   return (
-    <div style={{ display: 'flex', gap: 8 }}>
+    <div style={{ display: "flex", gap: 8 }}>
       {Object.entries(weights).map(([tier, weight]) => (
         <div
           key={tier}
@@ -15,11 +15,11 @@ export function TierWeights({ weights }: TierWeightsProps) {
             backgroundColor: theme.colors.appBackground1_light,
             flex: weight,
             color: theme.colors.textHighContrast_light,
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center',
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
             fontSize: 16,
-            overflow: 'hidden',
+            overflow: "hidden",
             borderRadius: 8,
             minWidth: 16,
           }}

packages/bot/src/core/blitz/resolveTankId.ts

@@ -1,33 +1,33 @@
-import { SEARCH_KEYS } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import { go } from 'fuzzysort';
-import markdownEscape from 'markdown-escape';
-import { tankDefinitions, tankNames } from '../blitzkit/nonBlockingPromises';
-import { UserError } from '../blitzkit/userError';
-import { tankNamesTechTreeOnly } from '../discord/autocompleteTanks';
-import { translator } from '../localization/translator';
+import { SEARCH_KEYS } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import { go } from "fuzzysort";
+import markdownEscape from "markdown-escape";
+import { tankDefinitions, tankNames } from "../blitzkit/nonBlockingPromises";
+import { UserError } from "../blitzkit/userError";
+import { tankNamesTechTreeOnly } from "../discord/autocompleteTanks";
+import { translator } from "../localization/translator";
 
 export async function resolveTankId(
   tank: string | number,
   locale: Locale,
-  techTreeOnly = false,
+  techTreeOnly = false
 ) {
   const { strings } = translator(locale);
-  const number = typeof tank === 'string' ? Number(tank) : tank;
+  const number = typeof tank === "string" ? Number(tank) : tank;
 
   if (Number.isNaN(number)) {
     const searchResult = go(
       `${tank}`,
       await (techTreeOnly ? tankNamesTechTreeOnly : tankNames),
-      { keys: SEARCH_KEYS, limit: 1 },
+      { keys: SEARCH_KEYS, limit: 1 }
     );
 
     if (searchResult.length === 0) {
       throw new UserError(
-        literals(strings.bot.common.errors.tank_name_not_found, [
-          markdownEscape(`${tank}`),
-        ]),
+        literals(strings.bot.common.errors.tank_name_not_found, {
+          search: markdownEscape(`${tank}`),
+        })
       );
     } else {
       return searchResult[0].obj.id;
@@ -39,7 +39,9 @@ export async function resolveTankId(
       return number;
     } else {
       throw new UserError(
-        literals(strings.bot.common.errors.tank_id_not_found, [`${number}`]),
+        literals(strings.bot.common.errors.tank_id_not_found, {
+          search: number,
+        })
       );
     }
   }

packages/bot/src/core/blitzkit/filtersToDescription.ts

@@ -1,12 +1,12 @@
-import { fetchTankDefinitions, TIER_ROMAN_NUMERALS } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import { StatFilters } from '../blitzstars/filterStats';
-import { translator } from '../localization/translator';
+import { fetchTankDefinitions, TIER_ROMAN_NUMERALS } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import { type StatFilters } from "../blitzstars/filterStats";
+import { translator } from "../localization/translator";
 
 export async function filtersToDescription(
   { nation, tier, type, class: tankClass, tank }: StatFilters,
-  locale: Locale,
+  locale: Locale
 ) {
   const { strings, bkLocale } = translator(locale);
   const awaitedTankDefinitions = await fetchTankDefinitions();
@@ -18,11 +18,13 @@ export async function filtersToDescription(
     info.push((strings.common.nations as Record<string, string>)[nation]);
   if (tier) {
     info.push(
-      literals(strings.bot.common.filters.tier, [TIER_ROMAN_NUMERALS[tier]]),
+      literals(strings.bot.common.filters.tier, {
+        tier: TIER_ROMAN_NUMERALS[tier],
+      })
     );
   }
   if (tankClass) info.push(strings.common.tank_class_short[tankClass]);
   if (type) info.push(strings.common.tree_type[type]);
 
-  return info.length === 0 ? strings.bot.common.filters.none : info.join(', ');
+  return info.length === 0 ? strings.bot.common.filters.none : info.join(", ");
 }

packages/bot/src/core/blitzkit/getPeriodStart.ts

@@ -1,5 +1,5 @@
-import { getTimeDaysAgo, Region } from '@blitzkit/core';
-import { PeriodSize } from '../discord/addPeriodSubCommands';
+import { getTimeDaysAgo, type Region } from '@blitzkit/core';
+import type { PeriodSize } from '../discord/addPeriodSubCommands';
 
 export function getPeriodStart(region: Region, period: PeriodSize) {
   if (period === 'career') return 0;

packages/bot/src/core/blitzkit/iconPng.ts

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

packages/bot/src/core/blitzkit/jsxToPng.ts

@@ -1,7 +1,7 @@
-import { jsxToSvg } from './jsxToSvg';
-import { svgToPng } from './svgToPng';
+import { jsxToSvg } from "./jsxToSvg";
+import { svgToPng } from "./svgToPng";
 
-export async function jsxToPng(jsx: JSX.Element) {
+export async function jsxToPng(jsx: React.JSX.Element) {
   const svg = await jsxToSvg(jsx);
   const png = svgToPng(svg);
 

packages/bot/src/core/blitzkit/jsxToPngThreaded.ts

@@ -1,10 +1,10 @@
-import { jsxToSvg } from './jsxToSvg';
-import { RenderConfiguration } from './renderConfiguration';
-import { svgToPngThreaded } from './svgToPngThreaded';
+import { jsxToSvg } from "./jsxToSvg";
+import { RenderConfiguration } from "./renderConfiguration";
+import { svgToPngThreaded } from "./svgToPngThreaded";
 
 export async function jsxToPngThreaded(
-  jsx: JSX.Element,
-  renderConfiguration: RenderConfiguration,
+  jsx: React.JSX.Element,
+  renderConfiguration: RenderConfiguration
 ) {
   const svg = await jsxToSvg(jsx, renderConfiguration);
   const png = await svgToPngThreaded(svg);

packages/bot/src/core/blitzkit/jsxToSvg/index.ts

@@ -1,9 +1,9 @@
-import { readFile } from 'fs/promises';
-import satori from 'satori';
-import { RenderConfiguration } from '../renderConfiguration';
-import robotoBlack from './Roboto-Black.ttf';
-import robotoBold from './Roboto-Bold.ttf';
-import roboto from './Roboto.ttf';
+import { readFile } from "fs/promises";
+import satori from "satori";
+import { RenderConfiguration } from "../renderConfiguration";
+import robotoBlack from "./Roboto-Black.ttf";
+import robotoBold from "./Roboto-Bold.ttf";
+import roboto from "./Roboto.ttf";
 
 const fontsPromise = [
   { file: roboto, weight: 400 as const },
@@ -11,12 +11,12 @@ const fontsPromise = [
   { file: robotoBlack, weight: 900 as const },
 ].map(async ({ file, weight }) => {
   const data = await readFile(`${__dirname}/${file}`);
-  return { name: 'Roboto', weight, data };
+  return { name: "Roboto", weight, data };
 });
 
 export async function jsxToSvg(
-  jsx: JSX.Element,
-  renderConfiguration = new RenderConfiguration(),
+  jsx: React.JSX.Element,
+  renderConfiguration = new RenderConfiguration()
 ) {
   const fonts = await Promise.all(fontsPromise);
   return await satori(jsx, { width: renderConfiguration.width, fonts });

packages/bot/src/core/blitzstars/filterStats.ts

@@ -1,10 +1,10 @@
-import { TankClass, TankType } from '@blitzkit/core';
-import { SupplementaryStats } from '@blitzkit/core/src/blitz/getAccountInfo';
-import { calculateWN8 } from '@blitzkit/core/src/statistics/calculateWN8';
-import { BlitzStats } from '@blitzkit/core/src/statistics/compositeStats';
-import { sumAllStats } from '@blitzkit/core/src/statistics/sumAllStats';
-import { tankDefinitions } from '../blitzkit/nonBlockingPromises';
-import { blitzStarsTankAverages } from './tankAverages';
+import { TankClass, TankType } from "@blitzkit/core";
+import type { SupplementaryStats } from "@blitzkit/core/src/blitz/getAccountInfo";
+import { calculateWN8 } from "@blitzkit/core/src/statistics/calculateWN8";
+import type { BlitzStats } from "@blitzkit/core/src/statistics/compositeStats";
+import { sumAllStats } from "@blitzkit/core/src/statistics/sumAllStats";
+import { tankDefinitions } from "../blitzkit/nonBlockingPromises";
+import { blitzStarsTankAverages } from "./tankAverages";
 
 export interface StatFilters {
   nation?: string;
@@ -16,7 +16,7 @@ export interface StatFilters {
 
 export async function filterStats(
   { diff, order }: DiffedTankStats,
-  filters: StatFilters,
+  filters: StatFilters
 ) {
   // tank, if provided, takes priority over all other filters
   if (filters.tank) filters = { tank: filters.tank };
@@ -45,14 +45,14 @@ export async function filterStats(
   const battlesOfTanksWithAverages = filteredOrder.reduce<number>(
     (accumulator, id) =>
       awaitedTankAverages[id] ? accumulator + diff[id].battles : accumulator,
-    0,
+    0
   );
   const battlesOfTanksWithTankDefinition = filteredOrder.reduce<number>(
     (accumulator, id) =>
       awaitedTankDefinitions.tanks[id]
         ? accumulator + diff[id].battles
         : accumulator,
-    0,
+    0
   );
   const supplementary = {
     WN8:
@@ -63,7 +63,7 @@ export async function filterStats(
               calculateWN8(awaitedTankAverages[id].all, diff[id]) *
                 diff[id].battles
             : accumulator,
-        0,
+        0
       ) / battlesOfTanksWithAverages,
     tier:
       filteredOrder.reduce<number>(
@@ -72,7 +72,7 @@ export async function filterStats(
             ? accumulator +
               awaitedTankDefinitions.tanks[id]!.tier * diff[id].battles
             : accumulator,
-        0,
+        0
       ) / battlesOfTanksWithTankDefinition,
   } satisfies SupplementaryStats;
 

packages/bot/src/core/blitzstars/getBlitzStarsLinkButton.ts

@@ -1,17 +1,17 @@
-import { getAccountInfo, Region } from '@blitzkit/core';
-import { buttonLink } from '../discord/buttonLink';
+import { getAccountInfo, type Region } from "@blitzkit/core";
+import { buttonLink } from "../discord/buttonLink";
 
 export async function getBlitzStarsLinkButton(
   region: Region,
   id: number,
-  tankId?: number,
+  tankId?: number
 ) {
   const { nickname } = await getAccountInfo(region, id);
 
   return buttonLink(
     `https://www.blitzstars.com/player/${region}/${nickname}${
-      tankId ? `/tank/${tankId!}` : ''
+      tankId ? `/tank/${tankId!}` : ""
     }`,
-    'BlitzStars',
+    "BlitzStars"
   );
 }

packages/bot/src/core/blitzstars/getPlayerHistories.ts

@@ -1,11 +1,11 @@
-import { Region, emptyAllStats, getAccountInfo } from '@blitzkit/core';
+import { type Region, emptyAllStats, getAccountInfo } from '@blitzkit/core';
 import {
-  GetHistoriesOptions,
-  Histories,
-  History,
+  type GetHistoriesOptions,
+  type Histories,
+  type History,
   getHistoriesDefaultOptions,
 } from '../../types/histories';
-import { PlayerStats } from './getPlayerStats';
+import type { PlayerStats } from './getPlayerStats';
 
 export async function getPlayerHistories(
   server: Region,

packages/bot/src/core/blitzstars/getPlayerStats.ts

@@ -1,4 +1,4 @@
-import { BlitzStats, Region } from '@blitzkit/core';
+import type { BlitzStats, Region } from "@blitzkit/core";
 
 interface IndividualPlayerStats {
   clan: { clan_id: number; name: string; tag: string };
@@ -25,13 +25,13 @@ export async function getPlayerStats<
   ReturnType = Ids extends number ? PlayerStats : PlayerStats[],
 >(region: Region, ids: Ids) {
   const stats = await Promise.all(
-    ((typeof ids === 'number' ? [ids] : ids) as number[]).map((id) =>
+    ((typeof ids === "number" ? [ids] : ids) as number[]).map((id) =>
       fetch(`https://www.blitzstars.com/api/playerstats/${id}`).then(
-        (response) => response.json() as Promise<PlayerStats>,
-      ),
-    ),
+        (response) => response.json() as Promise<PlayerStats>
+      )
+    )
   );
 
-  if (typeof ids === 'number') return stats[0] as ReturnType;
+  if (typeof ids === "number") return stats[0] as ReturnType;
   return stats as ReturnType;
 }

packages/bot/src/core/blitzstars/getStatsInPeriod.ts

@@ -1,11 +1,11 @@
-import { BlitzStats, emptyAllStats, Region } from '@blitzkit/core';
-import { Locale } from 'discord.js';
-import { DiffedTankStats } from './filterStats';
+import { type BlitzStats, emptyAllStats, type Region } from "@blitzkit/core";
+import { Locale } from "discord.js";
+import type { DiffedTankStats } from "./filterStats";
 import {
   getTankHistories,
-  TankHistories,
-  TankHistoryRaw,
-} from './getTankHistories';
+  type TankHistories,
+  type TankHistoryRaw,
+} from "./getTankHistories";
 
 const emptyTankHistoryNode: TankHistoryRaw = {
   account_id: 0,
@@ -22,7 +22,7 @@ export async function getStatsInPeriod(
   id: number,
   start: number,
   end: number,
-  locale: Locale,
+  locale: Locale
 ) {
   const history = await getTankHistories(server, id, locale, {
     includeLatestHistories: true,
@@ -43,8 +43,8 @@ export async function getStatsInPeriod(
   // find the ones played within the range
   const inRangeTanks = tanks.filter((tankId) =>
     tankSortedHistory[tankId].some(
-      (node) => node.last_battle_time > start && node.last_battle_time < end,
-    ),
+      (node) => node.last_battle_time > start && node.last_battle_time < end
+    )
   );
   const playedTanks: number[] = [];
 

packages/bot/src/core/blitzstars/getTankHistories.ts

@@ -1,13 +1,13 @@
-import { Region, emptyAllStats, getTankStats } from '@blitzkit/core';
-import { Locale } from 'discord.js';
+import { type Region, emptyAllStats, getTankStats } from "@blitzkit/core";
+import { Locale } from "discord.js";
 import {
-  GetHistoriesOptions,
-  Histories,
-  History,
+  type GetHistoriesOptions,
+  type Histories,
+  type History,
   getHistoriesDefaultOptions,
-} from '../../types/histories';
-import { UserError } from '../blitzkit/userError';
-import { translator } from '../localization/translator';
+} from "../../types/histories";
+import { UserError } from "../blitzkit/userError";
+import { translator } from "../localization/translator";
 
 export interface TankHistory extends History {
   tank_id: number;
@@ -36,12 +36,12 @@ export async function getTankHistories(
   server: Region,
   id: number,
   locale: Locale,
-  options?: Partial<GetTankHistoriesOptions>,
+  options?: Partial<GetTankHistoriesOptions>
 ) {
   const { strings } = translator(locale);
   const mergedOptions = { ...getTankHistoriesDefaultOptions, ...options };
   const tankHistoriesResponse = await fetch(
-    `https://www.blitzstars.com/api/tankhistories/for/${id}/`,
+    `https://www.blitzstars.com/api/tankhistories/for/${id}/`
   );
   const tankHistories = (
     (await tankHistoriesResponse.json()) as TankHistoriesRaw
@@ -51,7 +51,7 @@ export async function getTankHistories(
         all: history.all,
         last_battle_time: history.last_battle_time,
         tank_id: history.tank_id,
-      }) satisfies TankHistory,
+      }) satisfies TankHistory
   );
   const compliantTanks: number[] = [];
   const lastBattles: Record<number, number> = {};
@@ -73,7 +73,7 @@ export async function getTankHistories(
       lastBattles[tank_id] = battles;
 
       return complies;
-    },
+    }
   );
 
   const latestNodes: TankHistories = [];
@@ -112,7 +112,7 @@ export async function getTankHistories(
               all: emptyAllStats,
               last_battle_time: -Infinity,
               tank_id: tankId,
-            } satisfies TankHistory),
+            } satisfies TankHistory)
         );
       }
     });

packages/bot/src/core/discord/addFilterOptions.ts

@@ -4,7 +4,7 @@ import {
   TANK_TYPES,
 } from '@blitzkit/core';
 import {
-  APIApplicationCommandOptionChoice,
+  type APIApplicationCommandOptionChoice,
   Locale,
   SlashCommandBuilder,
   SlashCommandSubcommandBuilder,

packages/bot/src/core/discord/addRegionChoices.ts

@@ -1,11 +1,11 @@
-import { REGIONS } from '@blitzkit/core';
+import { REGIONS } from "@blitzkit/core";
 import {
-  APIApplicationCommandOptionChoice,
+  type APIApplicationCommandOptionChoice,
   Locale,
   SlashCommandStringOption,
-} from 'discord.js';
-import { translator } from '../localization/translator';
-import { localizationObject } from './localizationObject';
+} from "discord.js";
+import { translator } from "../localization/translator";
+import { localizationObject } from "./localizationObject";
 
 export function addRegionChoices(option: SlashCommandStringOption) {
   const { strings } = translator(Locale.EnglishUS);
@@ -16,14 +16,14 @@ export function addRegionChoices(option: SlashCommandStringOption) {
       localizationObject(
         (strings) => strings.bot.common.options.region.name,
         undefined,
-        true,
-      ),
+        true
+      )
     )
     .setDescription(strings.bot.common.options.region.description)
     .setDescriptionLocalizations(
       localizationObject(
-        (strings) => strings.bot.common.options.region.description,
-      ),
+        (strings) => strings.bot.common.options.region.description
+      )
     )
     .addChoices(
       ...REGIONS.map(
@@ -32,10 +32,10 @@ export function addRegionChoices(option: SlashCommandStringOption) {
             value: region,
             name: strings.common.regions.normal[region],
             name_localizations: localizationObject(
-              (strings) => strings.common.regions.normal[region],
+              (strings) => strings.common.regions.normal[region]
             ),
-          }) satisfies APIApplicationCommandOptionChoice,
-      ),
+          }) satisfies APIApplicationCommandOptionChoice
+      )
     )
     .setRequired(true);
 }

packages/bot/src/core/discord/addTierChoices.ts

@@ -1,13 +1,13 @@
-import { numberToRomanNumeral } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
+import { numberToRomanNumeral } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
 import {
   APIApplicationCommandOptionChoice,
   Locale,
   SlashCommandStringOption,
-} from 'discord.js';
-import { range } from 'lodash-es';
-import { translator } from '../localization/translator';
-import { localizationObject } from './localizationObject';
+} from "discord.js";
+import { range } from "lodash-es";
+import { translator } from "../localization/translator";
+import { localizationObject } from "./localizationObject";
 
 export function addTierChoices(option: SlashCommandStringOption) {
   const { strings } = translator(Locale.EnglishUS);
@@ -18,30 +18,30 @@ export function addTierChoices(option: SlashCommandStringOption) {
       localizationObject(
         (strings) => strings.bot.common.options.tier.name,
         undefined,
-        true,
-      ),
+        true
+      )
     )
     .setDescription(strings.bot.common.options.tier.description)
     .setDescriptionLocalizations(
       localizationObject(
-        (strings) => strings.bot.common.options.tier.description,
-      ),
+        (strings) => strings.bot.common.options.tier.description
+      )
     )
     .setChoices(
       ...range(10, 0).map(
         (tier) =>
           ({
-            name: literals(strings.bot.common.options.tier.choices.tier, [
-              `${tier}`,
-              numberToRomanNumeral(tier),
-            ]),
+            name: literals(strings.bot.common.options.tier.choices.tier, {
+              tier_1: tier,
+              tier_2: numberToRomanNumeral(tier),
+            }),
             value: `${tier}`,
             name_localizations: localizationObject(
               (strings) => strings.bot.common.options.tier.choices.tier,
-              [`${tier}`, numberToRomanNumeral(tier)],
+              { tier_1: tier, tier_2: numberToRomanNumeral(tier) }
             ),
-          }) satisfies APIApplicationCommandOptionChoice,
-      ),
+          }) satisfies APIApplicationCommandOptionChoice
+      )
     )
     .setRequired(true);
 }

packages/bot/src/core/discord/autocompleteTanks.ts

@@ -1,25 +1,25 @@
-import { fetchTankNames, SEARCH_KEYS, TankType } from '@blitzkit/core';
+import { fetchTankNames, SEARCH_KEYS, TankType } from "@blitzkit/core";
 import {
-  ApplicationCommandOptionChoiceData,
+  type ApplicationCommandOptionChoiceData,
   AutocompleteInteraction,
-  CacheType,
-} from 'discord.js';
-import { go } from 'fuzzysort';
-import { tankNames } from '../blitzkit/nonBlockingPromises';
-import { translator } from '../localization/translator';
+  type CacheType,
+} from "discord.js";
+import { go } from "fuzzysort";
+import { tankNames } from "../blitzkit/nonBlockingPromises";
+import { translator } from "../localization/translator";
 import {
   DISCORD_CHOICES_MAX_NAME_SIZE,
   OVERFLOW_SUFFIX,
-} from './autocompleteClan/constants';
+} from "./autocompleteClan/constants";
 
 export const tankNamesTechTreeOnly = fetchTankNames().then((names) =>
-  names.filter((tank) => tank.treeType === TankType.RESEARCHABLE),
+  names.filter((tank) => tank.treeType === TankType.RESEARCHABLE)
 );
 
 export async function autocompleteTanks(
   interaction: AutocompleteInteraction<CacheType>,
   techTreeOnly = false,
-  fields = ['tank'],
+  fields = ["tank"]
 ) {
   const { unwrap } = translator(interaction.locale);
   const focusedOption = interaction.options.getFocused(true);
@@ -31,7 +31,7 @@ export async function autocompleteTanks(
           go(
             focusedOption.value,
             await (techTreeOnly ? tankNamesTechTreeOnly : tankNames),
-            { keys: SEARCH_KEYS, limit: 10 },
+            { keys: SEARCH_KEYS, limit: 10 }
           ).map(async (item) => {
             let name = unwrap(item.obj.searchableName);
 
@@ -42,7 +42,7 @@ export async function autocompleteTanks(
                 0,
                 unwrap(item.obj.searchableName).length -
                   overSize -
-                  OVERFLOW_SUFFIX.length,
+                  OVERFLOW_SUFFIX.length
               )}${OVERFLOW_SUFFIX}`;
             }
 
@@ -50,8 +50,8 @@ export async function autocompleteTanks(
               name,
               value: `${item.obj.id}`,
             } satisfies ApplicationCommandOptionChoiceData<string>;
-          }),
+          })
         )
-      : [],
+      : []
   );
 }

packages/bot/src/core/discord/buttonLink.ts

@@ -1,13 +1,13 @@
 import {
   ButtonBuilder,
   ButtonStyle,
-  ComponentEmojiResolvable,
-} from 'discord.js';
+  type ComponentEmojiResolvable,
+} from "discord.js";
 
 export function buttonLink(
   url: string,
   label: string,
-  emoji?: ComponentEmojiResolvable,
+  emoji?: ComponentEmojiResolvable
 ) {
   const button = new ButtonBuilder()
     .setStyle(ButtonStyle.Link)