2 files changed, 4 insertions, 13 deletions
diff --git a/server/index.js b/server/index.js
index 1843ae0..96bca33 100644
--- a/server/index.js
+++ b/server/index.js
@@ -13,8 +13,6 @@ var http = require('http'),
 	ws = require("./ws"),
 	util = require("./util");
 
-var websocket = require('./websocket')
-
 var app = express()
 var server, io
 
@@ -33,15 +31,6 @@ app.use(express.query())
 //   app.use(require('express-error-handler'))
 // }
 
-server = http.createServer(app)
-server.listen(app.get('port'), function () {
-  console.log('asdf-yt server listening on port ' + app.get('port'));
-})
-
-var io = websocket.init(server)
-
-var rooms = {}
-
 app.all('*', function(req, res, next){
   res.locals.config = config
   next()
@@ -65,4 +54,4 @@ server.listen(app.get('port'), function () {
   console.log('asdf-yt server listening on port ' + app.get('port'));
 })
 
-ws.listen(server)
+var io = ws.listen(server)
diff --git a/server/ws.js b/server/ws.js
index 5819b94..75f430c 100644
--- a/server/ws.js
+++ b/server/ws.js
@@ -11,10 +11,11 @@ ws.listen = function(app){
 ws.add = function(name){
   if (name in rooms) { return }
   var room = rooms[name] = {}
+  var messages = room.messages = []
   room.users = {}
   sockets = {}
   
-  var ns = base.io.of('/' + name)
+  var ns = ws.io.of('/' + name)
   
   ns.on('connection', function(socket){
     
@@ -27,6 +28,7 @@ ws.add = function(name){
         sockets[nick].disconnect()
         sockets[nick] = socket
         room.users[nick] = true
+        socket.emit("messages", messages)
       }
     })