Skip to content

Fix timezone handling in format_date_iso: ensure fallback to UTC for … #1590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jokob-sk merged 2 commits into from
Apr 5, 2026
+7 −4
Merged

Fix timezone handling in format_date_iso: ensure fallback to UTC for … #1590

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b3d954
Fix timezone handling in format_date_iso: ensure fallback to UTC for …
jokob-sk Apr 5, 2026
bda8ca3
Fix timezone resolution in format_date_iso: handle specific exception…
jokob-sk Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions server/utils/datetime_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import re
import pytz
from typing import Union, Optional
from zoneinfo import ZoneInfo
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
import email.utils
import conf
# from const import *
Expand Down Expand Up @@ -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)
# then CONVERT to user's configured timezone
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)
# Convert to user's timezone
target_tz = conf.tz if isinstance(conf.tz, datetime.tzinfo) else ZoneInfo(conf.tz)
# 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)
except (ZoneInfoNotFoundError, ValueError, TypeError):
target_tz = datetime.UTC
dt = dt.astimezone(target_tz)

# 3. Return the string. .isoformat() will now include the +11:00 or +10:00
Expand Down
Loading