macltok

public

Star0

Fork 0

Watch0

102 commits 3 branches 0 tags 0 releases3.0 MiB

Commit `93d4735d70cf`

tarball

atagen <boss@atagen.co>2026-10-26 01:37 UTC

2 files changed+80-1

mentions: keep a captured profile when observing an event again

Each sync in a room observes its saved entries again from raw, and a fresh normalisation carries no profile, so it replaced the captured sender, reset the capture to Pending and fetched the context once more. In a busy room the ping spent most of its life without a profile, and the neighbours lost theirs on the re-observe right after the capture.

Modified file: src/mentions/service.rs+5 additions−1 deletions@@ -914,6 +914,9 @@ impl Service {
             };
             resolve_replies(std::iter::once(&mut **event), &targets);
         }
+        if let Some(saved) = data.events.get(&identity) {
+            improve(&mut item, &saved.item);
+        }
         self.supplement(data, &key, &item, &media, &value);
         let (reasons, suppressed, unresolved) = self.classify(data, room_id, &value).await;
         if unresolved {
@@ -1680,7 +1683,8 @@ fn retry_at(error: &Error, fallback_ms: u64) -> u64 {
 }
 
 /// the capture fetched what observing at sync time couldn't, so its profile and reply win
-/// over the saved ones, while the saved content keeps its own edits and redactions
+/// over the saved ones, while the saved content keeps its own edits and redactions. observing
+/// again calls it the other way round, or every sync in the room wipes the profile
 fn improve(saved: &mut TimelineItem, captured: &TimelineItem) {
     let (TimelineItem::Event(saved), TimelineItem::Event(captured)) = (saved, captured) else {
         return;

Modified file: src/mentions/service_tests.rs+75 additions@@ -696,3 +696,78 @@ async fn explicit_recovery_rechecks_server_support() {
     assert!(service.data.coverage.recovering);
     assert_eq!(service.recovery_budget, 20);
 }
+
+#[tokio::test]
+async fn observing_again_keeps_the_profiles_a_capture_fetched() {
+    let server = MatrixMockServer::new().await;
+    let room_id = room_id!("!mentions:localhost");
+    let (client, own_user) = joined_client(&server, room_id).await;
+    let raw = |event: matrix_sdk::ruma::serde::Raw<_>, timestamp: u64| {
+        let mut value: serde_json::Value = serde_json::from_str(event.json().get()).unwrap();
+        value["origin_server_ts"] = json!(timestamp);
+        value
+    };
+    let factory = EventFactory::new().room(room_id).sender(user_id!("@bob:localhost"));
+    let mention = raw(
+        factory
+            .text_msg("ping")
+            .mentions(Mentions::with_user_ids([own_user]))
+            .event_id(event_id!("$ping:localhost"))
+            .into_raw_sync(),
+        10,
+    );
+    let following = raw(
+        factory
+            .text_msg("following")
+            .event_id(event_id!("$following:localhost"))
+            .into_raw_sync(),
+        11,
+    );
+    let service = service(&client, None).await;
+    let room_id = room_id.to_owned();
+    let mut data = Data::default();
+    service.observe(&mut data, &room_id, mention.clone()).await;
+    let ping = format!("{room_id}\n$ping:localhost");
+    let following_id = format!("{room_id}\n$following:localhost");
+
+    let profiled = |item: &TimelineItem| {
+        let mut item = item.clone();
+        if let TimelineItem::Event(event) = &mut item {
+            event.sender.display_name = Some("Bob".to_owned());
+        }
+        item
+    };
+    let target = profiled(&data.entries[&ping].event);
+    let mut neighbour = normalise_observed(&following, None, &following_id).unwrap().0;
+    neighbour = profiled(&neighbour);
+    let revision = data.entries[&ping].revision;
+    service.captured(
+        &mut data,
+        ping.clone(),
+        revision,
+        Ok((
+            crate::EventContext {
+                events_before: Vec::new(),
+                event: target,
+                events_after: vec![neighbour],
+                start_token: None,
+                end_token: None,
+            },
+            Vec::new(),
+            Vec::new(),
+        )),
+    );
+    let capture = data.entries[&ping].capture.clone();
+
+    service.observe(&mut data, &room_id, following).await;
+    service.observe(&mut data, &room_id, mention).await;
+
+    let name = |item: &TimelineItem| match item {
+        TimelineItem::Event(event) => event.sender.display_name.clone(),
+        _ => None,
+    };
+    assert_eq!(name(&data.entries[&ping].event).as_deref(), Some("Bob"));
+    assert_eq!(name(&data.events[&ping].item).as_deref(), Some("Bob"));
+    assert_eq!(name(&data.events[&following_id].item).as_deref(), Some("Bob"));
+    assert_eq!(data.entries[&ping].capture, capture);
+}

macltok

Commit 93d4735d70cf

Commit `93d4735d70cf`