Merge branch 'main' into dev

src/events/interactionCreate/handlers/chatInputCommand.ts

@@ -10,7 +10,6 @@ import {
 import { commands } from '..';
 import discord from '../../../../discord.json' assert { type: 'json' };
 import buttonLink from '../../../core/discord/buttonLink';
-import embedNegative from '../../../core/discord/embedNegative';
 import embedWarning from '../../../core/discord/embedWarning';
 import normalizeInteractionReturnable from '../../../core/discord/normalizeInteractionReturnable';
 import { psa } from '../../../core/discord/psa';
@@ -19,7 +18,8 @@ import { UserError } from '../../../hooks/userError';
 export default async function handleChatInputCommand(
   interaction: ChatInputCommandInteraction<CacheType>,
 ) {
-  const registry = (await commands)[interaction.commandName];
+  const awaitedCommands = await commands;
+  const registry = awaitedCommands[interaction.commandName];
 
   await interaction.deferReply();
 
@@ -118,25 +118,15 @@ export default async function handleChatInputCommand(
 
     if (error instanceof UserError) {
       interaction.editReply({
-        embeds: [
-          embedNegative(
-            error.message,
-            (error.cause as string | undefined) ??
-              'No further information is available.',
-          ),
-        ],
+        content: error.message,
         components,
       });
     } else {
       console.error(interaction.commandName, error);
 
       interaction.editReply({
-        embeds: [
-          embedNegative(
-            'Blitzkrieg ran into an error!',
-            "We're so sorry about this. Feel free to [join the official Discord server](https://discord.gg/nDt7AjGJQH) to get help.",
-          ),
-        ],
+        content:
+          "# Blitzkrieg ran into an error!\nWe're so sorry about this. Feel free to [join the official Discord server](https://discord.gg/nDt7AjGJQH) to get help.",
         components,
       });
     }

src/events/interactionCreate/index.ts

@@ -23,6 +23,7 @@ import { fullStatsCommand } from '../../commands/fullStats';
 import { inactiveCommand } from '../../commands/inactive';
 import { verifyCommand } from '../../commands/link';
 import { ownedTanksCommand } from '../../commands/ownedTanks';
+import { permissionsCommand } from '../../commands/permissions';
 import { pingCommand } from '../../commands/ping';
 import { playerAchievementsCommand } from '../../commands/playerAchievements';
 import { playerInfoCommand } from '../../commands/playerInfo';
@@ -31,6 +32,7 @@ import { searchClansCommand } from '../../commands/searchClans';
 import { searchPlayersCommand } from '../../commands/searchPlayers';
 import { searchTanksCommand } from '../../commands/searchTanks';
 import { statsCommand } from '../../commands/stats';
+import { todayCommand } from '../../commands/today';
 import getClientId from '../../core/blitzkrieg/getClientId';
 import isDev from '../../core/blitzkrieg/isDev';
 import { secrets } from '../../core/blitzkrieg/secrets';
@@ -52,38 +54,44 @@ export type InteractionReturnable =
   | InteractionIterableReturnable
   | Promise<InteractionIterableReturnable>;
 
-export interface Registry {
-  inProduction: boolean;
-}
-
-export type CommandRegistryRaw = Registry & {
-  inPublic: boolean;
-  inPreview?: boolean;
-
+type CommandRegistryBase = {
   command:
     | SlashCommandBuilder
     | SlashCommandSubcommandsOnlyBuilder
     | Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'>;
+};
+type CommandRegistryDefinitionBase = {
+  inProduction: boolean;
+  inPublic: boolean;
+  inPreview?: boolean;
 
   autocomplete?: (interaction: AutocompleteInteraction<CacheType>) => void;
   button?: (interaction: ButtonInteraction<CacheType>) => InteractionReturnable;
-} & (
-    | {
-        handlesInteraction: true;
-        handler: (interaction: ChatInputCommandInteraction<CacheType>) => void;
-      }
-    | {
-        handlesInteraction?: false;
-        handler: (
-          interaction: ChatInputCommandInteraction<CacheType>,
-        ) => InteractionReturnable;
-      }
-  );
-export type CommandRegistry = CommandRegistryRaw | Promise<CommandRegistryRaw>;
+};
+type CommandRegistryDefinitionHandlesInteraction = {
+  handlesInteraction: true;
+  handler: (interaction: ChatInputCommandInteraction<CacheType>) => void;
+};
+type CommandRegistryDefinitionDoesHandleInteraction = {
+  handlesInteraction?: false;
+  handler: (
+    interaction: ChatInputCommandInteraction<CacheType>,
+  ) => InteractionReturnable;
+};
+export type CommandRegistryPromisable = CommandRegistryBase &
+  (CommandRegistryDefinitionBase &
+    (
+      | CommandRegistryDefinitionHandlesInteraction
+      | CommandRegistryDefinitionDoesHandleInteraction
+    ));
+export type CommandRegistry =
+  | CommandRegistryPromisable
+  | Promise<CommandRegistryPromisable>;
 
 const rest = new REST().setToken(secrets.DISCORD_TOKEN);
 
 export const COMMANDS_RAW: CommandRegistry[] = [
+  permissionsCommand,
   debugCommand,
   eligibleCommand,
   aboutCommand,
@@ -101,10 +109,11 @@ export const COMMANDS_RAW: CommandRegistry[] = [
   evolutionCommand,
   statsCommand,
   ratingsCommand,
+  todayCommand,
 ];
 
 export const commands = Promise.all(COMMANDS_RAW).then((rawCommands) =>
-  rawCommands.reduce<Record<string, CommandRegistryRaw>>(
+  rawCommands.reduce<Record<string, CommandRegistryPromisable>>(
     (accumulator, registry) => {
       if (isDev()) registry.command.setDefaultMemberPermissions(0);
 
@@ -123,7 +132,7 @@ export const publicCommands: RESTPostAPIChatInputApplicationCommandsJSONBody[] =
   [];
 
 commands.then((awaitedCommands) => {
-  Object.entries(awaitedCommands).forEach(([, registry]) => {
+  Object.values(awaitedCommands).forEach((registry) => {
     const json = registry.command.toJSON();
 
     if (registry.inPublic) {