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

Merge branch 'release' into develop

Browse source
This commit is contained in:
SabreCat 2022-03-14 14:31:36 -05:00
commit a0cb9da64b
4 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
migrations/users/pi-day.js
View file

@ -3,7 +3,7 @@ import { v4 as uuid } from 'uuid';
import { model as User } from '../../website/server/models/user'; import { model as User } from '../../website/server/models/user';
const MIGRATION_NAME = '20210314_pi_day'; const MIGRATION_NAME = '20220314_pi_day';
const progressCount = 1000; const progressCount = 1000;
let count = 0; let count = 0;
@ -54,7 +54,7 @@ async function updateUser (user) {
export default async function processUsers () { export default async function processUsers () {
const query = { const query = {
migration: { $ne: MIGRATION_NAME }, migration: { $ne: MIGRATION_NAME },
'auth.timestamps.loggedin': { $gt: new Date('2021-02-15') }, 'auth.timestamps.loggedin': { $gt: new Date('2022-02-15') },
}; };
const fields = { const fields = {

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{ {
"name": "habitica", "name": "habitica",
"version": "4.224.0", "version": "4.224.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "habitica", "name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.", "description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.224.0", "version": "4.224.1",
"main": "./website/server/index.js", "main": "./website/server/index.js",
"dependencies": { "dependencies": {
"@babel/core": "^7.17.5", "@babel/core": "^7.17.5",

19
website/server/models/user/hooks.js
View file

@ -144,10 +144,21 @@ function _setUpNewUser (user) {
user.items.quests.dustbunnies = 1; user.items.quests.dustbunnies = 1;
user.purchased.background.violet = true; user.purchased.background.violet = true;
user.preferences.background = 'violet'; user.preferences.background = 'violet';
if (moment().isBefore('2022-02-02T20:00-05:00')) { if (moment().isBefore('2022-03-15T20:00-04:00')) {
user.migration = '20220131_habit_birthday'; user.items.gear.owned.head_special_piDay = true;
user.items.gear.owned.armor_special_birthday = true; user.items.gear.equipped.head = 'head_special_piDay';
user.items.gear.equipped.armor = 'armor_special_birthday'; 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'); user.markModified('items achievements');