From f3587a44dc0bbacf58f92b4dc1dc96572b2fef1f Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <benjamin@bouvier.cc>
Date: Mon, 12 Aug 2024 12:17:27 +0200
Subject: [PATCH] pinned events(refactor): fetch all the pinned events
 concurrently

Also log the reason why one couldn't be fetched, instead of discarding
silently.
---
 .../src/timeline/pinned_events_loader.rs      | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/crates/matrix-sdk-ui/src/timeline/pinned_events_loader.rs b/crates/matrix-sdk-ui/src/timeline/pinned_events_loader.rs
index 4a34982f4..7ea7ee6a1 100644
--- a/crates/matrix-sdk-ui/src/timeline/pinned_events_loader.rs
+++ b/crates/matrix-sdk-ui/src/timeline/pinned_events_loader.rs
@@ -1,5 +1,6 @@
 use std::{fmt::Formatter, num::NonZeroUsize, sync::Arc};
 
+use futures_util::future::join_all;
 use matrix_sdk::{
     config::RequestConfig, event_cache::paginator::PaginatorError,
     pinned_events_cache::PinnedEventCache, Room, SendOutsideWasm, SyncOutsideWasm,
@@ -7,7 +8,7 @@ use matrix_sdk::{
 use matrix_sdk_base::deserialized_responses::SyncTimelineEvent;
 use ruma::{EventId, MilliSecondsSinceUnixEpoch, OwnedEventId};
 use thiserror::Error;
-use tracing::info;
+use tracing::{info, warn};
 
 const MAX_CONCURRENT_REQUESTS: usize = 10;
 
@@ -64,31 +65,28 @@ impl PinnedEventsLoader {
 
         if !event_ids_to_request.is_empty() {
             let provider = Arc::new(self.room.clone());
-            let mut handles = Vec::new();
 
-            let config = Some(
+            let request_config = Some(
                 RequestConfig::default()
                     .retry_limit(3)
                     .max_concurrent_requests(NonZeroUsize::new(self.max_concurrent_requests)),
             );
 
-            for id in event_ids_to_request {
-                handles.push(tokio::spawn({
-                    let provider = Arc::clone(&provider);
-                    async move {
-                        provider
-                            .event_with_config(&id, config)
-                            .await
-                            .map_err(|_| PinnedEventsLoaderError::EventNotFound(id.to_owned()))
+            let new_events = join_all(event_ids_to_request.into_iter().map(|event_id| {
+                let provider = Arc::clone(&provider);
+                async move {
+                    match provider.event_with_config(&event_id, request_config).await {
+                        Ok(event) => Some(event),
+                        Err(err) => {
+                            warn!("error when loading pinned event: {err}");
+                            None
+                        }
                     }
-                }));
-            }
-
-            for handle in handles {
-                if let Ok(Ok(ev)) = handle.await {
-                    loaded_events.push(ev);
                 }
-            }
+            }))
+            .await;
+
+            loaded_events.extend(new_events.into_iter().flatten());
         }
 
         if has_pinned_event_ids && loaded_events.is_empty() {