Changeset 239 in code for trunk/upstream.go

Timestamp:

Apr 6, 2020, 7:42:55 PM (5 years ago)

Author:

contact

Message:

Make upstreamConn.produce log messages

File:

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

trunk/upstream.go

@@ -248 +248 @@
         case "NOTICE":
                 if msg.Prefix.User == "" && msg.Prefix.Host == "" { // server message
-                        uc.produce(msg, nil)
+                        uc.produce("", msg, nil)
                 } else { // regular user NOTICE
                         var entity, text string
@@ -259 +259 @@
                                 target = msg.Prefix.Name
                         }
-                        uc.appendLog(target, msg)
-
-                        uc.produce(msg, nil)
+                        uc.produce(target, msg, nil)
                 }
         case "CAP":
@@ -1135 +1133 @@
                         target = msg.Prefix.Name
                 }
-                uc.appendLog(target, msg)
-
-                uc.produce(msg, nil)
+                uc.produce(target, msg, nil)
         case "INVITE":
                 var nick string
@@ -1365 +1361 @@
 }
 
-func (uc *upstreamConn) produce(msg *irc.Message, origin *downstreamConn) {
+func (uc *upstreamConn) produce(target string, msg *irc.Message, origin *downstreamConn) {
+        if target != "" {
+                uc.appendLog(target, msg)
+        }
+
         uc.network.ring.Produce(msg)