From b9c339daa76215f785ef5862412d777f5f13cde9 Mon Sep 17 00:00:00 2001
From: tresabhi <43380238+tresabhi@users.noreply.github.com>
Date: Sat, 18 Jan 2025 13:47:31 -0600
Subject: [PATCH] fix: search keys

---
 packages/bot/src/core/blitz/resolveTankId.ts       |  6 ++----
 packages/bot/src/core/discord/autocompleteTanks.ts | 14 ++------------
 packages/core/src/blitzkit/tankNames.ts            |  9 +++++++++
 .../website/src/components/TankSearch/index.tsx    |  3 ++-
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/packages/bot/src/core/blitz/resolveTankId.ts b/packages/bot/src/core/blitz/resolveTankId.ts
index 55ba19c17..65eda9de6 100644
--- a/packages/bot/src/core/blitz/resolveTankId.ts
+++ b/packages/bot/src/core/blitz/resolveTankId.ts
@@ -1,3 +1,4 @@
+import { SEARCH_KEYS } from '@blitzkit/core';
 import { literals } from '@blitzkit/i18n';
 import { Locale } from 'discord.js';
 import { go } from 'fuzzysort';
@@ -19,10 +20,7 @@ export async function resolveTankId(
     const searchResult = go(
       `${tank}`,
       await (techTreeOnly ? tankNamesTechTreeOnly : tankNames),
-      {
-        keys: ['searchableName', 'searchableNameDeburr', 'camouflages'],
-        limit: 1,
-      },
+      { keys: SEARCH_KEYS, limit: 1 },
     );
 
     if (searchResult.length === 0) {
diff --git a/packages/bot/src/core/discord/autocompleteTanks.ts b/packages/bot/src/core/discord/autocompleteTanks.ts
index 8a48636e9..82d4d2013 100644
--- a/packages/bot/src/core/discord/autocompleteTanks.ts
+++ b/packages/bot/src/core/discord/autocompleteTanks.ts
@@ -1,5 +1,4 @@
-import { fetchTankNames, TankType } from '@blitzkit/core';
-import { SUPPORTED_LOCALES } from '@blitzkit/i18n';
+import { fetchTankNames, SEARCH_KEYS, TankType } from '@blitzkit/core';
 import {
   ApplicationCommandOptionChoiceData,
   AutocompleteInteraction,
@@ -32,16 +31,7 @@ export async function autocompleteTanks(
           go(
             focusedOption.value,
             await (techTreeOnly ? tankNamesTechTreeOnly : tankNames),
-            {
-              keys: [
-                ...SUPPORTED_LOCALES.map((locale) => [
-                  `searchableName.{locale}`,
-                  `searchableNameDeburr.{locale}`,
-                ]).flat(),
-                'camouflages',
-              ],
-              limit: 10,
-            },
+            { keys: SEARCH_KEYS, limit: 10 },
           ).map(async (item) => {
             let name = unwrap(item.obj.searchableName);
 
diff --git a/packages/core/src/blitzkit/tankNames.ts b/packages/core/src/blitzkit/tankNames.ts
index b5b53c183..940fdbed6 100644
--- a/packages/core/src/blitzkit/tankNames.ts
+++ b/packages/core/src/blitzkit/tankNames.ts
@@ -1,4 +1,5 @@
 import { deburr } from 'lodash-es';
+import { SUPPORTED_LOCALES } from '../../../i18n/src/strings';
 import { I18nString } from '../protos';
 import { fetchCamouflageDefinitions } from './camouflageDefinitions';
 import { fetchTankDefinitions } from './tankDefinitions';
@@ -33,3 +34,11 @@ export async function fetchTankNames() {
     }),
   );
 }
+
+export const SEARCH_KEYS = [
+  ...SUPPORTED_LOCALES.map((locale) => [
+    `searchableName.locales.${locale}`,
+    `searchableNameDeburr.locales.${locale}`,
+  ]).flat(),
+  'camouflages',
+];
diff --git a/packages/website/src/components/TankSearch/index.tsx b/packages/website/src/components/TankSearch/index.tsx
index 0e3aea2b8..257c37242 100644
--- a/packages/website/src/components/TankSearch/index.tsx
+++ b/packages/website/src/components/TankSearch/index.tsx
@@ -2,6 +2,7 @@ import {
   metaSortTank,
   normalizeBoundingBox,
   resolveDpm,
+  SEARCH_KEYS,
   unionBoundingBox,
   type TankDefinition,
 } from '@blitzkit/core';
@@ -410,7 +411,7 @@ export const TankSearch = memo<TankSearchProps>(
           : sorted.reverse();
       } else {
         const searchedRaw = fuzzysort.go(tankFilters.search, tankNames, {
-          keys: ['searchableName', 'searchableNameDeburr', 'camouflages'],
+          keys: SEARCH_KEYS,
         });
         const searchedTanks = searchedRaw.map(
           (result) => tankDefinitions.tanks[result.obj.id],