Merge branch 'encrypt-custom-events'

Author: poljar

crates/matrix-sdk-base/src/client.rs

@@ -45,7 +45,7 @@ use ruma::{
     api::client::r0::keys::claim_keys::Request as KeysClaimRequest,
     events::{
         room::{encrypted::RoomEncryptedEventContent, history_visibility::HistoryVisibility},
-        AnyMessageEventContent, AnySyncMessageEvent,
+        AnySyncMessageEvent, MessageEventContent,
     },
     DeviceId,
 };
@@ -1111,12 +1111,12 @@ impl BaseClient {
     pub async fn encrypt(
         &self,
         room_id: &RoomId,
-        content: impl Into<AnyMessageEventContent>,
+        content: impl MessageEventContent,
     ) -> Result<RoomEncryptedEventContent> {
         let olm = self.olm.lock().await;
 
         match &*olm {
-            Some(o) => Ok(o.encrypt(room_id, content.into()).await?),
+            Some(o) => Ok(o.encrypt(room_id, content).await?),
             None => panic!("Olm machine wasn't started"),
         }
     }

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

@@ -44,7 +44,7 @@ use ruma::{
         },
         room_key::ToDeviceRoomKeyEvent,
         secret::request::SecretName,
-        AnyMessageEventContent, AnyRoomEvent, AnyToDeviceEvent, EventContent,
+        AnyRoomEvent, AnyToDeviceEvent, MessageEventContent,
     },
     serde::Raw,
     DeviceId, DeviceKeyAlgorithm, DeviceKeyId, EventEncryptionAlgorithm, RoomId, UInt, UserId,
@@ -695,9 +695,6 @@ impl OlmMachine {
     /// [`should_share_group_session`] method if a new group session needs to
     /// be shared.
     ///
-    /// **Note**: This method doesn't support encrypting custom events, see the
-    /// [`encrypt_raw()`] method to do so.
-    ///
     /// # Arguments
     ///
     /// * `room_id` - The id of the room for which the message should be
@@ -712,22 +709,21 @@ impl OlmMachine {
     ///
     /// [`should_share_group_session`]: #method.should_share_group_session
     /// [`share_group_session`]: #method.share_group_session
-    /// [`encrypt_raw()`]: #method.encrypt_raw
     pub async fn encrypt(
         &self,
         room_id: &RoomId,
-        content: AnyMessageEventContent,
+        content: impl MessageEventContent,
     ) -> MegolmResult<RoomEncryptedEventContent> {
-        let event_type = content.event_type().to_owned();
-        let content = serde_json::to_value(content)?;
+        let event_type = content.event_type();
+        let content = serde_json::to_value(&content)?;
 
-        self.group_session_manager.encrypt(room_id, content, &event_type).await
+        self.group_session_manager.encrypt(room_id, content, event_type).await
     }
 
     /// Encrypt a json [`Value`] content for the given room.
     ///
-    /// This method is equivalent to the [`encrypt()`] method but allows custom
-    /// events to be encrypted.
+    /// This method is equivalent to the [`encrypt()`] method but operates on an
+    /// arbitrary JSON value instead of strongly-typed event content struct.
     ///
     /// # Arguments
     ///

crates/matrix-sdk/src/room/joined.rs

@@ -465,10 +465,10 @@ impl Joined {
         content: impl MessageEventContent,
         txn_id: Option<Uuid>,
     ) -> Result<send_message_event::Response> {
-        let event_type = content.event_type().to_owned();
-        let content = serde_json::to_value(content)?;
+        let event_type = content.event_type();
+        let content = serde_json::to_value(&content)?;
 
-        self.send_raw(content, &event_type, txn_id).await
+        self.send_raw(content, event_type, txn_id).await
     }
 
     /// Send a room message to this room from a json `Value`.