Changeset 435 in code for trunk/upstream.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/upstream.go (modified) (6 diffs)

trunk/upstream.go

@@ -51 +51 @@
         Members      map[string]*memberships
         complete     bool
+        detachTimer  *time.Timer
+}
+
+func (uc *upstreamChannel) updateAutoDetach(dur time.Duration) {
+        if uc.detachTimer != nil {
+                uc.detachTimer.Stop()
+                uc.detachTimer = nil
+        }
+
+        if dur == 0 {
+                return
+        }
+
+        uc.detachTimer = time.AfterFunc(dur, func() {
+                uc.conn.network.user.events <- eventChannelDetach{
+                        uc:   uc.conn,
+                        name: uc.Name,
+                }
+        })
 }
 
@@ -404 +423 @@
                                 target = msg.Prefix.Name
                         }
+
+                        if ch, ok := uc.network.channels[target]; ok {
+                                if ch.Detached {
+                                        uc.handleDetachedMessage(msg.Prefix.Name, text, ch)
+                                }
+
+                                highlight := msg.Prefix.Name != uc.nick && isHighlight(text, uc.nick)
+                                if ch.DetachOn == FilterMessage || ch.DetachOn == FilterDefault || (ch.DetachOn == FilterHighlight && highlight) {
+                                        uc.updateChannelAutoDetach(target)
+                                }
+                        }
+
                         uc.produce(target, msg, nil)
-
-                        highlight := msg.Prefix.Name != uc.nick && isHighlight(text, uc.nick)
-                        if ch, ok := uc.network.channels[target]; ok && ch.Detached && highlight {
-                                uc.forEachDownstream(func(dc *downstreamConn) {
-                                        sendServiceNOTICE(dc, fmt.Sprintf("highlight in %v: <%v> %v", dc.marshalEntity(uc.network, ch.Name), msg.Prefix.Name, text))
-                                })
-                        }
                 }
         case "CAP":
@@ -737 +761 @@
                                         Members: make(map[string]*memberships),
                                 }
+                                uc.updateChannelAutoDetach(ch)
 
                                 uc.SendMessage(&irc.Message{
@@ -767 +792 @@
                         if msg.Prefix.Name == uc.nick {
                                 uc.logger.Printf("parted channel %q", ch)
-                                delete(uc.channels, ch)
+                                if uch, ok := uc.channels[ch]; ok {
+                                        delete(uc.channels, ch)
+                                        uch.updateAutoDetach(0)
+                                }
                         } else {
                                 ch, err := uc.getChannel(ch)
@@ -1409 +1437 @@
 }
 
+func (uc *upstreamConn) handleDetachedMessage(sender string, text string, ch *Channel) {
+        highlight := sender != uc.nick && isHighlight(text, uc.nick)
+        if ch.RelayDetached == FilterMessage || ((ch.RelayDetached == FilterHighlight || ch.RelayDetached == FilterDefault) && highlight) {
+                uc.forEachDownstream(func(dc *downstreamConn) {
+                        if highlight {
+                                sendServiceNOTICE(dc, fmt.Sprintf("highlight in %v: <%v> %v", dc.marshalEntity(uc.network, ch.Name), sender, text))
+                        } else {
+                                sendServiceNOTICE(dc, fmt.Sprintf("message in %v: <%v> %v", dc.marshalEntity(uc.network, ch.Name), sender, text))
+                        }
+                })
+        }
+        if ch.ReattachOn == FilterMessage || (ch.ReattachOn == FilterHighlight && highlight) {
+                uc.network.attach(ch)
+                if err := uc.srv.db.StoreChannel(uc.network.ID, ch); err != nil {
+                        uc.logger.Printf("failed to update channel %q: %v", ch.Name, err)
+                }
+        }
+}
+
 func (uc *upstreamConn) handleSupportedCaps(capsStr string) {
         caps := strings.Fields(capsStr)
@@ -1702 +1749 @@
         uc.away = away
 }
+
+func (uc *upstreamConn) updateChannelAutoDetach(name string) {
+        if uch, ok := uc.channels[name]; ok {
+                if ch, ok := uc.network.channels[name]; ok && !ch.Detached {
+                        uch.updateAutoDetach(ch.DetachAfter)
+                }
+        }
+}