feat: update bot chunk 2

packages/bot/src/core/blitz/resolveTankId.ts

@@ -1,3 +1,4 @@
+import { literals } from '@blitzkit/i18n';
 import { Locale } from 'discord.js';
 import { go } from 'fuzzysort';
 import markdownEscape from 'markdown-escape';
@@ -11,7 +12,7 @@ export async function resolveTankId(
   locale: Locale,
   techTreeOnly = false,
 ) {
-  const { translate } = translator(locale);
+  const { strings } = translator(locale);
   const number = typeof tank === 'string' ? Number(tank) : tank;
 
   if (Number.isNaN(number)) {
@@ -26,7 +27,7 @@ export async function resolveTankId(
 
     if (searchResult.length === 0) {
       throw new UserError(
-        translate('bot.common.errors.tank_name_not_found', [
+        literals(strings.bot.common.errors.tank_name_not_found, [
           markdownEscape(`${tank}`),
         ]),
       );
@@ -40,7 +41,7 @@ export async function resolveTankId(
       return number;
     } else {
       throw new UserError(
-        translate('bot.common.errors.tank_id_not_found', [`${number}`]),
+        literals(strings.bot.common.errors.tank_id_not_found, [`${number}`]),
       );
     }
   }

packages/bot/src/core/blitzkit/filtersToDescription.ts

@@ -1,4 +1,5 @@
 import { fetchTankDefinitions, TIER_ROMAN_NUMERALS } from '@blitzkit/core';
+import { literals } from '@blitzkit/i18n';
 import { Locale } from 'discord.js';
 import { StatFilters } from '../blitzstars/filterStats';
 import { translator } from '../localization/translator';
@@ -7,22 +8,21 @@ export async function filtersToDescription(
   { nation, tier, type, class: tankClass, tank }: StatFilters,
   locale: Locale,
 ) {
-  const { translate } = translator(locale);
+  const { strings } = translator(locale);
   const awaitedTankDefinitions = await fetchTankDefinitions();
   const info: string[] = [];
 
   // TODO: somehow localize tank names?
   if (tank) return awaitedTankDefinitions.tanks[tank].name;
-  if (nation) info.push(translate(`common.nations.${nation}`));
+  if (nation)
+    info.push((strings.common.nations as Record<string, string>)[nation]);
   if (tier) {
     info.push(
-      translate('bot.common.filters.tier', [TIER_ROMAN_NUMERALS[tier]]),
+      literals(strings.bot.common.filters.tier, [TIER_ROMAN_NUMERALS[tier]]),
     );
   }
-  if (tankClass) info.push(translate(`common.tank_class_short.${tankClass}`));
-  if (type) info.push(translate(`common.tree_type.${type}`));
+  if (tankClass) info.push(strings.common.tank_class_short[tankClass]);
+  if (type) info.push(strings.common.tree_type[type]);
 
-  return info.length === 0
-    ? translate('bot.common.filters.none')
-    : info.join(', ');
+  return info.length === 0 ? strings.bot.common.filters.none : info.join(', ');
 }

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

@@ -3,16 +3,22 @@ import { translator } from '../localization/translator';
 import { localizationObject } from './localizationObject';
 
 export function addClanChoices(option: SlashCommandStringOption) {
-  const { translate } = translator(Locale.EnglishUS);
+  const { strings } = translator(Locale.EnglishUS);
 
   return option
     .setName('clan')
     .setNameLocalizations(
-      localizationObject('bot.common.options.clan', undefined, true),
+      localizationObject(
+        (strings) => strings.bot.common.options.clan.$,
+        undefined,
+        true,
+      ),
     )
-    .setDescription(translate('bot.common.options.clan.description'))
+    .setDescription(strings.bot.common.options.clan.description)
     .setDescriptionLocalizations(
-      localizationObject('bot.common.options.clan.description'),
+      localizationObject(
+        (strings) => strings.bot.common.options.clan.description,
+      ),
     )
     .setAutocomplete(true)
     .setMinLength(2)

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

@@ -17,34 +17,40 @@ import { localizationObject } from './localizationObject';
 export function addFilterOptions<
   Option extends SlashCommandBuilder | SlashCommandSubcommandBuilder,
 >(option: Option, nations: string[]) {
-  const { translate } = translator(Locale.EnglishUS);
+  const { strings } = translator(Locale.EnglishUS);
 
   return (
     option
       .addStringOption((option) =>
         option
-          .setName(translate('bot.common.options.filters.nation'))
+          .setName(strings.bot.common.options.filters.nation.$)
           .setNameLocalizations(
             localizationObject(
-              'bot.common.options.filters.nation',
+              (strings) => strings.bot.common.options.filters.nation.$,
               undefined,
               true,
             ),
           )
-          .setDescription(
-            translate('bot.common.options.filters.nation.description'),
-          )
+          .setDescription(strings.bot.common.options.filters.nation.description)
           .setDescriptionLocalizations(
-            localizationObject('bot.common.options.filters.nation.description'),
+            localizationObject(
+              (strings) =>
+                strings.bot.common.options.filters.nation.description,
+            ),
           )
           .addChoices(
             ...nations.map(
               (nation) =>
                 ({
                   value: nation,
-                  name: translate(`common.nations.${nation}`),
+                  name: (strings.common.nations as Record<string, string>)[
+                    nation
+                  ],
                   name_localizations: localizationObject(
-                    `common.nations.${nation}`,
+                    (strings) =>
+                      (strings.common.nations as Record<string, string>)[
+                        nation
+                      ],
                   ),
                 }) satisfies APIApplicationCommandOptionChoice,
             ),
@@ -54,28 +60,28 @@ export function addFilterOptions<
       .addStringOption((option) => addTierChoices(option).setRequired(false))
       .addStringOption((option) =>
         option
-          .setName(translate('bot.common.options.filters.class'))
+          .setName(strings.bot.common.options.filters.class.$)
           .setNameLocalizations(
             localizationObject(
-              'bot.common.options.filters.class',
+              (strings) => strings.bot.common.options.filters.class.$,
               undefined,
               true,
             ),
           )
-          .setDescription(
-            translate('bot.common.options.filters.class.description'),
-          )
+          .setDescription(strings.bot.common.options.filters.class.description)
           .setDescriptionLocalizations(
-            localizationObject('bot.common.options.filters.class.description'),
+            localizationObject(
+              (strings) => strings.bot.common.options.filters.class.description,
+            ),
           )
           .addChoices(
             ...TANK_CLASSES.map(
               (tankType) =>
                 ({
                   value: `${tankType}`,
-                  name: translate(`common.tank_class_short.${tankType}`),
+                  name: strings.common.tank_class_short[tankType],
                   name_localizations: localizationObject(
-                    `common.tank_class_short.${tankType}`,
+                    (strings) => strings.common.tank_class_short[tankType],
                   ),
                 }) satisfies APIApplicationCommandOptionChoice,
             ),
@@ -84,28 +90,28 @@ export function addFilterOptions<
       )
       .addStringOption((option) =>
         option
-          .setName(translate('bot.common.options.filters.type'))
+          .setName(strings.bot.common.options.filters.type.$)
           .setNameLocalizations(
             localizationObject(
-              'bot.common.options.filters.type',
+              (strings) => strings.bot.common.options.filters.type.$,
               undefined,
               true,
             ),
           )
-          .setDescription(
-            translate('bot.common.options.filters.type.description'),
-          )
+          .setDescription(strings.bot.common.options.filters.type.description)
           .setDescriptionLocalizations(
-            localizationObject('bot.common.options.filters.type.description'),
+            localizationObject(
+              (strings) => strings.bot.common.options.filters.type.description,
+            ),
           )
           .addChoices(
             ...TANK_TYPES.map(
               (treeType) =>
                 ({
                   value: TANK_TYPE_COMMAND_NAMES[treeType],
-                  name: translate(`common.tree_type.${treeType}`),
+                  name: strings.common.tree_type[treeType],
                   name_localizations: localizationObject(
-                    `common.tree_type.${treeType}`,
+                    (strings) => strings.common.tree_type[treeType],
                   ),
                 }) satisfies APIApplicationCommandOptionChoice,
             ),