Join Server returns server properly

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

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]);
}
}
});
});
@@ -1433,4 +1437,4 @@ function getGateway() {
});
}
module.exports = Client;
module.exports = Client;