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

New travis build

Browse Source
This commit is contained in:
hydrabolt
2015-10-28 16:09:21 +00:00
parent 1125d4ae97
commit 834825a09d
5 changed files with 173 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/Client.js
View File

@@ -802,15 +802,17 @@ var Client = (function (_EventEmitter) {
if (data.color) data.color = Color.toDec(data.color);
self.guildRoleCreateIgnoreList[res.body.id] = function () {
self.updateRole(perm, data).then(function (perm) {
cb(null, perm);
resolve(perm);
})["catch"](function (err) {
cb(err);
reject(err);
});
};
self.guildRoleCreateIgnoreList[res.body.id] = true;
server.addRole(res.body);
self.updateRole(perm, data).then(function (perm) {
cb(null, perm);
resolve(perm);
})["catch"](function (err) {
cb(err);
reject(err);
});
}
});
});
@@ -825,6 +827,11 @@ var Client = (function (_EventEmitter) {
var server = role.server.id;
var tempRole = role;
for (var key in data) {
tempRole[key] = data[key];
}
if (isNaN(Color.toDec(data.color))) {
var err = new Error("Invalid Color");
reject(err);
@@ -833,10 +840,10 @@ var Client = (function (_EventEmitter) {
}
request.patch(Endpoints.SERVERS + "/" + server + "/roles/" + role.id).set("authorization", self.token).send({
color: Color.toDec(data.color) || role.color,
hoist: data.hoist || role.hoist,
name: data.name || role.name,
permissions: data.packed || role.packed
color: tempRole.color,
hoist: tempRole.hoist,
name: tempRole.name,
permissions: tempRole.packed
}).end(function (err, res) {
if (err) {
cb(err);
@@ -1302,15 +1309,21 @@ var Client = (function (_EventEmitter) {
}*/
if (self.serverCreateListener[data.id]) {
var cbs = self.serverCreateListener[data.id];
cbs[0](server); //promise then callback
cbs[1](null, server); //legacy callback
self.serverCreateListener[data.id] = null;
if (data.owner_id === self.user.id) {
var keepCheck = setInterval(function () {
if (self.serverCreateListener[data.id]) {
var cbs = self.serverCreateListener[data.id];
cbs[0](server); //promise then callback
cbs[1](null, server); //legacy callback
self.serverCreateListener[data.id] = null;
self.emit("serverCreate", server);
clearInterval(keepCheck);
}
}, 50);
} else {
self.emit("serverCreate", server);
}
self.emit("serverCreate", server);
break;
case "CHANNEL_CREATE":
@@ -1469,8 +1482,6 @@ var Client = (function (_EventEmitter) {
var role = data.role;
if (self.guildRoleCreateIgnoreList[data.role.id]) {
server.addRole(role);
self.guildRoleCreateIgnoreList[data.role.id]();
self.guildRoleCreateIgnoreList[data.role.id] = null;
break;
}