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

Don't overwrite permissions in updateRole if they aren't passed

Browse Source
This commit is contained in:
abalabahaha
2015-11-22 20:25:52 -08:00
parent 014d78638e
commit 8cb912090f
2 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Client/InternalClient.js
View File

@@ -723,31 +723,32 @@ class InternalClient {
updateRole(role, data) {
var self = this;
data = data || {};
data.permissions = data.permissions || [];
return new Promise((resolve, reject) => {
var server = self.resolver.resolveServer(role.server);
var permissions = 0;
for (var perm of data.permissions) {
if (perm instanceof String || typeof perm === "string") {
permissions |= (Constants.Permissions[perm] || 0);
} else {
permissions |= perm;
var newData = {
color: data.color || role.color,
hoist: data.hoist || role.hoist,
name: data.name || role.name,
permissions: role.permissions || 0
};
if(data.permissions) {
newData.permissions = 0;
for (var perm of data.permissions) {
if (perm instanceof String || typeof perm === "string") {
newData.permissions |= (Constants.Permissions[perm] || 0);
} else {
newData.permissions |= perm;
}
}
}
data.color = data.color || 0;
request
.patch(Endpoints.SERVER_ROLES(server.id) + "/" + role.id)
.set("authorization", self.token)
.send({
color: data.color || role.color,
hoist: data.hoist || role.hoist,
name: data.name || role.name,
permissions: permissions
})
.send(newData)
.end((err, res) => {
if (err) {
reject(err);