1 files changed, 10 insertions, 9 deletions
diff --git a/public/js/lib/views/room/room.js b/public/js/lib/views/room/room.js
index 10c4d08..3b3b253 100644
--- a/public/js/lib/views/room/room.js
+++ b/public/js/lib/views/room/room.js
@@ -6,20 +6,21 @@ var RoomView = View.extend({
   },
   
   initialize: function(name){
-    this.name = name
-    chat = this.chatView = new ChatView ()
-    this.userlist = new UserlistView ()
 
     app.socket = ws.connect(name)
+
+    var base = this
+    this.name = name
+    chat = this.chatView = new ChatView (socket)
+    this.userlist = new UserlistView (socket)
+
     
     app.socket.emit("join", { nick: user.username })
-
-    app.socket.on("joined", function(msgs){
-      msgs && msgs.forEach(chat.add)
-    })
     
-    app.socket.on("messages", function(msgs){
-      msgs && msgs.forEach(chat.add)
+    app.socket.on("welcome", function(room){
+      room.messages.forEach(chat.add)
+      base.userlist.users = room.users
+      base.userlist.update()
     })
     
     app.socket.on("message", function(msg){