fix: parkour command and interaction server issues (#690)

Statsify · Aug 21, 2024 · e3c1880 · e3c1880
1 parent 6d36a8a
commit e3c1880
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/apps/discord-bot/src/index.ts b/apps/discord-bot/src/index.ts
@@ -42,7 +42,7 @@ await Promise.all(
   [I18nLoaderService, FontLoaderService].map((service) => Container.get(service).init())
 );
 
-const rest = new RestClient({ token: config("discordBot.token") });
+const rest = new RestClient({ token: config("discordBot.token"), timeout: 60 * 1000 });
 Container.set(RestClient, rest);
 
 const commands = await CommandLoader.load(join(__dirname, "./commands"));

diff --git a/packages/discord/src/command/abstract-command.listener.ts b/packages/discord/src/command/abstract-command.listener.ts
@@ -28,9 +28,6 @@ import type {
   WebsocketShard,
 } from "tiny-discord";
 
-const COMMAND_INTERACTION_RESPONSE = {};
-type CommandInteractionResponse = typeof COMMAND_INTERACTION_RESPONSE;
-
 export type InteractionHook = (
   interaction: Interaction
 ) => InteractionServer.InteractionReply | undefined | Promise<any>;
@@ -269,17 +266,10 @@ export abstract class AbstractCommandListener {
     };
   }
 
-  private async onInteraction(
-    interaction: Interaction
-  ): Promise<InteractionServer.InteractionReply | CommandInteractionResponse> {
+  private async onInteraction(interaction: Interaction): Promise<InteractionServer.InteractionReply> {
     if (interaction.isCommandInteraction()) {
-      await interaction.reply({
-        type: InteractionResponseType.DeferredChannelMessageWithSource,
-      });
-
       this.onCommand(interaction);
-
-      return COMMAND_INTERACTION_RESPONSE;
+      return { type: InteractionResponseType.DeferredChannelMessageWithSource };
     }
 
     if (interaction.isAutocompleteInteraction()) return this.onAutocomplete(interaction);
@@ -296,9 +286,10 @@ export abstract class AbstractCommandListener {
     });
 
     // @ts-ignore Discord supports sending a blank object as a response
-    client.on("interaction", (event) => {
+    client.on("interaction", async (event) => {
       const interaction = new Interaction(this.rest, event.interaction, this.applicationId);
-      return this.onInteraction(interaction);
+      const response = await this.onInteraction(interaction);
+      interaction.reply(response);
     });
   }
 
@@ -323,9 +314,7 @@ export abstract class AbstractCommandListener {
       );
 
       const response = await this.onInteraction(interaction);
-      if (response === COMMAND_INTERACTION_RESPONSE) return;
-
-      interaction.reply(response as InteractionServer.InteractionReply);
+      interaction.reply(response);
     });
   }
 

diff --git a/packages/schemas/src/player/gamemodes/parkour/index.ts b/packages/schemas/src/player/gamemodes/parkour/index.ts
@@ -127,7 +127,7 @@ export class Parkour {
     leaderboard: { ...fieldOptions, name: `${FormattedGame.WOOLGAMES} Lobby` },
     historical,
   })
-  public WOOLWARS: number;
+  public WOOLGAMES: number;
 
   public constructor(data: APIData) {
     const getTime = (key: string): number =>
@@ -151,6 +151,6 @@ export class Parkour {
     this.TOURNAMENT_LOBBY = getTime("Tourney");
     this.UHC = getTime("uhc");
     this.WARLORDS = getTime("Warlords");
-    this.WOOLWARS = getTime("WoolGames");
+    this.WOOLGAMES = getTime("WoolGames");
   }
 }