From 78f7f5ae58d9357e240873c137e8940e0647fbbd Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 6 Aug 2015 01:15:05 -0400 Subject: userlist stuph --- server/ws.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'server/ws.js') diff --git a/server/ws.js b/server/ws.js index 7199ac3..92c7d5a 100644 --- a/server/ws.js +++ b/server/ws.js @@ -22,22 +22,19 @@ ws.add = function(name){ var nick - console.log("new connection ...") socket.on('join', function(data){ nick = data.nick - console.log("joined >> " + nick) if (sockets[nick]) { // already connected? sockets[nick].disconnect() sockets[nick] = socket room.users[nick] = true - socket.emit("messages", messages) + socket.emit("welcome", room) + ns.emit('joined', data) } }) socket.on('message', function(data){ - console.log(data) - console.log("<" + data.nick + "> " + data.msg) if (messages.length > 20) { messages.shift() } messages.push(data) ns.emit('message', data) @@ -46,6 +43,7 @@ ws.add = function(name){ socket.on('disconnect', function(){ delete sockets[nick] delete room.users[nick] + ns.emit('parted', {nick:nick}) }) }) -- cgit v1.2.3-70-g09d2