From 93bf430fc74e75c2d46103eee507abafe328fbcd Mon Sep 17 00:00:00 2001
From: Lewdcario <isabellafj97@gmail.com>
Date: Sun, 26 Aug 2018 09:46:55 -0600
Subject: [PATCH] fix: Guild#addMember incorrectly resolving userID

---
 src/client/rest/RESTMethods.js | 4 ++--
 src/structures/Guild.js        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/client/rest/RESTMethods.js b/src/client/rest/RESTMethods.js
index a3406591d..0d2f7fcdb 100644
--- a/src/client/rest/RESTMethods.js
+++ b/src/client/rest/RESTMethods.js
@@ -457,7 +457,7 @@ class RESTMethods {
     return this.rest.makeRequest('get', Endpoints.Channel(channel).Message(messageID), true);
   }
 
-  putGuildMember(guild, user, options) {
+  putGuildMember(guild, userID, options) {
     options.access_token = options.accessToken;
     if (options.roles) {
       const roles = options.roles;
@@ -465,7 +465,7 @@ class RESTMethods {
         options.roles = roles.map(role => role.id);
       }
     }
-    return this.rest.makeRequest('put', Endpoints.Guild(guild).Member(user.id), true, options)
+    return this.rest.makeRequest('put', Endpoints.Guild(guild).Member(userID), true, options)
       .then(data => this.client.actions.GuildMemberGet.handle(guild, data).member);
   }
 
diff --git a/src/structures/Guild.js b/src/structures/Guild.js
index b390afd57..218ff63ff 100644
--- a/src/structures/Guild.js
+++ b/src/structures/Guild.js
@@ -563,7 +563,8 @@ class Guild {
    * @returns {Promise<GuildMember>}
    */
   addMember(user, options) {
-    if (this.members.has(user.id)) return Promise.resolve(this.members.get(user.id));
+    user = this.client.resolver.resolveUserID(user);
+    if (this.members.has(user)) return Promise.resolve(this.members.get(user));
     return this.client.rest.methods.putGuildMember(this, user, options);
   }