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

fix(ui): Change the behaviour when a duplicated event is received by Timeline.

Browse Source 
This patch changes the behaviour of the `Timeline` when a duplicated
event is received. Prior to this patch, the old event was removed, and
the one was added. With this patch, the old event is kept, and the new
one is skipped.

This is important for https://github.com/matrix-org/matrix-rust-sdk/pull/3512
where events are mapped to the timeline item indices. When an event is
removed, it becomes difficult to keep the mapping correct.

This patch also adds duplication detection for pagination (with
`TimelineItemPosition::Start`).
This commit is contained in:
Ivan Enderlin
2024-06-13 14:05:22 +02:00
parent f770248b24
commit 15ed91e047
2 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
crates/matrix-sdk-ui/src/timeline/inner/state.rs
View File

@@ -501,7 +501,8 @@ impl TimelineInnerStateTransaction<'_> {
timestamp: Some(event.origin_server_ts()),
visible: false,
};
self.add_event(event_meta, position, room_data_provider, settings).await;
let _event_added =
self.add_event(event_meta, position, room_data_provider, settings).await;
return HandleEventResult::default();
}
@@ -526,7 +527,9 @@ impl TimelineInnerStateTransaction<'_> {
timestamp,
visible: false,
};
self.add_event(event_meta, position, room_data_provider, settings).await;
let _event_added = self
.add_event(event_meta, position, room_data_provider, settings)
.await;
}
return HandleEventResult::default();
@@ -543,7 +546,14 @@ impl TimelineInnerStateTransaction<'_> {
timestamp: Some(timestamp),
visible: should_add,
};
self.add_event(event_meta, position, room_data_provider, settings).await;
let event_added = self.add_event(event_meta, position, room_data_provider, settings).await;
// If the event has not been added, it's because it's a duplicated event. Let's
// return early.
if !event_added {
return HandleEventResult::default();
}
let sender_profile = room_data_provider.profile_from_user_id(&sender).await;
let ctx = TimelineEventContext {
@@ -637,23 +647,36 @@ impl TimelineInnerStateTransaction<'_> {
items.commit();
}
/// Add an event in the [`TimelineInnerMeta::all_events`] collection.
///
/// This method also adjusts read receipt if needed.
///
/// It returns `true` if the event has been added, `false` otherwise. The
/// latter happens if the event already exists, i.e. if an existing event is
/// requested to be added.
async fn add_event<P: RoomDataProvider>(
&mut self,
event_meta: FullEventMeta<'_>,
position: TimelineItemPosition,
room_data_provider: &P,
settings: &TimelineInnerSettings,
) {
) -> bool {
// Detect if an event already exists in [`TimelineInnerMeta::all_events`]
fn event_already_exists(new_event_id: &EventId, all_events: &VecDeque<EventMeta>) -> bool {
all_events.iter().any(|EventMeta { event_id, .. }| event_id == new_event_id)
}
match position {
TimelineItemPosition::Start { .. } => {
if event_already_exists(event_meta.event_id, &self.meta.all_events) {
return false;
}
self.meta.all_events.push_front(event_meta.base_meta())
}
TimelineItemPosition::End { .. } => {
// Handle duplicated event.
if let Some(pos) =
self.meta.all_events.iter().position(|ev| ev.event_id == event_meta.event_id)
{
self.meta.all_events.remove(pos);
if event_already_exists(event_meta.event_id, &self.meta.all_events) {
return false;
}
self.meta.all_events.push_back(event_meta.base_meta());
@@ -686,6 +709,8 @@ impl TimelineInnerStateTransaction<'_> {
self.maybe_add_implicit_read_receipt(event_meta);
}
true
}
fn adjust_day_dividers(&mut self, mut adjuster: DayDividerAdjuster) {

4
crates/matrix-sdk-ui/tests/integration/timeline/sliding_sync.rs
View File

@@ -416,10 +416,6 @@ async fn test_timeline_duplicated_events() -> Result<()> {
assert_timeline_stream! {
[timeline_stream]
update[3] "$x3:bar.org";
update[1] "$x1:bar.org";
remove[1];
append "$x1:bar.org";
update[3] "$x1:bar.org";
append "$x4:bar.org";
};
}