Changeset 553 in code for trunk

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

Location:

trunk

Files:

• downstream.go (modified) (2 diffs)
• upstream.go (modified) (4 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},
                                 })
                         }

trunk/upstream.go

@@ -673 +673 @@
                 }
 
-                uc.forEachDownstreamByID(downstreamID, func (dc *downstreamConn) {
-                        dc.SendMessage(&irc.Message {
-                                Prefix: uc.srv.prefix(),
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  uc.srv.prefix(),
                                 Command: msg.Command,
-                                Params: msg.Params,
+                                Params:  msg.Params,
                         })
                 })
@@ -933 +933 @@
                                 return fmt.Errorf("received MODE message for unknown nick %q", name)
                         }
-                        return uc.modes.Apply(modeStr)
-                        // TODO: notify downstreams about user mode change?
+
+                        if err := uc.modes.Apply(modeStr); err != nil {
+                                return err
+                        }
+
+                        uc.forEachDownstream(func(dc *downstreamConn) {
+                                if dc.upstream() == nil {
+                                        return
+                                }
+
+                                dc.SendMessage(msg)
+                        })
                 } else { // channel mode change
                         ch, err := uc.getChannel(name)
@@ -983 +993 @@
                         return err
                 }
-                // TODO: send RPL_UMODEIS to downstream connections when applicable
+
+                uc.forEachDownstream(func(dc *downstreamConn) {
+                        if dc.upstream() == nil {
+                                return
+                        }
+
+                        dc.SendMessage(msg)
+                })
         case irc.RPL_CHANNELMODEIS:
                 var channel string
@@ -1443 +1460 @@
                 }
 
-                uc.forEachDownstreamByID(downstreamID, func (dc *downstreamConn) {
-                        dc.SendMessage(&irc.Message {
-                                Prefix: uc.srv.prefix(),
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  uc.srv.prefix(),
                                 Command: msg.Command,
-                                Params: msg.Params,
+                                Params:  msg.Params,
                         })
                 })