macltok

public

Star0

Fork 0

Watch0

72 commits 3 branches 0 tags 0 releases3.0 MiB

Commit `913832a327a8`

tarball

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

6 files changed+48-14

timeline: carry the push rule highlight on every event

Malice had no way to tell which rows the push rules flag for the user, which the sdk already computes as is_highlighted. Context pages take it from the push actions the sdk attaches as it fetches, so the flag costs no extra request.

Modified file: src/engine/context.rs+40 additions−11 deletions@@ -1,8 +1,10 @@
 use std::{collections::HashMap, sync::Arc};
 
 use futures_util::future::{join_all, try_join};
-use matrix_sdk::{Room, room::MessagesOptions};
-use ruma::{OwnedEventId, OwnedUserId, UInt};
+use matrix_sdk::{
+    Room, deserialized_responses::TimelineEvent as SdkTimelineEvent, room::MessagesOptions,
+};
+use ruma::{OwnedEventId, OwnedUserId, UInt, push::Action};
 use serde_json::Value;
 
 use crate::{
@@ -51,7 +53,14 @@ pub(crate) async fn execute(
         ));
     }
     let side = fetch_side(&room, Some(&token), limit, backwards).await?;
-    let mut page = Assembly::new(&room, current_user_id.as_deref(), &side.values, None).await;
+    let mut page = Assembly::new(
+        &room,
+        current_user_id.as_deref(),
+        &side.values,
+        &side.highlights,
+        None,
+    )
+    .await;
     let events = page.take(0..side.values.len());
     media.register(page.media).await;
     Ok(crate::CommandOutput::EventContextPage(EventContextPage {
@@ -84,10 +93,10 @@ pub(crate) async fn capture(
                 error
             }
         })?;
-    let target = raw
+    let (target, target_highlight) = raw
         .event
         .as_ref()
-        .and_then(|event| serde_json::from_str::<Value>(event.raw().json().get()).ok())
+        .and_then(raw_event)
         .ok_or_else(|| Error::new(ErrorKind::EventNotFound, "event was not found"))?;
     let (before, after) = try_join(
         fetch_side(&room, raw.prev_batch_token.as_deref(), before_limit, true),
@@ -98,10 +107,14 @@ pub(crate) async fn capture(
     let mut values = before.values;
     values.push(target);
     values.extend(after.values);
+    let mut highlights = before.highlights;
+    highlights.push(target_highlight);
+    highlights.extend(after.highlights);
     let mut page = Assembly::new(
         &room,
         current_user_id.as_deref(),
         &values,
+        &highlights,
         Some(target_index),
     )
     .await;
@@ -127,9 +140,19 @@ pub(crate) async fn capture(
 struct Side {
     /// in timeline order
     values: Vec<Value>,
+    /// beside `values`, from the push actions the sdk worked out as it fetched
+    highlights: Vec<bool>,
     token: Option<String>,
 }
 
+fn raw_event(event: &SdkTimelineEvent) -> Option<(Value, bool)> {
+    let value = serde_json::from_str(event.raw().json().get()).ok()?;
+    let highlight = event
+        .push_actions()
+        .is_some_and(|actions| actions.iter().any(Action::is_highlight));
+    Some((value, highlight))
+}
+
 async fn fetch_side(
     room: &Room,
     token: Option<&str>,
@@ -139,12 +162,14 @@ async fn fetch_side(
     let Some(token) = token else {
         return Ok(Side {
             values: Vec::new(),
+            highlights: Vec::new(),
             token: None,
         });
     };
     if limit == 0 {
         return Ok(Side {
             values: Vec::new(),
+            highlights: Vec::new(),
             token: Some(token.to_owned()),
         });
     }
@@ -159,16 +184,14 @@ async fn fetch_side(
         .messages(options)
         .await
         .map_err(|source| Error::from_sdk("fetching event context events failed", source))?;
-    let mut values: Vec<Value> = messages
-        .chunk
-        .iter()
-        .filter_map(|event| serde_json::from_str(event.raw().json().get()).ok())
-        .collect();
+    let mut events: Vec<_> = messages.chunk.iter().filter_map(raw_event).collect();
     if backwards {
-        values.reverse();
+        events.reverse();
     }
+    let (values, highlights) = events.into_iter().unzip();
     Ok(Side {
         values,
+        highlights,
         token: messages.end,
     })
 }
@@ -184,10 +207,16 @@ impl Assembly {
         room: &Room,
         current_user_id: Option<&ruma::UserId>,
         values: &[Value],
+        highlights: &[bool],
         keep: Option<usize>,
     ) -> Self {
         let page = normalise_context(values, keep, current_user_id, room.room_id());
         let mut items = page.items;
+        for (index, item) in &mut items {
+            if let TimelineItem::Event(event) = item {
+                event.highlight = highlights[*index];
+            }
+        }
         let mut media = page.media;
         let mut targets: HashMap<OwnedEventId, TimelineEvent> = HashMap::new();
         let mut missing = Vec::new();

Modified file: src/engine/mod.rs+3 additions−3 deletions@@ -172,9 +172,9 @@ impl EngineError {
             kind: match self {
                 Self::EventReceiverClosed => EngineErrorKind::EventReceiverClosed,
                 Self::TaskPanicked { .. } => EngineErrorKind::Watcher,
-                Self::Unauthenticated
-                | Self::ZeroCapacity
-                | Self::SyncService(_) => EngineErrorKind::Other,
+                Self::Unauthenticated | Self::ZeroCapacity | Self::SyncService(_) => {
+                    EngineErrorKind::Other
+                }
             },
             message: self.to_string(),
         }

Modified file: src/mentions/state_tests.rs+1

@@ -60,6 +60,7 @@ fn message_event(event_id: &str, timestamp_ms: u64, body: &str) -> TimelineItem

6060 reactions: Vec::new(),

6161 read_by: Vec::new(),

6262 editable: false,

63+ highlight: false,

6364 }))

6465 }

6566

Modified file: src/model.rs+2

@@ -1629,6 +1629,8 @@ pub struct TimelineEvent {

16291629 pub reactions: Vec<Reaction>,

16301630 pub read_by: Vec<OwnedUserId>,

16311631 pub editable: bool,

1632+ /// the push rules ask for this one to stand out, always false for a local echo

1633+ pub highlight: bool,

16321634 }

16331635

16341636 impl TimelineEvent {

Modified file: src/normalise/observed.rs+1

@@ -182,6 +182,7 @@ pub(crate) fn normalise_observed(

182182 reactions: Vec::new(),

183183 read_by: Vec::new(),

184184 editable: false,

185+ highlight: false,

185186 };

186187 Some((TimelineItem::Event(Box::new(event)), media))

187188 }

Modified file: src/normalise/timeline.rs+1

@@ -145,6 +145,7 @@ impl Normaliser<'_> {

145145 reactions: reactions(event, self.current_user_id),

146146 read_by,

147147 editable: event.is_editable(),

148+ highlight: event.is_highlighted(),

148149 }

149150 }

150151 }

macltok

Commit 913832a327a8

Commit `913832a327a8`