sdk-ui: use /event (again) for loading pinned events since it's faster than /context and its responses do contain the sender info we thought was missing

Author: jmartinesp

benchmarks/benches/room_bench.rs

@@ -153,7 +153,7 @@ pub fn load_pinned_events_benchmark(c: &mut Criterion) {
 
     runtime.block_on(
         Mock::given(method("GET"))
-            .and(path_regex(r"/_matrix/client/r0/rooms/.*/context/.*"))
+            .and(path_regex(r"/_matrix/client/r0/rooms/.*/event/.*"))
             .respond_with(move |r: &Request| {
                 let segments: Vec<&str> = r.url.path_segments().expect("Invalid path").collect();
                 let event_id_str = segments[6];
@@ -163,14 +163,9 @@ pub fn load_pinned_events_benchmark(c: &mut Criterion) {
                     .event_id(&event_id)
                     .server_ts(MilliSecondsSinceUnixEpoch::now())
                     .into_raw_sync();
-                ResponseTemplate::new(200).set_delay(Duration::from_millis(50)).set_body_json(
-                    json!({
-                        "events_before": [],
-                        "event": event.json(),
-                        "events_after": [],
-                        "state": [],
-                    }),
-                )
+                ResponseTemplate::new(200)
+                    .set_delay(Duration::from_millis(50))
+                    .set_body_json(event.json())
             })
             .mount(&server),
     );

crates/matrix-sdk-ui/src/timeline/pinned_events_loader.rs

@@ -16,17 +16,15 @@ use std::{fmt::Formatter, sync::Arc};
 
 use futures_util::{stream, StreamExt};
 use matrix_sdk::{
-    config::RequestConfig, event_cache::paginator::PaginatorError, Error, Room, SendOutsideWasm,
+    config::RequestConfig, event_cache::paginator::PaginatorError, Room, SendOutsideWasm,
     SyncOutsideWasm,
 };
 use matrix_sdk_base::deserialized_responses::SyncTimelineEvent;
-use ruma::{uint, EventId, MilliSecondsSinceUnixEpoch, OwnedEventId};
+use ruma::{EventId, MilliSecondsSinceUnixEpoch, OwnedEventId};
 use thiserror::Error;
 use tracing::{debug, warn};
 
-use crate::timeline::{
-    event_handler::TimelineEventKind, pinned_events_loader::PinnedEventsLoaderError::EventNotFound,
-};
+use crate::timeline::event_handler::TimelineEventKind;
 
 const MAX_CONCURRENT_REQUESTS: usize = 10;
 
@@ -164,15 +162,9 @@ impl PinnedEventsRoom for Room {
         }
 
         debug!("Loading pinned event {event_id} from HS");
-        self.event_with_context(event_id, true, uint!(0), request_config)
+        self.event(event_id, request_config)
             .await
-            .and_then(|e| {
-                if let Some(ev) = e.event {
-                    Ok((ev.into(), Vec::new()))
-                } else {
-                    Err(Error::UnknownError(Box::new(EventNotFound(event_id.to_owned()))))
-                }
-            })
+            .map(|e| (e.into(), Vec::new()))
             .map_err(|err| PaginatorError::SdkError(Box::new(err)))
     }
 

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

@@ -20,7 +20,7 @@ use serde_json::json;
 use stream_assert::assert_pending;
 use wiremock::MockServer;
 
-use crate::{mock_context, mock_sync};
+use crate::{mock_event, mock_sync};
 
 #[async_test]
 async fn test_new_pinned_events_are_added_on_sync() {
@@ -666,16 +666,11 @@ impl TestHelper {
         let mut joined_room_builder = JoinedRoomBuilder::new(&self.room_id);
         for (timeline_event, add_to_timeline) in text_messages {
             let deserialized_event = timeline_event.event.deserialize()?;
-            mock_context(
+            mock_event(
                 &self.server,
                 &self.room_id,
                 deserialized_event.event_id(),
-                None,
-                Vec::new(),
                 timeline_event.clone(),
-                Vec::new(),
-                None,
-                Vec::new(),
             )
             .await;