4.240.0

* chore(submodule): add August 2022 Mystery Items

* chore: update habitica-images

* chore(content): add Porcelain Magic Hatching Potion

* chore(content): update moonglow potion availability

* fix(events): no gap between events

Co-authored-by: Sabe Jones <sabrecat@gmail.com>

config.json.example

@@ -1,4 +1,5 @@
 {
+  "ACCOUNT_MIN_CHAT_AGE": "0",
   "ADMIN_EMAIL": "you@example.com",
   "AMAZON_PAYMENTS_CLIENT_ID": "CLIENT_ID",
   "AMAZON_PAYMENTS_MODE": "sandbox",

database_reports/count_users_who_own_specified_gear.js

@@ -119,7 +119,7 @@ function path(obj, path, def) {
  * @param {String} path dot separated
  * @param {*} def default value ( if result undefined )
  * @returns {*}
- * http://stackoverflow.com/a/16190716
+ * https://stackoverflow.com/a/16190716
  * Usage: console.log(path(someObject, pathname));
  */
     for(var i = 0,path = path.split('.'),len = path.length; i < len; i++){

migrations/archive/2013/20131028_task_subdocs_tags_invites.js

@@ -2,7 +2,7 @@
 
 // TODO it might be better we just find() and save() all user objects using mongoose, and rely on our defined pre('save')
 // and default values to "migrate" users. This way we can make sure those parts are working properly too
-// @see http://stackoverflow.com/questions/14867697/mongoose-full-collection-scan
+// @see https://stackoverflow.com/questions/14867697/mongoose-full-collection-scan
 // Also, what do we think of a Mongoose Migration module? something like https://github.com/madhums/mongoose-migrate
 
 // IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.

migrations/archive/2017/20170111_announce_collection_quest_change_in_parties.js

@@ -19,7 +19,7 @@ const Timer = require('./utils/timer');
 const connectToDb = require('./utils/connect').connectToDb;
 const closeDb = require('./utils/connect').closeDb;
 
-const message = '`This party\'s collection quest has been made easier! For details, refer to http://habitica.fandom.com/wiki/User_blog:LadyAlys/Collection_Quests_are_Now_Easier`';
+const message = '`This party\'s collection quest has been made easier! For details, refer to https://habitica.fandom.com/wiki/User_blog:LadyAlys/Collection_Quests_are_Now_Easier`';
 
 const timer = new Timer();
 

migrations/archive/2022/20220524_pet_group_achievements.js

@@ -0,0 +1,128 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20220524_pet_group_achievements';
+import { model as User } from '../../../website/server/models/user';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  const set = {
+    migration: MIGRATION_NAME,
+  };
+
+  if (user && user.items && user.items.pets) {
+    const pets = user.items.pets;
+    if (pets['Alligator-Base']
+      && pets['Alligator-CottonCandyBlue']
+      && pets['Alligator-CottonCandyPink']
+      && pets['Alligator-Desert']
+      && pets['Alligator-Golden']
+      && pets['Alligator-Red']
+      && pets['Alligator-Shade']
+      && pets['Alligator-Skeleton']
+      && pets['Alligator-White']
+      && pets['Alligator-Zombie']
+      && pets['Snake-Base']
+      && pets['Snake-CottonCandyBlue']
+      && pets['Snake-CottonCandyPink']
+      && pets['Snake-Desert']
+      && pets['Snake-Golden']
+      && pets['Snake-Red']
+      && pets['Snake-Shade']
+      && pets['Snake-Skeleton']
+      && pets['Snake-White']
+      && pets['Snake-Zombie']
+      && pets['Triceratops-Base']
+      && pets['Triceratops-CottonCandyBlue']
+      && pets['Triceratops-CottonCandyPink']
+      && pets['Triceratops-Desert']
+      && pets['Triceratops-Golden']
+      && pets['Triceratops-Red']
+      && pets['Triceratops-Shade']
+      && pets['Triceratops-Skeleton']
+      && pets['Triceratops-White']
+      && pets['Triceratops-Zombie']
+      && pets['TRex-Base']
+      && pets['TRex-CottonCandyBlue']
+      && pets['TRex-CottonCandyPink']
+      && pets['TRex-Desert']
+      && pets['TRex-Golden']
+      && pets['TRex-Red']
+      && pets['TRex-Shade']
+      && pets['TRex-Skeleton']
+      && pets['TRex-White']
+      && pets['TRex-Zombie']
+      && pets['Pterodactyl-Base']
+      && pets['Pterodactyl-CottonCandyBlue']
+      && pets['Pterodactyl-CottonCandyPink']
+      && pets['Pterodactyl-Desert']
+      && pets['Pterodactyl-Golden']
+      && pets['Pterodactyl-Red']
+      && pets['Pterodactyl-Shade']
+      && pets['Pterodactyl-Skeleton']
+      && pets['Pterodactyl-White']
+      && pets['Pterodactyl-Zombie']
+      && pets['Turtle-Base']
+      && pets['Turtle-CottonCandyBlue']
+      && pets['Turtle-CottonCandyPink']
+      && pets['Turtle-Desert']
+      && pets['Turtle-Golden']
+      && pets['Turtle-Red']
+      && pets['Turtle-Shade']
+      && pets['Turtle-Skeleton']
+      && pets['Turtle-White']
+      && pets['Turtle-Zombie']
+      && pets['Velociraptor-Base']
+      && pets['Velociraptor-CottonCandyBlue']
+      && pets['Velociraptor-CottonCandyPink']
+      && pets['Velociraptor-Desert']
+      && pets['Velociraptor-Golden']
+      && pets['Velociraptor-Red']
+      && pets['Velociraptor-Shade']
+      && pets['Velociraptor-Skeleton']
+      && pets['Velociraptor-White']
+      && pets['Velociraptor-Zombie']) {
+        set['achievements.reptacularRumble'] = true;
+      }
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return await User.update({ _id: user._id }, { $set: set }).exec();
+}
+
+export default async function processUsers () {
+  let query = {
+    // migration: { $ne: MIGRATION_NAME },
+    'auth.timestamps.loggedin': { $gt: new Date('2022-01-01') },
+  };
+
+  const fields = {
+    _id: 1,
+    items: 1,
+  };
+
+  while (true) { // eslint-disable-line no-constant-condition
+    const users = await User // eslint-disable-line no-await-in-loop
+      .find(query)
+      .limit(250)
+      .sort({_id: 1})
+      .select(fields)
+      .lean()
+      .exec();
+
+    if (users.length === 0) {
+      console.warn('All appropriate users found and modified.');
+      console.warn(`\n${count} users processed\n`);
+      break;
+    } else {
+      query._id = {
+        $gt: users[users.length - 1]._id,
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};

migrations/archive/s3-upload.js

@@ -16,7 +16,7 @@ AWS.config.update({
 const BUCKET_NAME = config.S3.bucket;
 const s3 = new AWS.S3();
 
-// Adapted from http://stackoverflow.com/a/22210077/2601552
+// Adapted from https://stackoverflow.com/a/22210077/2601552
 function uploadFile (buffer, fileName) {
   return new Promise((resolve, reject) => {
     s3.putObject({

migrations/command-line/cancelSubscription.js

@@ -2,7 +2,7 @@
 
 // For some reason people often to contact me to cancel their sub,
 // rather than do it online. Even when I point them to
-// the FAQ (http://goo.gl/1uoPGQ) they insist...
+// the FAQ (https://habitica.fandom.com/wiki/FAQ) they insist...
 
 db.users.update(
   { _id: '' },

package.json

@@ -1,19 +1,19 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.230.3",
+  "version": "4.240.0",
   "main": "./website/server/index.js",
   "dependencies": {
-    "@babel/core": "^7.17.10",
-    "@babel/preset-env": "^7.17.10",
-    "@babel/register": "^7.17.7",
+    "@babel/core": "^7.18.6",
+    "@babel/preset-env": "^7.18.6",
+    "@babel/register": "^7.18.6",
     "@google-cloud/trace-agent": "^5.1.6",
     "@parse/node-apn": "^5.1.3",
     "@slack/webhook": "^6.1.0",
     "accepts": "^1.3.8",
     "amazon-payments": "^0.2.9",
     "amplitude": "^6.0.0",
-    "apidoc": "^0.51.1",
+    "apidoc": "^0.52.0",
     "apple-auth": "^1.0.7",
     "bcrypt": "^5.0.1",
     "body-parser": "^1.20.0",
@@ -30,24 +30,24 @@
     "express": "^4.18.1",
     "express-basic-auth": "^1.2.1",
     "express-validator": "^5.2.0",
-    "glob": "^8.0.1",
+    "glob": "^8.0.3",
     "got": "^11.8.3",
     "gulp": "^4.0.0",
     "gulp-babel": "^8.0.0",
     "gulp-imagemin": "^7.1.0",
     "gulp-nodemon": "^2.5.0",
-    "gulp.spritesmith": "^6.12.1",
+    "gulp.spritesmith": "^6.13.0",
     "habitica-markdown": "^3.0.0",
     "helmet": "^4.6.0",
-    "image-size": "^1.0.1",
+    "image-size": "^1.0.2",
     "in-app-purchase": "^1.11.3",
     "js2xmlparser": "^4.0.2",
     "jsonwebtoken": "^8.5.1",
-    "jwks-rsa": "^2.1.1",
+    "jwks-rsa": "^2.1.4",
     "lodash": "^4.17.21",
     "merge-stream": "^2.0.0",
     "method-override": "^3.0.0",
-    "moment": "^2.29.3",
+    "moment": "^2.29.4",
     "moment-recur": "^1.0.7",
     "mongoose": "^5.13.7",
     "morgan": "^1.10.0",
@@ -68,13 +68,13 @@
     "rimraf": "^3.0.2",
     "short-uuid": "^4.2.0",
     "stripe": "^8.222.0",
-    "superagent": "^7.1.3",
+    "superagent": "^7.1.6",
     "universal-analytics": "^0.5.3",
     "useragent": "^2.1.9",
     "uuid": "^8.3.2",
     "validator": "^13.7.0",
     "vinyl-buffer": "^1.0.1",
-    "winston": "^3.7.2",
+    "winston": "^3.8.1",
     "winston-loggly-bulk": "^3.2.1",
     "xml2js": "^0.4.23"
   },

test/api/unit/libs/payments/google.test.js

@@ -326,6 +326,36 @@ describe('Google Payments', () => {
       });
     });
 
+    it('should cancel a user subscription with multiple inactive subscriptions', async () => {
+      const laterDate = moment.utc().add(7, 'days');
+      iap.getPurchaseData.restore();
+      iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
+        .returns([{ expirationDate, autoRenewing: false },
+          { expirationDate: laterDate, autoRenewing: false },
+        ]);
+      await googlePayments.cancelSubscribe(user, headers);
+
+      expect(iapSetupStub).to.be.calledOnce;
+      expect(iapValidateStub).to.be.calledOnce;
+      expect(iapValidateStub).to.be.calledWith(iap.GOOGLE, {
+        data: receipt,
+        signature,
+      });
+      expect(iapIsValidatedStub).to.be.calledOnce;
+      expect(iapIsValidatedStub).to.be.calledWith({
+        expirationDate,
+      });
+      expect(iapGetPurchaseDataStub).to.be.calledOnce;
+
+      expect(paymentCancelSubscriptionSpy).to.be.calledOnce;
+      expect(paymentCancelSubscriptionSpy).to.be.calledWith({
+        user,
+        paymentMethod: googlePayments.constants.PAYMENT_METHOD_GOOGLE,
+        nextBill: laterDate.toDate(),
+        headers,
+      });
+    });
+
     it('should not cancel a user subscription with autorenew', async () => {
       iap.getPurchaseData.restore();
       iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
@@ -346,5 +376,28 @@ describe('Google Payments', () => {
 
       expect(paymentCancelSubscriptionSpy).to.not.be.called;
     });
+
+    it('should not cancel a user subscription with multiple subscriptions with one autorenew', async () => {
+      iap.getPurchaseData.restore();
+      iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
+        .returns([{ expirationDate, autoRenewing: false },
+          { autoRenewing: true },
+          { expirationDate, autoRenewing: false }]);
+      await googlePayments.cancelSubscribe(user, headers);
+
+      expect(iapSetupStub).to.be.calledOnce;
+      expect(iapValidateStub).to.be.calledOnce;
+      expect(iapValidateStub).to.be.calledWith(iap.GOOGLE, {
+        data: receipt,
+        signature,
+      });
+      expect(iapIsValidatedStub).to.be.calledOnce;
+      expect(iapIsValidatedStub).to.be.calledWith({
+        expirationDate,
+      });
+      expect(iapGetPurchaseDataStub).to.be.calledOnce;
+
+      expect(paymentCancelSubscriptionSpy).to.not.be.called;
+    });
   });
 });

test/api/v3/integration/challenges/POST-challenges.test.js

@@ -4,6 +4,7 @@ import {
   createAndPopulateGroup,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
+import { MAX_SUMMARY_SIZE_FOR_CHALLENGES } from '../../../../../website/common/script/constants';
 
 describe('POST /challenges', () => {
   it('returns error when group is empty', async () => {
@@ -60,6 +61,22 @@ describe('POST /challenges', () => {
     });
   });
 
+  it('return error when creating a challenge with summary with greater than MAX_SUMMARY_SIZE_FOR_CHALLENGES characters', async () => {
+    const user = await generateUser();
+    const summary = 'A'.repeat(MAX_SUMMARY_SIZE_FOR_CHALLENGES + 1);
+    const group = createAndPopulateGroup({
+      members: 1,
+    });
+    await expect(user.post('/challenges', {
+      group: group._id,
+      summary,
+    })).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('invalidReqParams'),
+    });
+  });
+
   context('Creating a challenge for a valid group', () => {
     let groupLeader;
     let group;

test/api/v3/integration/challenges/PUT-challenges_challengeId.test.js

@@ -4,6 +4,7 @@ import {
   createAndPopulateGroup,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
+import { MAX_SUMMARY_SIZE_FOR_CHALLENGES } from '../../../../../website/common/script/constants';
 
 describe('PUT /challenges/:challengeId', () => {
   let privateGuild; let user; let nonMember; let challenge; let
@@ -91,4 +92,15 @@ describe('PUT /challenges/:challengeId', () => {
     expect(res.name).to.equal('New Challenge Name');
     expect(res.description).to.equal('New challenge description.');
   });
+
+  it('return error when challenge summary is greater than MAX_SUMMARY_SIZE_FOR_CHALLENGES characters', async () => {
+    const summary = 'A'.repeat(MAX_SUMMARY_SIZE_FOR_CHALLENGES + 1);
+    await expect(user.put(`/challenges/${challenge._id}`, {
+      summary,
+    })).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('invalidReqParams'),
+    });
+  });
 });

test/api/v3/integration/chat/DELETE-chat_id.test.js

@@ -15,6 +15,10 @@ describe('DELETE /groups/:groupId/chat/:chatId', () => {
         type: 'guild',
         privacy: 'public',
       },
+      leaderDetails: {
+        'auth.timestamps.created': new Date('2022-01-01'),
+        balance: 10,
+      },
     });
 
     groupWithChat = group;

test/api/v3/integration/chat/POST-chat.flag.test.js

@@ -117,7 +117,9 @@ describe('POST /chat/:chatId/flag', () => {
   });
 
   it('Flags a chat when the author\'s account was deleted', async () => {
-    const deletedUser = await generateUser();
+    const deletedUser = await generateUser({
+      'auth.timestamps.created': new Date('2022-01-01'),
+    });
     const { message } = await deletedUser.post(`/groups/${group._id}/chat`, { message: TEST_MESSAGE });
     await deletedUser.del('/user', {
       password: 'password',

test/api/v3/integration/chat/POST-chat.like.test.js

@@ -18,11 +18,16 @@ describe('POST /chat/:chatId/like', () => {
         privacy: 'public',
       },
       members: 1,
+      leaderDetails: {
+        'auth.timestamps.created': new Date('2022-01-01'),
+        balance: 10,
+      },
     });
 
     user = groupLeader;
     groupWithChat = group;
     anotherUser = members[0]; // eslint-disable-line prefer-destructuring
+    await anotherUser.update({ 'auth.timestamps.created': new Date('2022-01-01') });
   });
 
   it('Returns an error when chat message is not found', async () => {

test/api/v3/integration/chat/POST-chat.test.js

@@ -38,10 +38,15 @@ describe('POST /chat', () => {
       members: 2,
     });
     user = groupLeader;
-    await user.update({ 'contributor.level': SPAM_MIN_EXEMPT_CONTRIB_LEVEL }); // prevent tests accidentally throwing messageGroupChatSpam
+    await user.update({
+      'contributor.level': SPAM_MIN_EXEMPT_CONTRIB_LEVEL,
+      'auth.timestamps.created': new Date('2022-01-01'),
+    }); // prevent tests accidentally throwing messageGroupChatSpam
     groupWithChat = group;
     member = members[0]; // eslint-disable-line prefer-destructuring
     additionalMember = members[1]; // eslint-disable-line prefer-destructuring
+    await member.update({ 'auth.timestamps.created': new Date('2022-01-01') });
+    await additionalMember.update({ 'auth.timestamps.created': new Date('2022-01-01') });
   });
 
   it('Returns an error when no message is provided', async () => {
@@ -104,7 +109,10 @@ describe('POST /chat', () => {
       });
 
       const privateGuildMemberWithChatsRevoked = members[0];
-      await privateGuildMemberWithChatsRevoked.update({ 'flags.chatRevoked': true });
+      await privateGuildMemberWithChatsRevoked.update({
+        'flags.chatRevoked': true,
+        'auth.timestamps.created': new Date('2022-01-01'),
+      });
 
       const message = await privateGuildMemberWithChatsRevoked.post(`/groups/${group._id}/chat`, { message: testMessage });
 
@@ -122,7 +130,10 @@ describe('POST /chat', () => {
       });
 
       const privatePartyMemberWithChatsRevoked = members[0];
-      await privatePartyMemberWithChatsRevoked.update({ 'flags.chatRevoked': true });
+      await privatePartyMemberWithChatsRevoked.update({
+        'flags.chatRevoked': true,
+        'auth.timestamps.created': new Date('2022-01-01'),
+      });
 
       const message = await privatePartyMemberWithChatsRevoked.post(`/groups/${group._id}/chat`, { message: testMessage });
 
@@ -183,7 +194,10 @@ describe('POST /chat', () => {
       });
 
       const userWithChatShadowMuted = members[0];
-      await userWithChatShadowMuted.update({ 'flags.chatShadowMuted': true });
+      await userWithChatShadowMuted.update({
+        'flags.chatShadowMuted': true,
+        'auth.timestamps.created': new Date('2022-01-01'),
+      });
 
       const message = await userWithChatShadowMuted.post(`/groups/${group._id}/chat`, { message: testMessage });
 
@@ -202,7 +216,10 @@ describe('POST /chat', () => {
       });
 
       const userWithChatShadowMuted = members[0];
-      await userWithChatShadowMuted.update({ 'flags.chatShadowMuted': true });
+      await userWithChatShadowMuted.update({
+        'flags.chatShadowMuted': true,
+        'auth.timestamps.created': new Date('2022-01-01'),
+      });
 
       const message = await userWithChatShadowMuted.post(`/groups/${group._id}/chat`, { message: testMessage });
 
@@ -312,6 +329,7 @@ describe('POST /chat', () => {
         },
         members: 1,
       });
+      await members[0].update({ 'auth.timestamps.created': new Date('2022-01-01') });
 
       const message = await members[0].post(`/groups/${group._id}/chat`, { message: testBannedWordMessage });
 
@@ -330,6 +348,7 @@ describe('POST /chat', () => {
 
       // Update the bannedWordsAllowed property for the group
       group.update({ bannedWordsAllowed: true });
+      await members[0].update({ 'auth.timestamps.created': new Date('2022-01-01') });
 
       const message = await members[0].post(`/groups/${group._id}/chat`, { message: testBannedWordMessage });
 
@@ -345,6 +364,7 @@ describe('POST /chat', () => {
         },
         members: 1,
       });
+      await members[0].update({ 'auth.timestamps.created': new Date('2022-01-01') });
 
       const message = await members[0].post(`/groups/${group._id}/chat`, { message: testBannedWordMessage });
 
@@ -402,7 +422,7 @@ describe('POST /chat', () => {
       });
     });
 
-    it('does not allow slurs in private groups', async () => {
+    it('allows slurs in private groups', async () => {
       const { group, members } = await createAndPopulateGroup({
         groupDetails: {
           name: 'Party',
@@ -411,43 +431,11 @@ describe('POST /chat', () => {
         },
         members: 1,
       });
+      await members[0].update({ 'auth.timestamps.created': new Date('2022-01-01') });
 
-      await expect(members[0].post(`/groups/${group._id}/chat`, { message: testSlurMessage })).to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('bannedSlurUsed'),
-      });
+      const message = await members[0].post(`/groups/${group._id}/chat`, { message: testSlurMessage });
 
-      // Email sent to mods
-      await sleep(0.5);
-      expect(email.sendTxn).to.be.calledThrice;
-      expect(email.sendTxn.args[2][1]).to.eql('slur-report-to-mods');
-
-      // Slack message to mods
-      expect(IncomingWebhook.prototype.send).to.be.calledOnce;
-      /* eslint-disable camelcase */
-      expect(IncomingWebhook.prototype.send).to.be.calledWith({
-        text: `${members[0].profile.name} (${members[0].id}) tried to post a slur`,
-        attachments: [{
-          fallback: 'Slur Message',
-          color: 'danger',
-          author_name: `@${members[0].auth.local.username} ${members[0].profile.name} (${members[0].auth.local.email}; ${members[0]._id})`,
-          title: 'Slur in Party - (private party)',
-          title_link: undefined,
-          text: testSlurMessage,
-          mrkdwn_in: [
-            'text',
-          ],
-        }],
-      });
-      /* eslint-enable camelcase */
-
-      // Chat privileges are revoked
-      await expect(members[0].post(`/groups/${groupWithChat._id}/chat`, { message: testMessage })).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('chatPrivilegesRevoked'),
-      });
+      expect(message.message.id).to.exist;
     });
 
     it('errors when slur is typed in mixed case', async () => {
@@ -463,6 +451,16 @@ describe('POST /chat', () => {
     });
   });
 
+  it('errors when user account is too young', async () => {
+    const brandNewUser = await generateUser();
+    await expect(brandNewUser.post('/groups/habitrpg/chat', { message: 'hi im new' }))
+      .to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: t('chatTemporarilyUnavailable'),
+      });
+  });
+
   it('creates a chat', async () => {
     const newMessage = await user.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
     const groupMessages = await user.get(`/groups/${groupWithChat._id}/chat`);
@@ -525,6 +523,7 @@ describe('POST /chat', () => {
       'items.currentMount': mount,
       'items.currentPet': pet,
       'preferences.style': style,
+      'auth.timestamps.created': new Date('2022-01-01'),
     });
     await userWithStyle.sync();
 
@@ -550,6 +549,7 @@ describe('POST /chat', () => {
     };
     const backer = await generateUser({
       backer: backerInfo,
+      'auth.timestamps.created': new Date('2022-01-01'),
     });
 
     const message = await backer.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
@@ -620,6 +620,9 @@ describe('POST /chat', () => {
           privacy: 'private',
         },
         members: 1,
+        leaderDetails: {
+          'auth.timestamps.created': new Date('2022-01-01'),
+        },
       });
 
       const message = await groupLeader.post(`/groups/${group._id}/chat`, { message: testMessage });

test/api/v3/integration/chat/POST-chat_seen.test.js

@@ -15,6 +15,10 @@ describe('POST /groups/:id/chat/seen', () => {
           privacy: 'public',
         },
         members: 1,
+        leaderDetails: {
+          'auth.timestamps.created': new Date('2022-01-01'),
+          balance: 10,
+        },
       });
 
       guild = group;
@@ -51,6 +55,9 @@ describe('POST /groups/:id/chat/seen', () => {
           privacy: 'private',
         },
         members: 1,
+        leaderDetails: {
+          'auth.timestamps.created': new Date('2022-01-01'),
+        },
       });
 
       party = group;

test/api/v3/integration/chat/POST-groups_id_chat_id_clear_flags.test.js

@@ -18,6 +18,10 @@ describe('POST /groups/:id/chat/:id/clearflags', () => {
         type: 'guild',
         privacy: 'public',
       },
+      leaderDetails: {
+        'auth.timestamps.created': new Date('2022-01-01'),
+        balance: 10,
+      },
     });
 
     groupWithChat = group;
@@ -65,6 +69,7 @@ describe('POST /groups/:id/chat/:id/clearflags', () => {
         members: 1,
       });
 
+      await members[0].update({ 'auth.timestamps.created': new Date('2022-01-01') });
       let privateMessage = await members[0].post(`/groups/${group._id}/chat`, { message: 'Some message' });
       privateMessage = privateMessage.message;
 

test/api/v3/integration/groups/POST-group_remove_manager.test.js

@@ -7,7 +7,7 @@ import {
 describe('POST /group/:groupId/remove-manager', () => {
   let leader; let nonLeader; let
     groupToUpdate;
-  const groupName = 'Test Public Guild';
+  const groupName = 'Test Private Guild';
   const groupType = 'guild';
   let nonManager;
 
@@ -20,9 +20,10 @@ describe('POST /group/:groupId/remove-manager', () => {
       groupDetails: {
         name: groupName,
         type: groupType,
-        privacy: 'public',
+        privacy: 'private',
       },
       members: 2,
+      upgradeToGroupPlan: true,
     });
 
     groupToUpdate = group;
@@ -83,7 +84,7 @@ describe('POST /group/:groupId/remove-manager', () => {
 
     await nonLeader.sync();
 
-    expect(nonLeader.notifications.length).to.equal(0);
+    expect(nonLeader.notifications.length).to.equal(1); // user gets mystery items
     expect(updatedGroup.managers[nonLeader._id]).to.not.exist;
   });
 });

test/api/v3/integration/groups/POST-groups.test.js

@@ -3,6 +3,7 @@ import {
   translate as t,
 } from '../../../../helpers/api-integration/v3';
 import { model as Group } from '../../../../../website/server/models/group';
+import { MAX_SUMMARY_SIZE_FOR_GUILDS } from '../../../../../website/common/script/constants';
 
 describe('POST /group', () => {
   let user;
@@ -71,6 +72,20 @@ describe('POST /group', () => {
 
       expect(updatedGroup.summary).to.eql(summary);
     });
+
+    it('returns error when summary is longer than MAX_SUMMARY_SIZE_FOR_GUILDS characters', async () => {
+      const name = 'Test Group';
+      const summary = 'A'.repeat(MAX_SUMMARY_SIZE_FOR_GUILDS + 1);
+      await expect(user.post('/groups', {
+        name,
+        type: 'guild',
+        summary,
+      })).to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: t('invalidReqParams'),
+      });
+    });
   });
 
   context('Guilds', () => {

test/api/v3/integration/groups/POST-groups_groupId_leave.test.js

@@ -37,6 +37,7 @@ describe('POST /groups/:groupId/leave', () => {
         leader = groupLeader;
         member = members[0]; // eslint-disable-line prefer-destructuring
         memberCount = group.memberCount;
+        await members[0].update({ 'auth.timestamps.created': new Date('2022-01-01') });
       });
 
       it('prevents non members from leaving', async () => {
@@ -152,6 +153,10 @@ describe('POST /groups/:groupId/leave', () => {
             type: 'guild',
           },
           invites: 1,
+          leaderDetails: {
+            'auth.timestamps.created': new Date('2022-01-01'),
+            balance: 10,
+          },
         });
 
         privateGuild = group;

test/api/v3/integration/groups/POST-groups_id_removeMember.test.js

@@ -153,6 +153,7 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
         },
         invites: 1,
         members: 2,
+        leaderDetails: { 'auth.timestamps.created': new Date('2022-01-01') },
       });
 
       party = group;

test/api/v3/integration/groups/PUT-groups.test.js

@@ -3,6 +3,7 @@ import {
   generateUser,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
+import { MAX_SUMMARY_SIZE_FOR_GUILDS } from '../../../../../website/common/script/constants';
 
 describe('PUT /group', () => {
   let leader; let nonLeader; let groupToUpdate; let
@@ -130,4 +131,15 @@ describe('PUT /group', () => {
 
     expect(response.bannedWordsAllowed).to.eql(undefined);
   });
+
+  it('returns error when summary is longer than MAX_SUMMARY_SIZE_FOR_GUILDS characters', async () => {
+    const summary = 'A'.repeat(MAX_SUMMARY_SIZE_FOR_GUILDS + 1);
+    await expect(leader.put(`/groups/${groupToUpdate._id}`, {
+      summary,
+    })).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('invalidReqParams'),
+    });
+  });
 });

test/api/v3/integration/notifications/prevent-multiple-notification.js

@@ -25,6 +25,7 @@ describe('Prevent multiple notifications', () => {
 
     for (let i = 0; i < 4; i += 1) {
       for (let memberIndex = 0; memberIndex < partyMembers.length; memberIndex += 1) {
+        await partyMembers[memberIndex].update({ 'auth.timestamps.created': new Date('2022-01-01') }); // eslint-disable-line no-await-in-loop
         multipleChatMessages.push(
           partyMembers[memberIndex].post(`/groups/${party._id}/chat`, { message: `Message ${i}_${memberIndex}` }),
         );

test/api/v3/integration/qrcodes/GET-qrcodes_user.test.js

@@ -1,33 +0,0 @@
-import superagent from 'superagent';
-import nconf from 'nconf';
-import {
-  generateUser,
-  translate as t,
-} from '../../../../helpers/api-integration/v3';
-
-const API_TEST_SERVER_PORT = nconf.get('PORT');
-xdescribe('GET /qr-code/user/:memberId', () => {
-  let user;
-
-  before(async () => {
-    user = await generateUser();
-  });
-
-  it('validates req.params.memberId', async () => {
-    await expect(user.get('/qr-code/user/invalidUUID')).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('redirects to profile page', async () => {
-    const url = `http://localhost:${API_TEST_SERVER_PORT}/qr-code/user/${user._id}`;
-    const response = await superagent.get(url).end((err, res) => {
-      expect(err).to.be(undefined);
-      return res;
-    });
-    expect(response.status).to.eql(200);
-    expect(response.request.url).to.eql(`http://localhost:${API_TEST_SERVER_PORT}/static/front/#?memberId=${user._id}`);
-  });
-});

test/api/v3/integration/tasks/GET-tasks_id.test.js

@@ -134,6 +134,7 @@ describe('GET /tasks/:id', () => {
           type: 'guild',
         },
         members: 1,
+        upgradeToGroupPlan: true,
       });
 
       group = groupData.group;

test/api/v3/integration/tasks/POST-tasks_clearCompletedTodos.test.js

@@ -7,7 +7,11 @@ import {
 describe('POST /tasks/clearCompletedTodos', () => {
   it('deletes all completed todos except the ones from a challenge and group', async () => {
     const user = await generateUser({ balance: 1 });
-    const guild = await generateGroup(user);
+    const guild = await generateGroup(
+      user,
+      {},
+      { 'purchased.plan.customerId': 'group-unlimited' },
+    );
     const challenge = await generateChallenge(user, guild);
     await user.post(`/challenges/${challenge._id}/join`);
 

test/api/v3/integration/tasks/groups/DELETE-group_tasks_id.test.js

@@ -19,6 +19,7 @@ describe('Groups DELETE /tasks/:id', () => {
         type: 'guild',
       },
       members: 2,
+      upgradeToGroupPlan: true,
     });
 
     guild = group;
@@ -77,18 +78,18 @@ describe('Groups DELETE /tasks/:id', () => {
 
     await user.sync();
     await member2.sync();
-    expect(user.notifications.length).to.equal(2);
-    expect(user.notifications[1].type).to.equal('GROUP_TASK_APPROVAL');
-    expect(member2.notifications.length).to.equal(2);
-    expect(member2.notifications[1].type).to.equal('GROUP_TASK_APPROVAL');
+    expect(user.notifications.length).to.equal(3); // mystery items
+    expect(user.notifications[2].type).to.equal('GROUP_TASK_APPROVAL');
+    expect(member2.notifications.length).to.equal(3);
+    expect(member2.notifications[2].type).to.equal('GROUP_TASK_APPROVAL');
 
     await member2.del(`/tasks/${task._id}`);
 
     await user.sync();
     await member2.sync();
 
-    expect(user.notifications.length).to.equal(1);
-    expect(member2.notifications.length).to.equal(1);
+    expect(user.notifications.length).to.equal(2);
+    expect(member2.notifications.length).to.equal(2);
   });
 
   it('deletes task from assigned user', async () => {

test/api/v3/integration/tasks/groups/GET-approvals_group_id.test.js

@@ -18,6 +18,7 @@ describe('GET /approvals/group/:groupId', () => {
         type: 'guild',
       },
       members: 2,
+      upgradeToGroupPlan: true,
     });
 
     guild = group;

test/api/v3/integration/tasks/groups/GET-tasks_group_id.test.js

@@ -36,7 +36,7 @@ describe('GET /tasks/group/:groupId', () => {
 
   before(async () => {
     user = await generateUser();
-    group = await generateGroup(user);
+    group = await generateGroup(user, {}, { 'purchased.plan.customerId': 'group-unlimited' });
   });
 
   it('returns error when group is not found', async () => {

test/api/v3/integration/tasks/groups/POST-group_tasks_id_approve_userId.test.js

@@ -19,6 +19,7 @@ describe('POST /tasks/:id/approve/:userId', () => {
         type: 'guild',
       },
       members: 2,
+      upgradeToGroupPlan: true,
     });
 
     guild = group;
@@ -63,9 +64,9 @@ describe('POST /tasks/:id/approve/:userId', () => {
 
     await member.sync();
 
-    expect(member.notifications.length).to.equal(2);
-    expect(member.notifications[1].type).to.equal('GROUP_TASK_APPROVED');
-    expect(member.notifications[1].data.message).to.equal(t('yourTaskHasBeenApproved', { taskText: task.text }));
+    expect(member.notifications.length).to.equal(3);
+    expect(member.notifications[2].type).to.equal('GROUP_TASK_APPROVED');
+    expect(member.notifications[2].data.message).to.equal(t('yourTaskHasBeenApproved', { taskText: task.text }));
 
     memberTasks = await member.get('/tasks/user');
     syncedTask = find(memberTasks, findAssignedTask);
@@ -89,9 +90,9 @@ describe('POST /tasks/:id/approve/:userId', () => {
     await member2.post(`/tasks/${task._id}/approve/${member._id}`);
     await member.sync();
 
-    expect(member.notifications.length).to.equal(2);
-    expect(member.notifications[1].type).to.equal('GROUP_TASK_APPROVED');
-    expect(member.notifications[1].data.message).to.equal(t('yourTaskHasBeenApproved', { taskText: task.text }));
+    expect(member.notifications.length).to.equal(3);
+    expect(member.notifications[2].type).to.equal('GROUP_TASK_APPROVED');
+    expect(member.notifications[2].data.message).to.equal(t('yourTaskHasBeenApproved', { taskText: task.text }));
 
     memberTasks = await member.get('/tasks/user');
     syncedTask = find(memberTasks, findAssignedTask);
@@ -113,18 +114,18 @@ describe('POST /tasks/:id/approve/:userId', () => {
 
     await user.sync();
     await member2.sync();
-    expect(user.notifications.length).to.equal(2);
-    expect(user.notifications[1].type).to.equal('GROUP_TASK_APPROVAL');
-    expect(member2.notifications.length).to.equal(1);
-    expect(member2.notifications[0].type).to.equal('GROUP_TASK_APPROVAL');
+    expect(user.notifications.length).to.equal(3);
+    expect(user.notifications[2].type).to.equal('GROUP_TASK_APPROVAL');
+    expect(member2.notifications.length).to.equal(2);
+    expect(member2.notifications[1].type).to.equal('GROUP_TASK_APPROVAL');
 
     await member2.post(`/tasks/${task._id}/approve/${member._id}`);
 
     await user.sync();
     await member2.sync();
 
-    expect(user.notifications.length).to.equal(1);
-    expect(member2.notifications.length).to.equal(0);
+    expect(user.notifications.length).to.equal(2);
+    expect(member2.notifications.length).to.equal(1);
   });
 
   it('prevents double approval on a task', async () => {

test/api/v3/integration/tasks/groups/POST-group_tasks_id_needs-work_userId.test.js

@@ -19,6 +19,7 @@ describe('POST /tasks/:id/needs-work/:userId', () => {
         type: 'guild',
       },
       members: 2,
+      upgradeToGroupPlan: true,
     });
 
     guild = group;
@@ -72,7 +73,7 @@ describe('POST /tasks/:id/needs-work/:userId', () => {
     expect(syncedTask.group.approval.requestedDate).to.equal(undefined);
 
     // Check that the notification is correct
-    expect(member.notifications.length).to.equal(initialNotifications + 2);
+    expect(member.notifications.length).to.equal(initialNotifications + 3);
     const notification = member.notifications[member.notifications.length - 1];
     expect(notification.type).to.equal('GROUP_TASK_NEEDS_WORK');
 
@@ -121,7 +122,7 @@ describe('POST /tasks/:id/needs-work/:userId', () => {
     expect(syncedTask.group.approval.requested).to.equal(false);
     expect(syncedTask.group.approval.requestedDate).to.equal(undefined);
 
-    expect(member.notifications.length).to.equal(initialNotifications + 2);
+    expect(member.notifications.length).to.equal(initialNotifications + 3);
     const notification = member.notifications[member.notifications.length - 1];
     expect(notification.type).to.equal('GROUP_TASK_NEEDS_WORK');
 

test/api/v3/integration/tasks/groups/POST-group_tasks_id_score_direction.test.js

@@ -19,6 +19,7 @@ describe('POST /tasks/:id/score/:direction', () => {
         type: 'guild',
       },
       members: 2,
+      upgradeToGroupPlan: true,
     });
 
     guild = group;
@@ -53,15 +54,15 @@ describe('POST /tasks/:id/score/:direction', () => {
 
     await user.sync();
 
-    expect(user.notifications.length).to.equal(2);
-    expect(user.notifications[1].type).to.equal('GROUP_TASK_APPROVAL');
-    expect(user.notifications[1].data.message).to.equal(t('userHasRequestedTaskApproval', {
+    expect(user.notifications.length).to.equal(3);
+    expect(user.notifications[2].type).to.equal('GROUP_TASK_APPROVAL');
+    expect(user.notifications[2].data.message).to.equal(t('userHasRequestedTaskApproval', {
       user: member.auth.local.username,
       taskName: updatedTask.text,
       taskId: updatedTask._id,
       direction,
     }, 'cs')); // This test only works if we have the notification translated
-    expect(user.notifications[1].data.groupId).to.equal(guild._id);
+    expect(user.notifications[2].data.groupId).to.equal(guild._id);
 
     expect(updatedTask.group.approval.requested).to.equal(true);
     expect(updatedTask.group.approval.requestedDate).to.be.a('string'); // date gets converted to a string as json doesn't have a Date type
@@ -80,25 +81,25 @@ describe('POST /tasks/:id/score/:direction', () => {
     await user.sync();
     await member2.sync();
 
-    expect(user.notifications.length).to.equal(2);
-    expect(user.notifications[1].type).to.equal('GROUP_TASK_APPROVAL');
-    expect(user.notifications[1].data.message).to.equal(t('userHasRequestedTaskApproval', {
+    expect(user.notifications.length).to.equal(3);
+    expect(user.notifications[2].type).to.equal('GROUP_TASK_APPROVAL');
+    expect(user.notifications[2].data.message).to.equal(t('userHasRequestedTaskApproval', {
       user: member.auth.local.username,
       taskName: updatedTask.text,
       taskId: updatedTask._id,
       direction,
     }));
-    expect(user.notifications[1].data.groupId).to.equal(guild._id);
+    expect(user.notifications[2].data.groupId).to.equal(guild._id);
 
-    expect(member2.notifications.length).to.equal(1);
-    expect(member2.notifications[0].type).to.equal('GROUP_TASK_APPROVAL');
-    expect(member2.notifications[0].data.message).to.equal(t('userHasRequestedTaskApproval', {
+    expect(member2.notifications.length).to.equal(2);
+    expect(member2.notifications[1].type).to.equal('GROUP_TASK_APPROVAL');
+    expect(member2.notifications[1].data.message).to.equal(t('userHasRequestedTaskApproval', {
       user: member.auth.local.username,
       taskName: updatedTask.text,
       taskId: updatedTask._id,
       direction,
     }));
-    expect(member2.notifications[0].data.groupId).to.equal(guild._id);
+    expect(member2.notifications[1].data.groupId).to.equal(guild._id);
   });
 
   it('errors when approval has already been requested', async () => {

test/api/v3/integration/tasks/groups/POST-tasks_group_id.test.js

@@ -26,6 +26,7 @@ describe('POST /tasks/group/:groupid', () => {
         privacy: 'private',
       },
       members: 1,
+      upgradeToGroupPlan: true,
     });
 
     guild = group;

test/api/v3/integration/tasks/groups/POST-tasks_group_id_assign_user_id.test.js

@@ -21,6 +21,7 @@ describe('POST /tasks/:taskId/assign/:memberId', () => {
         type: 'guild',
       },
       members: 2,
+      upgradeToGroupPlan: true,
     });
 
     guild = group;
@@ -103,14 +104,14 @@ describe('POST /tasks/:taskId/assign/:memberId', () => {
     await member2.sync();
     const groupTask = await user.get(`/tasks/group/${guild._id}`);
 
-    expect(user.notifications.length).to.equal(2); // includes Guild Joined achievement
-    expect(user.notifications[1].type).to.equal('GROUP_TASK_CLAIMED');
-    expect(user.notifications[1].data.taskId).to.equal(groupTask[0]._id);
-    expect(user.notifications[1].data.groupId).to.equal(guild._id);
-    expect(member2.notifications.length).to.equal(1);
-    expect(member2.notifications[0].type).to.equal('GROUP_TASK_CLAIMED');
-    expect(member2.notifications[0].data.taskId).to.equal(groupTask[0]._id);
-    expect(member2.notifications[0].data.groupId).to.equal(guild._id);
+    expect(user.notifications.length).to.equal(3); // includes Guild Joined achievement
+    expect(user.notifications[2].type).to.equal('GROUP_TASK_CLAIMED');
+    expect(user.notifications[2].data.taskId).to.equal(groupTask[0]._id);
+    expect(user.notifications[2].data.groupId).to.equal(guild._id);
+    expect(member2.notifications.length).to.equal(2);
+    expect(member2.notifications[1].type).to.equal('GROUP_TASK_CLAIMED');
+    expect(member2.notifications[1].data.taskId).to.equal(groupTask[0]._id);
+    expect(member2.notifications[1].data.groupId).to.equal(guild._id);
   });
 
   it('assigns a task to a user', async () => {
@@ -130,9 +131,9 @@ describe('POST /tasks/:taskId/assign/:memberId', () => {
 
     const groupTask = await user.get(`/tasks/group/${guild._id}`);
 
-    expect(member.notifications.length).to.equal(1);
-    expect(member.notifications[0].type).to.equal('GROUP_TASK_ASSIGNED');
-    expect(member.notifications[0].taskId).to.equal(groupTask._id);
+    expect(member.notifications.length).to.equal(2);
+    expect(member.notifications[1].type).to.equal('GROUP_TASK_ASSIGNED');
+    expect(member.notifications[1].taskId).to.equal(groupTask._id);
   });
 
   it('assigns a task to multiple users', async () => {

test/api/v3/integration/tasks/groups/POST-tasks_move_taskId_to_position.test.js

@@ -9,7 +9,7 @@ describe('POST group-tasks/:taskId/move/to/:position', () => {
 
   beforeEach(async () => {
     user = await generateUser({ balance: 1 });
-    guild = await generateGroup(user, { type: 'guild' });
+    guild = await generateGroup(user, { type: 'guild' }, { 'purchased.plan.customerId': 'group-unlimited' });
   });
 
   it('can move task to new position', async () => {

test/api/v3/integration/tasks/groups/POST-tasks_task_id_unassign.test.js

@@ -21,6 +21,7 @@ describe('POST /tasks/:taskId/unassign/:memberId', () => {
         type: 'guild',
       },
       members: 2,
+      upgradeToGroupPlan: true,
     });
 
     guild = group;
@@ -91,7 +92,7 @@ describe('POST /tasks/:taskId/unassign/:memberId', () => {
     await user.post(`/tasks/${task._id}/unassign/${member._id}`);
 
     await member.sync();
-    expect(member.notifications.length).to.equal(0);
+    expect(member.notifications.length).to.equal(1); // mystery items
   });
 
   it('unassigns a user and only that user from a task', async () => {

test/api/v3/integration/tasks/groups/PUT-group_task_id.test.js

@@ -22,6 +22,7 @@ describe('PUT /tasks/:id', () => {
         type: 'guild',
       },
       members: 2,
+      upgradeToGroupPlan: true,
     });
 
     guild = group;

test/api/v3/integration/tasks/groups/checklists/DELETE-group_tasks_taskId_checklist_item.test.js

@@ -15,6 +15,7 @@ describe('DELETE group /tasks/:taskId/checklist/:itemId', () => {
         type: 'guild',
       },
       members: 2,
+      upgradeToGroupPlan: true,
     });
 
     guild = group;

test/api/v3/integration/tasks/groups/checklists/POST-group_tasks_taskId_checklist.test.js

@@ -15,6 +15,7 @@ describe('POST group /tasks/:taskId/checklist/', () => {
         type: 'guild',
       },
       members: 2,
+      upgradeToGroupPlan: true,
     });
 
     guild = group;

test/api/v3/integration/tasks/groups/checklists/PUT-group_tasks_taskId_checklist_itemId.test.js

@@ -15,6 +15,7 @@ describe('PUT group /tasks/:taskId/checklist/:itemId', () => {
         type: 'guild',
       },
       members: 2,
+      upgradeToGroupPlan: true,
     });
 
     guild = group;

test/api/v3/integration/user/POST-user_class_cast_spellId.test.js

@@ -139,7 +139,7 @@ describe('POST /user/class/cast/:spellId', () => {
   });
 
   it('returns an error if a group task was targeted', async () => {
-    const { group, groupLeader } = await createAndPopulateGroup();
+    const { group, groupLeader } = await createAndPopulateGroup({ upgradeToGroupPlan: true });
 
     const groupTask = await groupLeader.post(`/tasks/group/${group._id}`, {
       text: 'todo group',
@@ -266,7 +266,7 @@ describe('POST /user/class/cast/:spellId', () => {
   });
 
   it('searing brightness does not affect challenge or group tasks', async () => {
-    const guild = await generateGroup(user);
+    const guild = await generateGroup(user, {}, { 'purchased.plan.customerId': 'group-unlimited' });
     const challenge = await generateChallenge(user, guild);
     await user.post(`/challenges/${challenge._id}/join`);
     await user.post(`/tasks/challenge/${challenge._id}`, {

test/api/v3/integration/user/POST-user_reset.test.js

@@ -88,7 +88,7 @@ describe('POST /user/reset', () => {
   });
 
   it('does not delete challenge or group tasks', async () => {
-    const guild = await generateGroup(user);
+    const guild = await generateGroup(user, {}, { 'purchased.plan.customerId': 'group-unlimited' });
     const challenge = await generateChallenge(user, guild);
     await user.post(`/challenges/${challenge._id}/join`);
     await user.post(`/tasks/challenge/${challenge._id}`, {

test/api/v3/integration/user/buy/POST-user_buy_quest.test.js

@@ -39,25 +39,38 @@ describe('POST /user/buy-quest/:key', () => {
     }));
   });
 
-  it('returns an error if quest prerequisites are not met', async () => {
-    const key = 'dilatoryDistress2';
+  it('returns an error if not all quest prerequisites are met', async () => {
+    const prerequisites = ['dilatoryDistress1', 'dilatoryDistress2'];
+    const key = 'dilatoryDistress3';
+
+    const achievementName1 = `achievements.quests.${prerequisites[0]}`;
+
+    await user.update({
+      [achievementName1]: true,
+      'stats.gp': 9999,
+    });
 
     await expect(user.post(`/user/buy-quest/${key}`))
       .to.eventually.be.rejected.and.eql({
         code: 401,
         error: 'NotAuthorized',
-        message: t('mustComplete', { quest: 'dilatoryDistress1' }),
+        message: t('mustComplete', { quest: prerequisites[1] }),
       });
   });
 
   it('allows purchase of a quest if prerequisites are met', async () => {
-    const prerequisite = 'dilatoryDistress1';
-    const key = 'dilatoryDistress2';
+    const prerequisites = ['dilatoryDistress1', 'dilatoryDistress2'];
+    const key = 'dilatoryDistress3';
     const item = content.quests[key];
 
-    const achievementName = `achievements.quests.${prerequisite}`;
+    const achievementName1 = `achievements.quests.${prerequisites[0]}`;
+    const achievementName2 = `achievements.quests.${prerequisites[1]}`;
 
-    await user.update({ [achievementName]: true, 'stats.gp': 9999 });
+    await user.update({
+      [achievementName1]: true,
+      [achievementName2]: true,
+      'stats.gp': 9999,
+    });
     const res = await user.post(`/user/buy-quest/${key}`);
     await user.sync();
 

test/api/v4/user/POST-user_class_cast_spellId.test.js

@@ -124,7 +124,7 @@ describe('POST /user/class/cast/:spellId', () => {
   });
 
   it('returns an error if a group task was targeted', async () => {
-    const { group, groupLeader } = await createAndPopulateGroup();
+    const { group, groupLeader } = await createAndPopulateGroup({ upgradeToGroupPlan: true });
 
     const groupTask = await groupLeader.post(`/tasks/group/${group._id}`, {
       text: 'todo group',
@@ -234,7 +234,7 @@ describe('POST /user/class/cast/:spellId', () => {
   });
 
   it('searing brightness does not affect challenge or group tasks', async () => {
-    const guild = await generateGroup(user);
+    const guild = await generateGroup(user, {}, { 'purchased.plan.customerId': 'group-unlimited' });
     const challenge = await generateChallenge(user, guild);
     await user.post(`/challenges/${challenge._id}/join`);
     await user.post(`/tasks/challenge/${challenge._id}`, {

test/api/v4/user/POST-user_reset.test.js

@@ -88,7 +88,7 @@ describe('POST /user/reset', () => {
   });
 
   it('does not delete challenge or group tasks', async () => {
-    const guild = await generateGroup(user);
+    const guild = await generateGroup(user, {}, { 'purchased.plan.customerId': 'group-unlimited' });
     const challenge = await generateChallenge(user, guild);
     await user.post(`/challenges/${challenge._id}/join`);
     await user.post(`/tasks/challenge/${challenge._id}`, {

test/common/ops/buy/buyQuestGems.js

@@ -33,7 +33,7 @@ describe('shared.ops.buyQuestGems', () => {
     pinnedGearUtils.removeItemByPath.restore();
   });
 
-  context('successful purchase', () => {
+  context('single purchase', () => {
     const userGemAmount = 10;
 
     before(() => {
@@ -44,7 +44,7 @@ describe('shared.ops.buyQuestGems', () => {
       user.pinnedItems.push({ type: 'quests', key: 'gryphon' });
     });
 
-    it('purchases quests', async () => {
+    it('successfully purchases quest', async () => {
       const key = 'gryphon';
 
       await buyQuest(user, { params: { key } });
@@ -58,6 +58,28 @@ describe('shared.ops.buyQuestGems', () => {
 
       await buyQuest(user, { params: { key } });
 
+      expect(user.items.quests[key]).to.equal(1);
+      expect(pinnedGearUtils.removeItemByPath.notCalled).to.equal(true);
+    });
+    it('errors if the user has not completed prerequisite quests', async () => {
+      const key = 'atom3';
+      user.achievements.quests.atom1 = 1;
+
+      try {
+        await buyQuest(user, { params: { key } });
+      } catch (err) {
+        expect(err).to.be.an.instanceof(NotAuthorized);
+        expect(err.message).to.equal(i18n.t('mustComplete', { quest: 'atom2' }));
+        expect(user.items.quests[key]).to.eql(undefined);
+      }
+    });
+    it('successfully purchases quest if user has completed all prerequisite quests', async () => {
+      const key = 'atom3';
+      user.achievements.quests.atom1 = 1;
+      user.achievements.quests.atom2 = 1;
+
+      await buyQuest(user, { params: { key } });
+
       expect(user.items.quests[key]).to.equal(1);
       expect(pinnedGearUtils.removeItemByPath.notCalled).to.equal(true);
     });

test/common/ops/buy/buyQuestGold.js

@@ -162,7 +162,9 @@ describe('shared.ops.buyQuest', () => {
     }
   });
 
-  it('does not buy a quest without completing previous quests', async () => {
+  it('returns error if user has not completed all prerequisite quests', async () => {
+    user.stats.gp = 9999;
+    user.achievements.quests.dilatoryDistress1 = 1;
     try {
       await buyQuest(user, {
         params: {
@@ -175,4 +177,22 @@ describe('shared.ops.buyQuest', () => {
       expect(user.items.quests).to.eql({});
     }
   });
+
+  it('successfully purchases quest if user has completed all prerequisite quests', async () => {
+    user.stats.gp = 500;
+    user.achievements.quests.dilatoryDistress1 = 1;
+    user.achievements.quests.dilatoryDistress2 = 1;
+
+    await buyQuest(user, {
+      params: {
+        key: 'dilatoryDistress3',
+      },
+    }, analytics);
+
+    expect(user.items.quests).to.eql({
+      dilatoryDistress3: 1,
+    });
+    expect(user.stats.gp).to.equal(100);
+    expect(analytics.track).to.be.calledOnce;
+  });
 });

test/helpers/api-integration/external-server.js

@@ -28,7 +28,7 @@ app.post('/webhooks/:id', (req, res) => {
 });
 
 // Helps close down server from within mocha test
-// See http://stackoverflow.com/a/37054753/2601552
+// See https://stackoverflow.com/a/37054753/2601552
 const sockets = {};
 server.on('connection', socket => {
   const id = uuid();

test/helpers/api-integration/requester.js

@@ -40,7 +40,6 @@ function _requestMaker (user, method, additionalSets = {}) {
       || route.indexOf('/paypal') === 0
       || route.indexOf('/amazon') === 0
       || route.indexOf('/stripe') === 0
-      || route.indexOf('/qr-code') === 0
       || route.indexOf('/analytics') === 0
     ) {
       url += `${route}`;

test/helpers/api-integration/v4/object-generators.js

@@ -5,6 +5,8 @@ import { v4 as generateUUID } from 'uuid';
 import { ApiUser, ApiGroup, ApiChallenge } from '../api-classes';
 import { requester } from '../requester';
 import * as Tasks from '../../../../website/server/models/task';
+import payments from '../../../../website/server/libs/payments/payments';
+import { model as User } from '../../../../website/server/models/user';
 
 // Creates a new user and returns it
 // If you need the user to have specific requirements,
@@ -77,6 +79,26 @@ export async function generateGroup (leader, details = {}, update = {}) {
   return apiGroup;
 }
 
+async function _upgradeToGroupPlan (groupLeader, group) {
+  const groupLeaderModel = await User.findById(groupLeader._id).exec();
+
+  // Create subscription
+  const paymentData = {
+    user: groupLeaderModel,
+    groupId: group._id,
+    sub: {
+      key: 'basic_3mo',
+    },
+    customerId: 'customer-id',
+    paymentMethod: 'Payment Method',
+    headers: {
+      'x-client': 'habitica-web',
+      'user-agent': '',
+    },
+  };
+  await payments.createSubscription(paymentData);
+}
+
 // This is generate group + the ability to create
 // real users to populate it. The settings object
 // takes in:
@@ -95,6 +117,7 @@ export async function generateGroup (leader, details = {}, update = {}) {
 export async function createAndPopulateGroup (settings = {}) {
   const numberOfMembers = settings.members || 0;
   const numberOfInvites = settings.invites || 0;
+  const upgradeToGroupPlan = settings.upgradeToGroupPlan || false;
   const { groupDetails } = settings;
   const leaderDetails = settings.leaderDetails || { balance: 10 };
 
@@ -124,6 +147,10 @@ export async function createAndPopulateGroup (settings = {}) {
 
   await Promise.all(invitees.map(invitee => invitee.sync()));
 
+  if (upgradeToGroupPlan) {
+    await _upgradeToGroupPlan(groupLeader, group);
+  }
+
   return {
     groupLeader,
     group,

test/helpers/start-server.js

@@ -11,6 +11,7 @@ if (process.env.LOAD_SERVER === '0') { // when the server is in a different proc
   setupNconf('./config.json.example');
   nconf.set('NODE_DB_URI', nconf.get('TEST_DB_URI'));
   nconf.set('NODE_ENV', 'test');
+  nconf.set('ACCOUNT_MIN_CHAT_AGE', '2');
   nconf.set('IS_TEST', true);
   // We require src/server and not src/index because
   // 1. nconf is already setup

website/client/package.json

@@ -13,26 +13,27 @@
     "storybook:serve": "vue-cli-service storybook:serve -p 6006 -c config/storybook"
   },
   "dependencies": {
-    "@storybook/addon-actions": "6.4.19",
+    "@storybook/addon-actions": "6.5.8",
     "@storybook/addon-knobs": "6.2.9",
-    "@storybook/addon-links": "6.4.18",
+    "@storybook/addon-links": "6.5.8",
     "@storybook/addon-notes": "5.3.21",
-    "@storybook/addons": "6.4.19",
+    "@storybook/addons": "6.5.9",
     "@storybook/vue": "6.3.13",
     "@vue/cli-plugin-babel": "^4.5.15",
-    "@vue/cli-plugin-eslint": "^4.5.15",
+    "@vue/cli-plugin-eslint": "^4.5.19",
     "@vue/cli-plugin-router": "^4.5.15",
     "@vue/cli-plugin-unit-mocha": "^4.5.15",
     "@vue/cli-service": "^4.5.15",
     "@vue/test-utils": "1.0.0-beta.29",
-    "amplitude-js": "^8.17.0",
+    "amplitude-js": "^8.18.5",
     "axios": "^0.25.0",
     "axios-progress-bar": "^1.2.0",
     "babel-eslint": "^10.1.0",
     "bootstrap": "^4.6.0",
-    "bootstrap-vue": "^2.21.2",
+    "bootstrap-vue": "^2.22.0",
     "chai": "^4.3.6",
-    "core-js": "^3.21.0",
+    "core-js": "^3.23.5",
+    "dompurify": "^2.3.8",
     "eslint": "^6.8.0",
     "eslint-config-habitrpg": "^6.2.0",
     "eslint-plugin-mocha": "^5.3.0",
@@ -40,14 +41,14 @@
     "habitica-markdown": "^3.0.0",
     "hellojs": "^1.19.5",
     "inspectpack": "^4.7.1",
-    "intro.js": "^5.0.0",
+    "intro.js": "^5.1.0",
     "jquery": "^3.6.0",
     "lodash": "^4.17.21",
-    "moment": "^2.29.1",
-    "nconf": "^0.11.3",
+    "moment": "^2.29.4",
+    "nconf": "^0.12.0",
     "sass": "^1.34.0",
     "sass-loader": "^8.0.2",
-    "smartbanner.js": "^1.17.0",
+    "smartbanner.js": "^1.19.0",
     "svg-inline-loader": "^0.8.2",
     "svg-url-loader": "^7.1.1",
     "svgo": "^1.3.2",
@@ -57,13 +58,13 @@
     "vue": "^2.6.14",
     "vue-cli-plugin-storybook": "2.1.0",
     "vue-mugen-scroll": "^0.2.6",
-    "vue-router": "^3.5.3",
+    "vue-router": "^3.5.4",
     "vue-template-compiler": "^2.6.14",
     "vuedraggable": "^2.24.3",
     "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
     "webpack": "^4.46.0"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-optional-chaining": "^7.16.7"
+    "@babel/plugin-proposal-optional-chaining": "^7.18.6"
   }
 }

website/client/src/app.vue

@@ -414,7 +414,15 @@ export default {
         this.$store.state.isUserLoaded = true;
         Analytics.setUser();
         Analytics.updateUser();
-        return axios.get('/api/v4/i18n/browser-script', { language: this.user.preferences.language });
+        return axios.get('/api/v4/i18n/browser-script',
+          {
+            language: this.user.preferences.language,
+            headers: {
+              'Cache-Control': 'no-cache',
+              Pragma: 'no-cache',
+              Expires: '0',
+            },
+          });
       }).then(() => {
         const i18nData = window && window['habitica-i18n'];
         this.$loadLocale(i18nData);

website/client/src/assets/scss/form.scss

@@ -82,7 +82,7 @@ input, textarea, input.form-control, textarea.form-control {
   }
 }
 
-/** Colored Input-Groups, ignoring checklist */
+// Colored Input-Groups, ignoring checklist
 .input-group:not(.checklist-group) {
   border-radius: 2px;
   border: solid 1px $gray-400;
@@ -100,7 +100,7 @@ input, textarea, input.form-control, textarea.form-control {
   }
 }
 
-/** Generic Input Group Styles */
+// Generic Input Group Styles
 .input-group {
   height: 2rem;
 
@@ -179,10 +179,11 @@ input, textarea, input.form-control, textarea.form-control {
   padding-left: 0px;
 }
 
-// Checkboxes and radios
+// used in checkboxes and radios
 $bg-focused-active-control: #4f2993;
 $bg-disabled-control: #34303a;
 
+// custom control
 .custom-control {
   margin-bottom: .5rem;
 
@@ -205,6 +206,7 @@ $bg-disabled-control: #34303a;
   }
 }
 
+// checkboxes
 .custom-checkbox {
   .custom-control-label::before {
     border-radius: 2px;
@@ -280,11 +282,26 @@ $bg-disabled-control: #34303a;
   padding-left: 36px;
 }
 
+// radio buttons
+$bg-color: $purple-400;
+
+// svg for the purple dot
 @mixin custom-radio-checked-icon ($bg-color) {
   background-image: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$bg-color}'/%3E%3C/svg%3E"), "#", "%23");
 }
 
 .custom-radio .custom-control-input {
+  opacity: 0;
+  margin: 15px 25px 34px 25px;
+
+  // outside circle
+  &:checked~.custom-control-label::before {
+    background-color: $gray-700;
+    background-size: 12px 12px;
+    border-color: $purple-400;
+  }
+
+  // checked indicator
   &:checked~.custom-control-label::after {
     @include custom-radio-checked-icon($purple-400);
     width: 18px;
@@ -292,51 +309,84 @@ $bg-disabled-control: #34303a;
     background-size: 12px 12px;
   }
 
-  &:checked~.custom-control-label::before {
-    background-color: $gray-700;
-    background-size: 12px 12px;
-    border-color: $purple-400;
-  }
-
   &:active~.custom-control-label::before {
     background-color: inherit;
   }
 
-  &:focus:not(:checked):not(:disabled)~.custom-control-label::before, &:active:not(:checked):not(:disabled)~.custom-control-label::before  {
-    box-shadow: 0 0 0 6px rgba($bg-focused-active-control, 0.1);
+// focus / not checked / not disabled
+  &:focus:not(:checked):not(:disabled)~.custom-control-label::before,
+  &:active:not(:checked):not(:disabled)~.custom-control-label::before  {
+    border: 2px solid $gray-300;
+    box-shadow: 0 0 0 2px rgba(146, 92, 243, 0.5);
   }
 
-  &:focus:checked:not(:disabled)~.custom-control-label::before, &:active:checked:not(:disabled)~.custom-control-label::before  {
-    box-shadow: 0 0 0 6px rgba($bg-focused-active-control, 0.1);
-    border-color: $purple-400;
-    background-color: rgba($bg-focused-active-control, 0.1);
+// focus / checked / not disabled
+  &:focus:checked:not(:disabled)~.custom-control-label::before,
+  &:active:checked:not(:disabled)~.custom-control-label::before  {
+    border: 2px solid $purple-400;
+    box-shadow: 0 0 0 2px rgba(146, 92, 243, 0.5);
   }
 
-  &:disabled:checked~.custom-control-label::before {
-    border-color: $gray-400;
-    background-color: transparent;
+// hover / not checked / not disabled
+  &:hover:not(:checked):not(:disabled)~.custom-control-label::before,
+  &:active:not(:checked):not(:disabled)~.custom-control-label::before  {
+    width: 18px;
+    height: 18px;
+    background: 50%/50% 50% no-repeat;
+    @include custom-radio-checked-icon($purple-400);
+    background-size: 12px 12px;
+    border: solid 2px $purple-400;
   }
 
-  &:disabled:checked~.custom-control-label::after {
+// hover / checked / not disabled
+    &:hover:checked:not(:disabled)~.custom-control-label::before,
+    &:active::checked:not(:disabled)~.custom-control-label::before  {
+    width: 18px;
+    height: 18px;
+    background: 50%/50% 50% no-repeat;
     @include custom-radio-checked-icon($gray-400);
+    background-size: 12px 12px;
+    border: solid 2px $purple-300;
+  }
+
+// disabled / checked / before
+  &:disabled:checked~.custom-control-label::before {
+    background: 50%/50% 50% no-repeat;
+    @include custom-radio-checked-icon($gray-300);
+    border: 2px solid $gray-200;
+    background-color: transparent;
+    opacity: 0.75;
+  }
+
+// disabled / checked / after
+  &:disabled:checked~.custom-control-label::after {
+    background: 50%/50% 50% no-repeat;
+    @include custom-radio-checked-icon($gray-300);
     width: 18px;
     height: 18px;
     background-size: 12px 12px;
   }
 
+// disabled / not checked / before
   &:disabled:not(:checked)~.custom-control-label::before {
-    border-color: $gray-300;
-    background-color: transparent;
+    background-color: $gray-600;
+    border: 2px solid $gray-200;
   }
 
-  &:focus:disabled~.custom-control-label::before, &:active:disabled~.custom-control-label::before  {
-    box-shadow: 0 0 0 6px rgba($bg-disabled-control, 0.1);
-    border-color: $gray-300;
+// focus and disabled / not checked / before
+  &:focus:disabled~.custom-control-label::before,
+  &:active:disabled~.custom-control-label::before  {
     background-color: rgba($bg-disabled-control, 0.1);
+    box-shadow: 0 0 0 6px rgba($bg-disabled-control, 0.1);
+    border: 2px solid $gray-200;
   }
 
-  &:focus:disabled:checked~.custom-control-label::before, &:active:disabled:checked~.custom-control-label::before  {
-    border-color: $gray-400;
+// focus and disabled / checked / before
+  &:focus:disabled:checked~.custom-control-label::before,
+  &:active:disabled:checked~.custom-control-label::before  {
+    background: 50%/50% 50% no-repeat;
+    @include custom-radio-checked-icon($gray-300);
+    border: 2px solid $gray-200;
   }
 }
 

website/client/src/assets/scss/typography.scss

@@ -18,8 +18,10 @@ body {
 // Restore the default styling for a elements without an href attribute
 // that was changed in bootstrap 4.5.1
 a:not([href]), a:not([href]):hover {
-  color: inherit;
-  text-decoration: none;
+  &:not([role=button]) { 
+    color: inherit;
+    text-decoration: none;
+  }
 }
 
 a, a:not([href]):not([tabindex]) {

website/client/src/components/appFooter.vue

@@ -34,7 +34,7 @@
             </li>
             <li>
               <a
-                href="http://blog.habitrpg.com/"
+                href="https://blog.habitrpg.com/"
                 target="_blank"
               >{{ $t('tumblr') }}</a>
             </li>

website/client/src/components/auth/registerLoginReset.vue

@@ -614,6 +614,7 @@ import axios from 'axios';
 import hello from 'hellojs';
 import debounce from 'lodash/debounce';
 import isEmail from 'validator/lib/isEmail';
+import DOMPurify from 'dompurify';
 import { buildAppleAuthUrl } from '../../libs/auth';
 
 import { MINIMUM_PASSWORD_LENGTH } from '@/../../common/script/constants';
@@ -754,6 +755,12 @@ export default {
         }
       });
     }, 500),
+    sanitizeRedirect (redirect) {
+      if (!redirect) return '/';
+      let sanitizedString = DOMPurify.sanitize(redirect).replace(/\\|\/\/|\./g, '');
+      sanitizedString = `/${sanitizedString}`;
+      return sanitizedString;
+    },
     async register () {
       // @TODO do not use alert
       if (!this.email) {
@@ -785,19 +792,14 @@ export default {
         passwordConfirm: this.passwordConfirm,
       });
 
-      let redirectTo;
-
-      if (this.$route.query.redirectTo) {
-        redirectTo = this.$route.query.redirectTo;
-      } else {
-        redirectTo = '/';
-      }
+      const redirectTo = this.sanitizeRedirect(this.$route.query.redirectTo);
 
       // @TODO do not reload entire page
       // problem is that app.vue created hook should be called again
       // after user is logged in / just signed up
       // ALSO it's the only way to make sure language data
       // is reloaded and correct for the logged in user
+      // Same situation in login and socialAuth functions
       window.location.href = redirectTo;
     },
     async login () {
@@ -807,19 +809,8 @@ export default {
         password: this.password,
       });
 
-      let redirectTo;
+      const redirectTo = this.sanitizeRedirect(this.$route.query.redirectTo);
 
-      if (this.$route.query.redirectTo) {
-        redirectTo = this.$route.query.redirectTo;
-      } else {
-        redirectTo = '/';
-      }
-
-      // @TODO do not reload entire page
-      // problem is that app.vue created hook should be called again
-      // after user is logged in / just signed up
-      // ALSO it's the only way to make sure language data
-      // is reloaded and correct for the logged in user
       window.location.href = redirectTo;
     },
     // @TODO: Abstract hello in to action or lib
@@ -842,19 +833,8 @@ export default {
           auth,
         });
 
-        let redirectTo;
+        const redirectTo = this.sanitizeRedirect(this.$route.query.redirectTo);
 
-        if (this.$route.query.redirectTo) {
-          redirectTo = this.$route.query.redirectTo;
-        } else {
-          redirectTo = '/';
-        }
-
-        // @TODO do not reload entire page
-        // problem is that app.vue created hook should be called again
-        // after user is logged in / just signed up
-        // ALSO it's the only way to make sure language data
-        // is reloaded and correct for the logged in user
         window.location.href = redirectTo;
       }
     },

website/client/src/components/group-plans/createGroupModalPages.vue

@@ -122,6 +122,11 @@
     font-weight: bold;
   }
 
+  .custom-control-input {
+    z-index: -1;
+    opacity: 0;
+  }
+
   .box:hover {
     cursor: pointer;
     opacity: 0.7;

website/client/src/components/group-plans/taskInformation.vue

@@ -225,6 +225,11 @@ export default {
       this.group = await this.$store.dispatch('guilds:getGroup', {
         groupId: this.searchId,
       });
+      if (!this.group?.purchased?.active) {
+        if (this.group.type === 'guild') this.$router.push(`/groups/guild/${this.group._id}`);
+        if (this.group.type === 'party') this.$router.push('/party');
+        return;
+      }
       this.$store.dispatch('common:setTitle', {
         subSection: this.group.name,
         section: this.$route.path.startsWith('/group-plans') ? this.$t('groupPlans') : this.$t('group'),

website/client/src/components/memberDetails.vue

@@ -4,7 +4,7 @@
     :class="{ condensed, expanded, 'd-flex': isHeader, row: !isHeader, }"
     @click="showMemberModal(member)"
   >
-    <div :class="{ 'col-4': !isHeader }">
+    <div class="avatar-container" :class="{ 'col-4': !isHeader }">
       <avatar
         :member="member"
         :hide-class-badge="classBadgePosition !== 'under-avatar'"
@@ -92,6 +92,10 @@
   .member-details {
     white-space: nowrap;
     transition: all 0.15s ease-out;
+
+    .avatar-container {
+      margin-bottom: 20px;
+    }
   }
 
   .member-stats {

website/client/src/components/payments/amazonModal.vue

@@ -198,7 +198,7 @@ export default {
           appState.newGroup = false;
           appState.group = pick(this.amazonPayments.group, ['_id', 'memberCount', 'name']);
         }
-      } else if (paymentType.indexOf('gift-') === 0) {
+      } else if (paymentType && paymentType.indexOf('gift-') === 0) {
         appState.gift = this.amazonPayments.gift;
         appState.giftReceiver = this.amazonPayments.giftReceiver;
       } else if (paymentType === 'gems') {

website/client/src/components/payments/sendGiftModal.vue

@@ -52,16 +52,16 @@
 
       <!-- menu area -->
       <div class="row">
-        <div class="col-12 col-md-8 offset-md-2 text-center nav">
+        <div class="col-md-8 offset-md-2 text-center nav">
           <div
-            class="nav-item"
+            class="nav-link"
             :class="{active: selectedPage === 'subscription'}"
             @click="selectPage('subscription')"
           >
             {{ $t('subscription') }}
           </div>
           <div
-            class="nav-item"
+            class="nav-link"
             :class="{active: selectedPage !== 'subscription'}"
             @click="selectPage('buyGems')"
           >
@@ -74,6 +74,7 @@
       <subscription-options
         v-show="selectedPage === 'subscription'"
         class="subscribe-option"
+        :userReceivingGift="userReceivingGift"
       />
 
       <!-- gem block -->
@@ -88,7 +89,9 @@
           <div class="d-flex flex-row align-items-center justify-content-center">
             <div
               class="gray-circle"
-              @click="gift.gems.amount <= 0 ? gift.gems.amount = 0 : gift.gems.amount--"
+              @click="gift.gems.amount <= 0
+                ? gift.gems.amount = 0
+                : gift.gems.amount--"
             >
               <div
                 class="icon-negative"
@@ -106,7 +109,6 @@
                 id="gemsForm"
                 v-model.number="gift.gems.amount"
                 class="form-control"
-                min="0"
                 max="9999"
               >
             </div>
@@ -129,15 +131,15 @@
           <!-- the actual dollar amount -->
           <div class="buy-gem-amount">
             <span>
-              {{formatter.format(totalGems)}}
+              {{ formatter.format(totalGems) }}
             </span>
           </div>
 
           <!-- change to sending own gems page -->
           <div
             :class="{active: selectedPage === 'ownGems'}"
-            @click="selectPage('ownGems')"
             class="gem-state-change"
+            @click="selectPage('ownGems')"
           >
             {{ $t('wantToSendOwnGems') }}
           </div>
@@ -153,86 +155,89 @@
           :amazon-data="{type: 'single', gift, giftedTo: userReceivingGift._id, receiverName}"
         />
       </div>
-
-      <!-- send gems from balance -->
-      <div
-        v-show="selectedPage === 'ownGems'"
-      >
-        <div class="gem-group">
-          <label v-once>
-            {{ $t('howManyGemsSend') }}
-          </label>
-          <div class="d-flex align-items-center justify-content-center">
-            <div
-              class="gray-circle"
-              @click="gift.gems.amount <= 0 ? gift.gems.amount = 0 : gift.gems.amount--"
-            >
-              <div
-                class="icon-negative"
-                v-html="icons.negativeIcon"
-              ></div>
-            </div>
-            <div class="input-group">
-              <div class="input-group-prepend input-group-icon align-items-center">
-                <div
-                  class="icon-gem"
-                  v-html="icons.gemIcon"
-                ></div>
-              </div>
-              <input
-                id="gemsForm"
-                v-model="gift.gems.amount"
-                class="form-control"
-                min="0"
-                :max="maxGems"
-              >
-            </div>
-            <div
-              class="gray-circle"
-              @click="gift.gems.amount < maxGems ? gift.gems.amount++ : gift.gems.amount = maxGems"
-            >
-              <div
-                class="icon-positive"
-                v-html="icons.positiveIcon"
-              ></div>
-            </div>
-          </div>
-          <div class="align-items-middle">
-            <div class="d-flex justify-content-center align-items-middle">
-              <span class="balance-text">
-                {{ $t('yourBalance') }}
-              </span>
-              <span
-                class="icon-gem balance-gem-margin"
-                v-html="icons.gemIcon"
-                style="display: inline-block;"
-              ></span>
-              <span
-                class="balance-gems">
-                {{ maxGems }}
-              </span>
-            </div>
-          </div>
-          <div class="d-flex flex-column justify-content-center align-items-middle mt-3">
-            <button
-              v-if="fromBal"
-              class="btn btn-primary mx-auto mt-2"
-              type="submit"
-              :disabled="sendingInProgress"
-              @click="sendGift()"
-            >
-              {{ $t("send") }}
-            </button>
-          </div>
-
-          <!-- change to buying gems page -->
+    </div>
+    <!-- send gems from balance -->
+    <div
+      v-show="selectedPage === 'ownGems'"
+    >
+      <div class="gem-group">
+        <label v-once>
+          {{ $t('howManyGemsSend') }}
+        </label>
+        <div class="d-flex align-items-center justify-content-center">
           <div
-            :class="{active: selectedPage === 'buyGems'}"
-            @click="selectPage('buyGems')"
-            class="gem-state-change"
+            class="gray-circle"
+            @click="gift.gems.amount <= 0
+              ? gift.gems.amount = 0
+              : gift.gems.amount--"
           >
-            {{ $t('needToPurchaseGems') }}
+            <div
+              class="icon-negative"
+              v-html="icons.negativeIcon"
+            ></div>
           </div>
+          <div class="input-group">
+            <div class="input-group-prepend input-group-icon align-items-center">
+              <div
+                class="icon-gem"
+                v-html="icons.gemIcon"
+              ></div>
+            </div>
+            <input
+              id="gemsForm"
+              v-model="gift.gems.amount"
+              class="form-control"
+              :max="maxGems"
+            >
+          </div>
+          <div
+            class="gray-circle"
+            @click="gift.gems.amount < maxGems
+              ? gift.gems.amount++
+              : gift.gems.amount = maxGems"
+          >
+            <div
+              class="icon-positive"
+              v-html="icons.positiveIcon"
+            ></div>
+          </div>
+        </div>
+        <div class="align-items-middle">
+          <div class="d-flex justify-content-center align-items-middle">
+            <span class="balance-text">
+              {{ $t('yourBalance') }}
+            </span>
+            <span
+              class="icon-gem balance-gem-margin"
+              style="display: inline-block;"
+              v-html="icons.gemIcon"
+            ></span>
+            <span
+              class="balance-gems"
+            >
+              {{ maxGems }}
+            </span>
+          </div>
+        </div>
+        <div class="d-flex flex-column justify-content-center align-items-middle mt-3">
+          <button
+            v-if="fromBal"
+            class="btn btn-primary mx-auto mt-2"
+            type="submit"
+            :disabled="sendingInProgress"
+            @click="sendGift()"
+          >
+            {{ $t("send") }}
+          </button>
+        </div>
+
+        <!-- change to buying gems page -->
+        <div
+          :class="{active: selectedPage === 'buyGems'}"
+          class="gem-state-change"
+          @click="selectPage('buyGems')"
+        >
+          {{ $t('needToPurchaseGems') }}
         </div>
       </div>
     </div>
@@ -257,25 +262,31 @@
 
     .modal-close {
       position: absolute;
-      width: 18px;
-      height: 18px;
-      padding: 4px;
       right: 16px;
       top: 16px;
       cursor: pointer;
 
       .icon-close {
-        width: 15px;
-        height: 15px;
+        width: 18px;
+        height: 18px;
+        vertical-align: middle;
 
         & ::v-deep svg path {
           fill: #878190;
         }
+         & :hover {
+          fill: #686274;
+        }
       }
     }
     #subscription-form .subscribe-option {
       background: #F9F9F9;
     }
+
+    #subscription-form .selected {
+      background: rgba(213, 200, 255, 0.32);
+      // using rgba for transparency
+    }
 }
 </style>
 <style scoped lang="scss">
@@ -320,25 +331,24 @@
     font-size: 0.75rem;
     min-height: 32px;
     padding: 16px 0 0 0;
-    color: $purple-300;
     justify-content: center;
   }
 
-  .nav-item {
+  .nav-link {
+    color: $gray-100;
     display: inline-block;
     padding: 0px 8px 6px 8px;
-  }
 
-  .nav-item:hover, .nav-item.active {
+    &.active {
+    color: $purple-300;
+    border-bottom: 2px solid $purple-400;
+    }
+
+    &:hover {
     color: $purple-300;
     border-bottom: 2px solid $purple-400;
     cursor: pointer;
-  }
-
-  .nav-item.inactive {
-    color: $purple-300;
-    border-bottom: 0px;
-    cursor: pointer;
+    }
   }
 
   .gem-group {
@@ -392,6 +402,7 @@
   .icon-gem {
     width: 16px;
     height: 16px;
+    margin-bottom: 4px;
   }
 
   .icon-positive, .icon-negative {
@@ -522,38 +533,6 @@ export default {
       gemCost: 1,
     };
   },
-  methods: {
-    close () {
-      this.$root.$emit('bv::hide::modal', 'send-gift');
-    },
-    selectPage (page) {
-      this.selectedPage = page || 'subscription';
-    },
-    async sendGift () {
-      this.sendingInProgress = true;
-      await this.$store.dispatch('members:transferGems', {
-        toUserId: this.userReceivingGift._id,
-        gemAmount: this.gift.gems.amount,
-      });
-      this.close();
-      setTimeout(() => { // wait for the send gem modal to be closed
-        this.$root.$emit('habitica:payment-success', {
-          paymentMethod: 'balance',
-          paymentCompleted: true,
-          paymentType: 'gift-gems-balance',
-          gift: {
-            gems: {
-              amount: this.gift.gems.amount,
-            },
-          },
-          giftReceiver: this.receiverName,
-        });
-      }, 500);
-    },
-    onHide () {
-      this.sendingInProgress = false;
-    },
-  },
   computed: {
     ...mapState({
       userLoggedIn: 'user.data',
@@ -627,8 +606,54 @@ export default {
       } else {
         this.selectPage(this.startingPage);
       }
+      this.setGemDefaults();
       this.$root.$emit('bv::show::modal', 'send-gift');
     });
   },
+  methods: {
+    close () {
+      this.$root.$emit('bv::hide::modal', 'send-gift');
+    },
+    setGemDefaults () {
+      if (this.selectedPage === 'buyGems') {
+        this.gift.gems.amount = 20;
+      } else if (this.selectedPage === 'ownGems') {
+        this.gift.gems.amount = 1;
+      } else {
+        this.gift.gems.amount = 0;
+      }
+    },
+    selectPage (page) {
+      if (page === this.selectedPage) return;
+      if (page === 'buyGems') this.selectedPage = 'buyGems';
+      if (page === 'buyGems' && this.selectedPage === 'ownGems') return;
+      this.selectedPage = page || 'subscription';
+      this.setGemDefaults();
+    },
+    async sendGift () {
+      this.sendingInProgress = true;
+      await this.$store.dispatch('members:transferGems', {
+        toUserId: this.userReceivingGift._id,
+        gemAmount: this.gift.gems.amount,
+      });
+      this.close();
+      setTimeout(() => { // wait for the send gem modal to be closed
+        this.$root.$emit('habitica:payment-success', {
+          paymentMethod: 'balance',
+          paymentCompleted: true,
+          paymentType: 'gift-gems-balance',
+          gift: {
+            gems: {
+              amount: this.gift.gems.amount,
+            },
+          },
+          giftReceiver: this.receiverName,
+        });
+      }, 500);
+    },
+    onHide () {
+      this.sendingInProgress = false;
+    },
+  },
 };
 </script>

website/client/src/components/settings/site.vue

@@ -739,6 +739,14 @@ export default {
       } else if (attribute === 'email') {
         this.user.auth.local.email = updates.newEmail;
         window.alert(this.$t('emailSuccess')); // eslint-disable-line no-alert
+      } else if (attribute === 'password') {
+        this.passwordUpdates = {};
+        this.$store.dispatch('snackbars:add', {
+          title: 'Habitica',
+          text: this.$t('passwordSuccess'),
+          type: 'success',
+          timeout: true,
+        });
       }
     },
     async changeDisplayName (newName) {

website/client/src/components/settings/subscriptionOptions.vue

@@ -10,10 +10,17 @@
         :value="block.key"
         class="subscribe-option pt-2 pl-5 pb-3 mb-0"
         :class="{selected: subscription.key === block.key}"
-        @click.native="subscription.key = block.key"
+        @click.native="updateSubscriptionData(block.key)"
       >
         <!-- eslint-enable vue/no-use-v-if-with-v-for -->
         <div
+          v-if="userReceivingGift && userReceivingGift._id"
+          class="subscription-text ml-2 mb-1"
+          v-html="$t('giftSubscriptionRateText', {price: block.price, months: block.months})"
+        >
+        </div>
+        <div
+          v-else
           class="subscription-text ml-2 mb-1"
           v-html="$t('subscriptionRateText', {price: block.price, months: block.months})"
         >
@@ -25,7 +32,18 @@
         </div>
       </b-form-radio>
     </b-form-group>
+    <!-- payment buttons first is for gift subs and the second is for renewing subs -->
     <payments-buttons
+      v-if="userReceivingGift && userReceivingGift._id"
+      :disabled="!subscription.key"
+      :stripe-fn="() => redirectToStripe({gift, uuid: userReceivingGift._id, receiverName})"
+      :paypal-fn="() => openPaypalGift({
+        gift: gift, giftedTo: userReceivingGift._id, receiverName,
+      })"
+      :amazon-data="{type: 'single', gift, giftedTo: userReceivingGift._id, receiverName}"
+    />
+    <payments-buttons
+      v-else
       :disabled="!subscription.key"
       :stripe-fn="() => redirectToStripe({
         subscription: subscription.key,
@@ -43,6 +61,7 @@
 
 <style lang="scss">
   @import '~@/assets/scss/colors.scss';
+
   #subscription-form {
     .custom-control .custom-control-label::before,
     .custom-radio .custom-control-input:checked ~ .custom-control-label::after {
@@ -101,11 +120,22 @@ export default {
   mixins: [
     paymentsMixin,
   ],
+  props: {
+    userReceivingGift: {
+      type: Object,
+      default () {},
+    },
+  },
   data () {
     return {
       subscription: {
-        key: null,
+        key: 'basic_earned',
       },
+      gift: {
+        type: 'subscription',
+        subscription: { key: 'basic_earned' },
+      },
+      receiverName: '',
     };
   },
   computed: {
@@ -114,7 +144,6 @@ export default {
     },
     subscriptionBlocksOrdered () {
       const subscriptions = filter(subscriptionBlocks, o => o.discount !== true);
-
       return sortBy(subscriptions, [o => o.months]);
     },
   },
@@ -131,6 +160,10 @@ export default {
           return '<span class="subscription-bubble px-2 py-1">Gem cap at 25</span>';
       }
     },
+    updateSubscriptionData (key) {
+      this.subscription.key = key;
+      if (this.userReceivingGift._id) this.gift.subscription.key = key;
+    },
   },
 };
 </script>

website/client/src/components/shops/market/keysToKennel.vue

@@ -89,9 +89,6 @@ export default {
           try {
             this.$store.dispatch('shops:releasePets', { user: this.user });
             this.text(this.$t('releasePetsSuccess'));
-            // this.$router.push({name: 'stable'});
-            // Reload because achievement is set in user.save instead of common
-            window.location.reload(true);
           } catch (err) {
             window.alert(err.message); // eslint-disable-line no-alert
           }
@@ -112,9 +109,6 @@ export default {
           try {
             this.$store.dispatch('shops:releaseMounts', { user: this.user });
             this.text(this.$t('releaseMountsSuccess'));
-            // this.$router.push({name: 'stable'});
-            // Reload because achievement is set in user.save instead of common
-            window.location.reload(true);
           } catch (err) {
             window.alert(err.message); // eslint-disable-line no-alert
           }
@@ -135,9 +129,6 @@ export default {
           try {
             this.$store.dispatch('shops:releaseBoth', { user: this.user });
             this.text(this.$t('releaseBothSuccess'));
-            // this.$router.push({name: 'stable'});
-            // Reload because achievement is set in user.save instead of common
-            window.location.reload(true);
           } catch (err) {
             window.alert(err.message); // eslint-disable-line no-alert
           }

website/client/src/components/snackbars/notifications.vue

@@ -27,7 +27,7 @@
     position: fixed;
     right: 10px;
     width: 350px;
-    z-index: 999;
+    z-index: 9999; // to keep it above modal overlays
 
     top: var(--current-scrollY);
 

website/client/src/components/static/app.vue

@@ -18,7 +18,7 @@
         </a>
         <a
           href="https://geo.itunes.apple.com/us/app/habitica/id994882113?mt=8"
-          style="display:inline-block;overflow:hidden;background:url(http://linkmaker.itunes.apple.com/images/badges/en-us/badge_appstore-lrg.svg#svgView) no-repeat;background-size:100%;width:152px;height:45px;margin-left:20px;image-rendering:auto"
+          style="display:inline-block;overflow:hidden;background:url(https://linkmaker.itunes.apple.com/images/badges/en-us/badge_appstore-lrg.svg#svgView) no-repeat;background-size:100%;width:152px;height:45px;margin-left:20px;image-rendering:auto"
         ></a>
       </div>
     </div>

website/client/src/components/static/communityGuidelines.vue

@@ -209,6 +209,7 @@
           <li>Fox_town</li>
           <li>MaybeSteveRogers</li>
           <li>shanaqui</li>
+          <li>deilann (not yet pictured)</li>
         </ul>
       </div>
     </div>
@@ -218,7 +219,7 @@
       {{ $t('commGuidePara014') }}<br>
       <em>
         Lemoness, lefnire, Slappybag, litenull, Shaner, Bobbyroberts99, wc8,
-        deilann, Breadstrings, Megan, Blade, and Daniel the Bard
+        Breadstrings, Megan, Blade, and Daniel the Bard
       </em>
     </p>
     <h2 id="final">

website/client/src/components/static/header.vue

@@ -52,7 +52,7 @@
         <li class="nav-item">
           <a
             class="nav-link"
-            href="http://blog.habitrpg.com/"
+            href="https://blog.habitrpg.com/"
             target="_blank"
           >{{ $t('tumblr') }}</a>
         </li>

website/client/src/components/static/home.vue

@@ -6,7 +6,7 @@
     <noscript class="banner">
       {{ $t('jsDisabledHeadingFull') }}
       <br />
-      <a href="http://www.enable-javascript.com/" target="_blank">{{ $t('jsDisabledLink') }}</a>
+      <a href="https://www.enable-javascript.com/" target="_blank">{{ $t('jsDisabledLink') }}</a>
     </noscript>
     <div
       id="intro-signup"

website/client/src/components/static/privacy.vue

@@ -137,15 +137,15 @@
       browser which allows you to refuse cookies. Further information about the procedure to follow in order to
       disable cookies can be found on your Internet browser provider’s website via your help screen. You may
       wish to refer to <a
-        href="http://www.allaboutcookies.org/manage-cookies/index.html"
+        href="https://www.allaboutcookies.org/manage-cookies/index.html"
         target="_blank"
       >
-        http://www.allaboutcookies.org/manage-cookies/index.html</a> for information on commonly used browsers.
+        https://www.allaboutcookies.org/manage-cookies/index.html</a> for information on commonly used browsers.
       For more information about targeting and advertising cookies and how you can opt out, you can also visit
       <a
-        href="http://optout.aboutads.info"
+        href="https://optout.aboutads.info"
         target="_blank"
-      >http://optout.aboutads.info</a>. Please be aware
+      >https://optout.aboutads.info</a>. Please be aware
       that if cookies are disabled, not all features of the Service may operate properly or as intended.
     </p>
     <h3>Third-Party Analytics Providers</h3>

website/client/src/components/static/terms.vue

@@ -70,9 +70,9 @@
     <p>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.</p>
     <p>
       FOR ANY CUSTOMER WHO PURCHASED PREMIUM IN APPLE INC.'s APP STORE ("APP STORE"), PLEASE CONTACT APPLE INC.'s SUPPORT TEAM: <a
-        href="http://reportaproblem.apple.com"
+        href="https://reportaproblem.apple.com"
         target="_blank"
-      >http://reportaproblem.apple.com</a>. APPLE'S APP STORE DOES NOT ALLOW DEVELOPERS TO ISSUE REFUND FOR APP STORE PURCHASES MADE BY CUSTOMERS.
+      >https://reportaproblem.apple.com</a>. APPLE'S APP STORE DOES NOT ALLOW DEVELOPERS TO ISSUE REFUND FOR APP STORE PURCHASES MADE BY CUSTOMERS.
     </p>
     <h2>Warranty Disclaimer</h2>
     <p>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.</p>

website/client/src/components/tasks/taskModal.vue

@@ -662,6 +662,11 @@
       margin-bottom: 0;
     }
 
+    .custom-control-input {
+      z-index: -1;
+      opacity: 0;
+    }
+
     .modal-header {
       .form-group {
         margin-bottom: 1rem;
@@ -1280,12 +1285,17 @@ export default {
       createTag: 'tags:createTag',
     }),
     async syncTask () {
-      if (this.task && this.task.group && this.task.group.managerNotes) {
+      if (this.task?.group?.managerNotes) {
         this.managerNotes = this.task.group.managerNotes;
       }
-      if (this.groupId && this.task.group && this.task.group.approval) {
+      if (this.groupId && this.task.group?.approval) {
         this.requiresApproval = this.task.group.approval.required;
       }
+      if (this.task?.group?.sharedCompletion) {
+        this.sharedCompletion = this.task.group.sharedCompletion;
+      } else if (this.task.group) {
+        this.sharedCompletion = 'singleCompletion';
+      }
 
       if (this.groupId) {
         const members = await this.$store.dispatch('members:getGroupMembers', {
@@ -1306,9 +1316,6 @@ export default {
         if (this.task.group && this.task.group.assignedUsers) {
           this.assignedMembers = this.task.group.assignedUsers;
         }
-        if (this.task.group) {
-          this.sharedCompletion = this.task.group.sharedCompletion || 'singleCompletion';
-        }
       }
 
       // @TODO: This whole component is mutating a prop

website/client/src/components/userMenu/profile.vue

@@ -126,7 +126,7 @@
       </div>
     </div>
     <div class="row">
-      <div class="col-12 col-md-6 offset-md-3 text-center nav">
+      <div class="text-center nav">
         <div
           class="nav-item"
           :class="{active: selectedPage === 'profile'}"
@@ -470,6 +470,7 @@
   .gift-icon svg {
     height: 14px;
   }
+
 </style>
 
 <style lang="scss" scoped>
@@ -538,6 +539,7 @@
   }
 
   .nav {
+    width: 100%;
     font-weight: bold;
     min-height: 40px;
     justify-content: center;
@@ -710,6 +712,27 @@
       }
     }
   }
+
+  @media (max-width: 990px) {
+    .profile-actions {
+      flex-direction: column;
+    }
+    .profile-actions :not(:last-child) {
+      margin-bottom: 15px;
+    }
+    .profile-actions {
+      margin-right: 0;
+    }
+  }
+
+  @media (max-width: 550px) {
+    .member-details {
+      flex-direction: column;
+    }
+    .member-details .avatar {
+      margin-bottom: 15px;
+    }
+  }
 </style>
 
 <script>

website/client/src/components/userMenu/profileStats.vue

@@ -4,7 +4,7 @@
     class="standard-page"
   >
     <div class="row">
-      <div class="col-12 col-md-6">
+      <div class="stats-section-equipment col-12 col-md-6">
         <h2 class="text-center">
           {{ $t('equipment') }}
         </h2>
@@ -12,7 +12,7 @@
           <div
             v-for="(label, key) in equipTypes"
             :key="key"
-            class="col-12 col-md-4 item-wrapper"
+            class="item-wrapper"
           >
             <div
               v-if="label !== 'skip'"
@@ -48,7 +48,7 @@
           </div>
         </div>
       </div>
-      <div class="col-12 col-md-6">
+      <div class="stats-section-costume col-12 col-md-6">
         <h2 class="text-center">
           {{ $t('costume') }}
         </h2>
@@ -57,7 +57,7 @@
           <div
             v-for="(label, key) in equipTypes"
             :key="key"
-            class="col-12 col-md-4 item-wrapper"
+            class="item-wrapper"
           >
             <!-- Append a "C" to the key name since HTML IDs have to be unique.-->
             <div
@@ -111,7 +111,7 @@
       </div>
     </div>
     <div class="row pet-mount-row">
-      <div class="col-12 col-md-6">
+      <div class="stats-section-pets col-12 col-md-6">
         <h2
           v-once
           class="text-center"
@@ -119,8 +119,7 @@
           {{ $t('pets') }}
         </h2>
         <div class="well pet-mount-well">
-          <div class="row col-12">
-            <div class="col-12 col-md-4">
+          <div class="pet-mount-well-image">
               <div
                 class="box"
                 :class="{white: user.items.currentPet}"
@@ -131,7 +130,7 @@
                 ></div>
               </div>
             </div>
-            <div class="col-12 col-md-8">
+            <div class="pet-mount-well-text">
               <div>{{ formatAnimal(user.items.currentPet, 'pet') }}</div>
               <div>
                 <strong>{{ $t('petsFound') }}:</strong>
@@ -142,10 +141,9 @@
                 {{ beastMasterProgress(user.items.pets) }}
               </div>
             </div>
-          </div>
         </div>
       </div>
-      <div class="col-12 col-md-6">
+      <div class="stats-section-mounts col-12 col-md-6">
         <h2
           v-once
           class="text-center"
@@ -153,28 +151,26 @@
           {{ $t('mounts') }}
         </h2>
         <div class="well pet-mount-well">
-          <div class="row col-12">
-            <div class="col-12 col-md-4">
+          <div class="pet-mount-well-image">
+            <div
+              class="box"
+              :class="{white: user.items.currentMount}"
+            >
               <div
-                class="box"
-                :class="{white: user.items.currentMount}"
-              >
-                <div
-                  class="mount"
-                  :class="`Mount_Icon_${user.items.currentMount}`"
-                ></div>
-              </div>
+                class="mount"
+                :class="`Mount_Icon_${user.items.currentMount}`"
+              ></div>
             </div>
-            <div class="col-12 col-md-8">
-              <div>{{ formatAnimal(user.items.currentMount, 'mount') }}</div>
-              <div>
-                <strong>{{ $t('mountsTamed') }}:</strong>
-                <span>{{ totalCount(user.items.mounts) }}</span>
-              </div>
-              <div>
-                <strong>{{ $t('mountMasterProgress') }}:</strong>
-                <span>{{ mountMasterProgress(user.items.mounts) }}</span>
-              </div>
+          </div>
+          <div class="pet-mount-well-text">
+            <div>{{ formatAnimal(user.items.currentMount, 'mount') }}</div>
+            <div>
+              <strong>{{ $t('mountsTamed') }}:</strong>
+              <span>{{ totalCount(user.items.mounts) }}</span>
+            </div>
+            <div>
+              <strong>{{ $t('mountMasterProgress') }}:</strong>
+              <span>{{ mountMasterProgress(user.items.mounts) }}</span>
             </div>
           </div>
         </div>
@@ -309,15 +305,13 @@
         v-if="showStatsSave"
         class="row save-row"
       >
-        <div class="col-12 col-md-6 offset-md-3 text-center">
-          <button
-            class="btn btn-primary"
-            :disabled="loading"
-            @click="saveAttributes()"
-          >
-            {{ loading ? $t('loading') : $t('save') }}
-          </button>
-        </div>
+        <button
+          class="btn btn-primary"
+          :disabled="loading"
+          @click="saveAttributes()"
+        >
+          {{ loading ? $t('loading') : $t('save') }}
+        </button>
       </div>
     </div>
   </div>
@@ -650,10 +644,17 @@ export default {
     border-radius: 2px;
     padding: 0.4em;
     padding-top: 1em;
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    gap: 15px;
   }
 
   .well.pet-mount-well {
+    padding-left: 15px;
     padding-bottom: 1em;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
 
     strong {
       margin-right: .2em;
@@ -690,12 +691,13 @@ export default {
   }
 
   .save-row {
-    margin-top: 1em;
+    margin: 2em 0 1em 0;
+    justify-content: center;
   }
 
     .gear.box {
       vertical-align: top;
-      margin: 0 auto;
+      // margin: 0 auto;
     }
 
     .gear-label {
@@ -721,4 +723,34 @@ export default {
       // breaks the long words without a space
       word-break: break-word;
     }
+
+  @media (max-width: 850px) {
+    #stats .col-md-6 {
+      flex: none;
+      max-width: 100%;
+    }
+  }
+  @media(max-width: 990px) {
+    .modal-body #stats .col-md-6 {
+      flex: none;
+      max-width: 100%;
+    }
+
+    [class^="stats-section-"] {
+      margin-bottom: 30px;
+    }
+    #allocation {
+      .box {
+        width: 100%;
+        height: 100%;
+        .col-9 {
+          padding: 0;
+          margin: 0;
+        }
+        .col-9 div:first-child {
+          font-size: 13px;
+        }
+      }
+    }
+  }
 </style>

website/client/src/libs/staffList.js

@@ -39,6 +39,11 @@ export default [
     type: 'Moderator',
     uuid: '28771972-ca6d-4c03-8261-e1734aa7d21d',
   },
+  {
+    name: 'deilann',
+    type: 'Moderator',
+    uuid: 'e7b5d1e2-3b6e-4192-b867-8bafdb03eeec',
+  },
   {
     name: 'Dewines',
     type: 'Moderator',

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).

website/common/locales/ar/achievements.json

@@ -119,5 +119,21 @@
     "achievementDomesticatedText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة المستأنسة: النمس ، وخنزير غينيا ، والديك ، والخنزير الطائر ، والجرذ ، والأرنب ، والحصان ، والبقر!",
     "achievementDomesticated": "ا-يا-ا-يا-يو",
     "achievementBirdsOfAFeatherModalText": "تقوم بجمع كل الحيوانات الأليفة الطائرة!",
-    "achievementZodiacZookeeperText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة في الأبراج: الجرذ ، البقرة ، الأرنب ، الأفعى ، الحصان ، الأغنام ، القرد ، الديك ، الذئب ، النمر ، الخنزير الطائر ، والتنين!"
+    "achievementZodiacZookeeperText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة في الأبراج: الجرذ ، البقرة ، الأرنب ، الأفعى ، الحصان ، الأغنام ، القرد ، الديك ، الذئب ، النمر ، الخنزير الطائر ، والتنين!",
+    "achievementGroupsBeta2022ModalText": "لقد ساعدت أنت ومجموعاتك Habitica من خلال الاختبار وتقديم التعليقات!",
+    "achievementGroupsBeta2022": "اختبار تجريبي تفاعلي",
+    "achievementGroupsBeta2022Text": "قدمت أنت ومجموعتك تعليقات لا تقدر بثمن لمساعدة Habitica في الاختبار.",
+    "achievementReptacularRumble": "الدمدمة الزاحفة",
+    "achievementReptacularRumbleModalText": "لقد جمعت كل الزواحف الأليفة!",
+    "achievementReptacularRumbleText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة الزواحف: التمساح ، الزاحف المجنح ، الأفعى ، ترايسيراتوبس ، السلحفاة ، التيرانوصور ريكس ، وفيلوسيرابتور!",
+    "achievementBirdsOfAFeather": "متشابهون",
+    "achievementZodiacZookeeper": "حارس حديقة الحيوانات الفلكية",
+    "achievementShadyCustomerText": "لقد جمع كل حيوانات الظل الأليفة.",
+    "achievementShadyCustomerModalText": "لقد قمت بتجميع كل حيوانات الظل الأليفة!",
+    "achievementZodiacZookeeperModalText": "لقد قمت بتجميع كل الحيوانات الفلكية الأليفة!",
+    "achievementBirdsOfAFeatherText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة الطائرة: الخنزير الطائر ، البومة ، الببغاء ، الزاحف المجنح ، الجريفون ، فالكون ، الطاووس ، والديك!",
+    "achievementShadeOfItAllModalText": "لقد قمت بترويض كل حيوانات الظل للركوب!",
+    "achievementShadyCustomer": "زبون الظل",
+    "achievementShadeOfItAll": "ظل كل شيء",
+    "achievementShadeOfItAllText": "لقد ربي كل حيوانات الظل للترويض."
 }

website/common/locales/ar/backgrounds.json

@@ -409,5 +409,18 @@
     "backgroundArchaeologicalDigNotes": "Unearth secrets of the ancient past at an Archaeological Dig.",
     "backgroundScribesWorkshopText": "Scribe's Workshop",
     "backgroundScribesWorkshopNotes": "Write your next great scroll in a Scribe's Workshop.",
-    "backgrounds022019": "مجموعة 57: تم إصدارها في فبراير 2019"
+    "backgrounds022019": "مجموعة 57: تم إصدارها في فبراير 2019",
+    "backgroundBirthdayPartyText": "حفلة عيد ميلاد",
+    "backgrounds012020": "مجموعة 68: تم طرحه في يناير 2020",
+    "backgroundMedievalKitchenText": "مطبخ القرون الوسطى",
+    "backgroundMedievalKitchenNotes": "اطبخ العاصفة في مطبخ القرون الوسطى.",
+    "backgroundBirthdayPartyNotes": "احتفل بعيد ميلاد ال Habitican المفضل لديك.",
+    "backgroundDuckPondText": "بركة بط",
+    "backgroundOldFashionedBakeryText": "مخبز قديم الطراز",
+    "backgroundValentinesDayFeastingHallText": "قاعة عيد الحب",
+    "backgroundOldFashionedBakeryNotes": "استمتع بالنكهات اللذيذة خارج مخبز قديم الطراز.",
+    "backgroundDuckPondNotes": "أطعم الطيور المائية في بركة البط.",
+    "backgroundValentinesDayFeastingHallNotes": "اشعر بالحب في قاعة احتفالات عيد الحب.",
+    "hideLockedBackgrounds": "إخفاء الخلفيات المقفلة",
+    "backgrounds032019": "SET 58: تم إصداره في مارس 2019"
 }

website/common/locales/ar/challenge.json

@@ -103,5 +103,6 @@
     "selectParticipant": "اختر مشارك",
     "wonChallengeDesc": "<%= إسم التحدي %> إخترتك لتكون الفائز!تم تسجيل فوزك في \"إنجازاتك\".",
     "yourReward": "مكافئاتك",
-    "filters": "التصفيات"
+    "filters": "التصفيات",
+    "removeTasks": "إزالة المهام"
 }

website/common/locales/ar/generic.json

@@ -2,7 +2,7 @@
     "languageName": "العربية",
     "stringNotFound": "سلسلة المحارف '<%= string %>' لم توجد.",
     "habitica": "Habitica",
-    "onward": "Onward!",
+    "onward": "إلي الأمام!",
     "done": "Done",
     "gotIt": "Got it!",
     "titleTimeTravelers": "مسافرين عبر الزمن",
@@ -25,7 +25,7 @@
     "user": "المستخدم",
     "market": "المتجر",
     "newSubscriberItem": "You have new <span class=\"notification-bold-blue\">Mystery Items</span>",
-    "subscriberItemText": "كل شهر يحصل المشتركون على غرض غامض. عادةً يتم إصداره قبل نهاية الشهر بأسبوع. راجع صفحة الويكي \"الغرض الغامض\" للمزيد من المعلومات.",
+    "subscriberItemText": "كل شهر يحصل المشتركون على غرض غامض. عادةً يصبح متاحا في بداية الشهر. راجع صفحة الويكي \"الغرض الغامض\" للمزيد من المعلومات.",
     "all": "الجميع",
     "none": "لا شيء",
     "more": "<%= count %> more",
@@ -178,10 +178,10 @@
     "advocacy_causes": "Advocacy + Causes",
     "entertainment": "Entertainment",
     "finance": "Finance",
-    "health_fitness": "Health + Fitness",
-    "hobbies_occupations": "Hobbies + Occupations",
+    "health_fitness": "الصحة واللياقة البدنية",
+    "hobbies_occupations": "الهوايات والمهن",
     "location_based": "Location-based",
-    "mental_health": "Mental Health + Self-Care",
+    "mental_health": "الصحة العقلية + العناية الذاتية",
     "getting_organized": "Getting Organized",
     "self_improvement": "Self-Improvement",
     "spirituality": "Spirituality",
@@ -190,10 +190,28 @@
     "dismissAll": "Dismiss All",
     "messages": "Messages",
     "emptyMessagesLine1": "You don't have any messages",
-    "emptyMessagesLine2": "Send a message to start a conversation!",
+    "emptyMessagesLine2": "يمكنك إرسال رسالة جديدة إلى مستخدم من خلال زيارة ملفه الشخصي والنقر على زر \"رسالة\".",
     "userSentMessage": "<span class=\"notification-bold\"><%- user %></span> sent you a message",
-    "letsgo": "Let's Go!",
+    "letsgo": "لنذهب!",
     "selected": "Selected",
     "howManyToBuy": "How many would you like to buy?",
-    "contactForm": "Contact the Moderation Team"
+    "contactForm": "Contact the Moderation Team",
+    "congratulations": "تهانينا!",
+    "finish": "نهاية",
+    "onboardingAchievs": "إنجازات الإعداد",
+    "reportBugHeaderDescribe": "يُرجى وصف الخطأ الذي تواجهه وسيتواصل معك فريقنا.",
+    "reportEmailText": "سيتم استخدام هذا فقط للاتصال بك بخصوص تقرير الخطأ.",
+    "reportEmailPlaceholder": "عنوان بريدك الإلكتروني",
+    "reportEmailError": "يرجى تقديم عنوان بريد إلكتروني صالح",
+    "reportDescription": "الوصف",
+    "reportDescriptionText": "قم بتضمين لقطات الشاشة أو أخطاء وحدة التحكم بجافا سكريبت إذا كان ذلك مفيدًا.",
+    "reportDescriptionPlaceholder": "صف الخطأ بالتفصيل هنا",
+    "submitBugReport": "إرسال تقرير الخطأ",
+    "reportSent": "تم إرسال تقرير الخطأ!",
+    "askQuestion": "طرح سؤال",
+    "emptyReportBugMessage": "الإبلاغ عن رسالة خطأ مفقودة",
+    "loadEarlierMessages": "تحميل الرسائل السابقة",
+    "demo": "تجريبي",
+    "options": "الإعدادات",
+    "reportSentDescription": "سنعود إليك بمجرد أن تتاح الفرصة لفريقنا للتحقيق في الأمر. شكرا على الإبلاغ عن المشكلة."
 }

website/common/locales/ar/inventory.json

@@ -4,5 +4,7 @@
     "eggsItemType": "بيض",
     "hatchingPotionsItemType": "جرعات الفقس",
     "specialItemType": "حاجات خاصة",
-    "lockedItem": "حاجة مقفلة"
+    "lockedItem": "حاجة مقفلة",
+    "petAndMount": "حيوان أليف وحيوان للركوب",
+    "allItems": "كل العناصر"
 }

website/common/locales/ar/loginincentives.json

@@ -1,25 +1,25 @@
 {
-  "unlockedReward": "You have received <%= reward %>",
-  "earnedRewardForDevotion": "You have earned <%= reward %> for being committed to improving your life.",
-  "nextRewardUnlocksIn": "Check-ins until your next prize: <%= numberOfCheckinsLeft %>",
-  "awesome": "Awesome!",
-  "countLeft": "Check-ins until next reward: <%= count %>",
-  "incentivesDescription": "When it comes to building habits, consistency is key. Each day you check-in you get closer to a prize.",
-  "checkinEarned": "Your Check-In Counter went up!",
-  "unlockedCheckInReward": "You unlocked a Check-In Prize!",
-  "checkinProgressTitle": "Progress until next",
-  "incentiveBackgroundsUnlockedWithCheckins": "Locked Plain Backgrounds will unlock with Daily Check-Ins.",
-  "oneOfAllPetEggs": "one of each standard Pet Egg",
-  "twoOfAllPetEggs": "two of each standard Pet Egg",
-  "threeOfAllPetEggs": "three of each standard Pet Egg",
-  "oneOfAllHatchingPotions": "one of each standard Hatching Potion",
-  "threeOfEachFood": "three of each standard Pet Food",
-  "fourOfEachFood": "four of each standard Pet Food",
-  "twoSaddles": "two Saddles",
-  "threeSaddles": "three Saddles",
-  "incentiveAchievement": "the Royally Loyal achievement",
-  "royallyLoyal": "Royally Loyal",
-  "royallyLoyalText": "This user has checked in over 500 times, and has earned every Check-In Prize!",
-  "checkInRewards": "Check-In Rewards",
-  "backloggedCheckInRewards": "You received Check-In Prizes! Visit your Inventory and Equipment to see what's new."
+    "unlockedReward": "You have received <%= reward %>",
+    "earnedRewardForDevotion": "You have earned <%= reward %> for being committed to improving your life.",
+    "nextRewardUnlocksIn": "Check-ins until your next prize: <%= numberOfCheckinsLeft %>",
+    "awesome": "Awesome!",
+    "countLeft": "Check-ins until next reward: <%= count %>",
+    "incentivesDescription": "When it comes to building habits, consistency is key. Each day you check-in you get closer to a prize.",
+    "checkinEarned": "Your Check-In Counter went up!",
+    "unlockedCheckInReward": "You unlocked a Check-In Prize!",
+    "checkinProgressTitle": "Progress until next",
+    "incentiveBackgroundsUnlockedWithCheckins": "Locked Plain Backgrounds will unlock with Daily Check-Ins.",
+    "oneOfAllPetEggs": "one of each standard Pet Egg",
+    "twoOfAllPetEggs": "two of each standard Pet Egg",
+    "threeOfAllPetEggs": "three of each standard Pet Egg",
+    "oneOfAllHatchingPotions": "one of each standard Hatching Potion",
+    "threeOfEachFood": "three of each standard Pet Food",
+    "fourOfEachFood": "four of each standard Pet Food",
+    "twoSaddles": "two Saddles",
+    "threeSaddles": "ثلاثة سروج",
+    "incentiveAchievement": "the Royally Loyal achievement",
+    "royallyLoyal": "Royally Loyal",
+    "royallyLoyalText": "This user has checked in over 500 times, and has earned every Check-In Prize!",
+    "checkInRewards": "Check-In Rewards",
+    "backloggedCheckInRewards": "You received Check-In Prizes! Visit your Inventory and Equipment to see what's new."
 }

website/common/locales/ar/npc.json

@@ -1,12 +1,12 @@
 {
     "npc": "شخصية غير قابلة للعب",
-    "npcAchievementName": "<%= key %> NPC",
-    "npcAchievementText": "Backed the Kickstarter project at the maximum level!",
-    "welcomeTo": "Welcome to",
-    "welcomeBack": "Welcome back!",
+    "npcAchievementName": "<%= key %> شخصية غير قابلة للعب",
+    "npcAchievementText": "لقد دعمت مشروع Kickstarter بأقصى مستوى!",
+    "welcomeTo": "مرحبًا بكِ في",
+    "welcomeBack": "مرحباً بعودتك!",
     "justin": "جستن",
-    "justinIntroMessage1": "Hello there! You must be new here. My name is <strong>Justin</strong>, and I'll be your guide in Habitica.",
-    "justinIntroMessage3": "Great! Now, what are you interested in working on throughout this journey?",
+    "justinIntroMessage1": "أهلاً بك! يبدو أنك جديد/ة هنا. اسمي <strong>جاستن</strong> ، وسأكون دليلك في Habitica.",
+    "justinIntroMessage3": "رائعة! الآن ، ما الذي تهتم بالعمل عليه طوال هذه المغامرة؟",
     "justinIntroMessageUsername": "Before we begin, let’s figure out what to call you. Below you’ll find a display name and username I’ve generated for you. After you’ve picked a display name and username, we’ll get started by creating an avatar!",
     "justinIntroMessageAppearance": "So how would you like to look? Don’t worry, you can change this later.",
     "introTour": "Here we are! I've filled out some Tasks for you based on your interests, so you can get started right away. Click a Task to edit or add new Tasks to fit your routine!",

website/common/locales/ar/overview.json

@@ -1,10 +1,10 @@
 {
     "needTips": "تحتاج بعض النصائح حول كيفية البدء؟ هنا دليل مباشر!",
     "step1": "الخطوة ١: أدخل المهام",
-    "webStep1Text": "Habitica لا شيء بدون أهداف حقيقية، لذا أدخل بعض المهام. يمكنك إضافة المزيد في وقت لاحق وأنت تفكر بهم! يمكن إضافة جميع المهام عن طريق النقر على الزر \"إنشاء\" باللون الأخضر.\n* ** إعداد [المهام](http://habitica.wikia.com/wiki/To-Dos): ** أدخل المهام التي تقوم بها مرة واحدة أو نادراً ما في عمود المهام، كل مهمة على حدة. يمكنك أيضاً الضغط على المهام لتحريرها وإضافة قوائم المراجعة وتواريخ الاستحقاق والمزيد!\n* ** إعداد [اليوميات](http://habitica.wikia.com/wiki/Dailies): ** أدخل الأنشطة التي تحتاج فعلها يوميًا أو في يوم معين من الأسبوع أو الشهر أو السنة في عمود اليوميات. انقر على المهمة اليومية لتعديل موعد استحقاقها و/أو تحديد تاريخ البدء. يمكنك أيضًا جعلها مستحقة على أساس متكرر، على سبيل المثال، كل 3 أيام.\n* ** إعداد [العادات](http://habitica.wikia.com/wiki/Habits): ** أدخل العادات التي تريد إقامتها في عمود العادات. يمكنك تحرير العادة لتغييرها إلى عادة جيدة :heavy_plus_sign: أو عادة سيئة :heavy_minus_sign:\n* ** إعداد [المكافآت](http://habitica.wikia.com/wiki/Rewards): ** بالإضافة إلى المكافآت المقدمة في اللعبة، أضف الأنشطة أو الأشياء التي تريد استخدامها كدافع إلى عمود المكافآت. من المهم أن تمنح نفسك فترة راحة أو تسمح ببعض التساهل باعتدال!\n* إذا كنت بحاجة إلى إلهام للمهام التي يمكنك إضافتها، يمكنك الاطلاع على صفحات الويكي عن [نموذج عادات](http://habitica.wikia.com/wiki/Sample_Habits)، و[نموذج يوميات](http://habitica.wikia.com/wiki/Sample_Dailies)، و[نموذج مهام](http://habitica.wikia.com/wiki/Sample_To-Dos)، و[نموذج مكافآت](http://habitica.wikia.com/wiki/Sample_Custom_Rewards).",
+    "webStep1Text": "Habitica لا شيء بدون أهداف حقيقية، لذا أدخل بعض المهام. يمكنك إضافة المزيد في وقت لاحق وأنت تفكر بهم! يمكن إضافة جميع المهام عن طريق النقر على الزر \"إنشاء\" باللون الأخضر.\n* ** إعداد [المهام](https://habitica.wikia.com/wiki/To-Dos): ** أدخل المهام التي تقوم بها مرة واحدة أو نادراً ما في عمود المهام، كل مهمة على حدة. يمكنك أيضاً الضغط على المهام لتحريرها وإضافة قوائم المراجعة وتواريخ الاستحقاق والمزيد!\n* ** إعداد [اليوميات](https://habitica.wikia.com/wiki/Dailies): ** أدخل الأنشطة التي تحتاج فعلها يوميًا أو في يوم معين من الأسبوع أو الشهر أو السنة في عمود اليوميات. انقر على المهمة اليومية لتعديل موعد استحقاقها و/أو تحديد تاريخ البدء. يمكنك أيضًا جعلها مستحقة على أساس متكرر، على سبيل المثال، كل 3 أيام.\n* ** إعداد [العادات](https://habitica.wikia.com/wiki/Habits): ** أدخل العادات التي تريد إقامتها في عمود العادات. يمكنك تحرير العادة لتغييرها إلى عادة جيدة :heavy_plus_sign: أو عادة سيئة :heavy_minus_sign:\n* ** إعداد [المكافآت](https://habitica.wikia.com/wiki/Rewards): ** بالإضافة إلى المكافآت المقدمة في اللعبة، أضف الأنشطة أو الأشياء التي تريد استخدامها كدافع إلى عمود المكافآت. من المهم أن تمنح نفسك فترة راحة أو تسمح ببعض التساهل باعتدال!\n* إذا كنت بحاجة إلى إلهام للمهام التي يمكنك إضافتها، يمكنك الاطلاع على صفحات الويكي عن [نموذج عادات](https://habitica.wikia.com/wiki/Sample_Habits)، و[نموذج يوميات](http://habitica.wikia.com/wiki/Sample_Dailies)، و[نsموذج مهام](https://habitica.wikia.com/wiki/Sample_To-Dos)، و[نموذج مكافآت](https://habitica.wikia.com/wiki/Sample_Custom_Rewards).",
     "step2": "الخطوة 2: اكسب نقاط عن طريق القيام بأشياء في الحياة الحقيقية",
-    "webStep2Text": "مستوى",
+    "webStep2Text": "الآن ، ابدأ في معالجة أهدافك من القائمة! عندما تكمل المهام وتحقق منها في Habitica ، ستحصل على [الخبرة] (https://habitica.fandom.com/wiki/Experience_Points) ، مما يساعدك على الارتقاء إلى المستوى الأعلى ، و [الذهب] (https: // Habitica. fandom.com/wiki/Gold_Points) ، والذي يسمح لك بشراء مكافأت. إذا وقعت في عادات سيئة أو فاتتك يومياتك ، فستفقد [الصحة] (https://habitica.fandom.com/wiki/Health_Points). بهذه الطريقة ، تعمل أشرطة Habiticaالخبرة والصحة كمؤشر ممتع لتقدمك نحو أهدافك. ستبدأ في رؤية حياتك الحقيقية تتحسن مع تقدم شخصيتك في اللعبة.",
     "step3": "الخطوة ٣: كيّف واستكشف Habitica",
-    "webStep3Text": "Once you're familiar with the basics, you can get even more out of Habitica with these nifty features:\n * Organize your tasks with [tags](http://habitica.wikia.com/wiki/Tags) (edit a task to add them).\n * Customize your [avatar](http://habitica.wikia.com/wiki/Avatar) by clicking the user icon in the upper-right corner.\n * Buy your [Equipment](http://habitica.wikia.com/wiki/Equipment) under Rewards or from the [Shops](<%= shopUrl %>), and change it under [Inventory > Equipment](<%= equipUrl %>).\n * Connect with other users via the [Tavern](http://habitica.wikia.com/wiki/Tavern).\n * Starting at Level 3, hatch [Pets](http://habitica.wikia.com/wiki/Pets) by collecting [eggs](http://habitica.wikia.com/wiki/Eggs) and [hatching potions](http://habitica.wikia.com/wiki/Hatching_Potions). [Feed](http://habitica.wikia.com/wiki/Food) them to create [Mounts](http://habitica.wikia.com/wiki/Mounts).\n * At level 10: Choose a particular [class](http://habitica.wikia.com/wiki/Class_System) and then use class-specific [skills](http://habitica.wikia.com/wiki/Skills) (levels 11 to 14).\n * Form a party with your friends (by clicking [Party](<%= partyUrl %>) in the navigation bar) to stay accountable and earn a Quest scroll.\n * Defeat monsters and collect objects on [quests](http://habitica.wikia.com/wiki/Quests) (you will be given a quest at level 15).",
+    "webStep3Text": "بمجرد أن تتعرف على الأساسيات ، يمكنك الحصول على المزيد من Habitica بهذه الميزات الرائعة:\n * تنظيم المهام باستخدام [العلامات] (https://habitica.fandom.com/wiki/Tags) (قم بتحرير مهمة لإضافتها).\n * قم بتخصيص [الشخصية] الخاص بك (https://habitica.fandom.com/wiki/Avatar) بالنقر فوق رمز المستخدم في الزاوية العلوية اليمنى.\n * اشتر [المعدات] (https://habitica.fandom.com/wiki/Equipment) بموجب المكافآت أو من [المتاجر] (<٪ = shopUrl٪>) ، وقم بتغييرها ضمن [المخزون> المعدات] (<٪ = equipUrl٪>).\n * تواصل مع مستخدمين آخرين عبر [المطعم] (https://habitica.fandom.com/wiki/Tavern).\n * افقس[الحيوانات الأليفة] (https://habitica.fandom.com/wiki/ Pets) من خلال جمع [البيض] (https://habitica.fandom.com/wiki/Eggs) و [جرعات الفقس] (https: // Habitica.fandom.com/wiki/Hatching_Potions). [موجز] (https://habitica.fandom.com/wiki/Food) لإنشاء [حيوانات للركوب] (https://habitica.fandom.com/wiki/Mounts).\n * في المستوى 10: اختر [فئة] معينة (https://habitica.fandom.com/wiki/Class_System) ثم استخدم [مهارات] خاصة بالفصل (https://habitica.fandom.com/wiki/Skills) (المستويات من 11 إلى 14).\n * كوّن مجموعة مع أصدقائك (بالنقر فوق [حفلة] (<٪ = partyUrl٪>) في شريط التنقل) للبقاء مسؤولاً وكسب تمرير المهام.\n * اهزم الوحوش وجمع الأشياء في [المهام] (https://habitica.fandom.com/wiki/Quests) (ستحصل على مهمة في المستوى 15).",
     "overviewQuestions": "Have questions? Check out the [FAQ](<%= faqUrl %>)! If your question isn't mentioned there, you can ask for further help in the [Habitica Help guild](<%= helpGuildUrl %>).\n\nGood luck with your tasks!"
 }

website/common/locales/ar/pets.json

@@ -1,8 +1,8 @@
 {
     "pets": "الحيوانات الأليفة",
-    "stable": "مستقر",
+    "stable": "الإسطبل",
     "noActivePet": "لا يوجد حيوان أليف نشط",
-    "activePet": "أنشطة الحيوانات الأليفة",
+    "activePet": "الحيوان الأليف النشط",
     "raisedPet": "لقد نمت <٪ = حيوان أليف٪>!",
     "feedPet": "تغذية <٪ = text٪> إلى <٪ = name٪>؟",
     "mountNotOwned": "أنت لاتملك هذه الكمية.",
@@ -25,14 +25,14 @@
     "beastAchievement": "لقد ربحت \"وحش رئيسي \" إنجاز جمع كل الحيوانات الأليفة!",
     "beastMasterProgress": "تقدم الوحش الرئيسي",
     "premiumPotionNoDropExplanation": "لا يمكن استخدام جرعات التفقيس السحرية على البيض المستلم من المهام.الطريقة الوحيدة للحصول على جرعات التفقيس السحرية هي عن طريق شراؤهم بالأسفل.ليس من المقطورات العشوائية.",
-    "dropsExplanationEggs": "أنفق الجواهر لتحصل على المزيد من البيض بسرهة,إذا كنت لاتريد أن تنتظر البيض الأساسي أسقطه, أو كررالتنقيب لإدخارالبيض المنقب <a href=\"http://habitica.fandom.com/wiki/Drops\">Learn more about the drop system.</a>",
-    "dropsExplanation": "احصل على هذه العناصر بشكل أسرع مع الجواهر إذا كنت لا ترغب في انتظار إسقاطها عند إكمال مهمة. <a href=\"http://habitica.fandom.com/wiki/Drops\"> تعرف على المزيد حول نظام الإفلات. </a>",
+    "dropsExplanationEggs": "أنفق الجواهر لتحصل على المزيد من البيض بسرهة,إذا كنت لاتريد أن تنتظر البيض الأساسي أسقطه, أو كررالتنقيب لإدخارالبيض المنقب <a href=\"https://habitica.fandom.com/wiki/Drops\">Learn more about the drop system.</a>",
+    "dropsExplanation": "احصل على هذه العناصر بشكل أسرع مع الجواهر إذا كنت لا ترغب في انتظار إسقاطها عند إكمال مهمة. <a href=\"https://habitica.fandom.com/wiki/Drops\"> تعرف على المزيد حول نظام الإفلات. </a>",
     "veteranTiger": "النمر المحارب",
     "veteranWolf": "الذئب المحارب",
     "etherealLion": "الأسد السماوي",
     "magicMounts": "جرعة سحرية متصاعدة",
     "questMounts": "تنقيب جبال",
-    "mountsTamed": "ترويض الجبل",
+    "mountsTamed": "المراكيب المروضة",
     "noSaddlesAvailable": "أنت لاتملك أي سروج.",
     "noFoodAvailable": "أنت لاتملك أي أغذية للحيوانات الأليفة.",
     "food": "أغذية الحيوانات الأليفة والسروج",
@@ -61,20 +61,42 @@
     "veteranFox": "الثعلب المخضرم",
     "veteranBear": "الدب المخضرم",
     "veteranLion": "الأسد المخضرم",
-    "activeMount": "جبل نشط",
-    "mounts": "يتصاعد",
+    "activeMount": "مركوب نشط",
+    "mounts": "مركوب",
     "wackyPets": "حيوانات أليف مضحكة",
     "magicPets": "دواء سحري للحيوانات الأليفة",
     "petsFound": "إنشاء حيوانات أليفة",
     "keyToPets": "مفتاح بيوت الحيوانات",
-    "noActiveMount": "لا يوجد تثبيت نشط",
+    "noActiveMount": "لا يوجد مركوب نشط",
     "questPets": "بحث الحيوانات",
     "releasePetsConfirm": "هل أنت متأكد أنك تريد إطلاق سراح حيوانك الأليف القياسي؟",
     "keyToMounts": "مفتاح بيت الحيوان",
     "petsReleased": "أفرج عن الحيوانات الأليفة",
-    "keyToPetsDesc": "حرر جميع الحيوانات المسموح بها حتى تتمكن من جمعها مرة أخرى. (لا تتأثر بالحيوانات الأليفة والحيوانات الأليفة الغريبة.)",
-    "petName": "<%= potion(locale) %> <%= egg(locale) %>",
+    "keyToPetsDesc": "حرر جميع الحيوانات الأليفة القياسية حتى تتمكن من جمعها مرة أخرى. (لا تتأثر بالحيوانات الأليفة من المهام والحيوانات الأليفة الغريبة.)",
+    "petName": "<%= egg(locale) %> <%= potion(locale) %>",
     "keyToMountsDesc": "حرر جميع العينات القياسية حتى تتمكن من جمعها مرة أخرى. (لا تتأثر عمليات تثبيت المهام وعمليات التثبيت النادرة.)",
     "keyToBoth": "مفاتيح رئيسية لبيوت الكلاب",
-    "releasePetsSuccess": "تم إطلاق حيوانك الأليف القياسي!"
+    "releasePetsSuccess": "تم إطلاق حيوانك الأليف القياسي!",
+    "mountName": "<%= mount(locale) %> <%= potion(locale) %>",
+    "filterByWacky": "أحمق",
+    "sortByColor": "لون",
+    "filterByMagicPotion": "مشروب سحري",
+    "releaseBothSuccess": "لقد تم إطلاق كل حيواناتك الأليفة وحيوانات الركوب القياسية!",
+    "welcomeStable": "مرحبا بكم في الاسطبل!",
+    "mountsReleased": "تم إطلاق حيوانات الركوب القياسية",
+    "hatch": "فقس!",
+    "sortByHatchable": "قابل للفقس",
+    "filterByStandard": "أساسي",
+    "foodTitle": "طعام الحيوانات الاليفة",
+    "welcomeStableText": "مرحبا بكم في الاسطبل! أنا مات ، صاحب الوحش. في كل مرة تكمل فيها مهمة ، سيكون لديك فرصة عشوائية لتلقي بيضة أو جرعة تفقيس لتفقيس الحيوانات الأليفة. عندما تفقس حيوانًا أليفًا ، سيظهر هنا! انقر فوق صورة حيوان أليف لإضافتها إلى صورتك الرمزية. أطعمهم بأطعمة الحيوانات الأليفة التي تجدها وستنمو لتصبح حيوانات ركوب صلبة.",
+    "dragThisFood": "اسحب هذا <%= foodName %> إالي الحيوات وشاهده ينمو!",
+    "filterByQuest": "مغامرة",
+    "standard": "أساسي",
+    "releaseMountsConfirm": "هل أنت متأكد أنك تريد إطلاق كل الحيوانات الأليفة القياسية؟",
+    "releaseMountsSuccess": "لقد تم إطلاق كل حيوانات الركوب القياسية!",
+    "petLikeToEat": "ماذا يحب حيواني الأليف أن يأكل؟",
+    "keyToBothDesc": "حرر جميع الحيوانات الأليفة وحيوانات الركوب القياسية حتى تتمكن من جمعها مرة أخرى. (لا تتأثر Quest Pets / Mounts والحيوانات الأليفة النادرة /حيوانات الركوب.)",
+    "releaseBothConfirm": "هل أنت متأكد من إطلاق حيواناتك الأليفة وحيوانات الركوب القياسية؟",
+    "mountsAndPetsReleased": "الحيوانات الأليفة وحيوانات الركوب القياسية تم إطلاقها",
+    "petLikeToEatText": "ستنمو الحيوانات الأليفة بغض النظر عما تطعمه ، لكنها ستنمو بشكل أسرع إذا أطعمتها طعام الحيوانات الأليفة الذي تفضله أكثر. جرب لمعرفة النمط ، أو شاهد الإجابات هنا: <br/> <a href=\"https://habitica.fandom.com/wiki/Food_Preferences\" target=\"_blank\"> https: //habitica.fandom. com / wiki / Food_Preferences </a>"
 }

website/common/locales/ar/rebirth.json

@@ -8,7 +8,8 @@
     "rebirthOrb": "Used an Orb of Rebirth to start over after attaining Level <%= level %>.",
     "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher.",
     "rebirthOrbNoLevel": "Used an Orb of Rebirth to start over.",
-    "rebirthPop": "Instantly restart your character as a Level 1 Warrior while retaining achievements, collectibles, and equipment. Your tasks and their history will remain but they will be reset to yellow. Your streaks will be removed except from challenge tasks. Your Gold, Experience, Mana, and the effects of all Skills will be removed. All of this will take effect immediately. For more information, see the wiki's <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a> page.",
+    "rebirthPop": "أعد شخصيتك على الفور كمحارب من المستوى 1 مع الاحتفاظ بالإنجازات والمقتنيات والمعدات. ستبقى مهامك ومحفوظاتهم ولكن ستتم إعادة تعيينهم إلى اللون الأصفر. ستتم إزالة عدد سلاسلك المستمرة باستثناء المهام التي تنتمي إلى التحديات وخطط المجموعة. ستتم إزالة الذهب ، والخبرة ، ومانا ، وتأثيرات جميع المهارات. كل هذا سيصبح ساري المفعول على الفور. لمزيد من المعلومات ، راجع صفحة ويكي <a href='https://habitica.fandom.com/wiki/Orb_of_Rebirth' target='_blank'> Orb of Rebirth </a>.",
     "rebirthName": "Orb of Rebirth",
-    "rebirthComplete": "You have been reborn!"
+    "rebirthComplete": "You have been reborn!",
+    "nextFreeRebirth": "<strong><%= الأيام%> days</strong> until <strong>FREE</strong>نجم إعادة الميلاد"
 }

website/common/locales/ar/spells.json

@@ -6,7 +6,7 @@
     "spellWizardEarthText": "زلزال",
     "spellWizardEarthNotes": "Your mental power shakes the earth and buffs your Party's Intelligence! (Based on: Unbuffed INT)",
     "spellWizardFrostText": "صقيع مقشعر",
-    "spellWizardFrostNotes": "With one cast, ice freezes all your streaks so they won't reset to zero tomorrow!",
+    "spellWizardFrostNotes": "عن طريق إطلاق تعويذة واحدة، يقوم الجليد بتجميد كل سلاسل تقدمك حتى لا يتم إعادة تعيينها إلى الصفر غدًا!",
     "spellWizardFrostAlreadyCast": "You have already cast this today. Your streaks are frozen, and there's no need to cast this again.",
     "spellWarriorSmashText": "سحقة متوحشة",
     "spellWarriorSmashNotes": "You make a task more blue/less red and deal extra damage to Bosses! (Based on: STR)",
@@ -24,7 +24,7 @@
     "spellRogueToolsOfTradeNotes": "Your tricky talents buff your whole Party's Perception! (Based on: Unbuffed PER)",
     "spellRogueStealthText": "تسلل",
     "spellRogueStealthNotes": "With each cast, a few of your undone Dailies won't cause damage tonight. Their streaks and colors won't change. (Based on: PER)",
-    "spellRogueStealthDaliesAvoided": "<%= originalText %> Number of dailies avoided: <%= number %>.",
+    "spellRogueStealthDaliesAvoided": "<%= originalText %> عدد المهام اليومية التي سيتم تجنبها: <%= number %>.",
     "spellRogueStealthMaxedOut": "You have already avoided all your dailies; there's no need to cast this again.",
     "spellHealerHealText": "الضوء المعالج",
     "spellHealerHealNotes": "Shining light restores your health! (Based on: CON and INT)",
@@ -55,5 +55,6 @@
     "challengeTasksNoCast": "Casting a skill on challenge tasks is not allowed.",
     "groupTasksNoCast": "Casting a skill on group tasks is not allowed.",
     "spellNotOwned": "You don't own this skill.",
-    "spellLevelTooHigh": "You must be level <%= level %> to use this skill."
-}
+    "spellLevelTooHigh": "You must be level <%= level %> to use this skill.",
+    "spellAlreadyCast": "لن يكون لاستخدام هذه المهارة أي تأثير إضافي."
+}

website/common/locales/ar/tasks.json

@@ -1,10 +1,10 @@
 {
     "clearCompleted": "إكتمل الحذف",
-    "clearCompletedDescription": "يتم حذف المهام التي تم إكمالها بعد ٣٠ يومًا لغير المشتركين وبعد ٩٠ يومًا للمشتركين.",
-    "clearCompletedConfirm": "هل أنت متأكد من أنك تريد حذف المهام التي أنجزتها؟",
+    "clearCompletedDescription": "المهام المكتملة يتم حذفها بعد ٣٠ يومًا لغير المشتركين وبعد ٩٠ يومًا للمشتركين.",
+    "clearCompletedConfirm": "هل أنت متأكد من حذف المهام التي أنجزتها؟",
     "addMultipleTip": "<strong>نصيحة: </strong> لإضافة عدة <%= taskType %>، افصل كل منها باستخدام فاصل أسطر (Shift + Enter) ثم اضغط على \"Enter\".",
     "addATask": "اضف <%= type %>",
-    "editATask": "حرر <%= type %>",
+    "editATask": "عدل<%= type %>",
     "createTask": "أنشئ <%= type %>",
     "addTaskToUser": "اضف مهمة",
     "scheduled": "مجدولة",
@@ -22,12 +22,12 @@
     "checklist": "القائمة",
     "newChecklistItem": "عنصر قائمة مراجعة جديد",
     "expandChecklist": "Expand Checklist",
-    "collapseChecklist": "Collapse Checklist",
+    "collapseChecklist": "أغلق القائمة",
     "text": "العنوان",
     "notes": "الملاحظات",
     "advancedSettings": "إعدادات متقدمة",
     "difficulty": "الصعوبة",
-    "difficultyHelp": "Difficulty describes how challenging a Habit, Daily, or To-Do is for you to complete. A higher difficulty results in greater rewards when a Task is completed, but also greater damage when a Daily is missed or a negative Habit is clicked.",
+    "difficultyHelp": "تصف الصعوبة مدى صعوبة إكمال العادة أو المهام اليومية أو المهام التي يتعين عليك القيام بها. تؤدي الصعوبة الأعلى إلى الحصول على مكافآت أكبر عند اكتمال المهمة ، ولكن أيضًا الضرر الأكبر عند فقد مهام يومية أو النقر فوق العادة السلبية.",
     "trivial": "تافه",
     "easy": "سهل",
     "medium": "متوسط",
@@ -46,9 +46,9 @@
     "days": "أيام",
     "restoreStreak": "Adjust Streak",
     "resetStreak": "Reset Streak",
-    "todo": "مهمة",
+    "todo": "المهمة",
     "todos": "المهام",
-    "todosDesc": "تُنجَز المهام مرة واحدة فقط. أضف قوائم إلى المهام الخصة بك لتزيد قيمتها.",
+    "todosDesc": "تُنجَز المهام مرة واحدة فقط. أضف قوائم إلى المهام الخاصة بك لتزيد قيمتها.",
     "dueDate": "تاريخ الاستحقاق",
     "remaining": "متبقية",
     "complete": "منجزة",
@@ -83,19 +83,19 @@
     "fortifyName": "جرعة تحصين",
     "fortifyPop": "إرجاع جميع المهام إلى القيمة المحايدة (اللون الأصفر)، وإسترجاع جميع نقاط الصحة المفقودة.",
     "fortify": "تحصين",
-    "fortifyComplete": "Fortify complete!",
+    "fortifyComplete": "اكتمل التحصين!",
     "deleteTask": "احذف هذه المهمة",
     "sureDelete": "هل أنت متأكد من أنك تريد حذف هذه المهامة؟",
     "streakCoins": "إضافي شرائطي!",
     "taskToTop": "إلى الأعلى",
     "taskToBottom": "إلى الأسفل",
-    "taskAliasAlreadyUsed": "Task alias already used on another task.",
+    "taskAliasAlreadyUsed": "تم استخدام الاسم المستعار لهذه المهمة بالفعل في مهمة أخرى.",
     "taskNotFound": "Task not found.",
-    "invalidTaskType": "Task type must be one of \"habit\", \"daily\", \"todo\", \"reward\".",
-    "invalidTasksType": "Task type must be one of \"habits\", \"dailys\", \"todos\", \"rewards\".",
+    "invalidTaskType": "يجب أن يكون نوع المهمة واحدًا من \"العادة\" أو \"اليومية\" أو \"المهمة\" أو \"المكافأة\".",
+    "invalidTasksType": "يجب أن يكون نوع المهمة واحدًا من \"العادات\" أو \"اليوميات\" أو \"المهام\" أو \"المكافآت\".",
     "invalidTasksTypeExtra": "يجب أن يكون نوع المهمة واحدًا من \"العادات\" أو \"اليوميات\" أو \"المهام\" أو \"المكافآت\" أو \"المهام التي تم إكمالها\".",
-    "cantDeleteChallengeTasks": "A task belonging to a challenge can't be deleted.",
-    "checklistOnlyDailyTodo": "Checklists are supported only on Dailies and To-Dos",
+    "cantDeleteChallengeTasks": "لا يمكن حذف المهمة التي تنتمي إلى التحدي.",
+    "checklistOnlyDailyTodo": "القوائم مدعومة فقط في المهام اليومية والمهام",
     "checklistItemNotFound": "No checklist item was found with given id.",
     "itemIdRequired": "\"itemId\" must be a valid UUID.",
     "tagNotFound": "No tag item was found with given id.",
@@ -127,5 +127,17 @@
     "checkOffYesterDailies": "Check off any Dailies you did yesterday:",
     "yesterDailiesCallToAction": "ابدأ يومي الجديد!",
     "sessionOutdated": "Your session is outdated. Please refresh or sync.",
-    "errorTemporaryItem": "This item is temporary and cannot be pinned."
+    "errorTemporaryItem": "This item is temporary and cannot be pinned.",
+    "deleteTaskType": "احذف هذا/هذه <%= type %>",
+    "sureDeleteType": "هل انت متأكد انك تريد حذف هذا/هذه <%= type %> ؟",
+    "addATitle": "أضف عنوان",
+    "enterTag": "أدخل علامة",
+    "addNotes": "أضف ملاحظات",
+    "counter": "عداد",
+    "resetCounter": "إعداة ضبط العداد",
+    "tomorrow": "غدا",
+    "editTagsText": "تعديل العلامات",
+    "adjustCounter": "تعديل العداد",
+    "addTags": "أضف علامات...",
+    "pressEnterToAddTag": "اضغط Enter لإضافة العلامة: '<%= tagName %>'"
 }

website/common/locales/ca/settings.json

@@ -2,14 +2,14 @@
     "settings": "Configuració",
     "language": "Llengua",
     "americanEnglishGovern": "En el cas que hi hagi discrepàncies amb les traduccions, la versió d'anglès americà serà la utilitzada.",
-    "helpWithTranslation": "T'agradaria ajudar amb la traducció d'Habitica? Genial! Visita <a href=\"/groups/guild/7732f64c-33ee-4cce-873c-fc28f147a6f7\">aquest</a> Gremi.",
-    "stickyHeader": "Sticky header",
+    "helpWithTranslation": "T'agradaria ajudar amb la traducció d'Habitica? Genial! Visita <a href=\"/groups/guild/7732f64c-33ee-4cce-873c-fc28f147a6f7\">the Aspiring Linguists Guild</a>!",
+    "stickyHeader": "Capçalera enganxosa",
     "newTaskEdit": "Obrir noves tasques en mode edició",
-    "dailyDueDefaultView": "Set Dailies default to 'due' tab",
-    "dailyDueDefaultViewPop": "With this option set, the Dailies tasks will default to 'due' instead of 'all'",
-    "reverseChatOrder": "Show chat messages in reverse order",
-    "startAdvCollapsed": "Advanced Settings in tasks start collapsed",
-    "startAdvCollapsedPop": "With this option set, Advanced Settings will be hidden when you first open a task for editing.",
+    "dailyDueDefaultView": "Estableix Diaris per defecte a la pestanya \"vengut\".",
+    "dailyDueDefaultViewPop": "Amb aquesta opció establerta, les tasques diàries tindran el valor predeterminat \"de venciment\" en lloc de \"totes\".",
+    "reverseChatOrder": "Mostra els missatges de xat en ordre invers",
+    "startAdvCollapsed": "La configuració avançada de les tasques comença col·lapsada",
+    "startAdvCollapsedPop": "Amb aquesta opció establerta, la configuració avançada s'amagarà quan obriu una tasca per editar-la per primera vegada.",
     "dontShowAgain": "No em mostris això de nou",
     "suppressLevelUpModal": "No mostrar missatge emergent quan pugi de nivell",
     "suppressHatchPetModal": "No mostrar missatge emergent quan eclosioni una mascota",
@@ -17,16 +17,16 @@
     "suppressStreakModal": "No mostrar missatge emergent quan obtinguis una fita de ratxa",
     "showTour": "Mostrar Tour",
     "showBailey": "Mostra en Bailey",
-    "showBaileyPop": "Bring Bailey the Town Crier out of hiding so you can review past news.",
+    "showBaileyPop": "Treu a Bailey el pregoner de l'amagatall perquè puguis revisar les notícies anteriors.",
     "fixVal": "Arreglar els valors del personatge",
     "fixValPop": "Canvia manualment els valors de la teva vida, nivell, i monedes.",
-    "invalidLevel": "Invalid value: Level must be 1 or greater.",
+    "invalidLevel": "Valor no vàlid: el nivell ha de ser 1 o superior.",
     "enableClass": "Activar el sistema d'oficis",
     "enableClassPop": "Al principi, vas descartar utilitzar el sistema d'oficis. Voldries activar-lo ara?",
     "resetAccPop": "Comença de nou, perdent tots els nivells, monedes, equipament, historial i tasques.",
     "deleteAccount": "Eliminar compte",
-    "deleteAccPop": "Cancelar i eliminar el compte de Habitica",
-    "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.",
+    "deleteAccPop": "Cancelar i eliminar el compte de Habitica.",
+    "feedback": "Si voleu fer-nos un comentari, introduïu-lo a continuació; ens agradaria saber què us ha agradat o què no d'Habica! No parles bé anglès? Cap problema! Utilitzeu l'idioma que preferiu.",
     "qrCode": "Codi QR",
     "dataExport": "Exportar informació",
     "saveData": "Here are a few options for saving your data.",
@@ -42,7 +42,7 @@
     "sureChangeCustomDayStartTime": "Are you sure you want to change your Custom Day Start time? Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before then!",
     "customDayStartHasChanged": "Your custom day start has changed.",
     "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
-    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
+    "customDayStartInfo1": "Habitica per defecte comprovarà i restablirà las vostras tareas a mitjanit a la vostra zona horària cada dia. Podeu personalitzar aquest temps aquí.",
     "misc": "Varis",
     "showHeader": "Mostra capçalera",
     "changePass": "Canviar contrassenya",
@@ -55,7 +55,7 @@
     "newUsername": "New Username",
     "dangerZone": "Zona perillosa",
     "resetText1": "WARNING! This resets many parts of your account. This is highly discouraged, but some people find it useful in the beginning after playing with the site for a short time.",
-    "resetText2": "You will lose all your levels, Gold, and Experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks and equipment.",
+    "resetText2": "Perdràs tots els teus nivells, or i punts d'experiència. Totes les teves tasques (excepte les dels reptes) se suprimiran permanentment i perdràs totes les seves dades històriques. Perdràs tot el teu equip, però podràs tornar-lo a comprar tot, inclòs tots els equips d'edició limitada o els articles de misteri de subscriptors que ja tinguis (haureu d'estar a la classe correcta per tornar a comprar l'equip específic de la classe). Mantindràs la teva classe actual i les teves mascotes i montures. És possible que preferiu utilitzar un Orb of Rebirth, que és una opció molt més segura i que preservarà les vostres tasques i equips.",
     "deleteLocalAccountText": "Are you sure? This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type your password into the text box below.",
     "deleteSocialAccountText": "Are you sure? This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type \"<%= magicWord %>\" into the text box below.",
     "API": "API",
@@ -71,7 +71,7 @@
     "beeminderDesc": "Let Beeminder automatically monitor your Habitica To-Dos. You can commit to maintaining a target number of To-Dos completed per day or per week, or you can commit to gradually reducing your remaining number of uncompleted To-Dos. (By \"commit\" Beeminder means under threat of paying actual money! But you may also just like Beeminder's fancy graphs.)",
     "chromeChatExtension": "Extensió de Chat per Chrome",
     "chromeChatExtensionDesc": "The Chrome Chat Extension for Habitica adds an intuitive chat box to all of habitica.com. It allows users to chat in the Tavern, their party, and any guilds they are in.",
-    "otherExtensions": "<a target='blank' href='http://habitica.wikia.com/wiki/Extensions,_Add-Ons,_and_Customizations'>Other Extensions</a>",
+    "otherExtensions": "<a target='blank' href='https://habitica.wikia.com/wiki/Extensions,_Add-Ons,_and_Customizations'>Altres extensions</a>",
     "otherDesc": "Find other apps, extensions, and tools on the Habitica wiki.",
     "resetDo": "Fes-ho, reseteja el meu compte!",
     "resetComplete": "Reset complete!",
@@ -103,7 +103,7 @@
     "giftedSubscriptionInfo": "<%= name %> gifted you a <%= months %> month subscription",
     "giftedSubscriptionFull": "Hello <%= username %>, <%= sender %> has sent you <%= monthCount %> months of subscription!",
     "invitedParty": "Invited To Party",
-    "invitedGuild": "Invited To Guild",
+    "invitedGuild": "Et van convidar a un gremi",
     "importantAnnouncements": "Reminders to check in to complete tasks and receive prizes",
     "weeklyRecaps": "Summaries of your account activity in the past week (Note: this is currently disabled due to performance issues, but we hope to have this back up and sending e-mails again soon!)",
     "onboarding": "Guidance with setting up your Habitica account",
@@ -122,7 +122,7 @@
     "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months",
     "benefits": "Benefits",
     "coupon": "Cupó",
-    "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)",
+    "couponText": "De vegades tenim esdeveniments i donem codis de cupó per a equips especials. (per exemple, els que passen pel nostre estand de Wondercon)",
     "apply": "Aplicar",
     "promoCode": "Promo Code",
     "promoCodeApplied": "Promo Code Applied! Check your inventory",
@@ -147,19 +147,19 @@
     "pushDeviceAdded": "Push device added successfully",
     "pushDeviceNotFound": "The user has no push device with this id.",
     "pushDeviceRemoved": "Push device removed successfully.",
-    "buyGemsGoldCap": "Cap raised to <%= amount %>",
+    "buyGemsGoldCap": "S'ha augmentat el límit a <%= import %>",
     "mysticHourglass": "<%= amount %> Mystic Hourglass",
-    "purchasedPlanExtraMonths": "You have <%= months %> months of extra subscription credit.",
+    "purchasedPlanExtraMonths": "Tens <%= months %> mesos de crèdit extra de subscripció addicional.",
     "consecutiveSubscription": "Consecutive Subscription",
     "consecutiveMonths": "Consecutive Months:",
-    "gemCapExtra": "Gem Cap Extra:",
+    "gemCapExtra": "Bonificació de gemma",
     "mysticHourglasses": "Mystic Hourglasses:",
     "mysticHourglassesTooltip": "Mystic Hourglasses",
     "paypal": "PayPal",
     "amazonPayments": "Amazon Payments",
     "amazonPaymentsRecurring": "Ticking the checkbox below is necessary for your subscription to be created. It allows your Amazon account to be used for ongoing payments for <strong>this</strong> subscription. It will not cause your Amazon account to be automatically used for any future purchases.",
     "timezone": "Time Zone",
-    "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <strong><%= utc %></strong>",
+    "timezoneUTC": "Habitica utilitza la zona horària establerta al vostre ordinador, que és: <strong><%= utc %></strong>",
     "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.<br><br> <strong>If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all.</strong> If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices.",
     "push": "Push",
     "about": "About",
@@ -175,6 +175,29 @@
     "goToSettings": "Go to Settings",
     "usernameVerifiedConfirmation": "Your username, <%= username %>, is confirmed!",
     "usernameNotVerified": "Please confirm your username.",
-    "changeUsernameDisclaimer": "We will be transitioning login names to unique, public usernames soon. This username will be used for invitations, @mentions in chat, and messaging.",
-    "verifyUsernameVeteranPet": "One of these Veteran Pets will be waiting for you after you've finished confirming!"
+    "changeUsernameDisclaimer": "Aviat farem la transició dels noms d'inici de sessió a noms d'usuari únics i públics. Aquest nom d'usuari s'utilitzarà per a invitacions, @mencions al xat i missatgeria.",
+    "verifyUsernameVeteranPet": "One of these Veteran Pets will be waiting for you after you've finished confirming!",
+    "resetAccount": "Restableix el compte",
+    "dayStartAdjustment": "Ajust d'inici del dia",
+    "chatExtension": "<a target='blank' href='https://chrome.google.com/webstore/detail/habitrpg-chat-client/hidkdfgonpoaiannijofifhjidbnilbb'>Extensió de xat deChrome</a> i <a target='blank' href='https://addons.mozilla.org/en-US/firefox/addon/habitica-chat-client-2/'>Extensió de xat de Firefox</a>",
+    "chatExtensionDesc": "L'extensió de xat per a Habitica afegeix un quadre de xat intuïtiu a tot habitica.com. Permet als usuaris xatejar a la taverna, a la seva festa i a qualsevol gremi en què es trobin.",
+    "subscriptionReminders": "Recordatoris de subscripcions",
+    "everywhere": "A tot arreu",
+    "newPMNotificationTitle": "Nou missatge de <%= name %>",
+    "giftedSubscriptionWinterPromo": "Hola, <%= username %>, heu rebut <%= monthCount %> mesos de subscripció com a part de la nostra promoció de regals de vacances!",
+    "addPasswordAuth": "Afegeix contrasenya",
+    "bannedWordUsedInProfile": "El vostre nom visible o el text Sobre el contingut contenia un llenguatge inadequat.",
+    "displaynameIssueNewline": "Els noms visibles no poden contenir barres invertides seguides de la lletra N.",
+    "suggestMyUsername": "Suggereix el meu nom d'usuari",
+    "onlyPrivateSpaces": "Només en espais privats",
+    "bannedSlurUsedInProfile": "El vostre nom de visualització o el text Sobre la informació contenia un insult i els vostres privilegis de xat s'han revocat.",
+    "transactions": "Transaccions",
+    "gemTransactions": "Transaccions de gemmes",
+    "transaction_contribution": "A través de la contribució",
+    "transaction_gift_receive": "Rebut de",
+    "transaction_buy_money": "Comprat amb diners",
+    "transaction_buy_gold": "Comprat amb or",
+    "transaction_spend": "Gastat en",
+    "nextHourglassDescription": "Els subscriptors reben Mystic Hourglasses dins\nels tres primers dies del mes.",
+    "adjustment": "Ajust"
 }

website/common/locales/ceb/achievements.json

@@ -0,0 +1 @@
+{}

website/common/locales/ceb/backgrounds.json

@@ -0,0 +1 @@
+{}

website/common/locales/ceb/challenge.json

@@ -0,0 +1 @@
+{}

website/common/locales/ceb/character.json

@@ -0,0 +1 @@
+{}

website/common/locales/ceb/communityguidelines.json

@@ -0,0 +1 @@
+{}

website/common/locales/ceb/content.json

@@ -0,0 +1 @@
+{}