Remove unused user.getChannel, move getUpstream to user

downstream.go

@@ -321,7 +321,7 @@ func (dc *downstreamConn) register() error {
 	}
 
 	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)
 			dc.SendMessage(&irc.Message{

server.go

@@ -82,31 +82,13 @@ func (u *user) forEachDownstream(f func(dc *downstreamConn)) {
 	u.lock.Unlock()
 }
 
-func (u *user) getChannel(name string, upstream *Upstream) (*upstreamChannel, error) {
+func (u *user) getUpstream(name string) *Upstream {
-	var channel *upstreamChannel
+	for i, upstream := range u.srv.Upstreams {
-	var err error
+		if upstream.Addr == name {
-	u.forEachUpstream(func(uc *upstreamConn) {
+			return &u.srv.Upstreams[i]
-		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
 		}
 	}
-	})
+	return nil
-	if channel == nil {
-		return nil, ircError{&irc.Message{
-			Command: irc.ERR_NOSUCHCHANNEL,
-			Params:  []string{name, "No such channel"},
-		}}
-	}
-	return channel, nil
 }
 
 type Upstream struct {
@@ -199,15 +181,6 @@ func (s *Server) getUser(name string) *user {
 	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
-}
-
 func (s *Server) Serve(ln net.Listener) error {
 	for {
 		netConn, err := ln.Accept()