From 9332c55c8d0fc943e6914029fcecec2d97f5d000 Mon Sep 17 00:00:00 2001 From: Julian Sparber Date: Thu, 4 Mar 2021 19:23:10 +0100 Subject: [PATCH 1/2] matrix-sdk-base: merge StrippedRoom and Room --- matrix_sdk_base/src/client.rs | 10 +- matrix_sdk_base/src/lib.rs | 1 - matrix_sdk_base/src/rooms/mod.rs | 6 +- matrix_sdk_base/src/rooms/normal.rs | 8 +- matrix_sdk_base/src/rooms/stripped.rs | 145 -------------------- matrix_sdk_base/src/store/memory_store.rs | 8 +- matrix_sdk_base/src/store/mod.rs | 24 ++-- matrix_sdk_base/src/store/sled_store/mod.rs | 6 +- 8 files changed, 30 insertions(+), 178 deletions(-) delete mode 100644 matrix_sdk_base/src/rooms/stripped.rs diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs index 4de856e1..09a1dca8 100644 --- a/matrix_sdk_base/src/client.rs +++ b/matrix_sdk_base/src/client.rs @@ -63,7 +63,7 @@ use zeroize::Zeroizing; use crate::{ error::Result, event_handler::Handler, - rooms::{RoomInfo, RoomType, StrippedRoomInfo}, + rooms::{RoomInfo, RoomType}, session::Session, store::{ambiguity_map::AmbiguityCache, Result as StoreResult, StateChanges, Store}, EventHandler, RoomState, @@ -481,7 +481,7 @@ impl BaseClient { } } _ => { - room_info.handle_state_event(&s); + room_info.handle_state_event(&s.content()); changes.add_state_event(room_id, s.clone()); } }, @@ -525,7 +525,7 @@ impl BaseClient { fn handle_invited_state( &self, events: Vec>, - room_info: &mut StrippedRoomInfo, + room_info: &mut RoomInfo, ) -> ( InviteState, BTreeMap, @@ -549,7 +549,7 @@ impl BaseClient { ), } } else { - room_info.handle_state_event(&e); + room_info.handle_state_event(&e.content()); state_events .entry(e.content().event_type().to_owned()) .or_insert_with(BTreeMap::new) @@ -598,7 +598,7 @@ impl BaseClient { }) { state.events.push(event.clone()); - room_info.handle_state_event(&event); + room_info.handle_state_event(&event.content()); if let AnySyncStateEvent::RoomMember(member) = event { match MemberEvent::try_from(member) { diff --git a/matrix_sdk_base/src/lib.rs b/matrix_sdk_base/src/lib.rs index 7a8e6b42..95181d5e 100644 --- a/matrix_sdk_base/src/lib.rs +++ b/matrix_sdk_base/src/lib.rs @@ -54,7 +54,6 @@ mod store; pub use event_handler::{CustomEvent, EventHandler}; pub use rooms::{ InvitedRoom, JoinedRoom, LeftRoom, Room, RoomInfo, RoomMember, RoomState, RoomType, - StrippedRoom, StrippedRoomInfo, }; pub use store::{StateChanges, StateStore, Store, StoreError}; diff --git a/matrix_sdk_base/src/rooms/mod.rs b/matrix_sdk_base/src/rooms/mod.rs index 5186da5f..3aef1b44 100644 --- a/matrix_sdk_base/src/rooms/mod.rs +++ b/matrix_sdk_base/src/rooms/mod.rs @@ -1,6 +1,5 @@ mod members; mod normal; -mod stripped; use matrix_sdk_common::{ events::room::{ @@ -10,7 +9,6 @@ use matrix_sdk_common::{ identifiers::UserId, }; pub use normal::{Room, RoomInfo, RoomType}; -pub use stripped::{StrippedRoom, StrippedRoomInfo}; pub use members::RoomMember; @@ -140,11 +138,11 @@ impl Deref for LeftRoom { /// A room in an invited state. #[derive(Debug, Clone)] pub struct InvitedRoom { - pub(crate) inner: StrippedRoom, + pub(crate) inner: Room, } impl Deref for InvitedRoom { - type Target = StrippedRoom; + type Target = Room; fn deref(&self) -> &Self::Target { &self.inner diff --git a/matrix_sdk_base/src/rooms/normal.rs b/matrix_sdk_base/src/rooms/normal.rs index 2220b7f9..9c8084b3 100644 --- a/matrix_sdk_base/src/rooms/normal.rs +++ b/matrix_sdk_base/src/rooms/normal.rs @@ -29,7 +29,7 @@ use matrix_sdk_common::{ guest_access::GuestAccess, history_visibility::HistoryVisibility, join_rules::JoinRule, tombstone::TombstoneEventContent, }, - AnySyncStateEvent, EventType, + AnySyncStateEvent, AnyStateEventContent, EventType, }, identifiers::{RoomAliasId, RoomId, UserId}, }; @@ -43,7 +43,7 @@ use crate::{ use super::{BaseRoomInfo, RoomMember}; -/// The underlying room data structure collecting state for joined and left rooms. +/// The underlying room data structure collecting state for joined, left and invtied rooms. #[derive(Debug, Clone)] pub struct Room { room_id: Arc, @@ -484,8 +484,8 @@ impl RoomInfo { self.base_info.encryption.is_some() } - pub(crate) fn handle_state_event(&mut self, event: &AnySyncStateEvent) -> bool { - self.base_info.handle_state_event(&event.content()) + pub(crate) fn handle_state_event(&mut self, event: &AnyStateEventContent) -> bool { + self.base_info.handle_state_event(&event) } pub(crate) fn update_notification_count( diff --git a/matrix_sdk_base/src/rooms/stripped.rs b/matrix_sdk_base/src/rooms/stripped.rs deleted file mode 100644 index 8b94a7af..00000000 --- a/matrix_sdk_base/src/rooms/stripped.rs +++ /dev/null @@ -1,145 +0,0 @@ -// Copyright 2020 The Matrix.org Foundation C.I.C. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -use std::sync::{Arc, Mutex as SyncMutex}; - -use matrix_sdk_common::{ - events::{ - room::{encryption::EncryptionEventContent, history_visibility::HistoryVisibility}, - AnyStrippedStateEvent, - }, - identifiers::{RoomId, UserId}, -}; -use serde::{Deserialize, Serialize}; - -use crate::store::StateStore; - -use super::BaseRoomInfo; - -/// The underlying room data structure collecting state for invited rooms. -#[derive(Debug, Clone)] -pub struct StrippedRoom { - room_id: Arc, - own_user_id: Arc, - inner: Arc>, - store: Arc>, -} - -impl StrippedRoom { - pub(crate) fn new( - own_user_id: &UserId, - store: Arc>, - room_id: &RoomId, - ) -> Self { - let room_id = Arc::new(room_id.clone()); - - let info = StrippedRoomInfo { - room_id, - base_info: BaseRoomInfo::new(), - }; - - Self::restore(own_user_id, store, info) - } - - pub(crate) fn restore( - own_user_id: &UserId, - store: Arc>, - room_info: StrippedRoomInfo, - ) -> Self { - Self { - own_user_id: Arc::new(own_user_id.clone()), - room_id: room_info.room_id.clone(), - store, - inner: Arc::new(SyncMutex::new(room_info)), - } - } - - async fn calculate_name(&self) -> String { - let inner = self.inner.lock().unwrap(); - - if let Some(name) = &inner.base_info.name { - let name = name.trim(); - name.to_string() - } else if let Some(alias) = &inner.base_info.canonical_alias { - let alias = alias.alias().trim(); - alias.to_string() - } else { - // TODO do the dance with room members to calculate the name - self.room_id.to_string() - } - } - - /// Get the unique room id of the room. - pub fn room_id(&self) -> &RoomId { - &self.room_id - } - - /// Get our own user id. - pub fn own_user_id(&self) -> &UserId { - &self.own_user_id - } - - pub(crate) fn clone_info(&self) -> StrippedRoomInfo { - (*self.inner.lock().unwrap()).clone() - } - - /// Is the room encrypted. - pub fn is_encrypted(&self) -> bool { - self.inner.lock().unwrap().base_info.encryption.is_some() - } - - /// Get the `m.room.encryption` content that enabled end to end encryption - /// in the room. - pub fn encryption_settings(&self) -> Option { - self.inner.lock().unwrap().base_info.encryption.clone() - } - - /// Get the history visibility policy of this room. - pub fn history_visibility(&self) -> HistoryVisibility { - self.inner - .lock() - .unwrap() - .base_info - .history_visibility - .clone() - } - - /// Calculate the canonical display name of the room, taking into account - /// its name, aliases and members. - /// - /// The display name is calculated according to [this algorithm][spec]. - /// - /// [spec]: - pub async fn display_name(&self) -> String { - self.calculate_name().await - } -} - -/// The underlying pure data structure for invited rooms. -/// -/// Holds all the info needed to persist a room into the state store. -#[derive(Clone, Debug, Serialize, Deserialize)] -pub struct StrippedRoomInfo { - /// The unique room id of the room. - pub room_id: Arc, - /// Base room info which holds some basic event contents important for the - /// room state. - pub base_info: BaseRoomInfo, -} - -impl StrippedRoomInfo { - pub(crate) fn handle_state_event(&mut self, event: &AnyStrippedStateEvent) -> bool { - self.base_info.handle_state_event(&event.content()) - } -} diff --git a/matrix_sdk_base/src/store/memory_store.rs b/matrix_sdk_base/src/store/memory_store.rs index dbe3100e..014c20de 100644 --- a/matrix_sdk_base/src/store/memory_store.rs +++ b/matrix_sdk_base/src/store/memory_store.rs @@ -33,7 +33,7 @@ use tracing::info; use crate::deserialized_responses::{MemberEvent, StrippedMemberEvent}; -use super::{Result, RoomInfo, StateChanges, StateStore, StrippedRoomInfo}; +use super::{Result, RoomInfo, StateChanges, StateStore}; #[derive(Debug, Clone)] pub struct MemoryStore { @@ -49,7 +49,7 @@ pub struct MemoryStore { #[allow(clippy::type_complexity)] room_state: Arc>>>, room_account_data: Arc>>, - stripped_room_info: Arc>, + stripped_room_info: Arc>, #[allow(clippy::type_complexity)] stripped_room_state: Arc>>>, @@ -291,7 +291,7 @@ impl MemoryStore { self.room_info.iter().map(|r| r.clone()).collect() } - fn get_stripped_room_infos(&self) -> Vec { + fn get_stripped_room_infos(&self) -> Vec { #[allow(clippy::map_clone)] self.stripped_room_info.iter().map(|r| r.clone()).collect() } @@ -357,7 +357,7 @@ impl StateStore for MemoryStore { Ok(self.get_room_infos()) } - async fn get_stripped_room_infos(&self) -> Result> { + async fn get_stripped_room_infos(&self) -> Result> { Ok(self.get_stripped_room_infos()) } diff --git a/matrix_sdk_base/src/store/mod.rs b/matrix_sdk_base/src/store/mod.rs index 698efa13..f40751e4 100644 --- a/matrix_sdk_base/src/store/mod.rs +++ b/matrix_sdk_base/src/store/mod.rs @@ -35,7 +35,7 @@ use sled::Db; use crate::{ deserialized_responses::{MemberEvent, StrippedMemberEvent}, - rooms::{RoomInfo, RoomType, StrippedRoom, StrippedRoomInfo}, + rooms::{RoomInfo, RoomType}, InvitedRoom, JoinedRoom, LeftRoom, Room, RoomState, Session, }; @@ -164,8 +164,8 @@ pub trait StateStore: AsyncTraitDeps { /// Get all the pure `RoomInfo`s the store knows about. async fn get_room_infos(&self) -> Result>; - /// Get all the pure `StrippedRoomInfo`s the store knows about. - async fn get_stripped_room_infos(&self) -> Result>; + /// Get all the pure `RoomInfo`s the store knows about. + async fn get_stripped_room_infos(&self) -> Result>; /// Get all the users that use the given display name in the given room. /// @@ -192,7 +192,7 @@ pub struct Store { pub(crate) session: Arc>>, pub(crate) sync_token: Arc>>, rooms: Arc>, - stripped_rooms: Arc>, + stripped_rooms: Arc>, } impl Store { @@ -216,7 +216,7 @@ impl Store { } for info in self.inner.get_stripped_room_infos().await? { - let room = StrippedRoom::restore(&session.user_id, self.inner.clone(), info); + let room = Room::restore(&session.user_id, self.inner.clone(), info); self.stripped_rooms.insert(room.room_id().to_owned(), room); } @@ -315,12 +315,12 @@ impl Store { }) } - fn get_stripped_room(&self, room_id: &RoomId) -> Option { + fn get_stripped_room(&self, room_id: &RoomId) -> Option { #[allow(clippy::map_clone)] self.stripped_rooms.get(room_id).map(|r| r.clone()) } - pub(crate) async fn get_or_create_stripped_room(&self, room_id: &RoomId) -> StrippedRoom { + pub(crate) async fn get_or_create_stripped_room(&self, room_id: &RoomId) -> Room { let session = self.session.read().await; let user_id = &session .as_ref() @@ -329,7 +329,7 @@ impl Store { self.stripped_rooms .entry(room_id.clone()) - .or_insert_with(|| StrippedRoom::new(user_id, self.inner.clone(), room_id)) + .or_insert_with(|| Room::new(user_id, self.inner.clone(), room_id, RoomType::Invited)) .clone() } @@ -384,8 +384,8 @@ pub struct StateChanges { pub stripped_state: BTreeMap>>, /// A mapping of `RoomId` to a map of users and their `StrippedMemberEvent`. pub stripped_members: BTreeMap>, - /// A map of `RoomId` to `StrippedRoomInfo`. - pub invited_room_info: BTreeMap, + /// A map of `RoomId` to `RoomInfo`. + pub invited_room_info: BTreeMap, } impl StateChanges { @@ -408,8 +408,8 @@ impl StateChanges { .insert(room.room_id.as_ref().to_owned(), room); } - /// Update the `StateChanges` struct with the given `StrippedRoomInfo`. - pub fn add_stripped_room(&mut self, room: StrippedRoomInfo) { + /// Update the `StateChanges` struct with the given `RoomInfo`. + pub fn add_stripped_room(&mut self, room: RoomInfo) { self.invited_room_info .insert(room.room_id.as_ref().to_owned(), room); } diff --git a/matrix_sdk_base/src/store/sled_store/mod.rs b/matrix_sdk_base/src/store/sled_store/mod.rs index 5e8662c5..495b9477 100644 --- a/matrix_sdk_base/src/store/sled_store/mod.rs +++ b/matrix_sdk_base/src/store/sled_store/mod.rs @@ -43,7 +43,7 @@ use sled::{ }; use tracing::info; -use crate::{deserialized_responses::MemberEvent, rooms::StrippedRoomInfo}; +use crate::deserialized_responses::MemberEvent; use self::store_key::{EncryptedEvent, StoreKey}; @@ -560,7 +560,7 @@ impl SledStore { ) } - pub async fn get_stripped_room_infos(&self) -> impl Stream> { + pub async fn get_stripped_room_infos(&self) -> impl Stream> { let db = self.clone(); stream::iter( self.stripped_room_info @@ -644,7 +644,7 @@ impl StateStore for SledStore { self.get_room_infos().await.try_collect().await } - async fn get_stripped_room_infos(&self) -> Result> { + async fn get_stripped_room_infos(&self) -> Result> { self.get_stripped_room_infos().await.try_collect().await } From bc2c924c886f698dcac6188672fdc9a576e262ea Mon Sep 17 00:00:00 2001 From: Julian Sparber Date: Fri, 5 Mar 2021 12:00:43 +0100 Subject: [PATCH 2/2] matrix-sdk-base: remove InvitedRoom, JoinedRoom, LeftRoom and RoomState They are all replaced by `Room` --- matrix_sdk/examples/autojoin.rs | 6 +- matrix_sdk/examples/command_bot.rs | 10 +- matrix_sdk/examples/image_bot.rs | 10 +- matrix_sdk/examples/login.rs | 10 +- matrix_sdk/src/client.rs | 35 ++-- matrix_sdk/src/lib.rs | 4 +- matrix_sdk_base/src/client.rs | 6 +- matrix_sdk_base/src/event_handler/mod.rs | 229 ++++++++--------------- matrix_sdk_base/src/lib.rs | 4 +- matrix_sdk_base/src/rooms/mod.rs | 128 +------------ matrix_sdk_base/src/rooms/normal.rs | 4 +- matrix_sdk_base/src/store/mod.rs | 43 +---- 12 files changed, 130 insertions(+), 359 deletions(-) diff --git a/matrix_sdk/examples/autojoin.rs b/matrix_sdk/examples/autojoin.rs index b28f33a0..cff3a3bb 100644 --- a/matrix_sdk/examples/autojoin.rs +++ b/matrix_sdk/examples/autojoin.rs @@ -4,7 +4,7 @@ use tokio::time::{sleep, Duration}; use matrix_sdk::{ self, async_trait, events::{room::member::MemberEventContent, StrippedStateEvent}, - Client, ClientConfig, EventHandler, RoomState, SyncSettings, + Client, ClientConfig, EventHandler, Room, RoomType, SyncSettings, }; use url::Url; @@ -22,7 +22,7 @@ impl AutoJoinBot { impl EventHandler for AutoJoinBot { async fn on_stripped_state_member( &self, - room: RoomState, + room: Room, room_member: &StrippedStateEvent, _: Option, ) { @@ -30,7 +30,7 @@ impl EventHandler for AutoJoinBot { return; } - if let RoomState::Invited(room) = room { + if room.room_type() == RoomType::Invited { println!("Autojoining room {}", room.room_id()); let mut delay = 2; diff --git a/matrix_sdk/examples/command_bot.rs b/matrix_sdk/examples/command_bot.rs index ffae25c5..216dad07 100644 --- a/matrix_sdk/examples/command_bot.rs +++ b/matrix_sdk/examples/command_bot.rs @@ -6,7 +6,7 @@ use matrix_sdk::{ room::message::{MessageEventContent, MessageType, TextMessageEventContent}, AnyMessageEventContent, SyncMessageEvent, }, - Client, ClientConfig, EventHandler, RoomState, SyncSettings, + Client, ClientConfig, EventHandler, Room, RoomType, SyncSettings, }; use url::Url; @@ -24,12 +24,8 @@ impl CommandBot { #[async_trait] impl EventHandler for CommandBot { - async fn on_room_message( - &self, - room: RoomState, - event: &SyncMessageEvent, - ) { - if let RoomState::Joined(room) = room { + async fn on_room_message(&self, room: Room, event: &SyncMessageEvent) { + if room.room_type() == RoomType::Joined { let msg_body = if let SyncMessageEvent { content: MessageEventContent { diff --git a/matrix_sdk/examples/image_bot.rs b/matrix_sdk/examples/image_bot.rs index ed38f1fe..4ffd69c6 100644 --- a/matrix_sdk/examples/image_bot.rs +++ b/matrix_sdk/examples/image_bot.rs @@ -14,7 +14,7 @@ use matrix_sdk::{ room::message::{MessageEventContent, MessageType, TextMessageEventContent}, SyncMessageEvent, }, - Client, EventHandler, RoomState, SyncSettings, + Client, EventHandler, Room, RoomType, SyncSettings, }; use url::Url; @@ -32,12 +32,8 @@ impl ImageBot { #[async_trait] impl EventHandler for ImageBot { - async fn on_room_message( - &self, - room: RoomState, - event: &SyncMessageEvent, - ) { - if let RoomState::Joined(room) = room { + async fn on_room_message(&self, room: Room, event: &SyncMessageEvent) { + if room.room_type() == RoomType::Joined { let msg_body = if let SyncMessageEvent { content: MessageEventContent { diff --git a/matrix_sdk/examples/login.rs b/matrix_sdk/examples/login.rs index c8a88f58..b79b95e6 100644 --- a/matrix_sdk/examples/login.rs +++ b/matrix_sdk/examples/login.rs @@ -7,19 +7,15 @@ use matrix_sdk::{ room::message::{MessageEventContent, MessageType, TextMessageEventContent}, SyncMessageEvent, }, - Client, EventHandler, RoomState, SyncSettings, + Client, EventHandler, Room, RoomType, SyncSettings, }; struct EventCallback; #[async_trait] impl EventHandler for EventCallback { - async fn on_room_message( - &self, - room: RoomState, - event: &SyncMessageEvent, - ) { - if let RoomState::Joined(room) = room { + async fn on_room_message(&self, room: Room, event: &SyncMessageEvent) { + if room.room_type() == RoomType::Joined { if let SyncMessageEvent { content: MessageEventContent { diff --git a/matrix_sdk/src/client.rs b/matrix_sdk/src/client.rs index baef0a44..d0090c6f 100644 --- a/matrix_sdk/src/client.rs +++ b/matrix_sdk/src/client.rs @@ -41,8 +41,7 @@ use tracing::{error, info, instrument}; use matrix_sdk_base::{ deserialized_responses::{MembersResponse, SyncResponse}, - BaseClient, BaseClientConfig, EventHandler, InvitedRoom, JoinedRoom, LeftRoom, RoomState, - Session, Store, + BaseClient, BaseClientConfig, EventHandler, Room, RoomType, Session, Store, }; #[cfg(feature = "encryption")] @@ -564,34 +563,34 @@ impl Client { /// Get all the rooms the client knows about. /// /// This will return the list of joined, invited, and left rooms. - pub fn rooms(&self) -> Vec { + pub fn rooms(&self) -> Vec { self.store().get_rooms() } /// Returns the joined rooms this client knows about. - pub fn joined_rooms(&self) -> Vec { + pub fn joined_rooms(&self) -> Vec { self.store() .get_rooms() .into_iter() - .filter_map(|r| r.joined()) + .filter(|room| room.room_type() == RoomType::Joined) .collect() } /// Returns the invited rooms this client knows about. - pub fn invited_rooms(&self) -> Vec { + pub fn invited_rooms(&self) -> Vec { self.store() .get_rooms() .into_iter() - .filter_map(|r| r.invited()) + .filter(|room| room.room_type() == RoomType::Invited) .collect() } /// Returns the left rooms this client knows about. - pub fn left_rooms(&self) -> Vec { + pub fn left_rooms(&self) -> Vec { self.store() .get_rooms() .into_iter() - .filter_map(|r| r.left()) + .filter(|room| room.room_type() == RoomType::Left) .collect() } @@ -600,8 +599,10 @@ impl Client { /// # Arguments /// /// `room_id` - The unique id of the room that should be fetched. - pub fn get_joined_room(&self, room_id: &RoomId) -> Option { - self.store().get_joined_room(room_id) + pub fn get_joined_room(&self, room_id: &RoomId) -> Option { + self.store() + .get_room(room_id) + .filter(|room| room.room_type() == RoomType::Joined) } /// Get an invited room with the given room id. @@ -609,8 +610,10 @@ impl Client { /// # Arguments /// /// `room_id` - The unique id of the room that should be fetched. - pub fn get_invited_room(&self, room_id: &RoomId) -> Option { - self.store().get_invited_room(room_id) + pub fn get_invited_room(&self, room_id: &RoomId) -> Option { + self.store() + .get_room(room_id) + .filter(|room| room.room_type() == RoomType::Invited) } /// Get a left room with the given room id. @@ -618,8 +621,10 @@ impl Client { /// # Arguments /// /// `room_id` - The unique id of the room that should be fetched. - pub fn get_left_room(&self, room_id: &RoomId) -> Option { - self.store().get_left_room(room_id) + pub fn get_left_room(&self, room_id: &RoomId) -> Option { + self.store() + .get_room(room_id) + .filter(|room| room.room_type() == RoomType::Left) } /// Login to the server. diff --git a/matrix_sdk/src/lib.rs b/matrix_sdk/src/lib.rs index b0f2002a..9b70e874 100644 --- a/matrix_sdk/src/lib.rs +++ b/matrix_sdk/src/lib.rs @@ -68,8 +68,8 @@ compile_error!("only one of 'native-tls' or 'rustls-tls' features can be enabled #[cfg_attr(feature = "docs", doc(cfg(encryption)))] pub use matrix_sdk_base::crypto::{EncryptionInfo, LocalTrust}; pub use matrix_sdk_base::{ - CustomEvent, Error as BaseError, EventHandler, InvitedRoom, JoinedRoom, LeftRoom, RoomInfo, - RoomMember, RoomState, RoomType, Session, StateChanges, StoreError, + CustomEvent, Error as BaseError, EventHandler, Room, RoomInfo, RoomMember, RoomType, Session, + StateChanges, StoreError, }; pub use matrix_sdk_common::*; diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs index 09a1dca8..a5f5b817 100644 --- a/matrix_sdk_base/src/client.rs +++ b/matrix_sdk_base/src/client.rs @@ -63,10 +63,10 @@ use zeroize::Zeroizing; use crate::{ error::Result, event_handler::Handler, - rooms::{RoomInfo, RoomType}, + rooms::{Room, RoomInfo, RoomType}, session::Session, store::{ambiguity_map::AmbiguityCache, Result as StoreResult, StateChanges, Store}, - EventHandler, RoomState, + EventHandler, }; pub type Token = String; @@ -1178,7 +1178,7 @@ impl BaseClient { /// # Arguments /// /// * `room_id` - The id of the room that should be fetched. - pub fn get_room(&self, room_id: &RoomId) -> Option { + pub fn get_room(&self, room_id: &RoomId) -> Option { self.store.get_room(room_id) } diff --git a/matrix_sdk_base/src/event_handler/mod.rs b/matrix_sdk_base/src/event_handler/mod.rs index 7d383432..3a9db97d 100644 --- a/matrix_sdk_base/src/event_handler/mod.rs +++ b/matrix_sdk_base/src/event_handler/mod.rs @@ -47,7 +47,7 @@ use crate::{ AnySyncStateEvent, BasicEvent, StrippedStateEvent, SyncEphemeralRoomEvent, SyncMessageEvent, SyncStateEvent, }, - rooms::RoomState, + rooms::Room, Store, }; use matrix_sdk_common::async_trait; @@ -66,7 +66,7 @@ impl Deref for Handler { } impl Handler { - fn get_room(&self, room_id: &RoomId) -> Option { + fn get_room(&self, room_id: &RoomId) -> Option { self.store.get_room(room_id) } @@ -120,7 +120,7 @@ impl Handler { } } - async fn handle_timeline_event(&self, room: RoomState, event: &AnySyncRoomEvent) { + async fn handle_timeline_event(&self, room: Room, event: &AnySyncRoomEvent) { match event { AnySyncRoomEvent::State(event) => match event { AnySyncStateEvent::RoomMember(e) => self.on_room_member(room, e).await, @@ -160,7 +160,7 @@ impl Handler { } } - async fn handle_state_event(&self, room: RoomState, event: &AnySyncStateEvent) { + async fn handle_state_event(&self, room: Room, event: &AnySyncStateEvent) { match event { AnySyncStateEvent::RoomMember(member) => self.on_state_member(room, &member).await, AnySyncStateEvent::RoomName(name) => self.on_state_name(room, &name).await, @@ -188,7 +188,7 @@ impl Handler { pub(crate) async fn handle_stripped_state_event( &self, // TODO these events are only handleted in invited rooms. - room: RoomState, + room: Room, event: &AnyStrippedStateEvent, ) { match event { @@ -216,7 +216,7 @@ impl Handler { } } - pub(crate) async fn handle_account_data_event(&self, room: RoomState, event: &AnyBasicEvent) { + pub(crate) async fn handle_account_data_event(&self, room: Room, event: &AnyBasicEvent) { match event { AnyBasicEvent::Presence(presence) => self.on_non_room_presence(room, &presence).await, AnyBasicEvent::IgnoredUserList(ignored) => { @@ -229,7 +229,7 @@ impl Handler { pub(crate) async fn handle_ephemeral_event( &self, - room: RoomState, + room: Room, event: &AnySyncEphemeralRoomEvent, ) { match event { @@ -276,7 +276,7 @@ pub enum CustomEvent<'c> { /// # room::message::{MessageEventContent, MessageType, TextMessageEventContent}, /// # SyncMessageEvent /// # }, -/// # EventHandler, RoomState +/// # EventHandler, Room, RoomType, /// # }; /// # use matrix_sdk_common::{async_trait, locks::RwLock}; /// @@ -284,8 +284,8 @@ pub enum CustomEvent<'c> { /// /// #[async_trait] /// impl EventHandler for EventCallback { -/// async fn on_room_message(&self, room: RoomState, event: &SyncMessageEvent) { -/// if let RoomState::Joined(room) = room { +/// async fn on_room_message(&self, room: Room, event: &SyncMessageEvent) { +/// if room.room_type() == RoomType::Joined { /// if let SyncMessageEvent { /// content: /// MessageEventContent { @@ -311,165 +311,130 @@ pub enum CustomEvent<'c> { pub trait EventHandler: Send + Sync { // ROOM EVENTS from `IncomingTimeline` /// Fires when `Client` receives a `RoomEvent::RoomMember` event. - async fn on_room_member(&self, _: RoomState, _: &SyncStateEvent) {} + async fn on_room_member(&self, _: Room, _: &SyncStateEvent) {} /// Fires when `Client` receives a `RoomEvent::RoomName` event. - async fn on_room_name(&self, _: RoomState, _: &SyncStateEvent) {} + async fn on_room_name(&self, _: Room, _: &SyncStateEvent) {} /// Fires when `Client` receives a `RoomEvent::RoomCanonicalAlias` event. async fn on_room_canonical_alias( &self, - _: RoomState, + _: Room, _: &SyncStateEvent, ) { } /// Fires when `Client` receives a `RoomEvent::RoomAliases` event. - async fn on_room_aliases(&self, _: RoomState, _: &SyncStateEvent) {} + async fn on_room_aliases(&self, _: Room, _: &SyncStateEvent) {} /// Fires when `Client` receives a `RoomEvent::RoomAvatar` event. - async fn on_room_avatar(&self, _: RoomState, _: &SyncStateEvent) {} + async fn on_room_avatar(&self, _: Room, _: &SyncStateEvent) {} /// Fires when `Client` receives a `RoomEvent::RoomMessage` event. - async fn on_room_message(&self, _: RoomState, _: &SyncMessageEvent) {} + async fn on_room_message(&self, _: Room, _: &SyncMessageEvent) {} /// Fires when `Client` receives a `RoomEvent::RoomMessageFeedback` event. - async fn on_room_message_feedback( - &self, - _: RoomState, - _: &SyncMessageEvent, - ) { - } + async fn on_room_message_feedback(&self, _: Room, _: &SyncMessageEvent) {} /// Fires when `Client` receives a `RoomEvent::CallInvite` event - async fn on_room_call_invite(&self, _: RoomState, _: &SyncMessageEvent) {} + async fn on_room_call_invite(&self, _: Room, _: &SyncMessageEvent) {} /// Fires when `Client` receives a `RoomEvent::CallAnswer` event - async fn on_room_call_answer(&self, _: RoomState, _: &SyncMessageEvent) {} + async fn on_room_call_answer(&self, _: Room, _: &SyncMessageEvent) {} /// Fires when `Client` receives a `RoomEvent::CallCandidates` event - async fn on_room_call_candidates( - &self, - _: RoomState, - _: &SyncMessageEvent, - ) { + async fn on_room_call_candidates(&self, _: Room, _: &SyncMessageEvent) { } /// Fires when `Client` receives a `RoomEvent::CallHangup` event - async fn on_room_call_hangup(&self, _: RoomState, _: &SyncMessageEvent) {} + async fn on_room_call_hangup(&self, _: Room, _: &SyncMessageEvent) {} /// Fires when `Client` receives a `RoomEvent::RoomRedaction` event. - async fn on_room_redaction(&self, _: RoomState, _: &SyncRedactionEvent) {} + async fn on_room_redaction(&self, _: Room, _: &SyncRedactionEvent) {} /// Fires when `Client` receives a `RoomEvent::RoomPowerLevels` event. - async fn on_room_power_levels( - &self, - _: RoomState, - _: &SyncStateEvent, - ) { - } + async fn on_room_power_levels(&self, _: Room, _: &SyncStateEvent) {} /// Fires when `Client` receives a `RoomEvent::Tombstone` event. - async fn on_room_join_rules(&self, _: RoomState, _: &SyncStateEvent) {} + async fn on_room_join_rules(&self, _: Room, _: &SyncStateEvent) {} /// Fires when `Client` receives a `RoomEvent::Tombstone` event. - async fn on_room_tombstone(&self, _: RoomState, _: &SyncStateEvent) {} + async fn on_room_tombstone(&self, _: Room, _: &SyncStateEvent) {} // `RoomEvent`s from `IncomingState` /// Fires when `Client` receives a `StateEvent::RoomMember` event. - async fn on_state_member(&self, _: RoomState, _: &SyncStateEvent) {} + async fn on_state_member(&self, _: Room, _: &SyncStateEvent) {} /// Fires when `Client` receives a `StateEvent::RoomName` event. - async fn on_state_name(&self, _: RoomState, _: &SyncStateEvent) {} + async fn on_state_name(&self, _: Room, _: &SyncStateEvent) {} /// Fires when `Client` receives a `StateEvent::RoomCanonicalAlias` event. async fn on_state_canonical_alias( &self, - _: RoomState, + _: Room, _: &SyncStateEvent, ) { } /// Fires when `Client` receives a `StateEvent::RoomAliases` event. - async fn on_state_aliases(&self, _: RoomState, _: &SyncStateEvent) {} + async fn on_state_aliases(&self, _: Room, _: &SyncStateEvent) {} /// Fires when `Client` receives a `StateEvent::RoomAvatar` event. - async fn on_state_avatar(&self, _: RoomState, _: &SyncStateEvent) {} + async fn on_state_avatar(&self, _: Room, _: &SyncStateEvent) {} /// Fires when `Client` receives a `StateEvent::RoomPowerLevels` event. - async fn on_state_power_levels( - &self, - _: RoomState, - _: &SyncStateEvent, - ) { - } + async fn on_state_power_levels(&self, _: Room, _: &SyncStateEvent) {} /// Fires when `Client` receives a `StateEvent::RoomJoinRules` event. - async fn on_state_join_rules(&self, _: RoomState, _: &SyncStateEvent) {} + async fn on_state_join_rules(&self, _: Room, _: &SyncStateEvent) {} // `AnyStrippedStateEvent`s /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomMember` event. async fn on_stripped_state_member( &self, - _: RoomState, + _: Room, _: &StrippedStateEvent, _: Option, ) { } /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomName` event. - async fn on_stripped_state_name(&self, _: RoomState, _: &StrippedStateEvent) { - } + async fn on_stripped_state_name(&self, _: Room, _: &StrippedStateEvent) {} /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomCanonicalAlias` event. async fn on_stripped_state_canonical_alias( &self, - _: RoomState, + _: Room, _: &StrippedStateEvent, ) { } /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomAliases` event. async fn on_stripped_state_aliases( &self, - _: RoomState, + _: Room, _: &StrippedStateEvent, ) { } /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomAvatar` event. - async fn on_stripped_state_avatar( - &self, - _: RoomState, - _: &StrippedStateEvent, - ) { - } + async fn on_stripped_state_avatar(&self, _: Room, _: &StrippedStateEvent) {} /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomPowerLevels` event. async fn on_stripped_state_power_levels( &self, - _: RoomState, + _: Room, _: &StrippedStateEvent, ) { } /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomJoinRules` event. async fn on_stripped_state_join_rules( &self, - _: RoomState, + _: Room, _: &StrippedStateEvent, ) { } // `NonRoomEvent` (this is a type alias from ruma_events) /// Fires when `Client` receives a `NonRoomEvent::RoomPresence` event. - async fn on_non_room_presence(&self, _: RoomState, _: &PresenceEvent) {} + async fn on_non_room_presence(&self, _: Room, _: &PresenceEvent) {} /// Fires when `Client` receives a `NonRoomEvent::RoomName` event. async fn on_non_room_ignored_users( &self, - _: RoomState, + _: Room, _: &BasicEvent, ) { } /// Fires when `Client` receives a `NonRoomEvent::RoomCanonicalAlias` event. - async fn on_non_room_push_rules(&self, _: RoomState, _: &BasicEvent) {} + async fn on_non_room_push_rules(&self, _: Room, _: &BasicEvent) {} /// Fires when `Client` receives a `NonRoomEvent::RoomAliases` event. async fn on_non_room_fully_read( &self, - _: RoomState, + _: Room, _: &SyncEphemeralRoomEvent, ) { } /// Fires when `Client` receives a `NonRoomEvent::Typing` event. - async fn on_non_room_typing( - &self, - _: RoomState, - _: &SyncEphemeralRoomEvent, - ) { - } + async fn on_non_room_typing(&self, _: Room, _: &SyncEphemeralRoomEvent) {} /// Fires when `Client` receives a `NonRoomEvent::Receipt` event. /// /// This is always a read receipt. - async fn on_non_room_receipt( - &self, - _: RoomState, - _: &SyncEphemeralRoomEvent, - ) { - } + async fn on_non_room_receipt(&self, _: Room, _: &SyncEphemeralRoomEvent) {} // `PresenceEvent` is a struct so there is only the one method /// Fires when `Client` receives a `NonRoomEvent::RoomAliases` event. @@ -479,14 +444,14 @@ pub trait EventHandler: Send + Sync { /// because the event was unknown to ruma. /// /// The only guarantee this method can give about the event is that it is valid JSON. - async fn on_unrecognized_event(&self, _: RoomState, _: &RawJsonValue) {} + async fn on_unrecognized_event(&self, _: Room, _: &RawJsonValue) {} /// Fires when `Client` receives a `Event::Custom` event or if deserialization fails /// because the event was unknown to ruma. /// /// The only guarantee this method can give about the event is that it is in the /// shape of a valid matrix event. - async fn on_custom_event(&self, _: RoomState, _: &CustomEvent<'_>) {} + async fn on_custom_event(&self, _: Room, _: &CustomEvent<'_>) {} } #[cfg(test)] @@ -505,108 +470,88 @@ mod test { #[cfg_attr(target_arch = "wasm32", async_trait(?Send))] #[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl EventHandler for EvHandlerTest { - async fn on_room_member(&self, _: RoomState, _: &SyncStateEvent) { + async fn on_room_member(&self, _: Room, _: &SyncStateEvent) { self.0.lock().await.push("member".to_string()) } - async fn on_room_name(&self, _: RoomState, _: &SyncStateEvent) { + async fn on_room_name(&self, _: Room, _: &SyncStateEvent) { self.0.lock().await.push("name".to_string()) } async fn on_room_canonical_alias( &self, - _: RoomState, + _: Room, _: &SyncStateEvent, ) { self.0.lock().await.push("canonical".to_string()) } - async fn on_room_aliases(&self, _: RoomState, _: &SyncStateEvent) { + async fn on_room_aliases(&self, _: Room, _: &SyncStateEvent) { self.0.lock().await.push("aliases".to_string()) } - async fn on_room_avatar(&self, _: RoomState, _: &SyncStateEvent) { + async fn on_room_avatar(&self, _: Room, _: &SyncStateEvent) { self.0.lock().await.push("avatar".to_string()) } - async fn on_room_message(&self, _: RoomState, _: &SyncMessageEvent) { + async fn on_room_message(&self, _: Room, _: &SyncMessageEvent) { self.0.lock().await.push("message".to_string()) } async fn on_room_message_feedback( &self, - _: RoomState, + _: Room, _: &SyncMessageEvent, ) { self.0.lock().await.push("feedback".to_string()) } - async fn on_room_call_invite( - &self, - _: RoomState, - _: &SyncMessageEvent, - ) { + async fn on_room_call_invite(&self, _: Room, _: &SyncMessageEvent) { self.0.lock().await.push("call invite".to_string()) } - async fn on_room_call_answer( - &self, - _: RoomState, - _: &SyncMessageEvent, - ) { + async fn on_room_call_answer(&self, _: Room, _: &SyncMessageEvent) { self.0.lock().await.push("call answer".to_string()) } async fn on_room_call_candidates( &self, - _: RoomState, + _: Room, _: &SyncMessageEvent, ) { self.0.lock().await.push("call candidates".to_string()) } - async fn on_room_call_hangup( - &self, - _: RoomState, - _: &SyncMessageEvent, - ) { + async fn on_room_call_hangup(&self, _: Room, _: &SyncMessageEvent) { self.0.lock().await.push("call hangup".to_string()) } - async fn on_room_redaction(&self, _: RoomState, _: &SyncRedactionEvent) { + async fn on_room_redaction(&self, _: Room, _: &SyncRedactionEvent) { self.0.lock().await.push("redaction".to_string()) } - async fn on_room_power_levels( - &self, - _: RoomState, - _: &SyncStateEvent, - ) { + async fn on_room_power_levels(&self, _: Room, _: &SyncStateEvent) { self.0.lock().await.push("power".to_string()) } - async fn on_room_tombstone(&self, _: RoomState, _: &SyncStateEvent) { + async fn on_room_tombstone(&self, _: Room, _: &SyncStateEvent) { self.0.lock().await.push("tombstone".to_string()) } - async fn on_state_member(&self, _: RoomState, _: &SyncStateEvent) { + async fn on_state_member(&self, _: Room, _: &SyncStateEvent) { self.0.lock().await.push("state member".to_string()) } - async fn on_state_name(&self, _: RoomState, _: &SyncStateEvent) { + async fn on_state_name(&self, _: Room, _: &SyncStateEvent) { self.0.lock().await.push("state name".to_string()) } async fn on_state_canonical_alias( &self, - _: RoomState, + _: Room, _: &SyncStateEvent, ) { self.0.lock().await.push("state canonical".to_string()) } - async fn on_state_aliases(&self, _: RoomState, _: &SyncStateEvent) { + async fn on_state_aliases(&self, _: Room, _: &SyncStateEvent) { self.0.lock().await.push("state aliases".to_string()) } - async fn on_state_avatar(&self, _: RoomState, _: &SyncStateEvent) { + async fn on_state_avatar(&self, _: Room, _: &SyncStateEvent) { self.0.lock().await.push("state avatar".to_string()) } async fn on_state_power_levels( &self, - _: RoomState, + _: Room, _: &SyncStateEvent, ) { self.0.lock().await.push("state power".to_string()) } - async fn on_state_join_rules( - &self, - _: RoomState, - _: &SyncStateEvent, - ) { + async fn on_state_join_rules(&self, _: Room, _: &SyncStateEvent) { self.0.lock().await.push("state rules".to_string()) } @@ -614,7 +559,7 @@ mod test { /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomMember` event. async fn on_stripped_state_member( &self, - _: RoomState, + _: Room, _: &StrippedStateEvent, _: Option, ) { @@ -624,17 +569,13 @@ mod test { .push("stripped state member".to_string()) } /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomName` event. - async fn on_stripped_state_name( - &self, - _: RoomState, - _: &StrippedStateEvent, - ) { + async fn on_stripped_state_name(&self, _: Room, _: &StrippedStateEvent) { self.0.lock().await.push("stripped state name".to_string()) } /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomCanonicalAlias` event. async fn on_stripped_state_canonical_alias( &self, - _: RoomState, + _: Room, _: &StrippedStateEvent, ) { self.0 @@ -645,7 +586,7 @@ mod test { /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomAliases` event. async fn on_stripped_state_aliases( &self, - _: RoomState, + _: Room, _: &StrippedStateEvent, ) { self.0 @@ -656,7 +597,7 @@ mod test { /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomAvatar` event. async fn on_stripped_state_avatar( &self, - _: RoomState, + _: Room, _: &StrippedStateEvent, ) { self.0 @@ -667,7 +608,7 @@ mod test { /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomPowerLevels` event. async fn on_stripped_state_power_levels( &self, - _: RoomState, + _: Room, _: &StrippedStateEvent, ) { self.0.lock().await.push("stripped state power".to_string()) @@ -675,46 +616,42 @@ mod test { /// Fires when `Client` receives a `AnyStrippedStateEvent::StrippedRoomJoinRules` event. async fn on_stripped_state_join_rules( &self, - _: RoomState, + _: Room, _: &StrippedStateEvent, ) { self.0.lock().await.push("stripped state rules".to_string()) } - async fn on_non_room_presence(&self, _: RoomState, _: &PresenceEvent) { + async fn on_non_room_presence(&self, _: Room, _: &PresenceEvent) { self.0.lock().await.push("presence".to_string()) } async fn on_non_room_ignored_users( &self, - _: RoomState, + _: Room, _: &BasicEvent, ) { self.0.lock().await.push("account ignore".to_string()) } - async fn on_non_room_push_rules( - &self, - _: RoomState, - _: &BasicEvent, - ) { + async fn on_non_room_push_rules(&self, _: Room, _: &BasicEvent) { self.0.lock().await.push("account push rules".to_string()) } async fn on_non_room_fully_read( &self, - _: RoomState, + _: Room, _: &SyncEphemeralRoomEvent, ) { self.0.lock().await.push("account read".to_string()) } async fn on_non_room_typing( &self, - _: RoomState, + _: Room, _: &SyncEphemeralRoomEvent, ) { self.0.lock().await.push("typing event".to_string()) } async fn on_non_room_receipt( &self, - _: RoomState, + _: Room, _: &SyncEphemeralRoomEvent, ) { self.0.lock().await.push("receipt event".to_string()) @@ -722,10 +659,10 @@ mod test { async fn on_presence_event(&self, _: &PresenceEvent) { self.0.lock().await.push("presence event".to_string()) } - async fn on_unrecognized_event(&self, _: RoomState, _: &RawJsonValue) { + async fn on_unrecognized_event(&self, _: Room, _: &RawJsonValue) { self.0.lock().await.push("unrecognized event".to_string()) } - async fn on_custom_event(&self, _: RoomState, _: &CustomEvent<'_>) { + async fn on_custom_event(&self, _: Room, _: &CustomEvent<'_>) { self.0.lock().await.push("custom event".to_string()) } } diff --git a/matrix_sdk_base/src/lib.rs b/matrix_sdk_base/src/lib.rs index 95181d5e..ef1abffa 100644 --- a/matrix_sdk_base/src/lib.rs +++ b/matrix_sdk_base/src/lib.rs @@ -52,9 +52,7 @@ mod session; mod store; pub use event_handler::{CustomEvent, EventHandler}; -pub use rooms::{ - InvitedRoom, JoinedRoom, LeftRoom, Room, RoomInfo, RoomMember, RoomState, RoomType, -}; +pub use rooms::{Room, RoomInfo, RoomMember, RoomType}; pub use store::{StateChanges, StateStore, Store, StoreError}; pub use client::{BaseClient, BaseClientConfig}; diff --git a/matrix_sdk_base/src/rooms/mod.rs b/matrix_sdk_base/src/rooms/mod.rs index 3aef1b44..f536e7b8 100644 --- a/matrix_sdk_base/src/rooms/mod.rs +++ b/matrix_sdk_base/src/rooms/mod.rs @@ -13,7 +13,7 @@ pub use normal::{Room, RoomInfo, RoomType}; pub use members::RoomMember; use serde::{Deserialize, Serialize}; -use std::{cmp::max, ops::Deref}; +use std::cmp::max; use matrix_sdk_common::{ events::{ @@ -23,132 +23,6 @@ use matrix_sdk_common::{ identifiers::RoomAliasId, }; -/// An enum that represents the state of the given `Room`. -/// -/// If the event came from the `join`, `invite` or `leave` rooms map from the server -/// the variant that holds the corresponding room is used. `RoomState` is generic -/// so it can be used to represent a `Room` or an `Arc>` -#[derive(Debug, Clone)] -pub enum RoomState { - /// A room from the `join` section of a sync response. - Joined(JoinedRoom), - /// A room from the `leave` section of a sync response. - Left(LeftRoom), - /// A room from the `invite` section of a sync response. - Invited(InvitedRoom), -} - -impl RoomState { - /// Destructure the room into a `JoinedRoom` if the room is in the joined - /// state. - pub fn joined(self) -> Option { - if let RoomState::Joined(r) = self { - Some(r) - } else { - None - } - } - - /// Destructure the room into an `InvitedRoom` if the room is in the invited - /// state. - pub fn invited(self) -> Option { - if let RoomState::Invited(r) = self { - Some(r) - } else { - None - } - } - - /// Destructure the room into a `LeftRoom` if the room is in the left - /// state. - pub fn left(self) -> Option { - if let RoomState::Left(r) = self { - Some(r) - } else { - None - } - } - - /// Is the room encrypted. - pub fn is_encrypted(&self) -> bool { - match self { - RoomState::Joined(r) => r.inner.is_encrypted(), - RoomState::Left(r) => r.inner.is_encrypted(), - RoomState::Invited(r) => r.inner.is_encrypted(), - } - } - - /// Get the history visibility policy of this room. - pub fn history_visibility(&self) -> HistoryVisibility { - match self { - RoomState::Joined(r) => r.inner.history_visibility(), - RoomState::Left(r) => r.inner.history_visibility(), - RoomState::Invited(r) => r.inner.history_visibility(), - } - } - - /// Get the `m.room.encryption` content that enabled end to end encryption - /// in the room. - pub fn encryption_settings(&self) -> Option { - match self { - RoomState::Joined(r) => r.inner.encryption_settings(), - RoomState::Left(r) => r.inner.encryption_settings(), - RoomState::Invited(r) => r.inner.encryption_settings(), - } - } - - /// Are the members for this room synced. - pub fn are_members_synced(&self) -> bool { - if let RoomState::Joined(r) = self { - r.inner.are_members_synced() - } else { - true - } - } -} - -/// A room in a joined state. -#[derive(Debug, Clone)] -pub struct JoinedRoom { - pub(crate) inner: Room, -} - -impl Deref for JoinedRoom { - type Target = Room; - - fn deref(&self) -> &Self::Target { - &self.inner - } -} - -/// A room in a left state. -#[derive(Debug, Clone)] -pub struct LeftRoom { - pub(crate) inner: Room, -} - -impl Deref for LeftRoom { - type Target = Room; - - fn deref(&self) -> &Self::Target { - &self.inner - } -} - -/// A room in an invited state. -#[derive(Debug, Clone)] -pub struct InvitedRoom { - pub(crate) inner: Room, -} - -impl Deref for InvitedRoom { - type Target = Room; - - fn deref(&self) -> &Self::Target { - &self.inner - } -} - /// A base room info struct that is the backbone of normal as well as stripped /// rooms. Holds all the state events that are important to present a room to /// users. diff --git a/matrix_sdk_base/src/rooms/normal.rs b/matrix_sdk_base/src/rooms/normal.rs index 9c8084b3..96fa47fe 100644 --- a/matrix_sdk_base/src/rooms/normal.rs +++ b/matrix_sdk_base/src/rooms/normal.rs @@ -29,7 +29,7 @@ use matrix_sdk_common::{ guest_access::GuestAccess, history_visibility::HistoryVisibility, join_rules::JoinRule, tombstone::TombstoneEventContent, }, - AnySyncStateEvent, AnyStateEventContent, EventType, + AnyStateEventContent, AnySyncStateEvent, EventType, }, identifiers::{RoomAliasId, RoomId, UserId}, }; @@ -67,7 +67,7 @@ pub struct RoomSummary { /// Enum keeping track in which state the room is, e.g. if our own user is /// joined, invited, or has left the room. -#[derive(Clone, Copy, Debug, Serialize, Deserialize)] +#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)] pub enum RoomType { /// The room is in a joined state. Joined, diff --git a/matrix_sdk_base/src/store/mod.rs b/matrix_sdk_base/src/store/mod.rs index f40751e4..1f6e3d48 100644 --- a/matrix_sdk_base/src/store/mod.rs +++ b/matrix_sdk_base/src/store/mod.rs @@ -36,7 +36,7 @@ use sled::Db; use crate::{ deserialized_responses::{MemberEvent, StrippedMemberEvent}, rooms::{RoomInfo, RoomType}, - InvitedRoom, JoinedRoom, LeftRoom, Room, RoomState, Session, + Room, Session, }; pub(crate) mod ambiguity_map; @@ -267,51 +267,20 @@ impl Store { } /// Get all the rooms this store knows about. - pub fn get_rooms(&self) -> Vec { + pub fn get_rooms(&self) -> Vec { self.rooms .iter() .filter_map(|r| self.get_room(r.key())) .collect() } - /// Get the joined room with the given room id. - /// - /// *Note*: A room with the given id might exist in a different state, this - /// will only return the room if it's in the joined state. - pub fn get_joined_room(&self, room_id: &RoomId) -> Option { - self.get_room(room_id).and_then(|r| r.joined()) - } - - /// Get the joined room with the given room id. - /// - /// *Note*: A room with the given id might exist in a different state, this - /// will only return the room if it's in the invited state. - pub fn get_invited_room(&self, room_id: &RoomId) -> Option { - self.get_room(room_id).and_then(|r| r.invited()) - } - - /// Get the joined room with the given room id. - /// - /// *Note*: A room with the given id might exist in a different state, this - /// will only return the room if it's in the left state. - pub fn get_left_room(&self, room_id: &RoomId) -> Option { - self.get_room(room_id).and_then(|r| r.left()) - } - /// Get the room with the given room id. - /// - /// *Note*: This will return the room in the `RoomState` enum, a room might - /// turn from an invited room to a joined one between sync requests, this - /// room struct might have stale info in that case and a new one should be - /// pulled out of the store. - pub fn get_room(&self, room_id: &RoomId) -> Option { + pub fn get_room(&self, room_id: &RoomId) -> Option { self.get_bare_room(room_id) .and_then(|r| match r.room_type() { - RoomType::Joined => Some(RoomState::Joined(JoinedRoom { inner: r })), - RoomType::Left => Some(RoomState::Left(LeftRoom { inner: r })), - RoomType::Invited => self - .get_stripped_room(room_id) - .map(|r| RoomState::Invited(InvitedRoom { inner: r })), + RoomType::Joined => Some(r), + RoomType::Left => Some(r), + RoomType::Invited => self.get_stripped_room(room_id), }) }