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

refactor(bindings): Fetch latest event earlier

Browse Source 
Does this crash?
This commit is contained in:
Jonas Platte
2023-01-11 14:46:53 +01:00
parent 359f5f56c6
commit 7d1372195c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bindings/matrix-sdk-ffi/src/sliding_sync.rs
View File

@@ -90,6 +90,7 @@ pub struct SlidingSyncRoom {
inner: matrix_sdk::SlidingSyncRoom,
timeline: TimelineLock,
client: Client,
latest_room_message: Option<Arc<EventTimelineItem>>,
}
#[uniffi::export]
@@ -129,8 +130,7 @@ impl SlidingSyncRoom {
#[allow(clippy::significant_drop_in_scrutinee)]
pub fn latest_room_message(&self) -> Option<Arc<EventTimelineItem>> {
let item = RUNTIME.block_on(self.inner.latest_event())?;
Some(Arc::new(EventTimelineItem(item)))
self.latest_room_message.clone()
}
}
@@ -565,10 +565,13 @@ impl SlidingSync {
pub fn get_room(&self, room_id: String) -> anyhow::Result<Option<Arc<SlidingSyncRoom>>> {
Ok(self.inner.get_room(OwnedRoomId::try_from(room_id)?).map(|inner| {
let latest_room_message = RUNTIME
.block_on(async { Some(Arc::new(EventTimelineItem(inner.latest_event().await?))) });
Arc::new(SlidingSyncRoom {
inner,
client: self.client.clone(),
timeline: Default::default(),
latest_room_message,
})
}))
}
@@ -587,10 +590,14 @@ impl SlidingSync {
.into_iter()
.map(|o| {
o.map(|inner| {
let latest_room_message = RUNTIME.block_on(async {
Some(Arc::new(EventTimelineItem(inner.latest_event().await?)))
});
Arc::new(SlidingSyncRoom {
inner,
client: self.client.clone(),
timeline: Default::default(),
latest_room_message,
})
})
})