From bfba7023adba51d110ab3df1dba27bc260b43f53 Mon Sep 17 00:00:00 2001
From: Dan Seripap <daniel@seripap.com>
Date: Wed, 6 Jan 2016 21:22:25 -0500
Subject: [PATCH] Fix for joining any room url

---
 src/app.js | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/app.js b/src/app.js
index 6b83c2d..37efece 100644
--- a/src/app.js
+++ b/src/app.js
@@ -38,27 +38,42 @@ app.use(express.static(__dirname + '/public'));
 
 // Routes
 
-app.get('/', (req, res) => {
-  const id = shortid.generate();
+function generateNewRoom(req, res, id) {
   const room = new Room(io, id);
   rooms.push(room);
+  console.log('generating new room');
 
-  room.on('empty', () => {
-    rooms = _.without(rooms, _.findWhere(rooms, {id: room.id}));
-  });
+  // room.on('empty', () => {
+  //   console.log('room empty');
+  //   rooms = _.without(rooms, _.findWhere(rooms, {id: room.id}));
+  // });
 
+  return res.render('index', {username: shortid.generate()});
+
+}
+
+app.get('/', (req, res) => {
+  const id = shortid.generate();
   res.redirect(`/${id}`);
 });
 
 app.get('/:roomId', (req, res) => {
-  
-  const roomId = req.param.roomId || false;
+  const roomId = req.params.roomId || false;
+  let roomExists = false;
 
   rooms.forEach( (room) => {
-    console.log(room);
-  })
+    console.log(room, roomId);
+    if (room._id === roomId) {
+      roomExists = true;
+    }
+  });
+
+  if (roomExists) {
+    return res.render('index', {username: shortid.generate()});
+  }
+
+  generateNewRoom(req, res, roomId);
 
-  res.render('index', {username: shortid.generate()});
 });
 
 // Events