From 391a9bd91be419778ccc551adfc377809bbc345e Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 15 Dec 2021 16:20:43 -0600
Subject: [PATCH] feat(promo): G1G1 2021 Also refactors a number of places on
 web client to start using event list from world state instead of singular
 currentEvent

---
 .../src/components/header/banners/gemsPromo.vue |  6 +++++-
 .../src/components/header/banners/giftPromo.vue |  6 +++++-
 .../src/components/payments/buyGemsModal.vue    |  6 +++++-
 .../src/components/payments/selectUserModal.vue |  6 +++++-
 .../client/src/components/settings/index.vue    |  6 +++++-
 .../src/components/snackbars/notifications.vue  |  6 +++++-
 .../common/script/content/constants/events.js   | 17 +++++++++++++++--
 website/server/libs/payments/subscriptions.js   |  7 ++++---
 website/server/libs/worldState.js               |  2 +-
 9 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/website/client/src/components/header/banners/gemsPromo.vue b/website/client/src/components/header/banners/gemsPromo.vue
index a6a903dae2..20ac1ca40a 100644
--- a/website/client/src/components/header/banners/gemsPromo.vue
+++ b/website/client/src/components/header/banners/gemsPromo.vue
@@ -89,6 +89,7 @@
 </style>
 
 <script>
+import find from 'lodash/find';
 import { mapState } from '@/libs/store';
 import BaseBanner from './base';
 
