From 525f339c80d6e8662d5a981bcecd3910dbe5987a Mon Sep 17 00:00:00 2001 From: Ben Morrison Date: Thu, 25 Jun 2020 00:01:10 -0400 Subject: dealing with time is hard --- registry/fetch.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/registry/fetch.go b/registry/fetch.go index 630d8f6..07578b8 100644 --- a/registry/fetch.go +++ b/registry/fetch.go @@ -186,11 +186,23 @@ func ParseUserTwtxt(twtxt []byte, nickname, urlKey string) (TimeMap, error) { return nil, fmt.Errorf("improperly formatted data in twtxt file") } + noSeconds := false + count := strings.Count(columns[0], ":") + + if strings.Contains(columns[0], "Z") { + split := strings.Split(columns[0], "Z") + if len(split[1]) > 0 && count == 2 { + noSeconds = true + } + } else if count == 2 { + noSeconds = true + } + var thetime time.Time var err error if strings.Contains(columns[0], ".") { thetime, err = time.Parse(time.RFC3339Nano, columns[0]) - } else if strings.Count(columns[0], ":") == 2 { + } else if noSeconds { // this means they're probably not including seconds into the datetime thetime, err = time.Parse(rfc3339WithoutSeconds, columns[0]) } else { -- cgit 1.4.1-2-gfad0