Fixed evaluation and added basic deletion following

lib/Client.js

@@ -1134,6 +1134,17 @@ var Client = (function () {
 
 						break;
 
+					case "GUILD_ROLE_DELETE":
+
+						var server = self.getServer("id", data.guild_id);
+						var role = server.getRole(data.role_id);
+
+						self.trigger("serverRoleDelete", server, role);
+
+						server.removeRole(role.id);
+
+						break;
+
 					default:
 						self.debug("received unknown packet");
 						self.trigger("unknown", dat);

lib/Member.js

@@ -59,22 +59,15 @@ var Member = (function (_User) {
 				}
 			}
 
-			if (affectingOverwrites.length === 0) {
-				return new EvaluatedPermissions(this.evalPerms.packed);
-			}
-
-			var finalPacked = affectingOverwrites[0].packed;
-
 			var _iteratorNormalCompletion2 = true;
 			var _didIteratorError2 = false;
 			var _iteratorError2 = undefined;
 
 			try {
 				for (var _iterator2 = affectingOverwrites[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-					var overwrite = _step2.value;
+					var perm = _step2.value;
 
-					finalPacked = finalPacked & ~overwrite.deny;
+					console.log("hey", perm.attachFiles);
-					finalPacked = finalPacked | overwrite.allow;
 				}
 			} catch (err) {
 				_didIteratorError2 = true;
@@ -91,12 +84,18 @@ var Member = (function (_User) {
 				}
 			}
 
+			if (affectingOverwrites.length === 0 && affectingMemberOverwrites.length === 0) {
+				return new EvaluatedPermissions(this.evalPerms.packed);
+			}
+
+			var finalPacked = affectingOverwrites.length !== 0 ? affectingOverwrites[0].packed : affectingMemberOverwrites[0].packed;
+
 			var _iteratorNormalCompletion3 = true;
 			var _didIteratorError3 = false;
 			var _iteratorError3 = undefined;
 
 			try {
-				for (var _iterator3 = affectingMemberOverwrites[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+				for (var _iterator3 = affectingOverwrites[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
 					var overwrite = _step3.value;
 
 					finalPacked = finalPacked & ~overwrite.deny;
@@ -117,23 +116,16 @@ var Member = (function (_User) {
 				}
 			}
 
-			return new EvaluatedPermissions(finalPacked);
-		}
-	}, {
-		key: "roles",
-		get: function get() {
-
-			var ufRoles = [this.server.getRole(this.server.id)];
-
 			var _iteratorNormalCompletion4 = true;
 			var _didIteratorError4 = false;
 			var _iteratorError4 = undefined;
 
 			try {
-				for (var _iterator4 = this.rawRoles[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+				for (var _iterator4 = affectingMemberOverwrites[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-					var rawRole = _step4.value;
+					var overwrite = _step4.value;
 
-					ufRoles.push(this.server.getRole(rawRole));
+					finalPacked = finalPacked & ~overwrite.deny;
+					finalPacked = finalPacked | overwrite.allow;
 				}
 			} catch (err) {
 				_didIteratorError4 = true;
@@ -150,24 +142,23 @@ var Member = (function (_User) {
 				}
 			}
 
-			return ufRoles;
+			return new EvaluatedPermissions(finalPacked);
 		}
 	}, {
-		key: "evalPerms",
+		key: "roles",
 		get: function get() {
-			var basePerms = this.roles,
+
-			    //cache roles as it can be slightly expensive
+			var ufRoles = [this.server.getRole(this.server.id)];
-			basePerm = basePerms[0].packed;
 
 			var _iteratorNormalCompletion5 = true;
 			var _didIteratorError5 = false;
 			var _iteratorError5 = undefined;
 
 			try {
-				for (var _iterator5 = basePerms[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
+				for (var _iterator5 = this.rawRoles[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-					var perm = _step5.value;
+					var rawRole = _step5.value;
 
-					basePerm = basePerm | perm.packed;
+					ufRoles.push(this.server.getRole(rawRole));
 				}
 			} catch (err) {
 				_didIteratorError5 = true;
@@ -184,6 +175,40 @@ var Member = (function (_User) {
 				}
 			}
 
+			return ufRoles;
+		}
+	}, {
+		key: "evalPerms",
+		get: function get() {
+			var basePerms = this.roles,
+			    //cache roles as it can be slightly expensive
+			basePerm = basePerms[0].packed;
+
+			var _iteratorNormalCompletion6 = true;
+			var _didIteratorError6 = false;
+			var _iteratorError6 = undefined;
+
+			try {
+				for (var _iterator6 = basePerms[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
+					var perm = _step6.value;
+
+					basePerm = basePerm | perm.packed;
+				}
+			} catch (err) {
+				_didIteratorError6 = true;
+				_iteratorError6 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion6 && _iterator6["return"]) {
+						_iterator6["return"]();
+					}
+				} finally {
+					if (_didIteratorError6) {
+						throw _iteratorError6;
+					}
+				}
+			}
+
 			return new ServerPermissions({
 				permissions: basePerm
 			});

lib/server.js

@@ -121,18 +121,29 @@ var Server = (function () {
 			return null;
 		}
 	}, {
-		key: "getChannel",
+		key: "updateRole",
-		value: function getChannel(key, value) {
+		value: function updateRole() {}
+	}, {
+		key: "removeRole",
+		value: function removeRole(id) {
+			for (var roleId in this.roles) {
+				if (this.roles[roleId].id === id) {
+					this.roles.splice(roleId, 1);
+				}
+			}
+
 			var _iteratorNormalCompletion4 = true;
 			var _didIteratorError4 = false;
 			var _iteratorError4 = undefined;
 
 			try {
-				for (var _iterator4 = this.channels[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+				for (var _iterator4 = this.members[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-					var channel = _step4.value;
+					var member = _step4.value;
 
-					if (channel[key] === value) {
+					for (var roleId in member.rawRoles) {
-						return channel;
+						if (member.rawRoles[roleId] === id) {
+							member.rawRoles.splice(roleId, 1);
+						}
 					}
 				}
 			} catch (err) {
@@ -149,22 +160,20 @@ var Server = (function () {
 					}
 				}
 			}
-
-			return null;
 		}
 	}, {
-		key: "getMember",
+		key: "getChannel",
-		value: function getMember(key, value) {
+		value: function getChannel(key, value) {
 			var _iteratorNormalCompletion5 = true;
 			var _didIteratorError5 = false;
 			var _iteratorError5 = undefined;
 
 			try {
-				for (var _iterator5 = this.members[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
+				for (var _iterator5 = this.channels[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-					var member = _step5.value;
+					var channel = _step5.value;
 
-					if (member[key] === value) {
+					if (channel[key] === value) {
-						return member;
+						return channel;
 					}
 				}
 			} catch (err) {
@@ -185,8 +194,8 @@ var Server = (function () {
 			return null;
 		}
 	}, {
-		key: "removeMember",
+		key: "getMember",
-		value: function removeMember(key, value) {
+		value: function getMember(key, value) {
 			var _iteratorNormalCompletion6 = true;
 			var _didIteratorError6 = false;
 			var _iteratorError6 = undefined;
@@ -196,7 +205,6 @@ var Server = (function () {
 					var member = _step6.value;
 
 					if (member[key] === value) {
-						this.members.splice(key, 1);
 						return member;
 					}
 				}
@@ -215,6 +223,39 @@ var Server = (function () {
 				}
 			}
 
+			return null;
+		}
+	}, {
+		key: "removeMember",
+		value: function removeMember(key, value) {
+			var _iteratorNormalCompletion7 = true;
+			var _didIteratorError7 = false;
+			var _iteratorError7 = undefined;
+
+			try {
+				for (var _iterator7 = this.members[Symbol.iterator](), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
+					var member = _step7.value;
+
+					if (member[key] === value) {
+						this.members.splice(key, 1);
+						return member;
+					}
+				}
+			} catch (err) {
+				_didIteratorError7 = true;
+				_iteratorError7 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion7 && _iterator7["return"]) {
+						_iterator7["return"]();
+					}
+				} finally {
+					if (_didIteratorError7) {
+						throw _iteratorError7;
+					}
+				}
+			}
+
 			return false;
 		}
 	}, {

src/Client.js

@@ -1043,6 +1043,17 @@ class Client {
 
 					break;
 					
+				case "GUILD_ROLE_DELETE":
+				
+					var server = self.getServer("id", data.guild_id);
+					var role = server.getRole(data.role_id);
+					
+					self.trigger("serverRoleDelete", server, role);
+					
+					server.removeRole(role.id);
+					
+					break;
+
 				default:
 					self.debug("received unknown packet");
 					self.trigger("unknown", dat);

src/Member.js

@@ -48,11 +48,15 @@ class Member extends User{
 			}
 		}
 		
-		if(affectingOverwrites.length === 0){
+		for(var perm of affectingOverwrites){
+			console.log("hey", perm.attachFiles);
+		}
+		
+		if(affectingOverwrites.length === 0 && affectingMemberOverwrites.length === 0){
 			return new EvaluatedPermissions(this.evalPerms.packed);
 		}
 		
-		var finalPacked = affectingOverwrites[0].packed;
+		var finalPacked = (affectingOverwrites.length !== 0 ? affectingOverwrites[0].packed : affectingMemberOverwrites[0].packed);
 		
 		for(var overwrite of affectingOverwrites){
 			finalPacked = finalPacked & ~overwrite.deny;

src/server.js

@@ -83,6 +83,26 @@ class Server {
 		return null;
 	}
 	
+	updateRole(){
+		
+	}
+	
+	removeRole(id){
+		for (var roleId in this.roles) {
+			if (this.roles[roleId].id === id) {
+				this.roles.splice(roleId, 1);
+			}
+		}
+		
+		for(var member of this.members){
+			for(var roleId in member.rawRoles){
+				if(member.rawRoles[roleId] === id){
+					member.rawRoles.splice(roleId, 1);
+				}
+			}
+		}
+	}
+	
 	getChannel(key, value) {
 		for (var channel of this.channels) {
 			if (channel[key] === value) {

test/bot.1.js

@@ -9,10 +9,6 @@ counter = 1;
 mybot.on("message", function (message) {
 	
 	console.log("Everyone mentioned? " + message.everyoneMentioned);
-	if (mybot.user.equals(message.sender)) {
-		return;
-	}
-
 	if (message.content !== "$$$") {
 		return;
 	}
@@ -44,8 +40,6 @@ mybot.on("unknown", function(info){
 
 mybot.on("channelUpdate", function(oldChan, newChan){
 	
-	console.log(oldChan.topic + " vs " + newChan.topic);
-	
 });
 
 mybot.on("startTyping", function(user, channel){