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

Removed the 10 second delay on skipping

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-05-12 12:28:32 +02:00
parent 9db2a40ab1
commit 0b0db50bdf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/server.js
View File

@@ -314,16 +314,16 @@ io.on('connection', function(socket){
{ {
if(!docs[0]["skip"] || (docs[0]["adminpass"] == hash && docs[0]["adminpass"] != "") || error) 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 if((lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid))
|| lists[coll].length != 2)) || (docs[0]["adminpass"] == adminpass && docs[0]["adminpass"] != "")) || (docs[0]["adminpass"] == adminpass && docs[0]["adminpass"] != ""))
{ {
change_song(coll); change_song(coll);
socket.emit("toast", "skip"); socket.emit("toast", "skip");
io.sockets.emit('chat,'+coll, rndName(guid) + " skipped"); 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"); 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){ 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.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"); socket.broadcast.emit('chat,'+coll, rndName(guid) + " voted to skip");