From 5142a78bee3fcc56e08febdf47521ad2abe2f540 Mon Sep 17 00:00:00 2001 From: lancemanfv Date: Wed, 20 Feb 2013 23:29:06 +0200 Subject: [PATCH 1/4] Update src/app/tasks.coffee 20/02/13 Added a check for undefined value, more at https://github.com/lefnire/habitrpg/issues/463 -lancemanfv --- src/app/tasks.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee index 0feba1c746..8f14840e9f 100644 --- a/src/app/tasks.coffee +++ b/src/app/tasks.coffee @@ -43,8 +43,8 @@ module.exports.app = (appExports, model) -> list = model.at "_#{type}List" newModel = model.at('_new' + type.charAt(0).toUpperCase() + type.slice(1)) text = newModel.get() - # Don't add a blank task - if /^(\s)*$/.test(text) + # Don't add a blank task; 20/02/13 Added a check for undefined value, more at issue #463 -lancemanfv + if /^(\s)*$/.test(text) || text == undefined console.error "Task text entered was an empty string." return @@ -171,4 +171,4 @@ module.exports.app = (appExports, model) -> direction = 'up' if direction == 'true/' direction = 'down' if direction == 'false/' task = model.at $(el).parents('li')[0] - scoring.score(task.get('id'), direction) \ No newline at end of file + scoring.score(task.get('id'), direction) From 843ead6de9144952ad9351f6659cb9937099c9c8 Mon Sep 17 00:00:00 2001 From: Stan Lindsey Date: Thu, 21 Feb 2013 02:26:15 +0000 Subject: [PATCH 2/4] Update src/app/items.coffee --- src/app/items.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/items.coffee b/src/app/items.coffee index 0c18ce9acd..e1241584b5 100644 --- a/src/app/items.coffee +++ b/src/app/items.coffee @@ -28,7 +28,7 @@ items = module.exports.items = ] shield: [ {index: 0, text: "No Shield", classes: 'shield_0', notes:'No Shield.', modifier: 0.00, value:0} - {index: 1, text: "Wooden Shield", classes: 'shield_1', notes:'Decreases HP loss by 2%', modifier: 0.02, value:20} + {index: 1, text: "Wooden Shield", classes: 'shield_1', notes:'Decreases HP loss by 2%', modifier: 0.03, value:20} {index: 2, text: "Buckler", classes: 'shield_2', notes:'Decreases HP loss by 4%.', modifier: 0.04, value:35} {index: 3, text: "Enforced Shield", classes: 'shield_3', notes:'Decreases HP loss by 5%.', modifier: 0.05, value:55} {index: 4, text: "Red Shield", classes: 'shield_4', notes:'Decreases HP loss by 7%.', modifier: 0.07, value:70} From d28ae976fa604fd0d8e7c038cd9ecdfd03289f10 Mon Sep 17 00:00:00 2001 From: Stan Lindsey Date: Thu, 21 Feb 2013 02:26:31 +0000 Subject: [PATCH 3/4] Update src/app/items.coffee --- src/app/items.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/items.coffee b/src/app/items.coffee index e1241584b5..643c1d2288 100644 --- a/src/app/items.coffee +++ b/src/app/items.coffee @@ -28,7 +28,7 @@ items = module.exports.items = ] shield: [ {index: 0, text: "No Shield", classes: 'shield_0', notes:'No Shield.', modifier: 0.00, value:0} - {index: 1, text: "Wooden Shield", classes: 'shield_1', notes:'Decreases HP loss by 2%', modifier: 0.03, value:20} + {index: 1, text: "Wooden Shield", classes: 'shield_1', notes:'Decreases HP loss by 3%', modifier: 0.03, value:20} {index: 2, text: "Buckler", classes: 'shield_2', notes:'Decreases HP loss by 4%.', modifier: 0.04, value:35} {index: 3, text: "Enforced Shield", classes: 'shield_3', notes:'Decreases HP loss by 5%.', modifier: 0.05, value:55} {index: 4, text: "Red Shield", classes: 'shield_4', notes:'Decreases HP loss by 7%.', modifier: 0.07, value:70} From 1de9d303d826fbbf28210b2cb7d3c6f57918b000 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 21 Feb 2013 11:17:37 -0500 Subject: [PATCH 4/4] test '_userId' instead of session.userId --- src/server/index.coffee | 4 ++-- src/server/middleware.coffee | 2 +- src/server/private.coffee | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/index.coffee b/src/server/index.coffee index c0dac1619f..1fb7d7fd4d 100644 --- a/src/server/index.coffee +++ b/src/server/index.coffee @@ -69,10 +69,10 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, -> cookie: { maxAge: TWO_WEEKS } # defaults to 2 weeks? aka, can delete this line? store: mongo_store ) - # Show splash page for newcomers - .use(middleware.splash) # Adds req.getModel method .use(store.modelMiddleware()) + # Show splash page for newcomers + .use(middleware.splash) .use(priv.middleware) .use(middleware.view) .use(auth.middleware(strategies, options)) diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee index 44f53b90d0..03e388ffee 100644 --- a/src/server/middleware.coffee +++ b/src/server/middleware.coffee @@ -2,7 +2,7 @@ module.exports.splash = (req, res, next) -> # This was an API call, not a page load return next() if req.is('json') - if !req.session.userId? and !req.query?.play? + unless req.query?.play? or req.getModel().get('_userId') res.redirect('/splash.html') else next() diff --git a/src/server/private.coffee b/src/server/private.coffee index e9b5617053..5e7c148ab4 100644 --- a/src/server/private.coffee +++ b/src/server/private.coffee @@ -50,7 +50,7 @@ module.exports.routes = (expressApp) -> return res.send(500, err.response.error.message) else model = req.getModel() - userId = model.session.userId + userId = model.get('_userId') or model.session.userId req._isServer = true model.fetch "users.#{userId}", (err, user) -> model.ref '_user', "users.#{userId}"