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

Testing alternate role resolving

Browse Source
This commit is contained in:
abalabahaha
2016-05-12 17:30:44 -07:00
parent 873f78b02a
commit e7882a38ee
4 changed files with 28 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Client/InternalClient.js
View File

@@ -1180,9 +1180,7 @@ var InternalClient = (function () {
return Promise.reject(new Error("Role does not exist on same server as member"));
}
var roleIDs = roles[0].server.memberMap[member.id].roles.map(function (r) {
return r.id;
});
var roleIDs = roles[0].server.memberMap[member.id].roles;
for (var i = 0; i < roles.length; i++) {
if (! ~roleIDs.indexOf(roles[i].id)) {
@@ -1254,9 +1252,7 @@ var InternalClient = (function () {
});
}
var roleIDs = roles[0].server.memberMap[member.id].roles.map(function (r) {
return r.id;
});
var roleIDs = roles[0].server.memberMap[member.id].roles;
for (var _iterator7 = roles, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
var _ref7;
@@ -2071,9 +2067,7 @@ var InternalClient = (function () {
if (server) {
server.memberMap[data.user.id] = {
roles: data.roles.map(function (pid) {
return server.roles.get("id", pid);
}),
roles: data.roles,
mute: false,
selfMute: false,
deaf: false,
@@ -2123,9 +2117,7 @@ var InternalClient = (function () {
} else {
server.memberMap[data.user.id] = {};
}
server.memberMap[data.user.id].roles = data.roles ? data.roles.map(function (pid) {
return server.roles.get("id", pid);
}) : server.memberMap[data.user.id].roles;
server.memberMap[data.user.id].roles = data.roles ? data.roles : server.memberMap[data.user.id].roles;
server.memberMap[data.user.id].mute = data.mute || server.memberMap[data.user.id].mute;
server.memberMap[data.user.id].selfMute = data.self_mute === undefined ? server.memberMap[data.user.id].selfMute : data.self_mute;
server.memberMap[data.user.id].deaf = data.deaf || server.memberMap[data.user.id].deaf;
@@ -2291,9 +2283,7 @@ var InternalClient = (function () {
var user = _ref11;
server.memberMap[user.user.id] = {
roles: user.roles.map(function (pid) {
return server.roles.get("id", pid);
}),
roles: user.roles,
mute: user.mute,
selfMute: false,
deaf: user.deaf,