Fix for joining any room url

This commit is contained in:
Dan Seripap 2016-01-06 21:22:25 -05:00
parent f377b0dc87
commit bfba7023ad

View File

@ -38,27 +38,42 @@ app.use(express.static(__dirname + '/public'));
// Routes // Routes
app.get('/', (req, res) => { function generateNewRoom(req, res, id) {
const id = shortid.generate();
const room = new Room(io, id); const room = new Room(io, id);
rooms.push(room); rooms.push(room);
console.log('generating new room');
room.on('empty', () => { // room.on('empty', () => {
rooms = _.without(rooms, _.findWhere(rooms, {id: room.id})); // 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}`); res.redirect(`/${id}`);
}); });
app.get('/:roomId', (req, res) => { app.get('/:roomId', (req, res) => {
const roomId = req.params.roomId || false;
const roomId = req.param.roomId || false; let roomExists = false;
rooms.forEach( (room) => { 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 // Events