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

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

8
lib/Client.js
View File

@@ -529,7 +529,11 @@ var Client = (function () {
callback(err); callback(err);
reject(err); reject(err);
} else { } 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]);
}
} }
}); });
}); });
@@ -1433,4 +1437,4 @@ function getGateway() {
}); });
} }
module.exports = Client; module.exports = Client;

2
lib/Endpoints.js
View File

@@ -10,4 +10,4 @@ exports.LOGIN = exports.AUTH + "/login";
exports.LOGOUT = exports.AUTH + "/logout"; exports.LOGOUT = exports.AUTH + "/logout";
exports.USERS = exports.API + "/users"; exports.USERS = exports.API + "/users";
exports.SERVERS = exports.API + "/guilds"; exports.SERVERS = exports.API + "/guilds";
exports.CHANNELS = exports.API + "/channels"; exports.CHANNELS = exports.API + "/channels";

2
lib/PMChannel.js
View File

@@ -58,4 +58,4 @@ var PMChannel = (function () {
return PMChannel; return PMChannel;
})(); })();
module.exports = PMChannel; module.exports = PMChannel;

4
lib/channel.js
View File

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

2
lib/index.js
View File

@@ -9,4 +9,4 @@ var Discord = {
Client: Client Client: Client
}; };
module.exports = Discord; module.exports = Discord;

2
lib/internal.js
View File

@@ -200,4 +200,4 @@ Internal.XHR.setUsername = function (token, avatar, email, newPassword, password
}); });
}; };
exports.Internal = Internal; exports.Internal = Internal;

2
lib/invite.js
View File

@@ -32,4 +32,4 @@ var Invite = (function () {
return Invite; return Invite;
})(); })();
module.exports = Invite; module.exports = Invite;

2
lib/message.js
View File

@@ -69,4 +69,4 @@ var Message = (function () {
return Message; return Message;
})(); })();
module.exports = Message; module.exports = Message;

2
lib/server.js
View File

@@ -170,4 +170,4 @@ var Server = (function () {
return Server; return Server;
})(); })();
module.exports = Server; module.exports = Server;

2
lib/user.js
View File

@@ -53,4 +53,4 @@ var User = (function () {
return User; return User;
})(); })();
module.exports = User; module.exports = User;

6
src/Client.js
View File

@@ -542,7 +542,11 @@ class Client {
callback(err); callback(err);
reject(err); reject(err);
} else { } 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) { equals(object) {
return object.id === this.id; return (object && object.id === this.id);
} }
addMessage(data){ addMessage(data){