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

Fixed message about trying to skip

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-05-09 12:56:20 +02:00
parent 21ee0667eb
commit 377aae0c78
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/server.js
View File

@@ -323,10 +323,10 @@ io.on('connection', function(socket){
}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) && get_time() - docs[0]["startTime"] >= 30){ }else if(!contains(docs[0]["skips"], guid) && get_time() - docs[0]["startTime"] >= 10){
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!");
io.sockets.emit('chat,'+coll, rndName(guid) + " tried to skip!"); socket.broadcast.emit('chat,'+coll, rndName(guid) + " tried to skip!");
}); });
}else{ }else{
socket.emit("toast", "alreadyskip"); socket.emit("toast", "alreadyskip");
@@ -492,7 +492,6 @@ function vote(coll, id, guid, socket)
db.collection(coll).update({id:id}, {$push :{guids: guid}}, function(err, docs) db.collection(coll).update({id:id}, {$push :{guids: guid}}, function(err, docs)
{ {
socket.emit("toast", "voted"); socket.emit("toast", "voted");
socket.broadcast.emit('chat,'+coll, rndName(guid) + " voted to skip");
sort_list(coll, undefined, false, true); sort_list(coll, undefined, false, true);
}); });
//sort_list(coll, undefined, false); //sort_list(coll, undefined, false);