From 1887d5d2b732460aaabbc6e990d7d9e253cc5eda Mon Sep 17 00:00:00 2001 From: sam detweiler Date: Wed, 27 Aug 2025 15:52:18 -0500 Subject: [PATCH 1/3] fix regression of shouldEventBeExcluded #3841 --- CHANGELOG.md | 1 + modules/default/calendar/calendarfetcherutils.js | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27d004500b..64fa59448f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/modules/default/calendar/calendarfetcherutils.js b/modules/default/calendar/calendarfetcherutils.js index 880e68b5cf..eb991361c1 100644 --- a/modules/default/calendar/calendarfetcherutils.js +++ b/modules/default/calendar/calendarfetcherutils.js @@ -16,7 +16,7 @@ const CalendarFetcherUtils = { * until: the date until the event should be excluded. */ shouldEventBeExcluded (config, title) { - let filter = { + let result = { // change name excluded: false, until: null }; @@ -52,17 +52,20 @@ const CalendarFetcherUtils = { } else { filter = filter.toLowerCase(); } - + Log.debug("should be excluded ", testTitle, filter, useRegex, regexFlags); if (CalendarFetcherUtils.titleFilterApplies(testTitle, filter, useRegex, regexFlags)) { if (until) { - filter.until = until; + result.until = until; // change assignment } else { - filter.excluded = true; + Log.debug("event should be excluded = true,", testTitle); + result.excluded = true; // change assignment } + Log.debug("filter applies result =", result); break; } } - return filter; + Log.debug("filter applies returning =", result); + return result; // return outer }, /** From 1fc7e390d9e4283757ce7b99038a549e133a474f Mon Sep 17 00:00:00 2001 From: sam detweiler Date: Thu, 28 Aug 2025 08:41:40 -0500 Subject: [PATCH 2/3] remove unneccessary comments --- modules/default/calendar/calendarfetcherutils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/default/calendar/calendarfetcherutils.js b/modules/default/calendar/calendarfetcherutils.js index eb991361c1..6ea7c3a3b1 100644 --- a/modules/default/calendar/calendarfetcherutils.js +++ b/modules/default/calendar/calendarfetcherutils.js @@ -16,7 +16,7 @@ const CalendarFetcherUtils = { * until: the date until the event should be excluded. */ shouldEventBeExcluded (config, title) { - let result = { // change name + let result = { excluded: false, until: null }; @@ -55,7 +55,7 @@ const CalendarFetcherUtils = { Log.debug("should be excluded ", testTitle, filter, useRegex, regexFlags); if (CalendarFetcherUtils.titleFilterApplies(testTitle, filter, useRegex, regexFlags)) { if (until) { - result.until = until; // change assignment + result.until = until; } else { Log.debug("event should be excluded = true,", testTitle); result.excluded = true; // change assignment From 480019cded644c18b1c2eefc7d9e900f7bc8983c Mon Sep 17 00:00:00 2001 From: sam detweiler Date: Thu, 28 Aug 2025 09:16:00 -0500 Subject: [PATCH 3/3] remove log.debug statements --- modules/default/calendar/calendarfetcherutils.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/default/calendar/calendarfetcherutils.js b/modules/default/calendar/calendarfetcherutils.js index 6ea7c3a3b1..0176acd22e 100644 --- a/modules/default/calendar/calendarfetcherutils.js +++ b/modules/default/calendar/calendarfetcherutils.js @@ -52,19 +52,15 @@ const CalendarFetcherUtils = { } else { filter = filter.toLowerCase(); } - Log.debug("should be excluded ", testTitle, filter, useRegex, regexFlags); if (CalendarFetcherUtils.titleFilterApplies(testTitle, filter, useRegex, regexFlags)) { if (until) { result.until = until; } else { - Log.debug("event should be excluded = true,", testTitle); result.excluded = true; // change assignment } - Log.debug("filter applies result =", result); break; } } - Log.debug("filter applies returning =", result); return result; // return outer },