magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add get_pdu_owned sans Arc; improve client/room/event handler

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-11-06 06:20:39 +00:00
parent 3ed2c17f98
commit 7450c654ae
7 changed files with 50 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/service/rooms/timeline/data.rs
View file

@ -123,15 +123,18 @@ impl Data {
///
/// Checks the `eventid_outlierpdu` Tree if not found in the timeline.
pub(super) async fn get_pdu(&self, event_id: &EventId) -> Result<Arc<PduEvent>> {
self.get_pdu_owned(event_id).await.map(Arc::new)
}
/// Returns the pdu.
///
/// Checks the `eventid_outlierpdu` Tree if not found in the timeline.
pub(super) async fn get_pdu_owned(&self, event_id: &EventId) -> Result<PduEvent> {
if let Ok(pdu) = self.get_non_outlier_pdu(event_id).await {
return Ok(Arc::new(pdu));
return Ok(pdu);
}
self.eventid_outlierpdu
.get(event_id)
.await
.deserialized()
.map(Arc::new)
self.eventid_outlierpdu.get(event_id).await.deserialized()
}
/// Like get_non_outlier_pdu(), but without the expense of fetching and

8
src/service/rooms/timeline/mod.rs
View file

@ -244,6 +244,11 @@ impl Service {
/// Checks the `eventid_outlierpdu` Tree if not found in the timeline.
pub async fn get_pdu(&self, event_id: &EventId) -> Result<Arc<PduEvent>> { self.db.get_pdu(event_id).await }
/// Returns the pdu.
///
/// Checks the `eventid_outlierpdu` Tree if not found in the timeline.
pub async fn get_pdu_owned(&self, event_id: &EventId) -> Result<PduEvent> { self.db.get_pdu_owned(event_id).await }
/// Checks if pdu exists
///
/// Checks the `eventid_outlierpdu` Tree if not found in the timeline.
@ -885,6 +890,7 @@ impl Service {
vec![(*pdu.event_id).to_owned()],
state_lock,
)
.boxed()
.await?;
// We set the room state after inserting the pdu, so that we never have a moment
@ -1104,7 +1110,7 @@ impl Service {
match response {
Ok(response) => {
for pdu in response.pdus {
if let Err(e) = self.backfill_pdu(backfill_server, pdu).await {
if let Err(e) = self.backfill_pdu(backfill_server, pdu).boxed().await {
warn!("Failed to add backfilled pdu in room {room_id}: {e}");
}
}