Changeset 158 in code for trunk/downstream.go

Timestamp:

Mar 25, 2020, 11:12:53 PM (5 years ago)

Author:

delthas

Message:

Simplify error handling for downstream JOIN/PART

downstreamConnection.unmarshalEntity already returns an ircError of
command ERR_NOSUCHCHANNEL, so there's no need to explicitly return
another ircError of that type.

File:

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

trunk/downstream.go

@@ -849 +849 @@
                         uc, upstreamName, err := dc.unmarshalEntity(name)
                         if err != nil {
-                                return ircError{&irc.Message{
-                                        Command: irc.ERR_NOSUCHCHANNEL,
-                                        Params:  []string{name, err.Error()},
-                                }}
+                                return err
                         }
 
@@ -891 +888 @@
                         uc, upstreamName, err := dc.unmarshalEntity(name)
                         if err != nil {
-                                return ircError{&irc.Message{
-                                        Command: irc.ERR_NOSUCHCHANNEL,
-                                        Params:  []string{name, err.Error()},
-                                }}
+                                return err
                         }