Changeset 482 in code for trunk/upstream.go

Timestamp:

Mar 29, 2021, 2:55:57 PM (4 years ago)

Author:

contact

Message:

Simplify network.offlineClients

Replace it with a list of all clients (online or offline).

File:

• trunk/upstream.go (modified) (2 diffs)

trunk/upstream.go

@@ -1741 +1741 @@
         }
 
-        detached := false
-        if ch := uc.network.channels.Value(entity); ch != nil {
-                detached = ch.Detached
-        }
-
         delivered := uc.network.delivered.Value(entity)
         entityCM := uc.network.casemap(entity)
         if delivered == nil {
+                // This is the first message we receive from this target. Save the last
+                // message ID in delivery receipts, so that we can send the new message
+                // in the backlog if an offline client reconnects.
                 lastID, err := uc.user.msgStore.LastMsgID(uc.network, entityCM, time.Now())
                 if err != nil {
@@ -1758 +1756 @@
                 uc.network.delivered.SetValue(entity, delivered)
 
-                for clientName, _ := range uc.network.offlineClients {
+                for clientName, _ := range uc.network.clients {
                         delivered[clientName] = lastID
-                }
-
-                if detached {
-                        // If the channel is detached, online clients act as offline
-                        // clients too
-                        uc.forEachDownstream(func(dc *downstreamConn) {
-                                delivered[dc.clientName] = lastID
-                        })
                 }
         }