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

Fix for error-video in list not being updated when replaced

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2019-04-06 17:50:45 +02:00
parent 632bcef2ef
commit 39d10745a1
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/handlers/list.js
View File

@@ -199,7 +199,6 @@ function skip(list, guid, coll, offline, socket, callback) {
} 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;

13
server/handlers/search.js
View File

@@ -11,6 +11,7 @@ try {
} }
var request = require('request'); var request = require('request');
var db = require(pathThumbnails + '/handlers/db.js'); var db = require(pathThumbnails + '/handlers/db.js');
var countryCodes = ["US", "NO", "SE", "DK", "CA", "EU", "UK"];
function check_if_error_or_blocked(id, channel, errored, callback) { function check_if_error_or_blocked(id, channel, errored, callback) {
if(!errored) { if(!errored) {
@@ -26,7 +27,7 @@ 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&key="+key+"&id=" + song_info.id, url: "https://www.googleapis.com/youtube/v3/videos?part=id,status,contentDetails&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);
@@ -36,6 +37,16 @@ function check_if_error_or_blocked(id, channel, errored, callback) {
} else if(!resp.items[0].status.embeddable) { } else if(!resp.items[0].status.embeddable) {
callback(true); callback(true);
return; return;
} else if(resp.items[0].contentDetails.hasOwnProperty("regionRestriction") &&
resp.items[0].contentDetails.regionRestriction.hasOwnProperty("blocked") &&
resp.items[0].contentDetails.regionRestriction.blocked.length > 0) {
var any = resp.items[0].contentDetails.blocked.some(function(element) {
return countryCodes.indexOf(element) > -1;
});
if(any) {
callback(true);
return;
}
} }
callback(false); callback(false);
return; return;

24
server/public/assets/js/list.js
View File

@@ -86,13 +86,13 @@ var List = {
changedValues: function(song) { changedValues: function(song) {
if(song.type == "suggested") { if(song.type == "suggested") {
try { try {
document.getElementById("#suggested-" + song.id).querySelector(".vote-container").setAttribute("title", song.title); document.querySelector("#suggested-" + song.id).querySelector(".vote-container").setAttribute("title", song.title);
document.getElementById("#suggested-" + song.id).querySelector(".list-title").setAttribute("title", song.title); document.querySelector("#suggested-" + song.id).querySelector(".list-title").setAttribute("title", song.title);
document.getElementById("#suggested-" + song.id).querySelector(".list-title").innerText = song.title; document.querySelector("#suggested-" + song.id).querySelector(".list-title").innerText = song.title;
var _temp_duration = Helper.secondsToOther(song.duration); var _temp_duration = Helper.secondsToOther(song.duration);
document.getElementById("#suggested-" + song.id).querySelector(".card-duration").innerText = Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1]); document.querySelector("#suggested-" + song.id).querySelector(".card-duration").innerText = Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1]);
document.getElementById("#suggested-" + song.id).querySelector(".list-image").setAttribute("style", "background-image:url('//img.youtube.com/vi/"+song.new_id+"/mqdefault.jpg');"); document.querySelector("#suggested-" + song.id).querySelector(".list-image").setAttribute("style", "background-image:url('//img.youtube.com/vi/"+song.new_id+"/mqdefault.jpg');");
document.getElementById("#suggested-" + song.id).setAttribute("id", song.new_id); document.querySelector("#suggested-" + song.id).setAttribute("id", song.new_id);
} catch(e) {} } catch(e) {}
return; return;
} }
@@ -104,13 +104,13 @@ var List = {
full_playlist[i].end = song.end; full_playlist[i].end = song.end;
full_playlist[i].id = song.new_id; full_playlist[i].id = song.new_id;
try { try {
document.getElementById("#" + song.id).querySelector(".vote-container").setAttribute("title", song.title); document.querySelector("#" + song.id).querySelector(".vote-container").setAttribute("title", song.title);
document.getElementById("#" + song.id).querySelector(".list-title").setAttribute("title", song.title); document.querySelector("#" + song.id).querySelector(".list-title").setAttribute("title", song.title);
document.getElementById("#" + song.id).querySelector(".list-title").innerText = song.title; document.querySelector("#" + song.id).querySelector(".list-title").innerText = song.title;
var _temp_duration = Helper.secondsToOther(song.duration); var _temp_duration = Helper.secondsToOther(song.duration);
document.getElementById("#" + song.id).querySelector(".card-duration").innerText = Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1]); document.querySelector("#" + song.id).querySelector(".card-duration").innerText = Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1]);
document.getElementById("#" + song.id).querySelector(".list-image").setAttribute("style", "background-image:url('//img.youtube.com/vi/"+song.new_id+"/mqdefault.jpg');"); document.querySelector("#" + song.id).querySelector(".list-image").setAttribute("style", "background-image:url('//img.youtube.com/vi/"+song.new_id+"/mqdefault.jpg');");
document.getElementById("#" + song.id).setAttribute("id", song.new_id); document.querySelector("#" + song.id).setAttribute("id", song.new_id);
} catch(e) {} } catch(e) {}
} }
}, },