Changeset 284 in code for trunk/user.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/user.go (modified) (2 diffs)

trunk/user.go

@@ -151 +151 @@
                 return err
         }
+        prev := net.channels[ch.Name]
         net.channels[ch.Name] = ch
+
+        if prev != nil && prev.Detached != ch.Detached {
+                history := net.history[ch.Name]
+                if ch.Detached {
+                        net.user.srv.Logger.Printf("network %q: detaching channel %q", net.GetName(), ch.Name)
+                        net.forEachDownstream(func(dc *downstreamConn) {
+                                net.offlineClients[dc.clientName] = struct{}{}
+                                if history != nil {
+                                        history.offlineClients[dc.clientName] = history.ring.Cur()
+                                }
+
+                                dc.SendMessage(&irc.Message{
+                                        Prefix:  dc.prefix(),
+                                        Command: "PART",
+                                        Params:  []string{dc.marshalEntity(net, ch.Name), "Detach"},
+                                })
+                        })
+                } else {
+                        net.user.srv.Logger.Printf("network %q: attaching channel %q", net.GetName(), ch.Name)
+
+                        var uch *upstreamChannel
+                        if net.conn != nil {
+                                uch = net.conn.channels[ch.Name]
+                        }
+
+                        net.forEachDownstream(func(dc *downstreamConn) {
+                                dc.SendMessage(&irc.Message{
+                                        Prefix:  dc.prefix(),
+                                        Command: "JOIN",
+                                        Params:  []string{dc.marshalEntity(net, ch.Name)},
+                                })
+
+                                if uch != nil {
+                                        forwardChannel(dc, uch)
+                                }
+
+                                if history != nil {
+                                        dc.sendNetworkHistory(net)
+                                }
+                        })
+                }
+        }
+
         return nil
 }
@@ -343 +387 @@
 
                                 net.offlineClients[dc.clientName] = struct{}{}
-                                for _, history := range net.history {
+                                for target, history := range net.history {
+                                        if ch, ok := net.channels[target]; ok && ch.Detached {
+                                                continue
+                                        }
                                         history.offlineClients[dc.clientName] = history.ring.Cur()
                                 }