diff --git a/server/server.js b/server/server.js index 1793d54e..3fa6493b 100755 --- a/server/server.js +++ b/server/server.js @@ -41,8 +41,8 @@ io.on('connection', function(socket){ { 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; } }); @@ -50,14 +50,14 @@ io.on('connection', function(socket){ socket.on('chat', function (data) { 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); + io.sockets.emit('chat,'+coll, [name, ": " + data]); }); socket.on("all,chat", function(data) { 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]); + io.sockets.emit('chat.all', [name, ": " + data, coll]); }); socket.on('frontpage_lists', function() @@ -337,14 +337,14 @@ io.on('connection', function(socket){ { change_song(coll); socket.emit("toast", "skip"); - io.sockets.emit('chat,'+coll, name + " 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, name + " voted to skip"); + socket.broadcast.emit('chat,'+coll, [name, " voted to skip"]); }); }else{ socket.emit("toast", "alreadyskip"); @@ -453,7 +453,7 @@ io.on('connection', function(socket){ var index = lists[coll].indexOf(guid); lists[coll].splice(index, 1); io.sockets.emit(coll+",viewers", lists[coll].length); - io.sockets.emit('chat,'+coll, name + " left"); + io.sockets.emit('chat,'+coll, [name, " left"]); } } @@ -487,12 +487,12 @@ function check_inlist(coll, guid, socket, name) lists[coll] = []; lists[coll].push(guid); io.sockets.emit(coll+",viewers", lists[coll].length); - socket.broadcast.emit('chat,'+coll, name + " 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, name + " joined"); + socket.broadcast.emit('chat,'+coll, [name, " joined"]); } } diff --git a/static/js/chat.js b/static/js/chat.js index 64441031..aeebc6fa 100644 --- a/static/js/chat.js +++ b/static/js/chat.js @@ -31,7 +31,6 @@ $(".chat-tab").click(function(){ socket.on("chat.all", function(inp) { - data = inp[0]; if($("#chat-bar").position()["left"] != 0) { @@ -48,9 +47,9 @@ socket.on("chat.all", function(inp) $("#favicon").attr("href", "static/images/highlogo.png"); unseen = true; } - 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(data.indexOf(": "))); + var color = intToARGB(hashCode(inp[0])).substring(0,6); + $("#chatall").append("
  • "+inp[0]+"
  • "); + var in_text = document.createTextNode(inp[1]); $("#chatall li:last")[0].appendChild(in_text); document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight }); @@ -77,9 +76,9 @@ socket.on("chat,"+chan.toLowerCase(), function(data) } } } - 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(data.indexOf(": "))); + var color = intToARGB(hashCode(data[0])).substring(0,6); + $("#chatchannel").append("
  • "+data[0]+"
  • "); + var in_text = document.createTextNode(data[1]); $("#chatchannel li:last")[0].appendChild(in_text); document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight }); diff --git a/static/js/youtube.js b/static/js/youtube.js index 98c20a50..22124a8c 100755 --- a/static/js/youtube.js +++ b/static/js/youtube.js @@ -73,7 +73,7 @@ socket.on(chan.toLowerCase()+",viewers", function(view) $(document).ready(function() { - Materialize.toast("Passwords have been reset. If anything is not right, please send us a mail @ contact@zoff.no", 10000); + //Materialize.toast("Passwords have been reset. If anything is not right, please send us a mail @ contact@zoff.no", 10000); $("#settings").sideNav({ menuWidth: 300, // Default is 240 edge: 'right', // Choose the horizontal origin @@ -104,8 +104,11 @@ $(document).ready(function() if(localStorage[chan.toLowerCase()]) { - localStorage.removeItem(chan.toLowerCase()); - //socket.emit("password", [localStorage[chan.toLowerCase()], chan.toLowerCase(), guid]); + //localStorage.removeItem(chan.toLowerCase()); + if(localStorage[chan.toLowerCase()].length != 64) + localStorage.removeItem(chan.toLowerCase()); + else + socket.emit("password", [localStorage[chan.toLowerCase()], chan.toLowerCase(), guid]); } if($("#chan").html().toLowerCase() == "jazz")