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

Merge branch 'main' of github.com:netalertx/NetAlertX
Some checks failed
✅ Code checks / check-url-paths (push) Has been cancelled
Details
✅ Code checks / lint (push) Has been cancelled
Details
✅ Code checks / docker-tests (push) Has been cancelled
Details
🐳 👩‍💻 docker dev / docker_dev (push) Has been cancelled
Details
📘 Deploy MkDocs / deploy (push) Has been cancelled
Details

Browse Source
This commit is contained in:
jokob-sk
2026-04-06 12:27:59 +10:00
parent 92f1508d33 e1ad574fab
commit 83de79bf94
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/utils/datetime_utils.py
View File

@@ -6,7 +6,7 @@ import datetime
import re import re
import pytz import pytz
from typing import Union, Optional from typing import Union, Optional
from zoneinfo import ZoneInfo from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
import email.utils import email.utils
import conf import conf
# from const import * # from const import *
@@ -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
target_tz = conf.tz if isinstance(conf.tz, datetime.tzinfo) else ZoneInfo(conf.tz) try:
target_tz = conf.tz if isinstance(conf.tz, datetime.tzinfo) else ZoneInfo(conf.tz)
except (ZoneInfoNotFoundError, ValueError, TypeError):
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