From 78c3a8e4ac10c719605023030e55032692a7b2c8 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Thu, 10 Mar 2022 12:35:10 -0500 Subject: [PATCH 1/5] chore(submodule): update habitica-images --- habitica-images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/habitica-images b/habitica-images index 8d7fa3c3da..30c7e4a39d 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 8d7fa3c3dae2d3718886fff5e8026b8ba8aeb7fb +Subproject commit 30c7e4a39dee61ac8e9eb127dcc1f8d4af6b2313 From f69e43a9bc555c96cb3dc929704a25e7a12b807a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Mar 2022 13:32:16 -0500 Subject: [PATCH 2/5] build(deps): bump stripe from 8.203.0 to 8.207.0 (#13880) Bumps [stripe](https://github.com/stripe/stripe-node) from 8.203.0 to 8.207.0. - [Release notes](https://github.com/stripe/stripe-node/releases) - [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/stripe/stripe-node/compare/v8.203.0...v8.207.0) --- updated-dependencies: - dependency-name: stripe dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 363e0ed89c..2555dce90a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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" diff --git a/package.json b/package.json index 09f38d9792..560e0390b1 100644 --- a/package.json +++ b/package.json @@ -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", From 5fb284abeb75e011a196287914f871426d9a5efb Mon Sep 17 00:00:00 2001 From: Weblate Date: Sun, 13 Mar 2022 11:16:43 +0100 Subject: [PATCH 3/5] Translated using Weblate (French) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (196 of 196 strings) Translated using Weblate (Portuguese (Brazil)) Currently translated at 98.2% (670 of 682 strings) Translated using Weblate (Portuguese) Currently translated at 93.4% (637 of 682 strings) Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (131 of 131 strings) Translated using Weblate (French) Currently translated at 100.0% (682 of 682 strings) Translated using Weblate (French) Currently translated at 100.0% (131 of 131 strings) Co-authored-by: Benoit Hetru Co-authored-by: Céu Co-authored-by: TessAliz Co-authored-by: Weblate Translate-URL: https://translate.habitica.com/projects/habitica/achievements/fr/ Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pt_BR/ Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/fr/ Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt/ Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt_BR/ Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/fr/ Translation: Habitica/Achievements Translation: Habitica/Backgrounds Translation: Habitica/Subscriber --- website/common/locales/fr/achievements.json | 5 ++++- website/common/locales/fr/backgrounds.json | 9 ++++++++- website/common/locales/fr/subscriber.json | 3 ++- website/common/locales/pt/backgrounds.json | 3 ++- website/common/locales/pt_BR/achievements.json | 5 ++++- website/common/locales/pt_BR/backgrounds.json | 3 ++- 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/website/common/locales/fr/achievements.json b/website/common/locales/fr/achievements.json index 51ea742d1c..1b6dce4f1e 100644 --- a/website/common/locales/fr/achievements.json +++ b/website/common/locales/fr/achievements.json @@ -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 !" } diff --git a/website/common/locales/fr/backgrounds.json b/website/common/locales/fr/backgrounds.json index 63a5a3faee..518268874a 100644 --- a/website/common/locales/fr/backgrounds.json +++ b/website/common/locales/fr/backgrounds.json @@ -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" } diff --git a/website/common/locales/fr/subscriber.json b/website/common/locales/fr/subscriber.json index 382cc4709b..bec8d5341b 100644 --- a/website/common/locales/fr/subscriber.json +++ b/website/common/locales/fr/subscriber.json @@ -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" } diff --git a/website/common/locales/pt/backgrounds.json b/website/common/locales/pt/backgrounds.json index d30f5a271c..fca7a8dfe1 100644 --- a/website/common/locales/pt/backgrounds.json +++ b/website/common/locales/pt/backgrounds.json @@ -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" } diff --git a/website/common/locales/pt_BR/achievements.json b/website/common/locales/pt_BR/achievements.json index 682c468954..54ed706afa 100644 --- a/website/common/locales/pt_BR/achievements.json +++ b/website/common/locales/pt_BR/achievements.json @@ -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!" } diff --git a/website/common/locales/pt_BR/backgrounds.json b/website/common/locales/pt_BR/backgrounds.json index e211cd990e..ead6b63eaf 100644 --- a/website/common/locales/pt_BR/backgrounds.json +++ b/website/common/locales/pt_BR/backgrounds.json @@ -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" } From 3e082fe1278b3e4393270be2fadaac66e9e9dddd Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 14 Mar 2022 14:29:57 -0500 Subject: [PATCH 4/5] chore(event): Pi Day 2022 --- migrations/users/pi-day.js | 4 ++-- website/server/models/user/hooks.js | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/migrations/users/pi-day.js b/migrations/users/pi-day.js index 5aa1f40f53..f017c5ecda 100644 --- a/migrations/users/pi-day.js +++ b/migrations/users/pi-day.js @@ -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 = { diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js index ad3a2ec323..4e5a018a5a 100644 --- a/website/server/models/user/hooks.js +++ b/website/server/models/user/hooks.js @@ -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'); From dd86b96433499d7f6afdb26731c22cb10cbb42d6 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 14 Mar 2022 14:30:20 -0500 Subject: [PATCH 5/5] 4.224.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c704b00951..1e7aef2643 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.224.0", + "version": "4.224.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b6a2503ad2..e8dc9e25d2 100644 --- a/package.json +++ b/package.json @@ -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.16.12",