From 0b0db50bdf7b5f5f1585b4beab4cecfcfe671418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 12 May 2015 12:28:32 +0200 Subject: [PATCH] Removed the 10 second delay on skipping --- server/server.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/server.js b/server/server.js index 583e1a98..0ed23b52 100755 --- a/server/server.js +++ b/server/server.js @@ -314,16 +314,16 @@ io.on('connection', function(socket){ { if(!docs[0]["skip"] || (docs[0]["adminpass"] == hash && docs[0]["adminpass"] != "") || error) { - if((lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid) && (get_time() - docs[0]["startTime"] >= 10 - || lists[coll].length != 2)) || (docs[0]["adminpass"] == adminpass && docs[0]["adminpass"] != "")) + if((lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid)) + || (docs[0]["adminpass"] == adminpass && docs[0]["adminpass"] != "")) { change_song(coll); socket.emit("toast", "skip"); io.sockets.emit('chat,'+coll, rndName(guid) + " skipped"); - }else if(get_time() - docs[0]["startTime"] < 10 && lists[coll].length == 2 && !error) + }/*else if(get_time() - docs[0]["startTime"] < 10 && lists[coll].length == 2 && !error) { socket.emit("toast", "notyetskip"); - }else if(!contains(docs[0]["skips"], guid)){ + }*/else if(!contains(docs[0]["skips"], guid)){ db.collection(coll).update({views:{$exists:true}}, {$push:{skips:guid}}, function(err, d){ socket.emit("toast", (Math.ceil(lists[coll].length/2) - docs[0]["skips"].length-1) + " more are needed to skip!"); socket.broadcast.emit('chat,'+coll, rndName(guid) + " voted to skip");