KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed names in chat

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-05-16 21:00:05 +02:00
parent 1f99089f3a
commit c02ce87642
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/server.js
View File

@@ -41,8 +41,8 @@ io.on('connection', function(socket){
{ {
if(name.length < 9 && name.indexOf(" ") == -1) if(name.length < 9 && name.indexOf(" ") == -1)
{ {
io.sockets.emit('chat,'+coll, name + ": changed name to " + data); 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.all', [name ," changed name to " + data, coll]);
name = data; name = data;
} }
}); });
@@ -50,14 +50,14 @@ io.on('connection', function(socket){
socket.on('chat', function (data) { socket.on('chat', function (data) {
check_inlist(coll, guid, socket, name); check_inlist(coll, guid, socket, name);
if(data != "" && data !== undefined && data !== null && data.length < 151 && data.replace(/\s/g, '').length) 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) socket.on("all,chat", function(data)
{ {
check_inlist(coll, guid, socket, name); check_inlist(coll, guid, socket, name);
if(data != "" && data !== undefined && data !== null && data.length < 151 && data.replace(/\s/g, '').length) 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() socket.on('frontpage_lists', function()
@@ -337,14 +337,14 @@ io.on('connection', function(socket){
{ {
change_song(coll); change_song(coll);
socket.emit("toast", "skip"); 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) }/*else if(get_time() - docs[0]["startTime"] < 10 && lists[coll].length == 2 && !error)
{ {
socket.emit("toast", "notyetskip"); socket.emit("toast", "notyetskip");
}*/else if(!contains(docs[0]["skips"], guid)){ }*/else if(!contains(docs[0]["skips"], guid)){
db.collection(coll).update({views:{$exists:true}}, {$push:{skips:guid}}, function(err, d){ 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.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{ }else{
socket.emit("toast", "alreadyskip"); socket.emit("toast", "alreadyskip");
@@ -453,7 +453,7 @@ io.on('connection', function(socket){
var index = lists[coll].indexOf(guid); var index = lists[coll].indexOf(guid);
lists[coll].splice(index, 1); lists[coll].splice(index, 1);
io.sockets.emit(coll+",viewers", lists[coll].length); 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] = [];
lists[coll].push(guid); lists[coll].push(guid);
io.sockets.emit(coll+",viewers", lists[coll].length); 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)) }else if(!contains(lists[coll], guid))
{ {
lists[coll].push(guid); lists[coll].push(guid);
io.sockets.emit(coll+",viewers", lists[coll].length); io.sockets.emit(coll+",viewers", lists[coll].length);
socket.broadcast.emit('chat,'+coll, name + " joined"); socket.broadcast.emit('chat,'+coll, [name, " joined"]);
} }
} }

13
static/js/chat.js
View File

@@ -31,7 +31,6 @@ $(".chat-tab").click(function(){
socket.on("chat.all", function(inp) socket.on("chat.all", function(inp)
{ {
data = inp[0];
if($("#chat-bar").position()["left"] != 0) if($("#chat-bar").position()["left"] != 0)
{ {
@@ -48,9 +47,9 @@ socket.on("chat.all", function(inp)
$("#favicon").attr("href", "static/images/highlogo.png"); $("#favicon").attr("href", "static/images/highlogo.png");
unseen = true; unseen = true;
} }
var color = intToARGB(hashCode(data.substring(0,data.indexOf(": ")))).substring(0,6); var color = intToARGB(hashCode(inp[0])).substring(0,6);
$("#chatall").append("<li title='"+inp[1]+"'><span style='color:"+color+";'>"+data.substring(0,data.indexOf(": "))+"</span></li>"); $("#chatall").append("<li title='"+inp[2]+"'><span style='color:"+color+";'>"+inp[0]+"</span></li>");
var in_text = document.createTextNode(data.substring(data.indexOf(": "))); var in_text = document.createTextNode(inp[1]);
$("#chatall li:last")[0].appendChild(in_text); $("#chatall li:last")[0].appendChild(in_text);
document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight
}); });
@@ -75,9 +74,9 @@ socket.on("chat,"+chan.toLowerCase(), function(data)
blink_interval = setInterval(chat_blink, 2000); blink_interval = setInterval(chat_blink, 2000);
} }
} }
var color = intToARGB(hashCode(data.substring(0,data.indexOf(": ")))).substring(0,6); var color = intToARGB(hashCode(data[0])).substring(0,6);
$("#chatchannel").append("<li><span style='color:"+color+";'>"+data.substring(0,data.indexOf(": "))+"</span></li>"); $("#chatchannel").append("<li><span style='color:"+color+";'>"+data[0]+"</span></li>");
var in_text = document.createTextNode(data.substring(data.indexOf(": "))); var in_text = document.createTextNode(data[1]);
$("#chatchannel li:last")[0].appendChild(in_text); $("#chatchannel li:last")[0].appendChild(in_text);
document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight
}); });