feat(Interaction): add guild guard (#5955)

* feat(Interaction): add guild guard * fix: remove possibly uncached getters & duplicate method * fix: boolean ensuring Co-authored-by: Sugden <28943913+NotSugden@users.noreply.github.com> Co-authored-by: Sugden <28943913+NotSugden@users.noreply.github.com>
discordjs · Jun 29, 2021 · 87e8cdd · 87e8cdd
1 parent 706c6ea
commit 87e8cdd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/structures/Interaction.js b/src/structures/Interaction.js
@@ -105,6 +105,14 @@ class Interaction extends Base {
     return this.client.guilds.cache.get(this.guildID) ?? null;
   }
 
+  /**
+   * Indicates whether this interaction is received from a guild.
+   * @returns {boolean}
+   */
+  inGuild() {
+    return Boolean(this.guildID && this.member);
+  }
+
   /**
    * Indicates whether this interaction is a command interaction.
    * @returns {boolean}

diff --git a/typings/index.d.ts b/typings/index.d.ts
@@ -1212,6 +1212,7 @@ declare module 'discord.js' {
     public type: InteractionType;
     public user: User;
     public version: number;
+    public inGuild(): boolean;
     public isButton(): this is ButtonInteraction;
     public isCommand(): this is CommandInteraction;
     public isMessageComponent(): this is MessageComponentInteraction;