mirror of
https://github.com/matrix-org/matrix-rust-sdk.git
synced 2026-05-06 15:04:11 -04:00
sdk: Simplify return type of fetch_in_reply_to_details
This commit is contained in:
committed by
Jonas Platte
parent
b9fba69dc7
commit
086106a96d
@@ -546,20 +546,17 @@ impl TimelineInner {
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) async fn fetch_in_reply_to_details(
|
||||
&self,
|
||||
event_id: &EventId,
|
||||
) -> Result<RemoteEventTimelineItem> {
|
||||
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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user