Changeset 405 in code for trunk

Timestamp:

Aug 20, 2020, 9:12:54 AM (5 years ago)

Author:

hubert

Message:

Forward RPL_TOPICWHOTIME to downstreams

Location:

trunk

Files:

• bridge.go (modified) (3 diffs)
• upstream.go (modified) (5 diffs)

trunk/bridge.go

@@ -2 +2 @@
 
 import (
+        "strconv"
+        "strings"
+
         "gopkg.in/irc.v3"
-        "strings"
 )
 
@@ -12 +14 @@
 
         sendTopic(dc, ch)
-
-        // TODO: rpl_topicwhotime
         sendNames(dc, ch)
 }
@@ -26 +26 @@
                         Params:  []string{dc.nick, downstreamName, ch.Topic},
                 })
+                if ch.TopicWho != nil {
+                        topicWho := dc.marshalUserPrefix(ch.conn.network, ch.TopicWho)
+                        topicTime := strconv.FormatInt(ch.TopicTime.Unix(), 10)
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: rpl_topicwhotime,
+                                Params:  []string{dc.nick, downstreamName, topicWho.String(), topicTime},
+                        })
+                }
         } else {
                 dc.SendMessage(&irc.Message{

trunk/upstream.go

@@ -43 +43 @@
         conn         *upstreamConn
         Topic        string
-        TopicWho     string
+        TopicWho     *irc.Prefix
         TopicTime    time.Time
         Status       channelStatus
@@ -843 +843 @@
                 }
         case "TOPIC":
+                if msg.Prefix == nil {
+                        return fmt.Errorf("expected a prefix")
+                }
+
                 var name string
                 if err := parseMessageParams(msg, &name); err != nil {
@@ -853 +857 @@
                 if len(msg.Params) > 1 {
                         ch.Topic = msg.Params[1]
+                        ch.TopicWho = msg.Prefix.Copy()
+                        ch.TopicTime = time.Now() // TODO use msg.Tags["time"]
                 } else {
                         ch.Topic = ""
@@ -984 +990 @@
                         return err
                 }
-                ch.TopicWho = who
+                firstTopicWhoTime := ch.TopicWho == nil
+                ch.TopicWho = irc.ParsePrefix(who)
                 sec, err := strconv.ParseInt(timeStr, 10, 64)
                 if err != nil {
@@ -990 +997 @@
                 }
                 ch.TopicTime = time.Unix(sec, 0)
+                if firstTopicWhoTime {
+                        uc.forEachDownstream(func(dc *downstreamConn) {
+                                topicWho := dc.marshalUserPrefix(uc.network, ch.TopicWho)
+                                dc.SendMessage(&irc.Message{
+                                        Prefix:  dc.srv.prefix(),
+                                        Command: rpl_topicwhotime,
+                                        Params: []string{
+                                                dc.nick,
+                                                dc.marshalEntity(uc.network, ch.Name),
+                                                topicWho.String(),
+                                                timeStr,
+                                        },
+                                })
+                        })
+                }
         case irc.RPL_LIST:
                 var channel, clients, topic string