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

Add handling and tests for new background schedule

Browse Source
This commit is contained in:
Phillip Thelen
2024-04-30 13:13:09 +02:00
parent 4c2cdfe5b8
commit 9dabe79d5e
2 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,12 +2,24 @@ import moment from 'moment';
import SEASONAL_SETS from './seasonalSets';
import { getRepeatingEvents } from './events';
function isAfterNewSchedule (year, month) {
if (year >= 2025) {
return true;
} if (year === 2024) {
return month >= 6;
}
return false;
}
function backgroundMatcher (month1, month2, oddYear) {
return function call (key) {
return function call (key, date) {
const keyLength = key.length;
const month = parseInt(key.substring(keyLength - 6, keyLength - 4), 10);
return (month === month1 || month === month2)
&& parseInt(key.substring(keyLength - 2, keyLength), 10) % 2 === (oddYear ? 1 : 0);
const year = parseInt(key.substring(keyLength - 4, keyLength), 10);
if (isAfterNewSchedule(year, month)) {
return month === month1 && date.getFullYear() >= year && (date.getMonth() + 1) >= month;
}
return (month === month1 || month === month2) && year % 2 === (oddYear ? 1 : 0);
};
}
@@ -832,21 +844,22 @@ export function assembleScheduledMatchers (date) {
let cachedScheduleMatchers = null;
let cacheDate = null;
function makeMatcherClass () {
function makeMatcherClass (date) {
return {
matchers: [],
end: new Date(),
items: [],
matchingDate: date,
match (key) {
if (this.matchers.length === 0) {
if (this.items.length > 0) {
return inListMatcher(this.items)(key);
return inListMatcher(this.items)(key, this.matchingDate);
}
} else {
if (this.items.length > 0 && !inListMatcher(this.items)(key)) {
if (this.items.length > 0 && !inListMatcher(this.items)(key, this.matchingDate)) {
return false;
}
return this.matchers.every(m => m(key));
return this.matchers.every(m => m(key, this.matchingDate));
}
return false;
},
@@ -878,7 +891,7 @@ export function getAllScheduleMatchingGroups (date) {
cachedScheduleMatchers = {};
assembleScheduledMatchers(checkedDate).forEach(matcher => {
if (!cachedScheduleMatchers[matcher.type]) {
cachedScheduleMatchers[matcher.type] = makeMatcherClass();
cachedScheduleMatchers[matcher.type] = makeMatcherClass(date);
}
cachedScheduleMatchers[matcher.type].end = makeEndDate(checkedDate, matcher);
if (matcher.matcher instanceof Function) {