vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2026-04-06 02:01:37 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix timezone handling in format_date_iso: ensure fallback to UTC for invalid configurations

Browse Source
This commit is contained in:
Jokob @NetAlertX
2026-04-05 22:48:44 +00:00
parent 36e606e1a1
commit 2b3d9549dc
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/utils/datetime_utils.py
View File

@@ -209,10 +209,13 @@ def format_date_iso(date_val: str) -> Optional[str]:
# 2. If it has no timezone, assume it's UTC (our DB storage format) # 2. If it has no timezone, assume it's UTC (our DB storage format)
# then CONVERT to user's configured timezone # then CONVERT to user's configured timezone
if dt.tzinfo is None: if dt.tzinfo is None:
# Mark as UTC first # Mark as UTC first — critical: localize() would label without converting
dt = dt.replace(tzinfo=datetime.UTC) dt = dt.replace(tzinfo=datetime.UTC)
# Convert to user's timezone # Resolve target timezone; fall back to UTC if conf.tz is missing/invalid
try:
target_tz = conf.tz if isinstance(conf.tz, datetime.tzinfo) else ZoneInfo(conf.tz) target_tz = conf.tz if isinstance(conf.tz, datetime.tzinfo) else ZoneInfo(conf.tz)
except Exception:
target_tz = datetime.UTC
dt = dt.astimezone(target_tz) dt = dt.astimezone(target_tz)
# 3. Return the string. .isoformat() will now include the +11:00 or +10:00 # 3. Return the string. .isoformat() will now include the +11:00 or +10:00