Changeset 72 in code

Timestamp:

Mar 3, 2020, 2:33:21 PM (5 years ago)

Author:

contact

Message:

Remove upstream prefix for outgoing MODE and PRIVMSG

We shouldn't set the prefix when sending these commands.

Location:

trunk

Files:

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

trunk/downstream.go

@@ -422 +422 @@
                         if modeStr != "" {
                                 uc.SendMessage(&irc.Message{
-                                        Prefix:  uc.prefix(),
                                         Command: "MODE",
                                         Params:  []string{upstreamName, modeStr},
@@ -452 +451 @@
                                 dc.user.forEachUpstream(func(uc *upstreamConn) {
                                         uc.SendMessage(&irc.Message{
-                                                Prefix:  uc.prefix(),
                                                 Command: "MODE",
                                                 Params:  []string{uc.nick, modeStr},
@@ -478 +476 @@
 
                         uc.SendMessage(&irc.Message{
-                                Prefix:  uc.prefix(),
                                 Command: "PRIVMSG",
                                 Params:  []string{upstreamName, text},

trunk/upstream.go

@@ -90 +90 @@
 
         return uc, nil
-}
-
-func (uc *upstreamConn) prefix() *irc.Prefix {
-        return &irc.Prefix{
-                Name: uc.nick,
-                User: uc.upstream.Username,
-                // TODO: fill the host?
-        }
 }