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

refactor(timeline): simplify computation of should_add a bit

Browse Source
This commit is contained in:
Benjamin Bouvier
2025-05-13 16:19:20 +02:00
parent 6b62b41a60
commit ab87ea5770
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
crates/matrix-sdk-ui/src/timeline/controller/state_transaction.rs
View File

@@ -262,19 +262,6 @@ impl<'a> TimelineStateTransaction<'a> {
let mut should_add = (settings.event_filter)(&event, &room_version);
if should_add {
// Retrieve the origin of the event.
let origin = match position {
TimelineItemPosition::End { origin }
| TimelineItemPosition::Start { origin }
| TimelineItemPosition::At { origin, .. } => origin,
TimelineItemPosition::UpdateAt { timeline_item_index: idx } => self
.items
.get(idx)
.and_then(|item| item.as_event()?.as_remote())
.map_or(RemoteEventOrigin::Unknown, |item| item.origin),
};
// If the event should be added according to the general event filter, use a
// second filter to decide whether it should be added depending on the timeline
// focus and events origin, if needed
@@ -283,19 +270,21 @@ impl<'a> TimelineStateTransaction<'a> {
// Only add pinned events for the pinned events timeline
should_add = room_data_provider.is_pinned_event(&event_id);
}
TimelineFocusKind::Live => {
match origin {
RemoteEventOrigin::Sync | RemoteEventOrigin::Unknown => {
// Always add new items to a live timeline receiving items from
// sync.
should_add = true;
}
RemoteEventOrigin::Cache | RemoteEventOrigin::Pagination => {
// Forward the previous decision to add it.
}
}
}
TimelineFocusKind::Event => {
// Retrieve the origin of the event.
let origin = match position {
TimelineItemPosition::End { origin }
| TimelineItemPosition::Start { origin }
| TimelineItemPosition::At { origin, .. } => origin,
TimelineItemPosition::UpdateAt { timeline_item_index: idx } => self
.items
.get(idx)
.and_then(|item| item.as_event()?.as_remote())
.map_or(RemoteEventOrigin::Unknown, |item| item.origin),
};
match origin {
RemoteEventOrigin::Sync | RemoteEventOrigin::Unknown => {
// Never add any item to a focused timeline when the item comes
@@ -307,6 +296,11 @@ impl<'a> TimelineStateTransaction<'a> {
}
}
}
TimelineFocusKind::Live => {
// The live timeline doesn't apply any additional
// filtering: the event *should* be added!
}
}
}