Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2021-03-12 17:59:08 -06:00
parent d66ed032c0 39d82843df
commit cfeee82d62
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
migrations/users/pi-day.js
+2 -2
View File
@@ -3,7 +3,7 @@ import { v4 as uuid } from 'uuid';
import { model as User } from '../../website/server/models/user';
const MIGRATION_NAME = '20200314_pi_day';
const MIGRATION_NAME = '20210314_pi_day';
const progressCount = 1000;
let count = 0;
@@ -54,7 +54,7 @@ async function updateUser (user) {
export default async function processUsers () {
const query = {
migration: { $ne: MIGRATION_NAME },
'auth.timestamps.loggedin': { $gt: new Date('2020-02-15') },
'auth.timestamps.loggedin': { $gt: new Date('2021-02-15') },
};
const fields = {
package-lock.json
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.184.1",
"version": "4.184.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.184.1",
"version": "4.184.2",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.12.10",
website/server/models/user/hooks.js
+15 -4
View File
@@ -144,10 +144,21 @@ function _setUpNewUser (user) {
user.items.quests.dustbunnies = 1;
user.purchased.background.violet = true;
user.preferences.background = 'violet';
if (moment().isBefore('2021-02-02')) {
user.items.gear.owned.armor_special_birthday2021 = true;
user.items.gear.equipped.armor = 'armor_special_birthday2021';
user.achievements.habitBirthdays = 1;
if (moment().isBefore('2021-03-15T08:00-05:00')) {
user.items.gear.owned.head_special_piDay = true;
user.items.gear.equipped.head = 'head_special_piDay';
user.items.gear.owned.shield_special_piDay = true;
user.items.gear.equipped.shield = 'shield_special_piDay';
user.items.food.Pie_Skeleton = 1;
user.items.food.Pie_Base = 1;
user.items.food.Pie_CottonCandyBlue = 1;
user.items.food.Pie_CottonCandyPink = 1;
user.items.food.Pie_Shade = 1;
user.items.food.Pie_White = 1;
user.items.food.Pie_Golden = 1;
user.items.food.Pie_Zombie = 1;
user.items.food.Pie_Desert = 1;
user.items.food.Pie_Red = 1;
}
user.markModified('items achievements');