From b3dc00abb19521cbb7b8340478849174008ca700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 26 Feb 2019 21:48:45 +0100 Subject: [PATCH 1/3] Fix for strict-skip errors not working correctly --- server/handlers/list.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/handlers/list.js b/server/handlers/list.js index 9d0f1e9d..5e805d64 100644 --- a/server/handlers/list.js +++ b/server/handlers/list.js @@ -198,7 +198,6 @@ function skip(list, guid, coll, offline, socket, callback) { }else if(err == "5" || err == "100" || err == "101" || err == "150"){ error = true; } - hash = adminpass; //db.collection(coll + "_settings").find(function(err, docs){ var strictSkip = false; @@ -207,11 +206,13 @@ 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 && ((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))) || (!strictSkip && ((frontpage_viewers[0].viewers/2 <= docs[0].skips.length+1 && !Functions.contains(docs[0].skips, guid) && frontpage_viewers[0].viewers != 2) || (frontpage_viewers[0].viewers == 2 && docs[0].skips.length+1 == 2 && !Functions.contains(docs[0].skips, guid)) || (docs[0].adminpass == hash && docs[0].adminpass !== "" && docs[0].skip)))) From f5a992dde08ec64fc8937406c9a065256f4db731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 27 Feb 2019 17:07:53 +0100 Subject: [PATCH 2/3] Update list_change.js --- server/handlers/list_change.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js index a99e12d7..aed7b49c 100644 --- a/server/handlers/list_change.js +++ b/server/handlers/list_change.js @@ -319,8 +319,7 @@ function add_function(arr, coll, guid, offline, socket) { var socketid = socket.zoff_id; if(typeof(arr) === 'object' && arr !== undefined && arr !== null && arr !== "" && !isNaN(parseInt(arr.duration))) { - if(coll == "" || coll == undefined || coll == null || - !arr.hasOwnProperty("start") || !arr.hasOwnProperty("end")) { + if(coll == "" || coll == undefined || coll == null || !arr.hasOwnProperty("duration")) { var result = { start: { expected: "number or string that can be cast to int", @@ -336,6 +335,8 @@ function add_function(arr, coll, guid, offline, socket) { } try { + if(arr.start == undefined) arr.start = 0; + if(arr.end == undefined) arr.end = parseInt(arr.duration); var start = parseInt(arr.start); var end = parseInt(arr.end); if(start < 0) { From 4ba9d0bca3f0c3666bb2d7e6879fdbdada756800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 28 Feb 2019 17:02:20 +0100 Subject: [PATCH 3/3] Update list_change.js --- server/handlers/list_change.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js index aed7b49c..b707a51d 100644 --- a/server/handlers/list_change.js +++ b/server/handlers/list_change.js @@ -355,11 +355,13 @@ function add_function(arr, coll, guid, offline, socket) { return; } + if(!arr.hasOwnProperty("source")) { + arr.source = "youtube"; + } if(typeof(arr.id) != "string" || typeof(arr.start) != "number" || typeof(arr.end) != "number" || typeof(arr.title) != "string" || typeof(arr.list) != "string" || typeof(arr.duration) != "number" || - typeof(arr.source) != "string" || (arr.source == "soundcloud" && (!arr.hasOwnProperty("thumbnail") || !Functions.isUrl(arr.thumbnail)))) { var result = { start: {