From 820c1259120e54cd1840075fff83d8a370ba226e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:47:35 -0500
Subject: [PATCH] fix: stricter search

---
 .../tools/tankopedia/components/TankSearch/index.tsx   |  3 +--
 src/core/blitz/resolveTankId.ts                        |  2 +-
 src/core/blitzkit/tankDefinitions/index.ts             |  6 ++++--
 src/core/discord/autocompleteTanks.ts                  | 10 ++++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/app/tools/tankopedia/components/TankSearch/index.tsx b/src/app/tools/tankopedia/components/TankSearch/index.tsx
index afb42af69..cc7f2c0ec 100644
--- a/src/app/tools/tankopedia/components/TankSearch/index.tsx
+++ b/src/app/tools/tankopedia/components/TankSearch/index.tsx
@@ -375,8 +375,7 @@ export const TankSearch = memo<TankSearchProps>(
         return sort.direction === 'ascending' ? sorted : sorted.reverse();
       } else {
         const searchedRaw = go(filters.search, awaitedTankNames, {
-          key: 'combined',
-          limit: 25,
+          keys: ['searchableName', 'searchableNameDeburr'],
         });
         const searchedTanks = searchedRaw.map(
           (result) => awaitedTankDefinitions[result.obj.id],
diff --git a/src/core/blitz/resolveTankId.ts b/src/core/blitz/resolveTankId.ts
index 17bfa184a..3855e0c23 100644
--- a/src/core/blitz/resolveTankId.ts
+++ b/src/core/blitz/resolveTankId.ts
@@ -19,7 +19,7 @@ export default async function resolveTankId(
       `${tank}`,
       await (techTreeOnly ? tankNamesTechTreeOnly : tankNames),
       {
-        keys: ['combined'],
+        keys: ['searchableName', 'searchableNameDeburr'],
         limit: 1,
       },
     );
diff --git a/src/core/blitzkit/tankDefinitions/index.ts b/src/core/blitzkit/tankDefinitions/index.ts
index f46f7e6cb..c345dc972 100644
--- a/src/core/blitzkit/tankDefinitions/index.ts
+++ b/src/core/blitzkit/tankDefinitions/index.ts
@@ -187,8 +187,10 @@ export const tankNames = tanksDefinitionsArray.then((tanks) =>
 
       return {
         id,
-        original: tank.name,
-        combined: `${tank.name}${deburr(tank.name)}${tank.nameFull ? `${tank.nameFull}${deburr(tank.nameFull)}` : ''}`,
+        name: tank.name,
+        nameFull: tank.nameFull,
+        searchableName: tank.nameFull ?? tank.name,
+        searchableNameDeburr: deburr(tank.nameFull ?? tank.name),
         treeType: tank.treeType,
       };
     }),
diff --git a/src/core/discord/autocompleteTanks.ts b/src/core/discord/autocompleteTanks.ts
index acbc7cc1d..5b4a2ce71 100644
--- a/src/core/discord/autocompleteTanks.ts
+++ b/src/core/discord/autocompleteTanks.ts
@@ -29,18 +29,20 @@ export default async function autocompleteTanks(
             focusedOption.value,
             await (techTreeOnly ? tankNamesTechTreeOnly : tankNames),
             {
-              keys: ['combined'],
+              keys: ['searchableName', 'searchableNameDeburr'],
               limit: 10,
             },
           ).map(async (item) => {
-            let name = item.obj.original;
+            let name = item.obj.searchableName;
 
             if (name.length > DISCORD_CHOICES_MAX_NAME_SIZE) {
               const overSize = name.length - DISCORD_CHOICES_MAX_NAME_SIZE;
 
-              name = `${item.obj.original.slice(
+              name = `${item.obj.searchableName.slice(
                 0,
-                item.obj.original.length - overSize - OVERFLOW_SUFFIX.length,
+                item.obj.searchableName.length -
+                  overSize -
+                  OVERFLOW_SUFFIX.length,
               )}${OVERFLOW_SUFFIX}`;
             }