krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sabrecat/cshop' into subs-private

Browse Source
This commit is contained in:
Sabe Jones
2024-04-23 10:52:05 -05:00
parent 2d6555fe0f 8df326bf92
commit 7a50b2d2ff
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
website/common/script/content/constants/schedule.js
View File

@@ -24,7 +24,7 @@ function inListMatcher (list) {
};
}
const ALWAYS_AVAILABLE_CUSTOMIZATIONS = [
export const ALWAYS_AVAILABLE_CUSTOMIZATIONS = [
'animalSkins',
'rainbowSkins',
'rainbowHairColors',
@@ -843,16 +843,23 @@ export function getScheduleMatchingGroup (type, date) {
const checkedDate = date || new Date();
if (cacheDate !== null && (getDay(checkedDate) !== getDay(cacheDate)
|| getMonth(checkedDate) !== getMonth(cacheDate))) {
// Clear cached matchers, since they are old
cacheDate = null;
cachedScheduleMatchers = null;
}
if (!cachedScheduleMatchers) {
// No matchers exist, make new ones
cacheDate = new Date();
cachedScheduleMatchers = {};
assembleScheduledMatchers(checkedDate).forEach(matcher => {
if (!cachedScheduleMatchers[matcher.type]) {
cachedScheduleMatchers[matcher.type] = makeMatcherClass();
}
let end = moment(checkedDate);
end.date(TYPE_SCHEDULE[type]);
if (end.date() <= moment(checkedDate).date()) {
end = moment(end).add(1, 'months');
}
cachedScheduleMatchers[matcher.type].end = end.toDate();
if (matcher.matcher instanceof Function) {
cachedScheduleMatchers[matcher.type].matchers.push(matcher.matcher);
@@ -862,6 +869,7 @@ export function getScheduleMatchingGroup (type, date) {
});
}
if (!cachedScheduleMatchers[type]) {
// No matchers exist for this type
return {
items: [],
match () {