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

Fixed so you can't skip the first 10 seconds of a video if there is only two viewers on the channel

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-05-03 13:26:30 +02:00
parent 15ed3884df
commit 464b9bd189
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/server.js
View File

@@ -306,11 +306,12 @@ io.on('connection', function(socket){
db.collection(coll).find({skip: false}, function(err, docs){
if(docs.length == 1)
{
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) && (get_time() - docs[0]["startTime"] >= 10
|| lists[coll].length != 2))
{
change_song(coll);
socket.emit("toast", "skip");
}else if(get_time() - docs[0]["startTime"] < 10)
}else if(get_time() - docs[0]["startTime"] < 10 && lists[coll].length == 2)
{
socket.emit("toast", "notyetskip");
}else if(!contains(docs[0]["skips"], guid) && get_time() - docs[0]["startTime"] >= 30){

2
static/js/admin.js
View File

@@ -40,7 +40,7 @@ socket.on("toast", function(msg)
msg=rnd(["Skipping is democratic, only one vote per person!", "More people have to vote to skip, not just you!", "Get someone else to skip too! You can't do it on yourself."])
break;
case "notyetskip":
msg="Skipping is disabled the first 10 seconds of the video.";
msg="Skipping is disabled the first 10 seconds.";
break;
}
Materialize.toast(msg, 4000);