From 375706beac3219ae20885681112289bb2e0c6604 Mon Sep 17 00:00:00 2001 From: Amish Shah Date: Mon, 11 Feb 2019 18:03:35 +0000 Subject: [PATCH] voice: replace self.xyz events --- src/client/actions/VoiceStateUpdate.js | 2 +- src/client/voice/ClientVoiceManager.js | 3 --- src/client/websocket/handlers/VOICE_SERVER_UPDATE.js | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/client/actions/VoiceStateUpdate.js b/src/client/actions/VoiceStateUpdate.js index 7e4d35149..045ca9319 100644 --- a/src/client/actions/VoiceStateUpdate.js +++ b/src/client/actions/VoiceStateUpdate.js @@ -27,7 +27,7 @@ class VoiceStateUpdate extends Action { // Emit event if (member && member.user.id === client.user.id && data.channel_id) { client.emit('debug', `[VOICE] received voice state update: ${JSON.stringify(data)}`); - client.emit('self.voiceStateUpdate', data); + client.voice.onVoiceStateUpdate(data); } /** diff --git a/src/client/voice/ClientVoiceManager.js b/src/client/voice/ClientVoiceManager.js index e65effdd7..466b6d664 100644 --- a/src/client/voice/ClientVoiceManager.js +++ b/src/client/voice/ClientVoiceManager.js @@ -22,9 +22,6 @@ class ClientVoiceManager { * @type {Collection} */ this.connections = new Collection(); - - this.client.on('self.voiceServer', this.onVoiceServer.bind(this)); - this.client.on('self.voiceStateUpdate', this.onVoiceStateUpdate.bind(this)); } onVoiceServer({ guild_id, token, endpoint }) { diff --git a/src/client/websocket/handlers/VOICE_SERVER_UPDATE.js b/src/client/websocket/handlers/VOICE_SERVER_UPDATE.js index 563db1ead..f9cf53433 100644 --- a/src/client/websocket/handlers/VOICE_SERVER_UPDATE.js +++ b/src/client/websocket/handlers/VOICE_SERVER_UPDATE.js @@ -2,5 +2,5 @@ module.exports = (client, packet) => { client.emit('debug', `[VOICE] received voice server: ${JSON.stringify(packet)}`); - client.emit('self.voiceServer', packet.d); + client.voice.onVoiceServer(packet.d); };