Changeset 238 in code

Timestamp:

Apr 6, 2020, 7:34:45 PM (5 years ago)

Author:

contact

Message:

Add origin argument to upstreamConn.produce

Location:

trunk

Files:

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

trunk/downstream.go

@@ -1188 +1188 @@
 
                         uc.appendLog(upstreamName, echoMsg)
-
-                        uc.network.ring.Produce(echoMsg)
-
-                        uc.forEachDownstream(func(c *downstreamConn) {
-                                if c != dc || c.caps["echo-message"] {
-                                        c.sendFromUpstream(echoMsg, uc)
-                                }
-                        })
+                        uc.produce(echoMsg, dc)
                 }
         case "NOTICE":

trunk/upstream.go

@@ -248 +248 @@
         case "NOTICE":
                 if msg.Prefix.User == "" && msg.Prefix.Host == "" { // server message
-                        uc.produce(msg)
+                        uc.produce(msg, nil)
                 } else { // regular user NOTICE
                         var entity, text string
@@ -261 +261 @@
                         uc.appendLog(target, msg)
 
-                        uc.produce(msg)
+                        uc.produce(msg, nil)
                 }
         case "CAP":
@@ -1137 +1137 @@
                 uc.appendLog(target, msg)
 
-                uc.produce(msg)
+                uc.produce(msg, nil)
         case "INVITE":
                 var nick string
@@ -1365 +1365 @@
 }
 
-func (uc *upstreamConn) produce(msg *irc.Message) {
+func (uc *upstreamConn) produce(msg *irc.Message, origin *downstreamConn) {
         uc.network.ring.Produce(msg)
 
         uc.forEachDownstream(func(dc *downstreamConn) {
-                dc.sendFromUpstream(msg, uc)
+                if dc != origin || dc.caps["echo-message"] {
+                        dc.sendFromUpstream(msg, uc)
+                }
         })
 }