Changeset 553 in code for trunk/downstream.go

Timestamp:

Jun 10, 2021, 9:17:00 AM (4 years ago)

Author:

greg

Message:

Forward user mode changes in single-upstream mode

References: ​https://todo.sr.ht/~emersion/soju/20

File:

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

trunk/downstream.go

@@ -1103 +1103 @@
                 dc.SendMessage(msg)
         }
+        if uc := dc.upstream(); uc != nil {
+                dc.SendMessage(&irc.Message{
+                        Prefix:  dc.srv.prefix(),
+                        Command: irc.RPL_UMODEIS,
+                        Params:  []string{dc.nick, string(uc.modes)},
+                })
+        }
         dc.SendMessage(&irc.Message{
                 Prefix:  dc.srv.prefix(),
@@ -1602 +1609 @@
                                 })
                         } else {
-                                // TODO: only do this in multi-upstream mode
+                                var userMode string
+                                if uc := dc.upstream(); uc != nil {
+                                        userMode = string(uc.modes)
+                                }
+
                                 dc.SendMessage(&irc.Message{
                                         Prefix:  dc.srv.prefix(),
                                         Command: irc.RPL_UMODEIS,
-                                        Params:  []string{dc.nick, ""}, // TODO
+                                        Params:  []string{dc.nick, userMode},
                                 })
                         }