From 21d09f338e8dc2ad3cbc74d1e3fd56994b92de01 Mon Sep 17 00:00:00 2001
From: SpaceEEC <wermail2002-kap@yahoo.de>
Date: Sun, 5 Nov 2017 18:52:33 +0100
Subject: [PATCH] fix(Guild): correctly resolve user in Guild#addMember (#2090)

---
 src/structures/Guild.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/structures/Guild.js b/src/structures/Guild.js
index 73adbe1df..e00151f47 100644
--- a/src/structures/Guild.js
+++ b/src/structures/Guild.js
@@ -528,7 +528,9 @@ class Guild extends Base {
    * @returns {Promise<GuildMember>}
    */
   addMember(user, options) {
-    if (this.members.has(user.id)) return Promise.resolve(this.members.get(user.id));
+    user = this.client.users.resolveID(user);
+    if (!user) return Promise.reject(new TypeError('INVALID_TYPE', 'user', 'UserResolvable'));
+    if (this.members.has(user)) return Promise.resolve(this.members.get(user));
     options.access_token = options.accessToken;
     if (options.roles) {
       const roles = [];
@@ -541,7 +543,7 @@ class Guild extends Base {
         roles.push(role.id);
       }
     }
-    return this.client.api.guilds(this.id).members(user.id).put({ data: options })
+    return this.client.api.guilds(this.id).members(user).put({ data: options })
       .then(data => this.members.create(data));
   }