From 479eeeea44113fcc14e3293803b7a3ae558000b7 Mon Sep 17 00:00:00 2001
From: Emily J <me@emily.im>
Date: Thu, 18 Mar 2021 13:02:59 +1100
Subject: [PATCH] SHE CNA FUCKIGN SING AGAIN

---
 package.json         |  2 +-
 src/modules/music.js | 12 +-----------
 version.json         |  2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 60372e7..fee0622 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "discord-paginator.js": "github:mudkipscience/discord-paginator.js",
     "discord.js": "^12.5.1",
     "enmap": "^5.8.4",
-    "ffmpeg-static": "^4.2.7",
+    "ffmpeg-static": "^4.2.8",
     "hastebin-gen": "^2.0.5",
     "moment": "^2.29.1",
     "moment-duration-format": "^2.3.2",
diff --git a/src/modules/music.js b/src/modules/music.js
index 7100568..0f5b2ea 100644
--- a/src/modules/music.js
+++ b/src/modules/music.js
@@ -54,8 +54,6 @@ exports.getVideoByQuery = async function (client, query, message) {
     return message.channel.send('<:error:466995152976871434> An error has occured: ' + e)
   })
 
-  console.log(parsed)
-
   if (parsed) {
     const videos = parsed
     if (videos) {
@@ -196,15 +194,7 @@ exports.play = async function (client, message, query, playNext, ignoreQueue) {
       const v = guild.queue[0]
 
       try {
-        let y = null;
-        /*setTimeout(() => {
-          if(y == null) {
-            console.log('[MUSIC DEBUG] y is still null');
-          };
-        }, 5000);*/
-        y = await ytdl(exports.getLinkFromID(v.video.videoId) || v.video.videoId, { highWaterMark: 1024 * 1024 * 32 });
-
-        guild.dispatcher = connection.play(y, { type: 'opus' });
+        guild.dispatcher = connection.play(ytdl(v.video.videoId, { type: 'opus', bitrate: 'auto' }));
       } catch (err) {
         if (playNext && playNext === true) {
           guild.queue.splice(1, 1)
diff --git a/version.json b/version.json
index 61fe8a9..b915a4c 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
 {
-    "number": "1.4.1",
+    "number": "1.4.2",
     "changelog": "**1.4 Changelog**\n> • Splatoon commands have been added! check current and upcoming maps and modes with `~splatoonmaps`, current and upcoming salmon run maps, weapons and reward gear with `~salmonrun` and see what gear is on offer in the splatnet shop with `~splatnet`!\n**Notes:**\n> • Music is still broken and likely will be until v2 is released. Fixing v1 would delay v2 a lot, sorry >.<"
 }
\ No newline at end of file