From f2a059a1a3f307479acd60711d36dceb14c570e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Thu, 16 Apr 2015 12:17:45 +0200
Subject: [PATCH 1/5] Fixed when it is changing song twice

---
 server/server.js | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/server/server.js b/server/server.js
index a8cb36b9..89f24ede 100755
--- a/server/server.js
+++ b/server/server.js
@@ -324,7 +324,7 @@ function vote(coll, id, guid, socket)
 }
 
 
-function change_song(coll)
+function change_song(coll, id)
 {
   db.collection(coll).find({views:{$exists:true}}, function(err, docs){
     if(docs[0]["removeplay"] == true)
@@ -335,15 +335,27 @@ function change_song(coll)
       })
     }else
     {
-      db.collection(coll).update({now_playing:true},
-        {$set:{
-          now_playing:false,
-          votes:0,
-          guids:[]
-        }}, function(err, docs)
-        {
-            change_song_post(coll);
-      });
+      if(id === undefined){
+        db.collection(coll).update({now_playing:true},
+          {$set:{
+            now_playing:false,
+            votes:0,
+            guids:[]
+          }}, function(err, docs)
+          {
+              change_song_post(coll);
+        });
+      }else{
+        db.collection(coll).update({now_playing:true, id:id},
+          {$set:{
+            now_playing:false,
+            votes:0,
+            guids:[]
+          }}, function(err, docs)
+          {
+              change_song_post(coll);
+        });
+      }
     }
   })
 }

From 5b13ae1a58a41465ec49d7f7ec5fceee769eeceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Thu, 16 Apr 2015 12:34:14 +0200
Subject: [PATCH 2/5] logging the songchanges

---
 server/server.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/server.js b/server/server.js
index 89f24ede..181d05bf 100755
--- a/server/server.js
+++ b/server/server.js
@@ -343,6 +343,8 @@ function change_song(coll, id)
             guids:[]
           }}, function(err, docs)
           {
+              console.log(err);
+              console.log(docs);
               change_song_post(coll);
         });
       }else{
@@ -353,6 +355,8 @@ function change_song(coll, id)
             guids:[]
           }}, function(err, docs)
           {
+              console.log(err);
+              console.log(docs);
               change_song_post(coll);
         });
       }

From 6d06553e81ab9d7aec7e909ef65af9b589446c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Thu, 16 Apr 2015 12:50:21 +0200
Subject: [PATCH 3/5] Now?

---
 server/server.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/server.js b/server/server.js
index 181d05bf..b1c66fca 100755
--- a/server/server.js
+++ b/server/server.js
@@ -336,6 +336,7 @@ function change_song(coll, id)
     }else
     {
       if(id === undefined){
+        console.log("undef");
         db.collection(coll).update({now_playing:true},
           {$set:{
             now_playing:false,

From 5056b64dd298d3ce1ed3bf6fbeccd4c60920618f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Thu, 16 Apr 2015 12:53:31 +0200
Subject: [PATCH 4/5] poop

---
 server/server.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/server.js b/server/server.js
index b1c66fca..236032eb 100755
--- a/server/server.js
+++ b/server/server.js
@@ -105,7 +105,7 @@ io.on('connection', function(socket){
   {
   	db.collection(coll).find({now_playing:true}, function(err, docs){
   		if(docs.length > 0 && docs[0]["id"] == arg){
-  			change_song(coll, arg);
+  			change_song(coll, arg, docs[0]["id"]);
   		}
   	})
   });
@@ -324,7 +324,7 @@ function vote(coll, id, guid, socket)
 }
 
 
-function change_song(coll, id)
+function change_song(coll, id, np_id)
 {
   db.collection(coll).find({views:{$exists:true}}, function(err, docs){
     if(docs[0]["removeplay"] == true)
@@ -349,6 +349,8 @@ function change_song(coll, id)
               change_song_post(coll);
         });
       }else{
+        console.log(id);
+        console.log(np_id);
         db.collection(coll).update({now_playing:true, id:id},
           {$set:{
             now_playing:false,

From babdc8e61d03385d8b47b85549d8fa65d63ec6b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Thu, 16 Apr 2015 13:10:20 +0200
Subject: [PATCH 5/5] Seekto bugfix

---
 static/js/youtube.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/static/js/youtube.js b/static/js/youtube.js
index f6261747..409da3e8 100755
--- a/static/js/youtube.js
+++ b/static/js/youtube.js
@@ -64,7 +64,8 @@ socket.on(chan.toLowerCase()+",np", function(obj)
 		}
 		if(!paused)
 			ytplayer.playVideo();
-		ytplayer.seekTo(seekTo);
+		if(ytplayer.getDuration() > seekTo)
+			ytplayer.seekTo(seekTo);
 	}
 });