macltok

public

Star0

Fork 0

Watch0

105 commits 3 branches 0 tags 0 releases3.0 MiB

Commit `417da9e719bc`

tarball

atagen <boss@atagen.co>2026-10-26 03:11 UTC

7 files changed+177-45

repair: open a retained room from the store and probe only its newest gap

When a room already had retained events, the walk from the live end met the newest of them on its first page and fetched nothing. The real gap there was put in by the limited sync, and the room's sliding sync subscription catches up a stale room. So only an empty room walks now, and a retained one gets one page on its newest gap, which joins a gap that skipped nothing now that the fork (ec026bc9) joins on any event below it. A fill that runs out of pages leaves its gap Paused { reason: Budget } rather than Idle, so pressing fill visibly did something.

Modified file: Cargo.lock+10 additions−10 deletions@@ -2217,7 +2217,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=ec026bc9ea2393fd0cce6212b950d91ab6d36097#ec026bc9ea2393fd0cce6212b950d91ab6d36097"
 dependencies = [
  "anymap2",
  "aquamarine",
@@ -2280,7 +2280,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-base"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=ec026bc9ea2393fd0cce6212b950d91ab6d36097#ec026bc9ea2393fd0cce6212b950d91ab6d36097"
 dependencies = [
  "as_variant",
  "assert_matches",
@@ -2310,7 +2310,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-common"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=ec026bc9ea2393fd0cce6212b950d91ab6d36097#ec026bc9ea2393fd0cce6212b950d91ab6d36097"
 dependencies = [
  "eyeball-im",
  "futures-core",
@@ -2333,7 +2333,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-crypto"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=ec026bc9ea2393fd0cce6212b950d91ab6d36097#ec026bc9ea2393fd0cce6212b950d91ab6d36097"
 dependencies = [
  "aes",
  "aquamarine",
@@ -2374,7 +2374,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-indexeddb"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=ec026bc9ea2393fd0cce6212b950d91ab6d36097#ec026bc9ea2393fd0cce6212b950d91ab6d36097"
 dependencies = [
  "async-trait",
  "base64",
@@ -2406,7 +2406,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-sqlite"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=ec026bc9ea2393fd0cce6212b950d91ab6d36097#ec026bc9ea2393fd0cce6212b950d91ab6d36097"
 dependencies = [
  "as_variant",
  "async-trait",
@@ -2433,7 +2433,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-store-encryption"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=ec026bc9ea2393fd0cce6212b950d91ab6d36097#ec026bc9ea2393fd0cce6212b950d91ab6d36097"
 dependencies = [
  "base64",
  "blake3",
@@ -2454,7 +2454,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-test"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=ec026bc9ea2393fd0cce6212b950d91ab6d36097#ec026bc9ea2393fd0cce6212b950d91ab6d36097"
 dependencies = [
  "as_variant",
  "ctor",
@@ -2477,7 +2477,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-test-macros"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=ec026bc9ea2393fd0cce6212b950d91ab6d36097#ec026bc9ea2393fd0cce6212b950d91ab6d36097"
 dependencies = [
  "quote",
  "syn 2.0.119",
@@ -2486,7 +2486,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-ui"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=ec026bc9ea2393fd0cce6212b950d91ab6d36097#ec026bc9ea2393fd0cce6212b950d91ab6d36097"
 dependencies = [
  "as_variant",
  "async-rx",

Modified file: Cargo.toml+9 additions−9 deletions@@ -26,11 +26,11 @@ indexeddb = [
 futures-util = { version = "0.3.31", default-features = false, features = ["std"] }
 http = "1"
 imbl = { version = "6.1.0", default-features = false }
-matrix-sdk = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd", default-features = false, features = ["e2e-encryption"] }
-matrix-sdk-base = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd", default-features = false }
-matrix-sdk-crypto = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd", default-features = false }
-matrix-sdk-store-encryption = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd", optional = true }
-matrix-sdk-ui = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd", default-features = false }
+matrix-sdk = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "ec026bc9ea2393fd0cce6212b950d91ab6d36097", default-features = false, features = ["e2e-encryption"] }
+matrix-sdk-base = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "ec026bc9ea2393fd0cce6212b950d91ab6d36097", default-features = false }
+matrix-sdk-crypto = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "ec026bc9ea2393fd0cce6212b950d91ab6d36097", default-features = false }
+matrix-sdk-store-encryption = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "ec026bc9ea2393fd0cce6212b950d91ab6d36097", optional = true }
+matrix-sdk-ui = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "ec026bc9ea2393fd0cce6212b950d91ab6d36097", default-features = false }
 ruma = { version = "0.16.0", default-features = false, features = ["unstable-msc2545", "unstable-msc4095"] }
 serde = { version = "1.0.219", features = ["derive", "rc"], optional = true }
 serde_json = { version = "1.0.143", features = ["raw_value"] }
@@ -54,8 +54,8 @@ js-sys = { version = "0.3.105", optional = true }
 # tantivy 0.26's merger reads Instant::now() whenever debug logging is on, and that panics in
 # wasm. both caps, since a release_max_level a host sets would otherwise win in release
 log = { version = "0.4.29", features = ["max_level_info", "release_max_level_info"] }
-matrix-sdk = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd", default-features = false, features = ["js"] }
-matrix-sdk-ui = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd", default-features = false, features = ["js"] }
+matrix-sdk = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "ec026bc9ea2393fd0cce6212b950d91ab6d36097", default-features = false, features = ["js"] }
+matrix-sdk-ui = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "ec026bc9ea2393fd0cce6212b950d91ab6d36097", default-features = false, features = ["js"] }
 # the sdk's own wasm reqwest leaves out stream, which the bounded media download needs
 reqwest = { version = "0.13.1", default-features = false, features = ["stream"] }
 uuid = { version = "1", features = ["js"] }
@@ -70,8 +70,8 @@ web-sys = { version = "0.3.105", optional = true, features = [
 ] }
 
 [target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
-matrix-sdk = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd", default-features = false, features = ["testing"] }
-matrix-sdk-test = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd" }
+matrix-sdk = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "ec026bc9ea2393fd0cce6212b950d91ab6d36097", default-features = false, features = ["testing"] }
+matrix-sdk-test = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "ec026bc9ea2393fd0cce6212b950d91ab6d36097" }
 tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread", "signal", "time"] }
 wiremock = "0.6.5"
 

Modified file: src/engine/repair.rs+56 additions−12 deletions@@ -103,8 +103,29 @@ impl RepairController {
         self.running.is_some()
     }
 
+    /// a room with retained events already shows the live end, and a limited sync has put its
+    /// own gap there, so only an empty room walks back from the live end. otherwise the newest
+    /// gap gets one page, so a limited sync that skipped nothing leaves no gap behind
     pub(super) async fn start_recent(&mut self) {
-        self.start_recent_with(None).await;
+        let retained = async {
+            let (cache, _handles) = self.room.event_cache().await?;
+            if !cache.has_retained_events().await? {
+                return Ok(None);
+            }
+            let gaps = cache.history_gaps().await?;
+            Ok::<_, EventCacheError>(Some(gaps.into_iter().rev().find(|gap| {
+                matches!(
+                    gap.status,
+                    HistoryGapStatus::Idle | HistoryGapStatus::Failed { .. }
+                )
+            })))
+        }
+        .await;
+        match retained {
+            Ok(Some(Some(gap))) => self.start_gap_fill(gap.id, None, 1, false).await,
+            Ok(Some(None)) => {}
+            Ok(None) | Err(_) => self.start_recent_with(None).await,
+        }
     }
 
     pub(super) async fn execute(&mut self, command: HistoryRepairCommand, reply: Responder) {
@@ -122,7 +143,8 @@ impl RepairController {
             }
             HistoryRepairCommand::RetryRecent { .. } => self.start_recent_with(Some(reply)).await,
             HistoryRepairCommand::FillGap { gap_id, .. } => {
-                self.start_gap_fill(gap_id, reply).await;
+                self.start_gap_fill(gap_id, Some(reply), MAX_GAP_PAGES, true)
+                    .await;
             }
         }
     }
@@ -169,9 +191,17 @@ impl RepairController {
         });
     }
 
