From 61e6b2efa4086d8f8c36acb4f8fb59a25b2b802d Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Wed, 17 Nov 2021 11:22:26 +0100
Subject: [PATCH] Set isMultiUpstream flag in downstreamConn.welcome()

This will make it easier to globally disable multi-upstream mode.
---
 downstream.go | 39 ++++++++++++++++++++-------------------
 user.go       |  2 +-
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/downstream.go b/downstream.go
index 6ee1129..2f3733d 100644
--- a/downstream.go
+++ b/downstream.go
@@ -248,17 +248,18 @@ type downstreamConn struct {
 
 	id uint64
 
-	registered  bool
-	user        *user
-	nick        string
-	nickCM      string
-	rawUsername string
-	networkName string
-	clientName  string
-	realname    string
-	hostname    string
-	password    string   // empty after authentication
-	network     *network // can be nil
+	registered      bool
+	user            *user
+	nick            string
+	nickCM          string
+	rawUsername     string
+	networkName     string
+	clientName      string
+	realname        string
+	hostname        string
+	password        string   // empty after authentication
+	network         *network // can be nil
+	isMultiUpstream bool
 
 	negotiatingCaps bool
 	capVersion      int
@@ -307,20 +308,16 @@ func (dc *downstreamConn) prefix() *irc.Prefix {
 	}
 }
 
-func (dc *downstreamConn) isMultiUpstream() bool {
-	return dc.network == nil && !dc.caps["soju.im/bouncer-networks"]
-}
-
 func (dc *downstreamConn) forEachNetwork(f func(*network)) {
 	if dc.network != nil {
 		f(dc.network)
-	} else if dc.isMultiUpstream() {
+	} else if dc.isMultiUpstream {
 		dc.user.forEachNetwork(f)
 	}
 }
 
 func (dc *downstreamConn) forEachUpstream(f func(*upstreamConn)) {
-	if dc.network == nil && !dc.isMultiUpstream() {
+	if dc.network == nil && !dc.isMultiUpstream {
 		return
 	}
 	dc.user.forEachUpstream(func(uc *upstreamConn) {
@@ -1174,6 +1171,10 @@ func (dc *downstreamConn) welcome() error {
 		return err
 	}
 
+	if dc.network == nil && !dc.caps["soju.im/bouncer-networks"] {
+		dc.isMultiUpstream = true
+	}
+
 	isupport := []string{
 		fmt.Sprintf("CHATHISTORY=%v", chatHistoryLimit),
 		"CASEMAPPING=ascii",
@@ -1185,7 +1186,7 @@ func (dc *downstreamConn) welcome() error {
 	if title := dc.srv.Config().Title; dc.network == nil && title != "" {
 		isupport = append(isupport, "NETWORK="+encodeISUPPORT(title))
 	}
-	if dc.network == nil && !dc.isMultiUpstream() {
+	if dc.network == nil && !dc.isMultiUpstream {
 		isupport = append(isupport, "WHOX")
 	}
 
@@ -1228,7 +1229,7 @@ func (dc *downstreamConn) welcome() error {
 			Params:  []string{dc.nick, "+" + string(uc.modes)},
 		})
 	}
-	if dc.network == nil && !dc.isMultiUpstream() && dc.user.Admin {
+	if dc.network == nil && !dc.isMultiUpstream && dc.user.Admin {
 		dc.SendMessage(&irc.Message{
 			Prefix:  dc.srv.prefix(),
 			Command: irc.RPL_UMODEIS,
diff --git a/user.go b/user.go
index 90cb11e..52ea32c 100644
--- a/user.go
+++ b/user.go
@@ -152,7 +152,7 @@ func newNetwork(user *user, record *Network, channels []Channel) *network {
 
 func (net *network) forEachDownstream(f func(*downstreamConn)) {
 	net.user.forEachDownstream(func(dc *downstreamConn) {
-		if dc.network == nil && !dc.isMultiUpstream() {
+		if dc.network == nil && !dc.isMultiUpstream {
 			return
 		}
 		if dc.network != nil && dc.network != net {