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

Fixed colours

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ChannelPermissions.js
View File

@@ -20,7 +20,7 @@ var ChannelPermissions = (function () {
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;

18
lib/Client.js
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);

4
lib/Member.js
View File

@@ -130,7 +130,7 @@ var Member = (function (_User) {
key: "roles",
get: function get() {
var ufRoles = [this.server.getRole(this.server.id)];
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;
@@ -146,7 +146,7 @@ var Member = (function (_User) {
var rawRole = _ref5;
ufRoles.push(this.server.getRole(rawRole));
ufRoles.push(this.server.getRole("id", rawRole));
}
return ufRoles;

4
lib/index.js
View File

@@ -3,12 +3,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"),

12
lib/server.js
View File

@@ -71,7 +71,7 @@ var Server = (function () {
// get/set
Server.prototype.getRole = function getRole(id) {
Server.prototype.getRole = function getRole(key, value) {
for (var _iterator3 = this.roles, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
var _ref3;
@@ -86,7 +86,7 @@ var Server = (function () {
var role = _ref3;
if (role.id == id) {
if (role[key] === value) {
return role;
}
}
@@ -96,18 +96,18 @@ var Server = (function () {
Server.prototype.addRole = function 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;
};
Server.prototype.updateRole = function updateRole(data) {
var oldRole = this.getRole(data.id);
var oldRole = this.getRole("id", data.id);
if (oldRole) {
var index = this.roles.indexOf(oldRole);