diff --git a/src/client/rest/RESTMethods.js b/src/client/rest/RESTMethods.js index 36bc3715c..44715c182 100644 --- a/src/client/rest/RESTMethods.js +++ b/src/client/rest/RESTMethods.js @@ -499,8 +499,8 @@ class RESTMethods { .then(data => this.client.actions.GuildMemberGet.handle(guild, data).member); } - getGuildMember(guild, user, cache) { - return this.rest.makeRequest('get', Endpoints.Guild(guild).Member(user.id), true).then(data => { + getGuildMember(guild, userID, cache) { + return this.rest.makeRequest('get', Endpoints.Guild(guild).Member(userID), true).then(data => { if (cache) return this.client.actions.GuildMemberGet.handle(guild, data).member; else return new GuildMember(guild, data); }); diff --git a/src/structures/Guild.js b/src/structures/Guild.js index c34ec17f9..308dd57cb 100644 --- a/src/structures/Guild.js +++ b/src/structures/Guild.js @@ -649,11 +649,11 @@ class Guild { * .catch(console.error); */ fetchMember(user, cache = true) { - user = this.client.resolver.resolveUser(user); - if (!user) return Promise.reject(new Error('Invalid or uncached id provided.')); - const member = this.members.get(user.id); + const userID = this.client.resolver.resolveUserID(user); + if (!userID) return Promise.reject(new Error('Invalid id provided.')); + const member = this.members.get(userID); if (member && member.joinedTimestamp) return Promise.resolve(member); - return this.client.rest.methods.getGuildMember(this, user, cache); + return this.client.rest.methods.getGuildMember(this, userID, cache); } /**