From e42971d202c8fabc410e509154e95af5dc87c943 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 2 Jan 2013 12:31:16 -0500 Subject: [PATCH] small cleanup of cloning user schema --- src/app/schema.coffee | 26 ++++++++++++-------------- src/server/index.coffee | 2 +- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/app/schema.coffee b/src/app/schema.coffee index 99e1d6b7a7..621682f13f 100644 --- a/src/app/schema.coffee +++ b/src/app/schema.coffee @@ -2,21 +2,19 @@ content = require './content' moment = require 'moment' _ = require 'lodash' -userSchema = { - balance: 2 - stats: { money: 0, exp: 0, lvl: 1, hp: 50 } - items: { itemsEnabled: false, armor: 0, weapon: 0 } - tasks: {} - habitIds: [] - dailyIds: [] - todoIds: [] - completedIds: [] - rewardIds: [] -} - -module.exports.newUserObject = -> +module.exports.userSchema = -> # deep clone, else further new users get duplicate objects - newUser = _.cloneDeep(userSchema) + newUser = _.cloneDeep + balance: 2 + stats: { money: 0, exp: 0, lvl: 1, hp: 50 } + items: { itemsEnabled: false, armor: 0, weapon: 0 } + tasks: {} + habitIds: [] + dailyIds: [] + todoIds: [] + completedIds: [] + rewardIds: [] + for task in content.defaultTasks guid = task.id = require('racer').uuid() newUser.tasks[guid] = task diff --git a/src/server/index.coffee b/src/server/index.coffee index eb23ef9626..c96bf1fd69 100644 --- a/src/server/index.coffee +++ b/src/server/index.coffee @@ -49,7 +49,7 @@ strategies = options = domain: (if process.env.NODE_ENV == 'production' then 'https://habitrpg.com' else "http://localhost:3000") allowPurl: true - schema: require('../app/schema').newUserObject() + schema: require('../app/schema').userSchema() mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, -> expressApp