From ca1233e845825989f208e5b05a060916216a604f Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Feb 2013 15:10:31 -0500
Subject: [PATCH] freeze racer at bd27c5d, there's an issue with the memory
 subscriptions & accessing a REST path without a session?

---
 package.json                   | 2 +-
 src/server/index.coffee        | 2 +-
 src/server/serverRoutes.coffee | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b499d77383..23a58a94b9 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "./server.js",
   "dependencies": {
     "derby": "git://github.com/codeparty/derby#master",
-    "racer": "git://github.com/lefnire/racer#habitrpg",
+    "racer": "git://github.com/lefnire/racer.git#bd27c5d",
     "racer-db-mongo": "git://github.com/lefnire/racer-db-mongo#habitrpg",
     "derby-ui-boot": "git://github.com/codeparty/derby-ui-boot#master",
     "derby-auth": "git://github.com/lefnire/derby-auth#master",
diff --git a/src/server/index.coffee b/src/server/index.coffee
index a21605d973..e8a3a0eda4 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -81,7 +81,7 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
       return next() if req.is('json')
 
       if !req.session.userId? and !req.query?.play? and req.url == '/'
-        res.redirect('/splash.html')
+        return res.redirect('/splash.html')
       else
         next()
 
diff --git a/src/server/serverRoutes.coffee b/src/server/serverRoutes.coffee
index 25246eafdc..b49a2906b9 100644
--- a/src/server/serverRoutes.coffee
+++ b/src/server/serverRoutes.coffee
@@ -14,15 +14,16 @@ module.exports = (expressApp, root, derby) ->
     staticPages.render 'terms', res
 
   # localhost:3000/users/9/tasks.ics?apiToken=ae164366-f1ad-4a7d-83ef-b1d1085a96b6
-  expressApp.get '/users/:uid/tasks.ics', (req, res) ->
+  expressApp.get '/users/:uid/tasks.ics', (req, res, next) ->
     {uid} = req.params
     {apiToken} = req.query
 
     model = req.getModel()
     query = model.query('users').withIdAndToken(uid, apiToken)
-    query.fetch (err, result) ->
-      throw err if err
+    model.fetch query, (err, result) ->
+      return next(err) if err
       tasks = result.at(0).get('tasks')
+      return next "No tasks found for user #{uid}" unless tasks?
       tasksWithDates = _.filter tasks, (task) -> !!task.date
 
       ical = new icalendar.iCalendar()