sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 08:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

return next(err) for errors in subscription callbacks. Also, try

Browse source 
reloading the page when userObj? is null (bustedSession victims. See
the comments)
This commit is contained in:
Tyler Renelle 2013-02-25 18:59:14 -05:00
parent 89e5ec2d10
commit 06da720dfb
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/index.coffee
View file

@ -23,7 +23,7 @@ _ = require('underscore')
# ========== ROUTES ==========
get '/', (page, model, next) ->
get '/', (page, model, params, next) ->
return page.redirect '/' if page.params?.query?.play?
# temporary view variables, so we don't call model.set() too fast
@ -34,7 +34,7 @@ get '/', (page, model, next) ->
#if req.headers['x-forwarded-proto']!='https' and process.env.NODE_ENV=='production'
# return page.redirect 'https://' + req.headers.host + req.url
party.partySubscribe model, ->
party.partySubscribe page, model, params, next, ->
character.updateUser(model)
items.server(model)
model.set '_view', _view

14
src/app/party.coffee
View file

@ -17,7 +17,7 @@ partyUnsubscribe = (model, cb) ->
2) If in a an empty party, just subscribe to the user & party meta.
3) If full party, subscribe to everything.
###
module.exports.partySubscribe = partySubscribe = (model, cb) ->
module.exports.partySubscribe = partySubscribe = (page, model, params, next, cb) ->
# unsubscribe from everything - we're starting over
# partyUnsubscribe model, ->
@ -25,10 +25,15 @@ module.exports.partySubscribe = partySubscribe = (model, cb) ->
# Restart subscription to the main user
selfQ = model.query('users').withId model.get('_userId') #or model.session.userId # see http://goo.gl/TPYIt
selfQ.subscribe (err, self) ->
throw err if err
return next(err) if err
u = self.at(0)
uObj = u.get()
# Attempted handling for 'party of undefined' error, which is caused by bustedSession (see derby-auth).
# Theoretically simply reloading the page should restore model.at('_userId') and the second load should work just fine
# bustedSession victims might hit a redirection loop if I'm wrong :/
return page.redirect('/') unless uObj
## (1) User is solo, just return that subscription
unless uObj.party?.current?
model.ref '_user', u
@ -47,13 +52,14 @@ module.exports.partySubscribe = partySubscribe = (model, cb) ->
finished = ->
# model.unsubscribe selfQ, ->
selfQ.subscribe (err, self) ->
return next(err) if err
model.ref '_user', self.at(0)
cb()
# User in a party
partiesQ = model.query('parties').withId(uObj.party.current)
partiesQ.fetch (err, res) ->
throw err if err
return next(err) if err
p = res.at(0)
model.ref '_party', p
ids = p.get('members')
@ -73,7 +79,7 @@ module.exports.partySubscribe = partySubscribe = (model, cb) ->
## (3) Party has members, subscribe to those users too
membersQ = model.query('users').party(ids)
membersQ.fetch (err, members) ->
throw err if err
return next(err) if err
model.ref '_partyMembers', members
finished()