KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly fetching video-info on error for youtube

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2019-04-06 14:37:03 +02:00
parent 50704be17b
commit 7bab1fac16
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/handlers/list.js
View File

@@ -194,12 +194,12 @@ function skip(list, guid, coll, offline, socket, callback) {
err = list.error; err = list.error;
Search.check_if_error_or_blocked(video_id, coll, err == "5" || err == "100" || err == "101" || err == "150", function(trueError) { Search.check_if_error_or_blocked(video_id, coll, err == "5" || err == "100" || err == "101" || err == "150", function(trueError) {
var error = false; var error = false;
if(!trueError) if (!trueError) {
{
adminpass = list.pass; adminpass = list.pass;
}else if(trueError){ } else if(trueError) {
error = true; error = true;
} }
error = false;
hash = adminpass; hash = adminpass;
//db.collection(coll + "_settings").find(function(err, docs){ //db.collection(coll + "_settings").find(function(err, docs){
var strictSkip = false; 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[0].strictSkipNumber) strictSkipNumber = docs[0].strictSkipNumber;
if(docs !== null && docs.length !== 0) if(docs !== null && docs.length !== 0)
{ {
if(!docs[0].skip || (docs[0].adminpass == hash && docs[0].adminpass !== "") || error) if(!docs[0].skip || (docs[0].adminpass == hash && docs[0].adminpass !== "") || error)
{ {
db.collection("frontpage_lists").find({"_id": coll}, function(err, frontpage_viewers){ db.collection("frontpage_lists").find({"_id": coll}, function(err, frontpage_viewers){
if( if(
(strictSkip && (error || (docs[0].adminpass == hash && docs[0].adminpass !== "") || (docs[0].skips.length+1 >= strictSkipNumber))) || (strictSkip && (error || (docs[0].adminpass == hash && docs[0].adminpass !== "") || (docs[0].skips.length+1 >= strictSkipNumber))) ||

4
server/handlers/search.js
View File

@@ -26,14 +26,14 @@ function check_if_error_or_blocked(id, channel, errored, callback) {
if(song_info.source != "soundcloud") { if(song_info.source != "soundcloud") {
request({ request({
type: "GET", 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) { }, function(error, response, body) {
try { try {
var resp = JSON.parse(body); var resp = JSON.parse(body);
if(resp.pageInfo.totalResults == 0) { if(resp.pageInfo.totalResults == 0) {
callback(true); callback(true);
return; return;
} else if(!resp.status.embeddable) { } else if(!resp.items[0].status.embeddable) {
callback(true); callback(true);
return; return;
} }

4
server/public/assets/js/player.js
View File

@@ -1,5 +1,4 @@
var Player = { var Player = {
loaded: true, loaded: true,
before_load: "", before_load: "",
after_load: "", after_load: "",
@@ -429,7 +428,7 @@ var Player = {
}, },
soundcloudError: function() { soundcloudError: function() {
Player.errorHandler({data: "5"}); Player.errorHandler({data: 5});
}, },
addSCWidgetElements: function() { addSCWidgetElements: function() {
@@ -1285,5 +1284,4 @@ var Player = {
firstScriptTagSCWidget.parentNode.insertBefore(tagSCWidget, firstScriptTagSCWidget); firstScriptTagSCWidget.parentNode.insertBefore(tagSCWidget, firstScriptTagSCWidget);
} }
} }
}; };