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

fix(RESTMethods): verify correct member in add and remove role listeners

Browse Source 
Fixes #2480
This commit is contained in:
SpaceEEC
2018-04-19 13:13:28 +02:00
parent 7c37a0d386
commit de78a8d0b4
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -522,15 +522,17 @@ class RESTMethods {
if (member._roles.includes(role.id)) return resolve(member); if (member._roles.includes(role.id)) return resolve(member);
const listener = (oldMember, newMember) => { const listener = (oldMember, newMember) => {
if (!oldMember._roles.includes(role.id) && newMember._roles.includes(role.id)) { if (newMember.id === member.id && !oldMember._roles.includes(role.id) && newMember._roles.includes(role.id)) {
this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener); this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener);
resolve(newMember); resolve(newMember);
} }
}; };
this.client.on(Constants.Events.GUILD_MEMBER_UPDATE, listener); this.client.on(Constants.Events.GUILD_MEMBER_UPDATE, listener);
const timeout = this.client.setTimeout(() => const timeout = this.client.setTimeout(() => {
this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener), 10e3); this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener);
reject(new Error('Adding the role timeout out.'));
}, 10e3);
return this.rest.makeRequest('put', Endpoints.Member(member).Role(role.id), true, undefined, undefined, reason) return this.rest.makeRequest('put', Endpoints.Member(member).Role(role.id), true, undefined, undefined, reason)
.catch(err => { .catch(err => {
@@ -546,15 +548,17 @@ class RESTMethods {
if (!member._roles.includes(role.id)) return resolve(member); if (!member._roles.includes(role.id)) return resolve(member);
const listener = (oldMember, newMember) => { const listener = (oldMember, newMember) => {
if (oldMember._roles.includes(role.id) && !newMember._roles.includes(role.id)) { if (newMember.id === member.id && oldMember._roles.includes(role.id) && !newMember._roles.includes(role.id)) {
this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener); this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener);
resolve(newMember); resolve(newMember);
} }
}; };
this.client.on(Constants.Events.GUILD_MEMBER_UPDATE, listener); this.client.on(Constants.Events.GUILD_MEMBER_UPDATE, listener);
const timeout = this.client.setTimeout(() => const timeout = this.client.setTimeout(() => {
this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener), 10e3); this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener);
reject(new Error('Removing the role timeout out.'));
}, 10e3);
return this.rest.makeRequest('delete', Endpoints.Member(member).Role(role.id), true, undefined, undefined, reason) return this.rest.makeRequest('delete', Endpoints.Member(member).Role(role.id), true, undefined, undefined, reason)
.catch(err => { .catch(err => {