From 196ee61fd9a1f95c07b89a17404028b8797cd0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Fra=C3=9F?= Date: Tue, 13 May 2025 17:19:51 +0000 Subject: [PATCH] [fix] timezone-Mist --- source/sources/ical_feed.ts | 16 ++-------------- source/targets/email.ts | 12 ++++++++++-- source/targets/telegram_bot.ts | 8 +++++++- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/source/sources/ical_feed.ts b/source/sources/ical_feed.ts index 273b81d..a3128f8 100644 --- a/source/sources/ical_feed.ts +++ b/source/sources/ical_feed.ts @@ -84,25 +84,13 @@ namespace _munin.sources.ical_feed ) .map( vevent => { - /** - * @todo würg! - */ - const timezone_shift : int = lib_plankton.pit.timezone_shift_ce( - lib_plankton.pit.from_datetime( - { - "timezone_shift": 0, - "date": vevent.dtstart.value.date, - "time": vevent.dtstart.value.time, - } - ) - ); const begin : lib_plankton.pit.type_datetime = { - "timezone_shift": timezone_shift, + "timezone_shift": 0, "date": vevent.dtstart.value.date, "time": vevent.dtstart.value.time, }; const end : lib_plankton.pit.type_datetime = { - "timezone_shift": timezone_shift, + "timezone_shift": 0, "date": vevent.dtend.value.date, "time": vevent.dtend.value.time, }; diff --git a/source/targets/email.ts b/source/targets/email.ts index 5decc69..f291acf 100644 --- a/source/targets/email.ts +++ b/source/targets/email.ts @@ -58,7 +58,9 @@ namespace _munin.targets.email "[{{head}}] {{date}} : {{macro_tags}}{{title}}", { "head": labels.head, - "date": lib_plankton.pit.date_format(event.begin.date), + "date": lib_plankton.pit.date_format( + event.begin.date + ), "macro_tags": ( (event.tags === null) ? @@ -82,7 +84,13 @@ namespace _munin.targets.email ), "title_value": event.title, "time_label": labels.time.toUpperCase(), - "time_value": lib_plankton.pit.timespan_format(event.begin, event.end), + "time_value": lib_plankton.pit.timespan_format( + event.begin, + event.end, + { + "adjust_to_ce": true, + } + ), "macro_location": ( (event.location === null) ? diff --git a/source/targets/telegram_bot.ts b/source/targets/telegram_bot.ts index 2a68ee5..8ab53d4 100644 --- a/source/targets/telegram_bot.ts +++ b/source/targets/telegram_bot.ts @@ -55,7 +55,13 @@ namespace _munin.targets.telegram_bot "title_label": labels.title.toUpperCase(), "title_value": event.title, "time_label": labels.time.toUpperCase(), - "time_value": lib_plankton.pit.timespan_format(event.begin, event.end), + "time_value": lib_plankton.pit.timespan_format( + event.begin, + event.end, + { + "adjust_to_ce": true, + } + ), "macro_location": ( (event.location === null) ?