feat: added more mature periods

src/commands/debug.ts

@@ -12,7 +12,7 @@ const executionStart = new Date().getTime();
 
 export const debugCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/eligible.ts

@@ -26,7 +26,7 @@ export const SKILLED_CLANS: Record<SkilledClan, string> = {
 
 export const eligibleCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: false,
 
   command: new SlashCommandBuilder()

src/commands/evolution.tsx

@@ -28,7 +28,7 @@ export const evolutionCommand = new Promise<CommandRegistryRaw>(
 
     resolve({
       inProduction: true,
-      inDevelopment: false,
+      inDevelopment: true,
       inPublic: true,
 
       command,

src/commands/fullStats.tsx

@@ -27,7 +27,7 @@ export const fullStatsCommand = new Promise<CommandRegistryRaw>(
 
     resolve({
       inProduction: true,
-      inDevelopment: false,
+      inDevelopment: true,
       inPublic: true,
 
       command,

src/commands/help.ts

@@ -30,7 +30,7 @@ function addDocsSubcommands(option: SlashCommandSubcommandsOnlyBuilder) {
 
 export const helpCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: addDocsSubcommands(
@@ -44,13 +44,14 @@ export const helpCommand: CommandRegistry = {
       ),
   ),
 
-  handler(interaction) {
+  async handler(interaction) {
     const subcommand = interaction.options.getSubcommand();
 
     if (subcommand === 'commands') {
-      return `# Commands\n\nBlitzkrieg offers the following commands:\n\n${COMMANDS_RAW.filter(
-        (registry) => registry.inPublic && registry.inProduction,
+      return `# Commands\n\nBlitzkrieg offers the following commands:\n\n${(
+        await Promise.all(COMMANDS_RAW)
       )
+        .filter((registry) => registry.inPublic && registry.inProduction)
         .map(
           (registry) =>
             `- \`/${registry.command.name}\`: ${registry.command.description}`,

src/commands/inactive.tsx

@@ -18,7 +18,7 @@ const DEFAULT_THRESHOLD = 7;
 
 export const inactiveCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/ownedTanks.tsx

@@ -45,7 +45,7 @@ const COMP_TANKS = [
 
 export const ownedTanksCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/ping.ts

@@ -1,9 +1,9 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { CommandRegistry } from '../events/interactionCreate';
 
-export const pingCommand: CommandRegistry<true> = {
+export const pingCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
   handlesInteraction: true,
 

src/commands/playerAchievements.ts

@@ -16,7 +16,7 @@ type SortBy = 'name' | 'count';
 
 export const playerAchievementsCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/playerInfo.ts

@@ -12,7 +12,7 @@ import { AccountInfo } from '../types/accountInfo';
 
 export const playerInfoCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/ratings.tsx

@@ -121,7 +121,7 @@ export const DATABASE_REPO = { owner: 'tresabhi', repo: 'blitzkrieg-db' };
 
 export const ratingsCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/searchClans.ts

@@ -11,7 +11,7 @@ import { ClanList } from '../types/clanList';
 
 export const searchClansCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/searchPlayers.ts

@@ -12,7 +12,7 @@ import { AccountList } from '../types/accountList';
 
 export const searchPlayersCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/searchTanks.ts

@@ -8,7 +8,7 @@ import { CommandRegistry } from '../events/interactionCreate';
 
 export const searchTanksCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/stats.tsx

@@ -37,7 +37,11 @@ export const statsCommand = new Promise<CommandRegistryRaw>(async (resolve) => {
         true,
       ) as StatType;
       const player = await resolvePlayerFromCommand(interaction);
-      const period = resolvePeriodFromCommand(player.region, interaction);
+      const resolvedPeriod = resolvePeriodFromCommand(
+        player.region,
+        interaction,
+      );
+      const period = interaction.options.getString('period');
       const tankIdRaw = interaction.options.getString('tank')!;
       const tankId =
         commandGroup === 'tank' ? await resolveTankId(tankIdRaw) : null;
@@ -48,6 +52,7 @@ export const statsCommand = new Promise<CommandRegistryRaw>(async (resolve) => {
         tankId,
         start,
         end,
+        period,
       });
       const { nickname } = (
         await getWargamingResponse<AccountInfo>(
@@ -56,7 +61,7 @@ export const statsCommand = new Promise<CommandRegistryRaw>(async (resolve) => {
       )[player.id];
 
       return [
-        await stats(commandGroup, period, player, tankId),
+        await stats(commandGroup, resolvedPeriod, player, tankId),
         primaryButton(path, 'Refresh'),
         linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
         linkButton(

src/commands/today.tsx

@@ -15,7 +15,7 @@ import { AccountInfo } from '../types/accountInfo';
 
 export const todayCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/verify.ts

@@ -14,7 +14,7 @@ import { PlayerClanData } from '../types/playerClanData';
 
 export const verifyCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/core/blitzstars/getPeriodStart.ts

@@ -1,7 +1,7 @@
 import { Region } from '../../constants/regions';
-import { PeriodOption } from '../discord/addPeriodSubCommands';
+import { PeriodSize } from '../discord/addPeriodSubCommands';
 import getTimeDaysAgo from './getTimeDaysAgo';
 
-export default function getPeriodStart(region: Region, period: PeriodOption) {
+export default function getPeriodStart(region: Region, period: PeriodSize) {
   return period === 'career' ? 0 : getTimeDaysAgo(region, parseInt(period));
 }

src/core/discord/addPeriodSubCommands.ts

@@ -2,10 +2,9 @@ import {
   SlashCommandSubcommandBuilder,
   SlashCommandSubcommandGroupBuilder,
 } from 'discord.js';
-import { PERIOD_NAMES } from '../discord/resolvePeriodFromCommand';
 
-export type PeriodSubcommand = 'period' | 'custom';
-export type PeriodOption = `${number}` | 'career';
+export type PeriodType = 'period' | 'custom';
+export type PeriodSize = `${number}` | 'career';
 
 export default function addPeriodSubCommands(
   option: SlashCommandSubcommandGroupBuilder,
@@ -17,18 +16,18 @@ export default function addPeriodSubCommands(
     .addSubcommand((option) =>
       extra(
         option
-          .setName('period' satisfies PeriodSubcommand)
-          .setDescription(PERIOD_NAMES.period)
+          .setName('period' satisfies PeriodType)
+          .setDescription("Preset period's statistics")
           .addStringOption((option) =>
             option
               .setName('period')
               .setDescription('A preset period')
               .setChoices(
-                { name: 'Today', value: '1' satisfies PeriodOption },
-                { name: '30 days', value: '30' satisfies PeriodOption },
-                { name: '60 days', value: '60' satisfies PeriodOption },
-                { name: '90 days', value: '90' satisfies PeriodOption },
-                { name: 'Career', value: 'career' satisfies PeriodOption },
+                { name: 'Today', value: '1' satisfies PeriodSize },
+                { name: '30 days', value: '30' satisfies PeriodSize },
+                { name: '60 days', value: '60' satisfies PeriodSize },
+                { name: '90 days', value: '90' satisfies PeriodSize },
+                { name: 'Career', value: 'career' satisfies PeriodSize },
               )
               .setRequired(true),
           ),
@@ -37,19 +36,19 @@ export default function addPeriodSubCommands(
     .addSubcommand((option) =>
       extra(
         option
-          .setName('custom' satisfies PeriodSubcommand)
-          .setDescription(PERIOD_NAMES.custom)
+          .setName('custom' satisfies PeriodType)
+          .setDescription("Custom period's statistics")
           .addIntegerOption((option) =>
             option
               .setName('start')
-              .setDescription('Start of period in days ago from today')
+              .setDescription('Days ago from today')
               .setMinValue(0)
               .setRequired(true),
           )
           .addIntegerOption((option) =>
             option
               .setName('end')
-              .setDescription('End of period in days ago from today')
+              .setDescription('Days ago from today')
               .setMinValue(0)
               .setRequired(true),
           ),

src/core/discord/addStatTypeSubCommandGroups.ts

@@ -29,6 +29,7 @@ export default async function addStatTypeSubCommandGroups(
     .addSubcommandGroup((option) =>
       addPeriodSubCommands(option, (option) =>
         option
+          .addStringOption(addUsernameChoices)
           .addStringOption((option) => {
             option
               .setName('nation')

src/core/discord/resolvePeriodFromCommand.ts

@@ -3,17 +3,11 @@ import { Region } from '../../constants/regions';
 import getPeriodNow from '../blitzstars/getPeriodNow';
 import getPeriodStart from '../blitzstars/getPeriodStart';
 import getTimeDaysAgo from '../blitzstars/getTimeDaysAgo';
-import { PeriodSubcommand } from '../discord/addPeriodSubCommands';
+import { PeriodSize, PeriodType } from '../discord/addPeriodSubCommands';
 
-export const PERIOD_NAMES: Record<PeriodSubcommand, string> = {
-  period: "Preset period's statistics",
-  custom: "Custom period's statistics",
-};
-
-export const EVOLUTION_PERIOD_NAMES: Record<PeriodSubcommand, string> = {
-  period: "Preset period's evolution",
-  custom: "Custom period's evolution",
-};
+export function getPeriodOptionName(period: PeriodSize) {
+  return period === 'career' ? 'Career' : `${period}-day`;
+}
 
 export interface ResolvedPeriod {
   statsName: string;
@@ -30,9 +24,10 @@ export default function resolvePeriodFromCommand(
   let evolutionName: string;
   let start: number;
   let end: number;
-  const period = interaction.options.getSubcommand() as PeriodSubcommand;
+  const periodSubcommand = interaction.options.getSubcommand() as PeriodType;
+  const periodOption = interaction.options.getString('period') as PeriodSize;
 
-  if (period === 'custom') {
+  if (periodSubcommand === 'custom') {
     const startRaw = interaction.options.getInteger('start')!;
     const endRaw = interaction.options.getInteger('end')!;
     const startMin = Math.min(startRaw, endRaw);
@@ -43,9 +38,9 @@ export default function resolvePeriodFromCommand(
     start = getTimeDaysAgo(server, startMin);
     end = getTimeDaysAgo(server, endMax);
   } else {
-    statsName = PERIOD_NAMES[period];
-    evolutionName = EVOLUTION_PERIOD_NAMES[period];
-    start = getPeriodStart(server, period);
+    statsName = `${getPeriodOptionName(periodOption)} Statistics`;
+    evolutionName = `${getPeriodOptionName(periodOption)} Evolution`;
+    start = getPeriodStart(server, periodOption);
     end = getPeriodNow();
   }
 

src/core/express/resolvePeriodFromURL.ts

@@ -2,11 +2,10 @@ import { Region } from '../../constants/regions';
 import getPeriodNow from '../blitzstars/getPeriodNow';
 import getPeriodStart from '../blitzstars/getPeriodStart';
 import getTimeDaysAgo from '../blitzstars/getTimeDaysAgo';
-import { PeriodSubcommand } from '../discord/addPeriodSubCommands';
+import { PeriodSize, PeriodType } from '../discord/addPeriodSubCommands';
 import {
-  EVOLUTION_PERIOD_NAMES,
-  PERIOD_NAMES,
   ResolvedPeriod,
+  getPeriodOptionName,
 } from '../discord/resolvePeriodFromCommand';
 
 export default function resolvePeriodFromURL(
@@ -19,9 +18,10 @@ export default function resolvePeriodFromURL(
   let end: number;
   const url = new URL(urlString);
   const path = url.pathname.split('/').filter(Boolean);
-  const period = path[path.length - 1] as PeriodSubcommand;
+  const periodSubcommand = path[path.length - 1] as PeriodType;
+  const periodOption = url.searchParams.get('period') as PeriodSize;
 
-  if (period === 'custom') {
+  if (periodSubcommand === 'custom') {
     const startRaw = parseInt(url!.searchParams.get('start')!);
     const endRaw = parseInt(url!.searchParams.get('end')!);
     const startMin = Math.min(startRaw, endRaw);
@@ -32,9 +32,9 @@ export default function resolvePeriodFromURL(
     start = getTimeDaysAgo(server, startMin);
     end = getTimeDaysAgo(server, endMax);
   } else {
-    statsName = PERIOD_NAMES[period];
-    evolutionName = EVOLUTION_PERIOD_NAMES[period];
-    start = getPeriodStart(server, period);
+    statsName = `${getPeriodOptionName(periodOption)} Statistics`;
+    evolutionName = `${getPeriodOptionName(periodOption)} Evolution`;
+    start = getPeriodStart(server, periodOption);
     end = getPeriodNow();
   }
 

src/events/interactionCreate/handlers/autocomplete.ts

@@ -1,10 +1,10 @@
 import { AutocompleteInteraction, CacheType } from 'discord.js';
 import { commands } from '..';
 
-export default function handleAutocomplete(
+export default async function handleAutocomplete(
   interaction: AutocompleteInteraction<CacheType>,
 ) {
-  const command = commands[interaction.commandName];
+  const command = (await commands)[interaction.commandName];
 
   if (!command) {
     console.error(`No command matching ${interaction.commandName} was found.`);

src/events/interactionCreate/handlers/button.tsx

@@ -11,7 +11,7 @@ export default async function handleButton(
 
   const url = new URL(`${CYCLIC_API}/${interaction.customId}`);
   const commandName = url.pathname.split('/')[1];
-  const button = commands[commandName]?.button;
+  const button = (await commands)[commandName]?.button;
 
   if (!button) {
     throwError(`Button handler not found for "${commandName}"`);

src/events/interactionCreate/handlers/chatInputCommand.ts

@@ -16,7 +16,7 @@ import { handleError } from '../../error';
 export default async function handleChatInputCommand(
   interaction: ChatInputCommandInteraction<CacheType>,
 ) {
-  const registry = commands[interaction.commandName];
+  const registry = (await commands)[interaction.commandName];
 
   console.log(interaction.toString());
   await interaction.deferReply();

src/routes/stats.tsx

@@ -6,7 +6,7 @@ import { RouteRegistry } from '../server';
 export const statsRoute: RouteRegistry = {
   route: '/stats/:type/:period',
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
 
   async handler(req) {
     const type = req.params.type as StatType;

src/routes/today.tsx

@@ -5,7 +5,7 @@ import { RouteRegistry } from '../server';
 export const todayRoute: RouteRegistry = {
   route: '/today',
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
 
   async handler(req) {
     const player = resolvePlayerFromRequest(req);