Changeset 171 in code for trunk/upstream.go

Timestamp:

Mar 27, 2020, 8:12:16 PM (5 years ago)

Author:

delthas

Message:

Marshal NOTICE user prefixes and channels

NOTICE messages can be both special messages from the server (with no
prefix nick), or regular PRIVMSG-like messages from users. This commit
adds support for marshaling channel and user prefixes in the latter
case.

File:

• trunk/upstream.go (modified) (1 diff)

trunk/upstream.go

@@ -205 +205 @@
                 uc.logger.Print(msg)
 
-                uc.forEachDownstream(func(dc *downstreamConn) {
-                        dc.SendMessage(msg)
-                })
+                if msg.Prefix.User == "" && msg.Prefix.Host == "" { // server message
+                        uc.forEachDownstream(func(dc *downstreamConn) {
+                                dc.SendMessage(msg)
+                        })
+                } else { // regular user NOTICE
+                        var nick, text string
+                        if err := parseMessageParams(msg, &nick, &text); err != nil {
+                                return err
+                        }
+
+                        uc.forEachDownstream(func(dc *downstreamConn) {
+                                dc.SendMessage(&irc.Message{
+                                        Prefix:  dc.marshalUserPrefix(uc, msg.Prefix),
+                                        Command: "NOTICE",
+                                        Params:  []string{dc.marshalEntity(uc, nick), text},
+                                })
+                        })
+                }
         case "CAP":
                 var subCmd string