From 214981f0b1275dcabce81b8152a0826be8475eef Mon Sep 17 00:00:00 2001
From: Jan <66554238+Vaporox@users.noreply.github.com>
Date: Fri, 19 Jun 2020 11:43:19 +0200
Subject: [PATCH] feat(MessageMentions): fix typings/docs, add resolvables
 support (#4339)

---
 src/structures/MessageMentions.js | 12 ++++++++----
 typings/index.d.ts                |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/structures/MessageMentions.js b/src/structures/MessageMentions.js
index cbdd1c732..2ed24c091 100644
--- a/src/structures/MessageMentions.js
+++ b/src/structures/MessageMentions.js
@@ -79,14 +79,14 @@ class MessageMentions {
     }
 
     /**
-     * Cached members for {@link MessageMention#members}
+     * Cached members for {@link MessageMentions#members}
      * @type {?Collection<Snowflake, GuildMember>}
      * @private
      */
     this._members = null;
 
     /**
-     * Cached channels for {@link MessageMention#channels}
+     * Cached channels for {@link MessageMentions#channels}
      * @type {?Collection<Snowflake, GuildChannel>}
      * @private
      */
@@ -164,7 +164,7 @@ class MessageMentions {
   /**
    * Checks if a user, guild member, role, or channel is mentioned.
    * Takes into account user mentions, role mentions, and @everyone/@here mentions.
-   * @param {UserResolvable|GuildMember|Role|GuildChannel} data User/GuildMember/Role/Channel to check
+   * @param {UserResolvable|RoleResolvable|GuildChannelResolvable} data User/Role/Channel to check
    * @param {Object} [options] Options
    * @param {boolean} [options.ignoreDirect=false] - Whether to ignore direct mentions to the item
    * @param {boolean} [options.ignoreRoles=false] - Whether to ignore role mentions to a guild member
@@ -179,7 +179,11 @@ class MessageMentions {
     }
 
     if (!ignoreDirect) {
-      const id = data.id || data;
+      const id =
+        this.client.users.resolveID(data) ||
+        (this.guild && this.guild.roles.resolveID(data)) ||
+        this.client.channels.resolveID(data);
+
       return this.users.has(id) || this.channels.has(id) || this.roles.has(id);
     }
 
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 22da69d3f..e0ada93fa 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -1072,7 +1072,7 @@ declare module 'discord.js' {
       everyone: boolean,
     );
     private _channels: Collection<Snowflake, GuildChannel> | null;
-    private readonly _content: Message;
+    private readonly _content: string;
     private _members: Collection<Snowflake, GuildMember> | null;
 
     public readonly channels: Collection<Snowflake, TextChannel>;
@@ -1080,7 +1080,7 @@ declare module 'discord.js' {
     public everyone: boolean;
     public readonly guild: Guild;
     public has(
-      data: User | GuildMember | Role | GuildChannel,
+      data: UserResolvable | RoleResolvable | GuildChannelResolvable,
       options?: {
         ignoreDirect?: boolean;
         ignoreRoles?: boolean;