Changeset 435 in code for trunk/user.go

Timestamp:

Dec 14, 2020, 7:54:02 PM (4 years ago)

Author:

delthas

Message:

Add customizable auto-detaching, auto-reattaching, relaying.

This uses the fields added previously to the Channel struct to implement
the actual detaching/reattaching/relaying logic.

The FilterDefault values of the messages filters are currently
hardcoded.

The values of the message filters are not currently user-settable.

This introduces a new user event, eventChannelDetach, which stores an
upstreamConn (which might become invalid at the time of processing), and
a channel name, used for auto-detaching. Every time the channel detach
timer is refreshed (by receveing a message, etc.), a new timer is
created on the upstreamChannel, which will dispatch this event after the
duration (and discards the previous timer, if any).

File:

• trunk/user.go (modified) (5 diffs)

trunk/user.go

@@ -47 +47 @@
 type eventDownstreamDisconnected struct {
         dc *downstreamConn
+}
+
+type eventChannelDetach struct {
+        uc   *upstreamConn
+        name string
 }
 
@@ -177 +182 @@
 }
 
-func (net *network) createUpdateChannel(ch *Channel) error {
-        if current, ok := net.channels[ch.Name]; ok {
-                ch.ID = current.ID // update channel if it already exists
-        }
-        if err := net.user.srv.db.StoreChannel(net.ID, ch); err != nil {
-                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{}{}
-
-                                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
+func (net *network) detach(ch *Channel) {
+        if ch.Detached {
+                return
+        }
+        ch.Detached = true
+        net.user.srv.Logger.Printf("network %q: detaching channel %q", net.GetName(), ch.Name)
+
+        if net.conn != nil {
+                if uch, ok := net.conn.channels[ch.Name]; ok {
+                        uch.updateAutoDetach(0)
+                }
+        }
+
+        net.forEachDownstream(func(dc *downstreamConn) {
+                net.offlineClients[dc.clientName] = struct{}{}
+
+                dc.SendMessage(&irc.Message{
+                        Prefix:  dc.prefix(),
+                        Command: "PART",
+                        Params:  []string{dc.marshalEntity(net, ch.Name), "Detach"},
+                })
+        })
+}
+
+func (net *network) attach(ch *Channel) {
+        if !ch.Detached {
+                return
+        }
+        ch.Detached = false
+        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.conn.updateChannelAutoDetach(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 net.history[ch.Name] != nil {
+                        dc.sendNetworkHistory(net)
+                }
+        })
 }
 
@@ -234 +242 @@
                 return fmt.Errorf("unknown channel %q", name)
         }
+        if net.conn != nil {
+                if uch, ok := net.conn.channels[ch.Name]; ok {
+                        uch.updateAutoDetach(0)
+                }
+        }
+
         if err := net.user.srv.db.DeleteChannel(ch.ID); err != nil {
                 return err
@@ -399 +413 @@
                                 uc.logger.Printf("failed to handle message %q: %v", msg, err)
                         }
+                case eventChannelDetach:
+                        uc, name := e.uc, e.name
+                        c, ok := uc.network.channels[name]
+                        if !ok || c.Detached {
+                                continue
+                        }
+                        uc.network.detach(c)
+                        if err := uc.srv.db.StoreChannel(uc.network.ID, c); err != nil {
+                                u.srv.Logger.Printf("failed to store updated detached channel %q: %v", c.Name, err)
+                        }
                 case eventDownstreamConnected:
                         dc := e.dc
@@ -476 +500 @@
         uc.endPendingLISTs(true)
 
+        for _, uch := range uc.channels {
+                uch.updateAutoDetach(0)
+        }
+
         uc.forEachDownstream(func(dc *downstreamConn) {
                 dc.updateSupportedCaps()