From 086106a96d498abce4f67c07aab7ece4bc85c013 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Wed, 12 Apr 2023 12:51:39 +0200 Subject: [PATCH] sdk: Simplify return type of fetch_in_reply_to_details --- crates/matrix-sdk/src/room/timeline/inner.rs | 15 ++++++--------- crates/matrix-sdk/src/room/timeline/mod.rs | 3 +-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/crates/matrix-sdk/src/room/timeline/inner.rs b/crates/matrix-sdk/src/room/timeline/inner.rs index 6522acf11..ca5d9a2d4 100644 --- a/crates/matrix-sdk/src/room/timeline/inner.rs +++ b/crates/matrix-sdk/src/room/timeline/inner.rs @@ -546,20 +546,17 @@ impl TimelineInner { } } - pub(super) async fn fetch_in_reply_to_details( - &self, - event_id: &EventId, - ) -> Result { + pub(super) async fn fetch_in_reply_to_details(&self, event_id: &EventId) -> Result<()> { let state = self.state.lock().await; let (index, item) = rfind_event_by_id(&state.items, event_id) .and_then(|(pos, item)| item.as_remote().map(|item| (pos, item.clone()))) .ok_or(super::Error::RemoteEventNotInTimeline)?; let TimelineItemContent::Message(message) = item.content().clone() else { - return Ok(item); + return Ok(()); }; let Some(in_reply_to) = message.in_reply_to() else { - return Ok(item); + return Ok(()); }; let event = fetch_replied_to_event( @@ -582,10 +579,10 @@ impl TimelineInner { // Check the state of the event again, it might have been redacted while // the request was in-flight. let TimelineItemContent::Message(message) = item.content().clone() else { - return Ok(item); + return Ok(()); }; let Some(in_reply_to) = message.in_reply_to() else { - return Ok(item); + return Ok(()); }; item.set_content(TimelineItemContent::Message( @@ -596,7 +593,7 @@ impl TimelineInner { )); state.items.set(index, Arc::new(TimelineItem::Event(item.clone().into()))); - Ok(item) + Ok(()) } /// Get the latest read receipt for the given user. diff --git a/crates/matrix-sdk/src/room/timeline/mod.rs b/crates/matrix-sdk/src/room/timeline/mod.rs index 60c8b86b3..978dbc419 100644 --- a/crates/matrix-sdk/src/room/timeline/mod.rs +++ b/crates/matrix-sdk/src/room/timeline/mod.rs @@ -308,8 +308,7 @@ impl Timeline { /// before all requests are handled. #[instrument(skip(self), fields(room_id = ?self.room().room_id()))] pub async fn fetch_event_details(&self, event_id: &EventId) -> Result<()> { - self.inner.fetch_in_reply_to_details(event_id).await?; - Ok(()) + self.inner.fetch_in_reply_to_details(event_id).await } /// Fetch all member events for the room this timeline is displaying.