From 769405ff3466b1ee91234974e23eaf64b998282c Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Fri, 30 Mar 2018 19:24:51 +0200
Subject: [PATCH 1/4] google subs: make sure the subs can be cancelled if they
 return a 410 from google (#10201)

---
 website/server/libs/googlePayments.js | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/website/server/libs/googlePayments.js b/website/server/libs/googlePayments.js
index 2f201cffd2..b73197f4b5 100644
--- a/website/server/libs/googlePayments.js
+++ b/website/server/libs/googlePayments.js
@@ -140,16 +140,27 @@ api.cancelSubscribe = async function cancelSubscribe (user, headers) {
 
   await iap.setup();
 
-  let googleRes = await iap.validate(iap.GOOGLE, plan.additionalData);
+  let dateTerminated;
 
-  let isValidated = iap.isValidated(googleRes);
-  if (!isValidated) throw new NotAuthorized(this.constants.RESPONSE_INVALID_RECEIPT);
+  try {
+    let googleRes = await iap.validate(iap.GOOGLE, plan.additionalData);
 
-  let purchases = iap.getPurchaseData(googleRes);
-  if (purchases.length === 0) throw new NotAuthorized(this.constants.RESPONSE_INVALID_RECEIPT);
-  let subscriptionData = purchases[0];
+    let isValidated = iap.isValidated(googleRes);
+    if (!isValidated) throw new NotAuthorized(this.constants.RESPONSE_INVALID_RECEIPT);
+
+    let purchases = iap.getPurchaseData(googleRes);
+    if (purchases.length === 0) throw new NotAuthorized(this.constants.RESPONSE_INVALID_RECEIPT);
+    let subscriptionData = purchases[0];
+    dateTerminated = new Date(Number(subscriptionData.expirationDate));
+  } catch (err) {
+    // Status:410 means that the subsctiption isn't active anymore and we can safely delete it
+    if (err && err.message === 'Status:410') {
+      dateTerminated = new Date();
+    } else {
+      throw err;
+    }
+  }
 
-  let dateTerminated = new Date(Number(subscriptionData.expirationDate));
   if (dateTerminated > new Date()) throw new NotAuthorized(this.constants.RESPONSE_STILL_VALID);
 
   await payments.cancelSubscription({

From f7b9ca124d43a75713ccd6ff5242aade3761362f Mon Sep 17 00:00:00 2001
From: SabreCat <sabrecat@gmail.com>
Date: Sun, 1 Apr 2018 02:55:04 +0000
Subject: [PATCH 2/4] feat(event): April Foolery 2018

---
 website/client/assets/css/sprites.css   | 29 ++++++++++++++++++++++++-
 website/client/assets/scss/animals.scss |  2 +-
 website/client/components/avatar.vue    | 12 +++++-----
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/website/client/assets/css/sprites.css b/website/client/assets/css/sprites.css
index 906e3bc5a2..3b50e94b11 100755
--- a/website/client/assets/css/sprites.css
+++ b/website/client/assets/css/sprites.css
@@ -100,7 +100,34 @@
 
 [class*="Mount_Head_"],
 [class*="Mount_Body_"] {
-  margin-top:18px; /* Sprite accommodates 105x123 box */
+  margin-top: 18px; /* Sprite accommodates 105x123 box */
+  left: 28px;
+  top: 34px;
+}
+
+[class*="Mount_"],
+[class*="Pet-"] {
+  transform: scale(0.333, 0.333);
+  -ms-transform: scale(0.333, 0.333);
+  -webkit-transform: scale(0.333, 0.333);
+}
+
+[class*="_Sabretooth"],
+[class*="_TRex"],
+[class*="_Wolf"] {
+  left: 18px;
+  top: 25px;
+}
+
+[class*="_JackOLantern"] {
+  left: 32px;
+}
+
+[class*="_Cuttlefish"],
+[class*="_Frog"],
+[class*="_MagicalBee"],
+[class*="_Mammoth"] {
+  top: 30px;
 }
 
 .Pet_Currency_Gem {
diff --git a/website/client/assets/scss/animals.scss b/website/client/assets/scss/animals.scss
index a75f6dcb17..ca2bb92043 100644
--- a/website/client/assets/scss/animals.scss
+++ b/website/client/assets/scss/animals.scss
@@ -7,7 +7,7 @@
   left: 0;
 
   &:not([class*="FlyingPig"]) {
-    top: -28px !important;
+    top: -8px !important;
   }
 }
 
diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue
index a4acea6cc0..e62965e78a 100644
--- a/website/client/components/avatar.vue
+++ b/website/client/components/avatar.vue
@@ -1,10 +1,6 @@
 <template lang="pug">
 .avatar(:style="{width, height, paddingTop}", :class="backgroundClass", @click.prevent='castEnd()')
   .character-sprites(:style='{margin: spritesMargin}')
-    template(v-if="!avatarOnly")
-      // Mount Body
-      span(v-if="member.items.currentMount", :class="'Mount_Body_' + member.items.currentMount")
-
     // Buffs that cause visual changes to avatar: Snowman, Ghost, Flower, etc
     template(v-for="(klass, item) in visualBuffs")
       span(v-if="member.stats.buffs[item] && showVisualBuffs", :class="klass")
@@ -36,6 +32,8 @@
     span.zzz(v-if="member.preferences.sleep")
 
     template(v-if="!avatarOnly")
+      // Mount Body
+      span(v-if="member.items.currentMount", :class="'Mount_Body_' + member.items.currentMount")
       // Mount Head
       span(v-if="member.items.currentMount", :class="'Mount_Head_' + member.items.currentMount")
       // Pet
@@ -64,8 +62,8 @@
   }
 
   .current-pet {
-    bottom: 0px;
-    left: 0px;
+    right: 70px;
+    top: 70px;
   }
 </style>
 
@@ -136,7 +134,7 @@ export default {
 
       if (!this.avatarOnly) {
         if (this.member.items.currentPet) val = '24.5px';
-        if (this.member.items.currentMount) val = '0px';
+        // if (this.member.items.currentMount) val = '0px';
       }
 
       return val;

From 4968b291f7eae79949c148570915b48631c2c80f Mon Sep 17 00:00:00 2001
From: SabreCat <sabrecat@gmail.com>
Date: Sun, 1 Apr 2018 02:59:54 +0000
Subject: [PATCH 3/4] chore(news): Bailey

---
 migrations/users/full-stable.js           | 117 ++++++++++++++++++++++
 website/server/controllers/api-v3/news.js |  23 ++---
 2 files changed, 128 insertions(+), 12 deletions(-)
 create mode 100644 migrations/users/full-stable.js

diff --git a/migrations/users/full-stable.js b/migrations/users/full-stable.js
new file mode 100644
index 0000000000..76b0d922f6
--- /dev/null
+++ b/migrations/users/full-stable.js
@@ -0,0 +1,117 @@
+import each from 'lodash/each';
+import keys from 'lodash/keys';
+import content from '../../website/common/script/content/index';
+const migrationName = 'full-stable.js';
+const authorName = 'Sabe'; // in case script author needs to know when their ...
+const authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
+
+/*
+ * Award users every extant pet and mount
+ */
+const connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
+
+let monk = require('monk');
+let dbUsers = monk(connectionString).get('users', { castIds: false });
+
+function processUsers (lastId) {
+  // specify a query to limit the affected users (empty for all users):
+  let query = {
+    'profile.name': 'SabreCat',
+  };
+
+  if (lastId) {
+    query._id = {
+      $gt: lastId,
+    };
+  }
+
+  dbUsers.find(query, {
+    sort: {_id: 1},
+    limit: 250,
+    fields: [
+    ], // specify fields we are interested in to limit retrieved data (empty if we're not reading data):
+  })
+    .then(updateUsers)
+    .catch((err) => {
+      console.log(err);
+      return exiting(1, `ERROR! ${  err}`);
+    });
+}
+
+let progressCount = 1000;
+let count = 0;
+
+function updateUsers (users) {
+  if (!users || users.length === 0) {
+    console.warn('All appropriate users found and modified.');
+    displayData();
+    return;
+  }
+
+  let userPromises = users.map(updateUser);
+  let lastUser = users[users.length - 1];
+
+  return Promise.all(userPromises)
+    .then(() => {
+      processUsers(lastUser._id);
+    });
+}
+
+function updateUser (user) {
+  count++;
+  let set = {
+    migration: migrationName,
+  };
+
+  each(keys(content.pets), (pet) => {
+    set[`items.pets.${pet}`] = 5;
+  });
+  each(keys(content.premiumPets), (pet) => {
+    set[`items.pets.${pet}`] = 5;
+  });
+  each(keys(content.questPets), (pet) => {
+    set[`items.pets.${pet}`] = 5;
+  });
+  each(keys(content.specialPets), (pet) => {
+    set[`items.pets.${pet}`] = 5;
+  });
+  each(keys(content.mounts), (mount) => {
+    set[`items.mounts.${mount}`] = true;
+  });
+  each(keys(content.premiumMounts), (mount) => {
+    set[`items.mounts.${mount}`] = true;
+  });
+  each(keys(content.questMounts), (mount) => {
+    set[`items.mounts.${mount}`] = true;
+  });
+  each(keys(content.specialMounts), (mount) => {
+    set[`items.mounts.${mount}`] = true;
+  });
+
+  dbUsers.update({_id: user._id}, {$set: set});
+
+  if (count % progressCount === 0) console.warn(`${count  } ${  user._id}`);
+  if (user._id === authorUuid) console.warn(`${authorName  } processed`);
+}
+
+function displayData () {
+  console.warn(`\n${  count  } users processed\n`);
+  return exiting(0);
+}
+
+function exiting (code, msg) {
+  code = code || 0; // 0 = success
+  if (code && !msg) {
+    msg = 'ERROR!';
+  }
+  if (msg) {
+    if (code) {
+      console.error(msg);
+    } else      {
+      console.log(msg);
+    }
+  }
+  process.exit(code);
+}
+
+module.exports = processUsers;
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 569f62f6fb..5ba76e464f 100644
--- a/website/server/controllers/api-v3/news.js
+++ b/website/server/controllers/api-v3/news.js
@@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth';
 let api = {};
 
 // @TODO export this const, cannot export it from here because only routes are exported from controllers
-const LAST_ANNOUNCEMENT_TITLE = 'HABITICA ON INSTAGRAM, SELF-IMPOSED CHALLENGE BLOG, AND WHAT\'S THE APRIL FOOL UP TO?';
+const LAST_ANNOUNCEMENT_TITLE = 'APRIL FOOL\'S 2018: TINY PETS AND MOUNTS!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -32,22 +32,21 @@ api.getNews = {
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
           </div>
         </div>
-        <h2>3/30/2018 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+        <h2>4/1/2018 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
         <hr/>
-        <h3>Habitica is Now on Instagram!</h3>
-        <p>Habitica's <a href='https://www.instagram.com/habitica' target='_blank'>Instagram</a> is now live! Follow us for updates and exclusive peeks at behind-the-scenes fun!</p>
         <div class="media align-items-center">
-          <div class="scene_todos"></div>
           <div class="media-body">
-            <h3>New Blog Post: Self-Imposed Challenges!</h3>
-            <p>This month's <a href='https://habitica.wordpress.com/2018/03/28/self-imposed-challenges/' target='_blank'>featured Wiki article</a> is about Self-Imposed Challenges! We hope that it will help you as you customize Habitica to make it as fun and challenging as you'd like it to be! Be sure to check it out, and let us know what you think by reaching out on <a href='https://twitter.com/habitica' target='_blank'>Twitter</a>, <a href='http://blog.habitrpg.com' target='_blank'>Tumblr</a>, and <a href='https://facebook.com/habitica' target='_blank'>Facebook</a>.</p>
-            <div class="small mb-3">by Beffymaroo and the Wiki Wizards</div>
+            <h3>Tiny Pets and Mounts</h3>
+            <p>Oh no! That dastardly April Fool seems to have pulled off his "small" prank: all our pets and mounts have shrunk!</p>
+            <p>"Haha!" the April Fool laughs as he bursts in the the Tavern, "Enjoy your new and more efficiently-sized friends! Now your pets and mounts are so much easier to keep track of, right? This should certainly increase your productivity!"</p>
           </div>
+          <div class="npc_aprilFool"></div>
         </div>
-        <h3>The April Fool Stops By the Tavern...</h3>
-        <p>It's that time of year again, and all Habitica's denizens have been on the lookout for stirrings from the most mischievous Masterclasser: the April Fool. Puzzlingly (and perhaps alarmingly!) he's been unusually quiet considering his favorite day is nearing. He's announced he's keeping his plans small-scale and that they will hardly be noticed, but upon hearing this from Tavern-goers on a visit to Habit City, Lady Glaciate rolled her eyes.</p>
-        <p>"I'd be interested to know what the Master of Rogues considers a modestly-proportioned prank…" she says irritably.</p>
-        <p>Perhaps you should check back over the weekend to see what's in store…</p>
+        <p>Lady Glaciate grumbles from her corner table and looks at her mammoth, which is happily cavorting in her teacup. "Well, since I don't have a ride back home to the Stoikalm Steppes at the moment, I disagree."</p>
+        <p>As Sir Stomp sprays tea triumphantly from his trunk, a small smile tugs at the corner of her mouth. ".…I suppose one could argue it's quite cute, though," she grudgingly adds.</p>
+        <p>It looks like all our pets and mounts are extra small for the time being. Enjoy the fun by checking out everyone's profiles today! Your pets and mounts will return to normal on April 3.</p>
+        <h3>Special April Fool's Social Media Challenge!</h3>
+        <p>For even more fun, check out the <a href='/challenges/a7cacfb6-3135-4d17-9a51-46dfcfe1e712' target='_blank'>official Challenge</a> posted especially for today! Share your avatar featuring your tiny pets on social media between now and April 3, and you'll have a chance to win gems!</p>
       </div>
       `,
     });

From 95f8867bf88792ccbcc3b3aff141ccd58869fbb6 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Sun, 1 Apr 2018 03:01:04 +0000
Subject: [PATCH 4/4] 4.34.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f867e0c60d..be1c993892 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.34.1",
+  "version": "4.34.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8d696400ed..9182931d9d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.34.1",
+  "version": "4.34.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",