krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Phillip Thelen
2024-03-06 12:02:38 +01:00
committed by Sabe Jones
parent a50c0eb1e7
commit c18e06f071
9 changed files with 49 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -800,6 +800,29 @@ export function assembleScheduledMatchers (date) {
let cachedScheduleMatchers = null;
function makeMatcherClass () {
return {
matchers: [],
items: [],
match (key) {
if (this.matchers.length === 0) {
if (this.items.length > 0) {
return inListMatcher(this.items)(key);
}
} else {
if (this.items.length > 0 && !inListMatcher(this.items)(key)) {
return false;
}
return this.matchers.every(m => m(key));
}
return false;
},
getEndDate () {
return new Date();
},
};
}
export function getScheduleMatchingGroup (type, date) {
const checkedDate = date || new Date();
if (cacheDate !== null && (getDay(checkedDate) !== getDay(cacheDate)
@@ -812,23 +835,7 @@ export function getScheduleMatchingGroup (type, date) {
const scheduleMatchers = {};
assembleScheduledMatchers(checkedDate).forEach(matcher => {
if (!scheduleMatchers[matcher.type]) {
scheduleMatchers[matcher.type] = {
matchers: [],
items: [],
match (key) {
if (this.matchers.length === 0) {
if (this.items.length > 0) {
return inListMatcher(this.items)(key);
}
} else {
if (this.items.length > 0 && !inListMatcher(this.items)(key)) {
return false;
}
return this.matchers.every(m => m(key));
}
return false;
},
};
scheduleMatchers[matcher.type] = makeMatcherClass();
}
if (matcher.matcher instanceof Function) {
cachedScheduleMatchers[matcher.type].matchers.push(matcher.matcher);