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

Minor fixes

Browse Source
This commit is contained in:
hydrabolt
2015-11-07 21:24:56 +00:00
parent fc31df3fcf
commit ae75c49621
9 changed files with 69 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Client/Client.js
View File

@@ -532,6 +532,24 @@ var Client = (function (_EventEmitter) {
});
};
//def joinVoiceChannel
Client.prototype.joinVoiceChannel = function joinVoiceChannel(channel) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
return new Promise(function (resolve, reject) {
self.internal.joinVoiceChannel(channel).then(function (chan) {
callback(null, chan);
resolve(chan);
})["catch"](function (err) {
callback(err);
reject(err);
});
});
};
_createClass(Client, [{
key: "users",
get: function get() {

6
lib/Client/InternalClient.js
View File

@@ -76,7 +76,10 @@ var InternalClient = (function () {
token = data.d.token;
endpoint = data.d.endpoint;
self.voiceConnections[channel] = new VoiceConnection(channel, self.client, session, token, server, endpoint);
var chan = self.voiceConnections[channel] = new VoiceConnection(channel, self.client, session, token, server, endpoint);
chan.on("ready", resolve);
chan.on("error", reject);
}
if (fired >= 2) {
self.websocket.removeListener('message', check);
@@ -774,7 +777,6 @@ var InternalClient = (function () {
}
request.put(Endpoints.CHANNEL_PERMISSIONS(channel.id) + "/" + data.id).set("authorization", self.token).send(data).end(function (err) {
console.log(err);
if (err) {
reject(err);
} else {