Implement timeutil.ParseDateTimeGraceful()

Author: sonjek

modules/timeutil/datetime.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"html"
 	"html/template"
+	"strconv"
 	"time"
 )
 
@@ -58,3 +59,29 @@ func DateTime(format string, datetime any) template.HTML {
 	}
 	panic(fmt.Sprintf("Unsupported format %s", format))
 }
+
+func ParseDateTimeGraceful(datetime any) (time.Time, error) {
+	switch val := datetime.(type) {
+	case string:
+		if timestamp, err := strconv.ParseInt(val, 10, 64); err == nil {
+			return ParseDateTimeGraceful(timestamp)
+		} else {
+			t, err := time.Parse(time.RFC3339, val)
+			if err != nil {
+				return time.Time{}, err
+			}
+			return t, nil
+		}
+	case int64:
+		switch {
+		case val > 946684800000000: // 2999-12-31 00:00:00 in milliseconds
+			return time.UnixMicro(val), nil
+		case val > 946645200000: // 2000-01-01 00:00:00 in milliseconds
+			return time.UnixMilli(val), nil
+		default:
+			return time.Unix(val, 0), nil
+		}
+	default:
+		return time.Time{}, fmt.Errorf("unsupported data type: %T", datetime)
+	}
+}

modules/timeutil/datetime_test.go

@@ -43,3 +43,75 @@ func TestDateTime(t *testing.T) {
 	actual = DateTime("full", refTimeStamp)
 	assert.EqualValues(t, `<relative-time format="datetime" weekday="" year="numeric" month="short" day="numeric" hour="numeric" minute="numeric" second="numeric" datetime="2017-12-31T19:00:00-05:00">2017-12-31 19:00:00 -05:00</relative-time>`, actual)
 }
+
+func TestParseDateTimeGraceful(t *testing.T) {
+	testData := []struct {
+		value    any
+		expected any
+		isFail   bool
+	}{
+		{
+			value:    "2006-01-02T15:04:05Z",
+			expected: 1136214245,
+		},
+		{
+			value:    "2006-01-02T15:04:05.999Z",
+			expected: 1136214245,
+		},
+		{
+			value:    "2006-01-02T15:04:05-07:00",
+			expected: 1136239445,
+		},
+		{
+			value:    "2006-01-02T15:04:05.999-07:00",
+			expected: 1136239445,
+		},
+		{
+			value:    1136214245,
+			expected: 1136214245,
+		},
+		{
+			value:    "1136214245",
+			expected: 1136214245,
+		},
+		{
+			value:    1622040867000,
+			expected: 1622040867,
+		},
+		{
+			value:    "1622040867000",
+			expected: 1622040867,
+		},
+		{
+			value:    "1622040867000",
+			expected: 1622040867,
+		},
+		{
+			value:    0,
+			expected: -62135596800,
+			isFail:   true,
+		},
+		{
+			value:    nil,
+			expected: -62135596800,
+			isFail:   true,
+		},
+		{
+			value:    "",
+			expected: -62135596800,
+			isFail:   true,
+		},
+	}
+
+	for _, testCase := range testData {
+		actual, err := ParseDateTimeGraceful(testCase.value)
+
+		if testCase.isFail == true {
+			assert.NotNil(t, err)
+		} else {
+			assert.Nil(t, err)
+		}
+
+		assert.EqualValues(t, testCase.expected, actual.Unix())
+	}
+}

routers/api/v1/notify/user.go

@@ -5,12 +5,11 @@ package notify
 
 import (
 	"net/http"
-	"strconv"
-	"time"
 
 	activities_model "code.gitea.io/gitea/models/activities"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/services/convert"
 )
 
@@ -131,23 +130,12 @@ func ReadNotifications(ctx *context.APIContext) {
 	lastRead := int64(0)
 	qLastRead := ctx.FormTrim("last_read_at")
 	if len(qLastRead) > 0 {
-		var tmpLastRead time.Time
-
-		// If qLastRead consists solely digits then parse it as a timestamp
-		if _, err := strconv.Atoi(qLastRead); err == nil {
-			timestamp, err := strconv.ParseInt(qLastRead, 10, 64)
-			if err != nil {
-				ctx.InternalServerError(err)
-				return
-			}
-			tmpLastRead = time.Unix(timestamp, 0)
-		} else {
-			tmpLastRead, err = time.Parse(time.RFC3339, qLastRead)
-			if err != nil {
-				ctx.InternalServerError(err)
-				return
-			}
+		tmpLastRead, err := timeutil.ParseDateTimeGraceful(qLastRead)
+		if err != nil {
+			ctx.InternalServerError(err)
+			return
 		}
+
 		if !tmpLastRead.IsZero() {
 			lastRead = tmpLastRead.Unix()
 		}