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

Reword skipping in channel, allowing the whole channel to be skipped each second

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-09-29 10:36:44 +02:00
parent ae05344aa1
commit 695a4f3648
2 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/handlers/functions.js
View File

@@ -452,7 +452,8 @@ function checkTimeout(type, timeout, channel, guid, conf_pass, this_pass, socket
var retry_in = (date.getTime() - now.getTime()) / 1000; var retry_in = (date.getTime() - now.getTime()) / 1000;
if(retry_in > 0) { if(retry_in > 0) {
if(error_message) { if(error_message) {
socket.emit("toast", error_message + Math.ceil(retry_in) + " seconds."); var sOrNot = Math.ceil(retry_in) > 1 || Math.ceil(retry_in) == 0 ? "s" : "";
socket.emit("toast", error_message + Math.ceil(retry_in) + " second" + sOrNot + ".");
} else { } else {
socket.emit("toast", "wait_longer"); socket.emit("toast", "wait_longer");
} }

6
server/handlers/list.js
View File

@@ -197,9 +197,6 @@ function skip(list, guid, coll, offline, socket) {
} }
hash = adminpass; hash = adminpass;
var toCompare = list.error
var connection_id = Functions.hash_pass(socket.handshake.headers["user-agent"] + socket.handshake.address + socket.handshake.headers["accept-language"]);
Functions.checkTimeout("skip", 1, coll, connection_id, 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)
@@ -211,6 +208,7 @@ function skip(list, guid, coll, offline, socket) {
(frontpage_viewers[0].viewers == 2 && docs[0].skips.length+1 == 2 && !Functions.contains(docs[0].skips, guid)) || (frontpage_viewers[0].viewers == 2 && docs[0].skips.length+1 == 2 && !Functions.contains(docs[0].skips, guid)) ||
(docs[0].adminpass == hash && docs[0].adminpass !== "" && docs[0].skip)) (docs[0].adminpass == hash && docs[0].adminpass !== "" && docs[0].skip))
{ {
Functions.checkTimeout("skip", 1, coll, coll, error, true, socket, function() {
change_song(coll, error, video_id, docs); change_song(coll, error, video_id, docs);
socket.emit("toast", "skip"); socket.emit("toast", "skip");
db.collection("user_names").find({"guid": guid}, function(err, docs) { db.collection("user_names").find({"guid": guid}, function(err, docs) {
@@ -224,6 +222,7 @@ function skip(list, guid, coll, offline, socket) {
}); });
} }
}); });
}, "The channel is skipping too often, please wait ");
}else if(!Functions.contains(docs[0].skips, guid)){ }else if(!Functions.contains(docs[0].skips, guid)){
db.collection(coll + "_settings").update({ id: "config" }, {$push:{skips:guid}}, function(err, d){ db.collection(coll + "_settings").update({ id: "config" }, {$push:{skips:guid}}, function(err, d){
if(frontpage_viewers[0].viewers == 2) if(frontpage_viewers[0].viewers == 2)
@@ -240,7 +239,6 @@ function skip(list, guid, coll, offline, socket) {
}else }else
socket.emit("toast", "noskip"); socket.emit("toast", "noskip");
} }
});
//}); //});
} else { } else {
socket.emit("auth_required"); socket.emit("auth_required");