dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-05-31 21:31:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(Voice*): internally disconnect and cleanup when forcibly disconnected (#3597)

Browse source
This commit is contained in:
SpaceEEC 2020-01-05 18:10:20 +01:00 committed by GitHub
parent 1d6606293a
commit cbabc1663c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/client/voice/ClientVoiceManager.js
View file

@ -30,10 +30,15 @@ class ClientVoiceManager {
onVoiceStateUpdate({ guild_id, session_id, channel_id }) { onVoiceStateUpdate({ guild_id, session_id, channel_id }) {
const connection = this.connections.get(guild_id); const connection = this.connections.get(guild_id);
if (connection) { if (!connection) return;
connection.channel = this.client.channels.get(channel_id); if (!channel_id) {
connection.setSessionID(session_id); connection._disconnect();
this.connections.delete(guild_id);
return;
} }
connection.channel = this.client.channels.get(channel_id);
connection.setSessionID(session_id);
} }
/** /**

10
src/client/voice/VoiceConnection.js
View file

@ -312,6 +312,15 @@ class VoiceConnection extends EventEmitter {
this.sendVoiceStateUpdate({ this.sendVoiceStateUpdate({
channel_id: null, channel_id: null,
}); });
this._disconnect();
}
/**
* Internally disconnects (doesn't send disconnect packet).
* @private
*/
_disconnect() {
this.player.destroy(); this.player.destroy();
this.cleanup(); this.cleanup();
this.status = Constants.VoiceStatus.DISCONNECTED; this.status = Constants.VoiceStatus.DISCONNECTED;
@ -334,6 +343,7 @@ class VoiceConnection extends EventEmitter {
ws.removeAllListeners('ready'); ws.removeAllListeners('ready');
ws.removeAllListeners('sessionDescription'); ws.removeAllListeners('sessionDescription');
ws.removeAllListeners('speaking'); ws.removeAllListeners('speaking');
ws.shutdown();
} }
if (udp) udp.removeAllListeners('error'); if (udp) udp.removeAllListeners('error');

2
src/client/websocket/packets/handlers/VoiceStateUpdate.js
View file

@ -20,7 +20,7 @@ class VoiceStateUpdateHandler extends AbstractHandler {
// If the member left the voice channel, unset their speaking property // If the member left the voice channel, unset their speaking property
if (!data.channel_id) member.speaking = null; if (!data.channel_id) member.speaking = null;
if (member.user.id === client.user.id && data.channel_id) { if (member.user.id === client.user.id) {
client.emit('self.voiceStateUpdate', data); client.emit('self.voiceStateUpdate', data);
} }