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

sdk-ui: reverse (again) the order in the pinned events timeline

Browse Source 
This way it matches the rest of timelines in the SDK, I reversed it here because I didn't realise most clients just do this reversal of ordering themselves. As they do, they need the same order for this timeline too to be able to reuse their existing logic.
This commit is contained in:
Jorge Martín
2024-08-06 17:11:59 +02:00
committed by Jorge Martin Espinosa
parent 71e4f60fa5
commit 1c4f035c99
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/matrix-sdk-ui/src/timeline/pinned_events_loader.rs
View File

@@ -36,7 +36,7 @@ impl PinnedEventsLoader {
/// `max_concurrent_requests` allows, to avoid overwhelming the server.
///
/// It returns a `Result` with either a
/// reversed chronologically sorted list of retrieved `SyncTimelineEvent`s
/// chronologically sorted list of retrieved `SyncTimelineEvent`s
/// or a `PinnedEventsLoaderError`.
pub async fn load_events(
&self,
@@ -109,10 +109,10 @@ impl PinnedEventsLoader {
.unwrap_or_else(|_| MilliSecondsSinceUnixEpoch::now())
}
// Sort using reversed chronological ordering (newest -> oldest)
// Sort using chronological ordering (oldest -> newest)
let sorted_events = loaded_events
.into_iter()
.sorted_by(|e1, e2| timestamp(e1).cmp(&timestamp(e2)).reverse())
.sorted_by(|e1, e2| timestamp(e1).cmp(&timestamp(e2)))
.collect();
Ok(sorted_events)

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

@@ -67,10 +67,10 @@ async fn test_new_pinned_events_are_added_on_sync() {
// The list is reloaded, so it's reset
assert_matches!(timeline_stream.next().await.unwrap(), VectorDiff::Clear);
assert_matches!(timeline_stream.next().await.unwrap(), VectorDiff::PushBack { value } => {
assert_eq!(value.as_event().unwrap().event_id().unwrap(), event_id!("$2"));
assert_eq!(value.as_event().unwrap().event_id().unwrap(), event_id!("$1"));
});
assert_matches!(timeline_stream.next().await.unwrap(), VectorDiff::PushBack { value } => {
assert_eq!(value.as_event().unwrap().event_id().unwrap(), event_id!("$1"));
assert_eq!(value.as_event().unwrap().event_id().unwrap(), event_id!("$2"));
});
assert_matches!(timeline_stream.next().await.unwrap(), VectorDiff::PushFront { value } => {
assert!(value.is_day_divider());