Changeset 554 in code for trunk/downstream.go

Timestamp:

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

Author:

contact

Message:

Make user MODE commands fail in multi-upstream mode

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

File:

• trunk/downstream.go (modified) (1 diff)

trunk/downstream.go

@@ -1602 +1602 @@
                 if casemapASCII(name) == dc.nickCM {
                         if modeStr != "" {
-                                dc.forEachUpstream(func(uc *upstreamConn) {
+                                if uc := dc.upstream(); uc != nil {
                                         uc.SendMessageLabeled(dc.id, &irc.Message{
                                                 Command: "MODE",
                                                 Params:  []string{uc.nick, modeStr},
                                         })
-                                })
+                                } else {
+                                        dc.SendMessage(&irc.Message{
+                                                Prefix:  dc.srv.prefix(),
+                                                Command: irc.ERR_UMODEUNKNOWNFLAG,
+                                                Params:  []string{dc.nick, "Cannot change user mode in multi-upstream mode"},
+                                        })
+                                }
                         } else {
                                 var userMode string