1 files changed, 5 insertions, 2 deletions
diff --git a/public/js/lib/views/room/room.js b/public/js/lib/views/room/room.js
index 13f08ce..f8b6324 100644
--- a/public/js/lib/views/room/room.js
+++ b/public/js/lib/views/room/room.js
@@ -9,15 +9,18 @@ var RoomView = View.extend({
 
     var base = this
     this.name = name
-    this.chatView = new ChatView (socket)
-    this.userlist = new UserlistView (socket)
+    this.chat = new ChatView (app.socket)
+    this.userlist = new UserlistView (app.socket)
+    this.settings = new SettingsView (app.socket)
     
     app.socket.emit("join", { nick: user.username })
     
     app.socket.on("welcome", function(room){
+      console.log(room)
       room.messages.forEach(base.chat.add)
       base.userlist.users = room.users
       base.userlist.update()
+      base.settings.update(room.settings)
     })
     
     app.socket.on("message", function(msg){