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

refactor: Reduce database lookups in some cases

Browse source
This commit is contained in:
Jade Ellis 2025-12-18 21:27:46 +00:00
parent 8e33f9a7d0
commit dd87232f1f
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/service/rooms/pdu_metadata/bundled_aggregations.rs
View file

@ -1,6 +1,6 @@
use conduwuit::{Event, PduEvent, Result, err};
use ruma::{
EventId, RoomId, UserId,
UserId,
api::Direction,
events::relation::{BundledMessageLikeRelations, BundledReference, ReferenceChunk},
};
@ -19,14 +19,18 @@ impl super::Service {
pub async fn get_bundled_aggregations(
&self,
user_id: &UserId,
room_id: &RoomId,
event_id: &EventId,
pdu: &PduEvent,
) -> Result<Option<BundledMessageLikeRelations<Box<serde_json::value::RawValue>>>> {
// Events that can never get bundled aggregations
if pdu.state_key().is_some() || Self::is_replacement_event(pdu) {
return Ok(None);
}
let relations = self
.get_relations(
user_id,
room_id,
event_id,
&pdu.room_id_or_hash(),
pdu.event_id(),
conduwuit::PduCount::max(),
MAX_BUNDLED_RELATIONS,
0,
@ -80,10 +84,8 @@ impl super::Service {
// Handle m.replace relations - find the most recent valid one (lazy load
// original event)
if !replace_events.is_empty() {
let original_event = self.services.timeline.get_pdu(event_id).await?;
if let Some(replacement) =
Self::find_most_recent_valid_replacement(&original_event, &replace_events).await?
Self::find_most_recent_valid_replacement(pdu, &replace_events).await?
{
bundled.replace = Some(Self::serialize_replacement(replacement)?);
}
@ -161,9 +163,7 @@ impl super::Service {
return Ok(());
}
let bundled_aggregations = self
.get_bundled_aggregations(user_id, &pdu.room_id_or_hash(), pdu.event_id())
.await?;
let bundled_aggregations = self.get_bundled_aggregations(user_id, pdu).await?;
if let Some(aggregations) = bundled_aggregations {
let aggregations_json = serde_json::to_value(aggregations)