oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-01 17:38:37 +00:00
Code Wiki Activity

fix: json encoding is failing with dates at OAD and negative timezone offset

Browse source
This commit is contained in:
Frédéric Guillot 2025-01-30 17:28:50 -08:00
parent 7275bc808a
commit c951ac2876
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/timezone/timezone.go
View file

@ -12,10 +12,14 @@ func Convert(tz string, t time.Time) time.Time {
userTimezone := getLocation(tz)
if t.Location().String() == "" {
if t.Before(time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)) {
return time.Date(0, time.January, 1, 0, 0, 0, 0, userTimezone)
}
// In this case, the provided date is already converted to the user timezone by Postgres,
// but the timezone information is not set in the time struct.
// We cannot use time.In() because the date will be converted a second time.
t = time.Date(
return time.Date(
t.Year(),
t.Month(),
t.Day(),
@ -26,7 +30,7 @@ func Convert(tz string, t time.Time) time.Time {
userTimezone,
)
} else if t.Location() != userTimezone {
t = t.In(userTimezone)
return t.In(userTimezone)
}
return t