From 1d5f539dcf2a6a90bc6aa0e1a5315cb989ce9b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Wed, 6 May 2015 11:33:01 +0200
Subject: [PATCH] Removed code that made dead listeners, and added so admins
 can now skip. The only admins can skip is now functional

---
 server/server.js     | 20 ++++++++++++++++----
 static/js/list.js    |  2 +-
 static/js/youtube.js |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/server/server.js b/server/server.js
index f98d1c0c..dd269ac6 100755
--- a/server/server.js
+++ b/server/server.js
@@ -271,6 +271,7 @@ io.on('connection', function(socket){
   {
     pw = inp[0];
     coll = inp[1];
+    guid = inp[2];
     if(lists[coll] == undefined)
     {
     	lists[coll] = [];
@@ -308,11 +309,22 @@ io.on('connection', function(socket){
       io.sockets.emit(coll+",viewers", lists[coll].length);
     }
 
-  	db.collection(coll).find({skip: false}, function(err, docs){
-  		if(docs.length == 1)
+    adminpass = list[2];
+
+    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
-         || lists[coll].length != 2))
+  			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)) || (docs[0]["adminpass"] == adminpass && docs[0]["adminpass"] != ""))
   			{
   				change_song(coll);
           socket.emit("toast", "skip");
diff --git a/static/js/list.js b/static/js/list.js
index 437f398d..f06cf968 100755
--- a/static/js/list.js
+++ b/static/js/list.js
@@ -120,7 +120,7 @@ function vote(id, vote){
 }
 
 function skip(){
-	socket.emit('skip', [chan, guid]);
+	socket.emit('skip', [chan, guid, localStorage[chan.toLowerCase()]]);
 	return true;
 }
 
diff --git a/static/js/youtube.js b/static/js/youtube.js
index 0f92dce6..7d22f407 100755
--- a/static/js/youtube.js
+++ b/static/js/youtube.js
@@ -96,7 +96,7 @@ $(document).ready(function()
 
 		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")