From 991c44a9c078a785397d36729dc24a87cba29b19 Mon Sep 17 00:00:00 2001
From: Brett Huber <bretthuber6@gmail.com>
Date: Sat, 22 Jul 2017 10:43:38 -0500
Subject: [PATCH] updated messages logic to only send messages to user's in the
 same room

---
 public/js/chat.js |  1 -
 server/server.js  | 17 +++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/public/js/chat.js b/public/js/chat.js
index 99737a1..cac9681 100644
--- a/public/js/chat.js
+++ b/public/js/chat.js
@@ -73,7 +73,6 @@ jQuery('#message-form').on('submit', function(e){
     var messageTextBox = jQuery('[name=message]');
 
     socket.emit('createMessage', {
-        from: 'User',
         text: messageTextBox.val()
     }, function(){
 
diff --git a/server/server.js b/server/server.js
index f6f0677..e12e366 100644
--- a/server/server.js
+++ b/server/server.js
@@ -34,14 +34,23 @@ io.on('connection', (socket) => {
         callback();
     });
 
-    socket.on('createMessage', (message, callback) =>{
-        console.log('createMesse', message);
-        io.emit('newMessage', generateMessage(message.from, message.text));
+    socket.on('createMessage', (message, callback) => {
+        var user = users.getUser(socket.id);
+        
+        if(user && isRealString(message.text)) {
+            io.to(user.room).emit('newMessage', generateMessage(user.name, message.text));
+        }
+       
         callback();
     });
 
     socket.on('createLocationMessage', (coords) => {
-        io.emit('newLocationMessage', generateLocationMessage('Admin', coords.latitude, coords.longitude))
+        var user = users.getUser(socket.id);
+        
+        if(user) {
+            io.to(user.room).emit('newLocationMessage', generateLocationMessage(user.name, coords.latitude, coords.longitude));
+        }
+        
     });
 
     socket.on('disconnect', () =>{