From bf8563bd7422581a8420f179a22b32b49a229a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 12 Sep 2017 10:05:23 +0200 Subject: [PATCH] Fixed issue with skip not working --- server/server.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/server.js b/server/server.js index 365bd190..4cd47296 100755 --- a/server/server.js +++ b/server/server.js @@ -930,8 +930,8 @@ io.on('connection', function(socket){ if(!docs[0].skip || (docs[0].adminpass == hash && docs[0].adminpass !== "") || error) { db.collection("frontpage_lists").find({"_id": coll}, function(err, frontpage_viewers){ - if((frontpage_viewers.viewers/2 <= docs[0].skips.length+1 && !contains(docs[0].skips, guid) && frontpage_viewers.viewers != 2) || - (frontpage_viewers.viewers == 2 && docs[0].skips.length+1 == 2 && !contains(docs[0].skips, guid)) || + if((frontpage_viewers[0].viewers/2 <= docs[0].skips.length+1 && !contains(docs[0].skips, guid) && frontpage_viewers[0].viewers != 2) || + (frontpage_viewers[0].viewers == 2 && docs[0].skips.length+1 == 2 && !contains(docs[0].skips, guid)) || (docs[0].adminpass == hash && docs[0].adminpass !== "" && docs[0].skip)) { //if(!locks[coll] || locks[coll] == undefined){ @@ -942,10 +942,10 @@ io.on('connection', function(socket){ //} }else if(!contains(docs[0].skips, guid)){ db.collection(coll).update({views:{$exists:true}}, {$push:{skips:guid}}, function(err, d){ - if(frontpage_viewers.viewers == 2) + if(frontpage_viewers[0].viewers == 2) to_skip = 1; else - to_skip = (Math.ceil(frontpage_viewers.viewers/2) - docs[0].skips.length-1); + to_skip = (Math.ceil(frontpage_viewers[0].viewers/2) - docs[0].skips.length-1); socket.emit("toast", to_skip + " more are needed to skip!"); socket.broadcast.to(coll).emit('chat', {from: name, msg: " voted to skip"}); });