finish merge

1 files changed, 0 insertions, 34 deletions

diff --git a/server/websocket.js b/server/websocket.js
deleted file mode 100644
index ca54b68..0000000
--- a/server/websocket.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var websocket = module.exports = {}
-var io
-
-websocket.init = function(server){
-  io = require('socket.io')(server)
-  return io
-}
-
-websocket.bind = function(room){
-  var room_socket = io.of('/' + room)
-  
-  var users = {}, messages = []
-
-  room_socket.on('connection', function(socket){
-
-    var nick
-    
-    socket.on("join", function(data){
-      nick = data.nick
-      users[data.nick] = true
-    })
-    
-    socket.on("msg", function(data){
-      if (messages.length > 20) { messages.shift() }
-      messages.push(data)
-      room_socket.emit("msg", data)
-    })
-    
-    socket.on("disconnect", function(){
-      delete users[nick]
-    })
-
-  })
-}