mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-08 07:56:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3554 from Hywan/chore-sdk-remove-get-prefix

Browse Source
This commit is contained in:
Ivan Enderlin
2024-06-13 23:59:52 +02:00
committed by GitHub
parent b1c09ed61b b21b8c4a53
commit 6ecefd6bc7
6 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/matrix-sdk-base/CHANGELOG.md
View File

@@ -3,6 +3,13 @@
- Replace the `Notification` type from Ruma in `SyncResponse` and `StateChanges` by a custom one
- The ambiguity maps in `SyncResponse` are moved to `JoinedRoom` and `LeftRoom`
- `AmbiguityCache` contains the room member's user ID
- `Store::get_rooms` and `Store::get_rooms_filtered` are way faster because they
don't acquire the lock for every room they read.
- `Store::get_rooms`, `Store::get_rooms_filtered` and `Store::get_room` are
renamed `Store::rooms`, `Store::rooms_filtered` and `Store::room`.
- `Client::get_rooms` and `Client::get_rooms_filtered` are renamed
`Client::rooms` and `Client::rooms_filtered`.
- `Client::get_stripped_rooms` has finally been removed.
# 0.7.0

29
crates/matrix-sdk-base/src/client.rs
View File

@@ -160,13 +160,13 @@ impl BaseClient {
}
/// Get all the rooms this client knows about.
pub fn get_rooms(&self) -> Vec<Room> {
self.store.get_rooms()
pub fn rooms(&self) -> Vec<Room> {
self.store.rooms()
}
/// Get all the rooms this client knows about, filtered by room state.
pub fn get_rooms_filtered(&self, filter: RoomStateFilter) -> Vec<Room> {
self.store.get_rooms_filtered(filter)
pub fn rooms_filtered(&self, filter: RoomStateFilter) -> Vec<Room> {
self.store.rooms_filtered(filter)
}
/// Lookup the Room for the given RoomId, or create one, if it didn't exist
@@ -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<Room> {
self.get_rooms_filtered(RoomStateFilter::INVITED)
}
/// Get a reference to the store.
#[allow(unknown_lints, clippy::explicit_auto_deref)]
pub fn store(&self) -> &DynStateStore {
@@ -572,7 +566,7 @@ impl BaseClient {
on_room_info(room_info);
}
// The `BaseClient` has the `Room`, which has the `RoomInfo`.
else if let Some(room) = client.store.get_room(room_id) {
else if let Some(room) = client.store.room(room_id) {
// Clone the `RoomInfo`.
let mut room_info = room.clone_info();
@@ -637,7 +631,7 @@ impl BaseClient {
if let Some(room) = changes.room_infos.get_mut(room_id) {
room.base_info.dm_targets.insert(user_id.clone());
} else if let Some(room) = self.store.get_room(room_id) {
} else if let Some(room) = self.store.room(room_id) {
let mut info = room.clone_info();
if info.base_info.dm_targets.insert(user_id.clone()) {
changes.add_room(info);
@@ -1111,8 +1105,8 @@ impl BaseClient {
}
for (room_id, room_info) in &changes.room_infos {
if let Some(room) = self.store.get_room(room_id) {
room.set_room_info(room_info.clone(), trigger_room_list_update);
if let Some(room) = self.store.room(room_id) {
room.set_room_info(room_info.clone(), trigger_room_list_update)
}
}
}
@@ -1143,13 +1137,12 @@ impl BaseClient {
return Err(Error::InvalidReceiveMembersParameters);
}
let mut chunk = Vec::with_capacity(response.chunk.len());
let Some(room) = self.store.get_room(room_id) else {
let Some(room) = self.store.room(room_id) else {
// The room is unknown to us: leave early.
return Ok(());
};
let mut chunk = Vec::with_capacity(response.chunk.len());
let mut changes = StateChanges::default();
#[cfg(feature = "e2e-encryption")]
@@ -1309,7 +1302,7 @@ impl BaseClient {
///
/// * `room_id` - The id of the room that should be fetched.
pub fn get_room(&self, room_id: &RoomId) -> Option<Room> {
self.store.get_room(room_id)
self.store.room(room_id)
}
/// Get the olm machine.

2
crates/matrix-sdk-base/src/sliding_sync.rs
View File

@@ -223,7 +223,7 @@ impl BaseClient {
for (room_id, raw) in &rooms_account_data {
self.handle_room_account_data(room_id, raw, &mut changes).await;
if let Some(room) = self.store.get_room(room_id) {
if let Some(room) = self.store.room(room_id) {
match room.state() {
RoomState::Joined => new_rooms
.join

10
crates/matrix-sdk-base/src/store/mod.rs
View File

@@ -203,23 +203,23 @@ impl Store {
}
/// Get all the rooms this store knows about.
pub fn get_rooms(&self) -> Vec<Room> {
pub fn rooms(&self) -> Vec<Room> {
self.rooms.read().unwrap().values().cloned().collect()
}
/// Get all the rooms this store knows about, filtered by state.
pub fn get_rooms_filtered(&self, filter: RoomStateFilter) -> Vec<Room> {
pub fn rooms_filtered(&self, filter: RoomStateFilter) -> Vec<Room> {
self.rooms
.read()
.unwrap()
.iter()
.filter(|(_, r)| filter.matches(r.state()))
.filter_map(|(id, _)| self.get_room(id))
.filter(|(_, room)| filter.matches(room.state()))
.map(|(_, room)| room.clone())
.collect()
}
/// Get the room with the given room id.
pub fn get_room(&self, room_id: &RoomId) -> Option<Room> {
pub fn room(&self, room_id: &RoomId) -> Option<Room> {
self.rooms.read().unwrap().get(room_id).cloned()
}

2
crates/matrix-sdk-base/src/sync.rs
View File

@@ -89,7 +89,7 @@ impl RoomUpdates {
.keys()
.chain(self.join.keys())
.chain(self.invite.keys())
.filter_map(|room_id| store.get_room(room_id))
.filter_map(|room_id| store.room(room_id))
{
let _ = room.compute_display_name().await;
}

14
crates/matrix-sdk/src/client/mod.rs
View File

@@ -901,17 +901,13 @@ impl Client {
///
/// This will return the list of joined, invited, and left rooms.
pub fn rooms(&self) -> Vec<Room> {
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<Room> {
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<Room> {
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<Room> {
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<Room> {
self.base_client()
.get_rooms_filtered(RoomStateFilter::LEFT)
.rooms_filtered(RoomStateFilter::LEFT)
.into_iter()
.map(|room| Room::new(self.clone(), room))
.collect()