Merge pull request #52 from tresabhi/1.15.5

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

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

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

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

.github/workflows/cd-docs.yml

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

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

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

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

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

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

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

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

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

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

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

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

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

.github/workflows/ci-version.yml

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

.vscode/settings.json

@@ -13,9 +13,12 @@
     "Everytime",
     "fullstats",
     "fuzzysort",
+    "immer",
     "kranvagn",
+    "krieg",
     "Leaderboard",
     "leaderboards",
+    "MURICA",
     "Oopsy",
     "outdir",
     "outfile",

docs/.vitepress/config.ts

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

docs/changelogs/1.15.1.md

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

docs/changelogs/1.15.2.md

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

docs/changelogs/1.15.3.md

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

docs/changelogs/1.15.4.md

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

docs/changelogs/1.15.5.md

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

docs/guide/creators.md

@@ -0,0 +1,6 @@
+# Creators
+
+- TrèsAbhi `@tresabhi`
+  - Creator & main programmer; _I do it all!_
+- Prince_NA `@prince_na`
+  - Advisor & tester

docs/guide/install.md

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

docs/guide/introduction.md

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

docs/index.md

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzkrieg",
-  "version": "1.15.0",
+  "version": "1.15.5",
   "description": "🎉 Tools for everything World of Tanks Blitz",
   "main": "src/server.ts",
   "type": "module",
@@ -21,6 +21,7 @@
     "lint": "npx tsc",
     "lint:website": "next lint",
     "format": "prettier --write \"**/*.@(json|js|jsx|css|md|ts|tsx|html|xml|yml|gltf)\"",
+    "lint:version": "vite-node --script scripts/checkVersionMissMatch",
     "knip": "knip",
     "update": "yarn upgrade --latest"
   },

scripts/buildRatingsLeaderboard.ts

@@ -6,7 +6,7 @@ import {
   RatingsNeighbors,
   RatingsPlayer,
 } from '../src/commands/ratings';
