diff --git a/packages/bot/src/commands/about.ts b/packages/bot/src/commands/about.ts index 8908b63de..8a5bdb3ad 100644 --- a/packages/bot/src/commands/about.ts +++ b/packages/bot/src/commands/about.ts @@ -28,10 +28,10 @@ export const aboutCommand = new Promise(async (resolve) => { async handler(interaction) { const subcommand = interaction.options.getSubcommand(); - const { t } = translator(interaction.locale); + const { strings } = translator(interaction.locale); if (subcommand === 'commands') { - return t`bot.commands.about.subcommands.commands.body${( + return `${strings.bot.commands.about.subcommands.commands.body}${( await Promise.all(COMMANDS_RAW) ) .sort((a, b) => diff --git a/packages/bot/src/commands/debug.ts b/packages/bot/src/commands/debug.ts index d996484da..5231f4d8f 100644 --- a/packages/bot/src/commands/debug.ts +++ b/packages/bot/src/commands/debug.ts @@ -11,17 +11,17 @@ export const debugCommand = new Promise((resolve) => { command: createLocalizedCommand('debug'), async handler(interaction) { - const { t } = translator(interaction.locale); + const { strings } = translator(interaction.locale); const currentTime = new Date().getTime(); const uptime = currentTime - executionStart; const list = [ - [t`bot.commands.debug.body.version`, packageJSON.version], + [strings.bot.commands.debug.body.version, packageJSON.version], [ - t`bot.commands.debug.body.shard`, - client.shard?.ids[0] ?? t`bot.commands.debug.body.shard.default`, + strings.bot.commands.debug.body.shard, + client.shard?.ids[0] ?? strings.bot.commands.debug.body.shard.default, ], [ - t`bot.commands.debug.body.uptime`, + strings.bot.commands.debug.body.uptime, `${Math.floor((uptime / 1000 / 60 / 60) % 24)}h ${Math.floor( (uptime / 1000 / 60) % 60, )}m ${Math.floor((uptime / 1000) % 60)}s ${Math.floor( @@ -29,7 +29,7 @@ export const debugCommand = new Promise((resolve) => { )}ms`, ], ]; - return t`bot.commands.debug.body.title${list + return `${strings.bot.commands.debug.body.title}${list .map(([key, value]) => `- ${key}: ${value}`) .join('\n')}`; }, diff --git a/packages/bot/src/components/GenericAllStats/index.tsx b/packages/bot/src/components/GenericAllStats/index.tsx index 30e41cb8c..6935944c4 100644 --- a/packages/bot/src/components/GenericAllStats/index.tsx +++ b/packages/bot/src/components/GenericAllStats/index.tsx @@ -21,7 +21,7 @@ export function GenericAllStats({ supplementaryStats, locale, }: GenericAllStatsProps) { - const { t } = translator(locale); + const { strings } = translator(locale); const damageRatio = stats.damage_dealt / stats.damage_received; const killsToDeathRatio = stats.frags / (stats.battles - stats.survived_battles); @@ -30,27 +30,28 @@ export function GenericAllStats({ 100) { - throw new UserError(t`bot.common.errors.query_too_long`); + throw new UserError(strings.bot.common.errors.query_too_long); } return await searchClansAcrossRegions(trimmed, limit); diff --git a/packages/bot/src/core/blitz/searchPlayersAcrossRegionsBotWrapper.ts b/packages/bot/src/core/blitz/searchPlayersAcrossRegionsBotWrapper.ts index 2e8c10779..89e473a8d 100644 --- a/packages/bot/src/core/blitz/searchPlayersAcrossRegionsBotWrapper.ts +++ b/packages/bot/src/core/blitz/searchPlayersAcrossRegionsBotWrapper.ts @@ -8,15 +8,15 @@ export async function searchPlayersAcrossRegionsBotWrapper( locale: Locale, limit?: number, ) { - const { t } = translator(locale); + const { strings } = translator(locale); const trimmed = search.trim(); if (trimmed.length < 3) { - throw new UserError(t`bot.common.errors.query_too_small`); + throw new UserError(strings.bot.common.errors.query_too_small); } if (trimmed.length > 100) { - throw new UserError(t`bot.common.errors.query_too_long`); + throw new UserError(strings.bot.common.errors.query_too_long); } return await searchPlayersAcrossRegions(trimmed, limit); diff --git a/packages/bot/src/core/blitzstars/getTankHistories.ts b/packages/bot/src/core/blitzstars/getTankHistories.ts index fd45a2f17..87cbbf2b2 100644 --- a/packages/bot/src/core/blitzstars/getTankHistories.ts +++ b/packages/bot/src/core/blitzstars/getTankHistories.ts @@ -38,7 +38,7 @@ export async function getTankHistories( locale: Locale, options?: Partial, ) { - const { t } = translator(locale); + const { strings } = translator(locale); const mergedOptions = { ...getTankHistoriesDefaultOptions, ...options }; const tankHistoriesResponse = await fetch( `https://www.blitzstars.com/api/tankhistories/for/${id}/`, @@ -82,7 +82,7 @@ export async function getTankHistories( const tankStats = await getTankStats(server, id); if (tankStats === null) { - throw new UserError(t`bot.common.errors.no_tank_stats`); + throw new UserError(strings.bot.common.errors.no_tank_stats); } tankStats.forEach((tankHistory) => { diff --git a/packages/bot/src/core/discord/addUsernameChoices.ts b/packages/bot/src/core/discord/addUsernameChoices.ts index 65de3e955..b1b3d7039 100644 --- a/packages/bot/src/core/discord/addUsernameChoices.ts +++ b/packages/bot/src/core/discord/addUsernameChoices.ts @@ -3,16 +3,22 @@ import { translator } from '../localization/translator'; import { localizationObject } from './localizationObject'; export function addUsernameChoices(option: SlashCommandStringOption) { - const { t } = translator(Locale.EnglishUS); + const { strings } = translator(Locale.EnglishUS); return option - .setName(t`bot.common.options.username`) + .setName(strings.bot.common.options.username.$) .setNameLocalizations( - localizationObject('bot.common.options.username', undefined, true), + localizationObject( + (strings) => strings.bot.common.options.username.$, + undefined, + true, + ), ) - .setDescription(t`bot.common.options.username.description`) + .setDescription(strings.bot.common.options.username.description) .setDescriptionLocalizations( - localizationObject('bot.common.options.username.description'), + localizationObject( + (strings) => strings.bot.common.options.username.description, + ), ) .setAutocomplete(true); } diff --git a/packages/bot/src/core/discord/buttonRefresh.ts b/packages/bot/src/core/discord/buttonRefresh.ts index caef84b41..fdf21e961 100644 --- a/packages/bot/src/core/discord/buttonRefresh.ts +++ b/packages/bot/src/core/discord/buttonRefresh.ts @@ -6,13 +6,13 @@ export function buttonRefresh( interaction: ChatInputCommandInteraction, path: string, ) { - const { t } = translator(interaction.locale); + const { strings } = translator(interaction.locale); if ( interaction.appPermissions?.has('ReadMessageHistory') && interaction.appPermissions?.has('ViewChannel') ) { - return buttonPrimary(path, t`bot.common.buttons.refresh`); + return buttonPrimary(path, strings.bot.common.buttons.refresh); } return null; diff --git a/packages/bot/src/events/interactionCreate/index.ts b/packages/bot/src/events/interactionCreate/index.ts index 846fd3fd3..e9b1c7a48 100644 --- a/packages/bot/src/events/interactionCreate/index.ts +++ b/packages/bot/src/events/interactionCreate/index.ts @@ -12,8 +12,6 @@ import { SlashCommandSubcommandsOnlyBuilder, } from 'discord.js'; import { RenderConfiguration } from '../../core/blitzkit/renderConfiguration'; -import { handleAutocomplete } from './handlers/autocomplete'; -import { handleChatInputCommand } from './handlers/chatInputCommand'; export type InteractionRawReturnable = | string @@ -109,9 +107,9 @@ export const commands = Promise.allSettled(COMMANDS_RAW).then((rawCommands) => { export async function interactionCreate(interaction: Interaction) { if (interaction.isAutocomplete()) { - handleAutocomplete(interaction); + // handleAutocomplete(interaction); } else if (interaction.isChatInputCommand()) { - handleChatInputCommand(interaction); + // handleChatInputCommand(interaction); } else if (interaction.isButton()) { // handleButton(interaction); }