Changeset 784 in code for trunk

Timestamp:

Feb 16, 2022, 1:45:09 PM (3 years ago)

Author:

contact

Message:

Introduce formatServerTime

It's too easy to forget to convert to UTC.

Location:

trunk

Files:

• bridge.go (modified) (1 diff)
• db_sqlite.go (modified) (1 diff)
• downstream.go (modified) (6 diffs)
• irc.go (modified) (1 diff)
• msgstore_fs.go (modified) (1 diff)
• upstream.go (modified) (1 diff)

trunk/bridge.go

@@ -28 +28 @@
                         timestampStr := "*"
                         if r != nil {
-                                timestampStr = fmt.Sprintf("timestamp=%s", r.Timestamp.UTC().Format(serverTimeLayout))
+                                timestampStr = fmt.Sprintf("timestamp=%s", formatServerTime(r.Timestamp))
                         }
                         dc.SendMessage(&irc.Message{

trunk/db_sqlite.go

@@ -796 +796 @@
         args := []interface{}{
                 sql.Named("id", receipt.ID),
-                sql.Named("timestamp", receipt.Timestamp.UTC().Format(serverTimeLayout)),
+                sql.Named("timestamp", formatServerTime(receipt.Timestamp)),
                 sql.Named("network", networkID),
                 sql.Named("target", receipt.Target),

trunk/downstream.go

@@ -2331 +2331 @@
 
                                 broadcastTags := tags.Copy()
-                                broadcastTags["time"] = irc.TagValue(time.Now().UTC().Format(serverTimeLayout))
+                                broadcastTags["time"] = irc.TagValue(formatServerTime(time.Now()))
                                 broadcastMsg := &irc.Message{
                                         Tags:    broadcastTags,
@@ -2357 +2357 @@
                                 if dc.caps["echo-message"] {
                                         echoTags := tags.Copy()
-                                        echoTags["time"] = irc.TagValue(time.Now().UTC().Format(serverTimeLayout))
+                                        echoTags["time"] = irc.TagValue(formatServerTime(time.Now()))
                                         dc.SendMessage(&irc.Message{
                                                 Tags:    echoTags,
@@ -2389 +2389 @@
 
                         echoTags := tags.Copy()
-                        echoTags["time"] = irc.TagValue(time.Now().UTC().Format(serverTimeLayout))
+                        echoTags["time"] = irc.TagValue(formatServerTime(time.Now()))
                         if uc.account != "" {
                                 echoTags["account"] = irc.TagValue(uc.account)
@@ -2440 +2440 @@
 
                         echoTags := tags.Copy()
-                        echoTags["time"] = irc.TagValue(time.Now().UTC().Format(serverTimeLayout))
+                        echoTags["time"] = irc.TagValue(formatServerTime(time.Now()))
                         if uc.account != "" {
                                 echoTags["account"] = irc.TagValue(uc.account)
@@ -2737 +2737 @@
                                                 Prefix:  dc.srv.prefix(),
                                                 Command: "CHATHISTORY",
-                                                Params:  []string{"TARGETS", target.Name, target.LatestMessage.UTC().Format(serverTimeLayout)},
+                                                Params:  []string{"TARGETS", target.Name, formatServerTime(target.LatestMessage)},
                                         })
                                 }
@@ -2833 +2833 @@
                 timestampStr := "*"
                 if !r.Timestamp.IsZero() {
-                        timestampStr = fmt.Sprintf("timestamp=%s", r.Timestamp.UTC().Format(serverTimeLayout))
+                        timestampStr = fmt.Sprintf("timestamp=%s", formatServerTime(r.Timestamp))
                 }
                 uc.forEachDownstream(func(d *downstreamConn) {

trunk/irc.go

@@ -31 +31 @@
 // The server-time layout, as defined in the IRCv3 spec.
 const serverTimeLayout = "2006-01-02T15:04:05.000Z"
+
+func formatServerTime(t time.Time) string {
+        return t.UTC().Format(serverTimeLayout)
+}
 
 type userModes string

trunk/msgstore_fs.go

@@ -381 +381 @@
         msg := &irc.Message{
                 Tags: map[string]irc.TagValue{
-                        "time": irc.TagValue(t.UTC().Format(serverTimeLayout)),
+                        "time": irc.TagValue(formatServerTime(t)),
                 },
                 Prefix:  prefix,

trunk/upstream.go

@@ -446 +446 @@
 
         if _, ok := msg.Tags["time"]; !ok {
-                msg.Tags["time"] = irc.TagValue(time.Now().UTC().Format(serverTimeLayout))
+                msg.Tags["time"] = irc.TagValue(formatServerTime(time.Now()))
         }