Changeset 217 in code for trunk/upstream.go

Timestamp:

Apr 3, 2020, 7:00:19 PM (5 years ago)

Author:

contact

Message:

Add NOTICE messages to ring buffer

References: ​https://todo.sr.ht/~emersion/soju/33

File:

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

trunk/upstream.go

@@ -258 +258 @@
                 return nil
         case "NOTICE":
-                uc.logger.Print(msg)
-
                 if msg.Prefix.User == "" && msg.Prefix.Host == "" { // server message
-                        uc.forEachDownstream(func(dc *downstreamConn) {
-                                dc.SendMessage(&irc.Message{
-                                        Command: "NOTICE",
-                                        Params:  msg.Params,
-                                })
-                        })
+                        uc.network.ring.Produce(msg)
                 } else { // regular user NOTICE
-                        var nick, text string
-                        if err := parseMessageParams(msg, &nick, &text); err != nil {
+                        var entity, text string
+                        if err := parseMessageParams(msg, &entity, &text); err != nil {
                                 return err
                         }
 
-                        target := nick
-                        if nick == uc.nick {
+                        target := entity
+                        if target == uc.nick {
                                 target = msg.Prefix.Name
                         }
                         uc.appendLog(target, msg)
 
-                        uc.forEachDownstream(func(dc *downstreamConn) {
-                                dc.SendMessage(&irc.Message{
-                                        Prefix:  dc.marshalUserPrefix(uc, msg.Prefix),
-                                        Command: "NOTICE",
-                                        Params:  []string{dc.marshalEntity(uc, nick), text},
-                                })
-                        })
+                        uc.network.ring.Produce(msg)
                 }
         case "CAP":
@@ -1140 +1127 @@
                 }
 
-                var nick, text string
-                if err := parseMessageParams(msg, &nick, &text); err != nil {
+                var entity, text string
+                if err := parseMessageParams(msg, &entity, &text); err != nil {
                         return err
                 }
@@ -1149 +1136 @@
                         break
                 }
-                if nick == serviceNick {
+                if entity == serviceNick {
                         uc.logger.Printf("skipping PRIVMSG to soju's service: %v", msg)
                         break
                 }
 
-                target := nick
-                if nick == uc.nick {
+                target := entity
+                if target == uc.nick {
                         target = msg.Prefix.Name
                 }