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

Slightly reduced promise bloat

Browse Source
This commit is contained in:
Simon Schick
2015-11-24 02:59:26 +01:00
parent c801dcff2b
commit bcbcc1e95d
1 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Client/InternalClient.js
View File

@@ -54,16 +54,11 @@ class InternalClient {
//def leaveVoiceChannel //def leaveVoiceChannel
leaveVoiceChannel() { leaveVoiceChannel() {
var self = this;
return new Promise((resolve, reject) => {
if (self.voiceConnection) { if (self.voiceConnection) {
self.voiceConnection.destroy(); self.voiceConnection.destroy();
self.voiceConnection = null; self.voiceConnection = null;
resolve();
} else {
resolve();
} }
}); return Promise.resolve();
} }
//def awaitResponse //def awaitResponse
@@ -91,16 +86,14 @@ class InternalClient {
//def joinVoiceChannel //def joinVoiceChannel
joinVoiceChannel(chann) { joinVoiceChannel(chann) {
var self = this;
return new Promise((resolve, reject) => {
var channel = self.resolver.resolveVoiceChannel(chann); var channel = self.resolver.resolveVoiceChannel(chann);
if (channel) { if (!channel) {
return Promise.reject(new Error("voice channel does not exist"));
self.leaveVoiceChannel().then(next); }
return self.leaveVoiceChannel()
function next() { .then(() => {
return new Promise((resolve, reject) => {
var session, token, server = channel.server, endpoint; var session, token, server = channel.server, endpoint;
var check = (m) => { var check = (m) => {
@@ -131,11 +124,7 @@ class InternalClient {
"self_deaf": false "self_deaf": false
} }
}); });
} });
} else {
reject(new Error("voice channel does not exist"));
}
}); });
} }