feat: migrate all

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

@@ -1,33 +1,33 @@
-import { SEARCH_KEYS } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import { go } from 'fuzzysort';
-import markdownEscape from 'markdown-escape';
-import { tankDefinitions, tankNames } from '../blitzkit/nonBlockingPromises';
-import { UserError } from '../blitzkit/userError';
-import { tankNamesTechTreeOnly } from '../discord/autocompleteTanks';
-import { translator } from '../localization/translator';
+import { SEARCH_KEYS } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import { go } from "fuzzysort";
+import markdownEscape from "markdown-escape";
+import { tankDefinitions, tankNames } from "../blitzkit/nonBlockingPromises";
+import { UserError } from "../blitzkit/userError";
+import { tankNamesTechTreeOnly } from "../discord/autocompleteTanks";
+import { translator } from "../localization/translator";
 
 export async function resolveTankId(
   tank: string | number,
   locale: Locale,
-  techTreeOnly = false,
+  techTreeOnly = false
 ) {
   const { strings } = translator(locale);
-  const number = typeof tank === 'string' ? Number(tank) : tank;
+  const number = typeof tank === "string" ? Number(tank) : tank;
 
   if (Number.isNaN(number)) {
     const searchResult = go(
       `${tank}`,
       await (techTreeOnly ? tankNamesTechTreeOnly : tankNames),
-      { keys: SEARCH_KEYS, limit: 1 },
+      { keys: SEARCH_KEYS, limit: 1 }
     );
 
     if (searchResult.length === 0) {
       throw new UserError(
-        literals(strings.bot.common.errors.tank_name_not_found, [
-          markdownEscape(`${tank}`),
-        ]),
+        literals(strings.bot.common.errors.tank_name_not_found, {
+          search: markdownEscape(`${tank}`),
+        })
       );
     } else {
       return searchResult[0].obj.id;
@@ -39,7 +39,9 @@ export async function resolveTankId(
       return number;
     } else {
       throw new UserError(
-        literals(strings.bot.common.errors.tank_id_not_found, [`${number}`]),
+        literals(strings.bot.common.errors.tank_id_not_found, {
+          search: number,
+        })
       );
     }
   }

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

@@ -1,12 +1,12 @@
-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';
+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";
 
 export async function filtersToDescription(
   { nation, tier, type, class: tankClass, tank }: StatFilters,
-  locale: Locale,
+  locale: Locale
 ) {
   const { strings, bkLocale } = translator(locale);
   const awaitedTankDefinitions = await fetchTankDefinitions();
@@ -18,11 +18,13 @@ export async function filtersToDescription(
     info.push((strings.common.nations as Record<string, string>)[nation]);
   if (tier) {
     info.push(
-      literals(strings.bot.common.filters.tier, [TIER_ROMAN_NUMERALS[tier]]),
+      literals(strings.bot.common.filters.tier, {
+        tier: TIER_ROMAN_NUMERALS[tier],
+      })
     );
   }
   if (tankClass) info.push(strings.common.tank_class_short[tankClass]);
   if (type) info.push(strings.common.tree_type[type]);
 
-  return info.length === 0 ? strings.bot.common.filters.none : info.join(', ');
+  return info.length === 0 ? strings.bot.common.filters.none : info.join(", ");
 }

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

@@ -1,13 +1,13 @@
-import { numberToRomanNumeral } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
+import { numberToRomanNumeral } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
 import {
   APIApplicationCommandOptionChoice,
   Locale,
   SlashCommandStringOption,
-} from 'discord.js';
-import { range } from 'lodash-es';
-import { translator } from '../localization/translator';
-import { localizationObject } from './localizationObject';
+} from "discord.js";
+import { range } from "lodash-es";
+import { translator } from "../localization/translator";
+import { localizationObject } from "./localizationObject";
 
 export function addTierChoices(option: SlashCommandStringOption) {
   const { strings } = translator(Locale.EnglishUS);
@@ -18,30 +18,30 @@ export function addTierChoices(option: SlashCommandStringOption) {
       localizationObject(
         (strings) => strings.bot.common.options.tier.name,
         undefined,
-        true,
-      ),
+        true
+      )
     )
     .setDescription(strings.bot.common.options.tier.description)
     .setDescriptionLocalizations(
       localizationObject(
-        (strings) => strings.bot.common.options.tier.description,
-      ),
+        (strings) => strings.bot.common.options.tier.description
+      )
     )
     .setChoices(
       ...range(10, 0).map(
         (tier) =>
           ({
-            name: literals(strings.bot.common.options.tier.choices.tier, [
-              `${tier}`,
-              numberToRomanNumeral(tier),
-            ]),
+            name: literals(strings.bot.common.options.tier.choices.tier, {
+              tier_1: tier,
+              tier_2: numberToRomanNumeral(tier),
+            }),
             value: `${tier}`,
             name_localizations: localizationObject(
               (strings) => strings.bot.common.options.tier.choices.tier,
-              [`${tier}`, numberToRomanNumeral(tier)],
+              { tier_1: tier, tier_2: numberToRomanNumeral(tier) }
             ),
-          }) satisfies APIApplicationCommandOptionChoice,
-      ),
+          }) satisfies APIApplicationCommandOptionChoice
+      )
     )
     .setRequired(true);
 }

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

