Changeset 495 in code

Timestamp:

Apr 13, 2021, 3:49:37 PM (4 years ago)

Author:

contact

Message:

Take msg ID in sendTargetBacklog

Location:

trunk

Files:

• downstream.go (modified) (3 diffs)
• user.go (modified) (1 diff)

trunk/downstream.go

@@ -987 +987 @@
                 if firstClient {
                         net.delivered.ForEachTarget(func(target string) {
-                                dc.sendTargetBacklog(net, target)
-                        })
-                }
-
-                // Fast-forward history to last message
-                net.delivered.ForEachTarget(func(target string) {
-                        ch := net.channels.Value(target)
-                        if ch != nil && ch.Detached {
-                                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)
-                                return
-                        }
-
-                        net.delivered.StoreID(target, dc.clientName, lastID)
-                })
+                                lastDelivered := net.delivered.LoadID(target, dc.clientName)
+                                if lastDelivered == "" {
+                                        return
+                                }
+
+                                dc.sendTargetBacklog(net, target, lastDelivered)
+
+                                // Fast-forward history to last message
+                                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)
+                                        return
+                                }
+                                net.delivered.StoreID(target, dc.clientName, lastID)
+                        })
+                }
         })
 
@@ -1026 +1023 @@
 }
 
-func (dc *downstreamConn) sendTargetBacklog(net *network, target string) {
+func (dc *downstreamConn) sendTargetBacklog(net *network, target, msgID string) {
         if dc.caps["draft/chathistory"] || dc.user.msgStore == nil {
                 return
@@ -1034 +1031 @@
         }
 
-        lastDelivered := net.delivered.LoadID(target, dc.clientName)
-        if lastDelivered == "" {
-                return
-        }
-
         limit := 4000
         targetCM := net.casemap(target)
-        history, err := dc.user.msgStore.LoadLatestID(net, targetCM, lastDelivered, limit)
+        history, err := dc.user.msgStore.LoadLatestID(net, targetCM, msgID, limit)
         if err != nil {
-                dc.logger.Printf("failed to send implicit history for %q: %v", target, err)
+                dc.logger.Printf("failed to send backlog for %q: %v", target, err)
                 return
         }

trunk/user.go

@@ -277 +277 @@
                 }
 
-                dc.sendTargetBacklog(net, ch.Name)
+                lastDelivered := net.delivered.LoadID(ch.Name, dc.clientName)
+                if lastDelivered == "" {
+                        return
+                }
+
+                dc.sendTargetBacklog(net, ch.Name, lastDelivered)
         })
 }