char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

base: Remove the stale rooms from the hashmaps.

master
Damir Jelić 2020-05-13 13:23:16 +02:00
parent dc56063c67
commit 51f0a487ce
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
matrix_sdk_base/src/client.rs
View File

@ -310,6 +310,11 @@ impl BaseClient {
} }
pub(crate) async fn get_or_create_joined_room(&self, room_id: &RoomId) -> Arc<RwLock<Room>> { pub(crate) async fn get_or_create_joined_room(&self, room_id: &RoomId) -> Arc<RwLock<Room>> {
// If this used to be an invited or left room remove them from our other
// hashmaps.
self.invited_rooms.write().await.remove(room_id);
self.left_rooms.write().await.remove(room_id);
let mut rooms = self.joined_rooms.write().await; let mut rooms = self.joined_rooms.write().await;
#[allow(clippy::or_fun_call)] #[allow(clippy::or_fun_call)]
rooms rooms
@ -344,6 +349,10 @@ impl BaseClient {
} }
pub(crate) async fn get_or_create_invited_room(&self, room_id: &RoomId) -> Arc<RwLock<Room>> { pub(crate) async fn get_or_create_invited_room(&self, room_id: &RoomId) -> Arc<RwLock<Room>> {
// Remove the left rooms only here, since a join -> invite action per
// spec can't happen.
self.left_rooms.write().await.remove(room_id);
let mut rooms = self.invited_rooms.write().await; let mut rooms = self.invited_rooms.write().await;
#[allow(clippy::or_fun_call)] #[allow(clippy::or_fun_call)]
rooms rooms
@ -378,6 +387,11 @@ impl BaseClient {
} }
pub(crate) async fn get_or_create_left_room(&self, room_id: &RoomId) -> Arc<RwLock<Room>> { pub(crate) async fn get_or_create_left_room(&self, room_id: &RoomId) -> Arc<RwLock<Room>> {
// If this used to be an invited or joined room remove them from our other
// hashmaps.
self.invited_rooms.write().await.remove(room_id);
self.joined_rooms.write().await.remove(room_id);
let mut rooms = self.left_rooms.write().await; let mut rooms = self.left_rooms.write().await;
#[allow(clippy::or_fun_call)] #[allow(clippy::or_fun_call)]
rooms rooms