Changeset 40 in code for trunk/upstream.go

Timestamp:

Feb 7, 2020, 10:56:36 AM (5 years ago)

Author:

contact

Message:

Add user.forEachDownstream

File:

• trunk/upstream.go (modified) (4 diffs)

trunk/upstream.go

@@ -126 +126 @@
                         }
 
-                        c.srv.lock.Lock()
-                        for _, dc := range c.srv.downstreamConns {
+                        c.user.forEachDownstream(func(dc *downstreamConn) {
                                 dc.messages <- msg
-                        }
-                        c.srv.lock.Unlock()
+                        })
                 }
         case "NOTICE":
@@ -175 +173 @@
                 }
 
-                c.srv.lock.Lock()
-                for _, dc := range c.srv.downstreamConns {
+                c.user.forEachDownstream(func(dc *downstreamConn) {
                         dc.messages <- msg
-                }
-                c.srv.lock.Unlock()
+                })
         case "PART":
                 if len(msg.Params) < 1 {
@@ -198 +194 @@
                 }
 
-                c.srv.lock.Lock()
-                for _, dc := range c.srv.downstreamConns {
+                c.user.forEachDownstream(func(dc *downstreamConn) {
                         dc.messages <- msg
-                }
-                c.srv.lock.Unlock()
+                })
         case irc.RPL_TOPIC, irc.RPL_NOTOPIC:
                 if len(msg.Params) < 3 {
@@ -276 +270 @@
                 ch.complete = true
 
-                c.srv.lock.Lock()
-                for _, dc := range c.srv.downstreamConns {
+                c.user.forEachDownstream(func(dc *downstreamConn) {
                         forwardChannel(dc, ch)
-                }
-                c.srv.lock.Unlock()
+                })
         case "PRIVMSG":
-                c.srv.lock.Lock()
-                for _, dc := range c.srv.downstreamConns {
+                c.user.forEachDownstream(func(dc *downstreamConn) {
                         dc.messages <- msg
-                }
-                c.srv.lock.Unlock()
+                })
         case irc.RPL_YOURHOST, irc.RPL_CREATED:
                 // Ignore