-    async fn start_gap_fill(&mut self, gap_id: OwnedTransactionId, responder: Responder) {
+    async fn start_gap_fill(
+        &mut self,
+        gap_id: OwnedTransactionId,
+        responder: Option<Responder>,
+        pages: u32,
+        spend_budget: bool,
+    ) {
         if self.is_running() {
-            responder.done(Err(room_busy()));
+            if let Some(responder) = responder {
+                responder.done(Err(room_busy()));
+            }
             return;
         }
         let room = self.room.clone();
@@ -183,18 +213,24 @@ impl RepairController {
             .await
             .is_err()
         {
-            responder.done(Err(Error::interrupted()));
+            if let Some(responder) = responder {
+                responder.done(Err(Error::interrupted()));
+            }
             return;
         }
         let (cancel, receiver) = watch::channel(false);
-        let task = spawn(async move { fill_gap(room, progress, receiver).await });
+        let task =
+            spawn(async move { fill_gap(room, progress, receiver, pages, spend_budget).await });
         self.running = Some(Running {
             task,
             cancel,
-            responders: vec![PendingResponder {
-                responder,
-                cancel_ack: false,
-            }],
+            responders: responder
+                .map(|responder| PendingResponder {
+                    responder,
+                    cancel_ack: false,
+                })
+                .into_iter()
+                .collect(),
             gap_id: Some(gap_id),
             closing: false,
         });
@@ -285,11 +321,13 @@ async fn fill_gap(
     room: Room,
     mut report: HistoryRepairReport,
     mut cancel: watch::Receiver<bool>,
+    pages: u32,
+    spend_budget: bool,
 ) -> Finished {
     let mut committed = false;
     let stopped = async {
         let (cache, _handles) = room.event_cache().await.map_err(cache_error)?;
-        for _ in 0..MAX_GAP_PAGES {
+        for _ in 0..pages {
             let next = tokio::select! {
                 biased;
                 _ = cancel.changed() => return Ok(Stopped::Cancelled),
@@ -339,10 +377,16 @@ async fn fill_gap(
                 HistoryGapStatus::Failed { message } => {
                     return Err(Error::new(ErrorKind::Network, message));
                 }
-                HistoryGapStatus::Idle => {}
+                HistoryGapStatus::Idle | HistoryGapStatus::BudgetSpent => {}
             }
         }
         report.stop = Some(HistoryRepairStop::Budget);
+        if spend_budget {
+            if let Err(error) = cache.spend_history_budget(report.gap_id.clone()).await {
+                tracing::debug!(%error, "marking a history gap's spent budget failed");
+            }
+            committed = true;
+        }
         Ok(Stopped::Done)
     }
     .await

Modified file: src/lib.rs+2 additions−2 deletions@@ -77,8 +77,8 @@ pub use model::{
     VerificationAction, VerificationFailure, VerificationState, VerificationTarget,
 };
 pub use repair_model::{
-    HistoryContinuity, HistoryGap, HistoryGapLifecycle, HistoryRepairCommand, HistoryRepairPhase,
-    HistoryRepairReport, HistoryRepairStop,
+    HistoryContinuity, HistoryGap, HistoryGapLifecycle, HistoryGapPause, HistoryRepairCommand,
+    HistoryRepairPhase, HistoryRepairReport, HistoryRepairStop,
 };
 pub use ruma;
 pub use search_model::{

Modified file: src/normalise/timeline.rs+18 additions−5 deletions@@ -19,9 +19,10 @@ use ruma::{
 };
 
 use crate::{
-    Change, HistoryGap, HistoryGapLifecycle, MediaId, MembershipChange, Message, MessageKind,
-    MessageMentions, Reaction, ReplyDetails, ReplyReference, SendState, Sender, ThreadSummary,
-    TimelineContent, TimelineDiff, TimelineEvent, TimelineItem, TimelineItemId, UtdCause,
+    Change, HistoryGap, HistoryGapLifecycle, HistoryGapPause, MediaId, MembershipChange, Message,
+    MessageKind, MessageMentions, Reaction, ReplyDetails, ReplyReference, SendState, Sender,
+    ThreadSummary, TimelineContent, TimelineDiff, TimelineEvent, TimelineItem, TimelineItemId,
+    UtdCause,
 };
 
 use super::link_preview::sender_previews;
@@ -75,7 +76,18 @@ impl Normaliser<'_> {
                     HistoryGapStatus::Idle | HistoryGapStatus::Joined => {
                         (HistoryGapLifecycle::Idle, None)
                     }
-                    HistoryGapStatus::Paused => (HistoryGapLifecycle::Paused, None),
+                    HistoryGapStatus::Paused => (
+                        HistoryGapLifecycle::Paused {
+                            reason: HistoryGapPause::CursorStalled,
+                        },
+                        None,
+                    ),
+                    HistoryGapStatus::BudgetSpent => (
+                        HistoryGapLifecycle::Paused {
+                            reason: HistoryGapPause::Budget,
+                        },
+                        None,
+                    ),
                     HistoryGapStatus::Failed { message } => {
                         (HistoryGapLifecycle::Failed, Some(message.clone()))
                     }
@@ -107,7 +119,8 @@ impl Normaliser<'_> {
                         timestamp_ms: embedded.timestamp.get().into(),
                     },
                     TimelineDetails::Unavailable => {
-                        self.missing_replies.extend(event.event_id().map(ToOwned::to_owned));
+                        self.missing_replies
+                            .extend(event.event_id().map(ToOwned::to_owned));
                         ReplyDetails::Pending
                     }
                     TimelineDetails::Pending => ReplyDetails::Pending,

Modified file: src/repair_model.rs+11 additions−1 deletions@@ -34,12 +34,22 @@ pub struct HistoryGap {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum HistoryGapLifecycle {
     Idle,
-    Paused,
+    /// the last fill stopped short of joining, and another one carries on from there
+    Paused {
+        reason: HistoryGapPause,
+    },
     Failed,
     /// accessible history ends before the older section, so this interval stays
     Unavailable,
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+pub enum HistoryGapPause {
+    CursorStalled,
+    Budget,
+}
+
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum HistoryContinuity {

Modified file: tests/history_repair.rs+71 additions−6 deletions@@ -181,7 +181,7 @@ fn gap_in(items: &imbl::Vector<TimelineItem>) -> Option<HistoryGap> {
 }
 
 #[tokio::test]
-async fn automatic_recent_load_is_bounded_and_keeps_cached_history_behind_a_gap() {
+async fn a_recent_load_is_bounded_and_keeps_cached_history_behind_a_gap() {
     let room_id = room_id!("!recent-repair:localhost");
     let old_id = event_id!("$old:localhost");
     let new_ids = [
@@ -216,6 +216,10 @@ async fn automatic_recent_load_is_bounded_and_keeps_cached_history_behind_a_gap(
     }
     cache_event_before_open(&room, room_id, old_id, "retained old event").await;
     open_room(&mut room, room_id).await;
+    room.handle
+        .retry_recent_history(room_id.to_owned())
+        .await
+        .unwrap();
     timeline_until(&mut room, |items| {
         gap_in(items).is_some()
             && has_event(items, old_id)
@@ -342,6 +346,10 @@ async fn fill_gap_returns_after_the_mirror_contains_the_committed_rows() {
         )
         .await;
     handle.open_room(room_id.to_owned()).await.unwrap();
+    handle
+        .retry_recent_history(room_id.to_owned())
+        .await
+        .unwrap();
     let timeline_id = TimelineId::from(room_id.to_owned());
     let gap = tokio::time::timeout(Duration::from_secs(5), async {
         loop {
@@ -452,6 +460,10 @@ async fn cancelling_a_gap_fill_keeps_committed_progress_for_retry() {
         .await;
     cache_event_before_open(&room, room_id, old_id, "old cached").await;
     open_room(&mut room, room_id).await;
+    room.handle
+        .retry_recent_history(room_id.to_owned())
+        .await
+        .unwrap();
     timeline_until(&mut room, |items| gap_in(items).is_some()).await;
     let gap = gap_in(&room.items).unwrap();
     assert_eq!(
@@ -548,7 +560,7 @@ async fn cancelling_a_gap_fill_keeps_committed_progress_for_retry() {
 }
 
 #[tokio::test]
-async fn failed_automatic_recent_load_is_public_and_keeps_the_cached_timeline() {
+async fn failed_recent_load_is_public_and_keeps_the_cached_timeline() {
     let room_id = room_id!("!failed-recent:localhost");
     let old_id = event_id!("$failed-old:localhost");
     let mut room = start_room(room_id).await;
@@ -563,6 +575,12 @@ async fn failed_automatic_recent_load_is_public_and_keeps_the_cached_timeline() 
         .await;
     cache_event_before_open(&room, room_id, old_id, "kept event").await;
     open_room(&mut room, room_id).await;
+    assert!(
+        room.handle
+            .retry_recent_history(room_id.to_owned())
+            .await
+            .is_err()
+    );
     let state = wait_for_recent(&mut room, room_id).await;
     assert!(matches!(state, RecentHistoryState::Failed(_)));
     shut_down(&room.handle, &mut room.events, room.running).await;
@@ -653,12 +671,59 @@ async fn a_reply_whose_target_is_not_loaded_fetches_it() {
     timeline_until(&mut room, |items| {
         items.iter().any(|item| {
             matches!(item, TimelineItem::Event(event)
-                if event.event_id.as_deref() == Some(reply_id)
-                    && event.reply_to.as_ref().is_some_and(|reply| {
-                        matches!(reply.details, macltok::ReplyDetails::Ready { .. })
-                    }))
+            if event.event_id.as_deref() == Some(reply_id)
+                && event.reply_to.as_ref().is_some_and(|reply| {
+                    matches!(reply.details, macltok::ReplyDetails::Ready { .. })
+                }))
         })
     })
     .await;
     shut_down(&room.handle, &mut room.events, room.running).await;
 }
+
+#[tokio::test]
+async fn opening_a_retained_room_only_probes_its_newest_gap() {
+    let room_id = room_id!("!probe:localhost");
+    let old_id = event_id!("$probe-old:localhost");
+    let live_id = event_id!("$probe-live:localhost");
+    let mut room = start_room(room_id).await;
+    cache_event_before_open(&room, room_id, old_id, "retained").await;
+    room.server
+        .sync_room(
+            &room.sync_client,
+            JoinedRoomBuilder::new(room_id)
+                .add_timeline_event(
+                    EventFactory::new()
+                        .text_msg("live")
+                        .event_id(live_id)
+                        .sender(&ALICE),
+                )
+                .set_timeline_limited()
+                .set_timeline_prev_batch("sync-edge"),
+        )
+        .await;
+    room.server
+        .mock_room_messages()
+        .match_from("sync-edge")
+        .ok(RoomMessagesResponseTemplate::default()
+            .end_token("further")
+            .events(vec![history_event(room_id, old_id, "retained")]))
+        .mock_once()
+        .mount()
+        .await;
+    open_room(&mut room, room_id).await;
+    let report = wait_for_settled_fill(&mut room).await;
+    assert_eq!(report.pages, 1);
+    assert_eq!(report.stop, None);
+    timeline_until(&mut room, |items| {
+        gap_in(items).is_none() && has_event(items, old_id) && has_event(items, live_id)
+    })
+    .await;
+    let requests = room.server.received_requests().await.unwrap();
+    let messages = requests
+        .iter()
+        .filter(|request| request.url.path().ends_with("/messages"))
+        .count();
+    assert_eq!(messages, 1);
+    shut_down(&room.handle, &mut room.events, room.running).await;
+}

macltok

Commit 417da9e719bc

Commit `417da9e719bc`