mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-13 10:03:31 +01:00
Basic fixes, added test script
This commit is contained in:
@@ -44,7 +44,26 @@ class InternalClient {
|
||||
this.resolver = new Resolver(this);
|
||||
}
|
||||
|
||||
//def joinVoiceChannel()
|
||||
//def leaveVoiceChannel
|
||||
leaveVoiceChannel(chann){
|
||||
var self = this;
|
||||
return new Promise((resolve, reject) => {
|
||||
var channel = self.resolver.resolveVoiceChannel(chann);
|
||||
|
||||
if(channel){
|
||||
if(self.voiceConnections[channel]){
|
||||
var chan = self.voiceConnections[channel];
|
||||
chan.stopPlaying();
|
||||
self.voiceConnections.remove(chan);
|
||||
resolve();
|
||||
}
|
||||
}else{
|
||||
reject(new Error("voice channel does not exist"));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//def joinVoiceChannel
|
||||
joinVoiceChannel(chann){
|
||||
var self = this;
|
||||
return new Promise((resolve, reject) => {
|
||||
@@ -52,9 +71,7 @@ class InternalClient {
|
||||
var channel = self.resolver.resolveVoiceChannel(chann);
|
||||
|
||||
if(channel){
|
||||
if(!self.voiceConnections[channel]){
|
||||
|
||||
self.voiceConnections[channel] = {};
|
||||
if(!self.voiceConnections.get("id", channel.id)){
|
||||
|
||||
var session, token, server = channel.server, endpoint, fired = 0;
|
||||
|
||||
@@ -67,7 +84,7 @@ class InternalClient {
|
||||
token = data.d.token;
|
||||
endpoint = data.d.endpoint;
|
||||
|
||||
var chan = self.voiceConnections[channel] = new VoiceConnection(channel, self.client, session, token, server, endpoint);
|
||||
var chan = self.voiceConnections.add(new VoiceConnection(channel, self.client, session, token, server, endpoint));
|
||||
|
||||
chan.on("ready", resolve);
|
||||
chan.on("error", reject);
|
||||
|
||||
@@ -17,6 +17,7 @@ class VoiceConnection extends EventEmitter{
|
||||
if(!Opus){
|
||||
console.log("HEY! WATCH OUT\n\n discord.js needs node-opus, you don't have it installed.");
|
||||
}
|
||||
this.id = channel.id;
|
||||
this.voiceChannel = channel;
|
||||
this.client = client;
|
||||
this.session = session;
|
||||
@@ -57,13 +58,13 @@ class VoiceConnection extends EventEmitter{
|
||||
if (self.playingIntent) {
|
||||
self.stopPlaying();
|
||||
}
|
||||
|
||||
self.playing = true;
|
||||
var retStream = new StreamIntent();
|
||||
var onWarning = false;
|
||||
self.playingIntent = retStream;
|
||||
|
||||
function send() {
|
||||
if (!self.playingIntent) {
|
||||
if (!self.playingIntent || !self.playing) {
|
||||
self.setSpeaking(false);
|
||||
retStream.emit("end");
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user