mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-05 14:35:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(sdk): Don't overwrite parallel updates when fetching reply details

Browse Source
This commit is contained in:
Jonas Platte
2023-02-16 17:29:30 +01:00
committed by Jonas Platte
parent 9eefe9377e
commit 0f077ffcd3
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/matrix-sdk/src/room/timeline/inner.rs
View File

@@ -476,7 +476,7 @@ impl TimelineInner {
&self,
event_id: &EventId,
) -> Result<RemoteEventTimelineItem> {
let (index, mut item) = rfind_event_by_id(&self.items(), event_id)
let (index, item) = rfind_event_by_id(&self.items(), event_id)
.and_then(|(pos, item)| item.as_remote().map(|item| (pos, item.clone())))
.ok_or(super::Error::RemoteEventNotInTimeline)?;
@@ -490,11 +490,21 @@ impl TimelineInner {
let details =
self.fetch_replied_to_event(index, &item, &message, &in_reply_to.event_id).await;
// We need to be sure to have the latest position of the event as it might have
// changed while waiting for the request.
let (index, _) = rfind_event_by_id(&self.items(), &item.event_id)
// We need to be sure to have the latest position of the event as it
// might have changed while waiting for the request.
let (index, mut item) = rfind_event_by_id(&self.items(), &item.event_id)
.and_then(|(pos, item)| item.as_remote().map(|item| (pos, item.clone())))
.ok_or(super::Error::RemoteEventNotInTimeline)?;
// 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);
};
let Some(in_reply_to) = message.in_reply_to() else {
return Ok(item);
};
item.content = TimelineItemContent::Message(message.with_in_reply_to(InReplyToDetails {
event_id: in_reply_to.event_id.clone(),
details,