Add utility for strongly typed unix timestamps in JSON

Author: tulir

bridge/status/bridgestate.go

@@ -16,6 +16,7 @@ import (
 	"time"
 
 	"maunium.net/go/mautrix/id"
+	"maunium.net/go/mautrix/util/jsontime"
 )
 
 type BridgeStateEvent string
@@ -47,7 +48,7 @@ const (
 
 type BridgeState struct {
 	StateEvent BridgeStateEvent `json:"state_event"`
-	Timestamp  int64            `json:"timestamp"`
+	Timestamp  jsontime.Unix    `json:"timestamp"`
 	TTL        int              `json:"ttl"`
 
 	Source  string               `json:"source,omitempty"`
@@ -80,7 +81,7 @@ func (pong BridgeState) Fill(user BridgeStateFiller) BridgeState {
 		pong.RemoteName = user.GetRemoteName()
 	}
 
-	pong.Timestamp = time.Now().Unix()
+	pong.Timestamp = jsontime.UnixNow()
 	pong.Source = "bridge"
 	if len(pong.Error) > 0 {
 		pong.TTL = 60
@@ -127,5 +128,5 @@ func (pong *BridgeState) ShouldDeduplicate(newPong *BridgeState) bool {
 	if pong == nil || pong.StateEvent != newPong.StateEvent || pong.Error != newPong.Error {
 		return false
 	}
-	return pong.Timestamp+int64(pong.TTL/5) > time.Now().Unix()
+	return pong.Timestamp.Add(time.Duration(pong.TTL/5) * time.Second).After(time.Now())
 }

bridge/status/messagecheckpoint.go

@@ -18,6 +18,7 @@ import (
 	"maunium.net/go/mautrix"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
+	"maunium.net/go/mautrix/util/jsontime"
 )
 
 type MessageCheckpointStep string
@@ -67,7 +68,7 @@ type MessageCheckpoint struct {
 	EventID     id.EventID                  `json:"event_id"`
 	RoomID      id.RoomID                   `json:"room_id"`
 	Step        MessageCheckpointStep       `json:"step"`
-	Timestamp   int64                       `json:"timestamp"`
+	Timestamp   jsontime.UnixMilli          `json:"timestamp"`
 	Status      MessageCheckpointStatus     `json:"status"`
 	EventType   event.Type                  `json:"event_type"`
 	ReportedBy  MessageCheckpointReportedBy `json:"reported_by"`
@@ -102,7 +103,7 @@ func NewMessageCheckpoint(evt *event.Event, step MessageCheckpointStep, status M
 		EventID:    evt.ID,
 		RoomID:     evt.RoomID,
 		Step:       step,
-		Timestamp:  time.Now().UnixNano() / int64(time.Millisecond),
+		Timestamp:  jsontime.UnixMilliNow(),
 		Status:     status,
 		EventType:  evt.Type,
 		ReportedBy: MsgReportedByBridge,

util/jsontime/jsontime.go

@@ -0,0 +1,78 @@
+// Copyright (c) 2022 Tulir Asokan
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+package jsontime
+
+import (
+	"encoding/json"
+	"time"
+)
+
+func UM(time time.Time) UnixMilli {
+	return UnixMilli{Time: time}
+}
+
+func UnixMilliNow() UnixMilli {
+	return UM(time.Now())
+}
+
+type UnixMilli struct {
+	time.Time
+}
+
+func (um UnixMilli) MarshalJSON() ([]byte, error) {
+	if um.IsZero() {
+		return []byte{'0'}, nil
+	}
+	return json.Marshal(um.UnixMilli())
+}
+
+func (um *UnixMilli) UnmarshalJSON(data []byte) error {
+	var val int64
+	err := json.Unmarshal(data, &val)
+	if err != nil {
+		return err
+	}
+	if val == 0 {
+		um.Time = time.Time{}
+	} else {
+		um.Time = time.UnixMilli(val)
+	}
+	return nil
+}
+
+func U(time time.Time) Unix {
+	return Unix{Time: time}
+}
+
+func UnixNow() Unix {
+	return U(time.Now())
+}
+
+type Unix struct {
+	time.Time
+}
+
+func (u Unix) MarshalJSON() ([]byte, error) {
+	if u.IsZero() {
+		return []byte{'0'}, nil
+	}
+	return json.Marshal(u.Unix())
+}
+
+func (u *Unix) UnmarshalJSON(data []byte) error {
+	var val int64
+	err := json.Unmarshal(data, &val)
+	if err != nil {
+		return err
+	}
+	if val == 0 {
+		u.Time = time.Time{}
+	} else {
+		u.Time = time.Unix(val, 0)
+	}
+	return nil
+}