diff --git a/crates/matrix-sdk-base/src/client.rs b/crates/matrix-sdk-base/src/client.rs index 811a59b1e..6a8dbf9c0 100644 --- a/crates/matrix-sdk-base/src/client.rs +++ b/crates/matrix-sdk-base/src/client.rs @@ -160,12 +160,12 @@ impl BaseClient { } /// Get all the rooms this client knows about. - pub fn get_rooms(&self) -> Vec { + pub fn rooms(&self) -> Vec { self.store.rooms() } /// Get all the rooms this client knows about, filtered by room state. - pub fn get_rooms_filtered(&self, filter: RoomStateFilter) -> Vec { + pub fn rooms_filtered(&self, filter: RoomStateFilter) -> Vec { self.store.rooms_filtered(filter) } @@ -175,12 +175,6 @@ impl BaseClient { self.store.get_or_create_room(room_id, room_state, self.roominfo_update_sender.clone()) } - /// Get all the rooms this client knows about. - #[deprecated = "Use get_rooms_filtered with RoomStateFilter::INVITED instead."] - pub fn get_stripped_rooms(&self) -> Vec { - self.get_rooms_filtered(RoomStateFilter::INVITED) - } - /// Get a reference to the store. #[allow(unknown_lints, clippy::explicit_auto_deref)] pub fn store(&self) -> &DynStateStore { diff --git a/crates/matrix-sdk/src/client/mod.rs b/crates/matrix-sdk/src/client/mod.rs index af3c6e37e..b2a2e756f 100644 --- a/crates/matrix-sdk/src/client/mod.rs +++ b/crates/matrix-sdk/src/client/mod.rs @@ -901,17 +901,13 @@ impl Client { /// /// This will return the list of joined, invited, and left rooms. pub fn rooms(&self) -> Vec { - self.base_client() - .get_rooms() - .into_iter() - .map(|room| Room::new(self.clone(), room)) - .collect() + self.base_client().rooms().into_iter().map(|room| Room::new(self.clone(), room)).collect() } /// Get all the rooms the client knows about, filtered by room state. pub fn rooms_filtered(&self, filter: RoomStateFilter) -> Vec { self.base_client() - .get_rooms_filtered(filter) + .rooms_filtered(filter) .into_iter() .map(|room| Room::new(self.clone(), room)) .collect() @@ -920,7 +916,7 @@ impl Client { /// Returns the joined rooms this client knows about. pub fn joined_rooms(&self) -> Vec { self.base_client() - .get_rooms_filtered(RoomStateFilter::JOINED) + .rooms_filtered(RoomStateFilter::JOINED) .into_iter() .map(|room| Room::new(self.clone(), room)) .collect() @@ -929,7 +925,7 @@ impl Client { /// Returns the invited rooms this client knows about. pub fn invited_rooms(&self) -> Vec { self.base_client() - .get_rooms_filtered(RoomStateFilter::INVITED) + .rooms_filtered(RoomStateFilter::INVITED) .into_iter() .map(|room| Room::new(self.clone(), room)) .collect() @@ -938,7 +934,7 @@ impl Client { /// Returns the left rooms this client knows about. pub fn left_rooms(&self) -> Vec { self.base_client() - .get_rooms_filtered(RoomStateFilter::LEFT) + .rooms_filtered(RoomStateFilter::LEFT) .into_iter() .map(|room| Room::new(self.clone(), room)) .collect()