functioning chat

3 files changed, 8 insertions, 1 deletions

diff --git a/public/js/lib/views/room/chat.js b/public/js/lib/views/room/chat.js
index 2c1140e..058d02d 100644
--- a/public/js/lib/views/room/chat.js
+++ b/public/js/lib/views/room/chat.js
@@ -45,7 +45,7 @@ var ChatView = View.extend({
     msg.nick = user.username
     msg.date = +new Date
     this.add(msg)
-    app.socket.send("message", msg)
+    app.socket.emit("message", msg)
   },
   
   empty: function(){
diff --git a/public/js/lib/views/room/room.js b/public/js/lib/views/room/room.js
index c8d7f3f..10c4d08 100644
--- a/public/js/lib/views/room/room.js
+++ b/public/js/lib/views/room/room.js
@@ -11,6 +11,8 @@ var RoomView = View.extend({
     this.userlist = new UserlistView ()
 
     app.socket = ws.connect(name)
+    
+    app.socket.emit("join", { nick: user.username })
 
     app.socket.on("joined", function(msgs){
       msgs && msgs.forEach(chat.add)
diff --git a/server/ws.js b/server/ws.js
index 75f430c..7199ac3 100644
--- a/server/ws.js
+++ b/server/ws.js
@@ -14,6 +14,7 @@ ws.add = function(name){
   var messages = room.messages = []
   room.users = {}
   sockets = {}
+  console.log("new room >> " + name)
   
   var ns = ws.io.of('/' + name)
   
@@ -21,8 +22,10 @@ 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()
@@ -33,6 +36,8 @@ ws.add = function(name){
     })
     
     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)