From 0bf93e97646c3489aece558acc91d2ed36ae2193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Mon, 3 Aug 2015 12:07:35 +0200
Subject: [PATCH] Fixed error with undefined in ids

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

diff --git a/server/server.js b/server/server.js
index 4ecbb3ae..4a11f253 100755
--- a/server/server.js
+++ b/server/server.js
@@ -79,7 +79,6 @@ io.on('connection', function(socket){
   var short_id = uniqueID(socket.id,4);
   unique_ids.push(short_id);
 
-
   socket.on('namechange', function(data)
   {
     if(name.length < 9 && name.indexOf(" ") == -1)
@@ -740,7 +739,7 @@ function contains(a, obj) {
 }
 
 function rndName(seed, len) {
-  var vowels = ['a', 'e', 'i', 'o', 'u'];
+  var vowels = ['a', 'e', 'i', 'o', 'u', 'aa', 'ae', 'oe'];
   consts =  ['b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'p', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z', 'tt', 'ch', 'sh'];
   //len = 8;
   len = Math.floor(len);
@@ -758,7 +757,7 @@ function rndName(seed, len) {
 
 function uniqueID(seed, minlen){
   var len = minlen;
-  var id = rndName(seed, len);
+  var id = rndName(seed, minlen);
 
   while( contains(unique_ids, id) && len<=8){
     id = rndName(String(len)+id, len);
diff --git a/static/js/youtube.js b/static/js/youtube.js
index 05216583..01d70ddf 100755
--- a/static/js/youtube.js
+++ b/static/js/youtube.js
@@ -113,7 +113,7 @@ var Youtube = {
             || newState.data == 101 || newState.data == 150)
     		socket.emit("skip", newState.data);
     	else if(video_id !== undefined)
-    			ytplayer.loadVideoById(video_id);
+    		ytplayer.loadVideoById(video_id);
     },
 
     onPlayerReady: function(event) {
@@ -147,7 +147,7 @@ var Youtube = {
 
     		    var colorThief = new ColorThief();
                 var color      = colorThief.getColor(img);
-                
+
     		    document.getElementsByTagName("body")[0].style.backgroundColor = Helper.rgbToHsl(color);
                 console.log(colorThief.getColor(img));
                 $("meta[name=theme-color]").attr("content", Helper.rgbToHex(color[0], color[1], color[2]));