Changeset 485 in code for trunk/downstream.go

Timestamp:

Mar 29, 2021, 3:49:50 PM (4 years ago)

Author:

contact

Message:

Introduce deliveredStore

This hides the double-map complexity behind a dedicated type.

File:

• trunk/downstream.go (modified) (4 diffs)

trunk/downstream.go

@@ -362 +362 @@
         }
 
-        delivered := network.delivered.Value(entity)
-        if delivered == nil {
-                return
-        }
-
-        delivered[dc.clientName] = id
+        network.delivered.StoreID(entity, dc.clientName, id)
 }
 
@@ -998 +993 @@
                 })
                 if firstClient {
-                        dc.sendNetworkBacklog(net)
+                        net.delivered.ForEachTarget(func(target string) {
+                                dc.sendTargetBacklog(net, target)
+                        })
                 }
 
                 // Fast-forward history to last message
-                for targetCM, entry := range net.delivered.innerMap {
-                        delivered := entry.value.(deliveredClientMap)
-                        ch := net.channels.Value(targetCM)
+                net.delivered.ForEachTarget(func(target string) {
+                        ch := net.channels.Value(target)
                         if ch != nil && ch.Detached {
-                                continue
-                        }
-
+                                return
+                        }
+
+                        targetCM := net.casemap(target)
                         lastID, err := dc.user.msgStore.LastMsgID(net, targetCM, time.Now())
                         if err != nil {
                                 dc.logger.Printf("failed to get last message ID: %v", err)
-                                continue
-                        }
-                        delivered[dc.clientName] = lastID
-                }
+                                return
+                        }
+
+                        net.delivered.StoreID(target, dc.clientName, lastID)
+                })
         })
 
@@ -1035 +1033 @@
 }
 
-func (dc *downstreamConn) sendNetworkBacklog(net *network) {
-        for _, entry := range net.delivered.innerMap {
-                target := entry.originalKey
-                dc.sendTargetBacklog(net, target)
-        }
-}
-
 func (dc *downstreamConn) sendTargetBacklog(net *network, target string) {
         if dc.caps["draft/chathistory"] || dc.user.msgStore == nil {
@@ -1049 +1040 @@
                 return
         }
-        delivered := net.delivered.Value(target)
-        if delivered == nil {
-                return
-        }
-        lastDelivered, ok := delivered[dc.clientName]
-        if !ok {
+
+        lastDelivered := net.delivered.LoadID(target, dc.clientName)
+        if lastDelivered == "" {
                 return
         }