@@ -1,11 +1,11 @@
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import { translator } from '../localization/translator';
-import { PeriodSize } from './addPeriodSubCommands';
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import { translator } from "../localization/translator";
+import { PeriodSize } from "./addPeriodSubCommands";
 
 export function getPeriodOptionName(period: PeriodSize, locale: Locale) {
   const { strings } = translator(locale);
-  if (period === 'career') return strings.bot.common.periods.career;
-  if (period === 'today') return strings.bot.common.periods.today;
-  return literals(strings.bot.common.periods.days, [period]);
+  if (period === "career") return strings.bot.common.periods.career;
+  if (period === "today") return strings.bot.common.periods.today;
+  return literals(strings.bot.common.periods.days, { days: period });
 }

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

@@ -1,35 +1,35 @@
-import { Region } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { ChatInputCommandInteraction } from 'discord.js';
-import markdownEscape from 'markdown-escape';
-import { searchClansAcrossRegionsBotWrapper } from '../blitz/searchClansAcrossRegionsBotWrapper';
-import { UserError } from '../blitzkit/userError';
-import { translator } from '../localization/translator';
+import { Region } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { ChatInputCommandInteraction } from "discord.js";
+import markdownEscape from "markdown-escape";
+import { searchClansAcrossRegionsBotWrapper } from "../blitz/searchClansAcrossRegionsBotWrapper";
+import { UserError } from "../blitzkit/userError";
+import { translator } from "../localization/translator";
 
 export const serverAndIdPattern = /(com|eu|asia)\/[0-9]+/;
 
 export async function resolveClanFromCommand(
-  interaction: ChatInputCommandInteraction,
+  interaction: ChatInputCommandInteraction
 ) {
   const { strings } = translator(interaction.locale);
-  const clan = interaction.options.getString('clan', true);
+  const clan = interaction.options.getString("clan", true);
 
   if (serverAndIdPattern.test(clan)) {
-    const [server, accountId] = clan.split('/');
+    const [server, accountId] = clan.split("/");
     return { region: server as Region, id: Number(accountId) };
   } else {
     const accounts = await searchClansAcrossRegionsBotWrapper(
       clan,
-      interaction.locale,
+      interaction.locale
     );
 
     if (accounts[0]) {
       return { region: accounts[0].region, id: accounts[0].clan_id };
     } else {
       throw new UserError(
-        literals(strings.bot.common.errors.clan_not_found, [
-          markdownEscape(clan),
-        ]),
+        literals(strings.bot.common.errors.clan_not_found, {
+          search: markdownEscape(clan),
+        })
       );
     }
   }

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

@@ -1,11 +1,11 @@
-import { getTimeDaysAgo, Region } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { CacheType, ChatInputCommandInteraction } from 'discord.js';
-import { getPeriodNow } from '../blitzkit/getPeriodNow';
-import { getPeriodStart } from '../blitzkit/getPeriodStart';
-import { translator } from '../localization/translator';
-import { PeriodType } from './addPeriodSubCommands';
-import { getPeriodOptionName } from './getPeriodOptionName';
+import { getTimeDaysAgo, Region } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { CacheType, ChatInputCommandInteraction } from "discord.js";
+import { getPeriodNow } from "../blitzkit/getPeriodNow";
+import { getPeriodStart } from "../blitzkit/getPeriodStart";
+import { translator } from "../localization/translator";
+import { PeriodType } from "./addPeriodSubCommands";
+import { getPeriodOptionName } from "./getPeriodOptionName";
 
 export interface ResolvedPeriod {
   name: string;
@@ -16,7 +16,7 @@ export interface ResolvedPeriod {
 export function resolvePeriodFromCommand(
   region: Region,
   interaction: ChatInputCommandInteraction<CacheType>,
-  forcedPeriod?: PeriodType,
+  forcedPeriod?: PeriodType
 ) {
   const { strings } = translator(interaction.locale);
   let name: string;
@@ -26,16 +26,16 @@ export function resolvePeriodFromCommand(
     ? forcedPeriod
     : (interaction.options.getSubcommand() as PeriodType);
 
-  if (periodSubcommand === 'custom') {
-    const startOption = interaction.options.getInteger('start', true);
-    const endOption = interaction.options.getInteger('end', true);
+  if (periodSubcommand === "custom") {
+    const startOption = interaction.options.getInteger("start", true);
+    const endOption = interaction.options.getInteger("end", true);
     const startDaysAgoMin = Math.min(startOption, endOption);
     const endDaysAgoMax = Math.max(startOption, endOption);
 
-    name = literals(strings.bot.common.periods.custom, [
-      `${startDaysAgoMin}`,
-      `${endDaysAgoMax}`,
-    ]);
+    name = literals(strings.bot.common.periods.custom, {
+      day_1: startDaysAgoMin,
+      day_2: endDaysAgoMax,
+    });
     start = getTimeDaysAgo(region, endDaysAgoMax);
     end = getTimeDaysAgo(region, startDaysAgoMin);
   } else {

packages/bot/src/core/discord/resolvePlayerFromCommand/index.ts

@@ -1,11 +1,11 @@
-import { idToRegion, Region } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { CacheType, ChatInputCommandInteraction } from 'discord.js';
-import markdownEscape from 'markdown-escape';
-import { searchPlayersAcrossRegionsBotWrapper } from '../../blitz/searchPlayersAcrossRegionsBotWrapper';
-import { getBlitzFromDiscord } from '../../blitzkit/getBlitzFromDiscord';
-import { UserError } from '../../blitzkit/userError';
-import { translator } from '../../localization/translator';
+import { idToRegion, Region } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { CacheType, ChatInputCommandInteraction } from "discord.js";
+import markdownEscape from "markdown-escape";
+import { searchPlayersAcrossRegionsBotWrapper } from "../../blitz/searchPlayersAcrossRegionsBotWrapper";
+import { getBlitzFromDiscord } from "../../blitzkit/getBlitzFromDiscord";
+import { UserError } from "../../blitzkit/userError";
+import { translator } from "../../localization/translator";
 
 export interface ResolvedPlayer {
   region: Region;
@@ -13,10 +13,10 @@ export interface ResolvedPlayer {
 }
 
 export async function resolvePlayerFromCommand(
-  interaction: ChatInputCommandInteraction<CacheType>,
+  interaction: ChatInputCommandInteraction<CacheType>
 ) {
   const { strings } = translator(interaction.locale);
-  const commandUsername = interaction.options.getString('username');
+  const commandUsername = interaction.options.getString("username");
 
   if (commandUsername !== null) {
     const id = parseInt(commandUsername);
@@ -27,7 +27,7 @@ export async function resolvePlayerFromCommand(
     } else {
       const accounts = await searchPlayersAcrossRegionsBotWrapper(
         commandUsername,
-        interaction.locale,
+        interaction.locale
       );
 
       if (accounts[0]) {
@@ -37,9 +37,9 @@ export async function resolvePlayerFromCommand(
         } satisfies ResolvedPlayer;
       } else {
         throw new UserError(
-          literals(strings.bot.common.errors.player_not_found, [
-            markdownEscape(commandUsername),
-          ]),
+          literals(strings.bot.common.errors.player_not_found, {
+            search: markdownEscape(commandUsername),
+          })
         );
       }
     }