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

Merge branch 'unify-ee-methods'

master
Damir Jelić 2020-06-02 10:30:20 +02:00
parent 587614cdd7 8f017e7b27
commit 9f34b371be
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
matrix_sdk_base/src/client.rs
View File

@ -1615,18 +1615,18 @@ impl BaseClient {
match event { match event {
NonRoomEvent::Presence(presence) => { NonRoomEvent::Presence(presence) => {
event_emitter.on_account_presence(room, &presence).await event_emitter.on_non_room_presence(room, &presence).await
} }
NonRoomEvent::IgnoredUserList(ignored) => { NonRoomEvent::IgnoredUserList(ignored) => {
event_emitter.on_account_ignored_users(room, &ignored).await event_emitter
.on_non_room_ignored_users(room, &ignored)
.await
} }
NonRoomEvent::PushRules(rules) => { NonRoomEvent::PushRules(rules) => {
event_emitter.on_account_push_rules(room, &rules).await event_emitter.on_non_room_push_rules(room, &rules).await
} }
NonRoomEvent::FullyRead(full_read) => { NonRoomEvent::FullyRead(full_read) => {
event_emitter event_emitter.on_non_room_fully_read(room, &full_read).await
.on_account_data_fully_read(room, &full_read)
.await
} }
_ => {} _ => {}
} }
@ -1671,18 +1671,18 @@ impl BaseClient {
match event { match event {
NonRoomEvent::Presence(presence) => { NonRoomEvent::Presence(presence) => {
event_emitter.on_account_presence(room, &presence).await event_emitter.on_non_room_presence(room, &presence).await
} }
NonRoomEvent::IgnoredUserList(ignored) => { NonRoomEvent::IgnoredUserList(ignored) => {
event_emitter.on_account_ignored_users(room, &ignored).await event_emitter
.on_non_room_ignored_users(room, &ignored)
.await
} }
NonRoomEvent::PushRules(rules) => { NonRoomEvent::PushRules(rules) => {
event_emitter.on_account_push_rules(room, &rules).await event_emitter.on_non_room_push_rules(room, &rules).await
} }
NonRoomEvent::FullyRead(full_read) => { NonRoomEvent::FullyRead(full_read) => {
event_emitter event_emitter.on_non_room_fully_read(room, &full_read).await
.on_account_data_fully_read(room, &full_read)
.await
} }
_ => {} _ => {}
} }

22
matrix_sdk_base/src/event_emitter/mod.rs
View File

@ -170,20 +170,20 @@ pub trait EventEmitter: Send + Sync {
async fn on_stripped_state_join_rules(&self, _: SyncRoom, _: &StrippedRoomJoinRules) {} async fn on_stripped_state_join_rules(&self, _: SyncRoom, _: &StrippedRoomJoinRules) {}
// `NonRoomEvent` (this is a type alias from ruma_events) // `NonRoomEvent` (this is a type alias from ruma_events)
/// Fires when `Client` receives a `NonRoomEvent::RoomMember` event. /// Fires when `Client` receives a `NonRoomEvent::RoomPresence` event.
async fn on_account_presence(&self, _: SyncRoom, _: &PresenceEvent) {} async fn on_non_room_presence(&self, _: SyncRoom, _: &PresenceEvent) {}
/// Fires when `Client` receives a `NonRoomEvent::RoomName` event. /// Fires when `Client` receives a `NonRoomEvent::RoomName` event.
async fn on_account_ignored_users(&self, _: SyncRoom, _: &IgnoredUserListEvent) {} async fn on_non_room_ignored_users(&self, _: SyncRoom, _: &IgnoredUserListEvent) {}
/// Fires when `Client` receives a `NonRoomEvent::RoomCanonicalAlias` event. /// Fires when `Client` receives a `NonRoomEvent::RoomCanonicalAlias` event.
async fn on_account_push_rules(&self, _: SyncRoom, _: &PushRulesEvent) {} async fn on_non_room_push_rules(&self, _: SyncRoom, _: &PushRulesEvent) {}
/// Fires when `Client` receives a `NonRoomEvent::RoomAliases` event. /// Fires when `Client` receives a `NonRoomEvent::RoomAliases` event.
async fn on_account_data_fully_read(&self, _: SyncRoom, _: &FullyReadEvent) {} async fn on_non_room_fully_read(&self, _: SyncRoom, _: &FullyReadEvent) {}
/// Fires when `Client` receives a `NonRoomEvent::Typing` event. /// Fires when `Client` receives a `NonRoomEvent::Typing` event.
async fn on_account_data_typing(&self, _: SyncRoom, _: &TypingEvent) {} async fn on_non_room_typing(&self, _: SyncRoom, _: &TypingEvent) {}
/// Fires when `Client` receives a `NonRoomEvent::Receipt` event. /// Fires when `Client` receives a `NonRoomEvent::Receipt` event.
/// ///
/// This is always a read receipt. /// This is always a read receipt.
async fn on_account_data_receipt(&self, _: SyncRoom, _: &ReceiptEvent) {} async fn on_non_room_receipt(&self, _: SyncRoom, _: &ReceiptEvent) {}
// `PresenceEvent` is a struct so there is only the one method // `PresenceEvent` is a struct so there is only the one method
/// Fires when `Client` receives a `NonRoomEvent::RoomAliases` event. /// Fires when `Client` receives a `NonRoomEvent::RoomAliases` event.
@ -307,16 +307,16 @@ mod test {
self.0.lock().await.push("stripped state rules".to_string()) self.0.lock().await.push("stripped state rules".to_string())
} }
async fn on_account_presence(&self, _: SyncRoom, _: &PresenceEvent) { async fn on_non_room_presence(&self, _: SyncRoom, _: &PresenceEvent) {
self.0.lock().await.push("account presence".to_string()) self.0.lock().await.push("account presence".to_string())
} }
async fn on_account_ignored_users(&self, _: SyncRoom, _: &IgnoredUserListEvent) { async fn on_non_room_ignored_users(&self, _: SyncRoom, _: &IgnoredUserListEvent) {
self.0.lock().await.push("account ignore".to_string()) self.0.lock().await.push("account ignore".to_string())
} }
async fn on_account_push_rules(&self, _: SyncRoom, _: &PushRulesEvent) { async fn on_non_room_push_rules(&self, _: SyncRoom, _: &PushRulesEvent) {
self.0.lock().await.push("account push rules".to_string()) self.0.lock().await.push("account push rules".to_string())
} }
async fn on_account_data_fully_read(&self, _: SyncRoom, _: &FullyReadEvent) { async fn on_non_room_fully_read(&self, _: SyncRoom, _: &FullyReadEvent) {
self.0.lock().await.push("account read".to_string()) self.0.lock().await.push("account read".to_string())
} }
async fn on_presence_event(&self, _: SyncRoom, _: &PresenceEvent) { async fn on_presence_event(&self, _: SyncRoom, _: &PresenceEvent) {