base: Add the last missing accessors and reorder them.

matrix_sdk_base/src/rooms/normal.rs

@@ -23,7 +23,10 @@ use futures::{
 };
 use matrix_sdk_common::{
     api::r0::sync::sync_events::RoomSummary as RumaSummary,
-    events::{room::tombstone::TombstoneEventContent, AnySyncStateEvent, EventType},
+    events::{
+        room::{encryption::EncryptionEventContent, tombstone::TombstoneEventContent},
+        AnySyncStateEvent, EventType,
+    },
     identifiers::{RoomAliasId, RoomId, UserId},
 };
 use serde::{Deserialize, Serialize};
@@ -90,14 +93,38 @@ impl Room {
         }
     }
 
-    pub fn are_members_synced(&self) -> bool {
+    pub fn room_id(&self) -> &RoomId {
-        self.inner.read().unwrap().members_synced
+        &self.room_id
+    }
+
+    pub fn own_user_id(&self) -> &UserId {
+        &self.own_user_id
     }
 
     pub fn room_type(&self) -> RoomType {
         self.inner.read().unwrap().room_type
     }
 
+    pub fn unread_notification_counts(&self) -> UnreadNotificationsCount {
+        self.inner.read().unwrap().notification_counts
+    }
+
+    pub fn are_members_synced(&self) -> bool {
+        self.inner.read().unwrap().members_synced
+    }
+
+    pub fn last_prev_batch(&self) -> Option<String> {
+        self.inner.read().unwrap().last_prev_batch.clone()
+    }
+
+    pub fn name(&self) -> Option<String> {
+        self.inner.read().unwrap().base_info.name.clone()
+    }
+
+    pub fn canonical_alias(&self) -> Option<RoomAliasId> {
+        self.inner.read().unwrap().base_info.canonical_alias.clone()
+    }
+
     pub fn is_direct(&self) -> bool {
         self.inner.read().unwrap().base_info.dm_target.is_some()
     }
@@ -106,10 +133,38 @@ impl Room {
         self.inner.read().unwrap().base_info.dm_target.clone()
     }
 
-    fn max_power_level(&self) -> i64 {
+    pub fn avatar_url(&self) -> Option<String> {
+        self.inner.read().unwrap().base_info.avatar_url.clone()
+    }
+
+    pub fn topic(&self) -> Option<String> {
+        self.inner.read().unwrap().base_info.topic.clone()
+    }
+
+    pub fn is_encrypted(&self) -> bool {
+        self.inner.read().unwrap().is_encrypted()
+    }
+
+    pub fn encryption_settings(&self) -> Option<EncryptionEventContent> {
+        self.inner.read().unwrap().base_info.encryption.clone()
+    }
+
+    pub fn is_tombstoned(&self) -> bool {
+        self.inner.read().unwrap().base_info.tombstone.is_some()
+    }
+
+    pub fn tombstone(&self) -> Option<TombstoneEventContent> {
+        self.inner.read().unwrap().base_info.tombstone.clone()
+    }
+
+    pub fn max_power_level(&self) -> i64 {
         self.inner.read().unwrap().base_info.max_power_level
     }
 
+    pub async fn display_name(&self) -> String {
+        self.calculate_name().await
+    }
+
     pub async fn get_joined_user_ids(&self) -> impl Stream<Item = UserId> {
         self.store.get_joined_user_ids(self.room_id()).await
     }
@@ -219,10 +274,6 @@ impl Room {
         }
     }
 
-    pub fn own_user_id(&self) -> &UserId {
-        &self.own_user_id
-    }
-
     pub(crate) fn clone_info(&self) -> RoomInfo {
         (*self.inner.read().unwrap()).clone()
     }
@@ -231,30 +282,6 @@ impl Room {
         self.store.get_joined_user_ids(&self.room_id).await
     }
 
-    pub fn is_encrypted(&self) -> bool {
-        self.inner.read().unwrap().is_encrypted()
-    }
-
-    pub fn unread_notification_counts(&self) -> UnreadNotificationsCount {
-        self.inner.read().unwrap().notification_counts
-    }
-
-    pub fn is_tombstoned(&self) -> bool {
-        self.inner.read().unwrap().base_info.tombstone.is_some()
-    }
-
-    pub fn tombstone(&self) -> Option<TombstoneEventContent> {
-        self.inner.read().unwrap().base_info.tombstone.clone()
-    }
-
-    pub fn topic(&self) -> Option<String> {
-        self.inner.read().unwrap().base_info.topic.clone()
-    }
-
-    pub fn canonical_alias(&self) -> Option<RoomAliasId> {
-        self.inner.read().unwrap().base_info.canonical_alias.clone()
-    }
-
     pub fn update_summary(&self, summary: RoomInfo) {
         let mut inner = self.inner.write().unwrap();
         *inner = summary;
@@ -289,18 +316,6 @@ impl Room {
                 max_power_level,
             })
     }
-
-    pub fn room_id(&self) -> &RoomId {
-        &self.room_id
-    }
-
-    pub fn last_prev_batch(&self) -> Option<String> {
-        self.inner.read().unwrap().last_prev_batch.clone()
-    }
-
-    pub async fn display_name(&self) -> String {
-        self.calculate_name().await
-    }
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]