From 8c8883ef26e6f3f0a8eb98adecc65dcef448c5f6 Mon Sep 17 00:00:00 2001
From: anandre <38661761+anandre@users.noreply.github.com>
Date: Sun, 22 Nov 2020 12:21:01 -0600
Subject: [PATCH] Remove Guild#member (#4890)

---
 docs/examples/moderation.md         |  4 ++--
 src/client/voice/VoiceConnection.js |  2 +-
 src/structures/Guild.js             | 12 ------------
 src/structures/Message.js           |  2 +-
 src/structures/MessageMentions.js   |  2 +-
 src/structures/Role.js              |  2 +-
 test/random.js                      |  3 ++-
 typings/index.d.ts                  |  1 -
 8 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/docs/examples/moderation.md b/docs/examples/moderation.md
index 63c665c48..2eebf7f71 100644
--- a/docs/examples/moderation.md
+++ b/docs/examples/moderation.md
@@ -33,7 +33,7 @@ client.on('message', message => {
     // If we have a user mentioned
     if (user) {
       // Now we get the member from the user
-      const member = message.guild.member(user);
+      const member = message.guild.members.resolve(user);
       // If the member is in the guild
       if (member) {
         /**
@@ -105,7 +105,7 @@ client.on('message', message => {
     // If we have a user mentioned
     if (user) {
       // Now we get the member from the user
-      const member = message.guild.member(user);
+      const member = message.guild.members.resolve(user);
       // If the member is in the guild
       if (member) {
         /**
diff --git a/src/client/voice/VoiceConnection.js b/src/client/voice/VoiceConnection.js
index 8c1057fc3..de5f51bfd 100644
--- a/src/client/voice/VoiceConnection.js
+++ b/src/client/voice/VoiceConnection.js
@@ -501,7 +501,7 @@ class VoiceConnection extends EventEmitter {
     }
 
     if (guild && user && !speaking.equals(old)) {
-      const member = guild.member(user);
+      const member = guild.members.resolve(user);
       if (member) {
         /**
          * Emitted once a guild member changes speaking state.
diff --git a/src/structures/Guild.js b/src/structures/Guild.js
index 46dc76a07..c9c4fe9f9 100644
--- a/src/structures/Guild.js
+++ b/src/structures/Guild.js
@@ -637,18 +637,6 @@ class Guild extends Base {
     return this.voiceStates.cache.get(this.client.user.id);
   }
 
-  /**
-   * Returns the GuildMember form of a User object, if the user is present in the guild.
-   * @param {UserResolvable} user The user that you want to obtain the GuildMember of
-   * @returns {?GuildMember}
-   * @example
-   * // Get the guild member of a user
-   * const member = guild.member(message.author);
-   */
-  member(user) {
-    return this.members.resolve(user);
-  }
-
   /**
    * Fetches this guild.
    * @returns {Promise<Guild>}
diff --git a/src/structures/Message.js b/src/structures/Message.js
index 36c26f2df..afdfa943b 100644
--- a/src/structures/Message.js
+++ b/src/structures/Message.js
@@ -284,7 +284,7 @@ class Message extends Base {
    * @readonly
    */
   get member() {
-    return this.guild ? this.guild.member(this.author) || null : null;
+    return this.guild ? this.guild.members.resolve(this.author) || null : null;
   }
 
   /**
diff --git a/src/structures/MessageMentions.js b/src/structures/MessageMentions.js
index 2ed24c091..01f2a00aa 100644
--- a/src/structures/MessageMentions.js
+++ b/src/structures/MessageMentions.js
@@ -138,7 +138,7 @@ class MessageMentions {
     if (!this.guild) return null;
     this._members = new Collection();
     this.users.forEach(user => {
-      const member = this.guild.member(user);
+      const member = this.guild.members.resolve(user);
       if (member) this._members.set(member.user.id, member);
     });
     return this._members;
diff --git a/src/structures/Role.js b/src/structures/Role.js
index 94ee2f09a..4d2474ca0 100644
--- a/src/structures/Role.js
+++ b/src/structures/Role.js
@@ -127,7 +127,7 @@ class Role extends Base {
    */
   get editable() {
     if (this.managed) return false;
-    const clientMember = this.guild.member(this.client.user);
+    const clientMember = this.guild.members.resolve(this.client.user);
     if (!clientMember.permissions.has(Permissions.FLAGS.MANAGE_ROLES)) return false;
     return clientMember.roles.highest.comparePositionTo(this) > 0;
   }
diff --git a/test/random.js b/test/random.js
index 77112883b..d15212876 100644
--- a/test/random.js
+++ b/test/random.js
@@ -116,7 +116,8 @@ client.on('message', message => {
 
     if (message.content.startsWith('kick')) {
       message.guild
-        .member(message.mentions.users.first())
+        .members
+        .resolve(message.mentions.users.first())
         .kick()
         .then(member => {
           console.log(member);
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 24a0d7d7a..0d90d40e3 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -658,7 +658,6 @@ declare module 'discord.js' {
     public fetchWidget(): Promise<GuildWidget>;
     public iconURL(options?: ImageURLOptions & { dynamic?: boolean }): string | null;
     public leave(): Promise<Guild>;
-    public member(user: UserResolvable): GuildMember | null;
     public setAFKChannel(afkChannel: ChannelResolvable | null, reason?: string): Promise<Guild>;
     public setAFKTimeout(afkTimeout: number, reason?: string): Promise<Guild>;
     public setBanner(banner: Base64Resolvable | null, reason?: string): Promise<Guild>;