Merge pull request #61 from tresabhi/1.15.9

docs/changelogs/1.15.9.md

@@ -0,0 +1,13 @@
+# Blitzkrieg 1.15.9
+
+~~Curiosity killed the cat~~ Ratings killed the Blitzkrieg
+
+## Fixes
+
+- Deleted ratings players are now handled properly
+
+## Technical Fixes
+
+- Latest archived season number
+  - Is now cached properly
+  - Is now fetched in a chaining fashion correctly

package.json

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

src/commands/ratings.tsx

@@ -298,8 +298,8 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
                           position: firstPlayerIndex + index + 1,
                           clan: clanData[player.id]?.clan?.tag,
                           nickname:
-                            clanData[player.id]?.account_name ??
+                            clanData[index]?.account_name ??
-                            `Unknown Player ${player.id}`,
+                            `Deleted ${player.id}`,
                         }) satisfies SimplifiedPlayer,
                     );
                   },

src/core/blitzkrieg/getArchivedLatestSeasonNumber.ts

@@ -1,17 +1,28 @@
 import getRatingsInfo from '../blitz/getRatingsInfo';
 
+interface GitHubTrees {
+  tree: { path: string; url: string }[];
+}
+
 let cachedLatestArchivedSeasonNumber: number | null = null;
 
 export async function getArchivedLatestSeasonNumber() {
+  if (cachedLatestArchivedSeasonNumber !== null) {
+    return cachedLatestArchivedSeasonNumber;
+  }
+
   const ratingsInfo = await getRatingsInfo('com');
 
   if (ratingsInfo.detail) {
-    const comURL = (
+    const regionsURL = (
       (await fetch(
-        'https://api.github.com/repos/tresabhi/blitzkrieg-assets/git/trees/main/regions',
+        'https://api.github.com/repos/tresabhi/blitzkrieg-assets/git/trees/main',
-      ).then((response) => response.json())) as {
+      ).then((response) => response.json())) as GitHubTrees
-        tree: { path: string; url: string }[];
+    ).tree.find(({ path }) => path === 'regions')!.url;
-      }
+    const comURL = (
+      (await fetch(regionsURL).then((response) =>
+        response.json(),
+      )) as GitHubTrees
     ).tree.find(({ path }) => path === 'com')!.url;
     const ratingsURL = (
       (await fetch(comURL).then((response) => response.json())) as {
@@ -20,14 +31,16 @@ export async function getArchivedLatestSeasonNumber() {
     ).tree[0].url;
     const latestSeason = Math.max(
       ...(
-        (await fetch(ratingsURL).then((response) => {
+        (await fetch(ratingsURL).then((response) => response.json())) as {
-          response.json();
+          tree: { path: string }[];
-        })) as { tree: { path: string }[] }
+        }
-      ).tree.map(({ path }) => parseInt(path)),
+      ).tree.map(({ path }) => Number(path)),
     );
 
-    return latestSeason;
+    cachedLatestArchivedSeasonNumber = latestSeason;
   } else {
-    return ratingsInfo.current_season - 1;
+    cachedLatestArchivedSeasonNumber = ratingsInfo.current_season - 1;
   }
+
+  return cachedLatestArchivedSeasonNumber;
 }