From b3e3d0cb63761828485376f221d8b38e1245db37 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 2 Apr 2021 15:50:20 -0500 Subject: [PATCH] fix(fix): hide future mystery sets in Time Travel shop ...not in the gear tree --- website/common/script/content/mystery-sets.js | 2 +- website/common/script/content/time-travelers.js | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/website/common/script/content/mystery-sets.js b/website/common/script/content/mystery-sets.js index 61d8e0c4f0..3e3378e610 100644 --- a/website/common/script/content/mystery-sets.js +++ b/website/common/script/content/mystery-sets.js @@ -29,7 +29,7 @@ const FIRST_MYSTERY_SET = moment('2014-02-01'); for ( let mysteryMonth = FIRST_MYSTERY_SET; - moment(mysteryMonth).startOf('month').isSameOrBefore(moment()); + moment(mysteryMonth).startOf('month').isSameOrBefore(moment().add(1, 'months')); mysteryMonth = moment(mysteryMonth).add(1, 'months') ) { const setKey = moment(mysteryMonth).format('YYYYMM'); diff --git a/website/common/script/content/time-travelers.js b/website/common/script/content/time-travelers.js index 49f0aa58e2..54716ceccb 100644 --- a/website/common/script/content/time-travelers.js +++ b/website/common/script/content/time-travelers.js @@ -3,6 +3,7 @@ import filter from 'lodash/filter'; import keys from 'lodash/keys'; import union from 'lodash/union'; import reduce from 'lodash/reduce'; +import moment from 'moment'; import mysterySets from './mystery-sets'; import gear from './gear'; @@ -24,7 +25,11 @@ const timeTravelerStore = user => { ownedKeys = keys(typeof owned.toObject === 'function' ? owned.toObject() : owned); ownedKeys = union(ownedKeys, unopenedGifts); return reduce(mystery, (m, v, k) => { - if (k === 'wondercon' || ownedKeys.indexOf(v.items[0].key) !== -1) { + if ( + k === 'wondercon' + || ownedKeys.indexOf(v.items[0].key) !== -1 + || (moment(k).isAfter() && moment(k).isBefore('3000-01-01')) + ) { return m; } m[k] = v;