dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-07-09 05:00:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Join Server returns server properly

Browse source 
Previously if the client was already part of a server and attempted to
accept an invite to it again, it would stall and not work correctly.
This commit is contained in:
hydrabolt 2015-08-28 17:49:47 +01:00
parent 7300dec912
commit 1c8c9d2da3
12 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Client.js
View file

@ -529,7 +529,11 @@ var Client = (function () {
callback(err);
reject(err);
} else {
self.serverCreateListener.set(res.body.guild.id, [resolve, callback]);
if (self.getServer("id", res.body.guild.id)) {
resolve(self.getServer("id", res.body.guild.id));
} else {
self.serverCreateListener.set(res.body.guild.id, [resolve, callback]);
}
}
});
});

2
lib/channel.js
View file

@ -19,7 +19,7 @@ var Channel = (function () {
_createClass(Channel, [{
key: "equals",
value: function equals(object) {
return object.id === this.id;
return object && object.id === this.id;
}
}, {
key: "addMessage",

6
src/Client.js
View file

@ -542,7 +542,11 @@ class Client {
callback(err);
reject(err);
} else {
self.serverCreateListener.set(res.body.guild.id, [resolve, callback]);
if (self.getServer("id", res.body.guild.id)) {
resolve(self.getServer("id", res.body.guild.id));
} else {
self.serverCreateListener.set(res.body.guild.id, [resolve, callback]);
}
}
});

2
src/channel.js
View file

@ -14,7 +14,7 @@ class Channel {
}
equals(object) {
return object.id === this.id;
return (object && object.id === this.id);
}
addMessage(data){