1 files changed, 5 insertions, 3 deletions
diff --git a/server.js b/server.js
index 575b526..cbff284 100644
--- a/server.js
+++ b/server.js
@@ -69,9 +69,7 @@ function Channel() {
 }
 Channel.prototype.push = function(message){
   if (this.messages.length > 20) this.messages.shift();
-  var message = { id: ++this.message_id, content: message, user: username, faves: 0, time: Date.now() };
   this.messages.push(message);
-  io.sockets.emit('message', JSON.stringify(message));
 }
 Channel.prototype.fave = function(id){
   for (var i = 0; i < messages.length; i++) {
@@ -91,7 +89,11 @@ Channel.prototype.join = function(){
 
 var game = new Channel ();
 io.sockets.on( 'connection', function(socket){
-  socket.emit( 'join', game.join() );
+  socket.emit( 'event-join', game.join() );
+  socket.on( 'event-message', function(data){
+  	game.push(data);
+		socket.broadcast.emit('event-message', data);
+  } );
 });
 
 /******************************* DONE