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

join initial fetches in get_relations()

Browse source 
skip recursion for max_depth=0

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-02-06 04:30:17 +00:00 • committed by strawberry
parent e3b81f7b64
commit 3ec43be959
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/service/rooms/pdu_metadata/mod.rs
View file

@ -2,7 +2,7 @@ mod data;
use std::sync::Arc; use std::sync::Arc;
use conduwuit::{PduCount, Result}; use conduwuit::{PduCount, Result};
use futures::StreamExt; use futures::{future::try_join, StreamExt};
use ruma::{api::Direction, EventId, RoomId, UserId}; use ruma::{api::Direction, EventId, RoomId, UserId};
use self::data::{Data, PdusIterItem}; use self::data::{Data, PdusIterItem};
@ -54,10 +54,16 @@ impl Service {
max_depth: u8, max_depth: u8,
dir: Direction, dir: Direction,
) -> Vec<PdusIterItem> { ) -> Vec<PdusIterItem> {
let room_id = self.services.short.get_or_create_shortroomid(room_id).await; let room_id = self.services.short.get_shortroomid(room_id);
let target = match self.services.timeline.get_pdu_count(target).await { let target = self.services.timeline.get_pdu_count(target);
| Ok(PduCount::Normal(c)) => c,
let Ok((room_id, target)) = try_join(room_id, target).await else {
return Vec::new();
};
let target = match target {
| PduCount::Normal(c) => c,
// TODO: Support backfilled relations // TODO: Support backfilled relations
| _ => 0, // This will result in an empty iterator | _ => 0, // This will result in an empty iterator
}; };
@ -68,7 +74,11 @@ impl Service {
.collect() .collect()
.await; .await;
let mut stack: Vec<_> = pdus.iter().map(|pdu| (pdu.clone(), 1)).collect(); let mut stack: Vec<_> = pdus
.iter()
.filter(|_| max_depth > 0)
.map(|pdu| (pdu.clone(), 1))
.collect();
'limit: while let Some(stack_pdu) = stack.pop() { 'limit: while let Some(stack_pdu) = stack.pop() {
let target = match stack_pdu.0 .0 { let target = match stack_pdu.0 .0 {