macltok

public

Star0

Fork 0

Watch0

67 commits 3 branches 0 tags 0 releases3.0 MiB

Commit `258c08ec2168`

tarball

atagen <boss@atagen.co>2026-10-25 09:15 UTC

3 files changed+12-9

mentions: follow the required context event

EventContext.event is no longer optional, so a saved window whose target event is gone yields no context at all rather than one without its event. Only compiles together with the change that makes EventContext.event a TimelineItem.

Modified file: src/mentions/service.rs+1−1

@@ -1405,7 +1405,7 @@ impl Service {

14051405 .into_iter()

14061406 .filter_map(&mut insert)

14071407 .collect();

1408- let target = context.event.and_then(&mut insert);

1408+ let target = insert(context.event);

14091409 let mut after: Vec<_> = context

14101410 .events_after

14111411 .into_iter()

Modified file: src/mentions/service_tests.rs+2 additions−2 deletions@@ -532,7 +532,7 @@ async fn live_context_survives_capture_then_edit_and_redaction() {
         Ok((
             crate::EventContext {
                 events_before: Vec::new(),
-                event: Some(target),
+                event: target,
                 events_after: Vec::new(),
                 start_token: None,
                 end_token: None,
@@ -611,7 +611,7 @@ async fn live_context_survives_capture_then_edit_and_redaction() {
         panic!("retry should return saved context");
     };
     assert_eq!(context.state, MentionCaptureState::Pending);
-    assert!(context.context.unwrap().event.is_some());
+    assert!(context.context.is_some());
 }
 
 #[tokio::test]

Modified file: src/mentions/state.rs+9 additions−6 deletions@@ -285,12 +285,15 @@ impl Data {
                 event.item.clone()
             })
         };
-        let context = self.windows.get(&id(key)).map(|window| EventContext {
-            events_before: window.before.iter().filter_map(&mut item).collect(),
-            event: window.target.as_ref().and_then(&mut item),
-            events_after: window.after.iter().filter_map(&mut item).collect(),
-            start_token: window.start.clone(),
-            end_token: window.end.clone(),
+        let context = self.windows.get(&id(key)).and_then(|window| {
+            let event = window.target.as_ref().and_then(&mut item)?;
+            Some(EventContext {
+                events_before: window.before.iter().filter_map(&mut item).collect(),
+                event,
+                events_after: window.after.iter().filter_map(&mut item).collect(),
+                start_token: window.start.clone(),
+                end_token: window.end.clone(),
+            })
         });
         Ok((
             SavedMentionContext {

macltok

Commit 258c08ec2168

Commit `258c08ec2168`