Changeset 692 in code for trunk

Timestamp:

Nov 17, 2021, 10:17:09 AM (4 years ago)

Author:

contact

Message:

Add downstreamConn.isMultiUpstream

Location:

trunk

Files:

• downstream.go (modified) (4 diffs)
• user.go (modified) (1 diff)

trunk/downstream.go

@@ -308 +308 @@
 }
 
+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.caps["soju.im/bouncer-networks"] {
+        } else if dc.isMultiUpstream() {
                 dc.user.forEachNetwork(f)
         }
@@ -317 +321 @@
 
 func (dc *downstreamConn) forEachUpstream(f func(*upstreamConn)) {
-        if dc.network == nil && dc.caps["soju.im/bouncer-networks"] {
+        if dc.network == nil && !dc.isMultiUpstream() {
                 return
         }
@@ -1182 +1186 @@
                 isupport = append(isupport, "NETWORK="+encodeISUPPORT(title))
         }
-        if dc.network == nil && dc.caps["soju.im/bouncer-networks"] {
+        if dc.network == nil && !dc.isMultiUpstream() {
                 isupport = append(isupport, "WHOX")
         }
@@ -1225 +1229 @@
                 })
         }
-        if dc.network == nil && dc.caps["soju.im/bouncer-networks"] && dc.user.Admin {
+        if dc.network == nil && !dc.isMultiUpstream() && dc.user.Admin {
                 dc.SendMessage(&irc.Message{
                         Prefix:  dc.srv.prefix(),

trunk/user.go

@@ -153 +153 @@
 func (net *network) forEachDownstream(f func(*downstreamConn)) {
         net.user.forEachDownstream(func(dc *downstreamConn) {
-                if dc.network == nil && dc.caps["soju.im/bouncer-networks"] {
+                if dc.network == nil && !dc.isMultiUpstream() {
                         return
                 }