From b90acce4cc3bea128a9ca8554d82a06193370bb7 Mon Sep 17 00:00:00 2001
From: Alan Friedman <d.alan.friedman@gmail.com>
Date: Wed, 6 Jan 2016 21:48:49 -0500
Subject: [PATCH] Fix for empty rooms

---
 src/app.js  | 16 ++++++++--------
 src/room.js |  3 +--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/app.js b/src/app.js
index 37efece..e651ffc 100644
--- a/src/app.js
+++ b/src/app.js
@@ -38,22 +38,21 @@ app.use(express.static(__dirname + '/public'));
 
 // Routes
 
-function generateNewRoom(req, res, id) {
+function generateNewRoom(id) {
   const room = new Room(io, id);
   rooms.push(room);
   console.log('generating new room');
 
-  // room.on('empty', () => {
-  //   console.log('room empty');
-  //   rooms = _.without(rooms, _.findWhere(rooms, {id: room.id}));
-  // });
-
-  return res.render('index', {username: shortid.generate()});
+  room.on('empty', function() {
+    console.log('room empty');
+    rooms = _.without(rooms, _.findWhere(rooms, {_id: this._id}));
+  });
 
 }
 
 app.get('/', (req, res) => {
   const id = shortid.generate();
+  generateNewRoom(id);
   res.redirect(`/${id}`);
 });
 
@@ -62,7 +61,6 @@ app.get('/:roomId', (req, res) => {
   let roomExists = false;
 
   rooms.forEach( (room) => {
-    console.log(room, roomId);
     if (room._id === roomId) {
       roomExists = true;
     }
@@ -70,6 +68,8 @@ app.get('/:roomId', (req, res) => {
 
   if (roomExists) {
     return res.render('index', {username: shortid.generate()});
+  } else {
+    return res.sendStatus(404);
   }
 
   generateNewRoom(req, res, roomId);
diff --git a/src/room.js b/src/room.js
index 2caf858..d765400 100644
--- a/src/room.js
+++ b/src/room.js
@@ -54,7 +54,6 @@ class Room {
 
       // when the user disconnects.. perform this
       socket.on('disconnect', () => {
-        this.emit('empty');
         if (addedUser) {
           --this.numUsers;
 
@@ -66,7 +65,7 @@ class Room {
 
           // remove room from rooms array
           if (this.numUsers === 0) {
-
+            this.emit('empty');
           }
         }
       });