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

refactor(sdk): Avoid duplicate work and fix event handler call order

Browse Source 
Previously, when both a possibly-redacted timeline event handler and a
non-redacted timeline timeline event handler would apply to multiple
events in a sync response, they would individually run for every event
in order. With this change, they will instead both be called
for one event before the next is processed.
This commit is contained in:
Jonas Platte
2022-08-25 15:25:29 +02:00
committed by Jonas Platte
parent 6f3813a65f
commit 57dde2c4d3
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
crates/matrix-sdk/src/event_handler/mod.rs
View File

@@ -376,37 +376,25 @@ impl Client {
unsigned: Option<UnsignedDetails>,
}
// Event handlers for possibly-redacted timeline events
for item in timeline_events {
let TimelineEventDetails { event_type, state_key, .. } = item.event.deserialize_as()?;
let event_kind = match state_key {
Some(_) => EventKind::State,
None => EventKind::MessageLike,
};
let raw_event = &item.event.json();
let encryption_info = item.encryption_info.as_ref();
self.call_event_handlers(room, raw_event, event_kind, &event_type, encryption_info)
.await;
}
// Event handlers specifically for redacted OR unredacted timeline events
for item in timeline_events {
let TimelineEventDetails { event_type, state_key, unsigned } =
item.event.deserialize_as()?;
let redacted = unsigned.and_then(|u| u.redacted_because).is_some();
let event_kind = match state_key {
Some(_) => EventKind::state_redacted(redacted),
None => EventKind::message_like_redacted(redacted),
let (event_kind_g, event_kind_r) = match state_key {
Some(_) => (EventKind::State, EventKind::state_redacted(redacted)),
None => (EventKind::MessageLike, EventKind::message_like_redacted(redacted)),
};
let raw_event = &item.event.json();
let encryption_info = item.encryption_info.as_ref();
self.call_event_handlers(room, raw_event, event_kind, &event_type, encryption_info)
// Event handlers for possibly-redacted timeline events
self.call_event_handlers(room, raw_event, event_kind_g, &event_type, encryption_info)
.await;
// Event handlers specifically for redacted OR unredacted timeline events
self.call_event_handlers(room, raw_event, event_kind_r, &event_type, encryption_info)
.await;
}