Changeset 727 in code for trunk/downstream.go

Timestamp:

Nov 29, 2021, 3:41:52 PM (4 years ago)

Author:

contact

Message:

downstream: improve unmarshalEntityNetwork error message

Closes: ​https://todo.sr.ht/~emersion/soju/162

File:

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

trunk/downstream.go

@@ -432 +432 @@
                 return dc.network, name, nil
         }
+        if !dc.isMultiUpstream {
+                return nil, "", ircError{&irc.Message{
+                        Command: irc.ERR_NOSUCHCHANNEL,
+                        Params:  []string{dc.nick, name, "Cannot interact with channels and users on the bouncer connection. Did you mean to use a specific network?"},
+                }}
+        }
 
         var net *network
@@ -449 +455 @@
                 return nil, "", ircError{&irc.Message{
                         Command: irc.ERR_NOSUCHCHANNEL,
-                        Params:  []string{name, "Missing network suffix in name"},
+                        Params:  []string{dc.nick, name, "Missing network suffix in name"},
                 }}
         }
@@ -467 +473 @@
                 return nil, "", ircError{&irc.Message{
                         Command: irc.ERR_NOSUCHCHANNEL,
-                        Params:  []string{name, "Disconnected from upstream network"},
+                        Params:  []string{dc.nick, name, "Disconnected from upstream network"},
                 }}
         }