Changeset 488 in code for trunk/downstream.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/downstream.go (modified) (3 diffs)

trunk/downstream.go

@@ -351 +351 @@
 // ackMsgID acknowledges that a message has been received.
 func (dc *downstreamConn) ackMsgID(id string) {
-        netID, entity, _, err := parseMsgID(id)
+        netID, entity, err := parseMsgID(id, nil)
         if err != nil {
                 dc.logger.Printf("failed to ACK message ID %q: %v", id, err)
@@ -366 +366 @@
 
 func (dc *downstreamConn) sendPing(msgID string) {
-        token := "soju-msgid-" + base64.RawURLEncoding.EncodeToString([]byte(msgID))
+        token := "soju-msgid-" + msgID
         dc.SendMessage(&irc.Message{
                 Command: "PING",
@@ -378 +378 @@
                 return
         }
-        token = strings.TrimPrefix(token, "soju-msgid-")
-        b, err := base64.RawURLEncoding.DecodeString(token)
-        if err != nil {
-                dc.logger.Printf("received malformed PONG token: %v", err)
-                return
-        }
-        msgID := string(b)
-
+        msgID := strings.TrimPrefix(token, "soju-msgid-")
         dc.ackMsgID(msgID)
 }