matrix-org
/
matrix-rust-sdk
mirror of https://github.com/matrix-org/matrix-rust-sdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sdk: Don't reorder events already seen from syncing

pull/1897/head
Jonas Platte 2023-05-09 17:15:35 +02:00
parent 159b999485
commit a3f169337c
No known key found for this signature in database
GPG Key ID: AAA7A61F696C3E0C
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crates/matrix-sdk/src/room/timeline/event_handler.rs
View File

@ -698,11 +698,27 @@ impl<'a> TimelineEventHandler<'a> {
});
if let Some((idx, old_item)) = result {
if old_item.as_remote().is_some() {
// Item was previously received from the server. This
// should be very rare normally, but with the sliding-
// sync proxy, it is actually very common.
trace!(?item, ?old_item, "Received duplicate event");
if let Some(old_remote_item) = old_item.as_remote() {
if matches!(
old_remote_item.origin,
RemoteEventOrigin::Cache | RemoteEventOrigin::Sync
) {
// Item was previously received from syncing. This
// should be very rare normally, but with the
// sliding-sync proxy, it is actually very common.
//
// To avoid items being reordered only to eventually
// end up in the same position after processing the
// whole chunk, do nothing for this event.
trace!(?item, ?old_item, "Received duplicate event, skipping");
return;
} else {
// Item was previously received from pagination.
// Pagination and syncing have different timeline
// ordering (topological vs. stream order), we treat
// stream order as canonical so reorder here.
trace!(?item, ?old_item, "Received duplicate event, reordering");
}
if old_item.content.is_redacted() && !item.content.is_redacted() {
warn!("Got original form of an event that was previously redacted");
@ -712,7 +728,7 @@ impl<'a> TimelineEventHandler<'a> {
.reactions
.clear();
}
};
}
if txn_id.is_none() {
// The event was created by this client, but the server

6
crates/matrix-sdk/src/room/timeline/tests/basic.rs
View File

@ -228,12 +228,12 @@ async fn dedup_initial() {
timeline.make_message_event(*BOB, RoomMessageEventContent::text_plain("B")),
);
timeline.inner.add_initial_events(vector![event_a.clone(), event_b, event_a]).await;
timeline.inner.add_initial_events(vector![event_a, event_b]).await;
let timeline_items = timeline.inner.items().await;
assert_eq!(timeline_items.len(), 3);
assert_eq!(timeline_items[1].as_event().unwrap().sender(), *BOB);
assert_eq!(timeline_items[2].as_event().unwrap().sender(), *ALICE);
assert_eq!(timeline_items[1].as_event().unwrap().sender(), *ALICE);
assert_eq!(timeline_items[2].as_event().unwrap().sender(), *BOB);
}
#[async_test]