Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-18 04:23: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

8
lib/Client/InternalClient.js
View File

@@ -2088,7 +2088,9 @@ 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;
if (server.memberMap[data.user.id]) {
oldMember = {
roles: server.memberMap[data.user.id].roles, roles: server.memberMap[data.user.id].roles,
mute: server.memberMap[data.user.id].mute, mute: server.memberMap[data.user.id].mute,
selfMute: server.memberMap[data.user.id].selfMute, selfMute: server.memberMap[data.user.id].selfMute,
@@ -2096,7 +2098,9 @@ var InternalClient = (function () {
selfDeaf: server.memberMap[data.user.id].selfDeaf, selfDeaf: server.memberMap[data.user.id].selfDeaf,
nick: server.memberMap[data.user.id].nick nick: server.memberMap[data.user.id].nick
}; };
server.memberMap[data.user.id] = server.memberMap[data.user.id] || {}; } 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);
}); });

4
lib/Structures/ServerChannel.js
View File

@@ -88,8 +88,10 @@ var ServerChannel = (function (_Channel) {
var serverRole = _ref; var serverRole = _ref;
if (serverRole) {
permissions |= serverRole.permissions; 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]();;) {
var _ref2; var _ref2;
@@ -105,9 +107,11 @@ var ServerChannel = (function (_Channel) {
var overwrite = _ref2; var overwrite = _ref2;
if (overwrite) {
permissions = permissions & ~overwrite.deny; permissions = permissions & ~overwrite.deny;
permissions = permissions | overwrite.allow; permissions = permissions | overwrite.allow;
} }
}
return new _ChannelPermissions2["default"](permissions); return new _ChannelPermissions2["default"](permissions);
} else { } else {

8
src/Client/InternalClient.js
View File

@@ -1786,7 +1786,9 @@ 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;
if (server.memberMap[data.user.id]) {
oldMember = {
roles: server.memberMap[data.user.id].roles, roles: server.memberMap[data.user.id].roles,
mute: server.memberMap[data.user.id].mute, mute: server.memberMap[data.user.id].mute,
selfMute: server.memberMap[data.user.id].selfMute, selfMute: server.memberMap[data.user.id].selfMute,
@@ -1794,7 +1796,9 @@ export default class InternalClient {
selfDeaf: server.memberMap[data.user.id].selfDeaf, selfDeaf: server.memberMap[data.user.id].selfDeaf,
nick: server.memberMap[data.user.id].nick nick: server.memberMap[data.user.id].nick
}; };
server.memberMap[data.user.id] = server.memberMap[data.user.id] || {}; } 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;

4
src/Structures/ServerChannel.js
View File

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