Merge branch 'main' into dev

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) {

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);
 

packages/bot/src/core/discord/localizationObject.ts

@@ -3,7 +3,8 @@ import { Locale } from 'discord.js';
 import { SUPPORTED_LOCALES_DISCORD } from '../localization/strings/constants';
 import { translator } from '../localization/translator';
 
-const validNameRegex = /^[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai}]{1,32}$/u;
+const validNameRegex =
+  /^[\p{Ll}\p{Lm}\p{Lo}\p{N}\p{sc=Devanagari}\p{sc=Thai}_-]+$/u;
 
 export function localizationObject(
   path: (strings: BlitzKitStrings) => string,