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 strict-skip errors not working correctly

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2019-02-26 21:48:45 +01:00
parent e111c9e2ca
commit b3dc00abb1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/handlers/list.js
View File

@@ -198,7 +198,6 @@ function skip(list, guid, coll, offline, socket, callback) {
}else if(err == "5" || err == "100" || err == "101" || err == "150"){ }else if(err == "5" || err == "100" || err == "101" || err == "150"){
error = true; error = true;
} }
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;
@@ -207,11 +206,13 @@ 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 && ((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) || (!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)) || (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)))) (docs[0].adminpass == hash && docs[0].adminpass !== "" && docs[0].skip))))