Fixed colours

src/ChannelPermissions.js

@@ -13,7 +13,7 @@ class ChannelPermissions {
 		if (this.type === "member") {
 			this.packed = channel.server.getMember("id", data.id).evalPerms.packed;
 		} else {
-			this.packed = channel.server.getRole(data.id).packed;
+			this.packed = channel.server.getRole("id", data.id).packed;
 		}
 
 		this.packed = this.packed & ~data.deny;

src/Client.js

@@ -8,6 +8,7 @@ var Invite = require("./invite.js");
 var PMChannel = require("./PMChannel.js");
 var ServerPermissions = require("./ServerPermissions.js");
 var gameMap = require("../ref/gameMap.json");
+var Color = require("../ref/colours.js");
 var zlib;
 
 var EventEmitter = require('events');
@@ -873,26 +874,21 @@ class Client extends EventEmitter {
 
 			var server = role.server.id;
 
-			var modRole = role;
-			for (var key in data) {
-				modRole[key] = data[key];
-			}
-
 			request
 				.patch(`${Endpoints.SERVERS}/${server}/roles/${role.id}`)
 				.set("authorization", self.token)
 				.send({
-					color: modRole.color,
-					hoist: modRole.hoist,
-					name: modRole.name,
-					permissions: modRole.packed
+					color: Color.toDec(data.color) || role.color,
+					hoist: data.hoist || role.hoist,
+					name: data.name || role.name,
+					permissions: data.packed || role.packed
 				})
 				.end(function (err, res) {
 					if (err) {
 						cb(err);
 						reject(err);
 					} else {
-
+						
 						var data = self.getServer("id", server).updateRole(res.body);
 						resolve(data);
 						cb(null, data);
@@ -1510,7 +1506,7 @@ class Client extends EventEmitter {
 				case "GUILD_ROLE_DELETE":
 
 					var server = self.getServer("id", data.guild_id);
-					var role = server.getRole(data.role_id);
+					var role = server.getRole("id", data.role_id);
 
 					self.emit("serverRoleDelete", server, role);
 
@@ -1521,7 +1517,7 @@ class Client extends EventEmitter {
 				case "GUILD_ROLE_UPDATE":
 
 					var server = self.getServer("id", data.guild_id);
-					var role = server.getRole(data.role.id);
+					var role = server.getRole("id", data.role.id);
 					var newRole = server.updateRole(data.role);
 
 					self.emit("serverRoleUpdate", server, role, newRole);

src/Member.js

@@ -12,10 +12,10 @@ class Member extends User{
 	
 	get roles(){
 		
-		var ufRoles = [ this.server.getRole(this.server.id) ];
+		var ufRoles = [ this.server.getRole("id", this.server.id) ];
 	
 		for(var rawRole of this.rawRoles){
-			ufRoles.push( this.server.getRole(rawRole) );
+			ufRoles.push( this.server.getRole("id", rawRole) );
 		}
 		
 		return ufRoles;

src/index.js

@@ -1,12 +1,12 @@
 var request = require("superagent");
 var Endpoints = require("./Endpoints.js"); 
 var Client = require("./Client.js");
-var Colors = require("../ref/colours.js");
+var Color = require("../ref/colours.js");
 
 var Discord = {
 	Endpoints : Endpoints,
 	Client : Client,
-	Colors : Colors,
+	Color : Color,
 	User : require("./user.js"),
 	Server : require("./server.js"),
 	Channel : require("./channel.js"),

src/server.js

@@ -73,9 +73,9 @@ class Server {
 	
 	// get/set
 	
-	getRole(id){
+	getRole(key, value){
 		for (var role of this.roles) {
-			if (role.id == id) {
+			if (role[key] === value) {
 				return role;
 			}
 		}
@@ -85,11 +85,11 @@ class Server {
 	
 	addRole(data){
 		
-		if(this.getRole(data.id)){
-			return this.getRole(data.id);
+		if(this.getRole("id", data.id)){
+			return this.getRole("id", data.id);
 		}
 		
-		var perms = new ServerPermissions(data);
+		var perms = new ServerPermissions(data, this);
 		this.roles.push(perms);
 		return perms;
 		
@@ -97,7 +97,7 @@ class Server {
 	
 	updateRole(data){
 	
-		var oldRole = this.getRole(data.id);
+		var oldRole = this.getRole("id", data.id);
 		
 		if(oldRole){
 			var index = this.roles.indexOf(oldRole);