fix(sdk): Remove Deref impl for SlidingSyncRoom

fix(sdk): Remove `Deref` impl for `SlidingSyncRoom`

Author: Hywan

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

@@ -130,22 +130,23 @@ impl SlidingSyncRoom {
     }
 
     pub fn is_dm(&self) -> Option<bool> {
-        self.inner.is_dm
+        self.inner.is_dm()
     }
 
     pub fn is_initial(&self) -> Option<bool> {
-        self.inner.initial
+        self.inner.is_initial_response()
     }
+
     pub fn is_loading_more(&self) -> bool {
         self.inner.is_loading_more()
     }
 
     pub fn has_unread_notifications(&self) -> bool {
-        !self.inner.unread_notifications.is_empty()
+        self.inner.has_unread_notifications()
     }
 
     pub fn unread_notifications(&self) -> Arc<UnreadNotificationsCount> {
-        Arc::new(self.inner.unread_notifications.clone().into())
+        Arc::new(self.inner.unread_notifications().clone().into())
     }
 
     pub fn full_room(&self) -> Option<Arc<Room>> {

crates/matrix-sdk/src/sliding_sync.rs

@@ -16,7 +16,7 @@
 use std::{
     collections::BTreeMap,
     fmt::Debug,
-    ops::Deref,
+    ops::{Deref, Not},
     sync::{
         atomic::{AtomicBool, AtomicU8, Ordering},
         Arc, Mutex,
@@ -34,13 +34,17 @@ use matrix_sdk_base::{deserialized_responses::SyncTimelineEvent, sync::SyncRespo
 use ruma::{
     api::client::{
         error::ErrorKind,
-        sync::sync_events::v4::{
-            self, AccountDataConfig, E2EEConfig, ExtensionsConfig, ReceiptConfig, ToDeviceConfig,
-            TypingConfig,
+        sync::sync_events::{
+            v4::{
+                self, AccountDataConfig, E2EEConfig, ExtensionsConfig, ReceiptConfig,
+                ToDeviceConfig, TypingConfig,
+            },
+            UnreadNotificationsCount,
         },
     },
     assign,
-    events::TimelineEventType,
+    events::{AnySyncStateEvent, TimelineEventType},
+    serde::Raw,
     OwnedRoomId, RoomId, UInt,
 };
 use serde::{Deserialize, Serialize};
@@ -163,7 +167,7 @@ impl From<&SlidingSyncRoom> for FrozenSlidingSyncRoom {
     fn from(value: &SlidingSyncRoom) -> Self {
         let locked_tl = value.timeline.lock_ref();
         let tl_len = locked_tl.len();
-        // To not overflow the database, we only freeze the newest 10 items. on doing
+        // To not overflow the database, we only freeze the newest 10 items. On doing
         // so, we must drop the `prev_batch` key however, as we'd otherwise
         // create a gap between what we have loaded and where the
         // prev_batch-key will start loading when paginating backwards.
@@ -275,6 +279,31 @@ impl SlidingSyncRoom {
         self.inner.name.as_deref()
     }
 
+    /// Is this a direct message?
+    pub fn is_dm(&self) -> Option<bool> {
+        self.inner.is_dm
+    }
+
+    /// Was this an initial response.
+    pub fn is_initial_response(&self) -> Option<bool> {
+        self.inner.initial
+    }
+
+    /// Is there any unread notifications?
+    pub fn has_unread_notifications(&self) -> bool {
+        self.inner.unread_notifications.is_empty().not()
+    }
+
+    /// Get unread notifications.
+    pub fn unread_notifications(&self) -> &UnreadNotificationsCount {
+        &self.inner.unread_notifications
+    }
+
+    /// Get the required state.
+    pub fn required_state(&self) -> &Vec<Raw<AnySyncStateEvent>> {
+        &self.inner.required_state
+    }
+
     fn update(&mut self, room_data: &v4::SlidingSyncRoom, timeline: Vec<SyncTimelineEvent>) {
         let v4::SlidingSyncRoom {
             name,
@@ -331,13 +360,6 @@ impl SlidingSyncRoom {
     }
 }
 
-impl Deref for SlidingSyncRoom {
-    type Target = v4::SlidingSyncRoom;
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
 type ViewState = Mutable<SlidingSyncState>;
 type SyncMode = Mutable<SlidingSyncMode>;
 type StringState = Mutable<Option<String>>;

labs/jack-in/src/components/details.rs

@@ -51,10 +51,10 @@ impl Details {
             return;
         };
 
-        let name = room_data.name.clone().unwrap_or_else(|| "unknown".to_owned());
+        let name = room_data.name().unwrap_or("unknown").to_owned();
 
         let state_events = room_data
-            .required_state
+            .required_state()
             .iter()
             .filter_map(|r| r.deserialize().ok())
             .fold(BTreeMap::<String, Vec<_>>::new(), |mut b, r| {

labs/jack-in/src/components/rooms.rs

@@ -64,9 +64,8 @@ impl MockComponent for Rooms {
         let mut paras = vec![];
 
         for r in self.sstate.get_all_rooms() {
-            let mut cells =
-                vec![Cell::from(r.name.clone().unwrap_or_else(|| "unknown".to_owned()))];
-            if let Some(c) = r.unread_notifications.notification_count {
+            let mut cells = vec![Cell::from(r.name().unwrap_or("unknown").to_owned())];
+            if let Some(c) = r.unread_notifications().notification_count {
                 let count: u32 = c.try_into().unwrap_or_default();
                 if count > 0 {
                     cells.push(Cell::from(c.to_string()))