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

More bug fixes

Browse Source
This commit is contained in:
hydrabolt
2015-10-29 14:14:33 +00:00
parent bb1655330a
commit 1af1d71643
7 changed files with 93 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
lib/Member.js
View File

@@ -17,7 +17,8 @@ var Member = (function (_User) {
_classCallCheck(this, Member);
_User.call(this, user); // should work, we are basically creating a Member that has the same properties as user and a few more
this.server = server;
this.serverID = server.id;
this.client = server.client;
this.rawRoles = roles;
}
@@ -102,10 +103,9 @@ var Member = (function (_User) {
var overwrite = _ref3;
finalPacked = finalPacked & ~overwrite.deny;
finalPacked = finalPacked | overwrite.allow;
}
for (var _iterator4 = affectingMemberOverwrites, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
for (var _iterator4 = affectingOverwrites, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
var _ref4;
if (_isArray4) {
@@ -119,7 +119,40 @@ var Member = (function (_User) {
var overwrite = _ref4;
finalPacked = finalPacked | overwrite.allow;
}
for (var _iterator5 = affectingMemberOverwrites, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
var _ref5;
if (_isArray5) {
if (_i5 >= _iterator5.length) break;
_ref5 = _iterator5[_i5++];
} else {
_i5 = _iterator5.next();
if (_i5.done) break;
_ref5 = _i5.value;
}
var overwrite = _ref5;
finalPacked = finalPacked & ~overwrite.deny;
}
for (var _iterator6 = affectingMemberOverwrites, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
var _ref6;
if (_isArray6) {
if (_i6 >= _iterator6.length) break;
_ref6 = _iterator6[_i6++];
} else {
_i6 = _iterator6.next();
if (_i6.done) break;
_ref6 = _i6.value;
}
var overwrite = _ref6;
finalPacked = finalPacked | overwrite.allow;
}
@@ -127,24 +160,29 @@ var Member = (function (_User) {
};
_createClass(Member, [{
key: "server",
get: function get() {
return this.client.getServer("id", this.serverID);
}
}, {
key: "roles",
get: function get() {
var ufRoles = [this.server.getRole("id", this.server.id)];
for (var _iterator5 = this.rawRoles, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
var _ref5;
for (var _iterator7 = this.rawRoles, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
var _ref7;
if (_isArray5) {
if (_i5 >= _iterator5.length) break;
_ref5 = _iterator5[_i5++];
if (_isArray7) {
if (_i7 >= _iterator7.length) break;
_ref7 = _iterator7[_i7++];
} else {
_i5 = _iterator5.next();
if (_i5.done) break;
_ref5 = _i5.value;
_i7 = _iterator7.next();
if (_i7.done) break;
_ref7 = _i7.value;
}
var rawRole = _ref5;
var rawRole = _ref7;
ufRoles.push(this.server.getRole("id", rawRole));
}
@@ -159,19 +197,19 @@ var Member = (function (_User) {
basePerm = basePerms[0].packed;
basePerms = basePerms || [];
for (var _iterator6 = basePerms, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
var _ref6;
for (var _iterator8 = basePerms, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
var _ref8;
if (_isArray6) {
if (_i6 >= _iterator6.length) break;
_ref6 = _iterator6[_i6++];
if (_isArray8) {
if (_i8 >= _iterator8.length) break;
_ref8 = _iterator8[_i8++];
} else {
_i6 = _iterator6.next();
if (_i6.done) break;
_ref6 = _i6.value;
_i8 = _iterator8.next();
if (_i8.done) break;
_ref8 = _i8.value;
}
var perm = _ref6;
var perm = _ref8;
basePerm = basePerm | perm.packed;
}