From 617662c455d76dc243e9cda389c0bd35be29712a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Sun, 3 May 2015 01:45:25 +0200
Subject: [PATCH] 10 seconds instead of 20

---
 server/server.js   | 4 ++--
 static/js/admin.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/server.js b/server/server.js
index e26ecab6..31bf53c8 100755
--- a/server/server.js
+++ b/server/server.js
@@ -304,11 +304,11 @@ 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"] >= 20)
+  			if(lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid) && get_time() - docs[0]["startTime"] >= 10)
   			{
   				change_song(coll);
           socket.emit("toast", "skip");
-  			}else if(get_time() - docs[0]["startTime"] < 20)
+  			}else if(get_time() - docs[0]["startTime"] < 10)
         {
           socket.emit("toast", "notyetskip");
         }else if(!contains(docs[0]["skips"], guid) && get_time() - docs[0]["startTime"] >= 30){
diff --git a/static/js/admin.js b/static/js/admin.js
index ed16d989..28e4cbc0 100755
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -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 30 seconds of the video.";
+			msg="Skipping is disabled the first 10 seconds of the video.";
 			break;
 	}
 	Materialize.toast(msg, 4000);