{children}
diff --git a/src/components/TitleBar.tsx b/src/components/TitleBar.tsx
index 7449da129..ef5b284cc 100644
--- a/src/components/TitleBar.tsx
+++ b/src/components/TitleBar.tsx
@@ -1,75 +1,52 @@
import { theme } from '../stitches.config';
export interface TitleBarProps {
- name: string;
+ title: string;
image?: string;
description?: string;
}
-export default function TitleBar({ name, image, description }: TitleBarProps) {
+export default function TitleBar({ title, image, description }: TitleBarProps) {
return (
((resolve) => {
+ resolve({
+ inProduction: true,
+ inPublic: true,
- command: new SlashCommandBuilder()
- .setName('owned-tanks')
- .setDescription("Shows a player's owned tanks")
- .addStringOption(addTierChoices)
- .addStringOption(addUsernameChoices),
+ command: new SlashCommandBuilder()
+ .setName('owned-tanks')
+ .setDescription("Shows a player's owned tanks")
+ .addStringOption(addTierChoices)
+ .addStringOption(addUsernameChoices),
- async handler(interaction) {
- const tier = Number(interaction.options.getString('tier'));
- const account = await resolvePlayerFromCommand(interaction);
- const { id, region: server } = account;
- const accountInfo = await getAccountInfo(server, id);
- const tankStats = await getTankStats(server, id);
- const filteredTanks = (
- await Promise.all(
- tankStats.map(async (tankData) => ({
- tankDefinitions: (await tankDefinitions)[tankData.tank_id]!,
- id: tankData.tank_id,
- })),
- )
- ).filter((tank) => tank.tankDefinitions?.tier === tier);
- const clanAccountInfo = await getClanAccountInfo(server, id, ['clan']);
- const groupedTanks: Record = {};
- const nations: string[] = [];
+ async handler(interaction) {
+ const tier = Number(interaction.options.getString('tier'));
+ const account = await resolvePlayerFromCommand(interaction);
+ const { id, region: server } = account;
+ const accountInfo = await getAccountInfo(server, id);
+ const tankStats = await getTankStats(server, id);
+ const filteredTanks = (
+ await Promise.all(
+ tankStats.map(async (tankData) => ({
+ tankDefinitions: (await tankDefinitions)[tankData.tank_id]!,
+ id: tankData.tank_id,
+ })),
+ )
+ ).filter((tank) => tank.tankDefinitions?.tier === tier);
+ const clanAccountInfo = await getClanAccountInfo(server, id, ['clan']);
+ const groupedTanks: Record = {};
+ const nations: string[] = [];
- filteredTanks.forEach((tank) => {
- if (groupedTanks[tank.tankDefinitions.nation] === undefined) {
- groupedTanks[tank.tankDefinitions.nation] = [tank.tankDefinitions];
- nations.push(tank.tankDefinitions.nation);
- } else {
- groupedTanks[tank.tankDefinitions.nation].push(tank.tankDefinitions);
- }
- });
+ filteredTanks.forEach((tank) => {
+ if (groupedTanks[tank.tankDefinitions.nation] === undefined) {
+ groupedTanks[tank.tankDefinitions.nation] = [tank.tankDefinitions];
+ nations.push(tank.tankDefinitions.nation);
+ } else {
+ groupedTanks[tank.tankDefinitions.nation].push(tank.tankDefinitions);
+ }
+ });
- nations.sort();
+ nations.sort();
- return (
-
-
+
-
- {(await encyclopediaInfo).vehicle_nations[nation]}
-
+ return (
+
+
+ {(await encyclopediaInfo).vehicle_nations[nation]}
+
-
-
- {await Promise.all(
- leftColumn.map(async (tank) => (
-
-
- {await Promise.all(
- rightColumn.map(async (tank) => (
-
-
-
- );
- }),
- ))}
-
- );
- },
+
+
+ {await Promise.all(
+ leftColumn.map(async (tank) => (
+
+
+ {await Promise.all(
+ rightColumn.map(async (tank) => (
+
+
+
+ );
+ }),
+ ))}
+
+ );
+ },
- autocomplete: autocompleteUsername,
-};
+ autocomplete: autocompleteUsername,
+ });
+});
diff --git a/src/commands/permissions.ts b/src/commands/permissions.ts
index b8f29f563..367364d8e 100644
--- a/src/commands/permissions.ts
+++ b/src/commands/permissions.ts
@@ -1,42 +1,44 @@
import { SlashCommandBuilder } from 'discord.js';
import { CommandRegistry } from '../events/interactionCreate';
-export const permissionsCommand: CommandRegistry = {
- inProduction: true,
- inPublic: true,
+export const permissionsCommand = new Promise((resolve) => {
+ resolve({
+ inProduction: true,
+ inPublic: true,
- command: new SlashCommandBuilder()
- .setName('permissions')
- .setDescription('Checks wether the bot has the required permissions'),
+ command: new SlashCommandBuilder()
+ .setName('permissions')
+ .setDescription('Checks wether the bot has the required permissions'),
- async handler(interaction) {
- // friday the 13th permissions easter egg
- const isFridayThe13th =
- new Date().getDay() === 5 && new Date().getDate() === 13;
- const permissions = [
- [
- interaction.appPermissions?.has('ViewChannel'),
- 'View channels: needed for the refresh button to work',
- ],
- [
- interaction.appPermissions?.has('ReadMessageHistory'),
- 'Read message history: also needed for the refresh button to work',
- ],
- [
- interaction.appPermissions?.has('AttachFiles'),
- 'Attach files: needed for image-based commands to work',
- ],
- ];
- const body = permissions
- .map(([hasPermission, description]) => {
- if (hasPermission) {
- return `${isFridayThe13th ? '😇' : '✅'} ${description}`;
- } else {
- return `${isFridayThe13th ? '💀' : '❌'} ${description}`;
- }
- })
- .join('\n');
+ async handler(interaction) {
+ // friday the 13th permissions easter egg
+ const isFridayThe13th =
+ new Date().getDay() === 5 && new Date().getDate() === 13;
+ const permissions = [
+ [
+ interaction.appPermissions?.has('ViewChannel'),
+ 'View channels: needed for the refresh button to work',
+ ],
+ [
+ interaction.appPermissions?.has('ReadMessageHistory'),
+ 'Read message history: also needed for the refresh button to work',
+ ],
+ [
+ interaction.appPermissions?.has('AttachFiles'),
+ 'Attach files: needed for image-based commands to work',
+ ],
+ ];
+ const body = permissions
+ .map(([hasPermission, description]) => {
+ if (hasPermission) {
+ return `${isFridayThe13th ? '😇' : '✅'} ${description}`;
+ } else {
+ return `${isFridayThe13th ? '💀' : '❌'} ${description}`;
+ }
+ })
+ .join('\n');
- return `# Permissions\n${body}`;
- },
-};
+ return `# Permissions\n${body}`;
+ },
+ });
+});
diff --git a/src/commands/ping.ts b/src/commands/ping.ts
index bb93c57dc..e02eabcd0 100644
--- a/src/commands/ping.ts
+++ b/src/commands/ping.ts
@@ -1,32 +1,34 @@
import { SlashCommandBuilder } from 'discord.js';
import { CommandRegistry } from '../events/interactionCreate';
-export const pingCommand: CommandRegistry = {
- inProduction: true,
- inPublic: true,
- handlesInteraction: true,
+export const pingCommand = new Promise((resolve) => {
+ resolve({
+ inProduction: true,
+ inPublic: true,
+ handlesInteraction: true,
- command: new SlashCommandBuilder()
- .setName('ping')
- .setDescription('Check if the bot is alive')
- .addSubcommand((option) =>
- option.setName('blitzkrieg').setDescription('Ping Blitzkrieg'),
- )
- .addSubcommand((option) =>
- option.setName('blitz').setDescription('Ping Blitz'),
- ),
+ command: new SlashCommandBuilder()
+ .setName('ping')
+ .setDescription('Check if the bot is alive')
+ .addSubcommand((option) =>
+ option.setName('blitzkrieg').setDescription('Ping Blitzkrieg'),
+ )
+ .addSubcommand((option) =>
+ option.setName('blitz').setDescription('Ping Blitz'),
+ ),
- async handler(interaction) {
- const subcommand = interaction.options.getSubcommand();
- const executionStart = Date.now();
+ async handler(interaction) {
+ const subcommand = interaction.options.getSubcommand();
+ const executionStart = Date.now();
- if (subcommand === 'blitzkrieg') {
- await interaction.editReply('Pong 🏓');
- } else {
- await fetch('https://api.wotblitz.com/');
- }
+ if (subcommand === 'blitzkrieg') {
+ await interaction.editReply('Pong 🏓');
+ } else {
+ await fetch('https://api.wotblitz.com/');
+ }
- const executionTime = Date.now() - executionStart;
- interaction.editReply(`Pong 🏓 - ${executionTime}ms`);
- },
-};
+ const executionTime = Date.now() - executionStart;
+ interaction.editReply(`Pong 🏓 - ${executionTime}ms`);
+ },
+ });
+});
diff --git a/src/commands/playerAchievements.ts b/src/commands/playerAchievements.ts
index 440b4d954..ec76f0a0f 100644
--- a/src/commands/playerAchievements.ts
+++ b/src/commands/playerAchievements.ts
@@ -12,57 +12,62 @@ import { CommandRegistry } from '../events/interactionCreate';
type SortBy = 'name' | 'count';
-export const playerAchievementsCommand: CommandRegistry = {
- inProduction: true,
- inPublic: true,
+export const playerAchievementsCommand = new Promise(
+ (resolve) => {
+ resolve({
+ inProduction: true,
+ inPublic: true,
- command: new SlashCommandBuilder()
- .setName('player-achievements')
- .setDescription("All the player's achievements")
- .addStringOption(addUsernameChoices)
- .addStringOption((option) =>
- option
- .setName('sort')
- .setDescription('What to sort by (default: name)')
- .addChoices(
- { name: 'By name', value: 'name' satisfies SortBy },
- { name: 'By count', value: 'count' satisfies SortBy },
+ command: new SlashCommandBuilder()
+ .setName('player-achievements')
+ .setDescription("All the player's achievements")
+ .addStringOption(addUsernameChoices)
+ .addStringOption((option) =>
+ option
+ .setName('sort')
+ .setDescription('What to sort by (default: name)')
+ .addChoices(
+ { name: 'By name', value: 'name' satisfies SortBy },
+ { name: 'By count', value: 'count' satisfies SortBy },
+ ),
),
- ),
- async handler(interaction) {
- const sortBy = (interaction.options.getString('sort') ?? 'name') as SortBy;
- const account = await resolvePlayerFromCommand(interaction);
- const { id, region: region } = account;
- const accountInfo = await getAccountInfo(region, id);
- const accountsAchievements = await getAccountAchievements(region, id);
- const accountAchievements = accountsAchievements;
- const compound = {
- ...accountAchievements.achievements,
- ...accountAchievements.max_series,
- };
+ async handler(interaction) {
+ const sortBy = (interaction.options.getString('sort') ??
+ 'name') as SortBy;
+ const account = await resolvePlayerFromCommand(interaction);
+ const { id, region: region } = account;
+ const accountInfo = await getAccountInfo(region, id);
+ const accountsAchievements = await getAccountAchievements(region, id);
+ const accountAchievements = accountsAchievements;
+ const compound = {
+ ...accountAchievements.achievements,
+ ...accountAchievements.max_series,
+ };
- return embedInfo(
- `${markdownEscape(accountInfo.nickname)}'s information`,
+ return embedInfo(
+ `${markdownEscape(accountInfo.nickname)}'s information`,
- markdownTable(
- Object.keys(compound)
- .filter((achievement) => compound[achievement] > 0)
- .sort(
- sortBy === 'count'
- ? (a, b) => compound[b] - compound[a]
- : undefined,
- )
- .map(
- (achievement) =>
- [
- startCase(achievement),
- compound[achievement],
- ] as TableInputEntry,
+ markdownTable(
+ Object.keys(compound)
+ .filter((achievement) => compound[achievement] > 0)
+ .sort(
+ sortBy === 'count'
+ ? (a, b) => compound[b] - compound[a]
+ : undefined,
+ )
+ .map(
+ (achievement) =>
+ [
+ startCase(achievement),
+ compound[achievement],
+ ] as TableInputEntry,
+ ),
),
- ),
- );
- },
+ );
+ },
- autocomplete: autocompleteUsername,
-};
+ autocomplete: autocompleteUsername,
+ });
+ },
+);
diff --git a/src/commands/playerInfo.ts b/src/commands/playerInfo.ts
index 64342da2d..69a628be9 100644
--- a/src/commands/playerInfo.ts
+++ b/src/commands/playerInfo.ts
@@ -8,47 +8,49 @@ import markdownTable from '../core/discord/markdownTable';
import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
import { CommandRegistry } from '../events/interactionCreate';
-export const playerInfoCommand: CommandRegistry = {
- inProduction: true,
- inPublic: true,
+export const playerInfoCommand = new Promise((resolve) => {
+ resolve({
+ inProduction: true,
+ inPublic: true,
- command: new SlashCommandBuilder()
- .setName('player-info')
- .setDescription('Basic information about a player')
- .addStringOption(addUsernameChoices),
+ command: new SlashCommandBuilder()
+ .setName('player-info')
+ .setDescription('Basic information about a player')
+ .addStringOption(addUsernameChoices),
- async handler(interaction) {
- const account = await resolvePlayerFromCommand(interaction);
- const { id, region: region } = account;
- const accountInfo = await getAccountInfo(region, id);
+ async handler(interaction) {
+ const account = await resolvePlayerFromCommand(interaction);
+ const { id, region: region } = account;
+ const accountInfo = await getAccountInfo(region, id);
- return embedInfo(
- `${markdownEscape(accountInfo.nickname)}'s information`,
+ return embedInfo(
+ `${markdownEscape(accountInfo.nickname)}'s information`,
- markdownTable([
- ['Nickname', `${accountInfo.nickname}`],
- ['Battles', `${accountInfo.statistics.all.battles}`],
- [
- 'Winrate',
- `${(
- 100 *
- (accountInfo.statistics.all.wins /
- accountInfo.statistics.all.battles)
- ).toFixed(2)}%`,
- ],
- [],
- ['Account ID', `${accountInfo.account_id}`],
- [
- 'Created',
- `${new Date(accountInfo.created_at * 1000).toDateString()}`,
- ],
- [
- 'Last battle',
- `${new Date(accountInfo.last_battle_time * 1000).toDateString()}`,
- ],
- ]),
- );
- },
+ markdownTable([
+ ['Nickname', `${accountInfo.nickname}`],
+ ['Battles', `${accountInfo.statistics.all.battles}`],
+ [
+ 'Winrate',
+ `${(
+ 100 *
+ (accountInfo.statistics.all.wins /
+ accountInfo.statistics.all.battles)
+ ).toFixed(2)}%`,
+ ],
+ [],
+ ['Account ID', `${accountInfo.account_id}`],
+ [
+ 'Created',
+ `${new Date(accountInfo.created_at * 1000).toDateString()}`,
+ ],
+ [
+ 'Last battle',
+ `${new Date(accountInfo.last_battle_time * 1000).toDateString()}`,
+ ],
+ ]),
+ );
+ },
- autocomplete: autocompleteUsername,
-};
+ autocomplete: autocompleteUsername,
+ });
+});
diff --git a/src/commands/ratings.tsx b/src/commands/ratings.tsx
index 91dc7d817..5fbe47c79 100644
--- a/src/commands/ratings.tsx
+++ b/src/commands/ratings.tsx
@@ -27,7 +27,7 @@ import addUsernameChoices from '../core/discord/addUsernameChoices';
import autocompleteUsername from '../core/discord/autocompleteUsername';
import embedNegative from '../core/discord/embedNegative';
import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
-import { CommandRegistryPromisable } from '../events/interactionCreate';
+import { CommandRegistry } from '../events/interactionCreate';
import { UserError } from '../hooks/userError';
export interface RatingsPlayer {
@@ -122,334 +122,329 @@ const noOngoingSeason = embedNegative(
"Wargaming didn't provide any data for this season.",
);
-export const ratingsCommand = new Promise(
- async (resolve) => {
- const latestArchivedSeasonNumber = await getArchivedLatestSeasonNumber();
- const onGoingSeason = await isOnGoingRatingsSeason();
- const seasonNumbers = range(
- FIRST_ARCHIVED_RATINGS_SEASON,
- latestArchivedSeasonNumber + (onGoingSeason ? 1 : 0) + 1,
+export const ratingsCommand = new Promise(async (resolve) => {
+ const latestArchivedSeasonNumber = await getArchivedLatestSeasonNumber();
+ const onGoingSeason = await isOnGoingRatingsSeason();
+ const seasonNumbers = range(
+ FIRST_ARCHIVED_RATINGS_SEASON,
+ latestArchivedSeasonNumber + (onGoingSeason ? 1 : 0) + 1,
+ );
+
+ function addSubcommands(option: SlashCommandSubcommandBuilder) {
+ return option
+ .addStringOption(addUsernameChoices)
+ .addIntegerOption((option) =>
+ option
+ .setName('limit')
+ .setDescription('How many neighbors to display (default: 10)')
+ .setRequired(false)
+ .setMinValue(5)
+ .setMaxValue(30),
+ )
+ .addStringOption((option) =>
+ option
+ .setName('season')
+ .setDescription('Season number')
+ .setRequired(false)
+ .addChoices(
+ ...seasonNumbers
+ .map(
+ (number, index) =>
+ ({
+ name: `${number}${index === seasonNumbers.length - 1 && onGoingSeason ? ' (current)' : ''}`,
+ value: `${number}`,
+ }) satisfies APIApplicationCommandOptionChoice,
+ )
+ .reverse(),
+ ),
+ );
+ }
+
+ const command = new SlashCommandBuilder()
+ .setName('ratings')
+ .setDescription('Ratings battles statistics')
+ .addSubcommand((option) =>
+ addSubcommands(
+ option
+ .setName('neighbors')
+ .setDescription('Shows neighboring players on the leaderboard'),
+ ),
+ )
+ .addSubcommand((option) =>
+ addSubcommands(
+ option
+ .setName('league')
+ .setDescription('Shows top players from a league')
+ .addStringOption(addRegionChoices)
+ .addStringOption((option) =>
+ option
+ .setName('league')
+ .setDescription('The league to display')
+ .addChoices(
+ ...LEAGUES.map(
+ ({ name }, value) =>
+ ({
+ name,
+ value: `${value}`,
+ }) satisfies APIApplicationCommandOptionChoice,
+ ),
+ )
+ .setRequired(true),
+ ),
+ ),
);
- function addSubcommands(option: SlashCommandSubcommandBuilder) {
- return option
- .addStringOption(addUsernameChoices)
- .addIntegerOption((option) =>
- option
- .setName('limit')
- .setDescription('How many neighbors to display (default: 10)')
- .setRequired(false)
- .setMinValue(5)
- .setMaxValue(30),
- )
- .addStringOption((option) =>
- option
- .setName('season')
- .setDescription('Season number')
- .setRequired(false)
- .addChoices(
- ...seasonNumbers
- .map(
- (number, index) =>
+ resolve({
+ inProduction: true,
+ inPublic: true,
+
+ command,
+
+ async handler(interaction) {
+ interface SimplifiedPlayer {
+ id: number;
+ score: number;
+ position: number;
+ clan: string | undefined;
+ nickname: string;
+ }
+
+ const subcommand = interaction.options.getSubcommand(true) as
+ | 'league'
+ | 'neighbors';
+ const limit = interaction.options.getInteger('limit') ?? 10;
+ const seasonOption = interaction.options.getString('season');
+ const season = seasonOption
+ ? parseInt(seasonOption)
+ : onGoingSeason
+ ? latestArchivedSeasonNumber + 1
+ : latestArchivedSeasonNumber;
+ const isCurrentSeason = season === latestArchivedSeasonNumber + 1;
+ let titleName: string;
+ let titleImage: string | undefined;
+ let titleDescription: string;
+ let playersBefore: number;
+ let playersAfter: number;
+ let players: SimplifiedPlayer[] | undefined;
+ let midnightLeaderboard: BlitzkriegRatingsLeaderboard | undefined;
+ let playerId: number | undefined;
+ let regionRatingsInfo: RatingsInfo;
+
+ if (subcommand === 'league') {
+ const leagueIndex = parseInt(interaction.options.getString('league')!);
+ const region = interaction.options.getString('region') as Region;
+ regionRatingsInfo = await (isCurrentSeason
+ ? getRatingsInfo(region)
+ : getArchivedRatingsInfo(region, season!));
+
+ if (regionRatingsInfo.detail !== undefined) return noOngoingSeason;
+
+ const result = isCurrentSeason
+ ? await getRatingsLeague(region, leagueIndex).then(async (result) =>
+ result.slice(0, limit).map(
+ (player) =>
+ ({
+ id: player.spa_id,
+ score: player.score,
+ position: player.number,
+ clan: player.clan_tag,
+ nickname: player.nickname,
+ }) satisfies SimplifiedPlayer,
+ ),
+ )
+ : await getArchivedRatingsLeaderboard(region, season!).then(
+ async (players) => {
+ const firstPlayerIndex =
+ leagueIndex === 0
+ ? 0
+ : players.findIndex(
+ (player) =>
+ player.score < LEAGUES[leagueIndex - 1].minScore,
+ );
+ const lastPlayerIndex = firstPlayerIndex + limit - 1;
+ const trimmed = players.slice(
+ firstPlayerIndex,
+ lastPlayerIndex + 1,
+ );
+ const clanData = await getClanAccountInfo(
+ region,
+ trimmed.map(({ id }) => id),
+ ['clan'],
+ );
+
+ return trimmed.map(
+ (player, index) =>
({
- name: `${number}${index === seasonNumbers.length - 1 && onGoingSeason ? ' (current)' : ''}`,
- value: `${number}`,
- }) satisfies APIApplicationCommandOptionChoice,
- )
- .reverse(),
- ),
- );
- }
+ id: player.id,
+ score: player.score,
+ position: firstPlayerIndex + index + 1,
+ clan: clanData[player.id]?.clan?.tag,
+ nickname:
+ clanData[index]?.account_name ?? `Deleted ${player.id}`,
+ }) satisfies SimplifiedPlayer,
+ );
+ },
+ );
+ const leagueInfo = regionRatingsInfo.leagues[leagueIndex];
+ midnightLeaderboard = isCurrentSeason
+ ? await getArchivedRatingsMidnightLeaderboard(
+ region,
+ regionRatingsInfo.current_season,
+ )
+ : await getArchivedRatingsMidnightLeaderboard(region, season!);
- const command = new SlashCommandBuilder()
- .setName('ratings')
- .setDescription('Ratings battles statistics')
- .addSubcommand((option) =>
- addSubcommands(
- option
- .setName('neighbors')
- .setDescription('Shows neighboring players on the leaderboard'),
- ),
- )
- .addSubcommand((option) =>
- addSubcommands(
- option
- .setName('league')
- .setDescription('Shows top players from a league')
- .addStringOption(addRegionChoices)
- .addStringOption((option) =>
- option
- .setName('league')
- .setDescription('The league to display')
- .addChoices(
- ...LEAGUES.map(
- ({ name }, value) =>
- ({
- name,
- value: `${value}`,
- }) satisfies APIApplicationCommandOptionChoice,
- ),
- )
- .setRequired(true),
- ),
- ),
- );
+ players = result;
+ playersBefore = result ? result[0].position - 1 : 0;
+ playersAfter =
+ regionRatingsInfo.count - result[result.length - 1].position;
+ titleName = `${
+ leagueInfo ? leagueInfo.title : 'No Ongoing Season'
+ } - ${REGION_NAMES_SHORT[region]}`;
+ titleImage = leagueInfo.big_icon.startsWith('http')
+ ? leagueInfo.big_icon
+ : `https:${leagueInfo.big_icon}`;
+ titleDescription = `Top ${limit} players`;
+ } else {
+ const { region, id } = await resolvePlayerFromCommand(interaction);
+ regionRatingsInfo = isCurrentSeason
+ ? await getRatingsInfo(region)
+ : await getArchivedRatingsInfo(region, season!);
- resolve({
- inProduction: true,
- inPublic: true,
+ if (regionRatingsInfo.detail !== undefined) return noOngoingSeason;
- command,
-
- async handler(interaction) {
- interface SimplifiedPlayer {
- id: number;
- score: number;
- position: number;
- clan: string | undefined;
- nickname: string;
- }
-
- const subcommand = interaction.options.getSubcommand(true) as
- | 'league'
- | 'neighbors';
- const limit = interaction.options.getInteger('limit') ?? 10;
- const seasonOption = interaction.options.getString('season');
- const season = seasonOption
- ? parseInt(seasonOption)
- : onGoingSeason
- ? latestArchivedSeasonNumber + 1
- : latestArchivedSeasonNumber;
- const isCurrentSeason = season === latestArchivedSeasonNumber + 1;
- let titleName: string;
- let titleImage: string | undefined;
- let titleDescription: string;
- let playersBefore: number;
- let playersAfter: number;
- let players: SimplifiedPlayer[] | undefined;
- let midnightLeaderboard: BlitzkriegRatingsLeaderboard | undefined;
- let playerId: number | undefined;
- let regionRatingsInfo: RatingsInfo;
-
- if (subcommand === 'league') {
- const leagueIndex = parseInt(
- interaction.options.getString('league')!,
- );
- const region = interaction.options.getString('region') as Region;
- regionRatingsInfo = await (isCurrentSeason
- ? getRatingsInfo(region)
- : getArchivedRatingsInfo(region, season!));
-
- if (regionRatingsInfo.detail !== undefined) return noOngoingSeason;
-
- const result = isCurrentSeason
- ? await getRatingsLeague(region, leagueIndex).then(async (result) =>
- result.slice(0, limit).map(
+ const accountInfo = await getAccountInfo(region, id);
+ const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+ const neighbors = isCurrentSeason
+ ? await getRatingsNeighbors(region, id, Math.round(limit / 2)).then(
+ (players) =>
+ players.neighbors.map(
(player) =>
({
id: player.spa_id,
- score: player.score,
position: player.number,
+ score: player.score,
clan: player.clan_tag,
nickname: player.nickname,
}) satisfies SimplifiedPlayer,
),
- )
- : await getArchivedRatingsLeaderboard(region, season!).then(
- async (players) => {
- const firstPlayerIndex =
- leagueIndex === 0
- ? 0
- : players.findIndex(
- (player) =>
- player.score < LEAGUES[leagueIndex - 1].minScore,
- );
- const lastPlayerIndex = firstPlayerIndex + limit - 1;
- const trimmed = players.slice(
- firstPlayerIndex,
- lastPlayerIndex + 1,
- );
- const clanData = await getClanAccountInfo(
- region,
- trimmed.map(({ id }) => id),
- ['clan'],
+ )
+ : await getArchivedRatingsLeaderboard(region, season!).then(
+ async (players) => {
+ const playerIndex = players.findIndex(
+ (player) => player.id === id,
+ );
+
+ if (playerIndex === -1) {
+ throw new UserError(
+ `# ${markdownEscape(accountInfo.nickname)} didn't play ratings in season ${season}\nThis player did not participate in this season or did not get past calibration.`,
);
+ }
- return trimmed.map(
- (player, index) =>
- ({
- id: player.id,
- score: player.score,
- position: firstPlayerIndex + index + 1,
- clan: clanData[player.id]?.clan?.tag,
- nickname:
- clanData[index]?.account_name ??
- `Deleted ${player.id}`,
- }) satisfies SimplifiedPlayer,
- );
- },
- );
- const leagueInfo = regionRatingsInfo.leagues[leagueIndex];
- midnightLeaderboard = isCurrentSeason
- ? await getArchivedRatingsMidnightLeaderboard(
- region,
- regionRatingsInfo.current_season,
- )
- : await getArchivedRatingsMidnightLeaderboard(region, season!);
+ const halfRange = Math.round(limit / 2);
+ const trimmed = players.slice(
+ playerIndex - halfRange,
+ playerIndex + halfRange + 1,
+ );
+ const clanData = await getClanAccountInfo(
+ region,
+ trimmed.map((player) => player.id),
+ ['clan'],
+ );
- players = result;
- playersBefore = result ? result[0].position - 1 : 0;
- playersAfter =
- regionRatingsInfo.count - result[result.length - 1].position;
- titleName = `${
- leagueInfo ? leagueInfo.title : 'No Ongoing Season'
- } - ${REGION_NAMES_SHORT[region]}`;
- titleImage = leagueInfo.big_icon.startsWith('http')
- ? leagueInfo.big_icon
- : `https:${leagueInfo.big_icon}`;
- titleDescription = `Top ${limit} players`;
- } else {
- const { region, id } = await resolvePlayerFromCommand(interaction);
- regionRatingsInfo = isCurrentSeason
- ? await getRatingsInfo(region)
- : await getArchivedRatingsInfo(region, season!);
+ return trimmed.map((player, index) => ({
+ id: player.id,
+ score: player.score,
+ position: playerIndex + index + 1,
+ clan: clanData[index]?.clan?.tag,
+ nickname: clanData[index]
+ ? clanData[index]!.account_name
+ : `Deleted ${player.id}`,
+ }));
+ },
+ );
+ midnightLeaderboard = isCurrentSeason
+ ? await getArchivedRatingsMidnightLeaderboard(
+ region,
+ regionRatingsInfo.current_season,
+ )
+ : await getArchivedRatingsMidnightLeaderboard(region, season!);
- if (regionRatingsInfo.detail !== undefined) return noOngoingSeason;
+ players = neighbors;
+ titleImage = clan
+ ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clan.emblem_set_id}.png`
+ : undefined;
+ titleName = neighbors
+ ? accountInfo.nickname
+ : `No Ongoing Season - ${REGION_NAMES_SHORT[region]}`;
+ titleDescription = 'Ratings neighbors';
+ playersBefore = neighbors ? neighbors[0].position - 1 : 0;
+ playersAfter =
+ regionRatingsInfo.count - neighbors[neighbors.length - 1].position;
+ playerId = id;
+ }
- const accountInfo = await getAccountInfo(region, id);
- const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
- const neighbors = isCurrentSeason
- ? await getRatingsNeighbors(region, id, Math.round(limit / 2)).then(
- (players) =>
- players.neighbors.map(
- (player) =>
- ({
- id: player.spa_id,
- position: player.number,
- score: player.score,
- clan: player.clan_tag,
- nickname: player.nickname,
- }) satisfies SimplifiedPlayer,
- ),
- )
- : await getArchivedRatingsLeaderboard(region, season!).then(
- async (players) => {
- const playerIndex = players.findIndex(
- (player) => player.id === id,
- );
+ const resolvedRegionRatingsInfo: typeof regionRatingsInfo & {
+ detail: undefined;
+ } = regionRatingsInfo;
- if (playerIndex === -1) {
- throw new UserError(
- `# ${markdownEscape(accountInfo.nickname)} didn't play ratings in season ${season}\nThis player did not participate in this season or did not get past calibration.`,
- );
- }
-
- const halfRange = Math.round(limit / 2);
- const trimmed = players.slice(
- playerIndex - halfRange,
- playerIndex + halfRange + 1,
- );
- const clanData = await getClanAccountInfo(
- region,
- trimmed.map((player) => player.id),
- ['clan'],
- );
-
- return trimmed.map((player, index) => ({
- id: player.id,
- score: player.score,
- position: playerIndex + index + 1,
- clan: clanData[index]?.clan?.tag,
- nickname: clanData[index]
- ? clanData[index]!.account_name
- : `Deleted ${player.id}`,
- }));
- },
- );
- midnightLeaderboard = isCurrentSeason
- ? await getArchivedRatingsMidnightLeaderboard(
- region,
- regionRatingsInfo.current_season,
- )
- : await getArchivedRatingsMidnightLeaderboard(region, season!);
-
- players = neighbors;
- titleImage = clan
- ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clan.emblem_set_id}.png`
- : undefined;
- titleName = neighbors
- ? accountInfo.nickname
- : `No Ongoing Season - ${REGION_NAMES_SHORT[region]}`;
- titleDescription = 'Ratings neighbors';
- playersBefore = neighbors ? neighbors[0].position - 1 : 0;
- playersAfter =
- regionRatingsInfo.count - neighbors[neighbors.length - 1].position;
- playerId = id;
- }
-
- const resolvedRegionRatingsInfo: typeof regionRatingsInfo & {
- detail: undefined;
- } = regionRatingsInfo;
-
- const items = players.map((player) => {
- const reward = resolvedRegionRatingsInfo.rewards.find(
- (reward) =>
- player.position >= reward.from_position &&
- player.position <= reward.to_position,
- );
- const midnightIndex = midnightLeaderboard?.findIndex(
- (item) => item.id === player.id,
- );
- const midnightScore =
- midnightIndex === undefined
- ? player.score
- : midnightLeaderboard![midnightIndex].score;
- const midnightPosition =
- midnightIndex === undefined ? player.position : midnightIndex + 1;
-
- return (
-
-
- {playersBefore > 0 && (
-
- )}
-
+
+
+ {playersBefore > 0 && (
+
+ )}
+
+ );
+ },
+
+ autocomplete: autocompleteUsername,
+ });
+});
diff --git a/src/commands/searchClans.ts b/src/commands/searchClans.ts
index 9b4860799..4b70afae5 100644
--- a/src/commands/searchClans.ts
+++ b/src/commands/searchClans.ts
@@ -9,38 +9,42 @@ import embedInfo from '../core/discord/embedInfo';
import { CommandRegistry } from '../events/interactionCreate';
import { ClanList } from '../types/clanList';
-export const searchClansCommand: CommandRegistry = {
- inProduction: true,
- inPublic: true,
+export const searchClansCommand = new Promise((resolve) => {
+ resolve({
+ inProduction: true,
+ inPublic: true,
- command: new SlashCommandBuilder()
- .setName('search-clans')
- .setDescription('Search clans')
- .addStringOption(addRegionChoices)
- .addStringOption((option) => addClanChoices(option).setAutocomplete(false))
- .addIntegerOption((option) =>
- option
- .setName('limit')
- .setDescription('The size of the search result (default: 25)')
- .setMinValue(1)
- .setMaxValue(100),
- ),
+ command: new SlashCommandBuilder()
+ .setName('search-clans')
+ .setDescription('Search clans')
+ .addStringOption(addRegionChoices)
+ .addStringOption((option) =>
+ addClanChoices(option).setAutocomplete(false),
+ )
+ .addIntegerOption((option) =>
+ option
+ .setName('limit')
+ .setDescription('The size of the search result (default: 25)')
+ .setMinValue(1)
+ .setMaxValue(100),
+ ),
- async handler(interaction) {
- const server = interaction.options.getString('region') as Region;
- const clan = interaction.options.getString('clan')!;
- const limit = interaction.options.getInteger('limit') ?? 25;
- const clanList = await fetchBlitz(
- `https://api.wotblitz.${server}/wotb/clans/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${clan}&limit=${limit}`,
- );
+ async handler(interaction) {
+ const server = interaction.options.getString('region') as Region;
+ const clan = interaction.options.getString('clan')!;
+ const limit = interaction.options.getInteger('limit') ?? 25;
+ const clanList = await fetchBlitz(
+ `https://api.wotblitz.${server}/wotb/clans/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${clan}&limit=${limit}`,
+ );
- return embedInfo(
- `Clan search for "${markdownEscape(clan)}" in ${REGION_NAMES[server]}`,
- clanList.length === 0
- ? 'No clans found.'
- : `\`\`\`\n${clanList
- .map((clan) => `${clan.name} [${clan.tag}]`)
- .join('\n')}\n\`\`\``,
- );
- },
-};
+ return embedInfo(
+ `Clan search for "${markdownEscape(clan)}" in ${REGION_NAMES[server]}`,
+ clanList.length === 0
+ ? 'No clans found.'
+ : `\`\`\`\n${clanList
+ .map((clan) => `${clan.name} [${clan.tag}]`)
+ .join('\n')}\n\`\`\``,
+ );
+ },
+ });
+});
diff --git a/src/commands/searchPlayers.ts b/src/commands/searchPlayers.ts
index 3d6037bcc..11f642735 100644
--- a/src/commands/searchPlayers.ts
+++ b/src/commands/searchPlayers.ts
@@ -12,45 +12,47 @@ import addUsernameChoices from '../core/discord/addUsernameChoices';
import embedInfo from '../core/discord/embedInfo';
import { CommandRegistry } from '../events/interactionCreate';
-export const searchPlayersCommand: CommandRegistry = {
- inProduction: true,
- inPublic: true,
+export const searchPlayersCommand = new Promise((resolve) => {
+ resolve({
+ inProduction: true,
+ inPublic: true,
- command: new SlashCommandBuilder()
- .setName('search-players')
- .setDescription('Search players in a Blitz server')
- .addStringOption(addRegionChoices)
- .addStringOption((option) =>
- addUsernameChoices(option).setAutocomplete(false).setRequired(true),
- )
- .addIntegerOption((option) =>
- option
- .setName('limit')
- .setDescription('The size of the search result (default: 25)')
- .setMinValue(1)
- .setMaxValue(100),
- ),
+ command: new SlashCommandBuilder()
+ .setName('search-players')
+ .setDescription('Search players in a Blitz server')
+ .addStringOption(addRegionChoices)
+ .addStringOption((option) =>
+ addUsernameChoices(option).setAutocomplete(false).setRequired(true),
+ )
+ .addIntegerOption((option) =>
+ option
+ .setName('limit')
+ .setDescription('The size of the search result (default: 25)')
+ .setMinValue(1)
+ .setMaxValue(100),
+ ),
- async handler(interaction) {
- const server = interaction.options.getString('region') as Region;
- const name = interaction.options.getString('username')!;
- const limit = interaction.options.getInteger('limit') ?? 25;
- const trimmedSearch = name.trim();
- const players = usernamePattern.test(trimmedSearch)
- ? await fetchBlitz(
- `https://api.wotblitz.${server}/wotb/account/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${encodeURIComponent(
- trimmedSearch,
- )}&limit=${limit}`,
- )
- : [];
+ async handler(interaction) {
+ const server = interaction.options.getString('region') as Region;
+ const name = interaction.options.getString('username')!;
+ const limit = interaction.options.getInteger('limit') ?? 25;
+ const trimmedSearch = name.trim();
+ const players = usernamePattern.test(trimmedSearch)
+ ? await fetchBlitz(
+ `https://api.wotblitz.${server}/wotb/account/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${encodeURIComponent(
+ trimmedSearch,
+ )}&limit=${limit}`,
+ )
+ : [];
- return embedInfo(
- `Player search for "${markdownEscape(name)}" in ${REGION_NAMES[server]}`,
- `\`\`\`${
- players.length === 0
- ? 'No players found.'
- : players.map((player) => player.nickname).join('\n')
- }\`\`\``,
- );
- },
-};
+ return embedInfo(
+ `Player search for "${markdownEscape(name)}" in ${REGION_NAMES[server]}`,
+ `\`\`\`${
+ players.length === 0
+ ? 'No players found.'
+ : players.map((player) => player.nickname).join('\n')
+ }\`\`\``,
+ );
+ },
+ });
+});
diff --git a/src/commands/searchTanks.ts b/src/commands/searchTanks.ts
index e06414c46..86dfa42ab 100644
--- a/src/commands/searchTanks.ts
+++ b/src/commands/searchTanks.ts
@@ -6,35 +6,39 @@ import addTankChoices from '../core/discord/addTankChoices';
import embedInfo from '../core/discord/embedInfo';
import { CommandRegistry } from '../events/interactionCreate';
-export const searchTanksCommand: CommandRegistry = {
- inProduction: true,
- inPublic: true,
+export const searchTanksCommand = new Promise((resolve) => {
+ resolve({
+ inProduction: true,
+ inPublic: true,
- command: new SlashCommandBuilder()
- .setName('search-tanks')
- .setDescription('Search tanks')
- .addStringOption((option) => addTankChoices(option).setAutocomplete(false))
- .addIntegerOption((option) =>
- option
- .setName('limit')
- .setDescription('The size of the search result (default: 25)')
- .setMinValue(1)
- .setMaxValue(100),
- ),
+ command: new SlashCommandBuilder()
+ .setName('search-tanks')
+ .setDescription('Search tanks')
+ .addStringOption((option) =>
+ addTankChoices(option).setAutocomplete(false),
+ )
+ .addIntegerOption((option) =>
+ option
+ .setName('limit')
+ .setDescription('The size of the search result (default: 25)')
+ .setMinValue(1)
+ .setMaxValue(100),
+ ),
- async handler(interaction) {
- const tank = interaction.options.getString('tank')!;
- const limit = interaction.options.getInteger('limit') ?? 25;
- const results = go(tank, await tankNames, {
- limit,
- keys: ['combined'],
- }).map((result) => result.obj.original);
+ async handler(interaction) {
+ const tank = interaction.options.getString('tank')!;
+ const limit = interaction.options.getInteger('limit') ?? 25;
+ const results = go(tank, await tankNames, {
+ limit,
+ keys: ['combined'],
+ }).map((result) => result.obj.original);
- return embedInfo(
- `Tank search for "${markdownEscape(tank)}"`,
- results.length === 0
- ? 'No tanks found.'
- : `\`\`\`\n${results.join('\n')}\n\`\`\``,
- );
- },
-};
+ return embedInfo(
+ `Tank search for "${markdownEscape(tank)}"`,
+ results.length === 0
+ ? 'No tanks found.'
+ : `\`\`\`\n${results.join('\n')}\n\`\`\``,
+ );
+ },
+ });
+});
diff --git a/src/commands/stats.tsx b/src/commands/stats.tsx
index 27ca249c3..0e18962d7 100644
--- a/src/commands/stats.tsx
+++ b/src/commands/stats.tsx
@@ -27,7 +27,7 @@ import resolvePlayerFromCommand, {
ResolvedPlayer,
} from '../core/discord/resolvePlayerFromCommand';
import { StatFilters, filterStats } from '../core/statistics/filterStats';
-import { CommandRegistryPromisable } from '../events/interactionCreate';
+import { CommandRegistry } from '../events/interactionCreate';
async function render(
{ region, id }: ResolvedPlayer,
@@ -57,50 +57,48 @@ async function render(
);
}
-export const statsCommand = new Promise(
- async (resolve) => {
- const command = await addPeriodicFilterOptions(
- new SlashCommandBuilder()
- .setName('stats')
- .setDescription('Regular battles statistics'),
- (option) => option.addStringOption(addUsernameChoices),
- );
+export const statsCommand = new Promise(async (resolve) => {
+ const command = await addPeriodicFilterOptions(
+ new SlashCommandBuilder()
+ .setName('stats')
+ .setDescription('Regular battles statistics'),
+ (option) => option.addStringOption(addUsernameChoices),
+ );
- resolve({
- inProduction: true,
- inPublic: true,
+ resolve({
+ inProduction: true,
+ inPublic: true,
- command,
+ command,
- async handler(interaction) {
- const player = await resolvePlayerFromCommand(interaction);
- const period = resolvePeriodFromCommand(player.region, interaction);
- const filters = await getFiltersFromCommand(interaction);
- const path = commandToURL(interaction, {
- ...player,
- ...getCustomPeriodParams(interaction),
- ...filters,
- });
+ async handler(interaction) {
+ const player = await resolvePlayerFromCommand(interaction);
+ const period = resolvePeriodFromCommand(player.region, interaction);
+ const filters = await getFiltersFromCommand(interaction);
+ const path = commandToURL(interaction, {
+ ...player,
+ ...getCustomPeriodParams(interaction),
+ ...filters,
+ });
- return Promise.all([
- render(player, period, filters),
- buttonRefresh(interaction, path),
- getBlitzStarsLinkButton(player.region, player.id),
- ]);
- },
+ return Promise.all([
+ render(player, period, filters),
+ buttonRefresh(interaction, path),
+ getBlitzStarsLinkButton(player.region, player.id),
+ ]);
+ },
- autocomplete: (interaction) => {
- autocompleteUsername(interaction);
- autocompleteTanks(interaction);
- },
+ autocomplete: (interaction) => {
+ autocompleteUsername(interaction);
+ autocompleteTanks(interaction);
+ },
- async button(interaction) {
- const player = await resolvePlayerFromButton(interaction);
- const period = resolvePeriodFromButton(player.region, interaction);
- const filters = getFiltersFromButton(interaction);
+ async button(interaction) {
+ const player = await resolvePlayerFromButton(interaction);
+ const period = resolvePeriodFromButton(player.region, interaction);
+ const filters = getFiltersFromButton(interaction);
- return await render(player, period, filters);
- },
- });
- },
-);
+ return await render(player, period, filters);
+ },
+ });
+});
diff --git a/src/commands/today.ts b/src/commands/today.ts
index 81e82405b..cc7e0e30f 100644
--- a/src/commands/today.ts
+++ b/src/commands/today.ts
@@ -14,58 +14,56 @@ import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton';
import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand';
import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
-import { CommandRegistryPromisable } from '../events/interactionCreate';
+import { CommandRegistry } from '../events/interactionCreate';
import { renderBreakdown } from './breakdown';
-export const todayCommand = new Promise(
- async (resolve) => {
- const awaitedEncyclopediaInfo = await encyclopediaInfo;
- const command = addFilterOptions(
- new SlashCommandBuilder()
- .setName('today')
- .setDescription("Today's played tanks and statistics"),
- awaitedEncyclopediaInfo,
- ).addStringOption(addUsernameChoices);
+export const todayCommand = new Promise(async (resolve) => {
+ const awaitedEncyclopediaInfo = await encyclopediaInfo;
+ const command = addFilterOptions(
+ new SlashCommandBuilder()
+ .setName('today')
+ .setDescription("Today's played tanks and statistics"),
+ awaitedEncyclopediaInfo,
+ ).addStringOption(addUsernameChoices);
- resolve({
- inProduction: true,
- inPublic: true,
+ resolve({
+ inProduction: true,
+ inPublic: true,
- command,
+ command,
- async handler(interaction) {
- const player = await resolvePlayerFromCommand(interaction);
- const period = resolvePeriodFromCommand(
- player.region,
- interaction,
- 'today',
- );
- const filters = await getFiltersFromCommand(interaction);
- const path = commandToURL(interaction, {
- ...player,
- ...getCustomPeriodParams(interaction, true),
- ...filters,
- });
+ async handler(interaction) {
+ const player = await resolvePlayerFromCommand(interaction);
+ const period = resolvePeriodFromCommand(
+ player.region,
+ interaction,
+ 'today',
+ );
+ const filters = await getFiltersFromCommand(interaction);
+ const path = commandToURL(interaction, {
+ ...player,
+ ...getCustomPeriodParams(interaction, true),
+ ...filters,
+ });
- return [
- ...(await renderBreakdown(player, period, filters)),
- buttonPrimary(path, 'Refresh'),
- await getBlitzStarsLinkButton(player.region, player.id),
- ];
- },
+ return [
+ ...(await renderBreakdown(player, period, filters)),
+ buttonPrimary(path, 'Refresh'),
+ await getBlitzStarsLinkButton(player.region, player.id),
+ ];
+ },
- autocomplete: (interaction) => {
- autocompleteUsername(interaction);
- autocompleteTanks(interaction);
- },
+ autocomplete: (interaction) => {
+ autocompleteUsername(interaction);
+ autocompleteTanks(interaction);
+ },
- async button(interaction) {
- const player = await resolvePlayerFromButton(interaction);
- const period = resolvePeriodFromButton(player.region, interaction);
- const filters = getFiltersFromButton(interaction);
+ async button(interaction) {
+ const player = await resolvePlayerFromButton(interaction);
+ const period = resolvePeriodFromButton(player.region, interaction);
+ const filters = getFiltersFromButton(interaction);
- return await renderBreakdown(player, period, filters);
- },
- });
- },
-);
+ return await renderBreakdown(player, period, filters);
+ },
+ });
+});
diff --git a/src/core/discord/createLocalizedCommand.ts b/src/core/discord/createLocalizedCommand.ts
index 1efda3cf8..dbadcd776 100644
--- a/src/core/discord/createLocalizedCommand.ts
+++ b/src/core/discord/createLocalizedCommand.ts
@@ -1,14 +1,27 @@
-import { Locale, SlashCommandBuilder } from 'discord.js';
+import {
+ Locale,
+ SlashCommandBuilder,
+ SlashCommandSubcommandBuilder,
+ SlashCommandSubcommandGroupBuilder,
+} from 'discord.js';
import { translator } from '../localization/translator';
import { localizationObject } from './localizationObject';
interface CreateLocalizedCommandSubcommand {
subcommand: string;
+ modify?: (option: SlashCommandSubcommandBuilder) => void;
+}
+
+interface CreateLocalizedCommandSubcommandGroup {
+ group: string;
+ modify?: (option: SlashCommandSubcommandGroupBuilder) => void;
}
export function createLocalizedCommand(
command: string,
- subcommands?: CreateLocalizedCommandSubcommand[],
+ sub?:
+ | CreateLocalizedCommandSubcommand[]
+ | CreateLocalizedCommandSubcommandGroup[],
) {
const { translate } = translator(Locale.EnglishUS);
const slashCommand = new SlashCommandBuilder()
@@ -19,26 +32,51 @@ export function createLocalizedCommand(
localizationObject(`bot.commands.${command}.description`),
);
- if (subcommands) {
- subcommands.map(({ subcommand }) => {
- const subcommandNameLocalizations = localizationObject(
- `bot.commands.${command}.subcommands.${subcommand}`,
- );
- const subcommandDescriptionLocalizations = localizationObject(
- `bot.commands.${command}.subcommands.${subcommand}.description`,
- );
+ if (sub) {
+ sub.map((subItem) => {
+ if ('subcommand' in subItem) {
+ const subcommandNameLocalizations = localizationObject(
+ `bot.commands.${command}.subcommands.${subItem.subcommand}`,
+ );
+ const subcommandDescriptionLocalizations = localizationObject(
+ `bot.commands.${command}.subcommands.${subItem.subcommand}.description`,
+ );
- slashCommand.addSubcommand((option) =>
- option
- .setName(subcommand)
- .setNameLocalizations(subcommandNameLocalizations)
- .setDescription(
- translate(
- `bot.commands.${command}.subcommands.${subcommand}.description`,
- ),
- )
- .setDescriptionLocalizations(subcommandDescriptionLocalizations),
- );
+ slashCommand.addSubcommand((option) => {
+ if (subItem.modify) subItem.modify(option);
+
+ return option
+ .setName(subItem.subcommand)
+ .setNameLocalizations(subcommandNameLocalizations)
+ .setDescription(
+ translate(
+ `bot.commands.${command}.subcommands.${subItem.subcommand}.description`,
+ ),
+ )
+ .setDescriptionLocalizations(subcommandDescriptionLocalizations);
+ });
+ } else {
+ const subcommandNameLocalizations = localizationObject(
+ `bot.commands.${command}.groups.${subItem.group}`,
+ );
+ const subcommandDescriptionLocalizations = localizationObject(
+ `bot.commands.${command}.groups.${subItem.group}.description`,
+ );
+
+ slashCommand.addSubcommandGroup((option) => {
+ if (subItem.modify) subItem.modify(option);
+
+ return option
+ .setName(subItem.group)
+ .setNameLocalizations(subcommandNameLocalizations)
+ .setDescription(
+ translate(
+ `bot.commands.${command}.groups.${subItem.group}.description`,
+ ),
+ )
+ .setDescriptionLocalizations(subcommandDescriptionLocalizations);
+ });
+ }
});
}
diff --git a/src/core/discord/resolvePeriodFromButton.ts b/src/core/discord/resolvePeriodFromButton.ts
index 5498b7553..ecaf7f155 100644
--- a/src/core/discord/resolvePeriodFromButton.ts
+++ b/src/core/discord/resolvePeriodFromButton.ts
@@ -30,7 +30,7 @@ export default function resolvePeriodFromButton(
start = getTimeDaysAgo(region, endDaysAgoMax);
end = getTimeDaysAgo(region, startDaysAgoMin);
} else {
- name = getPeriodOptionName(periodSubcommand);
+ name = getPeriodOptionName(periodSubcommand, interaction.locale);
start = getPeriodStart(region, periodSubcommand);
end = getPeriodNow();
}
diff --git a/src/core/discord/resolvePeriodFromCommand.ts b/src/core/discord/resolvePeriodFromCommand.ts
index fc09987aa..043c53140 100644
--- a/src/core/discord/resolvePeriodFromCommand.ts
+++ b/src/core/discord/resolvePeriodFromCommand.ts
@@ -1,14 +1,17 @@
-import { CacheType, ChatInputCommandInteraction } from 'discord.js';
+import { CacheType, ChatInputCommandInteraction, Locale } from 'discord.js';
import { Region } from '../../constants/regions';
import getPeriodNow from '../blitzkrieg/getPeriodNow';
import getPeriodStart from '../blitzkrieg/getPeriodStart';
import getTimeDaysAgo from '../blitzkrieg/getTimeDaysAgo';
+import { translator } from '../localization/translator';
import { PeriodSize, PeriodType } from './addPeriodSubCommands';
-export function getPeriodOptionName(period: PeriodSize) {
- if (period === 'career') return 'Career';
- if (period === 'today') return 'Today';
- return `${period} days`;
+export function getPeriodOptionName(period: PeriodSize, locale: Locale) {
+ const { translate } = translator(locale);
+
+ if (period === 'career') return translate('bot.common.periods.career');
+ if (period === 'today') return translate('bot.common.periods.today');
+ return translate('bot.common.periods.days', [period]);
}
export interface ResolvedPeriod {
@@ -39,7 +42,7 @@ export default function resolvePeriodFromCommand(
start = getTimeDaysAgo(region, endDaysAgoMax);
end = getTimeDaysAgo(region, startDaysAgoMin);
} else {
- name = getPeriodOptionName(periodSubcommand);
+ name = getPeriodOptionName(periodSubcommand, interaction.locale);
start = getPeriodStart(region, periodSubcommand);
end = getPeriodNow();
}
diff --git a/src/core/localization/translator.ts b/src/core/localization/translator.ts
index 0b55fb879..78714fbcd 100644
--- a/src/core/localization/translator.ts
+++ b/src/core/localization/translator.ts
@@ -5,9 +5,10 @@ export function translator(localeRaw: Locale) {
const locale = locales.includes(localeRaw) ? localeRaw : Locale.EnglishUS;
const strings = translations[locale];
- function translate(path: string): string {
+ function translate(path: string, literals?: string[]): string {
const pathArray = path.split('.');
let fragment = strings;
+ let resolvedString: string;
for (const pathItem of pathArray) {
if (typeof fragment === 'string') {
@@ -33,14 +34,26 @@ export function translator(localeRaw: Locale) {
}
if (typeof fragment === 'string') {
- return fragment;
+ resolvedString = fragment;
} else if (fragment.$) {
- return fragment.$!;
+ resolvedString = fragment.$!;
} else {
throw new Error(
`Unresolved tree ending for "${path}" in locale "${locale}"`,
);
}
+
+ if (literals) {
+ const chunks = resolvedString.split('%s');
+ let embeddedString = '';
+
+ chunks.forEach((chunk, index) => {
+ if (index !== 0) embeddedString += literals[index - 1];
+ embeddedString += chunk;
+ });
+ }
+
+ return resolvedString;
}
function t(paths: TemplateStringsArray, ...embeds: string[]) {
diff --git a/src/events/interactionCreate/index.ts b/src/events/interactionCreate/index.ts
index 81e6b9452..c90b78c6c 100644
--- a/src/events/interactionCreate/index.ts
+++ b/src/events/interactionCreate/index.ts
@@ -17,7 +17,6 @@ import discord from '../../../discord.json' assert { type: 'json' };
import { aboutCommand } from '../../commands/about';
import { breakdownCommand } from '../../commands/breakdown';
import { debugCommand } from '../../commands/debug';
-import { eligibleCommand } from '../../commands/eligible';
import { evolutionCommand } from '../../commands/evolution';
import { fullStatsCommand } from '../../commands/fullStats';
import { inactiveCommand } from '../../commands/inactive';
@@ -78,22 +77,18 @@ type CommandRegistryDefinitionDoesHandleInteraction = {
interaction: ChatInputCommandInteraction,
) => InteractionReturnable;
};
-export type CommandRegistryPromisable = CommandRegistryBase &
+export type CommandRegistry = CommandRegistryBase &
(CommandRegistryDefinitionBase &
(
| CommandRegistryDefinitionHandlesInteraction
| CommandRegistryDefinitionDoesHandleInteraction
));
-export type CommandRegistry =
- | CommandRegistryPromisable
- | Promise;
const rest = new REST().setToken(secrets.DISCORD_TOKEN);
-export const COMMANDS_RAW: CommandRegistry[] = [
+export const COMMANDS_RAW: Promise[] = [
permissionsCommand,
debugCommand,
- eligibleCommand,
aboutCommand,
inactiveCommand,
ownedTanksCommand,
@@ -113,7 +108,7 @@ export const COMMANDS_RAW: CommandRegistry[] = [
];
export const commands = Promise.allSettled(COMMANDS_RAW).then((rawCommands) => {
- return rawCommands.reduce>(
+ return rawCommands.reduce>(
(commands, registry) => {
if (registry.status === 'rejected') return commands;
if (isDev()) registry.value.command.setDefaultMemberPermissions(0);
diff --git a/src/lang/en-US.json b/src/lang/en-US.json
index 2fa78623d..fa80328a0 100644
--- a/src/lang/en-US.json
+++ b/src/lang/en-US.json
@@ -51,6 +51,13 @@
}
}
}
+ },
+
+ "periods": {
+ "career": "Career",
+ "today": "Today",
+ "days": "%s days",
+ "custom": "%s - %s days"
}
},
@@ -112,6 +119,23 @@
},
"uptime": "Uptime"
}
+ },
+
+ "evolution": {
+ "$": "evolution",
+ "description": "Evolution of statistics",
+
+ "groups": {
+ "player": {
+ "$": "player",
+ "description": "Player statistics"
+ },
+
+ "tank": {
+ "$": "tank",
+ "description": "Tank statistics"
+ }
+ }
}
}
},
From e141a7ca3f499819484c7973350821415fa500b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 15:35:14 -0600
Subject: [PATCH 29/90] New translations en-us.json (Spanish)
---
src/lang/es-ES.json | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index 70bd479b1..7939f2b2c 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -49,6 +49,12 @@
}
}
}
+ },
+ "periods": {
+ "career": "Career",
+ "today": "Today",
+ "days": "%s days",
+ "custom": "%s - %s days"
}
},
"commands": {
@@ -105,6 +111,20 @@
},
"uptime": "Tiempo en línea"
}
+ },
+ "evolution": {
+ "$": "evolution",
+ "description": "Evolution of statistics",
+ "groups": {
+ "player": {
+ "$": "player",
+ "description": "Player statistics"
+ },
+ "tank": {
+ "$": "tank",
+ "description": "Tank statistics"
+ }
+ }
}
}
},
From 49d0dbe86d332c2e8ac7a002e30b1cec4220a958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 15:38:53 -0600
Subject: [PATCH 30/90] feat: simpler command types
---
src/events/interactionCreate/index.ts | 33 +++++++++++----------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/src/events/interactionCreate/index.ts b/src/events/interactionCreate/index.ts
index c90b78c6c..3008bf026 100644
--- a/src/events/interactionCreate/index.ts
+++ b/src/events/interactionCreate/index.ts
@@ -53,38 +53,30 @@ export type InteractionReturnable =
| InteractionIterableReturnable
| Promise;
-type CommandRegistryBase = {
- command:
- | SlashCommandBuilder
- | SlashCommandSubcommandsOnlyBuilder
- | Omit;
-};
-type CommandRegistryDefinitionBase = {
+interface CommandRegistryBase {
inProduction: boolean;
inPublic: boolean;
inPreview?: boolean;
+ command:
+ | SlashCommandBuilder
+ | SlashCommandSubcommandsOnlyBuilder
+ | Omit;
+
autocomplete?: (interaction: AutocompleteInteraction) => void;
button?: (interaction: ButtonInteraction) => InteractionReturnable;
-};
-type CommandRegistryDefinitionHandlesInteraction = {
+}
+interface CommandRegistryImplicit extends CommandRegistryBase {
handlesInteraction: true;
handler: (interaction: ChatInputCommandInteraction) => void;
-};
-type CommandRegistryDefinitionDoesHandleInteraction = {
+}
+interface CommandRegistryExplicit extends CommandRegistryBase {
handlesInteraction?: false;
handler: (
interaction: ChatInputCommandInteraction,
) => InteractionReturnable;
-};
-export type CommandRegistry = CommandRegistryBase &
- (CommandRegistryDefinitionBase &
- (
- | CommandRegistryDefinitionHandlesInteraction
- | CommandRegistryDefinitionDoesHandleInteraction
- ));
-
-const rest = new REST().setToken(secrets.DISCORD_TOKEN);
+}
+export type CommandRegistry = CommandRegistryImplicit | CommandRegistryExplicit;
export const COMMANDS_RAW: Promise[] = [
permissionsCommand,
@@ -118,6 +110,7 @@ export const commands = Promise.allSettled(COMMANDS_RAW).then((rawCommands) => {
);
});
+const rest = new REST().setToken(secrets.DISCORD_TOKEN);
export const guildCommands: RESTPostAPIChatInputApplicationCommandsJSONBody[] =
[];
export const publicCommands: RESTPostAPIChatInputApplicationCommandsJSONBody[] =
From 83e31e6352b7ff5e5ea52216d73b48be097e1aaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:11:07 -0600
Subject: [PATCH 31/90] New translations en-us.json (Spanish)
---
src/lang/es-ES.json | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index 7939f2b2c..97f4f264d 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -1,4 +1,28 @@
{
+ "common": {
+ "nations": {
+ "ussr": "USSR",
+ "germany": "Germany",
+ "usa": "USA",
+ "china": "China",
+ "uk": "Britain",
+ "france": "France",
+ "japan": "Japan",
+ "european": "Europe",
+ "other": "Hybrid"
+ },
+ "tank_type_short": {
+ "lightTank": "Light",
+ "mediumTank": "Medium",
+ "heavyTank": "Heavy",
+ "AT-SPG": "TD"
+ },
+ "tree_type": {
+ "researchable": "Tech tree",
+ "premium": "Premium",
+ "collector": "Collector"
+ }
+ },
"bot": {
"common": {
"wn8": {
@@ -55,6 +79,10 @@
"today": "Today",
"days": "%s days",
"custom": "%s - %s days"
+ },
+ "filters": {
+ "none": "No filters",
+ "tier": "Tier %s"
}
},
"commands": {
From 96a9e5b938ee695642da89e0721d4f5e86d273d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:11:08 -0600
Subject: [PATCH 32/90] feat: filter localizations
---
src/commands/stats.tsx | 9 +++---
src/components/Tanks/components/Item.tsx | 1 +
src/core/blitzkrieg/filtersToDescription.ts | 34 +++++++++++---------
src/core/discord/resolvePeriodFromCommand.ts | 7 ++--
src/core/localization/translator.ts | 4 ++-
src/lang/en-US.json | 32 ++++++++++++++++++
6 files changed, 65 insertions(+), 22 deletions(-)
diff --git a/src/commands/stats.tsx b/src/commands/stats.tsx
index 0e18962d7..ceca9cd0c 100644
--- a/src/commands/stats.tsx
+++ b/src/commands/stats.tsx
@@ -1,4 +1,4 @@
-import { SlashCommandBuilder } from 'discord.js';
+import { Locale, SlashCommandBuilder } from 'discord.js';
import AllStatsOverview from '../components/AllStatsOverview';
import CommandWrapper from '../components/CommandWrapper';
import NoData, { NoDataType } from '../components/NoData';
@@ -33,13 +33,14 @@ async function render(
{ region, id }: ResolvedPlayer,
{ start, end, name }: ResolvedPeriod,
filters: StatFilters,
+ locale: Locale,
) {
const { nickname } = await getAccountInfo(region, id);
const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
const clanImage = clan ? emblemIdToURL(clan.emblem_set_id) : undefined;
const diffedTankStats = await getStatsInPeriod(region, id, start, end);
const { stats, supplementary } = await filterStats(diffedTankStats, filters);
- const filterDescriptions = await filtersToDescription(filters);
+ const filterDescriptions = await filtersToDescription(filters, locale);
return (
@@ -82,7 +83,7 @@ export const statsCommand = new Promise(async (resolve) => {
});
return Promise.all([
- render(player, period, filters),
+ render(player, period, filters, interaction.locale),
buttonRefresh(interaction, path),
getBlitzStarsLinkButton(player.region, player.id),
]);
@@ -98,7 +99,7 @@ export const statsCommand = new Promise(async (resolve) => {
const period = resolvePeriodFromButton(player.region, interaction);
const filters = getFiltersFromButton(interaction);
- return await render(player, period, filters);
+ return await render(player, period, filters, interaction.locale);
},
});
});
diff --git a/src/components/Tanks/components/Item.tsx b/src/components/Tanks/components/Item.tsx
index da22e336f..870abd89a 100644
--- a/src/components/Tanks/components/Item.tsx
+++ b/src/components/Tanks/components/Item.tsx
@@ -17,6 +17,7 @@ export const TREE_TYPES = ['researchable', 'premium', 'collector'] as const;
export type TankType = (typeof TANK_TYPES)[number];
export type TreeType = (typeof TREE_TYPES)[number];
+// BIG TODO: REMOVE THIS AFTER LOCALIZATION
export const TREE_TYPE_NAMES: Record = {
researchable: 'Tech tree',
premium: 'Premium',
diff --git a/src/core/blitzkrieg/filtersToDescription.ts b/src/core/blitzkrieg/filtersToDescription.ts
index ce5b5a8b0..122cab1e8 100644
--- a/src/core/blitzkrieg/filtersToDescription.ts
+++ b/src/core/blitzkrieg/filtersToDescription.ts
@@ -1,24 +1,28 @@
-import { TREE_TYPE_NAMES } from '../../components/Tanks';
-import { encyclopediaInfo } from '../blitz/encyclopediaInfo';
+import { Locale } from 'discord.js';
+import { translator } from '../localization/translator';
import { StatFilters } from '../statistics/filterStats';
import { TIER_ROMAN_NUMERALS, Tier, tankDefinitions } from './tankDefinitions';
-export async function filtersToDescription({
- nation,
- tier,
- tankType,
- treeType,
- tank,
-}: StatFilters) {
- const awaitedEncyclopediaInfo = await encyclopediaInfo;
+export async function filtersToDescription(
+ { nation, tier, tankType, treeType, tank }: StatFilters,
+ locale: Locale,
+) {
+ const { translate } = translator(locale);
const awaitedTankDefinitions = await tankDefinitions;
const info: string[] = [];
+ // TODO: somehow localize tank names?
if (tank) return awaitedTankDefinitions[tank].name;
- if (nation) info.push(awaitedEncyclopediaInfo.vehicle_nations[nation]);
- if (tier) info.push(`Tier ${TIER_ROMAN_NUMERALS[tier as Tier]}`);
- if (tankType) info.push(awaitedEncyclopediaInfo.vehicle_types[tankType]);
- if (treeType) info.push(TREE_TYPE_NAMES[treeType]);
+ if (nation) info.push(translate(`common.nations.${nation}`));
+ if (tier) {
+ info.push(
+ translate('bot.common.filters.tier', [TIER_ROMAN_NUMERALS[tier as Tier]]),
+ );
+ }
+ if (tankType) info.push(translate(`common.tank_type_short.${tankType}`));
+ if (treeType) info.push(translate(`common.tree_type.${treeType}`));
- return info.length === 0 ? 'No filters' : info.join(', ');
+ return info.length === 0
+ ? translate('bot.common.filters.none')
+ : info.join(', ');
}
diff --git a/src/core/discord/resolvePeriodFromCommand.ts b/src/core/discord/resolvePeriodFromCommand.ts
index 043c53140..6681fd51f 100644
--- a/src/core/discord/resolvePeriodFromCommand.ts
+++ b/src/core/discord/resolvePeriodFromCommand.ts
@@ -8,7 +8,6 @@ import { PeriodSize, PeriodType } from './addPeriodSubCommands';
export function getPeriodOptionName(period: PeriodSize, locale: Locale) {
const { translate } = translator(locale);
-
if (period === 'career') return translate('bot.common.periods.career');
if (period === 'today') return translate('bot.common.periods.today');
return translate('bot.common.periods.days', [period]);
@@ -25,6 +24,7 @@ export default function resolvePeriodFromCommand(
interaction: ChatInputCommandInteraction,
forcedPeriod?: PeriodType,
) {
+ const { translate } = translator(interaction.locale);
let name: string;
let start: number;
let end: number;
@@ -38,7 +38,10 @@ export default function resolvePeriodFromCommand(
const startDaysAgoMin = Math.min(startOption, endOption);
const endDaysAgoMax = Math.max(startOption, endOption);
- name = `${startDaysAgoMin} - ${endDaysAgoMax} days`;
+ name = translate('bot.common.periods.custom', [
+ `${startDaysAgoMin}`,
+ `${endDaysAgoMax}`,
+ ]);
start = getTimeDaysAgo(region, endDaysAgoMax);
end = getTimeDaysAgo(region, startDaysAgoMin);
} else {
diff --git a/src/core/localization/translator.ts b/src/core/localization/translator.ts
index 78714fbcd..c53877a93 100644
--- a/src/core/localization/translator.ts
+++ b/src/core/localization/translator.ts
@@ -27,7 +27,7 @@ export function translator(localeRaw: Locale) {
console.warn(
`Undefined translation at "${pathItem}" in "${path}" for locale "${locale}"; falling back to en-US`,
);
- return translator(Locale.EnglishUS).translate(path);
+ return translator(Locale.EnglishUS).translate(path, literals);
}
}
}
@@ -51,6 +51,8 @@ export function translator(localeRaw: Locale) {
if (index !== 0) embeddedString += literals[index - 1];
embeddedString += chunk;
});
+
+ return embeddedString;
}
return resolvedString;
diff --git a/src/lang/en-US.json b/src/lang/en-US.json
index fa80328a0..be0637bba 100644
--- a/src/lang/en-US.json
+++ b/src/lang/en-US.json
@@ -1,4 +1,31 @@
{
+ "common": {
+ "nations": {
+ "ussr": "USSR",
+ "germany": "Germany",
+ "usa": "USA",
+ "china": "China",
+ "uk": "Britain",
+ "france": "France",
+ "japan": "Japan",
+ "european": "Europe",
+ "other": "Hybrid"
+ },
+
+ "tank_type_short": {
+ "lightTank": "Light",
+ "mediumTank": "Medium",
+ "heavyTank": "Heavy",
+ "AT-SPG": "TD"
+ },
+
+ "tree_type": {
+ "researchable": "Tech tree",
+ "premium": "Premium",
+ "collector": "Collector"
+ }
+ },
+
"bot": {
"common": {
"wn8": {
@@ -58,6 +85,11 @@
"today": "Today",
"days": "%s days",
"custom": "%s - %s days"
+ },
+
+ "filters": {
+ "none": "No filters",
+ "tier": "Tier %s"
}
},
From 716b446272832f3e9ee64b33177d4e165f243a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:19:29 -0600
Subject: [PATCH 33/90] fix: remove refresh button if not enough permissions
---
src/commands/breakdown.tsx | 22 +++++++++++++++++-----
src/commands/evolution.tsx | 4 ++--
src/commands/fullStats.tsx | 9 +++++----
src/commands/today.ts | 8 ++++----
src/core/discord/buttonRefresh.ts | 4 ++--
5 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/src/commands/breakdown.tsx b/src/commands/breakdown.tsx
index e635142b8..3c0e46ae5 100644
--- a/src/commands/breakdown.tsx
+++ b/src/commands/breakdown.tsx
@@ -1,3 +1,4 @@
+import { Locale } from 'discord.js';
import { chunk } from 'lodash';
import * as Breakdown from '../components/Breakdown';
import CommandWrapper from '../components/CommandWrapper';
@@ -18,7 +19,7 @@ import addPeriodicFilterOptions from '../core/discord/addPeriodicFilterOptions';
import addUsernameChoices from '../core/discord/addUsernameChoices';
import autocompleteTanks from '../core/discord/autocompleteTanks';
import autocompleteUsername from '../core/discord/autocompleteUsername';
-import buttonPrimary from '../core/discord/buttonPrimary';
+import { buttonRefresh } from '../core/discord/buttonRefresh';
import commandToURL from '../core/discord/commandToURL';
import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
@@ -44,6 +45,7 @@ export async function renderBreakdown(
{ region, id }: ResolvedPlayer,
{ start, end, name }: ResolvedPeriod,
filters: StatFilters,
+ locale: Locale,
) {
const awaitedTankDefinitions = await tankDefinitions;
const awaitedTankAverages = await tankAverages;
@@ -52,7 +54,7 @@ export async function renderBreakdown(
const accountInfo = await getAccountInfo(region, id);
const clanData = await getClanAccountInfo(region, id, ['clan']);
const tankStats = await getTankStats(region, id);
- const filterDescriptions = await filtersToDescription(filters);
+ const filterDescriptions = await filtersToDescription(filters, locale);
const orderedCurrentStats: AllStats[] = [];
const orderedCareerStats: AllStats[] = [];
const orderedCurrentWN8: (number | undefined)[] = [];
@@ -312,8 +314,13 @@ export const breakdownCommand = new Promise(
});
return [
- ...(await renderBreakdown(player, period, filters)),
- buttonPrimary(path, 'Refresh'),
+ ...(await renderBreakdown(
+ player,
+ period,
+ filters,
+ interaction.locale,
+ )),
+ buttonRefresh(interaction, path),
await getBlitzStarsLinkButton(player.region, player.id),
];
},
@@ -328,7 +335,12 @@ export const breakdownCommand = new Promise(
const period = resolvePeriodFromButton(player.region, interaction);
const filters = getFiltersFromButton(interaction);
- return await renderBreakdown(player, period, filters);
+ return await renderBreakdown(
+ player,
+ period,
+ filters,
+ interaction.locale,
+ );
},
});
},
diff --git a/src/commands/evolution.tsx b/src/commands/evolution.tsx
index 8bc87cfe7..ffc3abf4e 100644
--- a/src/commands/evolution.tsx
+++ b/src/commands/evolution.tsx
@@ -15,7 +15,7 @@ import addTankChoices from '../core/discord/addTankChoices';
import addUsernameChoices from '../core/discord/addUsernameChoices';
import autocompleteTanks from '../core/discord/autocompleteTanks';
import autocompleteUsername from '../core/discord/autocompleteUsername';
-import buttonPrimary from '../core/discord/buttonPrimary';
+import { buttonRefresh } from '../core/discord/buttonRefresh';
import commandToURL from '../core/discord/commandToURL';
import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
@@ -148,7 +148,7 @@ export const evolutionCommand = new Promise(
return [
await render(player, period, commandGroup, tankId),
- buttonPrimary(path, 'Refresh'),
+ buttonRefresh(interaction, path),
await getBlitzStarsLinkButton(
player.region,
player.id,
diff --git a/src/commands/fullStats.tsx b/src/commands/fullStats.tsx
index bb7e1f37f..1026c5a79 100644
--- a/src/commands/fullStats.tsx
+++ b/src/commands/fullStats.tsx
@@ -1,4 +1,4 @@
-import { SlashCommandBuilder } from 'discord.js';
+import { Locale, SlashCommandBuilder } from 'discord.js';
import CommandWrapper from '../components/CommandWrapper';
import GenericAllStats from '../components/GenericAllStats';
import NoData, { NoDataType } from '../components/NoData';
@@ -35,6 +35,7 @@ async function render(
{ region, id }: ResolvedPlayer,
{ start, end, name }: ResolvedPeriod,
filters: StatFilters,
+ locale: Locale,
) {
const { nickname } = await getAccountInfo(region, id);
const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
@@ -44,7 +45,7 @@ async function render(
diffedTankStats,
filters,
);
- const filterDescriptions = await filtersToDescription(filters);
+ const filterDescriptions = await filtersToDescription(filters, locale);
const tierWeights = await getTierWeights(diffedTankStats.diff, filteredOrder);
return (
@@ -90,7 +91,7 @@ export const fullStatsCommand = new Promise(
});
return Promise.all([
- render(player, period, filters),
+ render(player, period, filters, interaction.locale),
buttonRefresh(interaction, path),
getBlitzStarsLinkButton(player.region, player.id),
]);
@@ -106,7 +107,7 @@ export const fullStatsCommand = new Promise(
const period = resolvePeriodFromButton(player.region, interaction);
const filters = getFiltersFromButton(interaction);
- return await render(player, period, filters);
+ return await render(player, period, filters, interaction.locale);
},
});
},
diff --git a/src/commands/today.ts b/src/commands/today.ts
index cc7e0e30f..6e5e27b91 100644
--- a/src/commands/today.ts
+++ b/src/commands/today.ts
@@ -5,7 +5,7 @@ import { addFilterOptions } from '../core/discord/addFilterOptions';
import addUsernameChoices from '../core/discord/addUsernameChoices';
import autocompleteTanks from '../core/discord/autocompleteTanks';
import autocompleteUsername from '../core/discord/autocompleteUsername';
-import buttonPrimary from '../core/discord/buttonPrimary';
+import { buttonRefresh } from '../core/discord/buttonRefresh';
import commandToURL from '../core/discord/commandToURL';
import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
@@ -47,8 +47,8 @@ export const todayCommand = new Promise(async (resolve) => {
});
return [
- ...(await renderBreakdown(player, period, filters)),
- buttonPrimary(path, 'Refresh'),
+ ...(await renderBreakdown(player, period, filters, interaction.locale)),
+ buttonRefresh(interaction, path),
await getBlitzStarsLinkButton(player.region, player.id),
];
},
@@ -63,7 +63,7 @@ export const todayCommand = new Promise(async (resolve) => {
const period = resolvePeriodFromButton(player.region, interaction);
const filters = getFiltersFromButton(interaction);
- return await renderBreakdown(player, period, filters);
+ return await renderBreakdown(player, period, filters, interaction.locale);
},
});
});
diff --git a/src/core/discord/buttonRefresh.ts b/src/core/discord/buttonRefresh.ts
index 0a210a006..b33f60e44 100644
--- a/src/core/discord/buttonRefresh.ts
+++ b/src/core/discord/buttonRefresh.ts
@@ -6,10 +6,10 @@ export function buttonRefresh(
path: string,
) {
if (
- interaction.appPermissions?.has('AttachFiles') &&
+ interaction.appPermissions?.has('ReadMessageHistory') &&
interaction.appPermissions?.has('ViewChannel')
) {
- return buttonPrimary(path, 'Refresh');
+ return buttonPrimary(path, 'Refresh', '🔄️');
}
return null;
From bd6f1f35709ecff7361e48f8328a354ac5e9c046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:26:36 -0600
Subject: [PATCH 34/90] feat: no data translations
---
src/commands/breakdown.tsx | 4 ++--
src/commands/evolution.tsx | 16 ++++++++++++----
src/commands/fullStats.tsx | 6 ++++--
src/commands/inactive.tsx | 6 ++++--
src/commands/ownedTanks.tsx | 4 ++--
src/commands/stats.tsx | 4 ++--
src/components/NoData.tsx | 15 +++++++--------
src/lang/en-US.json | 6 ++++++
8 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/src/commands/breakdown.tsx b/src/commands/breakdown.tsx
index 3c0e46ae5..9a7ed439a 100644
--- a/src/commands/breakdown.tsx
+++ b/src/commands/breakdown.tsx
@@ -2,7 +2,7 @@ import { Locale } from 'discord.js';
import { chunk } from 'lodash';
import * as Breakdown from '../components/Breakdown';
import CommandWrapper from '../components/CommandWrapper';
-import NoData, { NoDataType } from '../components/NoData';
+import NoData from '../components/NoData';
import TitleBar from '../components/TitleBar';
import { AllStats, getAccountInfo } from '../core/blitz/getAccountInfo';
import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
@@ -286,7 +286,7 @@ export async function renderBreakdown(
description={`${name} • ${filterDescriptions}`}
/>
- ,
];
}
diff --git a/src/commands/evolution.tsx b/src/commands/evolution.tsx
index ffc3abf4e..fd6a61cdd 100644
--- a/src/commands/evolution.tsx
+++ b/src/commands/evolution.tsx
@@ -1,7 +1,7 @@
-import { SlashCommandSubcommandGroupBuilder } from 'discord.js';
+import { Locale, SlashCommandSubcommandGroupBuilder } from 'discord.js';
import CommandWrapper from '../components/CommandWrapper';
import * as Graph from '../components/Graph';
-import NoData, { NoDataType } from '../components/NoData';
+import NoData from '../components/NoData';
import TitleBar from '../components/TitleBar';
import { getAccountInfo } from '../core/blitz/getAccountInfo';
import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
@@ -36,6 +36,7 @@ async function render(
{ start, end, name }: ResolvedPeriod,
type: 'player' | 'tank',
tankId: number | null,
+ locale: Locale,
) {
const accountInfo = await getAccountInfo(region, id);
const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
@@ -100,7 +101,7 @@ async function render(
)}
- {plot.length === 0 && (
});
return [
- await render(player, period, commandGroup, tankId),
+ await render(
+ player,
+ period,
+ commandGroup,
+ tankId,
+ interaction.locale,
+ ),
buttonRefresh(interaction, path),
await getBlitzStarsLinkButton(
player.region,
@@ -174,6 +181,7 @@ export const evolutionCommand = new Promise(
period,
commandGroup,
parseInt(url.searchParams.get('tankId') ?? '0') || null,
+ interaction.locale,
);
},
});
diff --git a/src/commands/fullStats.tsx b/src/commands/fullStats.tsx
index 1026c5a79..5a3da27a0 100644
--- a/src/commands/fullStats.tsx
+++ b/src/commands/fullStats.tsx
@@ -1,7 +1,7 @@
import { Locale, SlashCommandBuilder } from 'discord.js';
import CommandWrapper from '../components/CommandWrapper';
import GenericAllStats from '../components/GenericAllStats';
-import NoData, { NoDataType } from '../components/NoData';
+import NoData from '../components/NoData';
import TierWeights from '../components/TierWeights';
import TitleBar from '../components/TitleBar';
import { getAccountInfo } from '../core/blitz/getAccountInfo';
@@ -56,7 +56,9 @@ async function render(
description={`${name} • ${filterDescriptions}`}
/>
- {stats.battles === 0 && ((resolve) => {
description={`Inactive for ${threshold}+ Days • ${new Date().toDateString()}`}
/>
- {!hasInactiveMembers && ((resolve) => {
/>
{filteredTanks.length === 0 && (
- = {
- [NoDataType.BattlesInPeriod]: 'No battles played in this period',
- [NoDataType.PlayersInPeriod]: 'No players in this period',
- [NoDataType.TanksFound]: 'No tanks found',
-};
+export default function NoData({ type, locale }: NoDataProps) {
+ const { translate } = translator(locale);
-export default function NoData({ type }: NoDataProps) {
return (
((resolve) => {
inProduction: true,
inPublic: true,
- command: new SlashCommandBuilder()
- .setName('inactive')
- .setDescription('Lists all inactive players')
+ command: createLocalizedCommand('inactive')
.addStringOption(addClanChoices)
- .addNumberOption((option) =>
- option
+ .addNumberOption((option) => {
+ const { translate } = translator(Locale.EnglishUS);
+
+ return option
.setName('threshold')
- .setDescription(
- `The number of days inactive (default: ${DEFAULT_THRESHOLD})`,
+ .setNameLocalizations(
+ localizationObject('bot.commands.inactive.options.threshold'),
)
- .setMinValue(0),
- ),
+ .setDescription(
+ translate('bot.commands.inactive.options.threshold.description'),
+ )
+ .setDescriptionLocalizations(
+ localizationObject(
+ 'bot.commands.inactive.options.threshold.description',
+ ),
+ )
+ .setMinValue(0);
+ }),
async handler(interaction) {
+ const { translate } = translator(interaction.locale);
const { region, id } = await resolveClanFromCommand(interaction);
const threshold =
interaction.options.getNumber('threshold')! ?? DEFAULT_THRESHOLD;
@@ -49,7 +61,10 @@ export const inactiveCommand = new Promise((resolve) => {
.sort((a, b) => b[1] - a[1])
.map(
([name, days]) =>
- [name, `${days.toFixed(0)} days`] as [string, string],
+ [
+ name,
+ translate('bot.commands.inactive.body.listing', [`${days}`]),
+ ] as [string, string],
);
const hasInactiveMembers = inactive.length > 0;
@@ -58,7 +73,7 @@ export const inactiveCommand = new Promise((resolve) => {
Date: Wed, 6 Mar 2024 17:44:42 -0600
Subject: [PATCH 41/90] New translations en-us.json (Spanish)
---
src/lang/es-ES.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index 32ac577f6..611746c4a 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -5,7 +5,7 @@
"germany": "Alemania",
"usa": "EUA",
"china": "China",
- "uk": "Reino Unido",
+ "uk": "R. U.",
"france": "Francia",
"japan": "Japón",
"european": "Europa",
From 935c578ef6148150177cfe929dc534ffd9fa5d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 19:30:47 -0600
Subject: [PATCH 42/90] Update en-US.json
---
src/lang/en-US.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lang/en-US.json b/src/lang/en-US.json
index c3ed6e2ba..959c5812c 100644
--- a/src/lang/en-US.json
+++ b/src/lang/en-US.json
@@ -1,15 +1,15 @@
{
"common": {
"nations": {
- "ussr": "USSR",
+ "ussr": "U.S.S.R.",
"germany": "Germany",
- "usa": "USA",
+ "usa": "U.S.A.",
"china": "China",
- "uk": "Britain",
+ "uk": "U.K.",
"france": "France",
"japan": "Japan",
- "european": "Europe",
- "other": "Hybrid"
+ "european": "European nation",
+ "other": "Hybrid nation"
},
"tank_type_short": {
From 4a6e94680904a9738e3290701ba86c0e1036ef58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 19:30:57 -0600
Subject: [PATCH 43/90] New translations en-us.json (Spanish)
---
src/lang/es-ES.json | 56 ++++++++++++++++++++++-----------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index 611746c4a..80889c3d9 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -1,19 +1,19 @@
{
"common": {
"nations": {
- "ussr": "URSS",
+ "ussr": "U.S.S.R.",
"germany": "Alemania",
- "usa": "EUA",
+ "usa": "U.S.A.",
"china": "China",
- "uk": "R. U.",
+ "uk": "U.K.",
"france": "Francia",
"japan": "Japón",
- "european": "Europa",
- "other": "Híbrido"
+ "european": "European nation",
+ "other": "Hybrid nation"
},
"tank_type_short": {
"lightTank": "Ligero",
- "mediumTank": "Medio",
+ "mediumTank": "Mediano",
"heavyTank": "Pesado",
"AT-SPG": "DT"
},
@@ -153,7 +153,7 @@
},
"evolution": {
"$": "evolución",
- "description": "Evolución de las estadísticas",
+ "description": "Evolución de estadísticas",
"groups": {
"player": {
"$": "jugador",
@@ -167,11 +167,11 @@
},
"inactive": {
"$": "inactivo",
- "description": "Lista todos los jugadores inactivos en un clan por encima de un umbral",
+ "description": "Enumera a todos los jugadores inactivos en un clan por encima de un umbral",
"options": {
"threshold": {
"$": "umbral",
- "description": "El número de días inactivo ( predeterminado: %s días)"
+ "description": "El número de días inactivo (predeterminado: %s días)"
}
},
"body": {
@@ -180,35 +180,35 @@
}
},
"full_stats": {
- "$": "full-stats",
- "description": "Full in-game statistics",
+ "$": "estadísticas-completas",
+ "description": "Estadísticas completas del juego",
"body": {
"cards": {
"games": {
- "$": "Games",
- "winrate": "Winrate",
- "battles": "Battles",
- "wins_losses": "Wins / losses"
+ "$": "Partidas",
+ "winrate": "Tasa de victorias",
+ "battles": "Batallas",
+ "wins_losses": "Victorias / derrotas"
},
"efficiency": {
- "$": "Efficiency",
+ "$": "Eficiencia",
"wn8": "WN8",
- "survival": "Survival",
- "accuracy": "Accuracy"
+ "survival": "Supervivencia",
+ "accuracy": "Precisión"
},
"lethality": {
- "$": "Lethality",
- "average_damage": "Average damage",
- "damage_per_tier": "Damage per tier",
- "damage_ratio": "Damage ratio",
- "average_kills": "Average kills"
+ "$": "Letalidad",
+ "average_damage": "Daño promedio",
+ "damage_per_tier": "Daño por tier",
+ "damage_ratio": "Relación de daño",
+ "average_kills": "Promedio de bajas"
},
"miscellaneous": {
- "$": "Miscellaneous",
- "average_tier": "Average tier",
- "average_spots": "Average spots",
- "average_xp": "Average XP",
- "kills_to_death_ratio": "Kills to death ratio"
+ "$": "Misceláneo",
+ "average_tier": "Tier promedio",
+ "average_spots": "Promedio de detecciones",
+ "average_xp": "Promedio de XP",
+ "kills_to_death_ratio": "Relación bajas-muertes"
}
}
}
From de9077e0d2d009d426c834550b1bcfb9010daece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 20:44:06 -0600
Subject: [PATCH 44/90] New translations en-us.json (Spanish)
---
src/lang/es-ES.json | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index 80889c3d9..f6c2c2426 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -1,26 +1,26 @@
{
"common": {
"nations": {
- "ussr": "U.S.S.R.",
+ "ussr": "URSS",
"germany": "Alemania",
- "usa": "U.S.A.",
+ "usa": "EE. UU.",
"china": "China",
- "uk": "U.K.",
+ "uk": "Reino Unido",
"france": "Francia",
"japan": "Japón",
- "european": "European nation",
- "other": "Hybrid nation"
+ "european": "Nación europea",
+ "other": "Nación híbrida"
},
"tank_type_short": {
"lightTank": "Ligero",
"mediumTank": "Mediano",
"heavyTank": "Pesado",
- "AT-SPG": "DT"
+ "AT-SPG": "Cazacarro"
},
"tree_type": {
"researchable": "Árbol tecnológico",
"premium": "Prémium",
- "collector": "Coleccionable"
+ "collector": "Coleccionista"
}
},
"bot": {
@@ -77,7 +77,7 @@
"options": {
"clan": {
"$": "clan",
- "description": "El nombre del clan o etiqueta"
+ "description": "El nombre o etiqueta del clan"
}
},
"periods": {
@@ -88,7 +88,7 @@
},
"filters": {
"none": "Sin filtros",
- "tier": "Rango %s"
+ "tier": "Tier %s"
},
"no_data": {
"battles_in_period": "No hay batallas jugadas en este período",
From 9437d16908c6600b17d776abd1f414a5e71a5c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Thu, 7 Mar 2024 13:49:36 -0600
Subject: [PATCH 45/90] New translations en-us.json (Spanish)
---
src/lang/es-ES.json | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index f6c2c2426..1f5b1209f 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -78,6 +78,24 @@
"clan": {
"$": "clan",
"description": "El nombre o etiqueta del clan"
+ },
+ "tank": {
+ "$": "tank",
+ "description": "The tank to get stats for"
+ },
+ "filters": {
+ "nation": {
+ "$": "nation",
+ "description": "Nation"
+ },
+ "tank_type": {
+ "$": "tank-type",
+ "description": "Tank type"
+ },
+ "tree_type": {
+ "$": "tree-type",
+ "description": "Tree type"
+ }
}
},
"periods": {
From b60f8bfd5744f584828413f5f3718523b12f455e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Thu, 7 Mar 2024 13:49:38 -0600
Subject: [PATCH 46/90] feat: filter strings
---
scripts/buildAssets/definitions.ts | 16 +-
.../[id]/components/Characteristics/index.tsx | 22 +--
.../components/TankSearch/index.tsx | 5 +-
src/commands/fullStats.tsx | 15 +-
src/commands/today.ts | 6 +-
src/components/Tanks/components/Item.tsx | 8 +-
src/core/blitzkrieg/tankDefinitions.ts | 24 +--
src/core/discord/addFilterOptions.ts | 156 ++++++++++++------
src/core/discord/addPeriodicFilterOptions.ts | 10 +-
src/core/discord/addTankChoices.ts | 14 +-
src/core/discord/createLocalizedCommand.ts | 19 ++-
src/lang/en-US.json | 20 +++
12 files changed, 187 insertions(+), 128 deletions(-)
diff --git a/scripts/buildAssets/definitions.ts b/scripts/buildAssets/definitions.ts
index 41a7c5f08..1dbd313a1 100644
--- a/scripts/buildAssets/definitions.ts
+++ b/scripts/buildAssets/definitions.ts
@@ -34,7 +34,6 @@ import {
import { DATA, POI } from './constants';
import { TankParameters } from './tankIcons';
-type BlitzTankType = 'AT-SPG' | 'lightTank' | 'mediumTank' | 'heavyTank';
interface Strings {
[key: string]: string;
}
@@ -306,19 +305,6 @@ type ConsumablesVehicleFilter =
| { name: string }
| { extendedTags: string };
-const consumableProvisionEffectSuffixes = [
- 'Increase',
- 'Factor',
- 'Bias',
- 'Coef',
- 'Percent',
-];
-const blitzTankTypeToBlitzkrieg: Record = {
- 'AT-SPG': 'tankDestroyer',
- lightTank: 'light',
- mediumTank: 'medium',
- heavyTank: 'heavy',
-};
const blitzShellKindToBLitzkrieg: Record = {
ARMOR_PIERCING: 'ap',
ARMOR_PIERCING_CR: 'ap_cr',
@@ -502,7 +488,7 @@ export async function definitions(production: boolean) {
? 'premium'
: 'researchable',
tier: tank.level as Tier,
- type: blitzTankTypeToBlitzkrieg[tankTags[0] as BlitzTankType],
+ type: tankTags[0] as TankType,
testing: tankTags.includes('testTank') ? true : undefined,
price: tankPrice,
camouflage: {
diff --git a/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx b/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
index b7d4d3e17..dae69588d 100644
--- a/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
@@ -136,12 +136,12 @@ export function Characteristics() {
]);
const enginePowerCoefficient = coefficient(
[
- hasEngineAccelerator && (tank.type === 'light' || tank.type === 'medium'),
+ hasEngineAccelerator && (tank.type === 'lightTank' || tank.type === 'mediumTank'),
0.05,
],
[
hasEngineAccelerator &&
- (tank.type === 'heavy' || tank.type === 'tankDestroyer'),
+ (tank.type === 'heavyTank' || tank.type === 'AT-SPG'),
0.07,
],
[hasEnginePowerBoost, 0.2],
@@ -163,7 +163,7 @@ export function Characteristics() {
const viewRangeCoefficient =
coefficient([
hasImprovedOptics,
- tank.type === 'tankDestroyer' ? 0.05 : tank.type === 'heavy' ? 0.07 : 0.1,
+ tank.type === 'AT-SPG' ? 0.05 : tank.type === 'heavyTank' ? 0.07 : 0.1,
]) * coefficient([true, progressiveStat(commanderMastery)]);
const fireChanceCoefficient = coefficient([hasProtectiveKit, -0.2]);
@@ -180,17 +180,17 @@ export function Characteristics() {
const camouflageSumMoving = sum(
[
hasCamouflageNet,
- tank.type === 'heavy'
+ tank.type === 'heavyTank'
? 0.03
- : tank.type === 'tankDestroyer'
+ : tank.type === 'AT-SPG'
? 0.07
: 0.05,
],
[
camouflage,
- tank.type === 'tankDestroyer'
+ tank.type === 'AT-SPG'
? 0.04
- : tank.type === 'heavy'
+ : tank.type === 'heavyTank'
? 0.03
: 0.02,
],
@@ -199,17 +199,17 @@ export function Characteristics() {
[
hasCamouflageNet,
2 *
- (tank.type === 'heavy'
+ (tank.type === 'heavyTank'
? 0.03
- : tank.type === 'tankDestroyer'
+ : tank.type === 'AT-SPG'
? 0.07
: 0.05),
],
[
camouflage,
- tank.type === 'tankDestroyer'
+ tank.type === 'AT-SPG'
? 0.04
- : tank.type === 'heavy'
+ : tank.type === 'heavyTank'
? 0.03
: 0.02,
],
diff --git a/src/app/tools/tankopedia/components/TankSearch/index.tsx b/src/app/tools/tankopedia/components/TankSearch/index.tsx
index 41a6f3a7d..6c5d00a10 100644
--- a/src/app/tools/tankopedia/components/TankSearch/index.tsx
+++ b/src/app/tools/tankopedia/components/TankSearch/index.tsx
@@ -15,7 +15,7 @@ import {
} from '@radix-ui/themes';
import { go } from 'fuzzysort';
import { use, useEffect, useMemo, useRef, useState } from 'react';
-import { TankType, TreeType } from '../../../../../components/Tanks';
+import { TANK_TYPES, TreeType } from '../../../../../components/Tanks';
import { resolveNearPenetration } from '../../../../../core/blitz/resolveNearPenetration';
import { asset } from '../../../../../core/blitzkrieg/asset';
import { modelDefinitions } from '../../../../../core/blitzkrieg/modelDefinitions';
@@ -49,7 +49,6 @@ interface TankSearchProps {
onSelect?: (tank: TankDefinition) => void;
}
-const tankTypeOrder: TankType[] = ['light', 'medium', 'heavy', 'tankDestroyer'];
const treeTypeOrder: TreeType[] = ['researchable', 'premium', 'collector'];
export function TankSearch({ compact, onSelect = () => {} }: TankSearchProps) {
@@ -70,7 +69,7 @@ export function TankSearch({ compact, onSelect = () => {} }: TankSearchProps) {
)
.sort(
(a, b) =>
- (tankTypeOrder.indexOf(a.type) - tankTypeOrder.indexOf(b.type)) *
+ (TANK_TYPES.indexOf(a.type) - TANK_TYPES.indexOf(b.type)) *
(sort.direction === 'descending' ? -1 : 1),
)
.sort(
diff --git a/src/commands/fullStats.tsx b/src/commands/fullStats.tsx
index 9fa3129c4..df7d870d9 100644
--- a/src/commands/fullStats.tsx
+++ b/src/commands/fullStats.tsx
@@ -1,4 +1,4 @@
-import { Locale, SlashCommandBuilder } from 'discord.js';
+import { Locale } from 'discord.js';
import CommandWrapper from '../components/CommandWrapper';
import GenericAllStats from '../components/GenericAllStats';
import NoData from '../components/NoData';
@@ -16,6 +16,7 @@ import autocompleteTanks from '../core/discord/autocompleteTanks';
import autocompleteUsername from '../core/discord/autocompleteUsername';
import { buttonRefresh } from '../core/discord/buttonRefresh';
import commandToURL from '../core/discord/commandToURL';
+import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
@@ -73,18 +74,14 @@ async function render(
export const fullStatsCommand = new Promise(
async (resolve) => {
- const command = await addPeriodicFilterOptions(
- new SlashCommandBuilder()
- .setName('full-stats')
- .setDescription('Full in-game statistics'),
- (option) => option.addStringOption(addUsernameChoices),
- );
-
resolve({
inProduction: true,
inPublic: true,
- command,
+ command: await addPeriodicFilterOptions(
+ createLocalizedCommand('full-stats'),
+ (option) => option.addStringOption(addUsernameChoices),
+ ),
async handler(interaction) {
const player = await resolvePlayerFromCommand(interaction);
diff --git a/src/commands/today.ts b/src/commands/today.ts
index 6e5e27b91..26ee17f9e 100644
--- a/src/commands/today.ts
+++ b/src/commands/today.ts
@@ -1,5 +1,5 @@
import { SlashCommandBuilder } from 'discord.js';
-import { encyclopediaInfo } from '../core/blitz/encyclopediaInfo';
+import { NATIONS } from '../core/blitzkrieg/tankDefinitions';
import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
import { addFilterOptions } from '../core/discord/addFilterOptions';
import addUsernameChoices from '../core/discord/addUsernameChoices';
@@ -18,12 +18,12 @@ import { CommandRegistry } from '../events/interactionCreate';
import { renderBreakdown } from './breakdown';
export const todayCommand = new Promise(async (resolve) => {
- const awaitedEncyclopediaInfo = await encyclopediaInfo;
+ const nations = await NATIONS;
const command = addFilterOptions(
new SlashCommandBuilder()
.setName('today')
.setDescription("Today's played tanks and statistics"),
- awaitedEncyclopediaInfo,
+ nations,
).addStringOption(addUsernameChoices);
resolve({
diff --git a/src/components/Tanks/components/Item.tsx b/src/components/Tanks/components/Item.tsx
index 870abd89a..886493113 100644
--- a/src/components/Tanks/components/Item.tsx
+++ b/src/components/Tanks/components/Item.tsx
@@ -6,10 +6,10 @@ import {
import { theme } from '../../../stitches.config';
export const TANK_TYPES = [
- 'light',
- 'medium',
- 'heavy',
- 'tankDestroyer',
+ 'lightTank',
+ 'mediumTank',
+ 'heavyTank',
+ 'AT-SPG',
] as const;
export const TREE_TYPES = ['researchable', 'premium', 'collector'] as const;
diff --git a/src/core/blitzkrieg/tankDefinitions.ts b/src/core/blitzkrieg/tankDefinitions.ts
index 3cadb52a7..fd3d08fb6 100644
--- a/src/core/blitzkrieg/tankDefinitions.ts
+++ b/src/core/blitzkrieg/tankDefinitions.ts
@@ -181,24 +181,24 @@ export const tankNames = tanksDefinitionsArray.then((tanks) =>
);
export const TANK_ICONS: Record = {
- tankDestroyer: 'https://i.imgur.com/BIHSEH0.png',
- light: 'https://i.imgur.com/CSNha5V.png',
- medium: 'https://i.imgur.com/wvf3ltm.png',
- heavy: 'https://i.imgur.com/ECeqlZa.png',
+ 'AT-SPG': 'https://i.imgur.com/BIHSEH0.png',
+ lightTank: 'https://i.imgur.com/CSNha5V.png',
+ mediumTank: 'https://i.imgur.com/wvf3ltm.png',
+ heavyTank: 'https://i.imgur.com/ECeqlZa.png',
};
export const TANK_ICONS_PREMIUM: Record = {
- tankDestroyer: 'https://i.imgur.com/TCu3EdR.png',
- light: 'https://i.imgur.com/zdkpTRb.png',
- medium: 'https://i.imgur.com/3z7eHX6.png',
- heavy: 'https://i.imgur.com/P3vbmyA.png',
+ 'AT-SPG': 'https://i.imgur.com/TCu3EdR.png',
+ lightTank: 'https://i.imgur.com/zdkpTRb.png',
+ mediumTank: 'https://i.imgur.com/3z7eHX6.png',
+ heavyTank: 'https://i.imgur.com/P3vbmyA.png',
};
export const TANK_ICONS_COLLECTOR: Record = {
- tankDestroyer: 'https://i.imgur.com/WTjeirB.png',
- light: 'https://i.imgur.com/EwhtKkU.png',
- medium: 'https://i.imgur.com/u8YDMBh.png',
- heavy: 'https://i.imgur.com/8xRf3nc.png',
+ 'AT-SPG': 'https://i.imgur.com/WTjeirB.png',
+ lightTank: 'https://i.imgur.com/EwhtKkU.png',
+ mediumTank: 'https://i.imgur.com/u8YDMBh.png',
+ heavyTank: 'https://i.imgur.com/8xRf3nc.png',
};
export const TIERS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as const;
diff --git a/src/core/discord/addFilterOptions.ts b/src/core/discord/addFilterOptions.ts
index 5523016c9..7e626a232 100644
--- a/src/core/discord/addFilterOptions.ts
+++ b/src/core/discord/addFilterOptions.ts
@@ -1,60 +1,108 @@
-import { SlashCommandBuilder, SlashCommandSubcommandBuilder } from 'discord.js';
-import { TREE_TYPE_NAMES, TreeType } from '../../components/Tanks';
-import { EncyclopediaInfo } from '../blitz/encyclopediaInfo';
+import {
+ APIApplicationCommandOptionChoice,
+ Locale,
+ SlashCommandBuilder,
+ SlashCommandSubcommandBuilder,
+} from 'discord.js';
+import { TANK_TYPES, TREE_TYPES } from '../../components/Tanks';
+import { translator } from '../localization/translator';
import addTankChoices from './addTankChoices';
import addTierChoices from './addTierChoices';
+import { localizationObject } from './localizationObject';
export function addFilterOptions<
Option extends SlashCommandBuilder | SlashCommandSubcommandBuilder,
->(option: Option, encyclopediaInfo: EncyclopediaInfo) {
- return option
- .addStringOption((option) =>
- option
- .setName('nation')
- .setDescription('Nation')
- .addChoices(
- ...Object.entries(encyclopediaInfo.vehicle_nations).map(
- ([type, name]) => ({ name, value: type }),
- ),
- )
- .setRequired(false),
- )
- .addStringOption((option) => addTierChoices(option).setRequired(false))
- .addStringOption((option) =>
- option
- .setName('tank-type')
- .setDescription('Tank type')
- .addChoices(
- ...Object.entries(encyclopediaInfo.vehicle_types).map(
- ([type, name]) => ({
- name: name.replace(' Tank', ''),
- value: type,
- }),
- ),
- )
- .setRequired(false),
- )
- .addStringOption((option) =>
- option
- .setName('tree-type')
- .setDescription('Tech tree type')
- .addChoices(
- {
- name: TREE_TYPE_NAMES['researchable'],
- value: 'researchable' satisfies TreeType,
- },
- {
- name: TREE_TYPE_NAMES.premium,
- value: 'premium' satisfies TreeType,
- },
- {
- name: TREE_TYPE_NAMES.collector,
- value: 'collector' satisfies TreeType,
- },
- )
- .setRequired(false),
- )
- .addStringOption((option) =>
- addTankChoices(option).setRequired(false),
- ) as Option;
+>(option: Option, nations: string[]) {
+ const { translate } = translator(Locale.EnglishUS);
+
+ return (
+ option
+ .addStringOption((option) =>
+ option
+ .setName(translate('bot.common.options.filters.nation'))
+ .setNameLocalizations(
+ localizationObject('bot.common.options.filters.nation'),
+ )
+ .setDescription(
+ translate('bot.common.options.filters.nation.description'),
+ )
+ .setDescriptionLocalizations(
+ localizationObject('bot.common.options.filters.nation.description'),
+ )
+ .addChoices(
+ ...nations.map(
+ (nation) =>
+ ({
+ value: nation,
+ name: translate(`common.nations.${nation}`),
+ name_localizations: localizationObject(
+ `common.nations.${nation}`,
+ ),
+ }) satisfies APIApplicationCommandOptionChoice,
+ ),
+ )
+ .setRequired(false),
+ )
+ .addStringOption((option) => addTierChoices(option).setRequired(false))
+ .addStringOption((option) =>
+ option
+ .setName(translate('bot.common.options.filters.tank_type'))
+ .setNameLocalizations(
+ localizationObject('bot.common.options.filters.tank_type'),
+ )
+ .setDescription(
+ translate('bot.common.options.filters.tank_type.description'),
+ )
+ .setDescriptionLocalizations(
+ localizationObject(
+ 'bot.common.options.filters.tank_type.description',
+ ),
+ )
+ .addChoices(
+ ...TANK_TYPES.map(
+ (tankType) =>
+ ({
+ value: tankType,
+ name: translate(`common.tank_type_short.${tankType}`),
+ name_localizations: localizationObject(
+ `common.tank_type_short.${tankType}`,
+ ),
+ }) satisfies APIApplicationCommandOptionChoice,
+ ),
+ )
+ .setRequired(false),
+ )
+ .addStringOption((option) =>
+ option
+ .setName(translate('bot.common.options.filters.tree_type'))
+ .setNameLocalizations(
+ localizationObject('bot.common.options.filters.tree_type'),
+ )
+ .setDescription(
+ translate('bot.common.options.filters.tree_type.description'),
+ )
+ .setDescriptionLocalizations(
+ localizationObject(
+ 'bot.common.options.filters.tree_type.description',
+ ),
+ )
+ .addChoices(
+ ...TREE_TYPES.map(
+ (treeType) =>
+ ({
+ value: treeType,
+ name: translate(`common.tree_type.${treeType}`),
+ name_localizations: localizationObject(
+ `common.tree_type.${treeType}`,
+ ),
+ }) satisfies APIApplicationCommandOptionChoice,
+ ),
+ )
+ .setRequired(false),
+ )
+ // TODO: somehow localize this?
+ .addStringOption((option) =>
+ addTankChoices(option).setRequired(false),
+ ) as Option
+ );
}
diff --git a/src/core/discord/addPeriodicFilterOptions.ts b/src/core/discord/addPeriodicFilterOptions.ts
index 48188b0cb..e5a9d7f18 100644
--- a/src/core/discord/addPeriodicFilterOptions.ts
+++ b/src/core/discord/addPeriodicFilterOptions.ts
@@ -3,7 +3,7 @@ import {
SlashCommandSubcommandBuilder,
SlashCommandSubcommandGroupBuilder,
} from 'discord.js';
-import { encyclopediaInfo } from '../blitz/encyclopediaInfo';
+import { NATIONS } from '../blitzkrieg/tankDefinitions';
import { addFilterOptions } from './addFilterOptions';
import { addPeriodSubCommands } from './addPeriodSubCommands';
@@ -15,10 +15,10 @@ export default async function addPeriodicFilterOptions<
option: SlashCommandSubcommandBuilder,
) => SlashCommandSubcommandBuilder = (option) => option,
): Promise {
- const awaitedEncyclopediaInfo = await encyclopediaInfo;
- addPeriodSubCommands(option, (option) => {
- return addFilterOptions(extra(option), awaitedEncyclopediaInfo);
- });
+ const nations = await NATIONS;
+ addPeriodSubCommands(option, (option) =>
+ addFilterOptions(extra(option), nations),
+ );
return option;
}
diff --git a/src/core/discord/addTankChoices.ts b/src/core/discord/addTankChoices.ts
index 07b8d0e1a..b224fc2a9 100644
--- a/src/core/discord/addTankChoices.ts
+++ b/src/core/discord/addTankChoices.ts
@@ -1,9 +1,17 @@
-import { SlashCommandStringOption } from 'discord.js';
+import { Locale, SlashCommandStringOption } from 'discord.js';
+import { translator } from '../localization/translator';
+import { localizationObject } from './localizationObject';
export default function addTankChoices(option: SlashCommandStringOption) {
+ const { translate } = translator(Locale.EnglishUS);
+
return option
- .setName('tank')
- .setDescription('The tank to get stats for')
+ .setName(translate('bot.common.options.tank'))
+ .setNameLocalizations(localizationObject('bot.common.options.tank'))
+ .setDescription(translate('bot.common.options.tank.description'))
+ .setDescriptionLocalizations(
+ localizationObject('bot.common.options.tank.description'),
+ )
.setAutocomplete(true)
.setRequired(true);
}
diff --git a/src/core/discord/createLocalizedCommand.ts b/src/core/discord/createLocalizedCommand.ts
index dbadcd776..d77866755 100644
--- a/src/core/discord/createLocalizedCommand.ts
+++ b/src/core/discord/createLocalizedCommand.ts
@@ -23,23 +23,24 @@ export function createLocalizedCommand(
| CreateLocalizedCommandSubcommand[]
| CreateLocalizedCommandSubcommandGroup[],
) {
+ const commandPathItem = command.replaceAll('-', '_');
const { translate } = translator(Locale.EnglishUS);
const slashCommand = new SlashCommandBuilder()
.setName(command)
- .setNameLocalizations(localizationObject(`bot.commands.${command}`))
- .setDescription(translate(`bot.commands.${command}.description`))
+ .setNameLocalizations(localizationObject(`bot.commands.${commandPathItem}`))
+ .setDescription(translate(`bot.commands.${commandPathItem}.description`))
.setDescriptionLocalizations(
- localizationObject(`bot.commands.${command}.description`),
+ localizationObject(`bot.commands.${commandPathItem}.description`),
);
if (sub) {
sub.map((subItem) => {
if ('subcommand' in subItem) {
const subcommandNameLocalizations = localizationObject(
- `bot.commands.${command}.subcommands.${subItem.subcommand}`,
+ `bot.commands.${commandPathItem}.subcommands.${subItem.subcommand}`,
);
const subcommandDescriptionLocalizations = localizationObject(
- `bot.commands.${command}.subcommands.${subItem.subcommand}.description`,
+ `bot.commands.${commandPathItem}.subcommands.${subItem.subcommand}.description`,
);
slashCommand.addSubcommand((option) => {
@@ -50,17 +51,17 @@ export function createLocalizedCommand(
.setNameLocalizations(subcommandNameLocalizations)
.setDescription(
translate(
- `bot.commands.${command}.subcommands.${subItem.subcommand}.description`,
+ `bot.commands.${commandPathItem}.subcommands.${subItem.subcommand}.description`,
),
)
.setDescriptionLocalizations(subcommandDescriptionLocalizations);
});
} else {
const subcommandNameLocalizations = localizationObject(
- `bot.commands.${command}.groups.${subItem.group}`,
+ `bot.commands.${commandPathItem}.groups.${subItem.group}`,
);
const subcommandDescriptionLocalizations = localizationObject(
- `bot.commands.${command}.groups.${subItem.group}.description`,
+ `bot.commands.${commandPathItem}.groups.${subItem.group}.description`,
);
slashCommand.addSubcommandGroup((option) => {
@@ -71,7 +72,7 @@ export function createLocalizedCommand(
.setNameLocalizations(subcommandNameLocalizations)
.setDescription(
translate(
- `bot.commands.${command}.groups.${subItem.group}.description`,
+ `bot.commands.${commandPathItem}.groups.${subItem.group}.description`,
),
)
.setDescriptionLocalizations(subcommandDescriptionLocalizations);
diff --git a/src/lang/en-US.json b/src/lang/en-US.json
index 959c5812c..2575122f6 100644
--- a/src/lang/en-US.json
+++ b/src/lang/en-US.json
@@ -84,6 +84,26 @@
"clan": {
"$": "clan",
"description": "The clan name or tag"
+ },
+
+ "tank": {
+ "$": "tank",
+ "description": "The tank to get stats for"
+ },
+
+ "filters": {
+ "nation": {
+ "$": "nation",
+ "description": "Nation"
+ },
+ "tank_type": {
+ "$": "tank-type",
+ "description": "Tank type"
+ },
+ "tree_type": {
+ "$": "tree-type",
+ "description": "Tree type"
+ }
}
},
From 3510768786e11152857722ebe37e69f6418a504e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Thu, 7 Mar 2024 15:13:37 -0600
Subject: [PATCH 47/90] New translations en-us.json (Spanish)
---
src/lang/es-ES.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index 1f5b1209f..61e5f0070 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -80,17 +80,17 @@
"description": "El nombre o etiqueta del clan"
},
"tank": {
- "$": "tank",
+ "$": "tanque",
"description": "The tank to get stats for"
},
"filters": {
"nation": {
- "$": "nation",
- "description": "Nation"
+ "$": "nación",
+ "description": "Nación"
},
"tank_type": {
- "$": "tank-type",
- "description": "Tank type"
+ "$": "tipo-tanque",
+ "description": "Tipo de tanque"
},
"tree_type": {
"$": "tree-type",
From 796aca21cff9b76c101ba2b14f42a29d31008240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Thu, 7 Mar 2024 17:02:37 -0600
Subject: [PATCH 48/90] feat: breakdown locale
---
src/commands/breakdown.tsx | 25 +++++++++++++++----------
src/core/discord/addUsernameChoices.ts | 14 +++++++++++---
src/core/discord/buttonRefresh.ts | 2 +-
src/lang/en-US.json | 9 ++++++++-
4 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/src/commands/breakdown.tsx b/src/commands/breakdown.tsx
index 9a7ed439a..f48f8733c 100644
--- a/src/commands/breakdown.tsx
+++ b/src/commands/breakdown.tsx
@@ -33,6 +33,7 @@ import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
import resolvePlayerFromCommand, {
ResolvedPlayer,
} from '../core/discord/resolvePlayerFromCommand';
+import { translator } from '../core/localization/translator';
import calculateWN8 from '../core/statistics/calculateWN8';
import { StatFilters, filterStats } from '../core/statistics/filterStats';
import getWN8Percentile from '../core/statistics/getWN8Percentile';
@@ -47,6 +48,7 @@ export async function renderBreakdown(
filters: StatFilters,
locale: Locale,
) {
+ const { t, translate } = translator(locale);
const awaitedTankDefinitions = await tankDefinitions;
const awaitedTankAverages = await tankAverages;
const statsInPeriod = await getStatsInPeriod(region, id, start, end);
@@ -146,21 +148,21 @@ export async function renderBreakdown(
Date: Thu, 7 Mar 2024 18:27:00 -0600
Subject: [PATCH 49/90] New translations en-us.json (Spanish)
---
src/lang/es-ES.json | 113 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 112 insertions(+), 1 deletion(-)
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index 61e5f0070..a58c85102 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -21,6 +21,25 @@
"researchable": "Árbol tecnológico",
"premium": "Prémium",
"collector": "Coleccionista"
+ },
+ "regions": {
+ "normal": {
+ "com": "North America",
+ "eu": "Europe",
+ "asia": "Asia"
+ },
+ "short": {
+ "com": "NA",
+ "eu": "EU",
+ "asia": "ASIA"
+ }
+ },
+ "leagues": {
+ "diamond": "Diamond",
+ "platinum": "Platinum",
+ "gold": "Gold",
+ "silver": "Silver",
+ "bronze": "Bronze"
}
},
"bot": {
@@ -83,6 +102,10 @@
"$": "tanque",
"description": "The tank to get stats for"
},
+ "username": {
+ "$": "username",
+ "description": "The Blitz username of the player"
+ },
"filters": {
"nation": {
"$": "nación",
@@ -96,6 +119,10 @@
"$": "tree-type",
"description": "Tree type"
}
+ },
+ "region": {
+ "$": "region",
+ "description": "Region"
}
},
"periods": {
@@ -152,8 +179,10 @@
"body": {
"total": "Total",
"battles": "Batallas",
+ "wn8": "WN8",
"winrate": "Tasa de victorias",
- "damage": "Daño"
+ "damage": "Daño",
+ "unknown_tank": "Unknown tank %s"
}
},
"debug": {
@@ -230,6 +259,88 @@
}
}
}
+ },
+ "link": {
+ "$": "link",
+ "description": "Links your Blitz and Discord account",
+ "body": {
+ "accounts_linked": "Accounts linked",
+ "no_role_permissions": {
+ "$": "%s failed to verify",
+ "description": "I don't have the permission to change your manage roles."
+ }
+ },
+ "embed": {
+ "title": "Incorrect account?",
+ "description": "Use the command again and select a username from the search results."
+ }
+ },
+ "search_clans": {
+ "$": "search-clans",
+ "description": "Search clans",
+ "options": {
+ "limit": {
+ "$": "limit",
+ "description": "The max number of clan results (default: %s)"
+ }
+ },
+ "body": {
+ "title": "Clan search for %s in region %s",
+ "no_results": "No clans found"
+ }
+ },
+ "search_players": {
+ "$": "search-players",
+ "description": "Search players",
+ "options": {
+ "limit": {
+ "$": "limit",
+ "description": "The max number of player results (default: %s)"
+ }
+ },
+ "body": {
+ "title": "Player search for %s in region %s",
+ "no_results": "No players found"
+ }
+ },
+ "ratings": {
+ "$": "ratings",
+ "description": "Ratings battles statistics",
+ "subcommands": {
+ "neighbors": {
+ "$": "neighbors",
+ "description": "Neighboring players on the leaderboard"
+ },
+ "league": {
+ "$": "league",
+ "description": "Top players of a league"
+ }
+ },
+ "options": {
+ "limit": {
+ "$": "limit",
+ "description": "How many neighbors to display (default: %s)"
+ },
+ "season": {
+ "$": "season",
+ "description": "Season number (default: current)",
+ "choices": {
+ "current": "%s (current)"
+ }
+ },
+ "league": {
+ "$": "league",
+ "description": "The league to display"
+ }
+ },
+ "body": {
+ "top_players": "Top %s players",
+ "no_participation": "# %s didn't play ratings in season %s\n\nThis player did not participate in this season or did not get past calibration.",
+ "no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running ratings season.",
+ "deleted_player": "Deleted %s",
+ "neighbors": "Ratings neighbors",
+ "more": "+%s more"
+ }
}
}
},
From 3325536bbc7d7d7afc4c09245b01d5f5e11a37e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Thu, 7 Mar 2024 18:27:05 -0600
Subject: [PATCH 50/90] feat: random localizations
---
.vscode/settings.json | 1 +
src/app/tools/ratings/page.tsx | 8 +-
src/app/tools/session/page.tsx | 4 +-
src/commands/evolution.tsx | 4 +-
src/commands/inactive.tsx | 4 +-
src/commands/link.tsx | 35 ++--
src/commands/ratings.tsx | 219 ++++++++++++++---------
src/commands/searchClans.ts | 50 ++++--
src/commands/searchPlayers.ts | 39 +++-
src/constants/leagues.ts | 10 +-
src/constants/regions.ts | 18 +-
src/core/discord/addRegionChoices.ts | 33 +++-
src/core/discord/autocompleteClan.ts | 11 +-
src/core/discord/autocompleteUsername.ts | 13 +-
src/core/discord/localizationObject.ts | 4 +-
src/events/interactionCreate/index.ts | 11 +-
src/lang/en-US.json | 125 +++++++++++++
17 files changed, 423 insertions(+), 166 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index dca4e6fa9..57b505836 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -131,6 +131,7 @@
"TYPELESS",
"ubjson",
"Unicum",
+ "UNLOCALIZED",
"UNORM",
"Unregistering",
"vickers",
diff --git a/src/app/tools/ratings/page.tsx b/src/app/tools/ratings/page.tsx
index 979e4c1c3..555bb9f8d 100644
--- a/src/app/tools/ratings/page.tsx
+++ b/src/app/tools/ratings/page.tsx
@@ -20,7 +20,11 @@ import PageWrapper from '../../../components/PageWrapper';
import { Skeleton } from '../../../components/Skeleton';
import { LEAGUES } from '../../../constants/leagues';
import { FIRST_ARCHIVED_RATINGS_SEASON } from '../../../constants/ratings';
-import { REGIONS, REGION_NAMES, Region } from '../../../constants/regions';
+import {
+ REGIONS,
+ Region,
+ UNLOCALIZED_REGION_NAMES,
+} from '../../../constants/regions';
import { WARGAMING_APPLICATION_ID } from '../../../constants/wargamingApplicationID';
import fetchBlitz from '../../../core/blitz/fetchBlitz';
import { getClanAccountInfo } from '../../../core/blitz/getClanAccountInfo';
@@ -556,7 +560,7 @@ export default function Page() {
{REGIONS.map((region) => (
- {REGION_NAMES[region]}
+ {UNLOCALIZED_REGION_NAMES[region]}
))}
diff --git a/src/app/tools/session/page.tsx b/src/app/tools/session/page.tsx
index eecd2e180..a092b4f8a 100644
--- a/src/app/tools/session/page.tsx
+++ b/src/app/tools/session/page.tsx
@@ -18,7 +18,7 @@ import {
import { debounce } from 'lodash';
import { ChangeEvent, useEffect, useRef, useState } from 'react';
import PageWrapper from '../../../components/PageWrapper';
-import { REGION_NAMES } from '../../../constants/regions';
+import { UNLOCALIZED_REGION_NAMES } from '../../../constants/regions';
import searchPlayersAcrossRegions, {
AccountListWithServer,
} from '../../../core/blitz/searchPlayersAcrossRegions';
@@ -107,7 +107,7 @@ export default function Page() {
setShowSearchResults(false);
setSession(region, id, nickname);
}}
- shortcut={REGION_NAMES[region]}
+ shortcut={UNLOCALIZED_REGION_NAMES[region]}
>
{nickname}
diff --git a/src/commands/evolution.tsx b/src/commands/evolution.tsx
index fd6a61cdd..fce791045 100644
--- a/src/commands/evolution.tsx
+++ b/src/commands/evolution.tsx
@@ -89,8 +89,8 @@ async function render(
max: maxX,
precision: 0,
}}
- xMinLabel={new Date(minTime * 1000).toDateString()}
- xMaxLabel={new Date(maxTime * 1000).toDateString()}
+ xMinLabel={new Date(minTime * 1000).toLocaleDateString(locale)}
+ xMaxLabel={new Date(maxTime * 1000).toLocaleDateString(locale)}
>
{Graph.Line({
color: Graph.LineColor.Red,
diff --git a/src/commands/inactive.tsx b/src/commands/inactive.tsx
index d5f3d78ac..0c74df574 100644
--- a/src/commands/inactive.tsx
+++ b/src/commands/inactive.tsx
@@ -63,7 +63,9 @@ export const inactiveCommand = new Promise((resolve) => {
([name, days]) =>
[
name,
- translate('bot.commands.inactive.body.listing', [`${days}`]),
+ translate('bot.commands.inactive.body.listing', [
+ days.toFixed(0),
+ ]),
] as [string, string],
);
const hasInactiveMembers = inactive.length > 0;
diff --git a/src/commands/link.tsx b/src/commands/link.tsx
index 5f81fa346..55c2cc463 100644
--- a/src/commands/link.tsx
+++ b/src/commands/link.tsx
@@ -1,18 +1,19 @@
import { teal } from '@radix-ui/colors';
-import { GuildMemberRoleManager, SlashCommandBuilder } from 'discord.js';
+import { GuildMemberRoleManager } from 'discord.js';
import markdownEscape from 'markdown-escape';
import discord from '../../discord.json' assert { type: 'json' };
import { Glow } from '../components/AllStatsOverview/components/WN8Display/components/Glow';
import CommandWrapper from '../components/CommandWrapper';
-import { REGION_NAMES } from '../constants/regions';
import { getAccountInfo } from '../core/blitz/getAccountInfo';
import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
import { linkBlitzAndDiscord } from '../core/blitzkrieg/discordBlitz';
import addUsernameChoices from '../core/discord/addUsernameChoices';
import autocompleteUsername from '../core/discord/autocompleteUsername';
+import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import embedInfo from '../core/discord/embedInfo';
import embedNegative from '../core/discord/embedNegative';
import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+import { translator } from '../core/localization/translator';
import { CommandRegistry } from '../events/interactionCreate';
import { theme } from '../stitches.config';
@@ -21,14 +22,12 @@ export const verifyCommand = new Promise((resolve) => {
inProduction: true,
inPublic: true,
- command: new SlashCommandBuilder()
- .setName('link')
- .setDescription('Links your Blitz and Discord account')
- .addStringOption((option) =>
- addUsernameChoices(option).setRequired(true),
- ),
+ command: createLocalizedCommand('link').addStringOption((option) =>
+ addUsernameChoices(option).setRequired(true),
+ ),
async handler(interaction) {
+ const { t, translate } = translator(interaction.locale);
const { id, region } = await resolvePlayerFromCommand(interaction);
const discordId = parseInt(interaction.user.id);
const accountInfo = await getAccountInfo(region, id);
@@ -39,8 +38,14 @@ export const verifyCommand = new Promise((resolve) => {
if (interaction.guildId === discord.sklld_guild_id) {
if (!interaction.guild?.members.me?.permissions.has('ManageRoles')) {
return embedNegative(
- `${markdownEscape(interaction.user.username)} failed to verify`,
- "I don't have the permission to change your manage roles.",
+ translate(translate('bot.commands.link.body.no_role_permissions'), [
+ markdownEscape(interaction.user.username),
+ ]),
+ translate(
+ translate(
+ 'bot.commands.link.body.no_role_permissions.description',
+ ),
+ ),
);
}
@@ -140,7 +145,9 @@ export const verifyCommand = new Promise((resolve) => {
height: 16,
}}
/>
- Accounts linked
+ {t`bot.commands.link.body.accounts_linked`}
- (
+export const breakdownCommand = new Promise(
async (resolve) => {
resolve({
inProduction: true,
diff --git a/src/commands/debug.ts b/src/commands/debug.ts
index f0a10993d..57452999b 100644
--- a/src/commands/debug.ts
+++ b/src/commands/debug.ts
@@ -6,33 +6,35 @@ import { CommandRegistry } from '../events/interactionCreate';
const executionStart = new Date().getTime();
-export const debugCommand: CommandRegistry = {
- inProduction: true,
- inPublic: true,
+export const debugCommand = new Promise((resolve) => {
+ resolve({
+ inProduction: true,
+ inPublic: true,
- command: createLocalizedCommand('debug'),
+ command: createLocalizedCommand('debug'),
- async handler(interaction) {
- const { t } = translator(interaction.locale);
- const currentTime = new Date().getTime();
- const uptime = currentTime - executionStart;
- const list = [
- [t`bot.commands.debug.body.version`, packageJSON.version],
- [
- t`bot.commands.debug.body.shard`,
- client.shard?.ids[0] ?? t`bot.commands.debug.body.shard.default`,
- ],
- [
- t`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(
- uptime % 1000,
- )}ms`,
- ],
- ];
- return t`bot.commands.debug.body.title${list
- .map(([key, value]) => `- ${key}: ${value}`)
- .join('\n')}`;
- },
-};
+ async handler(interaction) {
+ const { t } = translator(interaction.locale);
+ const currentTime = new Date().getTime();
+ const uptime = currentTime - executionStart;
+ const list = [
+ [t`bot.commands.debug.body.version`, packageJSON.version],
+ [
+ t`bot.commands.debug.body.shard`,
+ client.shard?.ids[0] ?? t`bot.commands.debug.body.shard.default`,
+ ],
+ [
+ t`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(
+ uptime % 1000,
+ )}ms`,
+ ],
+ ];
+ return t`bot.commands.debug.body.title${list
+ .map(([key, value]) => `- ${key}: ${value}`)
+ .join('\n')}`;
+ },
+ });
+});
diff --git a/src/commands/eligible.ts b/src/commands/eligible.ts
index 8225885e6..33fcc5812 100644
--- a/src/commands/eligible.ts
+++ b/src/commands/eligible.ts
@@ -1,198 +1,205 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import getPeriodNow from '../core/blitzkrieg/getPeriodNow';
-import getTimeDaysAgo from '../core/blitzkrieg/getTimeDaysAgo';
-import { tankDefinitions } from '../core/blitzkrieg/tankDefinitions';
-import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
-import { tankAverages } from '../core/blitzstars/tankAverages';
-import addUsernameChoices from '../core/discord/addUsernameChoices';
-import embedNegative from '../core/discord/embedNegative';
-import embedPositive from '../core/discord/embedPositive';
-import markdownTable, { TableInput } from '../core/discord/markdownTable';
-import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
-import calculateWN8 from '../core/statistics/calculateWN8';
-import sumStats from '../core/statistics/sumStats';
-import { CommandRegistry } from '../events/interactionCreate';
-import { PossiblyPromise } from '../types/possiblyPromise';
+// _____ _____ _ _ _ _ _____ ____ __ __ ______ ____ _____ _ __
+// |_ _| / ____| | | | /\ | | | | / ____/ __ \| \/ | ____| | _ \ /\ / ____| |/ /
+// | | | (___ | |__| | / \ | | | | | | | | | | \ / | |__ | |_) | / \ | | | ' /
+// | | \___ \| __ | / /\ \ | | | | | | | | | | |\/| | __| | _ < / /\ \| | | <
+// _| |_ ____) | | | |/ ____ \| |____| |____ | |___| |__| | | | | |____ | |_) / ____ \ |____| . \
+// |_____| |_____/|_| |_/_/ \_\______|______| \_____\____/|_| |_|______| |____/_/ \_\_____|_|\_\
-export type SkilledClan = 'SKLLD' | 'SMRI';
+// import { SlashCommandBuilder } from 'discord.js';
+// import { getAccountInfo } from '../core/blitz/getAccountInfo';
+// import getPeriodNow from '../core/blitzkrieg/getPeriodNow';
+// import getTimeDaysAgo from '../core/blitzkrieg/getTimeDaysAgo';
+// import { tankDefinitions } from '../core/blitzkrieg/tankDefinitions';
+// import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
+// import { tankAverages } from '../core/blitzstars/tankAverages';
+// import addUsernameChoices from '../core/discord/addUsernameChoices';
+// import embedNegative from '../core/discord/embedNegative';
+// import embedPositive from '../core/discord/embedPositive';
+// import markdownTable, { TableInput } from '../core/discord/markdownTable';
+// import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+// import calculateWN8 from '../core/statistics/calculateWN8';
+// import sumStats from '../core/statistics/sumStats';
+// import { CommandRegistry } from '../events/interactionCreate';
+// import { PossiblyPromise } from '../types/possiblyPromise';
-export const SKILLED_CLANS: Record = {
- SKLLD: 'Skilled',
- SMRI: 'Samurai',
-};
+// export type SkilledClan = 'SKLLD' | 'SMRI';
-export const eligibleCommand: CommandRegistry = {
- inProduction: true,
- inPublic: false,
+// export const SKILLED_CLANS: Record = {
+// SKLLD: 'Skilled',
+// SMRI: 'Samurai',
+// };
- command: new SlashCommandBuilder()
- .setName('eligible')
- .setDescription('Checks eligibility for any Skilled clan')
- .addStringOption((option) =>
- option
- .setName('clan')
- .setDescription('The clan to check')
- .setChoices(
- {
- name: SKILLED_CLANS.SKLLD,
- value: 'SKLLD' satisfies SkilledClan,
- },
- { name: SKILLED_CLANS.SMRI, value: 'SMRI' satisfies SkilledClan },
- )
- .setRequired(true),
- )
- .addStringOption(addUsernameChoices),
+// export const eligibleCommand: CommandRegistry = {
+// inProduction: true,
+// inPublic: false,
- async handler(interaction) {
- const clan = interaction.options.getString('clan') as SkilledClan;
- const { id, region: region } = await resolvePlayerFromCommand(interaction);
- const accountInfo = await getAccountInfo(region, id);
- const problems: TableInput = [];
- const title = `${accountInfo.nickname}'s eligibility for ${SKILLED_CLANS[clan]}`;
- let isEligible = false;
- let body = '';
+// command: new SlashCommandBuilder()
+// .setName('eligible')
+// .setDescription('Checks eligibility for any Skilled clan')
+// .addStringOption((option) =>
+// option
+// .setName('clan')
+// .setDescription('The clan to check')
+// .setChoices(
+// {
+// name: SKILLED_CLANS.SKLLD,
+// value: 'SKLLD' satisfies SkilledClan,
+// },
+// { name: SKILLED_CLANS.SMRI, value: 'SMRI' satisfies SkilledClan },
+// )
+// .setRequired(true),
+// )
+// .addStringOption(addUsernameChoices),
- if (clan === 'SKLLD') {
- const { diff: diffed } = await getStatsInPeriod(
- region,
- id,
- getTimeDaysAgo(region, 30),
- getPeriodNow(),
- );
- const entries = Object.entries(diffed);
- const stats = sumStats(entries.map(([, stats]) => stats));
- const averageTier =
- (await entries.reduce>(
- async (accumulator, [tankIdString, stats]) => {
- const tankId = parseInt(tankIdString);
- const tankDefinition = (await tankDefinitions)[tankId];
+// async handler(interaction) {
+// const clan = interaction.options.getString('clan') as SkilledClan;
+// const { id, region: region } = await resolvePlayerFromCommand(interaction);
+// const accountInfo = await getAccountInfo(region, id);
+// const problems: TableInput = [];
+// const title = `${accountInfo.nickname}'s eligibility for ${SKILLED_CLANS[clan]}`;
+// let isEligible = false;
+// let body = '';
- if (!tankDefinition) return accumulator;
+// if (clan === 'SKLLD') {
+// const { diff: diffed } = await getStatsInPeriod(
+// region,
+// id,
+// getTimeDaysAgo(region, 30),
+// getPeriodNow(),
+// );
+// const entries = Object.entries(diffed);
+// const stats = sumStats(entries.map(([, stats]) => stats));
+// const averageTier =
+// (await entries.reduce>(
+// async (accumulator, [tankIdString, stats]) => {
+// const tankId = parseInt(tankIdString);
+// const tankDefinition = (await tankDefinitions)[tankId];
- const tankTier = tankDefinition.tier;
+// if (!tankDefinition) return accumulator;
- return (await accumulator) + tankTier * stats.battles;
- },
- 0,
- )) /
- (await entries.reduce>(
- async (accumulator, [tankIdString, stats]) => {
- const tankId = parseInt(tankIdString);
- const tankDefinition = (await tankDefinitions)[tankId];
+// const tankTier = tankDefinition.tier;
- if (!tankDefinition) return accumulator;
+// return (await accumulator) + tankTier * stats.battles;
+// },
+// 0,
+// )) /
+// (await entries.reduce>(
+// async (accumulator, [tankIdString, stats]) => {
+// const tankId = parseInt(tankIdString);
+// const tankDefinition = (await tankDefinitions)[tankId];
- return stats.battles;
- },
- 0,
- ));
- const WN8 =
- (await entries.reduce>(
- async (accumulator, [tankIdString, stats]) => {
- const tankId = parseInt(tankIdString);
+// if (!tankDefinition) return accumulator;
- // edge case where new tanks don't have averages
- if ((await tankAverages)[tankId]) {
- const tankWN8 = calculateWN8(
- (await tankAverages)[tankId].all,
- stats,
- );
+// return stats.battles;
+// },
+// 0,
+// ));
+// const WN8 =
+// (await entries.reduce>(
+// async (accumulator, [tankIdString, stats]) => {
+// const tankId = parseInt(tankIdString);
- if (isNaN(tankWN8)) return accumulator;
- return (await accumulator) + tankWN8 * stats.battles;
- } else return accumulator;
- },
- 0,
- )) / stats.battles;
- const tier10Damage =
- (await entries.reduce>(
- async (accumulator, [tankIdString, stats]) => {
- const tankId = parseInt(tankIdString);
+// // edge case where new tanks don't have averages
+// if ((await tankAverages)[tankId]) {
+// const tankWN8 = calculateWN8(
+// (await tankAverages)[tankId].all,
+// stats,
+// );
- if ((await tankDefinitions)[tankId]?.tier === 10) {
- const tankStats = diffed[tankId];
- return (await accumulator) + tankStats.damage_dealt;
- } else return accumulator;
- },
- 0,
- )) /
- (await entries.reduce>(
- async (accumulator, [tankIdString, stats]) => {
- const tankId = parseInt(tankIdString);
+// if (isNaN(tankWN8)) return accumulator;
+// return (await accumulator) + tankWN8 * stats.battles;
+// } else return accumulator;
+// },
+// 0,
+// )) / stats.battles;
+// const tier10Damage =
+// (await entries.reduce>(
+// async (accumulator, [tankIdString, stats]) => {
+// const tankId = parseInt(tankIdString);
- if ((await tankDefinitions)[tankId]?.tier === 10) {
- const tankStats = diffed[tankId];
- return (await accumulator) + tankStats.battles;
- } else return accumulator;
- },
- 0,
- ));
+// if ((await tankDefinitions)[tankId]?.tier === 10) {
+// const tankStats = diffed[tankId];
+// return (await accumulator) + tankStats.damage_dealt;
+// } else return accumulator;
+// },
+// 0,
+// )) /
+// (await entries.reduce>(
+// async (accumulator, [tankIdString, stats]) => {
+// const tankId = parseInt(tankIdString);
- if (stats.battles < 126) {
- problems.push(['Battles', `${stats.battles} (${stats.battles - 126})`]);
- }
- if (averageTier < 8) {
- problems.push([
- 'Average tier',
- `${averageTier.toFixed(2)} (${(averageTier - 8).toFixed(2)})`,
- ]);
- }
- if (stats.wins / stats.battles < 0.6) {
- problems.push([
- 'Winrate',
- `${(100 * (stats.wins / stats.battles)).toFixed(2)}% (${(
- 100 *
- (stats.wins / stats.battles - 0.6)
- ).toFixed(2)}%)`,
- ]);
- }
- if (WN8 < 2450) {
- problems.push([
- 'WN8',
- `${WN8.toFixed(0)} (${(WN8 - 2450).toFixed(0)})`,
- ]);
- }
- if (tier10Damage < 1250) {
- problems.push([
- 'Tier 10 damage',
- `${tier10Damage.toFixed(0)} (${tier10Damage - 1250})`,
- ]);
- }
+// if ((await tankDefinitions)[tankId]?.tier === 10) {
+// const tankStats = diffed[tankId];
+// return (await accumulator) + tankStats.battles;
+// } else return accumulator;
+// },
+// 0,
+// ));
- isEligible = problems.length === 0;
- body = isEligible
- ? 'Player is fully eligible.'
- : `Player is not eligible. Shortcomings in 30-day statistics:\n\n${markdownTable(
- problems,
- )}`;
- } else if (clan === 'SMRI') {
- const stats = accountInfo.statistics.all;
+// if (stats.battles < 126) {
+// problems.push(['Battles', `${stats.battles} (${stats.battles - 126})`]);
+// }
+// if (averageTier < 8) {
+// problems.push([
+// 'Average tier',
+// `${averageTier.toFixed(2)} (${(averageTier - 8).toFixed(2)})`,
+// ]);
+// }
+// if (stats.wins / stats.battles < 0.6) {
+// problems.push([
+// 'Winrate',
+// `${(100 * (stats.wins / stats.battles)).toFixed(2)}% (${(
+// 100 *
+// (stats.wins / stats.battles - 0.6)
+// ).toFixed(2)}%)`,
+// ]);
+// }
+// if (WN8 < 2450) {
+// problems.push([
+// 'WN8',
+// `${WN8.toFixed(0)} (${(WN8 - 2450).toFixed(0)})`,
+// ]);
+// }
+// if (tier10Damage < 1250) {
+// problems.push([
+// 'Tier 10 damage',
+// `${tier10Damage.toFixed(0)} (${tier10Damage - 1250})`,
+// ]);
+// }
- if (stats.battles < 1500) {
- problems.push([
- 'Battles',
- `${stats.battles} (${stats.battles - 1500})`,
- ]);
- }
- if (stats.wins / stats.battles <= 0.53) {
- problems.push([
- 'Winrate',
- `${(100 * (stats.wins / stats.battles)).toFixed(2)}% (${(
- 100 *
- (stats.wins / stats.battles - 0.53)
- ).toFixed(2)}%)`,
- ]);
- }
+// isEligible = problems.length === 0;
+// body = isEligible
+// ? 'Player is fully eligible.'
+// : `Player is not eligible. Shortcomings in 30-day statistics:\n\n${markdownTable(
+// problems,
+// )}`;
+// } else if (clan === 'SMRI') {
+// const stats = accountInfo.statistics.all;
- isEligible = problems.length === 0;
- body = isEligible
- ? 'Player is fully eligible.'
- : `Player is not eligible. Shortcomings in career statistics:\n\n${markdownTable(
- problems,
- )}`;
- }
+// if (stats.battles < 1500) {
+// problems.push([
+// 'Battles',
+// `${stats.battles} (${stats.battles - 1500})`,
+// ]);
+// }
+// if (stats.wins / stats.battles <= 0.53) {
+// problems.push([
+// 'Winrate',
+// `${(100 * (stats.wins / stats.battles)).toFixed(2)}% (${(
+// 100 *
+// (stats.wins / stats.battles - 0.53)
+// ).toFixed(2)}%)`,
+// ]);
+// }
- return (isEligible ? embedPositive : embedNegative)(title, body);
- },
-};
+// isEligible = problems.length === 0;
+// body = isEligible
+// ? 'Player is fully eligible.'
+// : `Player is not eligible. Shortcomings in career statistics:\n\n${markdownTable(
+// problems,
+// )}`;
+// }
+
+// return (isEligible ? embedPositive : embedNegative)(title, body);
+// },
+// };
diff --git a/src/commands/evolution.tsx b/src/commands/evolution.tsx
index e2bb7bd99..8bc87cfe7 100644
--- a/src/commands/evolution.tsx
+++ b/src/commands/evolution.tsx
@@ -1,7 +1,4 @@
-import {
- SlashCommandBuilder,
- SlashCommandSubcommandGroupBuilder,
-} from 'discord.js';
+import { SlashCommandSubcommandGroupBuilder } from 'discord.js';
import CommandWrapper from '../components/CommandWrapper';
import * as Graph from '../components/Graph';
import NoData, { NoDataType } from '../components/NoData';
@@ -20,6 +17,7 @@ import autocompleteTanks from '../core/discord/autocompleteTanks';
import autocompleteUsername from '../core/discord/autocompleteUsername';
import buttonPrimary from '../core/discord/buttonPrimary';
import commandToURL from '../core/discord/commandToURL';
+import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton';
import resolvePeriodFromCommand, {
@@ -29,7 +27,7 @@ import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
import resolvePlayerFromCommand, {
ResolvedPlayer,
} from '../core/discord/resolvePlayerFromCommand';
-import { CommandRegistryPromisable } from '../events/interactionCreate';
+import { CommandRegistry } from '../events/interactionCreate';
type EvolutionStatType = 'player' | 'tank';
@@ -107,40 +105,32 @@ async function render(
);
}
-export const evolutionCommand = new Promise(
+export const evolutionCommand = new Promise(
async (resolve) => {
- let playerGroup: SlashCommandSubcommandGroupBuilder;
- let tankGroup: SlashCommandSubcommandGroupBuilder;
- const command = new SlashCommandBuilder()
- .setName('evolution')
- .setDescription('Evolution of statistics')
- .addSubcommandGroup((option) => {
- playerGroup = option
- .setName('player')
- .setDescription('Player statistics');
-
- return playerGroup;
- })
- .addSubcommandGroup((option) => {
- tankGroup = option.setName('tank').setDescription('Tank statistics');
-
- return tankGroup;
- });
-
- addPeriodSubCommands(playerGroup!, (option) =>
- option.addStringOption(addUsernameChoices),
- );
- addPeriodSubCommands(tankGroup!, (option) =>
- option
- .addStringOption(addTankChoices)
- .addStringOption(addUsernameChoices),
- );
-
resolve({
inProduction: true,
inPublic: true,
- command,
+ command: createLocalizedCommand('evolution', [
+ {
+ group: 'player',
+ modify(option: SlashCommandSubcommandGroupBuilder) {
+ addPeriodSubCommands(option, (option) =>
+ option.addStringOption(addUsernameChoices),
+ );
+ },
+ },
+ {
+ group: 'tank',
+ modify(option: SlashCommandSubcommandGroupBuilder) {
+ addPeriodSubCommands(option, (option) =>
+ option
+ .addStringOption(addTankChoices)
+ .addStringOption(addUsernameChoices),
+ );
+ },
+ },
+ ]),
async handler(interaction) {
const commandGroup =
@@ -156,8 +146,6 @@ export const evolutionCommand = new Promise(
tankId,
});
- getBlitzStarsLinkButton;
-
return [
await render(player, period, commandGroup, tankId),
buttonPrimary(path, 'Refresh'),
diff --git a/src/commands/fullStats.tsx b/src/commands/fullStats.tsx
index fce3f7205..bb7e1f37f 100644
--- a/src/commands/fullStats.tsx
+++ b/src/commands/fullStats.tsx
@@ -29,7 +29,7 @@ import resolvePlayerFromCommand, {
} from '../core/discord/resolvePlayerFromCommand';
import { StatFilters, filterStats } from '../core/statistics/filterStats';
import { getTierWeights } from '../core/statistics/getTierWeights';
-import { CommandRegistryPromisable } from '../events/interactionCreate';
+import { CommandRegistry } from '../events/interactionCreate';
async function render(
{ region, id }: ResolvedPlayer,
@@ -64,7 +64,7 @@ async function render(
);
}
-export const fullStatsCommand = new Promise(
+export const fullStatsCommand = new Promise(
async (resolve) => {
const command = await addPeriodicFilterOptions(
new SlashCommandBuilder()
diff --git a/src/commands/inactive.tsx b/src/commands/inactive.tsx
index 762ff3515..f5a4807f5 100644
--- a/src/commands/inactive.tsx
+++ b/src/commands/inactive.tsx
@@ -12,58 +12,61 @@ import { CommandRegistry } from '../events/interactionCreate';
const DEFAULT_THRESHOLD = 7;
-export const inactiveCommand: CommandRegistry = {
- inProduction: true,
- inPublic: true,
+export const inactiveCommand = new Promise((resolve) => {
+ resolve({
+ inProduction: true,
+ inPublic: true,
- command: new SlashCommandBuilder()
- .setName('inactive')
- .setDescription('Lists all inactive players')
- .addStringOption(addClanChoices)
- .addNumberOption((option) =>
- option
- .setName('threshold')
- .setDescription(
- `The number of days inactive (default: ${DEFAULT_THRESHOLD})`,
+ command: new SlashCommandBuilder()
+ .setName('inactive')
+ .setDescription('Lists all inactive players')
+ .addStringOption(addClanChoices)
+ .addNumberOption((option) =>
+ option
+ .setName('threshold')
+ .setDescription(
+ `The number of days inactive (default: ${DEFAULT_THRESHOLD})`,
+ )
+ .setMinValue(0),
+ ),
+
+ async handler(interaction) {
+ const { region, id } = await resolveClanFromCommand(interaction);
+ const threshold =
+ interaction.options.getNumber('threshold')! ?? DEFAULT_THRESHOLD;
+ const time = new Date().getTime() / 1000;
+ const clanInfo = await getClanInfo(region, id);
+ const accountInfo = await getAccountInfo(region, clanInfo.members_ids);
+ const inactive = accountInfo
+ .map(
+ (account) =>
+ [
+ account.nickname,
+ (time - account.last_battle_time) / 60 / 60 / 24,
+ ] as [string, number],
)
- .setMinValue(0),
- ),
+ .filter(([, inactiveDays]) => inactiveDays >= threshold)
+ .sort((a, b) => b[1] - a[1])
+ .map(
+ ([name, days]) =>
+ [name, `${days.toFixed(0)} days`] as [string, string],
+ );
+ const hasInactiveMembers = inactive.length > 0;
- async handler(interaction) {
- const { region, id } = await resolveClanFromCommand(interaction);
- const threshold =
- interaction.options.getNumber('threshold')! ?? DEFAULT_THRESHOLD;
- const time = new Date().getTime() / 1000;
- const clanInfo = await getClanInfo(region, id);
- const accountInfo = await getAccountInfo(region, clanInfo.members_ids);
- const inactive = accountInfo
- .map(
- (account) =>
- [
- account.nickname,
- (time - account.last_battle_time) / 60 / 60 / 24,
- ] as [string, number],
- )
- .filter(([, inactiveDays]) => inactiveDays >= threshold)
- .sort((a, b) => b[1] - a[1])
- .map(
- ([name, days]) => [name, `${days.toFixed(0)} days`] as [string, string],
+ return (
+
+
);
- const hasInactiveMembers = inactive.length > 0;
+ },
- return (
-
-
- );
- },
-
- autocomplete: autocompleteClan,
-};
+ autocomplete: autocompleteClan,
+ });
+});
diff --git a/src/commands/link.tsx b/src/commands/link.tsx
index 27e744b34..5f81fa346 100644
--- a/src/commands/link.tsx
+++ b/src/commands/link.tsx
@@ -16,194 +16,198 @@ import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
import { CommandRegistry } from '../events/interactionCreate';
import { theme } from '../stitches.config';
-export const verifyCommand: CommandRegistry = {
- inProduction: true,
- inPublic: true,
+export const verifyCommand = new Promise((resolve) => {
+ resolve({
+ inProduction: true,
+ inPublic: true,
- command: new SlashCommandBuilder()
- .setName('link')
- .setDescription('Links your Blitz and Discord account')
- .addStringOption((option) => addUsernameChoices(option).setRequired(true)),
+ command: new SlashCommandBuilder()
+ .setName('link')
+ .setDescription('Links your Blitz and Discord account')
+ .addStringOption((option) =>
+ addUsernameChoices(option).setRequired(true),
+ ),
- async handler(interaction) {
- const { id, region } = await resolvePlayerFromCommand(interaction);
- const discordId = parseInt(interaction.user.id);
- const accountInfo = await getAccountInfo(region, id);
- const clanAccountInfo = await getClanAccountInfo(region, id, ['clan']);
+ async handler(interaction) {
+ const { id, region } = await resolvePlayerFromCommand(interaction);
+ const discordId = parseInt(interaction.user.id);
+ const accountInfo = await getAccountInfo(region, id);
+ const clanAccountInfo = await getClanAccountInfo(region, id, ['clan']);
- await linkBlitzAndDiscord(discordId, region, id);
+ await linkBlitzAndDiscord(discordId, region, id);
- if (interaction.guildId === discord.sklld_guild_id) {
- if (!interaction.guild?.members.me?.permissions.has('ManageRoles')) {
- return embedNegative(
- `${markdownEscape(interaction.user.username)} failed to verify`,
- "I don't have the permission to change your manage roles.",
+ if (interaction.guildId === discord.sklld_guild_id) {
+ if (!interaction.guild?.members.me?.permissions.has('ManageRoles')) {
+ return embedNegative(
+ `${markdownEscape(interaction.user.username)} failed to verify`,
+ "I don't have the permission to change your manage roles.",
+ );
+ }
+
+ await (interaction.member!.roles as GuildMemberRoleManager).remove(
+ discord.sklld_verify_role,
+ );
+ await (interaction.member!.roles as GuildMemberRoleManager).add(
+ discord.sklld_peasant_role,
);
}
- await (interaction.member!.roles as GuildMemberRoleManager).remove(
- discord.sklld_verify_role,
- );
- await (interaction.member!.roles as GuildMemberRoleManager).add(
- discord.sklld_peasant_role,
- );
- }
-
- return [
-
- ,
-
- ,
+ embedInfo(
+ 'Incorrect account?',
+ 'Use the command again and select a username from the search results.',
+ ),
+ ];
+ },
- embedInfo(
- 'Incorrect account?',
- 'Use the command again and select a username from the search results.',
- ),
- ];
- },
-
- autocomplete: autocompleteUsername,
-};
+ autocomplete: autocompleteUsername,
+ });
+});
diff --git a/src/commands/ownedTanks.tsx b/src/commands/ownedTanks.tsx
index 0e61e4f31..4c8640c7a 100644
--- a/src/commands/ownedTanks.tsx
+++ b/src/commands/ownedTanks.tsx
@@ -21,108 +21,112 @@ import autocompleteUsername from '../core/discord/autocompleteUsername';
import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
import { CommandRegistry } from '../events/interactionCreate';
-export const ownedTanksCommand: CommandRegistry = {
- inProduction: true,
- inPublic: true,
+export const ownedTanksCommand = new Promise
+
);
}
From 267f23cad89bb4adf2f2ac5cc19b87ceb64f22d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 09:53:28 -0600
Subject: [PATCH 27/90] fix: use dot in /link
---
src/commands/link.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/commands/link.tsx b/src/commands/link.tsx
index a7a7ea8c6..27e744b34 100644
--- a/src/commands/link.tsx
+++ b/src/commands/link.tsx
@@ -186,7 +186,7 @@ export const verifyCommand: CommandRegistry = {
}}
>
{clanAccountInfo?.clan
- ? `[${clanAccountInfo?.clan?.tag}] - `
+ ? `[${clanAccountInfo?.clan?.tag}] • `
: ''}
{REGION_NAMES[region]}
From adad668157a7a38e8a3ea236a4c0b8c04a84b9b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 15:34:10 -0600
Subject: [PATCH 28/90] feat: some period translations
---
src/commands/breakdown.tsx | 4 +-
src/commands/debug.ts | 58 +-
src/commands/eligible.ts | 363 +++++------
src/commands/evolution.tsx | 60 +-
src/commands/fullStats.tsx | 4 +-
src/commands/inactive.tsx | 103 ++--
src/commands/link.tsx | 292 ++++-----
src/commands/ownedTanks.tsx | 194 +++---
src/commands/permissions.ts | 74 +--
src/commands/ping.ts | 52 +-
src/commands/playerAchievements.ts | 99 +--
src/commands/playerInfo.ts | 80 +--
src/commands/ratings.tsx | 611 +++++++++----------
src/commands/searchClans.ts | 68 ++-
src/commands/searchPlayers.ts | 80 +--
src/commands/searchTanks.ts | 62 +-
src/commands/stats.tsx | 80 ++-
src/commands/today.ts | 90 ++-
src/core/discord/createLocalizedCommand.ts | 80 ++-
src/core/discord/resolvePeriodFromButton.ts | 2 +-
src/core/discord/resolvePeriodFromCommand.ts | 15 +-
src/core/localization/translator.ts | 19 +-
src/events/interactionCreate/index.ts | 11 +-
src/lang/en-US.json | 24 +
24 files changed, 1309 insertions(+), 1216 deletions(-)
diff --git a/src/commands/breakdown.tsx b/src/commands/breakdown.tsx
index 6e7c3a90e..e635142b8 100644
--- a/src/commands/breakdown.tsx
+++ b/src/commands/breakdown.tsx
@@ -35,7 +35,7 @@ import resolvePlayerFromCommand, {
import calculateWN8 from '../core/statistics/calculateWN8';
import { StatFilters, filterStats } from '../core/statistics/filterStats';
import getWN8Percentile from '../core/statistics/getWN8Percentile';
-import { CommandRegistryPromisable } from '../events/interactionCreate';
+import { CommandRegistry } from '../events/interactionCreate';
const ROWS_PER_PAGE = 8;
const MAX_PAGES = 9;
@@ -290,7 +290,7 @@ export async function renderBreakdown(
}
}
-export const breakdownCommand = new Promise
{image && (
)}
-
+
+
+ {description}
+
-
+ {title}
+
-
- {name}
-
-
-
-
-
- {description}
-
-
-
-
+
+
+
+
- 
-
-
-
-
- {interaction.user.displayName}
-
-
- @{interaction.user.username}
-
-
-
- 
- Accounts linked
-
-
-
- Accounts linked
-
- {clanAccountInfo?.clan ? (
- ) : null}
+
+
+
+
+ {interaction.user.displayName}
+
+
+ @{interaction.user.username}
+
+
+
-
+ Accounts linked
+
+
+
+ {clanAccountInfo?.clan ? (
+ 
+ ) : null}
+
+ ) : null}
+
- {accountInfo.nickname}
-
-
- {clanAccountInfo?.clan
- ? `[${clanAccountInfo?.clan?.tag}] • `
- : ''}
- {REGION_NAMES[region]}
-
+
+ {accountInfo.nickname}
+
+
+ {clanAccountInfo?.clan
+ ? `[${clanAccountInfo?.clan?.tag}] • `
+ : ''}
+ {REGION_NAMES[region]}
+
+
- {NO_DATA_MESSAGES[type]}
+ {translate(`bot.common.no_data.${type}`)}
);
diff --git a/src/lang/en-US.json b/src/lang/en-US.json
index be0637bba..efdf3ff25 100644
--- a/src/lang/en-US.json
+++ b/src/lang/en-US.json
@@ -90,6 +90,12 @@
"filters": {
"none": "No filters",
"tier": "Tier %s"
+ },
+
+ "no_data": {
+ "battles_in_period": "No battles played in this period",
+ "players_in_period": "No players in this period",
+ "tanks_found": "No tanks found"
}
},
From bc0865680619d0353f4a546a46bde180cc84fdf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 17:13:57 -0600
Subject: [PATCH 35/90] New translations en-us.json (Spanish)
---
src/lang/es-ES.json | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index 97f4f264d..d67b03efd 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -83,6 +83,11 @@
"filters": {
"none": "No filters",
"tier": "Tier %s"
+ },
+ "no_data": {
+ "battles_in_period": "No battles played in this period",
+ "players_in_period": "No players in this period",
+ "tanks_found": "No tanks found"
}
},
"commands": {
From 472172c50411ffeb29f0a2f5716ecf7dd8cd1a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 17:18:51 -0600
Subject: [PATCH 36/90] New translations en-us.json (Spanish)
---
src/lang/es-ES.json | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index d67b03efd..3c93a362b 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -74,6 +74,12 @@
}
}
},
+ "options": {
+ "clan": {
+ "$": "clan",
+ "description": "The clan name or tag"
+ }
+ },
"periods": {
"career": "Career",
"today": "Today",
@@ -158,6 +164,20 @@
"description": "Tank statistics"
}
}
+ },
+ "inactive": {
+ "$": "inactive",
+ "description": "Lists all inactive players in a clan above a threshold",
+ "options": {
+ "threshold": {
+ "$": "threshold",
+ "description": "The number of days inactive (default: %s days)"
+ }
+ },
+ "body": {
+ "subtitle": "Inactive for %s+ days",
+ "listing": "%s days"
+ }
}
}
},
From 9f4c8c90883848d483552385172edb6ee400f86b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 6 Mar 2024 17:19:00 -0600
Subject: [PATCH 37/90] feat: inactive command localization
---
src/commands/inactive.tsx | 39 +++++++++++++++++++++---------
src/core/discord/addClanChoices.ts | 12 +++++++--
src/lang/en-US.json | 24 ++++++++++++++++++
3 files changed, 61 insertions(+), 14 deletions(-)
diff --git a/src/commands/inactive.tsx b/src/commands/inactive.tsx
index 39d803123..d5f3d78ac 100644
--- a/src/commands/inactive.tsx
+++ b/src/commands/inactive.tsx
@@ -1,4 +1,4 @@
-import { SlashCommandBuilder } from 'discord.js';
+import { Locale } from 'discord.js';
import CommandWrapper from '../components/CommandWrapper';
import GenericStats from '../components/GenericStats';
import NoData from '../components/NoData';
@@ -7,7 +7,10 @@ import { getAccountInfo } from '../core/blitz/getAccountInfo';
import { getClanInfo } from '../core/blitz/getClanInfo';
import addClanChoices from '../core/discord/addClanChoices';
import autocompleteClan from '../core/discord/autocompleteClan';
+import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
+import { localizationObject } from '../core/discord/localizationObject';
import resolveClanFromCommand from '../core/discord/resolveClanFromCommand';
+import { translator } from '../core/localization/translator';
import { CommandRegistry } from '../events/interactionCreate';
const DEFAULT_THRESHOLD = 7;
@@ -17,20 +20,29 @@ export const inactiveCommand = new Promise((resolve) => {
{clanAccountInfo?.clan
? `[${clanAccountInfo?.clan?.tag}] • `
: ''}
- {REGION_NAMES[region]}
+ {translate(`common.regions.normal.${region}`)}
@@ -202,8 +209,8 @@ export const verifyCommand = new Promise