refactor: Adapt to removal of EventContent in Ruma

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

Author: zecakeh

bindings/matrix-sdk-crypto-ffi/src/responses.rs

@@ -27,7 +27,7 @@ use ruma::{
         to_device::send_event_to_device::v3::Response as ToDeviceResponse,
     },
     assign,
-    events::EventContent,
+    events::MessageLikeEventContent,
     OwnedTransactionId, UserId,
 };
 use serde_json::json;

bindings/matrix-sdk-ffi/src/timeline/msg_like.rs

@@ -15,7 +15,7 @@
 use std::{collections::HashMap, sync::Arc};
 
 use matrix_sdk::crypto::types::events::UtdCause;
-use ruma::events::{room::MediaSource as RumaMediaSource, EventContent};
+use ruma::events::{room::MediaSource as RumaMediaSource, MessageLikeEventContent};
 
 use super::{
     content::Reaction,

crates/matrix-sdk-base/src/room/create.rs

@@ -17,7 +17,7 @@ use ruma::{
     events::{
         macros::EventContent,
         room::create::{PreviousRoom, RoomCreateEventContent},
-        EmptyStateKey, RedactContent, RedactedStateEventContent,
+        EmptyStateKey, RedactContent, RedactedStateEventContent, StateEventType,
     },
     room::RoomType,
     OwnedUserId, RoomVersionId,
@@ -100,6 +100,10 @@ pub type RedactedRoomCreateWithCreatorEventContent = RoomCreateWithCreatorEventC
 
 impl RedactedStateEventContent for RedactedRoomCreateWithCreatorEventContent {
     type StateKey = EmptyStateKey;
+
+    fn event_type(&self) -> StateEventType {
+        StateEventType::RoomCreate
+    }
 }
 
 impl RedactContent for RoomCreateWithCreatorEventContent {

crates/matrix-sdk-base/src/store/migration_helpers.rs

@@ -35,7 +35,7 @@ use ruma::{
             tombstone::RoomTombstoneEventContent,
             topic::RoomTopicEventContent,
         },
-        EmptyStateKey, EventContent, RedactContent, StateEventContent, StateEventType,
+        EmptyStateKey, RedactContent, StateEventContent, StateEventType,
     },
     OwnedRoomId, OwnedUserId, RoomId,
 };
@@ -222,18 +222,14 @@ struct RoomNameEventContentV1 {
     name: Option<String>,
 }
 
-impl EventContent for RoomNameEventContentV1 {
-    type EventType = StateEventType;
+impl StateEventContent for RoomNameEventContentV1 {
+    type StateKey = EmptyStateKey;
 
-    fn event_type(&self) -> Self::EventType {
+    fn event_type(&self) -> StateEventType {
         StateEventType::RoomName
     }
 }
 
-impl StateEventContent for RoomNameEventContentV1 {
-    type StateKey = EmptyStateKey;
-}
-
 impl RedactContent for RoomNameEventContentV1 {
     type Redacted = RedactedRoomNameEventContent;
 

crates/matrix-sdk-base/src/store/mod.rs

@@ -614,7 +614,7 @@ impl StateChanges {
     where
         C: StaticEventContent + StaticStateEventContent + RedactContent,
         C::Redacted: RedactedStateEventContent,
-        C::PossiblyRedacted: DeserializeOwned,
+        C::PossiblyRedacted: StaticEventContent + DeserializeOwned,
         C::StateKey: Borrow<K>,
         K: AsRef<str> + ?Sized,
     {

crates/matrix-sdk-base/src/store/send_queue.rs

@@ -20,7 +20,7 @@ use as_variant::as_variant;
 use ruma::{
     events::{
         room::{message::RoomMessageEventContent, MediaSource},
-        AnyMessageLikeEventContent, EventContent as _, RawExt as _,
+        AnyMessageLikeEventContent, MessageLikeEventContent as _, RawExt as _,
     },
     serde::Raw,
     MilliSecondsSinceUnixEpoch, OwnedDeviceId, OwnedEventId, OwnedTransactionId, OwnedUserId,
@@ -63,7 +63,7 @@ impl SerializableEventContent {
     /// Convert a [`SerializableEventContent`] back into a
     /// [`AnyMessageLikeEventContent`].
     pub fn deserialize(&self) -> Result<AnyMessageLikeEventContent, serde_json::Error> {
-        self.event.deserialize_with_type(self.event_type.clone().into())
+        self.event.deserialize_with_type(&self.event_type)
     }
 
     /// Returns the raw event content along with its type.

crates/matrix-sdk-crypto/src/secret_storage.rs

@@ -36,7 +36,7 @@ use ruma::{
             },
             secret::SecretEncryptedData,
         },
-        EventContent, GlobalAccountDataEventType,
+        GlobalAccountDataEventContent, GlobalAccountDataEventType,
     },
     serde::Base64,
     UInt,

crates/matrix-sdk-crypto/src/types/events/to_device.rs

@@ -23,7 +23,7 @@ use ruma::{
             request::ToDeviceKeyVerificationRequestEvent, start::ToDeviceKeyVerificationStartEvent,
         },
         secret::request::{SecretName, ToDeviceSecretRequestEvent},
-        EventContent, ToDeviceEventType,
+        ToDeviceEventContent, ToDeviceEventType,
     },
     serde::Raw,
     OwnedUserId, UserId,

crates/matrix-sdk-crypto/src/types/requests/to_device.rs

@@ -15,7 +15,7 @@
 use std::{collections::BTreeMap, iter};
 
 use ruma::{
-    events::{AnyToDeviceEventContent, EventContent, ToDeviceEventType},
+    events::{AnyToDeviceEventContent, ToDeviceEventContent, ToDeviceEventType},
     serde::Raw,
     to_device::DeviceIdOrAllDevices,
     OwnedDeviceId, OwnedTransactionId, OwnedUserId, TransactionId, UserId,

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

@@ -32,7 +32,7 @@ use ruma::{
             Relation, RoomMessageEventContent, RoomMessageEventContentWithoutRelation,
         },
         AnyMessageLikeEventContent, AnySyncMessageLikeEvent, AnySyncStateEvent,
-        AnySyncTimelineEvent, EventContent, FullStateEventContent, MessageLikeEventType,
+        AnySyncTimelineEvent, FullStateEventContent, MessageLikeEventContent, MessageLikeEventType,
         StateEventType, SyncStateEvent,
     },
     serde::Raw,