refactor(timeline): move code around for loading initial main|unthreaded receipts

Author: bnjbvr

crates/matrix-sdk-ui/src/timeline/controller/read_receipts.rs

@@ -560,7 +560,41 @@ impl<P: RoomDataProvider> TimelineStateTransaction<'_, P> {
         trace!(%event_id, "loading initial receipts for an event");
 
         let receipt_thread = self.focus.receipt_thread();
-        let read_receipts = room_data_provider.load_event_receipts(event_id, receipt_thread).await;
+
+        let mut read_receipts;
+
+        if matches!(receipt_thread, ReceiptThread::Unthreaded | ReceiptThread::Main) {
+            // If the requested receipt thread is unthreaded or main, we maintain maximal
+            // compatibility with clients using either unthreaded or main-thread read
+            // receipts by allowing both here.
+
+            // First, load the main receipts.
+            read_receipts =
+                room_data_provider.load_event_receipts(event_id, ReceiptThread::Main).await;
+
+            // Then, load the unthreaded receipts.
+            let unthreaded_receipts =
+                room_data_provider.load_event_receipts(event_id, ReceiptThread::Unthreaded).await;
+
+            // Only insert unthreaded receipts that are more recent. Ideally we'd compare
+            // the receipted event position, but we don't have access to that
+            // here.
+            for (user_id, unthreaded_receipt) in unthreaded_receipts {
+                if let Some(main_receipt) = read_receipts.get(&user_id) {
+                    if unthreaded_receipt.ts > main_receipt.ts {
+                        read_receipts.insert(user_id, unthreaded_receipt);
+                    }
+                } else {
+                    read_receipts.insert(user_id, unthreaded_receipt);
+                }
+            }
+        } else {
+            // In all other cases, return what's requested, and only that (threaded
+            // receipts).
+            read_receipts =
+                room_data_provider.load_event_receipts(event_id, receipt_thread.clone()).await
+        }
+
         let own_user_id = room_data_provider.own_user_id();
 
         // Since they are explicit read receipts, we need to check if they are

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

@@ -232,53 +232,6 @@ impl RoomDataProvider for Room {
         event_id: &'a EventId,
         receipt_thread: ReceiptThread,
     ) -> IndexMap<OwnedUserId, Receipt> {
-        if matches!(receipt_thread, ReceiptThread::Unthreaded | ReceiptThread::Main) {
-            // If the requested receipt thread is unthreaded or main, we maintain maximal
-            // compatibility with clients using either unthreaded or main-thread read
-            // receipts by allowing both here.
-
-            // First, load the main receipts.
-            let mut result = match self
-                .load_event_receipts(ReceiptType::Read, ReceiptThread::Main, event_id)
-                .await
-            {
-                Ok(receipts) => receipts.into_iter().collect(),
-                Err(e) => {
-                    error!(?event_id, "Failed to get main thread read receipts for event: {e}");
-                    IndexMap::new()
-                }
-            };
-
-            // Then, load the unthreaded receipts.
-            let unthreaded_receipts = match self
-                .load_event_receipts(ReceiptType::Read, ReceiptThread::Unthreaded, event_id)
-                .await
-            {
-                Ok(receipts) => receipts,
-                Err(e) => {
-                    error!(?event_id, "Failed to get main thread read receipts for event: {e}");
-                    Vec::new()
-                }
-            };
-
-            // Only insert unthreaded receipts that are more recent. Ideally we'd compare
-            // the receipted event position, but we don't have access to that
-            // here.
-            for (user_id, unthreaded_receipt) in unthreaded_receipts {
-                if let Some(main_receipt) = result.get(&user_id) {
-                    if unthreaded_receipt.ts > main_receipt.ts {
-                        result.insert(user_id, unthreaded_receipt);
-                    }
-                } else {
-                    result.insert(user_id, unthreaded_receipt);
-                }
-            }
-
-            return result;
-        }
-
-        // In all other cases, return what's requested, and only that (threaded
-        // receipts).
         match self.load_event_receipts(ReceiptType::Read, receipt_thread.clone(), event_id).await {
             Ok(receipts) => receipts.into_iter().collect(),
             Err(e) => {