Merge branch 'develop'
This commit is contained in:
@@ -67,7 +67,6 @@ get '/', (page, model, params, next) ->
|
||||
|
||||
# removed force-ssl (handled in nginx), see git for code
|
||||
setupSubscriptions page, model, params, next, ->
|
||||
misc.fixCorruptUser(model) # https://github.com/lefnire/habitrpg/issues/634
|
||||
require('./items').server(model)
|
||||
#refLists
|
||||
_.each ['habit', 'daily', 'todo', 'reward'], (type) ->
|
||||
@@ -79,9 +78,12 @@ get '/', (page, model, params, next) ->
|
||||
# ========== CONTROLLER FUNCTIONS ==========
|
||||
|
||||
ready (model) ->
|
||||
user = model.at('_user')
|
||||
browser = require './browser'
|
||||
exports.removeAt = (e) -> e.at().remove() # used for things like remove website, chat, etc
|
||||
|
||||
user = model.at('_user')
|
||||
misc.fixCorruptUser(model) # https://github.com/lefnire/habitrpg/issues/634
|
||||
|
||||
browser = require './browser'
|
||||
require('./tasks').app(exports, model)
|
||||
require('./items').app(exports, model)
|
||||
require('./party').app(exports, model, app)
|
||||
|
||||
@@ -77,6 +77,7 @@ module.exports.fixCorruptUser = (model) ->
|
||||
delete tasks[key]
|
||||
true
|
||||
|
||||
resetDom = false
|
||||
batchTxn model, (uObj, paths, batch) ->
|
||||
|
||||
## fix https://github.com/lefnire/habitrpg/issues/1086
|
||||
@@ -100,6 +101,8 @@ module.exports.fixCorruptUser = (model) ->
|
||||
batch.set("#{type}Ids", preened)
|
||||
console.error uObj.id + "'s #{type}s were corrupt."
|
||||
true
|
||||
resetDom = !_.isEmpty(paths)
|
||||
require('./browser').resetDom(model) if resetDom
|
||||
|
||||
module.exports.viewHelpers = (view) ->
|
||||
|
||||
|
||||
Reference in New Issue
Block a user