chore: Update to latest Ruma version

Cargo.toml

@@ -57,7 +57,7 @@ proptest = { version = "1.5.0", default-features = false, features = ["std"] }
 rand = "0.8.5"
 reqwest = { version = "0.12.4", default-features = false }
 rmp-serde = "1.3.0"
-ruma = { git = "https://github.com/ruma/ruma", rev = "b266343136e8470a7d040efc207e16af0c20d374", features = [
+ruma = { git = "https://github.com/ruma/ruma", rev = "5c9ef9f425d8f8b330e46d215c683bf799a28d50", features = [
     "client-api-c",
     "compat-upload-signatures",
     "compat-user-id",
@@ -72,7 +72,7 @@ ruma = { git = "https://github.com/ruma/ruma", rev = "b266343136e8470a7d040efc20
     "unstable-msc4140",
     "unstable-msc4171",
 ] }
-ruma-common = { git = "https://github.com/ruma/ruma", rev = "b266343136e8470a7d040efc207e16af0c20d374" }
+ruma-common = { git = "https://github.com/ruma/ruma", rev = "5c9ef9f425d8f8b330e46d215c683bf799a28d50" }
 serde = "1.0.151"
 serde_html_form = "0.2.0"
 serde_json = "1.0.91"

crates/matrix-sdk-crypto/src/machine/tests/mod.rs

@@ -1323,8 +1323,8 @@ async fn test_unsigned_decryption() {
 
     // Encrypt a second message, an edit.
     let second_message_text = "This is the ~~original~~ edited message";
-    let second_message_content = RoomMessageEventContent::text_plain(second_message_text)
-        .make_replacement(first_message, None);
+    let second_message_content =
+        RoomMessageEventContent::text_plain(second_message_text).make_replacement(first_message);
     let second_message_encrypted_content =
         alice.encrypt_room_event(room_id, second_message_content).await.unwrap();
 

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

@@ -145,16 +145,6 @@ impl Message {
         self.mentions.as_ref()
     }
 
-    pub(in crate::timeline) fn to_content(&self) -> RoomMessageEventContent {
-        // Like the `impl From<Message> for RoomMessageEventContent` below, but
-        // takes &self and only copies what's needed.
-        let relates_to = make_relates_to(
-            self.thread_root.clone(),
-            self.in_reply_to.as_ref().map(|details| details.event_id.clone()),
-        );
-        assign!(RoomMessageEventContent::new(self.msgtype.clone()), { relates_to })
-    }
-
     pub(in crate::timeline) fn with_in_reply_to(&self, in_reply_to: InReplyToDetails) -> Self {
         Self { in_reply_to: Some(in_reply_to), ..self.clone() }
     }

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

@@ -566,7 +566,6 @@ impl EventTimelineItem {
         Ok(RepliedToInfo {
             event_id: event_id.to_owned(),
             sender: self.sender().to_owned(),
-            timestamp: self.timestamp(),
             content: reply_content,
         })
     }

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

@@ -39,18 +39,18 @@ use ruma::{
     events::{
         poll::unstable_start::{NewUnstablePollStartEventContent, UnstablePollStartEventContent},
         receipt::{Receipt, ReceiptThread},
+        relation::Thread,
         room::{
             message::{
-                AddMentions, ForwardThread, OriginalRoomMessageEvent,
-                RoomMessageEventContentWithoutRelation,
+                AddMentions, ForwardThread, ReplyMetadata, RoomMessageEventContentWithoutRelation,
             },
             pinned_events::RoomPinnedEventsEventContent,
         },
         AnyMessageLikeEventContent, AnySyncMessageLikeEvent, AnySyncTimelineEvent,
         SyncMessageLikeEvent,
     },
     serde::Raw,
-    EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedUserId, RoomVersionId, UserId,
+    EventId, OwnedEventId, OwnedUserId, RoomVersionId, UserId,
 };
 use thiserror::Error;
 use tracing::{error, instrument, trace, warn};
@@ -104,8 +104,6 @@ pub struct RepliedToInfo {
     event_id: OwnedEventId,
     /// The sender of the event to reply to.
     sender: OwnedUserId,
-    /// The timestamp of the event to reply to.
-    timestamp: MilliSecondsSinceUnixEpoch,
     /// The content of the event to reply to.
     content: ReplyContent,
 }
@@ -343,7 +341,8 @@ impl Timeline {
         replied_to_info: RepliedToInfo,
         forward_thread: ForwardThread,
     ) -> Result<(), RoomSendQueueError> {
-        let event_id = replied_to_info.event_id;
+        let event_id = &replied_to_info.event_id;
+        let sender = &replied_to_info.sender;
 
         // [The specification](https://spec.matrix.org/v1.10/client-server-api/#user-and-room-mentions) says:
         //
@@ -352,32 +351,21 @@ impl Timeline {
         //
         // If the replied to event has been written by the current user, let's toggle to
         // `AddMentions::No`.
-        let mention_the_sender = if self.room().own_user_id() == replied_to_info.sender {
-            AddMentions::No
-        } else {
-            AddMentions::Yes
+        let mention_the_sender =
+            if self.room().own_user_id() == sender { AddMentions::No } else { AddMentions::Yes };
+
+        let thread = match replied_to_info.content {
+            ReplyContent::Message(message) => message
+                .thread_root()
+                .map(|thread_root| Thread::plain(thread_root.clone(), event_id.clone())),
+            ReplyContent::Raw(_raw_event) => None,
         };
 
-        let content = match replied_to_info.content {
-            ReplyContent::Message(msg) => {
-                let event = OriginalRoomMessageEvent {
-                    event_id: event_id.to_owned(),
-                    sender: replied_to_info.sender,
-                    origin_server_ts: replied_to_info.timestamp,
-                    room_id: self.room().room_id().to_owned(),
-                    content: msg.to_content(),
-                    unsigned: Default::default(),
-                };
-                content.make_reply_to(&event, forward_thread, mention_the_sender)
-            }
-            ReplyContent::Raw(raw_event) => content.make_reply_to_raw(
-                &raw_event,
-                event_id.to_owned(),
-                self.room().room_id(),
-                forward_thread,
-                mention_the_sender,
-            ),
-        };
+        let content = content.make_reply_to(
+            ReplyMetadata::new(event_id, sender, thread.as_ref()),
+            forward_thread,
+            mention_the_sender,
+        );
 
         self.send(content.into()).await?;
 
@@ -425,7 +413,6 @@ impl Timeline {
         Ok(RepliedToInfo {
             event_id: event_id.to_owned(),
             sender: sync_event.sender().to_owned(),
-            timestamp: sync_event.origin_server_ts(),
             content: reply_content,
         })
     }