refactor: Adapt to new type of bundled thread

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>

Author: zecakeh

crates/matrix-sdk-common/src/deserialized_responses.rs

@@ -17,7 +17,10 @@ use std::{collections::BTreeMap, fmt, sync::Arc};
 #[cfg(doc)]
 use ruma::events::AnyTimelineEvent;
 use ruma::{
-    events::{AnyMessageLikeEvent, AnySyncTimelineEvent, AnyToDeviceEvent, MessageLikeEventType},
+    events::{
+        AnyMessageLikeEvent, AnySyncMessageLikeEvent, AnySyncTimelineEvent, AnyToDeviceEvent,
+        MessageLikeEventType,
+    },
     push::Action,
     serde::{
         AsRefStr, AsStrAsRefStr, DebugAsRefStr, DeserializeFromCowStr, FromString, JsonObject, Raw,
@@ -542,7 +545,7 @@ impl TimelineEvent {
     /// encryption status for it.
     fn from_bundled_latest_event(
         this: &TimelineEventKind,
-        latest_event: Option<Raw<AnyMessageLikeEvent>>,
+        latest_event: Option<Raw<AnySyncMessageLikeEvent>>,
     ) -> Option<Box<Self>> {
         let latest_event = latest_event?;
 
@@ -559,7 +562,9 @@ impl TimelineEvent {
                             // information around.
                             return Some(Box::new(TimelineEvent::from_decrypted(
                                 DecryptedRoomEvent {
-                                    event: latest_event,
+                                    // Safety: A decrypted event always includes a room_id in its
+                                    // payload.
+                                    event: latest_event.cast(),
                                     encryption_info: encryption_info.clone(),
                                     // A bundled latest event is never a thread root. It could have
                                     // a replacement event, but we don't carry this information

crates/matrix-sdk-common/src/serde_helpers.rs

@@ -16,7 +16,7 @@
 //! to access some fields.
 
 use ruma::{
-    events::{relation::BundledThread, AnyMessageLikeEvent, AnySyncTimelineEvent},
+    events::{relation::BundledThread, AnySyncMessageLikeEvent, AnySyncTimelineEvent},
     serde::Raw,
     OwnedEventId,
 };
@@ -76,7 +76,7 @@ struct Unsigned {
 /// Try to extract a bundled thread summary of a timeline event, if available.
 pub fn extract_bundled_thread_summary(
     event: &Raw<AnySyncTimelineEvent>,
-) -> (ThreadSummaryStatus, Option<Raw<AnyMessageLikeEvent>>) {
+) -> (ThreadSummaryStatus, Option<Raw<AnySyncMessageLikeEvent>>) {
     match event.get_field::<Unsigned>("unsigned") {
         Ok(Some(Unsigned { relations: Some(Relations { thread: Some(bundled_thread) }) })) => {
             // Take the count from the bundled thread summary, if available. If it can't be

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

@@ -36,8 +36,8 @@ use ruma::{
         room::message::{
             AddMentions, MessageType, Relation, ReplyWithinThread, RoomMessageEventContent,
         },
-        AnyMessageLikeEvent, AnyMessageLikeEventContent, AnyToDeviceEvent, MessageLikeEvent,
-        OriginalMessageLikeEvent, ToDeviceEventType,
+        AnyMessageLikeEvent, AnyMessageLikeEventContent, AnySyncMessageLikeEvent, AnyToDeviceEvent,
+        MessageLikeEvent, OriginalMessageLikeEvent, ToDeviceEventType,
     },
     room_id,
     serde::Raw,
@@ -1579,7 +1579,10 @@ async fn test_unsigned_decryption() {
     assert!(first_message.unsigned.relations.replace.is_some());
     // Deserialization of the thread event succeeded, but it is still encrypted.
     let thread = first_message.unsigned.relations.thread.as_ref().unwrap();
-    assert_matches!(thread.latest_event.deserialize(), Ok(AnyMessageLikeEvent::RoomEncrypted(_)));
+    assert_matches!(
+        thread.latest_event.deserialize(),
+        Ok(AnySyncMessageLikeEvent::RoomEncrypted(_))
+    );
 
     let unsigned_encryption_info = raw_decrypted_event.unsigned_encryption_info.unwrap();
     assert_eq!(unsigned_encryption_info.len(), 2);
@@ -1625,7 +1628,7 @@ async fn test_unsigned_decryption() {
     let thread = &first_message.unsigned.relations.thread.as_ref().unwrap();
     assert_matches!(
         thread.latest_event.deserialize(),
-        Ok(AnyMessageLikeEvent::RoomMessage(third_message))
+        Ok(AnySyncMessageLikeEvent::RoomMessage(third_message))
     );
     let third_message = third_message.as_original().unwrap();
     assert_eq!(third_message.content.body(), third_message_text);

testing/matrix-sdk-test/src/event_factory.rs

@@ -64,7 +64,7 @@ use ruma::{
         },
         sticker::StickerEventContent,
         typing::TypingEventContent,
-        AnyMessageLikeEvent, AnyStateEvent, AnySyncStateEvent, AnySyncTimelineEvent,
+        AnyStateEvent, AnySyncMessageLikeEvent, AnySyncStateEvent, AnySyncTimelineEvent,
         AnyTimelineEvent, BundledMessageLikeRelations, Mentions, RedactedMessageLikeEventContent,
         RedactedStateEventContent, StateEventContent, StaticEventContent,
     },
@@ -201,7 +201,7 @@ impl<E: StaticEventContent> EventBuilder<E> {
     /// this event.
     pub fn with_bundled_thread_summary(
         mut self,
-        latest_event: Raw<AnyMessageLikeEvent>,
+        latest_event: Raw<AnySyncMessageLikeEvent>,
         count: usize,
         current_user_participated: bool,
     ) -> Self {