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

trunk/downstream.go

@@ -1158 +1158 @@
                         })
 
-                        ch := &Channel{Name: upstreamName, Key: key, Detached: false}
-                        if current, ok := uc.network.channels[ch.Name]; ok && key == "" {
+                        var ch *Channel
+                        var ok bool
+                        if ch, ok = uc.network.channels[upstreamName]; ok {
                                 // Don't clear the channel key if there's one set
                                 // TODO: add a way to unset the channel key
-                                ch.Key = current.Key
-                        }
-                        if err := uc.network.createUpdateChannel(ch); err != nil {
+                                if key != "" {
+                                        ch.Key = key
+                                }
+                                uc.network.attach(ch)
+                        } else {
+                                ch = &Channel{
+                                        Name: upstreamName,
+                                        Key:  key,
+                                }
+                                uc.network.channels[upstreamName] = ch
+                        }
+                        if err := dc.srv.db.StoreChannel(uc.network.ID, ch); err != nil {
                                 dc.logger.Printf("failed to create or update channel %q: %v", upstreamName, err)
                         }
@@ -1186 +1196 @@
 
                         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)
+                                var ch *Channel
+                                var ok bool
+                                if ch, ok = uc.network.channels[upstreamName]; ok {
+                                        uc.network.detach(ch)
+                                } else {
+                                        ch = &Channel{
+                                                Name:     name,
+                                                Detached: true,
+                                        }
+                                        uc.network.channels[upstreamName] = ch
+                                }
+                                if err := dc.srv.db.StoreChannel(uc.network.ID, ch); err != nil {
+                                        dc.logger.Printf("failed to create or update channel %q: %v", upstreamName, err)
                                 }
                         } else {
@@ -1614 +1634 @@
                         }
                         uc.produce(upstreamName, echoMsg, dc)
+
+                        uc.updateChannelAutoDetach(upstreamName)
                 }
         case "NOTICE":
@@ -1637 +1659 @@
                                 Params:  []string{upstreamName, unmarshaledText},
                         })
+
+                        uc.updateChannelAutoDetach(upstreamName)
                 }
         case "TAGMSG":
@@ -1659 +1683 @@
                                 Params:  []string{upstreamName},
                         })
+
+                        uc.updateChannelAutoDetach(upstreamName)
                 }
         case "INVITE":