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

fix: Guild#addMember incorrectly resolving userID

Browse Source
This commit is contained in:
Lewdcario
2018-08-26 09:46:55 -06:00
parent 469fbe2889
commit 93bf430fc7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -457,7 +457,7 @@ class RESTMethods {
return this.rest.makeRequest('get', Endpoints.Channel(channel).Message(messageID), true); return this.rest.makeRequest('get', Endpoints.Channel(channel).Message(messageID), true);
} }
putGuildMember(guild, user, options) { putGuildMember(guild, userID, options) {
options.access_token = options.accessToken; options.access_token = options.accessToken;
if (options.roles) { if (options.roles) {
const roles = options.roles; const roles = options.roles;
@@ -465,7 +465,7 @@ class RESTMethods {
options.roles = roles.map(role => role.id); 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); .then(data => this.client.actions.GuildMemberGet.handle(guild, data).member);
} }

3
src/structures/Guild.js
View File

@@ -563,7 +563,8 @@ class Guild {
* @returns {Promise<GuildMember>} * @returns {Promise<GuildMember>}
*/ */
addMember(user, options) { 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); return this.client.rest.methods.putGuildMember(this, user, options);
} }