Merge pull request #92 from divolgin/timestamps

divolgin · web-flow · commit 38593795093e · 2020-01-20T07:47:07.000-08:00
Support RFC3339 timestamps
diff --git a/pkg/util/parseTime.go b/pkg/util/parseTime.go
@@ -6,9 +6,11 @@ import (
 )
 
 func ParseTime(ts string) (time.Time, error) {
-	ts = strings.TrimSuffix(ts, "+0000 (UTC)")
-
-	createdAt, err := time.Parse("Mon Jan 02 2006 15:04:05 MST", ts)
+	parsed, err := time.Parse(time.RFC3339, ts)
+	if err == nil {
+		return parsed, nil
+	}
 
-	return createdAt, err
+	ts = strings.TrimSuffix(ts, "+0000 (UTC)")
+	return time.Parse("Mon Jan 02 2006 15:04:05 MST", ts)
 }

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,11 @@ import (`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`func ParseTime(ts string) (time.Time, error) {`
`9`		`- ts = strings.TrimSuffix(ts, "+0000 (UTC)")`
`10`		`-`
`11`		`- createdAt, err := time.Parse("Mon Jan 02 2006 15:04:05 MST", ts)`
	`9`	`+ parsed, err := time.Parse(time.RFC3339, ts)`
	`10`	`+ if err == nil {`
	`11`	`+ return parsed, nil`
	`12`	`+ }`
`12`	`13`
`13`		`- return createdAt, err`
	`14`	`+ ts = strings.TrimSuffix(ts, "+0000 (UTC)")`
	`15`	`+ return time.Parse("Mon Jan 02 2006 15:04:05 MST", ts)`
`14`	`16`	`}`