refactor(timeline): avoid cloning of relates_to for room messages

This can be done by splitting the handling of the msgtype/mentions from
the handling of the `relates_to` field, requiring a few API changes here
and there.

Author: bnjbvr

crates/matrix-sdk-ui/src/timeline/controller/decryption_retry_task.rs

@@ -521,13 +521,16 @@ mod tests {
             origin: RemoteEventOrigin::Sync,
         });
 
+        let content = RoomMessageEventContent::text_plain("hi");
+
         TimelineItem::new(
             TimelineItemKind::Event(EventTimelineItem::new(
                 owned_user_id!("@u:s.to"),
                 TimelineDetails::Pending,
                 timestamp(),
                 TimelineItemContent::message(
-                    RoomMessageEventContent::text_plain("hi"),
+                    content.msgtype,
+                    content.mentions,
                     ReactionsByKeyBySender::default(),
                     None,
                     None,

crates/matrix-sdk-ui/src/timeline/controller/mod.rs

@@ -1017,7 +1017,8 @@ impl<P: RoomDataProvider, D: Decryptor> TimelineController<P, D> {
         // Replace the local-related state (kind) and the content state.
         let new_item = TimelineItem::new(
             prev_item.with_kind(ti_kind).with_content(TimelineItemContent::message(
-                content,
+                content.msgtype,
+                content.mentions,
                 prev_item.content().reactions().cloned().unwrap_or_default(),
                 prev_item.content().thread_root(),
                 prev_item.content().in_reply_to(),

crates/matrix-sdk-ui/src/timeline/event_handler.rs

@@ -447,14 +447,15 @@ impl TimelineAction {
                 }
 
                 let (in_reply_to, thread_root) = Self::extract_reply_and_thread_root(
-                    msg.relates_to.clone().and_then(|rel| rel.try_into().ok()),
+                    msg.relates_to.and_then(|rel| rel.try_into().ok()),
                     timeline_items,
                 );
                 Self::mark_response(meta, event_id, in_reply_to.as_ref());
 
                 Self::AddItem {
                     content: TimelineItemContent::message(
-                        msg,
+                        msg.msgtype,
+                        msg.mentions,
                         Default::default(),
                         thread_root,
                         in_reply_to,

crates/matrix-sdk-ui/src/timeline/event_item/content/message.rs

@@ -23,8 +23,7 @@ use ruma::{
             UnstablePollStartEventContent,
         },
         room::message::{
-            MessageType, Relation, RoomMessageEventContent, RoomMessageEventContentWithoutRelation,
-            SyncRoomMessageEvent,
+            MessageType, Relation, RoomMessageEventContentWithoutRelation, SyncRoomMessageEvent,
         },
         AnySyncMessageLikeEvent, AnySyncTimelineEvent, BundledMessageLikeRelations, Mentions,
     },
@@ -46,14 +45,14 @@ pub struct Message {
 impl Message {
     /// Construct a `Message` from a `m.room.message` event.
     pub(in crate::timeline) fn from_event(
-        c: RoomMessageEventContent,
+        mut msgtype: MessageType,
+        mentions: Option<Mentions>,
         edit: Option<RoomMessageEventContentWithoutRelation>,
         remove_reply_fallback: RemoveReplyFallback,
     ) -> Self {
-        let mut msgtype = c.msgtype;
         msgtype.sanitize(DEFAULT_SANITIZER_MODE, remove_reply_fallback);
 
-        let mut ret = Self { msgtype, edited: false, mentions: c.mentions };
+        let mut ret = Self { msgtype, edited: false, mentions };
 
         if let Some(edit) = edit {
             ret.apply_edit(edit);

crates/matrix-sdk-ui/src/timeline/event_item/content/mod.rs

@@ -39,7 +39,7 @@ use ruma::{
             history_visibility::RoomHistoryVisibilityEventContent,
             join_rules::RoomJoinRulesEventContent,
             member::{Change, RoomMemberEventContent, SyncRoomMemberEvent},
-            message::{Relation, RoomMessageEventContent, SyncRoomMessageEvent},
+            message::{MessageType, Relation, SyncRoomMessageEvent},
             name::RoomNameEventContent,
             pinned_events::RoomPinnedEventsEventContent,
             power_levels::{RoomPowerLevels, RoomPowerLevelsEventContent},
@@ -50,7 +50,7 @@ use ruma::{
         },
         space::{child::SpaceChildEventContent, parent::SpaceParentEventContent},
         sticker::{StickerEventContent, SyncStickerEvent},
-        AnyFullStateEventContent, AnySyncTimelineEvent, FullStateEventContent,
+        AnyFullStateEventContent, AnySyncTimelineEvent, FullStateEventContent, Mentions,
         MessageLikeEventType, StateEventType,
     },
     html::RemoveReplyFallback,
@@ -199,7 +199,8 @@ impl TimelineItemContent {
 
                 let msglike = MsgLikeContent {
                     kind: MsgLikeKind::Message(Message::from_event(
-                        event_content,
+                        event_content.msgtype,
+                        event_content.mentions,
                         edit,
                         RemoveReplyFallback::Yes,
                     )),
@@ -410,7 +411,8 @@ impl TimelineItemContent {
     // These constructors could also be `From` implementations, but that would
     // allow users to call them directly, which should not be supported
     pub(crate) fn message(
-        c: RoomMessageEventContent,
+        msgtype: MessageType,
+        mentions: Option<Mentions>,
         reactions: ReactionsByKeyBySender,
         thread_root: Option<OwnedEventId>,
         in_reply_to: Option<InReplyToDetails>,
@@ -420,7 +422,12 @@ impl TimelineItemContent {
             if in_reply_to.is_some() { RemoveReplyFallback::Yes } else { RemoveReplyFallback::No };
 
         Self::MsgLike(MsgLikeContent {
-            kind: MsgLikeKind::Message(Message::from_event(c, None, remove_reply_fallback)),
+            kind: MsgLikeKind::Message(Message::from_event(
+                msgtype,
+                mentions,
+                None,
+                remove_reply_fallback,
+            )),
             reactions,
             thread_root,
             in_reply_to,

crates/matrix-sdk-ui/src/timeline/event_item/content/reply.rs

@@ -145,7 +145,8 @@ impl RepliedToEvent {
 
                     TimelineItemContent::MsgLike(MsgLikeContent {
                         kind: MsgLikeKind::Message(Message::from_event(
-                            c,
+                            c.msgtype,
+                            c.mentions,
                             extract_room_msg_edit_content(event.relations()),
                             RemoveReplyFallback::Yes,
                         )),