Changeset 152 in code for trunk/upstream.go

Timestamp:

Mar 25, 2020, 10:15:48 PM (5 years ago)

Author:

delthas

Message:

Add upstream message-tags capability support

File:

• trunk/upstream.go (modified) (4 diffs)

trunk/upstream.go

@@ -50 +50 @@
         channels   map[string]*upstreamChannel
         caps       map[string]string
+
+        tagsSupported bool
 
         saslClient  sasl.Client
@@ -191 +193 @@
                         }
 
+                        requestCaps := make([]string, 0, 16)
+                        for _, c := range []string{"message-tags"} {
+                                if _, ok := uc.caps[c]; ok {
+                                        requestCaps = append(requestCaps, c)
+                                }
+                        }
+
                         if uc.requestSASL() {
+                                requestCaps = append(requestCaps, "sasl")
+                        }
+
+                        if len(requestCaps) > 0 {
                                 uc.SendMessage(&irc.Message{
                                         Command: "CAP",
-                                        Params:  []string{"REQ", "sasl"},
-                                })
+                                        Params:  []string{"REQ", strings.Join(requestCaps, " ")},
+                                })
+                        }
+
+                        if uc.requestSASL() {
                                 break // we'll send CAP END after authentication is completed
                         }
@@ -892 +908 @@
                         })
                 })
+        case "TAGMSG":
+                // TODO: relay to downstream connections that accept message-tags
         case irc.RPL_YOURHOST, irc.RPL_CREATED:
                 // Ignore
@@ -988 +1006 @@
                         Params:  []string{auth.Mechanism},
                 })
+        case "message-tags":
+                uc.tagsSupported = ok
         }
         return nil