From 4afc6b2567da139bf69f17ada23bec4c2ff2be21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 4 Jan 2021 12:26:13 +0100
Subject: [PATCH] base: Don't mark all the room methods as public.

---
 matrix_sdk/src/client.rs            |  2 +-
 matrix_sdk_base/src/rooms/normal.rs | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/matrix_sdk/src/client.rs b/matrix_sdk/src/client.rs
index 12748bdb..48b393a0 100644
--- a/matrix_sdk/src/client.rs
+++ b/matrix_sdk/src/client.rs
@@ -2899,7 +2899,7 @@ mod test {
         let room = client
             .get_joined_room(&room_id!("!SVkFJHzfwvuaIEawgC:localhost"))
             .unwrap();
-        let members: Vec<RoomMember> = room.get_active_members().await.collect().await;
+        let members: Vec<RoomMember> = room.active_members().await.collect().await;
 
         assert_eq!(1, members.len());
         // assert!(room.power_levels.is_some())
diff --git a/matrix_sdk_base/src/rooms/normal.rs b/matrix_sdk_base/src/rooms/normal.rs
index 818fcf77..00342402 100644
--- a/matrix_sdk_base/src/rooms/normal.rs
+++ b/matrix_sdk_base/src/rooms/normal.rs
@@ -63,7 +63,7 @@ pub enum RoomType {
 }
 
 impl Room {
-    pub fn new(
+    pub(crate) fn new(
         own_user_id: &UserId,
         store: SledStore,
         room_id: &RoomId,
@@ -84,7 +84,7 @@ impl Room {
         Self::restore(own_user_id, store, room_info)
     }
 
-    pub fn restore(own_user_id: &UserId, store: SledStore, room_info: RoomInfo) -> Self {
+    pub(crate) fn restore(own_user_id: &UserId, store: SledStore, room_info: RoomInfo) -> Self {
         Self {
             own_user_id: Arc::new(own_user_id.clone()),
             room_id: room_info.room_id.clone(),
@@ -165,17 +165,17 @@ impl Room {
         self.calculate_name().await
     }
 
-    pub async fn get_joined_user_ids(&self) -> impl Stream<Item = UserId> {
+    pub async fn joined_user_ids(&self) -> impl Stream<Item = UserId> {
         self.store.get_joined_user_ids(self.room_id()).await
     }
 
-    pub async fn get_joined_members(&self) -> impl Stream<Item = RoomMember> + '_ {
+    pub async fn joined_members(&self) -> impl Stream<Item = RoomMember> + '_ {
         let joined = self.store.get_joined_user_ids(self.room_id()).await;
 
         joined.filter_map(move |u| async move { self.get_member(&u).await })
     }
 
-    pub async fn get_active_members(&self) -> impl Stream<Item = RoomMember> + '_ {
+    pub async fn active_members(&self) -> impl Stream<Item = RoomMember> + '_ {
         let joined = self.store.get_joined_user_ids(self.room_id()).await;
         let invited = self.store.get_invited_user_ids(self.room_id()).await;
 
@@ -235,7 +235,7 @@ impl Room {
                 names.sort();
                 names.join(", ")
             } else if heroes_count >= invited_joined {
-                let members = self.get_active_members().await;
+                let members = self.active_members().await;
 
                 let mut names = members
                     .filter(|m| future::ready(is_own_member(m)))
@@ -251,7 +251,7 @@ impl Room {
                 names.sort();
                 names.join(", ")
             } else if heroes_count < invited_joined && invited + joined > 1 {
-                let members = self.get_active_members().await;
+                let members = self.active_members().await;
 
                 let mut names = members
                     .filter(|m| future::ready(is_own_member(m)))
@@ -278,10 +278,6 @@ impl Room {
         (*self.inner.read().unwrap()).clone()
     }
 
-    pub async fn joined_user_ids(&self) -> impl Stream<Item = UserId> {
-        self.store.get_joined_user_ids(&self.room_id).await
-    }
-
     pub fn update_summary(&self, summary: RoomInfo) {
         let mut inner = self.inner.write().unwrap();
         *inner = summary;