- http://www.allaboutcookies.org/manage-cookies/index.html for information on commonly used browsers.
+ https://www.allaboutcookies.org/manage-cookies/index.html for information on commonly used browsers.
For more information about targeting and advertising cookies and how you can opt out, you can also visit
http://optout.aboutads.info. Please be aware
+ >https://optout.aboutads.info. Please be aware
that if cookies are disabled, not all features of the Service may operate properly or as intended.
Third-Party Analytics Providers
diff --git a/website/client/src/components/static/terms.vue b/website/client/src/components/static/terms.vue
index c37b48b83e..e3b99aa39d 100644
--- a/website/client/src/components/static/terms.vue
+++ b/website/client/src/components/static/terms.vue
@@ -70,9 +70,9 @@
WITHIN THIRTY (30) DAYS OF YOUR PREMIUM PAYMENT DATE AS SHOWN ON YOUR PAYMENT BILL, YOU CAN REQUEST A FULL REFUND BY CONTACTING US AT ADMIN@HABITICA.COM. AFTER THIRTY (30) DAYS OF YOUR PREMIUM PAYMENT DATE, ANY PAYMENT REFUND IS SOLELY SUBJECT TO OUR DISCRETION. THE REFUND SHALL BE YOUR SOLE AND EXCLUSIVE REMEDY.
FOR ANY CUSTOMER WHO PURCHASED PREMIUM IN APPLE INC.'s APP STORE ("APP STORE"), PLEASE CONTACT APPLE INC.'s SUPPORT TEAM: http://reportaproblem.apple.com. APPLE'S APP STORE DOES NOT ALLOW DEVELOPERS TO ISSUE REFUND FOR APP STORE PURCHASES MADE BY CUSTOMERS.
+ >https://reportaproblem.apple.com. APPLE'S APP STORE DOES NOT ALLOW DEVELOPERS TO ISSUE REFUND FOR APP STORE PURCHASES MADE BY CUSTOMERS.
Warranty Disclaimer
THE SERVICE AND ANY CONTENT MADE AVAILABLE BY HABITRPG VIA THE SERVICE IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT ANY WARRANTIES OF ANY KIND, INCLUDING, WITHOUT LIMITATION, THAT THE SERVICE OR CONTENT WILL OPERATE ERROR-FREE OR THAT THE SERVICE OR CONTENT OR ITS SERVERS ARE FREE OF COMPUTER VIRUSES OR SIMILAR CONTAMINATION OR DESTRUCTIVE FEATURES.
diff --git a/website/common/locales/README.md b/website/common/locales/README.md
index 3f25e8a20a..c0e03a1e66 100644
--- a/website/common/locales/README.md
+++ b/website/common/locales/README.md
@@ -1,4 +1,4 @@
-HabitRPG's translations are managed at http://translate.habitica.com/
+HabitRPG's translations are managed at https://translate.habitica.com/
The files in this folder are automatically pulled from there, with
exception of the original American-English strings which are managed
@@ -10,5 +10,5 @@ request that your changes be translated; changes are automatically
copied to the translation website on a regular basis.
If you want to help with translations, please first read [Guidance for
-Linguists](http://habitica.fandom.com/wiki/Guidance_for_Linguists) and
+Linguists](https://habitica.fandom.com/wiki/Guidance_for_Linguists) and
note especially its information about the [Translations Trello card](https://trello.com/c/SvTsLdRF/12-translations).
diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json
index d0fce2dd93..3d1c84b6e2 100644
--- a/website/common/locales/en/questsContent.json
+++ b/website/common/locales/en/questsContent.json
@@ -702,7 +702,7 @@
"cuddleBuddiesNotes": "Contains 'The Killer Bunny', 'The Nefarious Ferret', and 'The Guinea Pig Gang'. Available until March 31.",
"aquaticAmigosText": "Aquatic Amigos Quest Bundle",
- "aquaticAmigosNotes": "Contains 'The Magical Axolotl', 'The Kraken of Inkomplete', and 'The Call of Octothulu'. Available until August 31.",
+ "aquaticAmigosNotes": "Contains 'The Magical Axolotl', 'The Kraken of Inkomplete', and 'The Call of Octothulu'. Available until June 30.",
"questSeaSerpentText": "Danger in the Depths: Sea Serpent Strike!",
"questSeaSerpentNotes": "Your streaks have you feeling lucky—it’s the perfect time for a trip to the seahorse racetrack. You board the submarine at Diligent Docks and settle in for the trip to Dilatory, but you’ve barely submerged when an impact rocks the sub, sending its occupants tumbling. “What’s going on?” @AriesFaries shouts.
You glance through a nearby porthole and are shocked by the wall of shimmering scales passing by it. “Sea serpent!” Captain @Witticaster calls through the intercom. “Brace yourselves, it’s coming ‘round again!” As you grip the arms of your seat, your unfinished tasks flash before your eyes. ‘Maybe if we work together and complete them,’ you think, ‘we can drive this monster away!’",
diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json
index f1147f768d..c883eaa79f 100644
--- a/website/common/locales/en/settings.json
+++ b/website/common/locales/en/settings.json
@@ -28,7 +28,6 @@
"deleteAccount": "Delete Account",
"deleteAccPop": "Cancel and remove your Habitica account.",
"feedback": "If you'd like to give us feedback, please enter it below - we'd love to know what you liked or didn't like about Habitica! Don't speak English well? No problem! Use the language you prefer.",
- "qrCode": "QR Code",
"dataExport": "Data Export",
"saveData": "Here are a few options for saving your data.",
"habitHistory": "Habit History",
diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js
index 5179cb1cd5..bda8e75941 100644
--- a/website/common/script/content/bundles.js
+++ b/website/common/script/content/bundles.js
@@ -128,8 +128,9 @@ const bundles = {
'kraken',
'octopus',
],
+ event: EVENTS.bundle202206,
canBuy () {
- return moment().isBetween('2020-07-14', '2020-08-02');
+ return moment().isBefore(EVENTS.bundle202206.end);
},
type: 'quests',
value: 7,
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 9ed33d8edb..ed7145637c 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -15,6 +15,10 @@ export const EVENTS = {
season: 'normal',
npcImageSuffix: '',
},
+ bundle202206: {
+ start:'2022-06-14T08:00-04:00',
+ end:'2022-06-30T20:00-04:00',
+ },
potions202205: {
start: '2022-05-17T08:00-04:00',
end: '2022-05-31T20:00-04:00',
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index 8d6bb0ec14..7950bbc467 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -1,5 +1,5 @@
import moment from 'moment';
-// import { EVENTS } from './constants';
+import { EVENTS } from './constants';
// Magic Hatching Potions are configured like this:
// type: 'premiumHatchingPotion', // note no "s" at the end
// path: 'premiumHatchingPotions.Rainbow',
@@ -45,34 +45,34 @@ const featuredItems = {
];
},
quests () {
- if (moment().isBefore('2022-05-31T20:00-04:00')) {
+ if (moment().isBefore(EVENTS.bundle202206.end)) {
return [
{
type: 'bundles',
- path: 'bundles.delightfulDinos',
+ path: 'bundles.aquaticAmigos',
},
{
type: 'quests',
- path: 'quests.alligator',
+ path: 'quests.seaserpent',
},
{
type: 'quests',
- path: 'quests.turtle',
+ path: 'quests.dolphin',
},
];
}
return [
{
type: 'quests',
- path: 'quests.ferret',
+ path: 'quests.badger',
},
{
type: 'quests',
- path: 'quests.silver',
+ path: 'quests.onyx',
},
{
type: 'quests',
- path: 'quests.basilist',
+ path: 'quests.rooster',
},
];
},
diff --git a/website/common/script/libs/statsComputed.js b/website/common/script/libs/statsComputed.js
index 150200f4da..5345f43c16 100644
--- a/website/common/script/libs/statsComputed.js
+++ b/website/common/script/libs/statsComputed.js
@@ -11,7 +11,7 @@ function equipmentStatBonusComputed (stat, user) {
// toObject is required here due to lodash values not working well with mongoose doc objects.
// if toObject doesn't exist, we can assume the object is already plain JSON
- // see http://stackoverflow.com/questions/25767334/underscore-js-keys-and-omit-not-working-as-expected
+ // see https://stackoverflow.com/questions/25767334/underscore-js-keys-and-omit-not-working-as-expected
const { equipped } = user.items.gear;
const equippedKeys = values(!equipped.toObject ? equipped : equipped.toObject());
diff --git a/website/server/controllers/api-v3/user.js b/website/server/controllers/api-v3/user.js
index 0aeb1bf4dc..bfd0f68c52 100644
--- a/website/server/controllers/api-v3/user.js
+++ b/website/server/controllers/api-v3/user.js
@@ -1318,8 +1318,8 @@ api.userSell = {
* @apiParam (Query) {String} path Full path to unlock. See "content" API call for list of items.
*
* @apiParamExample {curl} Example call:
- * curl -X POST http://habitica.com/api/v3/user/unlock?path=background.midnight_clouds
- * curl -X POST http://habitica.com/api/v3/user/unlock?path=hair.color.midnight
+ * curl -X POST https://habitica.com/api/v3/user/unlock?path=background.midnight_clouds
+ * curl -X POST https://habitica.com/api/v3/user/unlock?path=hair.color.midnight
*
* @apiSuccess {Object} data.purchased
* @apiSuccess {Object} data.items
diff --git a/website/server/controllers/api-v3/webhook.js b/website/server/controllers/api-v3/webhook.js
index 00b5bf54cb..c8f08d3059 100644
--- a/website/server/controllers/api-v3/webhook.js
+++ b/website/server/controllers/api-v3/webhook.js
@@ -43,7 +43,7 @@ const api = {};
* @apiParamExample {json} Task Activity Example
* {
* "enabled": true, // default
- * "url": "http://some-webhook-url.com",
+ * "url": "https://some-webhook-url.com",
* "label": "My Webhook",
* "type": "taskActivity", // default
* "options": {
@@ -56,7 +56,7 @@ const api = {};
* @apiParamExample {json} Group Chat Received Example
* {
* "enabled": true,
- * "url": "http://some-webhook-url.com",
+ * "url": "https://some-webhook-url.com",
* "label": "My Chat Webhook",
* "type": "groupChatReceived",
* "options": {
@@ -66,7 +66,7 @@ const api = {};
* @apiParamExample {json} User Activity Example
* {
* "enabled": true,
- * "url": "http://some-webhook-url.com",
+ * "url": "https://some-webhook-url.com",
* "label": "My Activity Webhook",
* "type": "userActivity",
* "options": { // set at least one to true
@@ -78,7 +78,7 @@ const api = {};
* @apiParamExample {json} Quest Activity Example
* {
* "enabled": true,
- * "url": "http://some-webhook-url.com",
+ * "url": "https://some-webhook-url.com",
* "label": "My Quest Webhook",
* "type": "questActivity",
* "options": { // set at least one to true
@@ -89,7 +89,7 @@ const api = {};
* }
* @apiParamExample {json} Minimal Example
* {
- * "url": "http://some-webhook-url.com"
+ * "url": "https://some-webhook-url.com"
* }
*
* @apiSuccess (201) {Object} data The created webhook
diff --git a/website/server/controllers/top-level/dataexport.js b/website/server/controllers/top-level/dataexport.js
index fd9a10c8bf..aaae4f411d 100644
--- a/website/server/controllers/top-level/dataexport.js
+++ b/website/server/controllers/top-level/dataexport.js
@@ -160,6 +160,7 @@ api.exportUserDataXml = {
/**
* @api {get} /export/avatar-:uuid.html Render a user avatar as an HTML page
* @apiName ExportUserAvatarHtml
+ * @apiDescription This HTML export feature is not currently working (https://github.com/HabitRPG/habitica/issues/9489).
* @apiGroup DataExport
*
* @apiParam (Path) {String} uuid The User ID of the user
diff --git a/website/server/controllers/top-level/qrcodes.js b/website/server/controllers/top-level/qrcodes.js
deleted file mode 100644
index 588b5c69bd..0000000000
--- a/website/server/controllers/top-level/qrcodes.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const api = {};
-
-api.redirectProfileQRCode = {
- method: 'GET',
- url: '/qr-code/user/:memberid',
- runCron: false,
- async handler (req, res) {
- req.checkParams('memberid', res.t('memberIdRequired')).notEmpty().isUUID();
-
- const validationErrors = req.validationErrors();
- if (validationErrors) throw validationErrors;
-
- res.redirect(301, `/static/front/#?memberId=${req.params.memberid}`);
- },
-};
-
-export default api;
diff --git a/website/server/libs/payments/google.js b/website/server/libs/payments/google.js
index 86f0967213..9beac9b2a4 100644
--- a/website/server/libs/payments/google.js
+++ b/website/server/libs/payments/google.js
@@ -244,11 +244,15 @@ api.cancelSubscribe = async function cancelSubscribe (user, headers) {
const purchases = iap.getPurchaseData(googleRes);
if (purchases.length === 0) throw new NotAuthorized(this.constants.RESPONSE_INVALID_RECEIPT);
- const subscriptionData = purchases[0];
- // Check to make sure the sub isn't active anymore.
- if (subscriptionData.autoRenewing !== false) return;
-
- dateTerminated = new Date(Number(subscriptionData.expirationDate));
+ for (const i in purchases) {
+ if (Object.prototype.hasOwnProperty.call(purchases, i)) {
+ const purchase = purchases[i];
+ if (purchase.autoRenewing !== false) return;
+ if (!dateTerminated || Number(purchase.expirationDate) > Number(dateTerminated)) {
+ dateTerminated = new Date(Number(purchase.expirationDate));
+ }
+ }
+ }
} catch (err) {
// Status:410 means that the subsctiption isn't active anymore and we can safely delete it
if (err && err.message === 'Status:410') {
@@ -257,13 +261,14 @@ api.cancelSubscribe = async function cancelSubscribe (user, headers) {
throw err;
}
}
-
- await payments.cancelSubscription({
- user,
- nextBill: dateTerminated,
- paymentMethod: this.constants.PAYMENT_METHOD_GOOGLE,
- headers,
- });
+ if (dateTerminated) {
+ await payments.cancelSubscription({
+ user,
+ nextBill: dateTerminated,
+ paymentMethod: this.constants.PAYMENT_METHOD_GOOGLE,
+ headers,
+ });
+ }
};
export default api;
diff --git a/website/server/libs/user/index.js b/website/server/libs/user/index.js
index 6ff39ef1b9..f2aa73df69 100644
--- a/website/server/libs/user/index.js
+++ b/website/server/libs/user/index.js
@@ -58,7 +58,7 @@ const updatablePaths = [
];
// This tells us for which paths users can call `PUT /user`.
-// The trick here is to only accept leaf paths, not root/intermediate paths (see http://goo.gl/OEzkAs)
+// The trick here is to only accept leaf paths, not root/intermediate paths (see https://goo.gl/OEzkAs)
const acceptablePUTPaths = _.reduce(UserSchema.paths, (accumulator, val, leaf) => {
const found = _.find(updatablePaths, rootPath => leaf.indexOf(rootPath) === 0);
diff --git a/website/server/middlewares/notFound.js b/website/server/middlewares/notFound.js
index feb73d8a7f..77f858e353 100644
--- a/website/server/middlewares/notFound.js
+++ b/website/server/middlewares/notFound.js
@@ -13,7 +13,6 @@ const TOP_LEVEL_ROUTES = [
'/stripe',
'/export',
'/email',
- '/qr-code',
// logout, old-client
// and /static/user/auth/local/reset-password-set-new-one don't need the not found
// handler because they don't have any child route
diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js
index 93a4df68b9..58340c73cd 100644
--- a/website/server/models/user/hooks.js
+++ b/website/server/models/user/hooks.js
@@ -246,7 +246,7 @@ schema.pre('save', true, function preSaveUser (next, done) {
// use the default values defined in the user schema and not the real ones.
//
// To check if a field was selected Document.isDirectSelected('field') can be used.
- // more info on its usage can be found at http://mongoosejs.com/docs/api.html#document_Document-isDirectSelected
+ // more info on its usage can be found at https://mongoosejs.com/docs/api.html#document_Document-isDirectSelected
// do not calculate achievements if items or achievements are not selected
if (this.isDirectSelected('items') && this.isDirectSelected('achievements')) {
diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js
index 9e9fd4fd5d..868c158a6c 100644
--- a/website/server/models/user/schema.js
+++ b/website/server/models/user/schema.js
@@ -68,7 +68,7 @@ export default new Schema({
},
// We want to know *every* time an object updates.
// Mongoose uses __v to designate when an object contains arrays which
- // have been updated (http://goo.gl/gQLz41), but we want *every* update
+ // have been updated, but we want *every* update
_v: { $type: Number, default: 0 },
migration: String,
achievements: {
@@ -441,7 +441,7 @@ export default new Schema({
// Using an array without validation because otherwise mongoose
// treat this as a subdocument and applies _id by default
// Schema is (id, name, inviter, publicGuild)
- // TODO one way to fix is http://mongoosejs.com/docs/guide.html#_id
+ // TODO one way to fix is https://mongoosejs.com/docs/guide.html#_id
guilds: { $type: Array, default: () => [] },
// Using a Mixed type because otherwise user.invitations.party = {}
// to reset invitation, causes validation to fail TODO