Changeset 497 in code for trunk/user.go

Timestamp:

Apr 13, 2021, 4:15:30 PM (4 years ago)

Author:

contact

Message:

Store last internal msg ID in DB when detaching

References: ​https://todo.sr.ht/~emersion/soju/98

File:

• trunk/user.go (modified) (3 diffs)

trunk/user.go

@@ -233 +233 @@
                 return
         }
+
+        net.user.logger.Printf("network %q: detaching channel %q", net.GetName(), ch.Name)
+
         ch.Detached = true
-        net.user.logger.Printf("network %q: detaching channel %q", net.GetName(), ch.Name)
+
+        if net.user.msgStore != nil {
+                nameCM := net.casemap(ch.Name)
+                lastID, err := net.user.msgStore.LastMsgID(net, nameCM, time.Now())
+                if err != nil {
+                        net.user.logger.Printf("failed to get last message ID for channel %q: %v", ch.Name, err)
+                }
+                ch.DetachedInternalMsgID = lastID
+        }
 
         if net.conn != nil {
@@ -256 +267 @@
                 return
         }
+
+        net.user.logger.Printf("network %q: attaching channel %q", net.GetName(), ch.Name)
+
+        detachedMsgID := ch.DetachedInternalMsgID
         ch.Detached = false
-        net.user.logger.Printf("network %q: attaching channel %q", net.GetName(), ch.Name)
+        ch.DetachedInternalMsgID = ""
 
         var uch *upstreamChannel
@@ -277 +292 @@
                 }
 
-                lastDelivered := net.delivered.LoadID(ch.Name, dc.clientName)
-                if lastDelivered == "" {
-                        return
-                }
-
-                dc.sendTargetBacklog(net, ch.Name, lastDelivered)
+                if detachedMsgID != "" {
+                        dc.sendTargetBacklog(net, ch.Name, detachedMsgID)
+                }
         })
 }