macltok

public

Star0

Fork 0

Watch0

38 commits 3 branches 0 tags 0 releases3.0 MiB

Commit `8fa8a7cde89c`

tarball

atagen <boss@atagen.co>2026-10-22 09:31 UTC

5 files changed+27-3

timeline: carry msc4027 shortcodes on custom emote reactions

A reaction keyed on an mxc uri is meaningless to a client without the pack, and MSC4027's shortcode is the label. ruma's ReactionEventContent drops the field, so the fork reads and writes it raw in the timeline and send queue, and Reaction says which image a key is so hosts never parse mxc strings.

Modified file: docs/design-decisions.md+7 additions@@ -119,6 +119,11 @@ edit, redact and react take an `EventRef`, so your own message can be edited or
 reacted to before the server has echoed it back. redacting an unsent one just
 cancels it
 
+a custom emote reaction keys on the image's mxc uri and carries its shortcode
+(msc4027), so clients without the pack can still label it. `Reaction` says
+which image it is and the shortcode any sender gave, and `toggle_reaction`
+takes the shortcode to send
+
 ## warming up to send
 
 the sdk does all its key work on the send path, in the room's send queue before
@@ -383,6 +388,8 @@ which keep their public sans-io apis
 - `Room::prepare_encryption`, the send path's encryption prep made public
 - `SyncServiceBuilder::with_room_list_extra_required_state`, for state the
   sdk's hard-coded list leaves out. image packs use it
+- msc4027 reaction shortcodes, kept on the timeline's `ReactionInfo` and sent
+  with `Timeline::toggle_reaction_with_shortcode`
 
 ## public model
 

Modified file: src/engine/timeline.rs+7 additions−2 deletions@@ -185,9 +185,14 @@ impl TimelineSession {
                     .await
                     .map_err(timeline_error)
             }),
-            TimelineCommand::ToggleReaction { target, key, .. } => Box::pin(async move {
+            TimelineCommand::ToggleReaction {
+                target,
+                key,
+                shortcode,
+                ..
+            } => Box::pin(async move {
                 timeline
-                    .toggle_reaction(&item_id(target), &key)
+                    .toggle_reaction_with_shortcode(&item_id(target), &key, shortcode.as_deref())
                     .await
                     .map(drop)
                     .map_err(timeline_error)

Modified file: src/model.rs+6 additions@@ -236,6 +236,8 @@ pub enum TimelineCommand {
         timeline_id: TimelineId,
         target: EventRef,
         key: String,
+        /// a custom emote's shortcode, sent along so clients without the pack can label it
+        shortcode: Option<String>,
     },
     /// works on a closed room too, it just can't refuse to move the marker backwards
     MarkRead {
@@ -1605,6 +1607,10 @@ pub enum ReplyDetails {
 #[non_exhaustive]
 pub struct Reaction {
     pub key: String,
+    /// a custom emote's shortcode, from whichever sender gave one
+    pub shortcode: Option<String>,
+    /// the custom emote itself, when the key is an image
+    pub image: Option<MediaId>,
     pub count: usize,
     pub own: bool,
     pub senders: Vec<OwnedUserId>,

Modified file: src/normalise/timeline.rs+5 additions−1 deletions@@ -11,7 +11,7 @@ use matrix_sdk_ui::{
     },
 };
 use ruma::{
-    OwnedEventId, UserId,
+    MxcUri, OwnedEventId, UserId,
     events::{
         StateEventContentChange,
         room::message::{MessageFormat, MessageType},
@@ -421,6 +421,10 @@ fn reactions(event: &EventTimelineItem, current_user_id: Option<&UserId>) -> Vec
         .flat_map(|reactions| reactions.iter())
         .map(|(key, senders)| Reaction {
             key: key.clone(),
+            shortcode: senders.values().find_map(|info| info.shortcode.clone()),
+            image: <&MxcUri>::from(key.as_str())
+                .is_valid()
+                .then(|| MediaId::plain(key)),
             count: senders.len(),
             own: current_user_id.is_some_and(|user_id| senders.contains_key(user_id)),
             senders: senders.keys().cloned().collect(),

Modified file: src/transport.rs+2 additions@@ -341,11 +341,13 @@ impl ClientHandle {
         timeline_id: TimelineId,
         target: impl Into<EventRef>,
         key: impl Into<String>,
+        shortcode: Option<String>,
     ) -> Result<(), Error> {
         self.run(Command::Timeline(TimelineCommand::ToggleReaction {
             timeline_id,
             target: target.into(),
             key: key.into(),
+            shortcode,
         }))
         .await
     }

macltok

Commit 8fa8a7cde89c

Commit `8fa8a7cde89c`