updated bot.ts

Les-Laboratoires · Oct 22, 2024 · 6b82393 · 6b82393
1 parent 2e02dc6
commit 6b82393
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/src/app/button.ts b/src/app/button.ts
@@ -146,20 +146,22 @@ export async function prepareButton(
     button.options.cooldown,
     `${button.options.key} button`,
     {
-      author: interaction.user,
-      channel: interaction.channel,
-      guild: interaction.guild,
+      authorId: interaction.user.id,
+      channelId: interaction.channelId,
+      guildId: interaction.guildId,
     },
     interaction,
   )
 
   if (error) return error
 
-  if (interaction.guild) {
+  if (interaction.inGuild()) {
     if (
       button.options.adminOnly &&
       !(
-        await interaction.guild.members.fetch(interaction.user)
+        await (
+          await interaction.client.guilds.fetch(interaction.guildId)
+        ).members.fetch(interaction.user)
       )?.permissions.has("Administrator")
     ) {
       return util.getSystemMessage(

diff --git a/src/app/command.ts b/src/app/command.ts
@@ -381,7 +381,11 @@ export async function prepareCommand(
   const error = await util.checkCooldown(
     cmd.options.cooldown,
     `${cmd.options.name} command`,
-    message,
+    {
+      authorId: message.author.id,
+      channelId: message.channelId,
+      guildId: message.guildId,
+    },
     message,
   )
 

diff --git a/src/app/util.ts b/src/app/util.ts
@@ -659,9 +659,9 @@ export async function checkCooldown(
   cooldown: Cooldown | undefined,
   key: string,
   context: {
-    author: discord.User
-    guild: discord.Guild | null
-    channel: discord.Channel | null
+    authorId: discord.Snowflake
+    guildId: discord.Snowflake | null
+    channelId: discord.Snowflake | null
   },
   parentOfTrigger: {
     triggerCooldown: () => void
@@ -673,18 +673,18 @@ export async function checkCooldown(
 
     switch (cooldown.type) {
       case CooldownType.ByUser:
-        _slug = slug("coolDown", key, context.author.id)
+        _slug = slug("coolDown", key, context.authorId)
         break
       case CooldownType.ByGuild:
-        if (context.guild) _slug = slug("coolDown", key, context.guild.id)
+        if (context.guildId) _slug = slug("coolDown", key, context.guildId)
         else
           return getSystemMessage(
             "error",
             "You can't perform this action outside of a guild.",
           )
         break
       case CooldownType.ByChannel:
-        if (context.channel) _slug = slug("coolDown", key, context.channel.id)
+        if (context.channelId) _slug = slug("coolDown", key, context.channelId)
         else
           return getSystemMessage(
             "error",