KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 20:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added timeout for skips for 1 second

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-09-28 13:56:05 +02:00
parent b3825bd093
commit 2563b3c4f1
1 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
server/handlers/list.js
View File

@@ -182,7 +182,6 @@ function skip(list, guid, coll, offline, socket) {
db.collection(coll + "_settings").find(function(err, docs){ db.collection(coll + "_settings").find(function(err, docs){
if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (list.hasOwnProperty('userpass') && docs[0].userpass == list.userpass))) { if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (list.hasOwnProperty('userpass') && docs[0].userpass == list.userpass))) {
Functions.check_inlist(coll, guid, socket, offline, undefined, "place 12"); Functions.check_inlist(coll, guid, socket, offline, undefined, "place 12");
adminpass = ""; adminpass = "";
@@ -198,47 +197,49 @@ function skip(list, guid, coll, offline, socket) {
} }
hash = adminpass; hash = adminpass;
var toCompare = list.error
Functions.checkTimeout("skip", 1, coll, coll, error, true, socket, function() {
//db.collection(coll + "_settings").find(function(err, docs){
//db.collection(coll + "_settings").find(function(err, docs){ if(docs !== null && docs.length !== 0)
if(docs !== null && docs.length !== 0)
{
if(!docs[0].skip || (docs[0].adminpass == hash && docs[0].adminpass !== "") || error)
{ {
db.collection("frontpage_lists").find({"_id": coll}, function(err, frontpage_viewers){ if(!docs[0].skip || (docs[0].adminpass == hash && docs[0].adminpass !== "") || error)
if((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)) || db.collection("frontpage_lists").find({"_id": coll}, function(err, frontpage_viewers){
(docs[0].adminpass == hash && docs[0].adminpass !== "" && docs[0].skip)) if((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)) ||
change_song(coll, error, video_id, docs); (docs[0].adminpass == hash && docs[0].adminpass !== "" && docs[0].skip))
socket.emit("toast", "skip"); {
db.collection("user_names").find({"guid": guid}, function(err, docs) { change_song(coll, error, video_id, docs);
if(docs.length == 1) { socket.emit("toast", "skip");
db.collection("registered_users").find({"_id": docs[0].name}, function(err, n) { db.collection("user_names").find({"guid": guid}, function(err, docs) {
var icon = false; if(docs.length == 1) {
if(n.length > 0 && n[0].icon) { db.collection("registered_users").find({"_id": docs[0].name}, function(err, n) {
icon = n[0].icon; var icon = false;
} if(n.length > 0 && n[0].icon) {
io.to(coll).emit('chat', {from: docs[0].name, icon: icon, msg: " skipped"}); icon = n[0].icon;
}); }
} io.to(coll).emit('chat', {from: docs[0].name, icon: icon, msg: " skipped"});
}); });
}else if(!Functions.contains(docs[0].skips, guid)){ }
db.collection(coll + "_settings").update({ id: "config" }, {$push:{skips:guid}}, function(err, d){ });
if(frontpage_viewers[0].viewers == 2) }else if(!Functions.contains(docs[0].skips, guid)){
to_skip = 1; db.collection(coll + "_settings").update({ id: "config" }, {$push:{skips:guid}}, function(err, d){
else if(frontpage_viewers[0].viewers == 2)
to_skip = (Math.ceil(frontpage_viewers[0].viewers/2) - docs[0].skips.length-1); to_skip = 1;
socket.emit("toast", to_skip + " more are needed to skip!"); else
socket.to(coll).emit('chat', {from: name, msg: " voted to skip"}); to_skip = (Math.ceil(frontpage_viewers[0].viewers/2) - docs[0].skips.length-1);
}); socket.emit("toast", to_skip + " more are needed to skip!");
}else{ socket.to(coll).emit('chat', {from: name, msg: " voted to skip"});
socket.emit("toast", "alreadyskip"); });
} }else{
}); socket.emit("toast", "alreadyskip");
}else }
socket.emit("toast", "noskip"); });
} }else
socket.emit("toast", "noskip");
}
});
//}); //});
} else { } else {
socket.emit("auth_required"); socket.emit("auth_required");