From 83140f11b729bcd55ca1c874a17e9a18b20617cb Mon Sep 17 00:00:00 2001
From: Amish Shah <amishshah.2k@gmail.com>
Date: Fri, 19 Jan 2018 22:41:31 +0000
Subject: [PATCH] Fix ESLint and inline the voice readable stream

---
 src/client/voice/receiver/PacketHandler.js | 7 ++++---
 src/client/voice/receiver/Receiver.js      | 3 +--
 src/client/voice/receiver/VoiceReadable.js | 8 +-------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/client/voice/receiver/PacketHandler.js b/src/client/voice/receiver/PacketHandler.js
index 27e094557..8fcd3d089 100644
--- a/src/client/voice/receiver/PacketHandler.js
+++ b/src/client/voice/receiver/PacketHandler.js
@@ -1,7 +1,8 @@
 const nonce = Buffer.alloc(24);
-const Readable = require('./VoiceReadable');
 const secretbox = require('../util/Secretbox');
 
+class Readable extends require('stream').Readable { _read() {} } // eslint-disable-line no-empty-function
+
 class PacketHandler {
   constructor(receiver) {
     this.receiver = receiver;
@@ -16,13 +17,13 @@ class PacketHandler {
   }
 
   parseBuffer(buffer) {
-    // reuse nonce
+    // Reuse nonce buffer
     buffer.copy(nonce, 0, 0, 12);
 
     let packet = secretbox.methods.open(buffer.slice(12), nonce, this.receiver.connection.authentication.secretKey);
     if (!packet) return Error('Failed to decrypt voice packet');
     packet = Buffer.from(packet);
-  
+
     // Strip RTP Header Extensions (one-byte only)
     if (packet[0] === 0xBE && packet[1] === 0xDE && packet.length > 4) {
       const headerExtensionLength = packet.readUInt16BE(2);
diff --git a/src/client/voice/receiver/Receiver.js b/src/client/voice/receiver/Receiver.js
index 07163ab23..6e63ade5a 100644
--- a/src/client/voice/receiver/Receiver.js
+++ b/src/client/voice/receiver/Receiver.js
@@ -13,7 +13,6 @@ class VoiceReceiver extends EventEmitter {
   createStream(user, { mode = 'opus' } = {}) {
     user = this.connection.client.users.resolve(user);
     if (!user) throw new Error('VOICE_USER_MISSING');
-    console.log('making stream for', user.tag);
     const stream = this.packets.makeStream(user.id);
     if (mode === 'pcm') {
       const decoder = new prism.opus.Decoder({ channels: 2, rate: 48000, frameSize: 1920 });
@@ -24,7 +23,7 @@ class VoiceReceiver extends EventEmitter {
   }
 
   stoppedSpeaking() {
-    console.log('remember to remove this :)');
+    return false;
   }
 }
 
diff --git a/src/client/voice/receiver/VoiceReadable.js b/src/client/voice/receiver/VoiceReadable.js
index 0c4665dbc..db27bf9f5 100644
--- a/src/client/voice/receiver/VoiceReadable.js
+++ b/src/client/voice/receiver/VoiceReadable.js
@@ -1,11 +1,5 @@
 const { Readable } = require('stream');
 
-class VoiceReadable extends Readable {
-  constructor() {
-    super();
-  }
-
-  _read() {} // eslint-disable-line no-empty-function
-}
+class VoiceReadable extends Readable { _read() {} } // eslint-disable-line no-empty-function
 
 module.exports = VoiceReadable;