From 1b0b31cd806c2f26ed135568294a4b5b51c7f3bc Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Tue, 30 Mar 2021 15:46:29 -0500
Subject: [PATCH 01/13] fix(subscriptions): handle future/prebuilt mystery
 items

---
 website/server/libs/payments/subscriptions.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
index 06deefd40f..a2f9ec768e 100644
--- a/website/server/libs/payments/subscriptions.js
+++ b/website/server/libs/payments/subscriptions.js
@@ -29,6 +29,7 @@ function _findMysteryItems (user, dateMoment) {
   _.each(shared.content.gear.flat, item => {
     if (
       item.klass === 'mystery'
+        && shared.content.mystery[item.mystery]
         && dateMoment.isSameOrAfter(shared.content.mystery[item.mystery].start)
         && dateMoment.isSameOrBefore(moment(shared.content.mystery[item.mystery].end).endOf('day'))
         && !user.items.gear.owned[item.key]

From cdaa504db4c8c75d9d7fb29d1b9d8f8e0ee443de Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Wed, 7 Apr 2021 12:24:24 -0500
Subject: [PATCH 02/13] feat(event): countdown banners for limited availability
 items

---
 .../client/src/components/shops/buyModal.vue  | 18 ++--
 .../src/components/shops/countdownBanner.vue  | 84 +++++++++++++++++++
 .../components/shops/market/categoryRow.vue   | 35 +++++++-
 .../components/shops/quests/buyQuestModal.vue | 19 ++---
 .../src/components/shops/quests/questInfo.vue | 31 ++++++-
 .../client/src/components/shops/shopItem.vue  | 40 +++++++--
 website/common/locales/en/npc.json            |  4 +-
 7 files changed, 191 insertions(+), 40 deletions(-)
 create mode 100644 website/client/src/components/shops/countdownBanner.vue

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 2a4a793c20..13e4b7ac05 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -161,16 +161,10 @@
         </button>
       </div>
     </div>
-    <div
+    <countdown-banner
       v-if="item.event && item.owned == null"
-      class="limitedTime"
-    >
-      <span
-        class="svg-icon inline icon-16 clock-icon"
-        v-html="icons.clock"
-      ></span>
-      <span class="limitedString">{{ limitedString }}</span>
-    </div>
+      :endDate = "endDate"
+    />
     <div
       v-if="item.key === 'rebirth_orb' && item.value > 0 && user.stats.lvl >= 100"
       class="free-rebirth d-flex align-items-center"
@@ -399,6 +393,7 @@ import svgWhiteClock from '@/assets/svg/clock-white.svg';
 
 import BalanceInfo from './balanceInfo.vue';
 import PinBadge from '@/components/ui/pinBadge';
+import CountdownBanner from './countdownBanner';
 import currencyMixin from './_currencyMixin';
 import notifications from '@/mixins/notifications';
 import buyMixin from '@/mixins/buy';
@@ -432,6 +427,7 @@ export default {
     Item,
     Avatar,
     PinBadge,
+    CountdownBanner,
   },
   mixins: [buyMixin, currencyMixin, notifications, numberInvalid, spellsMixin],
   props: {
@@ -462,6 +458,7 @@ export default {
 
       selectedAmountToBuy: 1,
       isPinned: false,
+      endDate: seasonalShopConfig.dateRange.end,
     };
   },
   computed: {
@@ -494,9 +491,6 @@ export default {
       }
       return this.item.notes;
     },
-    limitedString () {
-      return this.$t('limitedOffer', { date: moment(seasonalShopConfig.dateRange.end).format('LL') });
-    },
     gemsLeft () {
       if (!this.user.purchased.plan) return 0;
       return planGemLimits.convCap
diff --git a/website/client/src/components/shops/countdownBanner.vue b/website/client/src/components/shops/countdownBanner.vue
new file mode 100644
index 0000000000..7bb29e7a92
--- /dev/null
+++ b/website/client/src/components/shops/countdownBanner.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="limitedTime">
+    <span
+      class="svg-icon inline icon-16"
+      v-html="icons.clock"
+    ></span>
+    <span class="limitedString"> {{ limitedString }} </span>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  @import '~@/assets/scss/colors.scss';
+
+  .limitedTime {
+    height: 32px;
+    background-color: $purple-300;
+    width: calc(100% + 30px);
+    margin: 0 -15px; // the modal content has its own padding
+
+    font-size: 12px;
+    line-height: 1.33;
+    text-align: center;
+    color: $white;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .limitedString {
+      height: 16px;
+      margin-left: 8px;
+    }
+  }
+</style>
+
+<script>
+import moment from 'moment';
+import svgClock from '@/assets/svg/clock.svg';
+
+export default {
+  props: {
+    endDate: {
+      type: String,
+    },
+  },
+  data () {
+    return {
+      icons: Object.freeze({
+        clock: svgClock,
+      }),
+      timer: '',
+      limitedString: '',
+    };
+  },
+  mounted () {
+    this.countdownString();
+    this.timer = setInterval(this.countdownString, 30000);
+  },
+  methods: {
+    countdownString () {
+      const diffDuration = moment.duration(moment(this.endDate).diff(moment()));
+
+      if (diffDuration.days() > 0) {
+        this.limitedString = this.$t('limitedAvailabilityDays', {
+          days: diffDuration.days(),
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      } else {
+        this.limitedString = this.$t('limitedAvailabilityHours', {
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      }
+    },
+    cancelAutoUpdate () {
+      clearInterval(this.timer);
+    },
+  },
+  beforeDestroy () {
+    this.cancelAutoUpdate();
+  },
+};
+</script>
diff --git a/website/client/src/components/shops/market/categoryRow.vue b/website/client/src/components/shops/market/categoryRow.vue
index 92012294b6..d63e92ded2 100644
--- a/website/client/src/components/shops/market/categoryRow.vue
+++ b/website/client/src/components/shops/market/categoryRow.vue
@@ -48,6 +48,12 @@ export default {
   },
   mixins: [pinUtils],
   props: ['hideLocked', 'hidePinned', 'searchBy', 'sortBy', 'category'],
+  data () {
+    return {
+      timer: '',
+      limitedString: '',
+    };
+  },
   computed: {
     ...mapState({
       content: 'content',
@@ -60,9 +66,6 @@ export default {
       return planGemLimits.convCap
         + this.user.purchased.plan.consecutive.gemCapExtra - this.user.purchased.plan.gemsBought;
     },
-    limitedString () {
-      return this.$t('limitedOffer', { date: moment(seasonalShopConfig.dateRange.end).format('LL') });
-    },
     sortedMarketItems () {
       let result = _map(this.category.items, e => ({
         ...e,
@@ -103,10 +106,36 @@ export default {
       return result;
     },
   },
+  mounted () {
+    this.countdownString();
+    this.timer = setInterval(this.countdownString, 30000);
+  },
   methods: {
     itemSelected (item) {
       this.$root.$emit('buyModal::showItem', item);
     },
+    countdownString () {
+      const diffDuration = moment.duration(moment(seasonalShopConfig.dateRange.end).diff(moment()));
+
+      if (diffDuration.days() > 0) {
+        this.limitedString = this.$t('limitedAvailabilityDays', {
+          days: diffDuration.days(),
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      } else {
+        this.limitedString = this.$t('limitedAvailabilityHours', {
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      }
+    },
+    cancelAutoUpdate () {
+      clearInterval(this.timer);
+    },
+  },
+  beforeDestroy () {
+    this.cancelAutoUpdate();
   },
 };
 </script>
diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue
index a11e3bc05c..da8bf6b1b7 100644
--- a/website/client/src/components/shops/quests/buyQuestModal.vue
+++ b/website/client/src/components/shops/quests/buyQuestModal.vue
@@ -84,16 +84,10 @@
     >
       <questDialogDrops :item="item" />
     </div>
-    <div
+    <countdown-banner
       v-if="item.event"
-      class="limitedTime"
-    >
-      <span
-        class="svg-icon inline icon-16 clock-icon"
-        v-html="icons.clock"
-      ></span>
-      <span class="limitedString">{{ limitedString }}</span>
-    </div>
+      :endDate="endDate"
+    />
     <div
       slot="modal-footer"
       class="clearfix"
@@ -268,7 +262,6 @@
 </style>
 
 <script>
-import moment from 'moment';
 import { mapState } from '@/libs/store';
 import seasonalShopConfig from '@/../../common/script/libs/shops-seasonal.config';
 
@@ -285,6 +278,7 @@ import notifications from '@/mixins/notifications';
 import buyMixin from '@/mixins/buy';
 import numberInvalid from '@/mixins/numberInvalid';
 import PinBadge from '@/components/ui/pinBadge';
+import CountdownBanner from '../countdownBanner';
 
 import questDialogDrops from './questDialogDrops';
 import questDialogContent from './questDialogContent';
@@ -295,6 +289,7 @@ export default {
     PinBadge,
     questDialogDrops,
     questDialogContent,
+    CountdownBanner,
   },
   mixins: [buyMixin, currencyMixin, notifications, numberInvalid],
   props: {
@@ -321,6 +316,7 @@ export default {
 
       isPinned: false,
       selectedAmountToBuy: 1,
+      endDate: seasonalShopConfig.dateRange.end,
     };
   },
   computed: {
@@ -344,9 +340,6 @@ export default {
       if (this.priceType === 'hourglasses') return this.icons.hourglass;
       return this.icons.gem;
     },
-    limitedString () {
-      return this.$t('limitedOffer', { date: moment(seasonalShopConfig.dateRange.end).format('LL') });
-    },
   },
   watch: {
     item: function itemChanged () {
diff --git a/website/client/src/components/shops/quests/questInfo.vue b/website/client/src/components/shops/quests/questInfo.vue
index b3020dc255..681e8c4e37 100644
--- a/website/client/src/components/shops/quests/questInfo.vue
+++ b/website/client/src/components/shops/quests/questInfo.vue
@@ -143,6 +143,8 @@ export default {
         starHalf: svgStarHalf,
         starEmpty: svgStarEmpty,
       }),
+      timer: '',
+      limitedString: '',
     };
   },
   computed: {
@@ -153,9 +155,10 @@ export default {
 
       return 1;
     },
-    limitedString () {
-      return this.$t('limitedOffer', { date: moment(seasonalShopConfig.dateRange.end).format('LL') });
-    },
+  },
+  mounted () {
+    this.countdownString();
+    this.timer = setInterval(this.countdownString, 30000);
   },
   methods: {
     stars () {
@@ -182,6 +185,28 @@ export default {
       }
       return collect.text;
     },
+    countdownString () {
+      const diffDuration = moment.duration(moment(seasonalShopConfig.dateRange.end).diff(moment()));
+
+      if (diffDuration.days() > 0) {
+        this.limitedString = this.$t('limitedAvailabilityDays', {
+          days: diffDuration.days(),
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      } else {
+        this.limitedString = this.$t('limitedAvailabilityHours', {
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      }
+    },
+    cancelAutoUpdate () {
+      clearInterval(this.timer);
+    },
+  },
+  beforeDestroy () {
+    this.cancelAutoUpdate();
   },
 };
 </script>
diff --git a/website/client/src/components/shops/shopItem.vue b/website/client/src/components/shops/shopItem.vue
index f3bc30e77c..d2bc6c228c 100644
--- a/website/client/src/components/shops/shopItem.vue
+++ b/website/client/src/components/shops/shopItem.vue
@@ -291,16 +291,18 @@ export default {
     },
   },
   data () {
-    return Object.freeze({
+    return {
       itemId: uuid(),
-      icons: {
+      icons: Object.freeze({
         gems: svgGem,
         gold: svgGold,
         lock: svgLock,
         hourglasses: svgHourglasses,
         clock: svgClock,
-      },
-    });
+      }),
+      timer: '',
+      limitedString: '',
+    };
   },
   computed: {
     showNotes () {
@@ -314,10 +316,10 @@ export default {
       }
       return 'gold';
     },
-    limitedString () {
-      return this.item.owned === false ? ''
-        : this.$t('limitedOffer', { date: moment(seasonalShopConfig.dateRange.end).format('LL') });
-    },
+  },
+  mounted () {
+    this.countdownString();
+    this.timer = setInterval(this.countdownString, 30000);
   },
   methods: {
     click () {
@@ -338,6 +340,28 @@ export default {
         locked: this.item.locked,
       };
     },
+    countdownString () {
+      const diffDuration = moment.duration(moment(seasonalShopConfig.dateRange.end).diff(moment()));
+
+      if (diffDuration.days() > 0) {
+        this.limitedString = this.$t('limitedAvailabilityDays', {
+          days: diffDuration.days(),
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      } else {
+        this.limitedString = this.$t('limitedAvailabilityHours', {
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      }
+    },
+    cancelAutoUpdate () {
+      clearInterval(this.timer);
+    },
+  },
+  beforeDestroy () {
+    this.cancelAutoUpdate();
   },
 };
 </script>
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index 684e6ac81b..d4461ec9fa 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -125,5 +125,7 @@
   "welcome3": "Progress in life and the game!",
   "welcome3notes": "As you improve your life, your avatar will level up and unlock pets, quests, equipment, and more!",
   "imReady": "Enter Habitica",
-  "limitedOffer": "Available until <%= date %>"
+  "limitedOffer": "Available until <%= date %>",
+  "limitedAvailabilityDays": "Available for <%= days %>d <%= hours %>h <%= minutes %>m",
+  "limitedAvailabilityHours": "Available for <%= hours %>h <%= minutes %>m"
 }

From 5ffdf09be4d1bb0438d5af096168f3ff7c87bc6f Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Wed, 7 Apr 2021 13:07:04 -0500
Subject: [PATCH 03/13] fix(event): don't flatten start/end moments

---
 website/common/script/libs/shops-seasonal.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js
index 06657c4ed7..fb50933dda 100644
--- a/website/common/script/libs/shops-seasonal.config.js
+++ b/website/common/script/libs/shops-seasonal.config.js
@@ -18,8 +18,8 @@ export default {
   currentSeason: SHOP_OPEN ? upperFirst(CURRENT_EVENT.season) : 'Closed',
 
   dateRange: {
-    start: moment(CURRENT_EVENT.start).format('YYYY-MM-DD'),
-    end: moment(CURRENT_EVENT.end).format('YYYY-MM-DD'),
+    start: SHOP_OPEN ? moment(CURRENT_EVENT.start) : moment().subtract(1, 'days').toDate(),
+    end: SHOP_OPEN ? moment(CURRENT_EVENT.end) : moment().subtract(1, 'seconds').toDate(),
   },
 
   availableSets: SHOP_OPEN

From 23f6e9b91114cc0eec53e2a82ed6115d31117169 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Thu, 8 Apr 2021 15:43:47 -0500
Subject: [PATCH 04/13] feat(event): more datetime countdown improvements

---
 .../client/src/components/shops/buyModal.vue  | 21 -----------
 .../src/components/shops/countdownBanner.vue  | 35 +++++++++++++++----
 .../components/shops/market/categoryRow.vue   | 13 +++++--
 .../components/shops/quests/buyQuestModal.vue | 21 -----------
 .../src/components/shops/quests/questInfo.vue | 13 +++++--
 .../client/src/components/shops/shopItem.vue  | 13 +++++--
 website/common/locales/en/limited.json        |  3 +-
 website/common/locales/en/npc.json            |  3 +-
 website/common/script/content/quests.js       |  5 +--
 9 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 13e4b7ac05..e591f58fd4 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -318,27 +318,6 @@
       opacity: 0.55;
     }
 
-    .limitedTime {
-      height: 32px;
-      background-color: $purple-300;
-      width: calc(100% + 30px);
-      margin: 0 -15px; // the modal content has its own padding
-
-      font-size: 12px;
-      line-height: 1.33;
-      text-align: center;
-      color: $white;
-
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      .limitedString {
-        height: 16px;
-        margin-left: 8px;
-      }
-    }
-
     .attributesGrid {
       margin-top: 8px;
       border-radius: 2px;
diff --git a/website/client/src/components/shops/countdownBanner.vue b/website/client/src/components/shops/countdownBanner.vue
index 7bb29e7a92..dee2380f72 100644
--- a/website/client/src/components/shops/countdownBanner.vue
+++ b/website/client/src/components/shops/countdownBanner.vue
@@ -1,8 +1,11 @@
 <template>
-  <div class="limitedTime">
+  <div
+    class="limitedTime"
+    :class="availabilityClass"
+  >
     <span
       class="svg-icon inline icon-16"
-      v-html="icons.clock"
+      v-html="availabilityClass === 'expired' ? icons.clockWhite : icons.clock"
     ></span>
     <span class="limitedString"> {{ limitedString }} </span>
   </div>
@@ -13,7 +16,6 @@
 
   .limitedTime {
     height: 32px;
-    background-color: $purple-300;
     width: calc(100% + 30px);
     margin: 0 -15px; // the modal content has its own padding
 
@@ -31,46 +33,65 @@
       margin-left: 8px;
     }
   }
+
+  .available {
+    background-color: $purple-300;
+  }
+  .expired {
+    background-color: $gray-200;
+  }
 </style>
 
 <script>
 import moment from 'moment';
 import svgClock from '@/assets/svg/clock.svg';
+import clockWhite from '@/assets/svg/clock-white.svg';
 
 export default {
   props: {
     endDate: {
-      type: String,
+      type: Object, // moment
     },
   },
   data () {
     return {
       icons: Object.freeze({
         clock: svgClock,
+        clockWhite,
       }),
       timer: '',
       limitedString: '',
+      availabilityClass: 'available',
     };
   },
   mounted () {
     this.countdownString();
-    this.timer = setInterval(this.countdownString, 30000);
+    this.timer = setInterval(this.countdownString, 1000);
   },
   methods: {
     countdownString () {
       const diffDuration = moment.duration(moment(this.endDate).diff(moment()));
 
-      if (diffDuration.days() > 0) {
+      if (moment(this.endDate).isBefore()) {
+        this.limitedString = this.$t('noLongerAvailable');
+        this.availabilityClass = 'expired';
+        this.cancelAutoUpdate();
+      } else if (diffDuration.days() > 0) {
         this.limitedString = this.$t('limitedAvailabilityDays', {
           days: diffDuration.days(),
           hours: diffDuration.hours(),
           minutes: diffDuration.minutes(),
         });
-      } else {
+      } else if (diffDuration.asMinutes() > 2) {
         this.limitedString = this.$t('limitedAvailabilityHours', {
           hours: diffDuration.hours(),
           minutes: diffDuration.minutes(),
         });
+      } else {
+        this.limitedString = this.$t('limitedAvailabilityMinutes', {
+          minutes: diffDuration.minutes(),
+          seconds: diffDuration.seconds(),
+        });
       }
     },
     cancelAutoUpdate () {
diff --git a/website/client/src/components/shops/market/categoryRow.vue b/website/client/src/components/shops/market/categoryRow.vue
index d63e92ded2..f34da10d0e 100644
--- a/website/client/src/components/shops/market/categoryRow.vue
+++ b/website/client/src/components/shops/market/categoryRow.vue
@@ -108,7 +108,7 @@ export default {
   },
   mounted () {
     this.countdownString();
-    this.timer = setInterval(this.countdownString, 30000);
+    this.timer = setInterval(this.countdownString, 1000);
   },
   methods: {
     itemSelected (item) {
@@ -117,17 +117,24 @@ export default {
     countdownString () {
       const diffDuration = moment.duration(moment(seasonalShopConfig.dateRange.end).diff(moment()));
 
-      if (diffDuration.days() > 0) {
+      if (diffDuration.asSeconds() <= 0) {
+        this.limitedString = this.$t('noLongerAvailable');
+      } else if (diffDuration.days() > 0) {
         this.limitedString = this.$t('limitedAvailabilityDays', {
           days: diffDuration.days(),
           hours: diffDuration.hours(),
           minutes: diffDuration.minutes(),
         });
-      } else {
+      } else if (diffDuration.asMinutes() > 2) {
         this.limitedString = this.$t('limitedAvailabilityHours', {
           hours: diffDuration.hours(),
           minutes: diffDuration.minutes(),
         });
+      } else {
+        this.limitedString = this.$t('limitedAvailabilityMinutes', {
+          minutes: diffDuration.minutes(),
+          seconds: diffDuration.seconds(),
+        });
       }
     },
     cancelAutoUpdate () {
diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue
index da8bf6b1b7..f4dc300f9a 100644
--- a/website/client/src/components/shops/quests/buyQuestModal.vue
+++ b/website/client/src/components/shops/quests/buyQuestModal.vue
@@ -202,27 +202,6 @@
       display: block;
     }
 
-    .limitedTime {
-      height: 32px;
-      background-color: $purple-300;
-      width: calc(100% + 30px);
-      margin: 0 -15px; // the modal content has its own padding
-
-      font-size: 12px;
-      line-height: 1.33;
-      text-align: center;
-      color: $white;
-
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      .limitedString {
-        height: 16px;
-        margin-left: 8px;
-      }
-    }
-
     .notEnough {
       pointer-events: none;
       opacity: 0.55;
diff --git a/website/client/src/components/shops/quests/questInfo.vue b/website/client/src/components/shops/quests/questInfo.vue
index 681e8c4e37..c13c980c60 100644
--- a/website/client/src/components/shops/quests/questInfo.vue
+++ b/website/client/src/components/shops/quests/questInfo.vue
@@ -158,7 +158,7 @@ export default {
   },
   mounted () {
     this.countdownString();
-    this.timer = setInterval(this.countdownString, 30000);
+    this.timer = setInterval(this.countdownString, 1000);
   },
   methods: {
     stars () {
@@ -188,17 +188,24 @@ export default {
     countdownString () {
       const diffDuration = moment.duration(moment(seasonalShopConfig.dateRange.end).diff(moment()));
 
-      if (diffDuration.days() > 0) {
+      if (diffDuration.asSeconds() <= 0) {
+        this.limitedString = this.$t('noLongerAvailable');
+      } else if (diffDuration.days() > 0) {
         this.limitedString = this.$t('limitedAvailabilityDays', {
           days: diffDuration.days(),
           hours: diffDuration.hours(),
           minutes: diffDuration.minutes(),
         });
-      } else {
+      } else if (diffDuration.asMinutes() > 2) {
         this.limitedString = this.$t('limitedAvailabilityHours', {
           hours: diffDuration.hours(),
           minutes: diffDuration.minutes(),
         });
+      } else {
+        this.limitedString = this.$t('limitedAvailabilityMinutes', {
+          minutes: diffDuration.minutes(),
+          seconds: diffDuration.seconds(),
+        });
       }
     },
     cancelAutoUpdate () {
diff --git a/website/client/src/components/shops/shopItem.vue b/website/client/src/components/shops/shopItem.vue
index d2bc6c228c..cd9e97955d 100644
--- a/website/client/src/components/shops/shopItem.vue
+++ b/website/client/src/components/shops/shopItem.vue
@@ -319,7 +319,7 @@ export default {
   },
   mounted () {
     this.countdownString();
-    this.timer = setInterval(this.countdownString, 30000);
+    this.timer = setInterval(this.countdownString, 1000);
   },
   methods: {
     click () {
@@ -343,17 +343,24 @@ export default {
     countdownString () {
       const diffDuration = moment.duration(moment(seasonalShopConfig.dateRange.end).diff(moment()));
 
-      if (diffDuration.days() > 0) {
+      if (diffDuration.asSeconds() <= 0) {
+        this.limitedString = this.$t('noLongerAvailable');
+      } else if (diffDuration.days() > 0) {
         this.limitedString = this.$t('limitedAvailabilityDays', {
           days: diffDuration.days(),
           hours: diffDuration.hours(),
           minutes: diffDuration.minutes(),
         });
-      } else {
+      } else if (diffDuration.asMinutes() > 2) {
         this.limitedString = this.$t('limitedAvailabilityHours', {
           hours: diffDuration.hours(),
           minutes: diffDuration.minutes(),
         });
+      } else {
+        this.limitedString = this.$t('limitedAvailabilityMinutes', {
+          minutes: diffDuration.minutes(),
+          seconds: diffDuration.seconds(),
+        });
       }
     },
     cancelAutoUpdate () {
diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json
index 6ffc6d37ed..7ad85cc377 100644
--- a/website/common/locales/en/limited.json
+++ b/website/common/locales/en/limited.json
@@ -199,5 +199,6 @@
     "howItWorks": "How it Works",
     "g1g1HowItWorks": "Type in the username of the account you’d like to gift to. From there, pick the sub length you’d like to gift and check out. Your account will automatically be rewarded with the same level of subscription you just gifted.",
     "limitations": "Limitations",
-    "g1g1Limitations": "This is a limited time event that starts on December 17th at 8:00 AM ET (13:00 UTC) and will end January 7th at 8:00 PM ET (1:00 UTC). This promotion only applies when you gift to another Habitican. If you or your gift recipient already have a subscription, the gifted subscription will add months of credit that will only be used after the current subscription is canceled or expires."
+    "g1g1Limitations": "This is a limited time event that starts on December 17th at 8:00 AM ET (13:00 UTC) and will end January 7th at 8:00 PM ET (1:00 UTC). This promotion only applies when you gift to another Habitican. If you or your gift recipient already have a subscription, the gifted subscription will add months of credit that will only be used after the current subscription is canceled or expires.",
+    "noLongerAvailable": "This item is no longer available."
 }
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index d4461ec9fa..517491c71c 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -127,5 +127,6 @@
   "imReady": "Enter Habitica",
   "limitedOffer": "Available until <%= date %>",
   "limitedAvailabilityDays": "Available for <%= days %>d <%= hours %>h <%= minutes %>m",
-  "limitedAvailabilityHours": "Available for <%= hours %>h <%= minutes %>m"
+  "limitedAvailabilityHours": "Available for <%= hours %>h <%= minutes %>m",
+  "limitedAvailabilityMinutes": "Available for <%= minutes %>m <%= seconds %>s"
 }
diff --git a/website/common/script/content/quests.js b/website/common/script/content/quests.js
index 7c4a35ee7a..869cf00cdc 100644
--- a/website/common/script/content/quests.js
+++ b/website/common/script/content/quests.js
@@ -518,8 +518,9 @@ const quests = {
     completion: t('questEggHuntCompletion'),
     value: 1,
     category: 'pet',
+    event: EVENTS.spring2021,
     canBuy () {
-      return moment().isBefore('2021-04-30T20:00-05:00');
+      return moment().isBefore(EVENTS.spring2021.end);
     },
     collect: {
       plainEgg: {
@@ -3587,7 +3588,7 @@ const quests = {
     category: 'hatchingPotion',
     event: EVENTS.spring2021,
     canBuy () {
-      return moment().isBetween('2021-04-01T08:00-05:00', '2021-04-30T20:00-05:00');
+      return moment().isBefore(EVENTS.spring2021.end);
     },
     boss: {
       name: t('questWaffleBoss'),

From 9c402152e8fc58a82bdea78056ef347c2f0a420f Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Thu, 8 Apr 2021 16:26:32 -0500
Subject: [PATCH 05/13] feat(event): Shiny Seed and Egg Hunt countdowns

---
 website/client/src/components/shops/quests/questInfo.vue | 6 +-----
 website/client/src/components/shops/shopItem.vue         | 2 +-
 website/common/script/content/spells.js                  | 2 ++
 website/common/script/libs/getItemInfo.js                | 2 ++
 website/common/script/libs/shops-seasonal.config.js      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/website/client/src/components/shops/quests/questInfo.vue b/website/client/src/components/shops/quests/questInfo.vue
index c13c980c60..f56308c09b 100644
--- a/website/client/src/components/shops/quests/questInfo.vue
+++ b/website/client/src/components/shops/quests/questInfo.vue
@@ -36,7 +36,7 @@
         </dd>
       </div>
     </div>
-    <div v-if="quest.event && popoverVersion">
+    <div v-if="quest.event">
       {{ limitedString }}
     </div>
   </div>
@@ -131,10 +131,6 @@ export default {
     quest: {
       type: Object,
     },
-    popoverVersion: {
-      type: Boolean,
-      default: false,
-    },
   },
   data () {
     return {
diff --git a/website/client/src/components/shops/shopItem.vue b/website/client/src/components/shops/shopItem.vue
index cd9e97955d..b6b60e0145 100644
--- a/website/client/src/components/shops/shopItem.vue
+++ b/website/client/src/components/shops/shopItem.vue
@@ -107,7 +107,7 @@
           </div>
         </div>
         <div
-          v-if="item.event"
+          v-if="item.event && item.purchaseType !== 'quests'"
           :class="item.purchaseType === 'gear' ? 'mt-4' : 'mt-2'"
         >
           {{ limitedString }}
diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js
index 93940c3ba5..495b1f07e1 100644
--- a/website/common/script/content/spells.js
+++ b/website/common/script/content/spells.js
@@ -5,6 +5,7 @@ import statsComputed from '../libs/statsComputed'; // eslint-disable-line import
 import setDebuffPotionItems from '../libs/setDebuffPotionItems'; // eslint-disable-line import/no-cycle
 import crit from '../fns/crit'; // eslint-disable-line import/no-cycle
 import updateStats from '../fns/updateStats';
+import { EVENTS } from './constants';
 
 /*
   ---------------------------------------------------------------
@@ -352,6 +353,7 @@ spells.special = {
     previousPurchase: true,
     target: 'user',
     notes: t('spellSpecialShinySeedNotes'),
+    event: EVENTS.spring2021,
     cast (user, target, req) {
       if (!user.items.special.shinySeed) throw new NotAuthorized(t('spellNotOwned')(req.language));
       target.stats.buffs.snowball = false;
diff --git a/website/common/script/libs/getItemInfo.js b/website/common/script/libs/getItemInfo.js
index f59f5d0f9a..c9d26ac32c 100644
--- a/website/common/script/libs/getItemInfo.js
+++ b/website/common/script/libs/getItemInfo.js
@@ -178,6 +178,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
         class: `inventory_special_${item.key}`,
         path: `spells.special.${item.key}`,
         pinType: 'seasonalSpell',
+        event: item.event,
       };
       break;
     case 'debuffPotion':
@@ -215,6 +216,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
         purchaseType: 'quests',
         path: `quests.${item.key}`,
         pinType: 'seasonalQuest',
+        event: item.event,
       };
       break;
     case 'gear':
diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js
index fb50933dda..72bd5db381 100644
--- a/website/common/script/libs/shops-seasonal.config.js
+++ b/website/common/script/libs/shops-seasonal.config.js
@@ -37,7 +37,7 @@ export default {
     }
     : {},
 
-  availableSpells: moment().isBetween('2021-04-06T08:00-05:00', '2021-04-30T20:00-05:00')
+  availableSpells: SHOP_OPEN && moment().isAfter('2021-04-06T08:00-05:00')
     ? [
       'shinySeed',
     ]

From c3497193033cecd0e5e10a2f8b7458836b5329d2 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Thu, 8 Apr 2021 16:45:56 -0500
Subject: [PATCH 06/13] feat(event): current event data in Gem-buy Seasonal
 Shop gear

---
 .../script/content/gear/sets/special/index.js | 137 ++++++++++++++++--
 1 file changed, 121 insertions(+), 16 deletions(-)

diff --git a/website/common/script/content/gear/sets/special/index.js b/website/common/script/content/gear/sets/special/index.js
index 6153e64f85..6fc041b222 100644
--- a/website/common/script/content/gear/sets/special/index.js
+++ b/website/common/script/content/gear/sets/special/index.js
@@ -164,18 +164,22 @@ const armor = {
   },
   springRogue: {
     set: 'stealthyKittySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springWarrior: {
     set: 'mightyBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springMage: {
     set: 'magicMouseSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springHealer: {
     set: 'lovingPupSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summerRogue: {
@@ -234,18 +238,22 @@ const armor = {
   },
   spring2015Rogue: {
     set: 'sneakySqueakerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Warrior: {
     set: 'bewareDogSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Mage: {
     set: 'magicianBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Healer: {
     set: 'comfortingKittySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2015Rogue: {
@@ -310,18 +318,22 @@ const armor = {
   },
   spring2016Rogue: {
     set: 'cleverDogSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Warrior: {
     set: 'braveMouseSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Mage: {
     set: 'grandMalkinSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Healer: {
     set: 'springingBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2016Rogue: {
@@ -380,18 +392,22 @@ const armor = {
   },
   spring2017Rogue: {
     set: 'spring2017SneakyBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Warrior: {
     set: 'spring2017FelineWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Mage: {
     set: 'spring2017CanineConjurorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Healer: {
     set: 'spring2017FloralMouseSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2017Rogue: {
@@ -450,18 +466,22 @@ const armor = {
   },
   spring2018Rogue: {
     set: 'spring2018DucklingRogueSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2018Warrior: {
     set: 'spring2018SunriseWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2018Mage: {
     set: 'spring2018TulipMageSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2018Healer: {
     set: 'spring2018GarnetHealerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2018Rogue: {
@@ -526,18 +546,22 @@ const armor = {
   },
   spring2019Rogue: {
     set: 'spring2019CloudRogueSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2019Warrior: {
     set: 'spring2019OrchidWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2019Mage: {
     set: 'spring2019AmberMageSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2019Healer: {
     set: 'spring2019RobinHealerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2019Rogue: {
@@ -603,18 +627,22 @@ const armor = {
   },
   spring2020Rogue: {
     set: 'spring2020LapisLazuliRogueSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2020Warrior: {
     set: 'spring2020BeetleWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2020Mage: {
     set: 'spring2020PuddleMageSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2020Healer: {
     set: 'spring2020IrisHealerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2020Rogue: {
@@ -1171,18 +1199,22 @@ const head = {
   },
   springRogue: {
     set: 'stealthyKittySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springWarrior: {
     set: 'mightyBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springMage: {
     set: 'magicMouseSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springHealer: {
     set: 'lovingPupSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summerRogue: {
@@ -1241,18 +1273,22 @@ const head = {
   },
   spring2015Rogue: {
     set: 'sneakySqueakerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Warrior: {
     set: 'bewareDogSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Mage: {
     set: 'magicianBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Healer: {
     set: 'comfortingKittySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2015Rogue: {
@@ -1317,18 +1353,22 @@ const head = {
   },
   spring2016Rogue: {
     set: 'cleverDogSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Warrior: {
     set: 'braveMouseSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Mage: {
     set: 'grandMalkinSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Healer: {
     set: 'springingBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2016Rogue: {
@@ -1387,18 +1427,22 @@ const head = {
   },
   spring2017Rogue: {
     set: 'spring2017SneakyBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Warrior: {
     set: 'spring2017FelineWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Mage: {
     set: 'spring2017CanineConjurorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Healer: {
     set: 'spring2017FloralMouseSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2017Rogue: {
@@ -1463,18 +1507,22 @@ const head = {
   },
   spring2018Rogue: {
     set: 'spring2018DucklingRogueSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2018Warrior: {
     set: 'spring2018SunriseWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2018Mage: {
     set: 'spring2018TulipMageSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2018Healer: {
     set: 'spring2018GarnetHealerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2018Rogue: {
@@ -1545,18 +1593,22 @@ const head = {
   },
   spring2019Rogue: {
     set: 'spring2019CloudRogueSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2019Warrior: {
     set: 'spring2019OrchidWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2019Mage: {
     set: 'spring2019AmberMageSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2019Healer: {
     set: 'spring2019RobinHealerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2019Rogue: {
@@ -1622,18 +1674,22 @@ const head = {
   },
   spring2020Rogue: {
     set: 'spring2020LapisLazuliRogueSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2020Warrior: {
     set: 'spring2020BeetleWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2020Mage: {
     set: 'spring2020PuddleMageSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2020Healer: {
     set: 'spring2020IrisHealerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2020Rogue: {
@@ -1720,75 +1776,75 @@ Object.keys(gearEvents).forEach(event => {
 
 const headAccessory = {
   springRogue: {
-    event: EVENTS.spring,
     specialClass: 'rogue',
     set: 'stealthyKittySet',
     text: t('headAccessorySpecialSpringRogueText'),
     notes: t('headAccessorySpecialSpringRogueNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springWarrior: {
-    event: EVENTS.spring,
     specialClass: 'warrior',
     set: 'mightyBunnySet',
     text: t('headAccessorySpecialSpringWarriorText'),
     notes: t('headAccessorySpecialSpringWarriorNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springMage: {
-    event: EVENTS.spring,
     specialClass: 'wizard',
     set: 'magicMouseSet',
     text: t('headAccessorySpecialSpringMageText'),
     notes: t('headAccessorySpecialSpringMageNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springHealer: {
-    event: EVENTS.spring,
     specialClass: 'healer',
     set: 'lovingPupSet',
     text: t('headAccessorySpecialSpringHealerText'),
     notes: t('headAccessorySpecialSpringHealerNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Rogue: {
-    event: EVENTS.spring2015,
     specialClass: 'rogue',
     set: 'sneakySqueakerSet',
     text: t('headAccessorySpecialSpring2015RogueText'),
     notes: t('headAccessorySpecialSpring2015RogueNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Warrior: {
-    event: EVENTS.spring2015,
     specialClass: 'warrior',
     set: 'bewareDogSet',
     text: t('headAccessorySpecialSpring2015WarriorText'),
     notes: t('headAccessorySpecialSpring2015WarriorNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Mage: {
-    event: EVENTS.spring2015,
     specialClass: 'wizard',
     set: 'magicianBunnySet',
     text: t('headAccessorySpecialSpring2015MageText'),
     notes: t('headAccessorySpecialSpring2015MageNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Healer: {
-    event: EVENTS.spring2015,
     specialClass: 'healer',
     set: 'comfortingKittySet',
     text: t('headAccessorySpecialSpring2015HealerText'),
     notes: t('headAccessorySpecialSpring2015HealerNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   bearEars: {
@@ -1856,75 +1912,75 @@ const headAccessory = {
     canBuy: () => true,
   },
   spring2016Rogue: {
-    event: EVENTS.spring2016,
     specialClass: 'rogue',
     set: 'cleverDogSet',
     text: t('headAccessorySpecialSpring2016RogueText'),
     notes: t('headAccessorySpecialSpring2016RogueNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Warrior: {
-    event: EVENTS.spring2016,
     specialClass: 'warrior',
     set: 'braveMouseSet',
     text: t('headAccessorySpecialSpring2016WarriorText'),
     notes: t('headAccessorySpecialSpring2016WarriorNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Mage: {
-    event: EVENTS.spring2016,
     specialClass: 'wizard',
     set: 'grandMalkinSet',
     text: t('headAccessorySpecialSpring2016MageText'),
     notes: t('headAccessorySpecialSpring2016MageNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Healer: {
-    event: EVENTS.spring2016,
     specialClass: 'healer',
     set: 'springingBunnySet',
     text: t('headAccessorySpecialSpring2016HealerText'),
     notes: t('headAccessorySpecialSpring2016HealerNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Rogue: {
-    event: EVENTS.spring2017,
     specialClass: 'rogue',
     set: 'spring2017SneakyBunnySet',
     text: t('headAccessorySpecialSpring2017RogueText'),
     notes: t('headAccessorySpecialSpring2017RogueNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Warrior: {
-    event: EVENTS.spring2017,
     specialClass: 'warrior',
     set: 'spring2017FelineWarriorSet',
     text: t('headAccessorySpecialSpring2017WarriorText'),
     notes: t('headAccessorySpecialSpring2017WarriorNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Mage: {
-    event: EVENTS.spring2017,
     specialClass: 'wizard',
     set: 'spring2017CanineConjurorSet',
     text: t('headAccessorySpecialSpring2017MageText'),
     notes: t('headAccessorySpecialSpring2017MageNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Healer: {
-    event: EVENTS.spring2017,
     specialClass: 'healer',
     set: 'spring2017FloralMouseSet',
     text: t('headAccessorySpecialSpring2017HealerText'),
     notes: t('headAccessorySpecialSpring2017HealerNotes'),
     value: 20,
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   blackHeadband: {
@@ -2071,14 +2127,17 @@ const shield = {
   },
   springRogue: {
     set: 'stealthyKittySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springWarrior: {
     set: 'mightyBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springHealer: {
     set: 'lovingPupSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summerRogue: {
@@ -2119,14 +2178,17 @@ const shield = {
   },
   spring2015Rogue: {
     set: 'sneakySqueakerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Warrior: {
     set: 'bewareDogSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Healer: {
     set: 'comfortingKittySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2015Rogue: {
@@ -2167,14 +2229,17 @@ const shield = {
   },
   spring2016Rogue: {
     set: 'cleverDogSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Warrior: {
     set: 'braveMouseSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Healer: {
     set: 'springingBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2016Rogue: {
@@ -2215,14 +2280,17 @@ const shield = {
   },
   spring2017Rogue: {
     set: 'spring2017SneakyBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Warrior: {
     set: 'spring2017FelineWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Healer: {
     set: 'spring2017FloralMouseSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2017Rogue: {
@@ -2263,14 +2331,17 @@ const shield = {
   },
   spring2018Rogue: {
     set: 'spring2018DucklingRogueSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2018Warrior: {
     set: 'spring2018SunriseWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2018Healer: {
     set: 'spring2018GarnetHealerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2018Rogue: {
@@ -2319,14 +2390,17 @@ const shield = {
   },
   spring2019Rogue: {
     set: 'spring2019CloudRogueSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2019Warrior: {
     set: 'spring2019OrchidWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2019Healer: {
     set: 'spring2019RobinHealerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2019Rogue: {
@@ -2384,14 +2458,17 @@ const shield = {
   },
   spring2020Rogue: {
     set: 'spring2020LapisLazuliRogueSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2020Warrior: {
     set: 'spring2020BeetleWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2020Healer: {
     set: 'spring2020IrisHealerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2020Warrior: {
@@ -2604,18 +2681,22 @@ const weapon = {
   },
   springRogue: {
     set: 'stealthyKittySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springWarrior: {
     set: 'mightyBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springMage: {
     set: 'magicMouseSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   springHealer: {
     set: 'lovingPupSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summerRogue: {
@@ -2668,18 +2749,22 @@ const weapon = {
   },
   spring2015Rogue: {
     set: 'sneakySqueakerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Warrior: {
     set: 'bewareDogSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Mage: {
     set: 'magicianBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2015Healer: {
     set: 'comfortingKittySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2015Rogue: {
@@ -2732,18 +2817,22 @@ const weapon = {
   },
   spring2016Rogue: {
     set: 'cleverDogSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Warrior: {
     set: 'braveMouseSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Mage: {
     set: 'grandMalkinSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2016Healer: {
     set: 'springingBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2016Rogue: {
@@ -2796,18 +2885,22 @@ const weapon = {
   },
   spring2017Rogue: {
     set: 'spring2017SneakyBunnySet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Warrior: {
     set: 'spring2017FelineWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Mage: {
     set: 'spring2017CanineConjurorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2017Healer: {
     set: 'spring2017FloralMouseSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2017Rogue: {
@@ -2860,18 +2953,22 @@ const weapon = {
   },
   spring2018Rogue: {
     set: 'spring2018DucklingRogueSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2018Warrior: {
     set: 'spring2018SunriseWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2018Mage: {
     set: 'spring2018TulipMageSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2018Healer: {
     set: 'spring2018GarnetHealerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2018Rogue: {
@@ -2924,18 +3021,22 @@ const weapon = {
   },
   spring2019Rogue: {
     set: 'spring2019CloudRogueSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2019Warrior: {
     set: 'spring2019OrchidWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2019Mage: {
     set: 'spring2019AmberMageSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2019Healer: {
     set: 'spring2019RobinHealerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2019Rogue: {
@@ -3003,18 +3104,22 @@ const weapon = {
   },
   spring2020Rogue: {
     set: 'spring2020LapisLazuliRogueSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2020Warrior: {
     set: 'spring2020BeetleWarriorSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2020Mage: {
     set: 'spring2020PuddleMageSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   spring2020Healer: {
     set: 'spring2020IrisHealerSet',
+    event: EVENTS.spring2021,
     canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
   },
   summer2020Rogue: {

From 46b8e7f725fcc3d452e9ce9443d105a3f7dd1bfe Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Fri, 9 Apr 2021 15:14:18 -0500
Subject: [PATCH 07/13] fix(event): filter out past seasonal sets in Market
 also block purchase of special spells outside their events also remove
 hardcoded dates from seasonal shop intro text used on mobile

---
 website/common/locales/en/limited.json  |  8 ++++----
 website/common/script/content/spells.js | 19 +++++++++++++++++++
 website/common/script/libs/shops.js     |  1 +
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json
index 7ad85cc377..179b6d7cd7 100644
--- a/website/common/locales/en/limited.json
+++ b/website/common/locales/en/limited.json
@@ -28,10 +28,10 @@
     "seasonalShopClosedTitle": "<%= linkStart %>Leslie<%= linkEnd %>",
     "seasonalShopTitle": "<%= linkStart %>Seasonal Sorceress<%= linkEnd %>",
     "seasonalShopClosedText": "The Seasonal Shop is currently closed!! It’s only open during Habitica’s four Grand Galas.",
-    "seasonalShopSummerText": "Happy Summer Splash!! Would you like to buy some rare items? They’ll only be available until July 31st!",
-    "seasonalShopFallText": "Happy Fall Festival!! Would you like to buy some rare items? They’ll only be available until October 31st!",
-    "seasonalShopWinterText": "Happy Winter Wonderland!! Would you like to buy some rare items? They’ll only be available until January 31st!",
-    "seasonalShopSpringText": "Happy Spring Fling!! Would you like to buy some rare items? They’ll only be available until April 30th!",
+    "seasonalShopSummerText": "Happy Summer Splash!! Would you like to buy some rare items? They’ll only be available during the Gala!",
+    "seasonalShopFallText": "Happy Fall Festival!! Would you like to buy some rare items? They’ll only be available during the Gala!",
+    "seasonalShopWinterText": "Happy Winter Wonderland!! Would you like to buy some rare items? They’ll only be available during the Gala!",
+    "seasonalShopSpringText": "Happy Spring Fling!! Would you like to buy some rare items? They’ll only be available during the Gala!",
     "seasonalShopFallTextBroken": "Oh.... Welcome to the Seasonal Shop... We're stocking autumn Seasonal Edition goodies, or something... Everything here will be available to purchase during the Fall Festival event each year, but we're only open until October 31... I guess you should to stock up now, or you'll have to wait... and wait... and wait... <strong>*sigh*</strong>",
     "seasonalShopBrokenText": "My pavilion!!!!!!! My decorations!!!! Oh, the Dysheartener's destroyed everything :( Please help defeat it in the Tavern so I can rebuild!",
     "seasonalShopRebirth": "If you bought any of this equipment in the past but don't currently own it, you can repurchase it in the Rewards Column. Initially, you'll only be able to purchase the items for your current class (Warrior by default), but fear not, the other class-specific items will become available if you switch to that class.",
diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js
index 495b1f07e1..f208c519a1 100644
--- a/website/common/script/content/spells.js
+++ b/website/common/script/content/spells.js
@@ -1,4 +1,5 @@
 import each from 'lodash/each';
+import moment from 'moment';
 import t from './translation';
 import { NotAuthorized, BadRequest } from '../libs/errors';
 import statsComputed from '../libs/statsComputed'; // eslint-disable-line import/no-cycle
@@ -287,6 +288,9 @@ spells.special = {
     previousPurchase: true,
     target: 'user',
     notes: t('spellSpecialSnowballAuraNotes'),
+    canOwn () {
+      return false;
+    },
     cast (user, target, req) {
       if (!user.items.special.snowball) throw new NotAuthorized(t('spellNotOwned')(req.language));
       target.stats.buffs.snowball = true;
@@ -320,6 +324,9 @@ spells.special = {
     previousPurchase: true,
     target: 'user',
     notes: t('spellSpecialSpookySparklesNotes'),
+    canOwn () {
+      return false;
+    },
     cast (user, target, req) {
       if (!user.items.special.spookySparkles) throw new NotAuthorized(t('spellNotOwned')(req.language));
       target.stats.buffs.snowball = false;
@@ -354,6 +361,9 @@ spells.special = {
     target: 'user',
     notes: t('spellSpecialShinySeedNotes'),
     event: EVENTS.spring2021,
+    canOwn () {
+      return moment().isBetween('2021-04-06T08:00-05:00', EVENTS.spring2021.end);
+    },
     cast (user, target, req) {
       if (!user.items.special.shinySeed) throw new NotAuthorized(t('spellNotOwned')(req.language));
       target.stats.buffs.snowball = false;
@@ -387,6 +397,9 @@ spells.special = {
     previousPurchase: true,
     target: 'user',
     notes: t('spellSpecialSeafoamNotes'),
+    canOwn () {
+      return false;
+    },
     cast (user, target, req) {
       if (!user.items.special.seafoam) throw new NotAuthorized(t('spellNotOwned')(req.language));
       target.stats.buffs.snowball = false;
@@ -421,6 +434,9 @@ spells.special = {
     silent: true,
     target: 'user',
     notes: t('nyeCardNotes'),
+    canOwn () {
+      return false;
+    },
     cast (user, target) {
       if (user === target) {
         if (!user.achievements.nye) user.achievements.nye = 0;
@@ -458,6 +474,9 @@ spells.special = {
     silent: true,
     target: 'user',
     notes: t('valentineCardNotes'),
+    canOwn () {
+      return false;
+    },
     cast (user, target) {
       if (user === target) {
         if (!user.achievements.valentine) user.achievements.valentine = 0;
diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js
index 41d0cd466d..397506381a 100644
--- a/website/common/script/libs/shops.js
+++ b/website/common/script/libs/shops.js
@@ -157,6 +157,7 @@ shops.getMarketGearCategories = function getMarketGear (user, language) {
       if (
         gearItem.specialClass === classType
         && user.items.gear.owned[gearItem.key] !== false
+        && gearItem.set === seasonalShopConfig.pinnedSets[gearItem.specialClass]
       ) return gearItem.canOwn(classShift);
       return false;
     });

From d231eb30237b6d3ffc7b448e41d7f55a478a152e Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Fri, 9 Apr 2021 15:41:20 -0500
Subject: [PATCH 08/13] fix(test): force special spell purchasable for test

---
 test/api/v3/integration/user/buy/POST-user_buy.test.js | 3 +++
 website/common/locales/en/limited.json                 | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/api/v3/integration/user/buy/POST-user_buy.test.js b/test/api/v3/integration/user/buy/POST-user_buy.test.js
index 4b39704500..aee180d753 100644
--- a/test/api/v3/integration/user/buy/POST-user_buy.test.js
+++ b/test/api/v3/integration/user/buy/POST-user_buy.test.js
@@ -70,6 +70,7 @@ describe('POST /user/buy/:key', () => {
   it('buys a special spell', async () => {
     const key = 'spookySparkles';
     const item = content.special[key];
+    const stub = sinon.stub(item, 'canOwn').returns(true);
 
     await user.update({ 'stats.gp': 250 });
     const res = await user.post(`/user/buy/${key}`);
@@ -82,6 +83,8 @@ describe('POST /user/buy/:key', () => {
     expect(res.message).to.equal(t('messageBought', {
       itemText: item.text(),
     }));
+
+    stub.restore();
   });
 
   it('allows for bulk purchases', async () => {
diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json
index 179b6d7cd7..b6d262b1d7 100644
--- a/website/common/locales/en/limited.json
+++ b/website/common/locales/en/limited.json
@@ -28,10 +28,10 @@
     "seasonalShopClosedTitle": "<%= linkStart %>Leslie<%= linkEnd %>",
     "seasonalShopTitle": "<%= linkStart %>Seasonal Sorceress<%= linkEnd %>",
     "seasonalShopClosedText": "The Seasonal Shop is currently closed!! It’s only open during Habitica’s four Grand Galas.",
-    "seasonalShopSummerText": "Happy Summer Splash!! Would you like to buy some rare items? They’ll only be available during the Gala!",
-    "seasonalShopFallText": "Happy Fall Festival!! Would you like to buy some rare items? They’ll only be available during the Gala!",
-    "seasonalShopWinterText": "Happy Winter Wonderland!! Would you like to buy some rare items? They’ll only be available during the Gala!",
-    "seasonalShopSpringText": "Happy Spring Fling!! Would you like to buy some rare items? They’ll only be available during the Gala!",
+    "seasonalShopSummerText": "Happy Summer Splash!! Would you like to buy some rare items? Be sure to get them before the Gala ends!",
+    "seasonalShopFallText": "Happy Fall Festival!! Would you like to buy some rare items? Be sure to get them before the Gala ends!",
+    "seasonalShopWinterText": "Happy Winter Wonderland!! Would you like to buy some rare items? Be sure to get them before the Gala ends!",
+    "seasonalShopSpringText": "Happy Spring Fling!! Would you like to buy some rare items? Be sure to get them before the Gala ends!",
     "seasonalShopFallTextBroken": "Oh.... Welcome to the Seasonal Shop... We're stocking autumn Seasonal Edition goodies, or something... Everything here will be available to purchase during the Fall Festival event each year, but we're only open until October 31... I guess you should to stock up now, or you'll have to wait... and wait... and wait... <strong>*sigh*</strong>",
     "seasonalShopBrokenText": "My pavilion!!!!!!! My decorations!!!! Oh, the Dysheartener's destroyed everything :( Please help defeat it in the Tavern so I can rebuild!",
     "seasonalShopRebirth": "If you bought any of this equipment in the past but don't currently own it, you can repurchase it in the Rewards Column. Initially, you'll only be able to purchase the items for your current class (Warrior by default), but fear not, the other class-specific items will become available if you switch to that class.",

From b5497b149b109227debbb8c48a6e5c5803316da8 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Tue, 13 Apr 2021 14:36:24 -0500
Subject: [PATCH 09/13] refactor(potions): de-hardcode premium potion end dates

---
 website/common/script/content/hatching-potions.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index cd5b016c1d..b8e689f845 100644
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -197,7 +197,7 @@ const premium = {
     }),
     event: EVENTS.spring2021,
     canBuy () {
-      return moment().isBefore('2021-04-30T20:00-04:00');
+      return moment().isBefore(EVENTS.spring2021.end);
     },
   },
   Glass: {
@@ -347,13 +347,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionBirchBark'),
     limited: true,
-    event: EVENTS.spring2020,
+    event: EVENTS.spring2021,
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndMarch'),
       previousDate: t('marchYYYY', { year: 2020 }),
     }),
     canBuy () {
-      return moment().isBefore('2021-04-30T20:00-04:00');
+      return moment().isBefore(EVENTS.spring2021.end);
     },
   },
   Fluorite: {
@@ -440,7 +440,7 @@ const premium = {
       date: t('dateEndMarch'),
     }),
     canBuy () {
-      return moment().isBefore('2021-04-30T20:00-04:00');
+      return moment().isBefore(EVENTS.spring2021.end);
     },
   },
 };

From 344280d12456247462a3739cfed3e3153d8b092c Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Tue, 13 Apr 2021 15:19:44 -0500
Subject: [PATCH 10/13] refactor(potions): also de-hardcode Veggie Potion

---
 website/common/script/content/hatching-potions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index b8e689f845..52957737c5 100644
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -449,13 +449,13 @@ const wacky = {
   Veggie: {
     text: t('hatchingPotionVeggie'),
     limited: true,
-    event: EVENTS.spring2020,
+    event: EVENTS.spring2021,
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndMarch'),
       previousDate: t('marchYYYY', { year: 2019 }),
     }),
     canBuy () {
-      return moment().isBetween('2021-04-01T08:00-05:00', '2021-04-30T20:00-05:00');
+      return moment().isBetween('2021-04-01T08:00-05:00', EVENTS.spring2021.end);
     },
   },
   Dessert: {

From 2b8a9ba6b76ae2019d00d060137f18939e68e29e Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Wed, 14 Apr 2021 14:34:22 -0500
Subject: [PATCH 11/13] fix(achievement): clarify Legendary Bestiary
 requirement

---
 website/common/locales/en/achievements.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/common/locales/en/achievements.json b/website/common/locales/en/achievements.json
index c134a31411..85a64c9870 100644
--- a/website/common/locales/en/achievements.json
+++ b/website/common/locales/en/achievements.json
@@ -104,7 +104,7 @@
   "achievementRedLetterDayText": "Has tamed all Red Mounts.",
   "achievementRedLetterDayModalText": "You tamed all the Red Mounts!",
   "achievementLegendaryBestiary": "Legendary Bestiary",
-  "achievementLegendaryBestiaryText": "Has hatched all the mythical pets: Dragon, Flying Pig, Gryphon, Sea Serpent, and Unicorn!",
+  "achievementLegendaryBestiaryText": "Has hatched all standard colors of mythical pets: Dragon, Flying Pig, Gryphon, Sea Serpent, and Unicorn!",
   "achievementLegendaryBestiaryModalText": "You collected all the mythical pets!",
   "achievementSeasonalSpecialist": "Seasonal Specialist",
   "achievementSeasonalSpecialistText": "Has completed all the Spring and Winter seasonal quests: Egg Hunt, Trapper Santa, and Find the Cub!",

From 8641817d780e3fa6a12934bf3efd563edb03a822 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Wed, 14 Apr 2021 14:43:35 -0500
Subject: [PATCH 12/13] fix(analytics): if user no longer subscriber, blank out
 sub field

---
 website/server/libs/analyticsService.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/website/server/libs/analyticsService.js b/website/server/libs/analyticsService.js
index 995a911fd5..3082c78d42 100644
--- a/website/server/libs/analyticsService.js
+++ b/website/server/libs/analyticsService.js
@@ -100,6 +100,8 @@ function _formatUserData (user) {
 
   if (user.purchased && user.purchased.plan.planId) {
     properties.subscription = user.purchased.plan.planId;
+  } else {
+    properties.subscription = null;
   }
 
   if (user._ABtests) {

From e1521f9456b048cb791c3cd9b99a75e96f69b02e Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Fri, 16 Apr 2021 11:13:02 -0500
Subject: [PATCH 13/13] 4.189.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 124448ad7e..9bfd50a72b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.189.1",
+  "version": "4.189.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a094cb2e82..a9915382c4 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.189.1",
+  "version": "4.189.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.12.10",