From f9e65a5ab9c386d954503141d18667f46ede173d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 13 May 2015 12:39:31 +0200 Subject: [PATCH 01/13] Added so channel of sender is on title of sender --- server/server.js | 2 +- static/js/chat.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server/server.js b/server/server.js index 14dd3a49..652d5eca 100755 --- a/server/server.js +++ b/server/server.js @@ -46,7 +46,7 @@ io.on('connection', function(socket){ { check_inlist(coll, guid, socket); if(data != "" && data !== undefined && data !== null && data.length < 151 && data.replace(/\s/g, '').length) - io.sockets.emit('chat.all', rndName(guid) + ": " + data); + io.sockets.emit('chat.all', [rndName(guid) + ": " + data, coll]); }); socket.on('frontpage_lists', function() diff --git a/static/js/chat.js b/static/js/chat.js index 94c57385..e62cf2bd 100644 --- a/static/js/chat.js +++ b/static/js/chat.js @@ -29,8 +29,10 @@ $(".chat-tab").click(function(){ $("#text-chat-input").focus(); }); -socket.on("chat.all", function(data) +socket.on("chat.all", function(inp) { + data = inp[0]; + if($("#chat-bar").position()["left"] != 0) { //$("#chat-btn").css("color", "grey"); @@ -47,7 +49,7 @@ socket.on("chat.all", function(data) unseen = true; } var color = intToARGB(hashCode(data.substring(0,8))).substring(0,6); - $("#chatall").append("
  • "+data.substring(0,8)+"
  • "); + $("#chatall").append("
  • "+data.substring(0,8)+"
  • "); var in_text = document.createTextNode(data.substring(8)); $("#chatall li:last")[0].appendChild(in_text); document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight From 1ce95b2324454b76935208883adb0264e3a52d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 13 May 2015 14:15:16 +0200 Subject: [PATCH 02/13] easter is here? --- server/server.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/server/server.js b/server/server.js index 652d5eca..ef114064 100755 --- a/server/server.js +++ b/server/server.js @@ -35,18 +35,29 @@ io.on('connection', function(socket){ //var guid; var tot_lists = []; var in_list = false; + var name = rndName(guid); + + socket.on('namechange', function(data) + { + if(name.length < 9) + { + name = data; + io.sockets.emit('chat,'+coll, rndName(guid) + " changed name to " + name); + io.sockets.emit('chat.all', [rndName(guid) + " changed name to " + name, coll]); + } + }); socket.on('chat', function (data) { check_inlist(coll, guid, socket); if(data != "" && data !== undefined && data !== null && data.length < 151 && data.replace(/\s/g, '').length) - io.sockets.emit('chat,'+coll, rndName(guid) + ": " + data); + io.sockets.emit('chat,'+coll, name + ": " + data); }); socket.on("all,chat", function(data) { check_inlist(coll, guid, socket); if(data != "" && data !== undefined && data !== null && data.length < 151 && data.replace(/\s/g, '').length) - io.sockets.emit('chat.all', [rndName(guid) + ": " + data, coll]); + io.sockets.emit('chat.all', [name + ": " + data, coll]); }); socket.on('frontpage_lists', function() From ceb84808eab94609d62cde9720b8d95cc95ec7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 13 May 2015 14:17:39 +0200 Subject: [PATCH 03/13] more easter --- server/server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/server.js b/server/server.js index ef114064..a6e16b43 100755 --- a/server/server.js +++ b/server/server.js @@ -41,9 +41,9 @@ io.on('connection', function(socket){ { if(name.length < 9) { + io.sockets.emit('chat,'+coll, name + " changed name to " + data); + io.sockets.emit('chat.all', [name + " changed name to " + data, coll]); name = data; - io.sockets.emit('chat,'+coll, rndName(guid) + " changed name to " + name); - io.sockets.emit('chat.all', [rndName(guid) + " changed name to " + name, coll]); } }); From 40bce0792d84cc955ae7d6de5e7ab5dfb241be86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 13 May 2015 14:26:27 +0200 Subject: [PATCH 04/13] Fixed naming --- server/server.js | 6 +++--- static/js/chat.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/server.js b/server/server.js index a6e16b43..88d86a8e 100755 --- a/server/server.js +++ b/server/server.js @@ -39,10 +39,10 @@ io.on('connection', function(socket){ socket.on('namechange', function(data) { - if(name.length < 9) + if(name.length < 9 && name.indexOf(" ") == -1) { - io.sockets.emit('chat,'+coll, name + " changed name to " + data); - io.sockets.emit('chat.all', [name + " changed name to " + data, coll]); + io.sockets.emit('chat,'+coll, name + ": changed name to " + data); + io.sockets.emit('chat.all', [name + ": changed name to " + data, coll]); name = data; } }); diff --git a/static/js/chat.js b/static/js/chat.js index e62cf2bd..87002ae2 100644 --- a/static/js/chat.js +++ b/static/js/chat.js @@ -49,7 +49,7 @@ socket.on("chat.all", function(inp) unseen = true; } var color = intToARGB(hashCode(data.substring(0,8))).substring(0,6); - $("#chatall").append("
  • "+data.substring(0,8)+"
  • "); + $("#chatall").append("
  • "+data.substring(0,data.indexOf(": "))+"
  • "); var in_text = document.createTextNode(data.substring(8)); $("#chatall li:last")[0].appendChild(in_text); document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight From 3787b512f6fb8c7b427bd77eb365f014d29b292a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 13 May 2015 14:28:00 +0200 Subject: [PATCH 05/13] Forgot own channel --- static/js/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/chat.js b/static/js/chat.js index 87002ae2..aaefbcc5 100644 --- a/static/js/chat.js +++ b/static/js/chat.js @@ -76,7 +76,7 @@ socket.on("chat,"+chan.toLowerCase(), function(data) } } var color = intToARGB(hashCode(data.substring(0,8))).substring(0,6); - $("#chatchannel").append("
  • "+data.substring(0,8)+"
  • "); + $("#chatchannel").append("
  • "+data.substring(0,data.indexOf(": "))+"
  • "); var in_text = document.createTextNode(data.substring(8)); $("#chatchannel li:last")[0].appendChild(in_text); document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight From 5a601ff841214f21e85bc0241df8135cf4005ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 13 May 2015 14:29:43 +0200 Subject: [PATCH 06/13] Forgot shit --- static/js/chat.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/static/js/chat.js b/static/js/chat.js index aaefbcc5..1d6ec5b5 100644 --- a/static/js/chat.js +++ b/static/js/chat.js @@ -48,9 +48,9 @@ socket.on("chat.all", function(inp) $("#favicon").attr("href", "static/images/highlogo.png"); unseen = true; } - var color = intToARGB(hashCode(data.substring(0,8))).substring(0,6); + var color = intToARGB(hashCode(data.substring(0,data.indexOf(": ")))).substring(0,6); $("#chatall").append("
  • "+data.substring(0,data.indexOf(": "))+"
  • "); - var in_text = document.createTextNode(data.substring(8)); + var in_text = document.createTextNode(data.substring(data.indexOf(": "))); $("#chatall li:last")[0].appendChild(in_text); document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight }); @@ -75,9 +75,9 @@ socket.on("chat,"+chan.toLowerCase(), function(data) blink_interval = setInterval(chat_blink, 2000); } } - var color = intToARGB(hashCode(data.substring(0,8))).substring(0,6); + var color = intToARGB(hashCode(data.substring(0,data.indexOf(": ")))).substring(0,6); $("#chatchannel").append("
  • "+data.substring(0,data.indexOf(": "))+"
  • "); - var in_text = document.createTextNode(data.substring(8)); + var in_text = document.createTextNode(data.substring(data.indexOf(": "))); $("#chatchannel li:last")[0].appendChild(in_text); document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight }); From cd76d30cafd7d04571cc403a48761a40c2b80a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 13 May 2015 15:54:17 +0200 Subject: [PATCH 07/13] Added so name is used instead of guid on skipping --- server/server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/server.js b/server/server.js index 88d86a8e..ab11cc33 100755 --- a/server/server.js +++ b/server/server.js @@ -337,14 +337,14 @@ io.on('connection', function(socket){ { change_song(coll); socket.emit("toast", "skip"); - io.sockets.emit('chat,'+coll, rndName(guid) + " skipped"); + io.sockets.emit('chat,'+coll, name + " skipped"); }/*else if(get_time() - docs[0]["startTime"] < 10 && lists[coll].length == 2 && !error) { socket.emit("toast", "notyetskip"); }*/else if(!contains(docs[0]["skips"], guid)){ db.collection(coll).update({views:{$exists:true}}, {$push:{skips:guid}}, function(err, d){ socket.emit("toast", (Math.ceil(lists[coll].length/2) - docs[0]["skips"].length-1) + " more are needed to skip!"); - socket.broadcast.emit('chat,'+coll, rndName(guid) + " voted to skip"); + socket.broadcast.emit('chat,'+coll, name + " voted to skip"); }); }else{ socket.emit("toast", "alreadyskip"); From e6bf94908a95a938d18c6b72b2f24061ddf04145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 14 May 2015 14:22:01 +0200 Subject: [PATCH 08/13] Fixed left and joined messages --- server/server.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/server.js b/server/server.js index ab11cc33..b73bc52a 100755 --- a/server/server.js +++ b/server/server.js @@ -112,7 +112,7 @@ io.on('connection', function(socket){ coll = list[0].toLowerCase(); //guid = list[1]; - console.log(guid + " joined list " + coll); + console.log(name + " joined list " + coll); check_inlist(coll, guid, socket); @@ -448,11 +448,11 @@ io.on('connection', function(socket){ { if(contains(lists[coll], guid)) { - console.log(guid + " left list " + coll); + console.log(name + " left list " + coll); var index = lists[coll].indexOf(guid); lists[coll].splice(index, 1); io.sockets.emit(coll+",viewers", lists[coll].length); - io.sockets.emit('chat,'+coll, rndName(guid) + " left"); + io.sockets.emit('chat,'+coll, name + " left"); } } @@ -486,12 +486,12 @@ function check_inlist(coll, guid, socket) lists[coll] = []; lists[coll].push(guid); io.sockets.emit(coll+",viewers", lists[coll].length); - socket.broadcast.emit('chat,'+coll, rndName(guid) + " joined"); + socket.broadcast.emit('chat,'+coll, name + " joined"); }else if(!contains(lists[coll], guid)) { lists[coll].push(guid); io.sockets.emit(coll+",viewers", lists[coll].length); - socket.broadcast.emit('chat,'+coll, rndName(guid) + " joined"); + socket.broadcast.emit('chat,'+coll, name + " joined"); } } From a84fe0577d503468636af913198d9d3bb12921f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 14 May 2015 14:26:41 +0200 Subject: [PATCH 09/13] Fixed variable error --- server/server.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/server/server.js b/server/server.js index b73bc52a..704e932f 100755 --- a/server/server.js +++ b/server/server.js @@ -48,14 +48,14 @@ io.on('connection', function(socket){ }); socket.on('chat', function (data) { - check_inlist(coll, guid, socket); + check_inlist(coll, guid, socket, name); if(data != "" && data !== undefined && data !== null && data.length < 151 && data.replace(/\s/g, '').length) io.sockets.emit('chat,'+coll, name + ": " + data); }); socket.on("all,chat", function(data) { - check_inlist(coll, guid, socket); + check_inlist(coll, guid, socket, name); if(data != "" && data !== undefined && data !== null && data.length < 151 && data.replace(/\s/g, '').length) io.sockets.emit('chat.all', [name + ": " + data, coll]); }); @@ -114,7 +114,7 @@ io.on('connection', function(socket){ console.log(name + " joined list " + coll); - check_inlist(coll, guid, socket); + check_inlist(coll, guid, socket, name); io.sockets.emit(coll+",viewers", lists[coll].length); @@ -144,7 +144,7 @@ io.on('connection', function(socket){ { if(id !== undefined && id !== null && id != "") { - check_inlist(coll, guid, socket); + check_inlist(coll, guid, socket, name); db.collection(coll).find({now_playing:true}, function(err, np){ //console.log(docs); @@ -209,7 +209,7 @@ io.on('connection', function(socket){ { if(arr !== undefined && arr !== null && arr != "") { - check_inlist(coll, guid, socket); + check_inlist(coll, guid, socket, name); var id = arr[0]; var title = arr[1]; @@ -250,7 +250,7 @@ io.on('connection', function(socket){ { if(msg !== undefined && msg !== null) { - check_inlist(coll, guid, socket); + check_inlist(coll, guid, socket, name); if(msg[2] == "del") del(msg, socket); @@ -280,7 +280,7 @@ io.on('connection', function(socket){ pw = inp[0]; coll = inp[1]; //guid = inp[2]; - check_inlist(coll, guid, socket); + check_inlist(coll, guid, socket, name); //console.log(coll); db.collection(coll).find({views:{$exists:true}}, function(err, docs){ @@ -305,7 +305,7 @@ io.on('connection', function(socket){ { if(list !== undefined && list !== null && list != "") { - check_inlist(coll, guid, socket); + check_inlist(coll, guid, socket, name); adminpass = ""; @@ -360,7 +360,7 @@ io.on('connection', function(socket){ { if(params !== undefined && params !== null && params != "") { - check_inlist(coll, guid, socket); + check_inlist(coll, guid, socket,name); var voting = params[0]; var addsongs = params[1]; @@ -410,7 +410,7 @@ io.on('connection', function(socket){ { if(pass !== undefined && pass !== null && pass != "") { - check_inlist(coll, guid, socket); + check_inlist(coll, guid, socket, name); var hash = hash_pass(pass); db.collection(coll).find({views:{$exists:true}}, function(err, docs){ @@ -460,7 +460,7 @@ io.on('connection', function(socket){ socket.on('pos', function() { - check_inlist(coll, guid, socket); + check_inlist(coll, guid, socket, name); send_play(coll, socket); }); }); @@ -479,7 +479,7 @@ function del(params, socket) }); } -function check_inlist(coll, guid, socket) +function check_inlist(coll, guid, socket, name) { if(lists[coll] == undefined) { From 545571f8c8ebe421c129480a1fc7096826f359db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 14 May 2015 16:15:35 +0200 Subject: [PATCH 10/13] Making the passwords more safe --- php/footer.php | 1 + static/js/admin.js | 10 +++++++--- static/js/youtube.js | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/php/footer.php b/php/footer.php index 23068ed6..0d4c15bb 100755 --- a/php/footer.php +++ b/php/footer.php @@ -56,6 +56,7 @@ --> +