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

Use resolveChannel instead of resolveVoiceChannel for joinVoiceChannel and get rid of resolveVoiceChannel

Browse Source
This commit is contained in:
meew0
2016-02-01 21:30:57 +01:00
parent 6f7bd987b8
commit e66311bdf5
4 changed files with 70 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
lib/Client/InternalClient.js
View File

@@ -269,46 +269,46 @@ var InternalClient = (function () {
InternalClient.prototype.joinVoiceChannel = function joinVoiceChannel(chann) {
var _this3 = this;
var channel = this.resolver.resolveVoiceChannel(chann);
return this.resolver.resolveChannel(chann).then(function (channel) {
if (!channel) {
return Promise.reject(new Error("voice channel does not exist"));
}
return _this3.leaveVoiceChannel().then(function () {
return new Promise(function (resolve, reject) {
var session,
token,
server = channel.server,
endpoint;
if (!channel) {
return Promise.reject(new Error("voice channel does not exist"));
}
return this.leaveVoiceChannel().then(function () {
return new Promise(function (resolve, reject) {
var session,
token,
server = channel.server,
endpoint;
var check = function check(m) {
var data = JSON.parse(m);
if (data.t === "VOICE_STATE_UPDATE") {
session = data.d.session_id;
} else if (data.t === "VOICE_SERVER_UPDATE") {
token = data.d.token;
endpoint = data.d.endpoint;
var chan = _this3.voiceConnection = new _VoiceVoiceConnection2["default"](channel, _this3.client, session, token, server, endpoint);
var check = function check(m) {
var data = JSON.parse(m);
if (data.t === "VOICE_STATE_UPDATE") {
session = data.d.session_id;
} else if (data.t === "VOICE_SERVER_UPDATE") {
token = data.d.token;
endpoint = data.d.endpoint;
var chan = _this3.voiceConnection = new _VoiceVoiceConnection2["default"](channel, _this3.client, session, token, server, endpoint);
chan.on("ready", function () {
return resolve(chan);
});
chan.on("error", reject);
chan.on("ready", function () {
return resolve(chan);
});
chan.on("error", reject);
_this3.client.emit("debug", "removed temporary voice websocket listeners");
_this3.websocket.removeListener("message", check);
}
};
_this3.client.emit("debug", "removed temporary voice websocket listeners");
_this3.websocket.removeListener("message", check);
}
};
_this3.websocket.on("message", check);
_this3.sendWS({
op: 4,
d: {
"guild_id": server.id,
"channel_id": channel.id,
"self_mute": false,
"self_deaf": false
}
_this3.websocket.on("message", check);
_this3.sendWS({
op: 4,
d: {
"guild_id": server.id,
"channel_id": channel.id,
"self_mute": false,
"self_deaf": false
}
});
});
});
});

8
lib/Client/Resolver/Resolver.js
View File

@@ -236,14 +236,6 @@ var Resolver = (function () {
return null;
};
Resolver.prototype.resolveVoiceChannel = function resolveVoiceChannel(resource) {
// resolveChannel will also work but this is more apt
if (resource instanceof _StructuresVoiceChannel2["default"]) {
return resource;
}
return null;
};
Resolver.prototype.resolveChannel = function resolveChannel(resource) {
/*
accepts a Message, Channel, Server, String ID, User

68
src/Client/InternalClient.js
View File

@@ -200,45 +200,45 @@ export default class InternalClient {
//def joinVoiceChannel
joinVoiceChannel(chann) {
var channel = this.resolver.resolveVoiceChannel(chann);
return this.resolver.resolveChannel(chann).then(channel => {
if (!channel) {
return Promise.reject(new Error("voice channel does not exist"));
}
return this.leaveVoiceChannel()
.then(() => {
return new Promise((resolve, reject) => {
var session, token, server = channel.server, endpoint;
if (!channel) {
return Promise.reject(new Error("voice channel does not exist"));
}
return this.leaveVoiceChannel()
.then(() => {
return new Promise((resolve, reject) => {
var session, token, server = channel.server, endpoint;
var check = m => {
var data = JSON.parse(m);
if (data.t === "VOICE_STATE_UPDATE") {
session = data.d.session_id;
} else if (data.t === "VOICE_SERVER_UPDATE") {
token = data.d.token;
endpoint = data.d.endpoint;
var chan = this.voiceConnection = new VoiceConnection(
channel, this.client, session, token, server, endpoint
);
var check = m => {
var data = JSON.parse(m);
if (data.t === "VOICE_STATE_UPDATE") {
session = data.d.session_id;
} else if (data.t === "VOICE_SERVER_UPDATE") {
token = data.d.token;
endpoint = data.d.endpoint;
var chan = this.voiceConnection = new VoiceConnection(
channel, this.client, session, token, server, endpoint
);
chan.on("ready", () => resolve(chan));
chan.on("error", reject);
chan.on("ready", () => resolve(chan));
chan.on("error", reject);
this.client.emit("debug", "removed temporary voice websocket listeners");
this.websocket.removeListener("message", check);
this.client.emit("debug", "removed temporary voice websocket listeners");
this.websocket.removeListener("message", check);
}
};
}
};
this.websocket.on("message", check);
this.sendWS({
op: 4,
d: {
"guild_id": server.id,
"channel_id": channel.id,
"self_mute": false,
"self_deaf": false
}
this.websocket.on("message", check);
this.sendWS({
op: 4,
d: {
"guild_id": server.id,
"channel_id": channel.id,
"self_mute": false,
"self_deaf": false
}
});
});
});
});

8
src/Client/Resolver/Resolver.js
View File

@@ -166,14 +166,6 @@ export default class Resolver {
return null;
}
resolveVoiceChannel(resource) {
// resolveChannel will also work but this is more apt
if (resource instanceof VoiceChannel) {
return resource;
}
return null;
}
resolveChannel(resource) {
/*
accepts a Message, Channel, Server, String ID, User