Changeset 488 in code for trunk/msgstore_memory.go

Timestamp:

Mar 31, 2021, 3:57:24 PM (4 years ago)

Author:

contact

Message:

Use BARE for internal message IDs

This allows to have shorter and more future-proof IDs. This also
guarantees the IDs will only use reasonable ASCII characters (no
spaces), removing the need to encode them for PING/PONG tokens.

File:

• trunk/msgstore_memory.go (modified) (2 diffs)

trunk/msgstore_memory.go

@@ -3 +3 @@
 import (
         "fmt"
-        "strconv"
         "time"
 
+        "git.sr.ht/~sircmpwn/go-bare"
         "gopkg.in/irc.v3"
 )
@@ -11 +11 @@
 const messageRingBufferCap = 4096
 
+type memoryMsgID struct {
+        Seq bare.Uint
+}
+
+func (memoryMsgID) msgIDType() msgIDType {
+        return msgIDMemory
+}
+
 func parseMemoryMsgID(s string) (netID int64, entity string, seq uint64, err error) {
-        netID, entity, extra, err := parseMsgID(s)
+        var id memoryMsgID
+        netID, entity, err = parseMsgID(s, &id)
         if err != nil {
                 return 0, "", 0, err
         }
-        seq, err = strconv.ParseUint(extra, 10, 64)
-        if err != nil {
-                return 0, "", 0, fmt.Errorf("failed to parse message ID %q: %v", s, err)
-        }
-        return netID, entity, seq, nil
+        return netID, entity, uint64(id.Seq), nil
 }
 
 func formatMemoryMsgID(netID int64, entity string, seq uint64) string {
-        extra := strconv.FormatUint(seq, 10)
-        return formatMsgID(netID, entity, extra)
+        id := memoryMsgID{bare.Uint(seq)}
+        return formatMsgID(netID, entity, &id)
 }