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

Fix for incorrect oldMember in guildMemberUpdate event after addRole (#1129)

Browse Source 
* Fix for incorrect oldMember in guildMemberUpdate event after addRole

`addRole` would modify the cached GuildMember rather than letting it be handled internally when a guild member update packet is received from Discord, leading to the `oldMember` and `newMember` being identical following a call to `addRole`

This is currently how `addRoles` does it, and a correct oldMember is passed to the `guildMemberUpdate` event following a call to `addRoles`

* Return cloned member with added/removed role

So we can return a member object with the added/removed role without affecting the member object sent to `guildMemberUpdate`

* Wait for guildMemberUpdate and return updated GuildMember

* Fix linter errors

* Remove listeners after 10 seconds
This commit is contained in:
Zack Campbell
2017-02-08 11:38:57 -06:00
committed by Amish Shah
parent cdb911f2af
commit 2518a0f7e2
1 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -406,22 +406,42 @@ class RESTMethods {
}
addMemberRole(member, role) {
return this.rest.makeRequest('put', Constants.Endpoints.guildMemberRole(member.guild.id, member.id, role.id), true)
.then(() => {
if (!member._roles.includes(role.id)) member._roles.push(role.id);
return member;
});
return new Promise(resolve => {
const listener = (oldMember, newMember) => {
if (!oldMember._roles.includes(role.id) && newMember._roles.includes(role.id)) {
this.client.removeListener('guildMemberUpdate', listener);
resolve(newMember);
}
};
this.client.on('guildMemberUpdate', listener);
this.client.setTimeout(() => this.client.removeListener('guildMemberUpdate', listener), 10e3);
this.rest.makeRequest(
'put',
Constants.Endpoints.guildMemberRole(member.guild.id, member.id, role.id),
true
);
});
}
removeMemberRole(member, role) {
return this.rest.makeRequest(
'delete',
Constants.Endpoints.guildMemberRole(member.guild.id, member.id, role.id),
true
).then(() => {
const index = member._roles.indexOf(role.id);
if (index >= 0) member._roles.splice(index, 1);
return member;
return new Promise(resolve => {
const listener = (oldMember, newMember) => {
if (oldMember._roles.includes(role.id) && !newMember._roles.includes(role.id)) {
this.client.removeListener('guildMemberUpdate', listener);
resolve(newMember);
}
};
this.client.on('guildMemberUpdate', listener);
this.client.setTimeout(() => this.client.removeListener('guildMemberUpdate', listener), 10e3);
this.rest.makeRequest(
'delete',
Constants.Endpoints.guildMemberRole(member.guild.id, member.id, role.id),
true
);
});
}