sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-04-14 19:47:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into sabrecat/teams-rebase

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

2
habitica-images

@ -1 +1 @@
Subproject commit 8d7fa3c3dae2d3718886fff5e8026b8ba8aeb7fb
Subproject commit 30c7e4a39dee61ac8e9eb127dcc1f8d4af6b2313

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';
const MIGRATION_NAME = '20210314_pi_day';
const MIGRATION_NAME = '20220314_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('2021-02-15') },
'auth.timestamps.loggedin': { $gt: new Date('2022-02-15') },
};
const fields = {

8
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.224.0",
"version": "4.224.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -13656,9 +13656,9 @@
}
},
"stripe": {
"version": "8.203.0",
"resolved": "https://registry.npmjs.org/stripe/-/stripe-8.203.0.tgz",
"integrity": "sha512-7iQYttuOUe8BHDA7gM4nBEQKSNueT/XXVvukbJufwyp0kC/SiYKbjBZPIkCWfoWNcO6dT281uXTzkoSrl+sSOg==",
"version": "8.207.0",
"resolved": "https://registry.npmjs.org/stripe/-/stripe-8.207.0.tgz",
"integrity": "sha512-ZCjdqN2adGfrC5uAAo0v7IquzaiQ3+pDzB324/iV3Q3Deiot9VO7KMVSNVx/0i6E6ywhgV33ko3FMT7iUgxKYA==",
"requires": {
"@types/node": ">=8.1.0",
"qs": "^6.6.0"

4
package.json
View file

@ -1,7 +1,7 @@
{
"name": "habitica",
"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",
"dependencies": {
"@babel/core": "^7.17.5",
@ -67,7 +67,7 @@
"remove-markdown": "^0.3.0",
"rimraf": "^3.0.2",
"short-uuid": "^4.2.0",
"stripe": "^8.203.0",
"stripe": "^8.207.0",
"superagent": "^7.1.1",
"universal-analytics": "^0.5.3",
"useragent": "^2.1.9",

5
website/common/locales/fr/achievements.json
View file

@ -126,5 +126,8 @@
"achievementShadeOfItAllText": "A dompté tous les familiers d'ombre.",
"achievementZodiacZookeeper": "Le Zoo-diaque",
"achievementZodiacZookeeperModalText": "Vous avez collecté tous les familiers du zodiaque !",
"achievementZodiacZookeeperText": "A collecté tous les familiers du zodiaque : Rat, Vache, Lapin, Serpent, Cheval, Mouton, Singe, Coq, Loup, Tigre, Cochon volant et Dragon !"
"achievementZodiacZookeeperText": "A collecté tous les familiers du zodiaque : Rat, Vache, Lapin, Serpent, Cheval, Mouton, Singe, Coq, Loup, Tigre, Cochon volant et Dragon !",
"achievementBirdsOfAFeatherText": "A collecté tous les familiers volants : Cochon volant, Hibou, Perroquet, Pterodactyle, Griffon, et Faucon.",
"achievementBirdsOfAFeather": "Oiseaux à une Plume",
"achievementBirdsOfAFeatherModalText": "Vous avez collecté tous les familiers volants !"
}

9
website/common/locales/fr/backgrounds.json
View file

@ -678,5 +678,12 @@
"backgroundOrangeGroveText": "Orangeraie",
"backgroundOrangeGroveNotes": "Baladez-vous dans une orangeraie parfumée.",
"backgroundIridescentCloudsText": "Nuages iridescents",
"backgroundIridescentCloudsNotes": "Flottez sur des nuages iridescents."
"backgroundIridescentCloudsNotes": "Flottez sur des nuages iridescents.",
"backgrounds032022": "Ensemble 94 : sorti en mars 2022",
"backgroundAnimalsDenNotes": "Installez-vous confortablement dans une tanière de créature des bois.",
"backgroundBrickWallWithIvyNotes": "Admirez un mur de brique avec du lierre.",
"backgroundFloweringPrairieText": "Prairie fleurie",
"backgroundFloweringPrairieNotes": "Gambadez dans une prairie fleurie.",
"backgroundBrickWallWithIvyText": "Mur de brique avec Lierre",
"backgroundAnimalsDenText": "Tanière de créature des bois"
}

3
website/common/locales/fr/subscriber.json
View file

@ -201,5 +201,6 @@
"mysterySet202111": "Ensemble de chronomancien cosmique",
"mysterySet202112": "Ensemble d'ondine antarctique",
"mysterySet202201": "Ensemble de gaieté de cœur de minuit",
"mysterySet202202": "Ensemble de queues jumelles turquoise"
"mysterySet202202": "Ensemble de queues jumelles turquoise",
"mysterySet202203": "Ensemble de libellule intrépide"
}

3
website/common/locales/pt/backgrounds.json
View file

@ -635,5 +635,6 @@
"backgrounds072021": "SET 86: Publicado em Julho de 2021",
"backgroundStoneTowerNotes": "Contempla os baluartes de uma Torre de Pedra para outra.",
"backgroundAutumnPoplarsNotes": "Delicia-te nas brilhantes sombras castanhas e douradas da Floresta Outonal de Álamo.",
"backgrounds022022": "Conjunto 93: Lançado em Fevereiro de 2022"
"backgrounds022022": "Conjunto 93: Lançado em Fevereiro de 2022",
"backgrounds032022": "SET 94: Publicado em Março de 2022"
}

5
website/common/locales/pt_BR/achievements.json
View file

@ -126,5 +126,8 @@
"achievementShadyCustomerText": "Coletou todos os Mascotes das Sombras.",
"achievementZodiacZookeeperModalText": "Você coletou todos os mascotes do zodíaco!",
"achievementZodiacZookeeper": "Guarda dos Animais do Zodíaco",
"achievementZodiacZookeeperText": "Chocou todos os mascotes do zodíaco: Rato, Vaca, Coelho, Cobra, Cavalo, Ovelha, Macaco, Galo, Lobo, Tigre, Porco Voador e Dragão!"
"achievementZodiacZookeeperText": "Chocou todos os mascotes do zodíaco: Rato, Vaca, Coelho, Cobra, Cavalo, Ovelha, Macaco, Galo, Lobo, Tigre, Porco Voador e Dragão!",
"achievementBirdsOfAFeather": "Valeu a Pena",
"achievementBirdsOfAFeatherText": "Coletou todos os mascotes voadores: Porco Voador, Coruja, Papagaio, Pterodáctilo, Grifo e Falcão.",
"achievementBirdsOfAFeatherModalText": "Você coletou todos os mascotes voadores!"
}

3
website/common/locales/pt_BR/backgrounds.json
View file

@ -668,5 +668,6 @@
"backgroundFortuneTellersShopNotes": "ouça sugestões irresistíveis sobre seu futuro numa Loja do Adivinho.",
"backgroundSpiralStaircaseNotes": "Suba, desça, sempre a rodar na Escadaria Espiral.",
"backgroundSpiralStaircaseText": "Escadaria Espiral",
"backgrounds022022": "Conjunto 93: Lançado em Fevereiro de 2022"
"backgrounds022022": "Conjunto 93: Lançado em Fevereiro de 2022",
"backgrounds032022": "Conjunto 94: Lançado em Março de 2022"
}

19
website/server/models/user/hooks.js
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('2022-02-02T20:00-05:00')) {
user.migration = '20220131_habit_birthday';
user.items.gear.owned.armor_special_birthday = true;
user.items.gear.equipped.armor = 'armor_special_birthday';
if (moment().isBefore('2022-03-15T20:00-04: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');