Avoid "pq: time zone displacement out of range" errors
This commit is contained in:
parent
aadbd5adf3
commit
30d4b8986a
2 changed files with 27 additions and 0 deletions
|
@ -6,6 +6,7 @@ package date // import "miniflux.app/reader/date"
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"math"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
@ -315,11 +316,13 @@ func Parse(rawInput string) (t time.Time, err error) {
|
||||||
switch layout {
|
switch layout {
|
||||||
case time.RFC822, time.RFC850, time.RFC1123:
|
case time.RFC822, time.RFC850, time.RFC1123:
|
||||||
if t, err = parseLocalTimeDates(layout, processedInput); err == nil {
|
if t, err = parseLocalTimeDates(layout, processedInput); err == nil {
|
||||||
|
t = checkTimezoneRange(t)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if t, err = time.Parse(layout, processedInput); err == nil {
|
if t, err = time.Parse(layout, processedInput); err == nil {
|
||||||
|
t = checkTimezoneRange(t)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -347,3 +350,14 @@ func parseLocalTimeDates(layout, ds string) (t time.Time, err error) {
|
||||||
|
|
||||||
return time.ParseInLocation(layout, ds, loc)
|
return time.ParseInLocation(layout, ds, loc)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://en.wikipedia.org/wiki/List_of_UTC_offsets
|
||||||
|
// Offset range: westernmost (−12:00) to the easternmost (+14:00)
|
||||||
|
// Avoid "pq: time zone displacement out of range" errors
|
||||||
|
func checkTimezoneRange(t time.Time) time.Time {
|
||||||
|
_, offset := t.Zone()
|
||||||
|
if math.Abs(float64(offset)) > 14*60*60 {
|
||||||
|
t = t.UTC()
|
||||||
|
}
|
||||||
|
return t
|
||||||
|
}
|
||||||
|
|
|
@ -187,3 +187,16 @@ func TestParseWeirdDateFormat(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestParseDateWithTimezoneOutOfRange(t *testing.T) {
|
||||||
|
date, err := Parse("2023-05-29 00:00:00-23:00")
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf(`Unable to parse date: %v`, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, offset := date.Zone()
|
||||||
|
if offset != 0 {
|
||||||
|
t.Errorf(`The offset should be reinitialized to 0 instead of %v because it's out of range`, offset)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue