From 0ea1ce9758c6d9e8b1d7f6dc8016a2226dbf6266 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Wed, 8 Apr 2020 23:31:17 +0200 Subject: [PATCH 1/8] fix(logs): do not log mongoose object with id and no _id to avoid crashes, see https://github.com/davidmarkclements/fast-safe-stringify/issues/43 --- website/server/libs/webhook.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/server/libs/webhook.js b/website/server/libs/webhook.js index c7d201e829..896497af75 100644 --- a/website/server/libs/webhook.js +++ b/website/server/libs/webhook.js @@ -22,7 +22,7 @@ function sendWebhook (webhook, body, user) { logger.error(webhookErr, { extraMessage: 'Error while sending a webhook request.', userId: user._id, - webhook, + webhookId: webhook.id, }); let _failuresReset = false; From e19837f58e55d18b79650ca1a171f333169d72da Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Wed, 8 Apr 2020 23:31:26 +0200 Subject: [PATCH 2/8] 4.140.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 6c348bdd00..30eb365c43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.140.0", + "version": "4.140.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 52f81fb823..9559fa38ef 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.140.0", + "version": "4.140.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.9.0", From 0ac0723be5cce31deeecc2902c3a4476ebd1768c Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 9 Apr 2020 06:28:11 -0500 Subject: [PATCH 3/8] 4.140.2 --- 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 8f4ec41751..6a6daa7aad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.140.1", + "version": "4.140.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0ca339c203..de5a9c1859 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.140.1", + "version": "4.140.2", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.9.0", From 39765895eef87f0c345c8189db23042187f89687 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 10 Apr 2020 13:53:52 -0500 Subject: [PATCH 4/8] fix(quest): call out limited time --- .../components/shops/quests/buyQuestModal.vue | 53 +++++++++++-- .../src/components/shops/quests/questInfo.vue | 78 +++++++++++-------- website/common/script/content/quests.js | 1 + website/common/script/libs/getItemInfo.js | 1 + 4 files changed, 94 insertions(+), 39 deletions(-) diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue index 6f282d068a..c95bb14662 100644 --- a/website/client/src/components/shops/quests/buyQuestModal.vue +++ b/website/client/src/components/shops/quests/buyQuestModal.vue @@ -82,6 +82,16 @@ > +
+ + {{ limitedString }} +