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 code that made dead listeners, and added so admins can now skip. The only admins can skip is now functional

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-05-06 11:33:01 +02:00
parent 9736a3baa7
commit 1d5f539dcf
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/server.js
View File

@@ -271,6 +271,7 @@ io.on('connection', function(socket){
{ {
pw = inp[0]; pw = inp[0];
coll = inp[1]; coll = inp[1];
guid = inp[2];
if(lists[coll] == undefined) if(lists[coll] == undefined)
{ {
lists[coll] = []; lists[coll] = [];
@@ -308,11 +309,22 @@ io.on('connection', function(socket){
io.sockets.emit(coll+",viewers", lists[coll].length); io.sockets.emit(coll+",viewers", lists[coll].length);
} }
db.collection(coll).find({skip: false}, function(err, docs){ adminpass = list[2];
if(docs.length == 1)
console.log(adminpass);
if(adminpass !== undefined && adminpass !== null)
var hash = hash_pass(adminpass);
else
var hash = "";
db.collection(coll).find({views: {$exists:true}}, function(err, docs){
console.log(adminpass);
console.log(docs[0]["adminpass"]);
if(!docs[0]["skip"] || (docs[0]["adminpass"] == hash && docs[0]["adminpass"] != ""))
{ {
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)) || lists[coll].length != 2)) || (docs[0]["adminpass"] == adminpass && docs[0]["adminpass"] != ""))
{ {
change_song(coll); change_song(coll);
socket.emit("toast", "skip"); socket.emit("toast", "skip");

2
static/js/list.js
View File

@@ -120,7 +120,7 @@ function vote(id, vote){
} }
function skip(){ function skip(){
socket.emit('skip', [chan, guid]); socket.emit('skip', [chan, guid, localStorage[chan.toLowerCase()]]);
return true; return true;
} }

2
static/js/youtube.js
View File

@@ -96,7 +96,7 @@ $(document).ready(function()
if(localStorage[chan.toLowerCase()]) if(localStorage[chan.toLowerCase()])
{ {
socket.emit("password", [localStorage[chan.toLowerCase()], chan.toLowerCase()]); socket.emit("password", [localStorage[chan.toLowerCase()], chan.toLowerCase(), guid]);
} }
if($("#chan").html().toLowerCase() == "jazz") if($("#chan").html().toLowerCase() == "jazz")