Changeset 284 in code for trunk/downstream.go

Timestamp:

May 1, 2020, 1:18:14 PM (5 years ago)

Author:

contact

Message:

Add support for detached channels

Channels can now be detached by leaving them with the reason "detach",
and re-attached by joining them again. Upon detaching the channel is
no longer forwarded to downstream connections. Upon re-attaching the
history buffer is sent.

File:

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

trunk/downstream.go

@@ -768 +768 @@
         dc.forEachUpstream(func(uc *upstreamConn) {
                 for _, ch := range uc.channels {
-                        if ch.complete {
-                                dc.SendMessage(&irc.Message{
-                                        Prefix:  dc.prefix(),
-                                        Command: "JOIN",
-                                        Params:  []string{dc.marshalEntity(ch.conn.network, ch.Name)},
-                                })
-
-                                forwardChannel(dc, ch)
-                        }
+                        if !ch.complete {
+                                continue
+                        }
+                        if record, ok := uc.network.channels[ch.Name]; ok && record.Detached {
+                                continue
+                        }
+
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.prefix(),
+                                Command: "JOIN",
+                                Params:  []string{dc.marshalEntity(ch.conn.network, ch.Name)},
+                        })
+
+                        forwardChannel(dc, ch)
                 }
         })
@@ -794 +799 @@
 func (dc *downstreamConn) sendNetworkHistory(net *network) {
         for target, history := range net.history {
+                if ch, ok := net.channels[target]; ok && ch.Detached {
+                        continue
+                }
+
                 seq, ok := history.offlineClients[dc.clientName]
                 if !ok {
@@ -946 +955 @@
                         })
 
-                        ch := &Channel{Name: upstreamName, Key: key}
+                        ch := &Channel{Name: upstreamName, Key: key, Detached: false}
                         if err := uc.network.createUpdateChannel(ch); err != nil {
                                 dc.logger.Printf("failed to create or update channel %q: %v", upstreamName, err)
@@ -968 +977 @@
                         }
 
-                        params := []string{upstreamName}
-                        if reason != "" {
-                                params = append(params, reason)
-                        }
-                        uc.SendMessage(&irc.Message{
-                                Command: "PART",
-                                Params:  params,
-                        })
-
-                        if err := uc.network.deleteChannel(upstreamName); err != nil {
-                                dc.logger.Printf("failed to delete channel %q: %v", upstreamName, err)
+                        if strings.EqualFold(reason, "detach") {
+                                ch := &Channel{Name: upstreamName, Detached: true}
+                                if err := uc.network.createUpdateChannel(ch); err != nil {
+                                        dc.logger.Printf("failed to detach channel %q: %v", upstreamName, err)
+                                }
+                        } else {
+                                params := []string{upstreamName}
+                                if reason != "" {
+                                        params = append(params, reason)
+                                }
+                                uc.SendMessage(&irc.Message{
+                                        Command: "PART",
+                                        Params:  params,
+                                })
+
+                                if err := uc.network.deleteChannel(upstreamName); err != nil {
+                                        dc.logger.Printf("failed to delete channel %q: %v", upstreamName, err)
+                                }
                         }
                 }