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

Unoverlap allow when denying a permission overwrite

Browse Source
This commit is contained in:
abalabahaha
2016-03-19 22:54:49 -07:00
parent 95748f3721
commit b069f818d9
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Client/InternalClient.js
View File

@@ -1143,7 +1143,9 @@ var InternalClient = (function () {
for (var perm in updated) { for (var perm in updated) {
if (updated[perm]) { if (updated[perm]) {
data.allow |= _Constants.Permissions[perm] || 0; data.allow |= _Constants.Permissions[perm] || 0;
data.deny &= ~(_Constants.Permissions[perm] || 0);
} else { } else {
data.allow &= ~(_Constants.Permissions[perm] || 0);
data.deny |= _Constants.Permissions[perm] || 0; data.deny |= _Constants.Permissions[perm] || 0;
} }
} }

24
lib/Util/TokenCacher-shim.js
View File

@@ -6,23 +6,23 @@ exports.__esModule = true;
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var TokenCacher = (function () { var TokenCacher = (function () {
function TokenCacher() { function TokenCacher() {
_classCallCheck(this, TokenCacher); _classCallCheck(this, TokenCacher);
} }
TokenCacher.prototype.setToken = function setToken() {}; TokenCacher.prototype.setToken = function setToken() {};
TokenCacher.prototype.save = function save() {}; TokenCacher.prototype.save = function save() {};
TokenCacher.prototype.getToken = function getToken() { TokenCacher.prototype.getToken = function getToken() {
return null; return null;
}; };
TokenCacher.prototype.init = function init(ind) { TokenCacher.prototype.init = function init(ind) {
this.done = true; this.done = true;
}; };
return TokenCacher; return TokenCacher;
})(); })();
exports["default"] = TokenCacher; exports["default"] = TokenCacher;

2
src/Client/InternalClient.js
View File

@@ -914,7 +914,9 @@ export default class InternalClient {
for (var perm in updated) { for (var perm in updated) {
if (updated[perm]) { if (updated[perm]) {
data.allow |= (Permissions[perm] || 0); data.allow |= (Permissions[perm] || 0);
data.deny &= ~(Permissions[perm] || 0);
} else { } else {
data.allow &= ~(Permissions[perm] || 0);
data.deny |= (Permissions[perm] || 0); data.deny |= (Permissions[perm] || 0);
} }
} }