refactor: Adapt to removal of EventContent in Ruma

zecakeh · zecakeh · commit 8b3244f4e0a7 · 2025-07-08T10:57:24.000+02:00
Signed-off-by: Kévin Commaille &lt;zecakeh@tedomum.fr&gt;
diff --git a/bindings/matrix-sdk-crypto-ffi/src/responses.rs b/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;
diff --git a/bindings/matrix-sdk-ffi/src/timeline/msg_like.rs b/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,
diff --git a/crates/matrix-sdk-base/src/room/create.rs b/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 {
diff --git a/crates/matrix-sdk-base/src/store/migration_helpers.rs b/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;
 
diff --git a/crates/matrix-sdk-base/src/store/send_queue.rs b/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.
diff --git a/crates/matrix-sdk-crypto/src/secret_storage.rs b/crates/matrix-sdk-crypto/src/secret_storage.rs
@@ -36,7 +36,7 @@ use ruma::{
             },
             secret::SecretEncryptedData,
         },
-        EventContent, GlobalAccountDataEventType,
+        GlobalAccountDataEventContent, GlobalAccountDataEventType,
     },
     serde::Base64,
     UInt,
diff --git a/crates/matrix-sdk-crypto/src/types/events/to_device.rs b/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,
diff --git a/crates/matrix-sdk-crypto/src/types/requests/to_device.rs b/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,
diff --git a/crates/matrix-sdk-ui/src/timeline/event_handler.rs b/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,
diff --git a/crates/matrix-sdk/src/encryption/recovery/mod.rs b/crates/matrix-sdk/src/encryption/recovery/mod.rs
@@ -97,7 +97,7 @@ use ruma::{
     events::{
         secret::{request::SecretName, send::ToDeviceSecretSendEvent},
         secret_storage::{default_key::SecretStorageDefaultKeyEvent, secret::SecretEventContent},
-        GlobalAccountDataEventType,
+        GlobalAccountDataEventType, StaticEventContent,
     },
     serde::Raw,
 };
@@ -408,7 +408,7 @@ impl Recovery {
     /// # let client = Client::new(homeserver).await?;
     /// # let user_id = unimplemented!();
     /// let encryption = client.encryption();
-    ///       
+    ///
     /// if let Some(handle) = encryption.recovery().reset_identity().await? {
     ///     match handle.auth_type() {
     ///         CrossSigningResetAuthType::Uiaa(uiaa) => {
@@ -592,7 +592,7 @@ impl Recovery {
         Ok(self
             .client
             .account()
-            .fetch_account_data(BackupDisabledContent::event_type())
+            .fetch_account_data(BackupDisabledContent::TYPE.into())
             .await?
             .map(|event| {
                 event
diff --git a/crates/matrix-sdk/src/encryption/recovery/types.rs b/crates/matrix-sdk/src/encryption/recovery/types.rs
@@ -13,10 +13,7 @@
 // limitations under the License.
 
 use matrix_sdk_base::crypto::store::types::RoomKeyCounts;
-use ruma::{
-    events::{EventContent, GlobalAccountDataEventType},
-    exports::ruma_macros::EventContent,
-};
+use ruma::events::macros::EventContent;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use zeroize::{Zeroize, ZeroizeOnDrop};
@@ -115,12 +112,3 @@ pub(super) struct SecretStorageDisabledContent {}
 pub(super) struct BackupDisabledContent {
     pub disabled: bool,
 }
-
-impl BackupDisabledContent {
-    /// Get the event type of the [`BackupDisabledContent`] global account data
-    /// event.
-    pub(super) fn event_type() -> GlobalAccountDataEventType {
-        // This is dumb, there's got to be a better way to get to the event type?
-        Self { disabled: false }.event_type()
-    }
-}
diff --git a/crates/matrix-sdk/src/send_queue/mod.rs b/crates/matrix-sdk/src/send_queue/mod.rs
@@ -161,7 +161,7 @@ use ruma::{
             message::{FormattedBody, RoomMessageEventContent},
             MediaSource,
         },
-        AnyMessageLikeEventContent, EventContent as _, Mentions,
+        AnyMessageLikeEventContent, Mentions, MessageLikeEventContent as _,
     },
     serde::Raw,
     MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId, OwnedTransactionId, TransactionId,
diff --git a/crates/matrix-sdk/tests/integration/send_queue.rs b/crates/matrix-sdk/tests/integration/send_queue.rs
@@ -36,7 +36,7 @@ use ruma::{
             },
             MediaSource,
         },
-        AnyMessageLikeEventContent, EventContent as _, Mentions,
+        AnyMessageLikeEventContent, Mentions, MessageLikeEventContent as _,
     },
     mxc_uri, owned_mxc_uri, owned_user_id, room_id,
     serde::Raw,
diff --git a/testing/matrix-sdk-integration-testing/src/tests/room.rs b/testing/matrix-sdk-integration-testing/src/tests/room.rs
@@ -9,7 +9,7 @@ use matrix_sdk::{
         assign, event_id, events,
         events::{
             room::message::RoomMessageEventContent, AnyRoomAccountDataEventContent,
-            AnySyncStateEvent, AnySyncTimelineEvent, EventContent,
+            AnySyncStateEvent, AnySyncTimelineEvent, RoomAccountDataEventContent,
         },
         serde::Raw,
         uint,
diff --git a/testing/matrix-sdk-test/src/event_factory.rs b/testing/matrix-sdk-test/src/event_factory.rs
@@ -232,7 +232,12 @@ impl<E: StaticEventContent> EventBuilder<E> {
         self.state_key = Some(state_key.into());
         self
     }
+}
 
+impl<E: StaticEventContent> EventBuilder<E>
+where
+    E: Serialize,
+{
     #[inline(always)]
     fn construct_json(self, requires_room: bool) -> serde_json::Value {
         // Use the `sender` preferably, or resort to the `redacted_because` sender if
@@ -448,19 +453,28 @@ impl EventBuilder<StickerEventContent> {
     }
 }
 
-impl<E: StaticEventContent> From<EventBuilder<E>> for Raw<AnySyncTimelineEvent> {
+impl<E: StaticEventContent> From<EventBuilder<E>> for Raw<AnySyncTimelineEvent>
+where
+    E: Serialize,
+{
     fn from(val: EventBuilder<E>) -> Self {
         val.into_raw_sync()
     }
 }
 
-impl<E: StaticEventContent> From<EventBuilder<E>> for Raw<AnyTimelineEvent> {
+impl<E: StaticEventContent> From<EventBuilder<E>> for Raw<AnyTimelineEvent>
+where
+    E: Serialize,
+{
     fn from(val: EventBuilder<E>) -> Self {
         val.into_raw_timeline()
     }
 }
 
-impl<E: StaticEventContent> From<EventBuilder<E>> for TimelineEvent {
+impl<E: StaticEventContent> From<EventBuilder<E>> for TimelineEvent
+where
+    E: Serialize,
+{
     fn from(val: EventBuilder<E>) -> Self {
         val.into_event()
     }
