From 7bab1fac161326c027d36c27160448f0a5922607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Sat, 6 Apr 2019 14:37:03 +0200
Subject: [PATCH] Correctly fetching video-info on error for youtube

---
 server/handlers/list.js           | 8 +++-----
 server/handlers/search.js         | 4 ++--
 server/public/assets/js/player.js | 4 +---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/server/handlers/list.js b/server/handlers/list.js
index c802c353..ecacafdc 100644
--- a/server/handlers/list.js
+++ b/server/handlers/list.js
@@ -194,12 +194,12 @@ function skip(list, guid, coll, offline, socket, callback) {
                     err       = list.error;
                     Search.check_if_error_or_blocked(video_id, coll, err == "5" || err == "100" || err == "101" || err == "150", function(trueError) {
                         var error = false;
-                        if(!trueError)
-                        {
+                        if (!trueError) {
                             adminpass = list.pass;
-                        }else if(trueError){
+                        } else if(trueError) {
                             error = true;
                         }
+                        error = false;
                         hash = adminpass;
                         //db.collection(coll + "_settings").find(function(err, docs){
                         var strictSkip = false;
@@ -208,10 +208,8 @@ function skip(list, guid, coll, offline, socket, callback) {
                         if(docs[0].strictSkipNumber) strictSkipNumber = docs[0].strictSkipNumber;
                         if(docs !== null && docs.length !== 0)
                         {
-
                             if(!docs[0].skip || (docs[0].adminpass == hash && docs[0].adminpass !== "") || error)
                             {
-
                                 db.collection("frontpage_lists").find({"_id": coll}, function(err, frontpage_viewers){
                                     if(
                                         (strictSkip && (error || (docs[0].adminpass == hash && docs[0].adminpass !== "") || (docs[0].skips.length+1 >= strictSkipNumber))) ||
diff --git a/server/handlers/search.js b/server/handlers/search.js
index 65151aff..24d7edff 100644
--- a/server/handlers/search.js
+++ b/server/handlers/search.js
@@ -26,14 +26,14 @@ function check_if_error_or_blocked(id, channel, errored, callback) {
         if(song_info.source != "soundcloud") {
             request({
                 type: "GET",
-                url: "https://www.googleapis.com/youtube/v3/videos?part=id,status,contentDetails&key="+key+"&id=" + song_info.id,
+                url: "https://www.googleapis.com/youtube/v3/videos?part=id,status&key="+key+"&id=" + song_info.id,
             }, function(error, response, body) {
                 try {
                     var resp = JSON.parse(body);
                     if(resp.pageInfo.totalResults == 0) {
                         callback(true);
                         return;
-                    } else if(!resp.status.embeddable) {
+                    } else if(!resp.items[0].status.embeddable) {
                         callback(true);
                         return;
                     }
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index fa79ee2c..3c11a1bf 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -1,5 +1,4 @@
 var Player = {
-
     loaded: true,
     before_load: "",
     after_load: "",
@@ -429,7 +428,7 @@ var Player = {
     },
 
     soundcloudError: function() {
-        Player.errorHandler({data: "5"});
+        Player.errorHandler({data: 5});
     },
 
     addSCWidgetElements: function() {
@@ -1285,5 +1284,4 @@ var Player = {
             firstScriptTagSCWidget.parentNode.insertBefore(tagSCWidget, firstScriptTagSCWidget);
         }
     }
-
 };