@@ -98,8 +99,11 @@ export default {
   },
   computed: {
     ...mapState({
-      currentEvent: 'worldState.data.currentEvent',
+      currentEventList: 'worldState.data.currentEventList',
     }),
+    currentEvent () {
+      return find(this.currentEventList, event => Boolean(event.gemsPromo));
+    },
     eventName () {
       return this.currentEvent && this.currentEvent.event;
     },
diff --git a/website/client/src/components/header/banners/giftPromo.vue b/website/client/src/components/header/banners/giftPromo.vue
index 43c49763ac..f8eaf7281f 100644
--- a/website/client/src/components/header/banners/giftPromo.vue
+++ b/website/client/src/components/header/banners/giftPromo.vue
@@ -63,6 +63,7 @@
 </style>
 
 <script>
+import find from 'lodash/find';
 import { mapState } from '@/libs/store';
 import BaseBanner from './base';
 
@@ -74,8 +75,11 @@ export default {
   },
   computed: {
     ...mapState({
-      currentEvent: 'worldState.data.currentEvent',
+      currentEventList: 'worldState.data.currentEventList',
     }),
+    currentEvent () {
+      return find(this.currentEventList, event => Boolean(event.promo));
+    },
     eventName () {
       return this.currentEvent && this.currentEvent.event;
     },
diff --git a/website/client/src/components/payments/buyGemsModal.vue b/website/client/src/components/payments/buyGemsModal.vue
index 10e12d285b..701ae8026a 100644
--- a/website/client/src/components/payments/buyGemsModal.vue
+++ b/website/client/src/components/payments/buyGemsModal.vue
@@ -364,6 +364,7 @@
 </style>
 
 <script>
+import find from 'lodash/find';
 import moment from 'moment';
 import { mapState } from '@/libs/store';
 import markdown from '@/directives/markdown';
@@ -408,8 +409,11 @@ export default {
     ...mapState({
       user: 'user.data',
       originalGemsBlocks: 'content.gems',
-      currentEvent: 'worldState.data.currentEvent',
+      currentEventList: 'worldState.data.currentEventList',
     }),
+    currentEvent () {
+      return find(this.currentEventList, event => Boolean(event.gemsPromo) || Boolean(event.promo));
+    },
     eventName () {
       return this.currentEvent && this.currentEvent.event;
     },
diff --git a/website/client/src/components/payments/selectUserModal.vue b/website/client/src/components/payments/selectUserModal.vue
index bd712db315..16a624dd0a 100644
--- a/website/client/src/components/payments/selectUserModal.vue
+++ b/website/client/src/components/payments/selectUserModal.vue
@@ -210,6 +210,7 @@
 
 <script>
 import debounce from 'lodash/debounce';
+import find from 'lodash/find';
 import isUUID from 'validator/lib/isUUID';
 import { mapState } from '@/libs/store';
 import closeIcon from '@/assets/svg/close.svg';
@@ -227,8 +228,11 @@ export default {
   },
   computed: {
     ...mapState({
-      currentEvent: 'worldState.data.currentEvent',
+      currentEventList: 'worldState.data.currentEventList',
     }),
+    currentEvent () {
+      return find(this.currentEventList, event => Boolean(event.gemsPromo) || Boolean(event.promo));
+    },
     searchCannotSubmit () {
       if (this.userSearchTerm.length < 1) return true;
       return typeof this.foundUser._id === 'undefined';
diff --git a/website/client/src/components/settings/index.vue b/website/client/src/components/settings/index.vue
index b0f9298812..8545e97558 100644
--- a/website/client/src/components/settings/index.vue
+++ b/website/client/src/components/settings/index.vue
@@ -111,6 +111,7 @@
 </style>
 
 <script>
+import find from 'lodash/find';
 import { mapState } from '@/libs/store';
 import SecondaryMenu from '@/components/secondaryMenu';
 import gifts from '@/assets/svg/gifts-vertical.svg';
@@ -128,8 +129,11 @@ export default {
   },
   computed: {
     ...mapState({
-      currentEvent: 'worldState.data.currentEvent',
+      currentEventList: 'worldState.data.currentEventList',
     }),
+    currentEvent () {
+      return find(this.currentEventList, event => Boolean(event.promo));
+    },
     promo () {
       if (!this.currentEvent || !this.currentEvent.promo) return 'none';
       return this.currentEvent.promo;
diff --git a/website/client/src/components/snackbars/notifications.vue b/website/client/src/components/snackbars/notifications.vue
index ea6f09fa09..40d2ceca0f 100644
--- a/website/client/src/components/snackbars/notifications.vue
+++ b/website/client/src/components/snackbars/notifications.vue
@@ -66,6 +66,7 @@
 
 <script>
 import debounce from 'lodash/debounce';
+import find from 'lodash/find';
 
 import { mapState } from '@/libs/store';
 import notification from './notification';
@@ -111,8 +112,11 @@ export default {
     ...mapState({
       notificationStore: 'notificationStore',
       userSleeping: 'user.data.preferences.sleep',
-      currentEvent: 'worldState.data.currentEvent',
+      currentEventList: 'worldState.data.currentEventList',
     }),
+    currentEvent () {
+      return find(this.currentEventList, event => Boolean(event.gemsPromo) || Boolean(event.promo));
+    },
     isEventActive () {
       return Boolean(this.currentEvent?.event);
     },
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index c72df004dd..247226bb64 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -10,8 +10,21 @@ const gemsPromo = {
 
 export const EVENTS = {
   noCurrentEvent: {
-    start: '2021-11-30T20:00-04:00',
-    end: '2021-12-31T20:00-04:00',
+    start: '2022-01-06T20:00-05:00',
+    end: '2022-02-28T20:00-05:00',
+    season: 'normal',
+    npcImageSuffix: '',
+  },
+  winter2022Promo: {
+    start: '2021-12-16T08:00-05:00',
+    end: '2022-01-06T20:00-05:00',
+    promo: 'g1g1',
+    season: 'normal',
+    npcImageSuffix: '',
+  },
+  prePromoNoEvent: {
+    start: '2021-11-28T20:00-05:00',
+    end: '2021-12-16T08:00-05:00',
     season: 'normal',
     npcImageSuffix: '',
   },
diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
index a2f9ec768e..d4016349fe 100644
--- a/website/server/libs/payments/subscriptions.js
+++ b/website/server/libs/payments/subscriptions.js
@@ -18,7 +18,7 @@ import {
 import shared from '../../../common';
 import { sendNotification as sendPushNotification } from '../pushNotifications'; // eslint-disable-line import/no-cycle
 import calculateSubscriptionTerminationDate from './calculateSubscriptionTerminationDate';
-import { getCurrentEvent } from '../worldState'; // eslint-disable-line import/no-cycle
+import { getCurrentEventList } from '../worldState'; // eslint-disable-line import/no-cycle
 
 // @TODO: Abstract to shared/constant
 const JOINED_GROUP_PLAN = 'joined group plan';
@@ -245,8 +245,9 @@ async function createSubscription (data) {
 
     // Only send push notifications if sending to a user other than yourself
     if (data.gift.member._id !== data.user._id) {
-      const currentEvent = getCurrentEvent();
-      if (currentEvent && currentEvent.promo && currentEvent.promo === 'g1g1') {
+      const currentEventList = getCurrentEventList();
+      const currentEvent = _.find(currentEventList, event => Boolean(event.promo));
+      if (currentEvent && currentEvent.promo === 'g1g1') {
         const promoData = {
           user: data.user,
           gift: {
diff --git a/website/server/libs/worldState.js b/website/server/libs/worldState.js
index 62d8a89226..257ab1879f 100644
--- a/website/server/libs/worldState.js
+++ b/website/server/libs/worldState.js
@@ -23,7 +23,7 @@ export function getCurrentEvent () {
 
     const now = moment();
 
-    return now.isBetween(event.start, event.end) && Boolean(event.npcImageSuffix);
+    return now.isBetween(event.start, event.end); // && Boolean(event.npcImageSuffix);
   });
 
   if (!currEvtKey) return null;