From f9db4b9b5befdf4042c577d12416ca21d672653c Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Mon, 13 Feb 2023 11:25:02 -0600
Subject: [PATCH] fix(event): correct logic for various Valentine's items

---
 website/client/src/components/groups/tavern.vue      | 10 ++++++----
 website/client/src/components/shops/market/index.vue | 10 ++++++----
 website/client/src/components/shops/quests/index.vue | 10 ++++++----
 website/common/script/content/constants/events.js    |  6 +++---
 website/common/script/content/index.js               |  2 +-
 website/common/script/content/spells.js              |  2 +-
 6 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/website/client/src/components/groups/tavern.vue b/website/client/src/components/groups/tavern.vue
index 75ed9d2062..8804aaa32c 100644
--- a/website/client/src/components/groups/tavern.vue
+++ b/website/client/src/components/groups/tavern.vue
@@ -759,6 +759,7 @@
 </style>
 
 <script>
+import find from 'lodash/find';
 import { mapState } from '@/libs/store';
 import { goToModForm } from '@/libs/modform';
 
@@ -835,22 +836,23 @@ export default {
   computed: {
     ...mapState({
       user: 'user.data',
-      currentEvent: 'worldState.data.currentEvent',
+      currentEventList: 'worldState.data.currentEventList',
     }),
     questData () {
       if (!this.group.quest) return {};
       return quests.quests[this.group.quest.key];
     },
     imageURLs () {
-      if (!this.currentEvent || !this.currentEvent.season) {
+      const currentEvent = find(this.currentEventList, event => Boolean(event.season));
+      if (!currentEvent) {
         return {
           background: 'url(/static/npc/normal/tavern_background.png)',
           npc: 'url(/static/npc/normal/tavern_npc.png)',
         };
       }
       return {
-        background: `url(/static/npc/${this.currentEvent.season}/tavern_background.png)`,
-        npc: `url(/static/npc/${this.currentEvent.season}/tavern_npc.png)`,
+        background: `url(/static/npc/${currentEvent.season}/tavern_background.png)`,
+        npc: `url(/static/npc/${currentEvent.season}/tavern_npc.png)`,
       };
     },
   },
diff --git a/website/client/src/components/shops/market/index.vue b/website/client/src/components/shops/market/index.vue
index 0f01aede61..3b6ab30aaf 100644
--- a/website/client/src/components/shops/market/index.vue
+++ b/website/client/src/components/shops/market/index.vue
@@ -146,6 +146,7 @@
 </style>
 
 <script>
+import find from 'lodash/find';
 import _filter from 'lodash/filter';
 import _map from 'lodash/map';
 import _throttle from 'lodash/throttle';
@@ -225,7 +226,7 @@ export default {
       user: 'user.data',
       userStats: 'user.data.stats',
       userItems: 'user.data.items',
-      currentEvent: 'worldState.data.currentEvent',
+      currentEventList: 'worldState.data.currentEventList',
     }),
     market () {
       return shops.getMarketShop(this.user);
@@ -292,15 +293,16 @@ export default {
       return Object.values(this.viewOptions).some(g => g.selected);
     },
     imageURLs () {
-      if (!this.currentEvent || !this.currentEvent.season) {
+      const currentEvent = find(this.currentEventList, event => Boolean(event.season));
+      if (!currentEvent) {
         return {
           background: 'url(/static/npc/normal/market_background.png)',
           npc: 'url(/static/npc/normal/market_banner_npc.png)',
         };
       }
       return {
-        background: `url(/static/npc/${this.currentEvent.season}/market_background.png)`,
-        npc: `url(/static/npc/${this.currentEvent.season}/market_banner_npc.png)`,
+        background: `url(/static/npc/${currentEvent.season}/market_background.png)`,
+        npc: `url(/static/npc/${currentEvent.season}/market_banner_npc.png)`,
       };
     },
   },
diff --git a/website/client/src/components/shops/quests/index.vue b/website/client/src/components/shops/quests/index.vue
index 49cf3eb4ff..c6607a643c 100644
--- a/website/client/src/components/shops/quests/index.vue
+++ b/website/client/src/components/shops/quests/index.vue
@@ -397,6 +397,7 @@
 </style>
 
 <script>
+import find from 'lodash/find';
 import _filter from 'lodash/filter';
 import _sortBy from 'lodash/sortBy';
 import _throttle from 'lodash/throttle';
@@ -512,7 +513,7 @@ export default {
       user: 'user.data',
       userStats: 'user.data.stats',
       userItems: 'user.data.items',
-      currentEvent: 'worldState.data.currentEvent',
+      currentEventList: 'worldState.data.currentEventList',
     }),
     shop () {
       return shops.getQuestShop(this.user);
@@ -536,15 +537,16 @@ export default {
       return Object.values(this.viewOptions).some(g => g.selected);
     },
     imageURLs () {
-      if (!this.currentEvent || !this.currentEvent.season) {
+      const currentEvent = find(this.currentEventList, event => Boolean(event.season));
+      if (!currentEvent) {
         return {
           background: 'url(/static/npc/normal/quest_shop_background.png)',
           npc: 'url(/static/npc/normal/quest_shop_npc.png)',
         };
       }
       return {
-        background: `url(/static/npc/${this.currentEvent.season}/quest_shop_background.png)`,
-        npc: `url(/static/npc/${this.currentEvent.season}/quest_shop_npc.png)`,
+        background: `url(/static/npc/${currentEvent.season}/quest_shop_background.png)`,
+        npc: `url(/static/npc/${currentEvent.season}/quest_shop_npc.png)`,
       };
     },
   },
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index fbb8339e26..98cfe393e3 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -16,18 +16,18 @@ export const EVENTS = {
     npcImageSuffix: '',
   },
   bundle202302: {
-    start: '2023-02-13T08:00-05:00',
+    start: '2023-02-21T08:00-05:00',
     end: '2023-02-28T23:59-05:00',
   },
   potions202302:{
-    start: '2023-02-21T08:00-05:00',
+    start: '2023-02-13T08:00-05:00',
     end: '2023-02-28T23:59-05:00',
   },
   valentines2023: {
     start: '2023-02-13T08:00-05:00',
     end: '2023-02-17T23:59-05:00',
     season: 'valentines',
-    npcImageSuffix: 'valentines',
+    npcImageSuffix: '_valentines',
   },
   birthday10: {
     start: '2023-01-30T08:00-05:00',
diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js
index d8d4165560..ccb91a5567 100644
--- a/website/common/script/content/index.js
+++ b/website/common/script/content/index.js
@@ -137,7 +137,7 @@ api.cardTypes = {
   valentine: {
     key: 'valentine',
     messageOptions: 4,
-    yearRound: moment().isBefore('2022-02-18T20:00-05:00'),
+    yearRound: moment().isBefore('2023-02-17T23:59-05:00'),
   },
   birthday: {
     key: 'birthday',
diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js
index 2be4768dd1..4662743883 100644
--- a/website/common/script/content/spells.js
+++ b/website/common/script/content/spells.js
@@ -475,7 +475,7 @@ spells.special = {
     target: 'user',
     notes: t('valentineCardNotes'),
     canOwn () {
-      return false;
+      return moment().isBetween('2023-02-13T08:00-05:00', '2023-02-17T23:59-05:00');
     },
     cast (user, target) {
       if (user === target) {