krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove user wrapping (#9960)

Browse Source 
* remove user wrapping, fixes #9146

* update tests

* fix tests
This commit is contained in:
Matteo Pagliazzi
2018-02-09 13:46:55 +01:00
committed by GitHub
parent 8e24b0578e
commit f947d3562b
14 changed files with 59 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
website/server/models/user/hooks.js
View File

@@ -1,4 +1,4 @@
import shared from '../../../common';
import common from '../../../common';
import _ from 'lodash';
import moment from 'moment';
import Bluebird from 'bluebird';
@@ -26,10 +26,6 @@ schema.plugin(baseModel, {
},
});
schema.post('init', function postInitUser (doc) {
shared.wrap(doc);
});
function findTag (user, tagName) {
let tagID = _.find(user.tags, (userTag) => {
return userTag.name === tagName(user.preferences.language);
@@ -40,10 +36,10 @@ function findTag (user, tagName) {
function _populateDefaultTasks (user, taskTypes) {
let defaultsData;
if (user.registeredThrough === 'habitica-android' || user.registeredThrough === 'habitica-ios') {
defaultsData = shared.content.userDefaultsMobile;
defaultsData = common.content.userDefaultsMobile;
user.flags.welcomed = true;
} else {
defaultsData = shared.content.userDefaults;
defaultsData = common.content.userDefaults;
}
let tagsI = taskTypes.indexOf('tag');
@@ -52,7 +48,7 @@ function _populateDefaultTasks (user, taskTypes) {
let newTag = _.cloneDeep(tag);
// tasks automatically get _id=helpers.uuid() from TaskSchema id.default, but tags are Schema.Types.Mixed - so we need to manually invoke here
newTag.id = shared.uuid();
newTag.id = common.uuid();
// Render tag's name in user's language
newTag.name = newTag.name(user.preferences.language);
return newTag;
@@ -229,21 +225,21 @@ schema.pre('save', true, function preSaveUser (next, done) {
// do not calculate achievements if items or achievements are not selected
if (this.isSelected('items') && this.isSelected('achievements')) {
// Determines if Beast Master should be awarded
let beastMasterProgress = shared.count.beastMasterProgress(this.items.pets);
let beastMasterProgress = common.count.beastMasterProgress(this.items.pets);
if (beastMasterProgress >= 90 || this.achievements.beastMasterCount > 0) {
this.achievements.beastMaster = true;
}
// Determines if Mount Master should be awarded
let mountMasterProgress = shared.count.mountMasterProgress(this.items.mounts);
let mountMasterProgress = common.count.mountMasterProgress(this.items.mounts);
if (mountMasterProgress >= 90 || this.achievements.mountMasterCount > 0) {
this.achievements.mountMaster = true;
}
// Determines if Triad Bingo should be awarded
let dropPetCount = shared.count.dropPetsCurrentlyOwned(this.items.pets);
let dropPetCount = common.count.dropPetsCurrentlyOwned(this.items.pets);
let qualifiesForTriad = dropPetCount >= 90 && mountMasterProgress >= 90;
if (qualifiesForTriad || this.achievements.triadBingoCount > 0) {