feat: data driven nations

src/commands/ownedTanks.tsx

@@ -3,8 +3,8 @@ import markdownEscape from 'markdown-escape';
 import { TANK_CLASSES } from '../components/Tanks/components/Item/constants';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
 import getTankStats from '../core/blitz/getTankStats';
+import { gameDefinitions } from '../core/blitzkit/gameDefinitions';
 import {
-  NATIONS,
   TankDefinition,
   Tier,
   flags,
@@ -62,7 +62,7 @@ export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
       });
 
       const awaitedTankDefinitions = await tankDefinitions;
-      const awaitedNations = await NATIONS;
+      const awaitedGameDefinitions = await gameDefinitions;
       const lines = tankStats
         .map(({ tank_id }) => awaitedTankDefinitions[tank_id])
         .filter((tank) => tank.tier === tier)
@@ -72,7 +72,8 @@ export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
         )
         .sort(
           (a, b) =>
-            awaitedNations.indexOf(a.nation) - awaitedNations.indexOf(b.nation),
+            awaitedGameDefinitions.nations.indexOf(a.nation) -
+            awaitedGameDefinitions.nations.indexOf(b.nation),
         )
         .map((tank) => `${flags[tank.nation]} ${markdownEscape(tank.name)}`);
 

src/commands/today.ts

@@ -1,4 +1,4 @@
-import { NATIONS } from '../core/blitzkit/tankDefinitions';
+import { gameDefinitions } from '../core/blitzkit/gameDefinitions';
 import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
 import { addFilterOptions } from '../core/discord/addFilterOptions';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
@@ -18,14 +18,15 @@ import { CommandRegistry } from '../events/interactionCreate';
 import { renderBreakdown } from './breakdown/render';
 
 export const todayCommand = new Promise<CommandRegistry>(async (resolve) => {
-  const nations = await NATIONS;
+  const awaitedGameDefinitions = await gameDefinitions;
+
   resolve({
     inProduction: true,
     inPublic: true,
 
     command: addFilterOptions(
       createLocalizedCommand('today'),
-      nations,
+      awaitedGameDefinitions.nations,
     ).addStringOption(addUsernameChoices),
 
     async handler(interaction) {