diff --git a/sync.py b/sync.py
index 0e7e12b..4d4810c 100644
--- a/sync.py
+++ b/sync.py
@@ -452,7 +452,7 @@ def get_weekly_events(conn, calendar_label, searchwords, blacklistwords=None):
if days_until_saturday == 0:
days_until_saturday = 7
week_start = today + timedelta(days=days_until_saturday)
- week_end = week_start + timedelta(days=6, hours=23, minutes=59, seconds=59)
+ week_end = week_start + timedelta(days=13, hours=23, minutes=59, seconds=59)
week_start_naive = week_start.replace(tzinfo=None)
week_end_naive = week_end.replace(tzinfo=None)
@@ -546,7 +546,7 @@ def send_weekly_notification(events, searchwords, week_start, week_end, blacklis
event_date = event["start_at"].replace(tzinfo=timezone.utc).astimezone(tz).strftime("%a, %d.%m.")
subject = f"Vorab-Info: Termin am {event_date}"
else:
- subject = f"Vorab-Info: {count} Termine naechste Woche"
+ subject = f"Vorab-Info: {count} Termine in 2 Wochen"
event_rows = ""
for event in events:
@@ -570,7 +570,7 @@ def send_weekly_notification(events, searchwords, week_start, week_end, blacklis
- Vorab-Info: Naechste Woche
+ Vorab-Info: Naechste 2 Wochen
Vom {start_str} bis {end_str} stehen folgende Termine an:
{event_rows}
@@ -612,7 +612,9 @@ def check_and_send_weekly_notification():
if should_send_weekly(conn):
searchwords = parse_weekly_searchwords()
blacklistwords = parse_weekly_blacklistwords()
+ log.info("Wochenbenachrichtigung: Suchbegriffe=%s, Blacklist=%s", searchwords, blacklistwords)
events, week_start, week_end = get_weekly_events(conn, CALENDAR_LABEL, searchwords, blacklistwords)
+ log.info("Wochenbenachrichtigung: %d Events nach Filterung", len(events))
if events:
send_weekly_notification(events, searchwords, week_start, week_end, blacklistwords)
log_weekly_notification(conn, len(events))