Skip to content

fix regression of shouldEventBeExcluded #3841 #3864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sdetweil wants to merge 3 commits into from
Closed

fix regression of shouldEventBeExcluded #3841 #3864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1887d5d
fix regression of shouldEventBeExcluded #3841
sdetweil Aug 27, 2025
1fc7e39
remove unneccessary comments
sdetweil Aug 28, 2025
480019c
remove log.debug statements
sdetweil Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Thanks to: @dathbe.
- [calendar] Fixed broken unittest that only broke on the 1st of July and 1st of january (#3830)
- [clock] Fixed missing icons when no other modules with icons is loaded (#3834)
- [weather] Fixed handling of empty values in weathergov providers handling of precipitationAmount (#3859)
- [calendar] Fixed regression of calendarfetcherutils.shouldEventBeExcluded (#3841)

## [2.32.0] - 2025-07-01

Expand Down
9 changes: 4 additions & 5 deletions modules/default/calendar/calendarfetcherutils.js
View file
Open in desktop
Comment thread
sdetweil marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const CalendarFetcherUtils = {
* until: the date until the event should be excluded.
*/
shouldEventBeExcluded (config, title) {
let filter = {
let result = {
excluded: false,
until: null
};
Expand Down Expand Up @@ -52,17 +52,16 @@ const CalendarFetcherUtils = {
} else {
filter = filter.toLowerCase();
}

if (CalendarFetcherUtils.titleFilterApplies(testTitle, filter, useRegex, regexFlags)) {
if (until) {
filter.until = until;
result.until = until;
} else {
filter.excluded = true;
result.excluded = true; // change assignment
Comment thread
sdetweil marked this conversation as resolved.
}
break;
}
}
return filter;
return result; // return outer
Comment thread
sdetweil marked this conversation as resolved.
},

/**
Expand Down