Fixed colours

This commit is contained in:
hydrabolt
2015-10-28 12:13:09 +00:00
parent 2eed36d297
commit c3b6dba6be
12 changed files with 194 additions and 81 deletions

View File

@@ -16,6 +16,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');
@@ -824,16 +825,11 @@ var Client = (function (_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);
@@ -1479,7 +1475,7 @@ var Client = (function (_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);
@@ -1490,7 +1486,7 @@ var Client = (function (_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);