Changeset 75 in code for trunk

Timestamp:

Mar 4, 2020, 3:00:19 PM (5 years ago)

Author:

contact

Message:

Remove unused user.getChannel, move getUpstream to user

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• server.go (modified) (2 diffs)

trunk/downstream.go

@@ -322 +322 @@
 
         if network != "" {
-                dc.upstream = dc.srv.getUpstream(network)
+                dc.upstream = dc.user.getUpstream(network)
                 if dc.upstream == nil {
                         dc.logger.Printf("failed registration: unknown upstream %q", network)

trunk/server.go

@@ -83 +83 @@
 }
 
-func (u *user) getChannel(name string, upstream *Upstream) (*upstreamChannel, error) {
-        var channel *upstreamChannel
-        var err error
-        u.forEachUpstream(func(uc *upstreamConn) {
-                if err != nil {
-                        return
-                }
-                if upstream != nil && uc.upstream != upstream {
-                        return
-                }
-                if ch, ok := uc.channels[name]; ok {
-                        if channel != nil {
-                                err = fmt.Errorf("ambiguous channel name %q", name)
-                        } else {
-                                channel = ch
-                        }
-                }
-        })
-        if channel == nil {
-                return nil, ircError{&irc.Message{
-                        Command: irc.ERR_NOSUCHCHANNEL,
-                        Params:  []string{name, "No such channel"},
-                }}
-        }
-        return channel, nil
+func (u *user) getUpstream(name string) *Upstream {
+        for i, upstream := range u.srv.Upstreams {
+                if upstream.Addr == name {
+                        return &u.srv.Upstreams[i]
+                }
+        }
+        return nil
 }
 
@@ -198 +180 @@
         s.lock.Unlock()
         return u
-}
-
-func (s *Server) getUpstream(name string) *Upstream {
-        for i, upstream := range s.Upstreams {
-                if upstream.Addr == name {
-                        return &s.Upstreams[i]
-                }
-        }
-        return nil
 }