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

Some fixes

Browse Source
This commit is contained in:
abalabahaha
2016-05-08 00:16:20 -07:00
parent 963b22e6ce
commit af333ef4cc
5 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Client/InternalClient.js
View File

@@ -2088,15 +2088,19 @@ var InternalClient = (function () {
if (server) { if (server) {
var user = self.users.add(new _StructuresUser2["default"](data.user, client)); var user = self.users.add(new _StructuresUser2["default"](data.user, client));
if (user) { if (user) {
var oldMember = { var oldMember = null;
roles: server.memberMap[data.user.id].roles, if (server.memberMap[data.user.id]) {
mute: server.memberMap[data.user.id].mute, oldMember = {
selfMute: server.memberMap[data.user.id].selfMute, roles: server.memberMap[data.user.id].roles,
deaf: server.memberMap[data.user.id].deaf, mute: server.memberMap[data.user.id].mute,
selfDeaf: server.memberMap[data.user.id].selfDeaf, selfMute: server.memberMap[data.user.id].selfMute,
nick: server.memberMap[data.user.id].nick deaf: server.memberMap[data.user.id].deaf,
}; selfDeaf: server.memberMap[data.user.id].selfDeaf,
server.memberMap[data.user.id] = server.memberMap[data.user.id] || {}; nick: server.memberMap[data.user.id].nick
};
} else {
server.memberMap[data.user.id] = {};
}
server.memberMap[data.user.id].roles = data.roles.map(function (pid) { server.memberMap[data.user.id].roles = data.roles.map(function (pid) {
return server.roles.get("id", pid); return server.roles.get("id", pid);
}); });

10
lib/Structures/ServerChannel.js
View File

@@ -88,7 +88,9 @@ var ServerChannel = (function (_Channel) {
var serverRole = _ref; var serverRole = _ref;
permissions |= serverRole.permissions; if (serverRole) {
permissions |= serverRole.permissions;
}
} }
for (var _iterator2 = roleOverwrites.concat(memberOverwrites), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) { for (var _iterator2 = roleOverwrites.concat(memberOverwrites), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
@@ -105,8 +107,10 @@ var ServerChannel = (function (_Channel) {
var overwrite = _ref2; var overwrite = _ref2;
permissions = permissions & ~overwrite.deny; if (overwrite) {
permissions = permissions | overwrite.allow; permissions = permissions & ~overwrite.deny;
permissions = permissions | overwrite.allow;
}
} }
return new _ChannelPermissions2["default"](permissions); return new _ChannelPermissions2["default"](permissions);

22
src/Client/InternalClient.js
View File

@@ -1786,15 +1786,19 @@ export default class InternalClient {
if (server) { if (server) {
var user = self.users.add(new User(data.user, client)); var user = self.users.add(new User(data.user, client));
if (user) { if (user) {
var oldMember = { var oldMember = null;
roles: server.memberMap[data.user.id].roles, if (server.memberMap[data.user.id]) {
mute: server.memberMap[data.user.id].mute, oldMember = {
selfMute: server.memberMap[data.user.id].selfMute, roles: server.memberMap[data.user.id].roles,
deaf: server.memberMap[data.user.id].deaf, mute: server.memberMap[data.user.id].mute,
selfDeaf: server.memberMap[data.user.id].selfDeaf, selfMute: server.memberMap[data.user.id].selfMute,
nick: server.memberMap[data.user.id].nick deaf: server.memberMap[data.user.id].deaf,
}; selfDeaf: server.memberMap[data.user.id].selfDeaf,
server.memberMap[data.user.id] = server.memberMap[data.user.id] || {}; nick: server.memberMap[data.user.id].nick
};
} else {
server.memberMap[data.user.id] = {};
}
server.memberMap[data.user.id].roles = data.roles.map(pid => server.roles.get("id", pid)); server.memberMap[data.user.id].roles = data.roles.map(pid => server.roles.get("id", pid));
server.memberMap[data.user.id].mute = data.mute; server.memberMap[data.user.id].mute = data.mute;
server.memberMap[data.user.id].selfMute = data.self_mute; server.memberMap[data.user.id].selfMute = data.self_mute;

10
src/Structures/ServerChannel.js
View File

@@ -44,12 +44,16 @@ export default class ServerChannel extends Channel{
var permissions = 0; var permissions = 0;
for(var serverRole of userRoles){ for(var serverRole of userRoles){
permissions |= serverRole.permissions; if (serverRole) {
permissions |= serverRole.permissions;
}
} }
for(var overwrite of roleOverwrites.concat(memberOverwrites)){ for(var overwrite of roleOverwrites.concat(memberOverwrites)){
permissions = permissions & ~overwrite.deny; if (overwrite) {
permissions = permissions | overwrite.allow; permissions = permissions & ~overwrite.deny;
permissions = permissions | overwrite.allow;
}
} }
return new ChannelPermissions(permissions); return new ChannelPermissions(permissions);

4
src/Util/Cache.js
View File

@@ -97,8 +97,8 @@ export default class Cache extends Array {
remove(data) { remove(data) {
delete this[discrimCacheS][data[this[discrimS]]]; delete this[discrimCacheS][data[this[discrimS]]];
for(var i in this) { for (var i in this) {
if(this[i] && this[i][this[discrimS]] === data[this[discrimS]]) { if (this[i] && this[i][this[discrimS]] === data[this[discrimS]]) {
this.splice(i, 1); this.splice(i, 1);
return true; return true;
} }