Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-18 20:43:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(Guild): allow fetchMember to be used with an uncached user (#3333)

Browse Source
This commit is contained in:
SpaceEEC
2019-06-08 10:39:03 +02:00
committed by GitHub
parent 0c6101901d
commit 6f49aadf4f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/rest/RESTMethods.js
View File

@@ -499,8 +499,8 @@ class RESTMethods {
.then(data => this.client.actions.GuildMemberGet.handle(guild, data).member); .then(data => this.client.actions.GuildMemberGet.handle(guild, data).member);
} }
getGuildMember(guild, user, cache) { getGuildMember(guild, userID, cache) {
return this.rest.makeRequest('get', Endpoints.Guild(guild).Member(user.id), true).then(data => { return this.rest.makeRequest('get', Endpoints.Guild(guild).Member(userID), true).then(data => {
if (cache) return this.client.actions.GuildMemberGet.handle(guild, data).member; if (cache) return this.client.actions.GuildMemberGet.handle(guild, data).member;
else return new GuildMember(guild, data); else return new GuildMember(guild, data);
}); });

8
src/structures/Guild.js
View File

@@ -649,11 +649,11 @@ class Guild {
* .catch(console.error); * .catch(console.error);
*/ */
fetchMember(user, cache = true) { fetchMember(user, cache = true) {
user = this.client.resolver.resolveUser(user); const userID = this.client.resolver.resolveUserID(user);
if (!user) return Promise.reject(new Error('Invalid or uncached id provided.')); if (!userID) return Promise.reject(new Error('Invalid id provided.'));
const member = this.members.get(user.id); const member = this.members.get(userID);
if (member && member.joinedTimestamp) return Promise.resolve(member); 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);
} }
/** /**