-import { patientFetch } from '../src/core/blitzkrieg/patientFetch';
+import { patientFetchJSON } from '../src/core/blitzkrieg/patientFetchJSON';
 import commitMultipleFiles from './commitMultipleFiles.js';
 
 /*
@@ -23,17 +23,18 @@ export type BlitzkriegRatingsLeaderboardEntry = { id: number; score: number };
 export type BlitzkriegRatingsLeaderboard = BlitzkriegRatingsLeaderboardEntry[];
 
 const publish = argv.includes('--publish');
-const latest = argv.includes('--latest');
+const target = argv
+  .find((arg) => arg.startsWith('--target='))
+  ?.split('=')[1] as 'midnight' | 'latest' | undefined;
 const server = argv.find((arg) => arg.startsWith('--region='))?.split('=')[1];
 
+if (!target) throw new Error('Target parameter not specified');
 if (!server) throw new Error('Region parameter not specified');
 
-const NEIGHBORS = 1024;
+const NEIGHBORS = 2 ** 8;
-const PLAYERS = await patientFetch(
+const PLAYERS = await patientFetchJSON<RatingsInfo>(
   `https://${server}.wotblitz.com/en/api/rating-leaderboards/season/`,
-)
+).then((data) => (data.detail === undefined ? data.count : undefined));
-  .then((response) => response.json() as Promise<RatingsInfo>)
-  .then((data) => (data.detail === undefined ? data.count : undefined));
 
 if (PLAYERS === undefined) {
   throw new Error('No current ratings season running');
@@ -44,9 +45,9 @@ const leaderboard: BlitzkriegRatingsLeaderboard = [];
 let registered = 0;
 
 async function branchFromPlayer(id: number) {
-  const { neighbors } = await patientFetch(
+  const { neighbors } = await patientFetchJSON<RatingsNeighbors>(
     `https://${server}.wotblitz.com/en/api/rating-leaderboards/user/${id}/?neighbors=${NEIGHBORS}`,
-  ).then((response) => response.json() as Promise<RatingsNeighbors>);
+  );
 
   const firstPlayer = neighbors[0];
   const lastPlayer = neighbors[neighbors.length - 1];
@@ -75,9 +76,9 @@ async function branchFromPlayer(id: number) {
 }
 
 async function branchFromLeague(id: number) {
-  const { result } = await patientFetch(
+  const { result } = await patientFetchJSON<{ result: RatingsPlayer[] }>(
     `https://${server}.wotblitz.com/en/api/rating-leaderboards/league/${id}/top/`,
-  ).then((response) => response.json() as Promise<{ result: RatingsPlayer[] }>);
+  );
 
   const firstPlayer = result[0];
   const lastPlayer = result[result.length - 1];
@@ -100,7 +101,10 @@ await Promise.all([
 console.log('Converting to an array...');
 for (let index = 0; index < PLAYERS; index++) {
   const listing = players[index + 1];
-  if (!listing) console.warn(`Position ${index + 1} had no player`);
+  if (!listing) {
+    console.warn(`Position ${index + 1} had no player`);
+    continue;
+  }
 
   leaderboard[index] = {
     id: listing.spa_id,
@@ -112,26 +116,19 @@ const leaderboardJSON = JSON.stringify(leaderboard);
 
 if (publish) {
   const octokit = new Octokit({ auth: env.GH_TOKEN });
-
+  const info = await patientFetchJSON<RatingsInfo & { detail: undefined }>(
-  const info = await patientFetch(
     `https://${server}.wotblitz.com/en/api/rating-leaderboards/season/`,
-  ).then(
-    (response) =>
-      response.json() as Promise<RatingsInfo & { detail: undefined }>,
   );
   const normalizedServer = server === 'na' ? 'com' : server;
-
+  const infoPath = `regions/${normalizedServer}/ratings/${info.current_season}/info.json`;
-  const infoPath = `${normalizedServer}/ratings/${info.current_season}/info.json`;
+  const leaderboardPath = `regions/${normalizedServer}/ratings/${info.current_season}/${target}.json`;
-  const leaderboardPath = `${normalizedServer}/ratings/${info.current_season}/${
-    latest ? 'latest' : 'midnight'
-  }.json`;
   const infoJSON = JSON.stringify(info);
 
   console.log(`Publishing to season ${info.current_season}...`);
   commitMultipleFiles(
     octokit,
     'tresabhi',
-    'blitzkrieg-db',
+    'blitzkrieg-assets',
     'main',
     new Date().toString(),
     [

scripts/checkVersionMissMatch.ts

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

src/app/tools/ratings/page.tsx

@@ -137,15 +137,12 @@ export default function Page() {
           await Promise.all(
             range(0, 5).map(async (league: number) => {
               const data = await getRatingsLeague(region, league);
-              leaguePositionCache.current[region][league] =
+              leaguePositionCache.current[region][league] = data[0].number - 1;
-                data.result[0].number - 1;
 
               return data;
             }),
           )
-        )
+        ).flat();
-          .map(({ result }) => result)
-          .flat();
 
         useLeaderboardCache.setState(
           produce((draft: LeaderboardCache) => {
@@ -302,19 +299,12 @@ export default function Page() {
       }
     }
 
-    const seedingPlayerNeighborEntry = Object.entries(
-      leaderboard[region][season],
-    ).find(([, player]) => id === player);
-
-    if (seedingPlayerNeighborEntry === undefined) return null;
-
-    const seedingPlayerPosition = parseInt(seedingPlayerNeighborEntry[0]);
     const { neighbors } = await getRatingsNeighbors(region, id, size, true);
 
     useLeaderboardCache.setState(
       produce((draft: LeaderboardCache) => {
         neighbors.forEach((neighbor, neighborIndex) => {
-          const position = neighborIndex - radius + seedingPlayerPosition;
+          const position = neighbor.number - 1;
 
           if (!(position in draft[region][season])) {
             draft[region][season][position] = neighbor.spa_id;
@@ -349,9 +339,9 @@ export default function Page() {
   async function jumpToPosition(position: number) {
     if (!ratingsInfo || ratingsInfo?.detail) return;
 
-    const targetPosition = Math.max(
+    const targetPosition = Math.min(
-      0,
+      ratingsInfo.count - 1,
-      Math.min(position, ratingsInfo.count - 1),
+      Math.max(0, Math.min(position, ratingsInfo.count - 1)),
     );
 
     if (season === 0) {

src/commands/about.ts

@@ -11,6 +11,7 @@ const DOCS = {
   introduction: 'guide/introduction',
   invite: 'guide/invite',
   timezones: 'guide/timezones',
+  creators: 'guide/creators',
 };
 const DOC_DESCRIPTIONS: Record<keyof typeof DOCS, string> = {
   permissions: 'The permissions needed for the bot to function',
@@ -18,6 +19,7 @@ const DOC_DESCRIPTIONS: Record<keyof typeof DOCS, string> = {
   introduction: 'About the bot',
   invite: 'How to invite the bot',
   timezones: 'How Blitzkrieg infers and uses your timezone',
+  creators: 'Who created the bot',
 };
 
 function addDocsSubcommands(option: SlashCommandSubcommandsOnlyBuilder) {

src/commands/credits.ts

@@ -1,15 +0,0 @@
-import { AttachmentBuilder, SlashCommandBuilder } from 'discord.js';
-import { CommandRegistry } from '../events/interactionCreate';
-
-export const creditsCommand: CommandRegistry = {
-  inProduction: true,
-  inPublic: true,
-
-  command: new SlashCommandBuilder()
-    .setName('credits')
-    .setDescription('Me and the people who made this bot'),
-
-  async handler() {
-    return new AttachmentBuilder('https://i.imgur.com/ZF5ch33.png');
-  },
-};

src/commands/debug.ts

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

src/commands/ratings.tsx

@@ -15,6 +15,8 @@ import { REGION_NAMES_SHORT, Region } from '../constants/regions';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
 import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
 import getRatingsInfo from '../core/blitz/getRatingsInfo';
+import { getRatingsLeague } from '../core/blitz/getRatingsLeague';
+import { getRatingsNeighbors } from '../core/blitz/getRatingsNeighbors';
 import regionToRegionSubdomain from '../core/blitz/regionToRegionSubdomain';
 import { getArchivedLatestSeasonNumber } from '../core/blitzkrieg/getArchivedLatestSeasonNumber';
 import getArchivedRatingsInfo from '../core/blitzkrieg/getArchivedRatingsInfo';
@@ -123,14 +125,14 @@ function addSubcommands(
     .addSubcommand((option) =>
       addOptions(
         option
-          .setName('neighbours')
+          .setName('neighbors')
-          .setDescription('Your position and neighbours'),
+          .setDescription('Your position and neighbors'),
       )
         .addStringOption(addUsernameChoices)
         .addIntegerOption((option) =>
           option
             .setName('limit')
-            .setDescription('How many neighbours to display (default: 10)')
+            .setDescription('How many neighbors to display (default: 10)')
             .setRequired(false)
             .setMinValue(5)
             .setMaxValue(30),
@@ -228,7 +230,7 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
           | 'current';
         const subcommand = interaction.options.getSubcommand(true) as
           | 'league'
-          | 'neighbours';
+          | 'neighbors';
         const limit = interaction.options.getInteger('limit') ?? 10;
         const seasonOption = interaction.options.getString('season');
         const season = seasonOption ? parseInt(seasonOption) : undefined;
@@ -257,11 +259,8 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
           const regionSubdomain = regionToRegionSubdomain(region);
           const result =
             subcommandGroup === 'current'
-              ? await fetch(
+              ? await getRatingsLeague(region, leagueIndex).then(
-                  `https://${regionSubdomain}.wotblitz.com/en/api/rating-leaderboards/league/${leagueIndex}/top/`,
+                  async (result) =>
-                )
-                  .then((response) => response.json() as Promise<LeagueTop>)
-                  .then(async ({ result }) =>
                     result.slice(0, limit).map(
                       (player) =>
                         ({
@@ -272,7 +271,7 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
                           nickname: player.nickname,
                         }) satisfies SimplifiedPlayer,
                     ),
-                  )
+                )
               : await getArchivedRatingsLeaderboard(region, season!).then(
                   async (players) => {
                     const firstPlayerIndex =
@@ -338,29 +337,24 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
 
           const accountInfo = await getAccountInfo(region, id);
           const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
-          const regionSubdomain = regionToRegionSubdomain(region);
           const neighbors =
             subcommandGroup === 'current'
-              ? await fetch(
+              ? await getRatingsNeighbors(
-                  `https://${regionSubdomain}.wotblitz.com/en/api/rating-leaderboards/user/${id}/?neighbors=${Math.round(
+                  region,
-                    limit / 2,
+                  id,
-                  )}`,
+                  Math.round(limit / 2),
+                ).then((players) =>
+                  players.neighbors.map(
+                    (player) =>
+                      ({
+                        id: player.spa_id,
+                        position: player.number,
+                        score: player.score,
+                        clan: player.clan_tag,
+                        nickname: player.nickname,
+                      }) satisfies SimplifiedPlayer,
+                  ),
                 )
-                  .then(
-                    (response) => response.json() as Promise<RatingsNeighbors>,
-                  )
-                  .then((players) =>
-                    players.neighbors.map(
-                      (player) =>
-                        ({
-                          id: player.spa_id,
-                          position: player.number,
-                          score: player.score,
-                          clan: player.clan_tag,
-                          nickname: player.nickname,
-                        }) satisfies SimplifiedPlayer,
-                    ),
-                  )
               : await getArchivedRatingsLeaderboard(region, season!).then(
                   async (players) => {
                     const playerIndex = players.findIndex(
@@ -414,7 +408,7 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
           titleName = neighbors
             ? accountInfo.nickname
             : `No Ongoing Season - ${REGION_NAMES_SHORT[region]}`;
-          titleDescription = 'Ratings neighbours';
+          titleDescription = 'Ratings neighbors';
           playersBefore = neighbors ? neighbors[0].position - 1 : 0;
           playersAfter =
             regionRatingsInfo.count - neighbors[neighbors.length - 1].position;

src/core/blitz/getRatingsLeague.ts

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

src/core/blitz/getRatingsNeighbors.ts

@@ -10,9 +10,10 @@ export async function getRatingsNeighbors(
   count: number,
   usePatientFetcher = false,
 ) {
-  const fetcher = usePatientFetcher
+  const fetcher = (url: string) =>
-    ? patientFetch
+    usePatientFetcher
-    : (url: string) => fetch(url, { cache: 'no-store' });
+      ? patientFetch(url, undefined, { cache: 'no-store' })
+      : fetch(url, { cache: 'no-store' });
   const response = await fetcher(
     withCORSProxy(
       `https://${regionToRegionSubdomain(

src/core/blitzkrieg/getArchivedLatestSeasonNumber.ts

@@ -8,7 +8,7 @@ export async function getArchivedLatestSeasonNumber() {
   if (ratingsInfo.detail) {
     const comURL = (
       (await fetch(
-        'https://api.github.com/repos/tresabhi/blitzkrieg-db/git/trees/main',
+        'https://api.github.com/repos/tresabhi/blitzkrieg-assets/git/trees/main',
       ).then((response) => response.json())) as {
         tree: { path: string; url: string }[];
       }

src/core/blitzkrieg/getArchivedRatingsInfo.ts

@@ -24,7 +24,7 @@ export default async function getArchivedRatingsInfo(
   }
 
   const response = await fetch(
-    `https://raw.githubusercontent.com/tresabhi/blitzkrieg-db/main/${region}/ratings/${season}/info.json`,
+    `https://raw.githubusercontent.com/tresabhi/blitzkrieg-assets/main/${region}/ratings/${season}/info.json`,
   );
   const jsonContent = (await response.json()) as RatingsInfo & {
     detail: undefined;

src/core/blitzkrieg/getArchivedRatingsLeaderboard.ts

@@ -19,7 +19,7 @@ export async function getArchivedRatingsLeaderboard(
   }
 
   const response = await fetch(
-    `https://raw.githubusercontent.com/tresabhi/blitzkrieg-db/main/${region}/ratings/${season}/latest.json`,
+    `https://raw.githubusercontent.com/tresabhi/blitzkrieg-assets/main/${region}/ratings/${season}/latest.json`,
   );
   const json = (await response.json()) as BlitzkriegRatingsLeaderboard;
   LEADERBOARD_CACHE[region][season] = json;

src/core/blitzkrieg/getArchivedRatingsMidnightLeaderboard.ts

@@ -1,7 +1,7 @@
 import { BlitzkriegRatingsLeaderboard } from '../../../scripts/buildRatingsLeaderboard';
 import { Region } from '../../constants/regions';
 
-export const DATABASE_REPO = { owner: 'tresabhi', repo: 'blitzkrieg-db' };
+export const DATABASE_REPO = { owner: 'tresabhi', repo: 'blitzkrieg-assets' };
 
 const MIDNIGHT_LEADERBOARD_CACHE: Record<
   Region,
@@ -22,7 +22,7 @@ export default async function getArchivedRatingsMidnightLeaderboard(
 
   try {
     const response = await fetch(
-      `https://raw.githubusercontent.com/tresabhi/blitzkrieg-db/main/${region}/ratings/${season}/midnight.json`,
+      `https://raw.githubusercontent.com/tresabhi/blitzkrieg-assets/main/${region}/ratings/${season}/midnight.json`,
     );
     const json = (await response.json()) as BlitzkriegRatingsLeaderboard;
     MIDNIGHT_LEADERBOARD_CACHE[region][season] = json;

src/core/blitzkrieg/patientFetchJSON.ts

@@ -0,0 +1,23 @@
+export async function patientFetchJSON<Type extends object>(
+  url: string,
+  timeout = 1000,
+  options?: Partial<{ cache: 'no-store' }>,
+) {
+  let patientJSON: Type;
+
+  while (patientJSON! === undefined) {
+    try {
+      patientJSON = (await fetch(url, options).then((response) =>
+        response.json(),
+      )) as Type;
+    } catch (error) {
+      console.warn(
+        `Failed to fetch ${url} as JSON; retrying in ${timeout}ms...`,
+        error,
+      );
+      await new Promise((resolve) => setTimeout(resolve, timeout));
+    }
+  }
+
+  return patientJSON;
+}

src/core/discord/client.ts

@@ -1,10 +1,11 @@
 import { Client, GatewayIntentBits } from 'discord.js';
 import guildMemberAdd from '../../events/guildMemberAdd';
 import interactionCreate from '../../events/interactionCreate';
+import ready from '../../events/ready';
 
 export const client = new Client({
   intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMembers],
 })
-  // .on('ready', ready)
+  .on('ready', ready)
   .on('guildMemberAdd', guildMemberAdd)
   .on('interactionCreate', interactionCreate);

src/events/interactionCreate/index.ts

@@ -16,7 +16,6 @@ import {
 import discord from '../../../discord.json' assert { type: 'json' };
 import { aboutCommand } from '../../commands/about';
 import { breakdownCommand } from '../../commands/breakdown';
-import { creditsCommand } from '../../commands/credits';
 import { debugCommand } from '../../commands/debug';
 import { eligibleCommand } from '../../commands/eligible';
 import { evolutionCommand } from '../../commands/evolution';
@@ -102,7 +101,6 @@ export const COMMANDS_RAW: CommandRegistry[] = [
   evolutionCommand,
   statsCommand,
   ratingsCommand,
-  creditsCommand,
 ];
 
 export const commands = Promise.all(COMMANDS_RAW).then((rawCommands) =>

src/events/ready.ts

@@ -1,5 +1,29 @@
-import { Client } from 'discord.js';
+import { ActivityType, Client } from 'discord.js';
 
 export default function ready(client: Client<true>) {
-  console.log(`🟢 Launched bot ${client.shard?.ids[0]}`);
+  console.log(`🟢 Launched bot ${client.shard?.ids[0] ?? 'default'}`);
+
+  const activities: (() => string)[] = [
+    () => `Living in ${client.guilds.cache.size.toLocaleString()} servers`,
+    () =>
+      `Serving ${client.guilds.cache
+        .reduce((accumulator, guild) => accumulator + guild.memberCount, 0)
+        .toLocaleString()} users`,
+    () =>
+      `Observing ${client.guilds.cache
+        .reduce(
+          (accumulator, guild) => accumulator + guild.channels.cache.size,
+          0,
+        )
+        .toLocaleString()} channels`,
+  ];
+
+  client.user.setPresence({
+    activities: [
+      {
+        type: ActivityType.Custom,
+        name: activities[Math.floor(Math.random() * activities.length)](),
+      },
+    ],
+  });
 }