Merge pull request #52 from tresabhi/1.15.5

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

@@ -1,4 +1,4 @@
-name: CD Asia Ratings
+name: CD Ratings Asia
 
 # latest: '0 0 * * *'
 # asia midnight: '0 17 * * *'

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

@@ -1,4 +1,4 @@
-name: CD Europe Ratings
+name: CD Ratings Europe
 
 # latest: '0 0 * * *'
 # eu midnight: '0 23 * * *'

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

@@ -1,4 +1,4 @@
-name: CD North America Ratings
+name: CD Ratings North America
 
 # latest: '0 0 * * *'
 # na midnight: '0 5 * * *'

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzkrieg",
-  "version": "1.15.3",
+  "version": "1.15.5",
   "description": "🎉 Tools for everything World of Tanks Blitz",
   "main": "src/server.ts",
   "type": "module",

scripts/buildRatingsLeaderboard.ts

@@ -101,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,
@@ -113,21 +116,19 @@ const leaderboardJSON = JSON.stringify(leaderboard);
 
 if (publish) {
   const octokit = new Octokit({ auth: env.GH_TOKEN });
-
   const info = await patientFetchJSON<RatingsInfo & { detail: undefined }>(
     `https://${server}.wotblitz.com/en/api/rating-leaderboards/season/`,
   );
   const normalizedServer = server === 'na' ? 'com' : server;
-
-  const infoPath = `${normalizedServer}/ratings/${info.current_season}/info.json`;
-  const leaderboardPath = `${normalizedServer}/ratings/${info.current_season}/${target}.json`;
+  const infoPath = `regions/${normalizedServer}/ratings/${info.current_season}/info.json`;
+  const leaderboardPath = `regions/${normalizedServer}/ratings/${info.current_season}/${target}.json`;
   const infoJSON = JSON.stringify(info);
 
   console.log(`Publishing to season ${info.current_season}...`);
   commitMultipleFiles(
     octokit,
     'tresabhi',
-    'blitzkrieg-db',
+    'blitzkrieg-assets',
     'main',
     new Date().toString(),
     [

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/events/ready.ts

@@ -5,8 +5,17 @@ export default function ready(client: Client<true>) {
 
   const activities: (() => string)[] = [
     () => `Living in ${client.guilds.cache.size.toLocaleString()} servers`,
-    () => `Serving ${client.users.cache.size.toLocaleString()} users`,
-    () => `Observing ${client.channels.cache.size.toLocaleString()} channels`,
+    () =>
+      `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({