Changeset 759 in code for trunk

Timestamp:

Dec 9, 2021, 11:12:20 AM (3 years ago)

Author:

contact

Message:

Block RPL_{CREATIONTIME,TOPICWHOTIME} for detached channels

Closes: ​https://todo.sr.ht/~emersion/soju/132

File:

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

trunk/upstream.go

@@ -1156 +1156 @@
                         return err
                 }
-                if firstMode {
-                        c := uc.network.channels.Value(channel)
-                        if c == nil || !c.Detached {
-                                modeStr, modeParams := ch.modes.Format()
-
-                                uc.forEachDownstream(func(dc *downstreamConn) {
-                                        params := []string{dc.nick, dc.marshalEntity(uc.network, channel), modeStr}
-                                        params = append(params, modeParams...)
-
-                                        dc.SendMessage(&irc.Message{
-                                                Prefix:  dc.srv.prefix(),
-                                                Command: irc.RPL_CHANNELMODEIS,
-                                                Params:  params,
-                                        })
+
+                c := uc.network.channels.Value(channel)
+                if firstMode && (c == nil || !c.Detached) {
+                        modeStr, modeParams := ch.modes.Format()
+
+                        uc.forEachDownstream(func(dc *downstreamConn) {
+                                params := []string{dc.nick, dc.marshalEntity(uc.network, channel), modeStr}
+                                params = append(params, modeParams...)
+
+                                dc.SendMessage(&irc.Message{
+                                        Prefix:  dc.srv.prefix(),
+                                        Command: irc.RPL_CHANNELMODEIS,
+                                        Params:  params,
                                 })
-                        }
+                        })
                 }
         case rpl_creationtime:
@@ -1186 +1185 @@
                 firstCreationTime := ch.creationTime == ""
                 ch.creationTime = creationTime
-                if firstCreationTime {
+
+                c := uc.network.channels.Value(channel)
+                if firstCreationTime && (c == nil || !c.Detached) {
                         uc.forEachDownstream(func(dc *downstreamConn) {
                                 dc.SendMessage(&irc.Message{
@@ -1196 +1197 @@
                 }
         case rpl_topicwhotime:
-                var name, who, timeStr string
-                if err := parseMessageParams(msg, nil, &name, &who, &timeStr); err != nil {
-                        return err
-                }
-                ch, err := uc.getChannel(name)
+                var channel, who, timeStr string
+                if err := parseMessageParams(msg, nil, &channel, &who, &timeStr); err != nil {
+                        return err
+                }
+
+                ch, err := uc.getChannel(channel)
                 if err != nil {
                         return err
                 }
+
                 firstTopicWhoTime := ch.TopicWho == nil
                 ch.TopicWho = irc.ParsePrefix(who)
@@ -1211 +1214 @@
                 }
                 ch.TopicTime = time.Unix(sec, 0)
-                if firstTopicWhoTime {
+
+                c := uc.network.channels.Value(channel)
+                if firstTopicWhoTime && (c == nil || !c.Detached) {
                         uc.forEachDownstream(func(dc *downstreamConn) {
                                 topicWho := dc.marshalUserPrefix(uc.network, ch.TopicWho)