Changeset 768 in code for trunk

Timestamp:

Feb 4, 2022, 1:01:27 PM (3 years ago)

Author:

contact

Message:

Drop user.forEachNetwork

It's a trivial for loop.

Location:

trunk

Files:

• downstream.go (modified) (6 diffs)
• service.go (modified) (3 diffs)
• user.go (modified) (2 diffs)

trunk/downstream.go

@@ -352 +352 @@
                 f(dc.network)
         } else if dc.isMultiUpstream {
-                dc.user.forEachNetwork(f)
+                for _, network := range dc.user.networks {
+                        f(network)
+                }
         }
 }
@@ -776 +778 @@
 
                         var match *network
-                        dc.user.forEachNetwork(func(net *network) {
+                        for _, net := range dc.user.networks {
                                 if net.ID == id {
                                         match = net
+                                        break
                                 }
-                        })
+                        }
                         if match == nil {
                                 return ircError{&irc.Message{
@@ -1437 +1440 @@
         if dc.caps["soju.im/bouncer-networks-notify"] {
                 dc.SendBatch("soju.im/bouncer-networks", nil, nil, func(batchRef irc.TagValue) {
-                        dc.user.forEachNetwork(func(network *network) {
+                        for _, network := range dc.user.networks {
                                 idStr := fmt.Sprintf("%v", network.ID)
                                 attrs := getNetworkAttrs(network)
@@ -1446 +1449 @@
                                         Params:  []string{"NETWORK", idStr, attrs.String()},
                                 })
-                        })
+                        }
                 })
         }
@@ -2749 +2752 @@
                 case "LISTNETWORKS":
                         dc.SendBatch("soju.im/bouncer-networks", nil, nil, func(batchRef irc.TagValue) {
-                                dc.user.forEachNetwork(func(network *network) {
+                                for _, network := range dc.user.networks {
                                         idStr := fmt.Sprintf("%v", network.ID)
                                         attrs := getNetworkAttrs(network)
@@ -2758 +2761 @@
                                                 Params:  []string{"NETWORK", idStr, attrs.String()},
                                         })
-                                })
+                                }
                         })
                 case "ADDNETWORK":

trunk/service.go

@@ -507 +507 @@
 func handleServiceNetworkStatus(ctx context.Context, dc *downstreamConn, params []string) error {
         n := 0
-        dc.user.forEachNetwork(func(net *network) {
+        for _, net := range dc.user.networks {
                 var statuses []string
                 var details string
@@ -542 +542 @@
 
                 n++
-        })
+        }
 
         if n == 0 {
@@ -970 +970 @@
 
         if *networkName == "" {
-                dc.user.forEachNetwork(sendNetwork)
+                for _, net := range dc.user.networks {
+                        sendNetwork(net)
+                }
         } else {
                 net := dc.user.getNetwork(*networkName)

trunk/user.go

@@ -465 +465 @@
 }
 
-func (u *user) forEachNetwork(f func(*network)) {
-        for _, network := range u.networks {
-                f(network)
-        }
-}
-
 func (u *user) forEachUpstream(f func(uc *upstreamConn)) {
         for _, network := range u.networks {
@@ -993 +987 @@
                 // Re-connect to networks which use the default realname
                 var needUpdate []Network
-                u.forEachNetwork(func(net *network) {
+                for _, net := range u.networks {
                         if net.Realname == "" {
                                 needUpdate = append(needUpdate, net.Network)
                         }
-                })
+                }
 
                 var netErr error