fixup! chore(room_preview): Add knocking action to the RoomPreviewActions too

Author: jmartinesp

bindings/matrix-sdk-ffi/src/client.rs

@@ -1027,7 +1027,7 @@ impl Client {
         &self,
         room_id: String,
         via_servers: Vec<String>,
-    ) -> Result<RoomPreview, ClientError> {
+    ) -> Result<Arc<RoomPreview>, ClientError> {
         let room_id = RoomId::parse(&room_id).context("room_id is not a valid room id")?;
 
         let via_servers = via_servers
@@ -1042,14 +1042,14 @@ impl Client {
 
         let sdk_room_preview = self.inner.get_room_preview(room_id.into(), via_servers).await?;
 
-        Ok(RoomPreview::from_sdk(sdk_room_preview))
+        Ok(Arc::new(RoomPreview::from_sdk(sdk_room_preview)))
     }
 
     /// Given a room alias, get the preview of a room, to interact with it.
     pub async fn get_room_preview_from_room_alias(
         &self,
         room_alias: String,
-    ) -> Result<RoomPreview, ClientError> {
+    ) -> Result<Arc<RoomPreview>, ClientError> {
         let room_alias =
             RoomAliasId::parse(&room_alias).context("room_alias is not a valid room alias")?;
 
@@ -1059,7 +1059,7 @@ impl Client {
 
         let sdk_room_preview = self.inner.get_room_preview(room_alias.into(), Vec::new()).await?;
 
-        Ok(RoomPreview::from_sdk(sdk_room_preview))
+        Ok(Arc::new(RoomPreview::from_sdk(sdk_room_preview)))
     }
 
     /// Waits until an at least partially synced room is received, and returns

bindings/matrix-sdk-ffi/src/room_list.rs

@@ -598,7 +598,7 @@ impl RoomListItem {
     ///
     /// An error will be returned if the room is in a state other than invited
     /// or knocked.
-    async fn preview_room(&self, via: Vec<String>) -> Result<RoomPreview, ClientError> {
+    async fn preview_room(&self, via: Vec<String>) -> Result<Arc<RoomPreview>, ClientError> {
         let membership = self.membership();
         if !matches!(membership, Membership::Invited | Membership::Knocked) {
             return Err(RoomListError::IncorrectRoomMembership {
@@ -622,7 +622,7 @@ impl RoomListItem {
         };
 
         let room_preview = client.get_room_preview(&room_or_alias_id, server_names).await?;
-        Ok(RoomPreview::from_sdk(room_preview))
+        Ok(Arc::new(RoomPreview::from_sdk(room_preview)))
     }
 
     /// Build a full `Room` FFI object, filling its associated timeline.

bindings/matrix-sdk-ffi/src/room_preview.rs

@@ -1,3 +1,4 @@
+use std::sync::Arc;
 use matrix_sdk::room_preview::RoomPreview as SdkRoomPreview;
 use ruma::space::SpaceRoomJoinRule;
 
@@ -7,25 +8,25 @@ use crate::{client::JoinRule, error::ClientError, room::Membership};
 /// aren't joined yet.
 #[derive(uniffi::Object)]
 pub struct RoomPreview {
-    inner: SdkRoomPreview,
+    inner: Arc<SdkRoomPreview>,
 }
 
 #[matrix_sdk_ffi_macros::export]
 impl RoomPreview {
     /// Returns the room info the preview contains.
     pub fn info(&self) -> RoomPreviewInfo {
-        let info = self.inner.clone();
+        let info = &self.inner;
         RoomPreviewInfo {
             room_id: info.room_id.to_string(),
-            canonical_alias: info.canonical_alias.map(|alias| alias.to_string()),
-            name: info.name,
-            topic: info.topic,
-            avatar_url: info.avatar_url.map(|url| url.to_string()),
+            canonical_alias: info.canonical_alias.as_ref().map(|alias| alias.to_string()),
+            name: info.name.clone(),
+            topic: info.topic.clone(),
+            avatar_url: info.avatar_url.as_ref().map(|url| url.to_string()),
             num_joined_members: info.num_joined_members,
-            room_type: info.room_type.map(|room_type| room_type.to_string()),
+            room_type: info.room_type.as_ref().map(|room_type| room_type.to_string()),
             is_history_world_readable: info.is_world_readable,
             membership: info.state.map(|state| state.into()),
-            join_rule: info.join_rule.into(),
+            join_rule: info.join_rule.clone().into(),
         }
     }
 
@@ -40,7 +41,7 @@ impl RoomPreview {
 
 impl RoomPreview {
     pub(crate) fn from_sdk(room_preview: SdkRoomPreview) -> Self {
-        Self { inner: room_preview }
+        Self { inner: Arc::new(room_preview) }
     }
 }