Merge branch 'main' of https://git.raphix.fr/subsonics/chopin

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "chopin-backend",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "chopin-backend",
-      "version": "1.1.1",
+      "version": "1.1.2",
       "license": "ISC",
       "dependencies": {
         "@discordjs/voice": "^0.18.0",

src/player/Method/Youtube.js

@@ -25,8 +25,13 @@ async function getStream(song) {
             'Accept-Language': 'en-US,en;q=0.9',
             'Cookie': cookiesArrayToHeaderString(cookies)
         };
+<<<<<<< HEAD
+            var cookies = await JSON.parse(await fs.readFileSync(__glob.COOKIES, 'utf-8'));
+          ytdl.createAgent(cookies)
+=======
  
     
+>>>>>>> 914edbbf1337acbbfa0e797d54b3d66cd255642e
           let stream = ytdl(song.url, { 
                quality: 'highestaudio',
                highWaterMark: 1 << 30,
@@ -35,7 +40,10 @@ async function getStream(song) {
                bitrate: 128,
                requestOptions: {
                    headers: headers,
+<<<<<<< HEAD
+=======
                     
+>>>>>>> 914edbbf1337acbbfa0e797d54b3d66cd255642e
                }
           });