From 7225fb0231c23a2ee1d976fae71e15c21f4b8841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Thu, 20 Jun 2024 13:34:27 -0500
Subject: [PATCH] feat: data driven nations

---
 .../TankSearch/components/Options/index.tsx   | 35 +++++++++++++------
 .../components/TankSearch/index.tsx           |  7 ++--
 src/commands/ownedTanks.tsx                   |  7 ++--
 src/commands/today.ts                         |  7 ++--
 src/core/blitzkit/tankDefinitions/index.ts    | 12 -------
 src/core/discord/addPeriodicFilterOptions.ts  |  7 ++--
 6 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/src/app/tools/tankopedia/components/TankSearch/components/Options/index.tsx b/src/app/tools/tankopedia/components/TankSearch/components/Options/index.tsx
index 71b91e48a..5f1ca2000 100644
--- a/src/app/tools/tankopedia/components/TankSearch/components/Options/index.tsx
+++ b/src/app/tools/tankopedia/components/TankSearch/components/Options/index.tsx
@@ -11,7 +11,7 @@ import {
   TREE_TYPE_ICONS,
   TREE_TYPE_IMAGES,
 } from '../../../../../../../components/Tanks/components/Item/constants';
-import { NATIONS } from '../../../../../../../core/blitzkit/tankDefinitions';
+import { gameDefinitions } from '../../../../../../../core/blitzkit/gameDefinitions';
 import {
   TIERS,
   TIER_ROMAN_NUMERALS,
@@ -23,7 +23,7 @@ import mutateTankopediaPersistent, {
 import * as styles from './index.css';
 
 export function Options() {
-  const nations = use(NATIONS);
+  const awaitedGameDefinitions = use(gameDefinitions);
   const filters = useTankopediaPersistent((state) => state.filters);
 
   return (
@@ -65,7 +65,7 @@ export function Options() {
         ))}
       </Flex>
       <Flex className={styles.oneLineFilters}>
-        {nations.map((nation, index) => (
+        {awaitedGameDefinitions.nations.map((nation, index) => (
           <Button
             key={nation}
             color={filters.nations.includes(nation) ? undefined : 'gray'}
@@ -76,9 +76,13 @@ export function Options() {
               borderTopLeftRadius: index === 0 ? undefined : 0,
               borderBottomLeftRadius: index === 0 ? undefined : 0,
               borderTopRightRadius:
-                index === nations.length - 1 ? undefined : 0,
+                index === awaitedGameDefinitions.nations.length - 1
+                  ? undefined
+                  : 0,
               borderBottomRightRadius:
-                index === nations.length - 1 ? undefined : 0,
+                index === awaitedGameDefinitions.nations.length - 1
+                  ? undefined
+                  : 0,
             }}
             onClick={() =>
               mutateTankopediaPersistent((draft) => {
@@ -241,7 +245,7 @@ export function Options() {
         style={{ width: '100%' }}
       >
         <Flex>
-          {nations.slice(0, 5).map((nation, index) => (
+          {awaitedGameDefinitions.nations.slice(0, 5).map((nation, index) => (
             <Button
               key={nation}
               color={filters.nations.includes(nation) ? undefined : 'gray'}
@@ -252,11 +256,15 @@ export function Options() {
                 borderTopLeftRadius: index === 0 ? 16 : 0,
                 borderBottomLeftRadius: 0,
                 borderTopRightRadius:
-                  index === nations.length - Math.round(nations.length / 2)
+                  index ===
+                  awaitedGameDefinitions.nations.length -
+                    Math.round(awaitedGameDefinitions.nations.length / 2)
                     ? 16
                     : 0,
                 borderBottomRightRadius:
-                  index === nations.length - 1 ? undefined : 0,
+                  index === awaitedGameDefinitions.nations.length - 1
+                    ? undefined
+                    : 0,
               }}
               onClick={() =>
                 mutateTankopediaPersistent((draft) => {
@@ -276,7 +284,7 @@ export function Options() {
         </Flex>
 
         <Flex>
-          {nations.slice(5).map((nation, index) => (
+          {awaitedGameDefinitions.nations.slice(5).map((nation, index) => (
             <Button
               key={nation}
               color={filters.nations.includes(nation) ? undefined : 'gray'}
@@ -287,9 +295,14 @@ export function Options() {
                 borderTopLeftRadius: 0,
                 borderBottomLeftRadius: index === 0 ? 16 : 0,
                 borderTopRightRadius:
-                  index === nations.length - 1 ? undefined : 0,
+                  index === awaitedGameDefinitions.nations.length - 1
+                    ? undefined
+                    : 0,
                 borderBottomRightRadius:
-                  index === nations.length - Math.round(nations.length / 2) - 1
+                  index ===
+                  awaitedGameDefinitions.nations.length -
+                    Math.round(awaitedGameDefinitions.nations.length / 2) -
+                    1
                     ? 16
                     : 0,
               }}
diff --git a/src/app/tools/tankopedia/components/TankSearch/index.tsx b/src/app/tools/tankopedia/components/TankSearch/index.tsx
index 9ab494bce..64c8c605e 100644
--- a/src/app/tools/tankopedia/components/TankSearch/index.tsx
+++ b/src/app/tools/tankopedia/components/TankSearch/index.tsx
@@ -16,12 +16,12 @@ import { use, useEffect, useMemo, useRef, useState } from 'react';
 import { isMobileOnly } from 'react-device-detect';
 import { TANK_CLASSES } from '../../../../../components/Tanks/components/Item/constants';
 import { resolveNearPenetration } from '../../../../../core/blitz/resolveNearPenetration';
+import { gameDefinitions } from '../../../../../core/blitzkit/gameDefinitions';
 import { modelDefinitions } from '../../../../../core/blitzkit/modelDefinitions';
 import { normalizeBoundingBox } from '../../../../../core/blitzkit/normalizeBoundingBox';
 import { resolveDpm } from '../../../../../core/blitzkit/resolveDpm';
 import { resolveReload } from '../../../../../core/blitzkit/resolveReload';
 import {
-  NATIONS,
   TankDefinition,
   tanksDefinitionsArray,
 } from '../../../../../core/blitzkit/tankDefinitions';
@@ -48,7 +48,7 @@ export function TankSearch({
   onSelectAll,
 }: TankSearchProps) {
   const tanksPerPage = (compact ? 16 : 96) * (isMobileOnly ? 0.5 : 1);
-  const nations = use(NATIONS);
+  const awaitedGameDefinitions = use(gameDefinitions);
   const filters = useTankopediaPersistent((state) => state.filters);
   const sort = useTankopediaPersistent((state) => state.sort);
   const awaitedTanks = use(tanksDefinitionsArray);
@@ -70,7 +70,8 @@ export function TankSearch({
         )
         .sort(
           (a, b) =>
-            (nations.indexOf(a.nation) - nations.indexOf(b.nation)) *
+            (awaitedGameDefinitions.nations.indexOf(a.nation) -
+              awaitedGameDefinitions.nations.indexOf(b.nation)) *
             (sort.direction === 'descending' ? -1 : 1),
         ),
     [],
diff --git a/src/commands/ownedTanks.tsx b/src/commands/ownedTanks.tsx
index 1d9255967..76997e4fe 100644
--- a/src/commands/ownedTanks.tsx
+++ b/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)}`);
 
diff --git a/src/commands/today.ts b/src/commands/today.ts
index dd251457b..383919bbf 100644
--- a/src/commands/today.ts
+++ b/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) {
diff --git a/src/core/blitzkit/tankDefinitions/index.ts b/src/core/blitzkit/tankDefinitions/index.ts
index a4dda60f9..6a9f56c9e 100644
--- a/src/core/blitzkit/tankDefinitions/index.ts
+++ b/src/core/blitzkit/tankDefinitions/index.ts
@@ -197,18 +197,6 @@ export const tankNames = tanksDefinitionsArray.then((tanks) =>
 
 export type Tier = (typeof TIERS)[number];
 
-// TODO: DEPRICATE THISuuu
-export const NATIONS = tanksDefinitionsArray.then((tanks) => {
-  const nations = Array.from(
-    new Set<string>(Object.values(tanks).map((tank) => tank.nation)),
-  );
-
-  nations.splice(nations.indexOf('other'), 1);
-  nations.push('other');
-
-  return nations;
-});
-
 export const flags: Record<string, string> = {
   ussr: '<:ussr:1218421042033197197>',
   germany: '🇩🇪',
diff --git a/src/core/discord/addPeriodicFilterOptions.ts b/src/core/discord/addPeriodicFilterOptions.ts
index c70869d3a..b3b0eb3ab 100644
--- a/src/core/discord/addPeriodicFilterOptions.ts
+++ b/src/core/discord/addPeriodicFilterOptions.ts
@@ -3,7 +3,7 @@ import {
   SlashCommandSubcommandBuilder,
   SlashCommandSubcommandGroupBuilder,
 } from 'discord.js';
-import { NATIONS } from '../blitzkit/tankDefinitions';
+import { gameDefinitions } from '../blitzkit/gameDefinitions';
 import { addFilterOptions } from './addFilterOptions';
 import { addPeriodSubCommands } from './addPeriodSubCommands';
 
@@ -15,9 +15,10 @@ export default async function addPeriodicFilterOptions<
     option: SlashCommandSubcommandBuilder,
   ) => SlashCommandSubcommandBuilder = (option) => option,
 ): Promise<OptionType> {
-  const nations = await NATIONS;
+  const awaitedGameDefinitions = await gameDefinitions;
+
   addPeriodSubCommands(option, (option) =>
-    addFilterOptions(extra(option), nations),
+    addFilterOptions(extra(option), awaitedGameDefinitions.nations),
   );
 
   return option;