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

Merge pull request #43 from qeled/master

Browse Source 
Fixes
This commit is contained in:
Amish Shah
2015-10-30 20:24:01 +00:00
parent 2d4295c83f a74fe57eb4
commit 0d9c7fe311
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ChannelPermissions.js
View File

@@ -30,7 +30,7 @@ class ChannelPermissions {
manageRoles: this.manageRoles, manageRoles: this.manageRoles,
manageChannels: this.manageChannels, manageChannels: this.manageChannels,
readMessages: this.readMessages, readMessages: this.readMessages,
sendMessages: this.sendMessage, sendMessages: this.sendMessages,
sendTTSMessages: this.sendTTSMessages, sendTTSMessages: this.sendTTSMessages,
manageMessages: this.manageMessages, manageMessages: this.manageMessages,
embedLinks: this.embedLinks, embedLinks: this.embedLinks,

15
src/Client.js
View File

@@ -624,8 +624,10 @@ class Client extends EventEmitter {
callback(err); callback(err);
reject(err); reject(err);
} else { } else {
if (self.getServer("id", res.body.guild.id)) { var server = self.getServer("id", res.body.guild.id);
resolve(self.getServer("id", res.body.guild.id)); if (server) {
callback(null, server);
resolve(server);
} else { } else {
self.serverCreateListener[res.body.guild.id] = [resolve, callback]; self.serverCreateListener[res.body.guild.id] = [resolve, callback];
} }
@@ -861,7 +863,7 @@ class Client extends EventEmitter {
var perm = server.addRole(res.body); var perm = server.addRole(res.body);
if (data.color) if (data && data.color)
data.color = Color.toDec(data.color); data.color = Color.toDec(data.color);
self.guildRoleCreateIgnoreList[res.body.id] = true; self.guildRoleCreateIgnoreList[res.body.id] = true;
@@ -900,7 +902,7 @@ class Client extends EventEmitter {
tempRole[key] = data[key]; tempRole[key] = data[key];
} }
if (isNaN(Color.toDec(data.color))) { if (data && isNaN(Color.toDec(data.color))) {
var err = new Error("Invalid Color"); var err = new Error("Invalid Color");
reject(err); reject(err);
cb(err); cb(err);
@@ -1375,7 +1377,10 @@ class Client extends EventEmitter {
if (channel) { if (channel) {
self.channelCache.splice(self.channelCache.indexOf(channel), 1); self.channelCache.splice(self.channelCache.indexOf(channel), 1);
server.channels.splice(server.channels.indexOf(channel), 1); var server = self.getServer("id", data.guild_id);
if (server) {
server.channels.splice(server.channels.indexOf(channel), 1);
}
self.emit("channelDelete", channel); self.emit("channelDelete", channel);