Split/cleanup backfill stream stanza.

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-07-08 13:19:10 +00:00
parent 4429323e11
commit 50de6277b8

View File

@@ -71,29 +71,31 @@ pub async fn backfill_if_required(&self, room_id: &RoomId, from: PduCount) -> Re
} }
}); });
let canonical_room_alias_server = once( let canonical_alias = self
self.services .services
.state_accessor .state_accessor
.get_canonical_alias(room_id) .get_canonical_alias(room_id)
.await, .await;
)
.filter_map(Result::ok) let canonical_room_alias_server = once(canonical_alias)
.map(|alias| alias.server_name().to_owned()) .filter_map(Result::ok)
.stream(); .map(|alias| alias.server_name().to_owned())
.stream();
let trusted_servers = self
.services
.server
.config
.trusted_servers
.iter()
.map(ToOwned::to_owned)
.stream();
let mut servers = room_mods let mut servers = room_mods
.stream() .stream()
.map(ToOwned::to_owned) .map(ToOwned::to_owned)
.chain(canonical_room_alias_server) .chain(canonical_room_alias_server)
.chain( .chain(trusted_servers)
self.services
.server
.config
.trusted_servers
.iter()
.map(ToOwned::to_owned)
.stream(),
)
.ready_filter(|server_name| !self.services.globals.server_is_ours(server_name)) .ready_filter(|server_name| !self.services.globals.server_is_ours(server_name))
.filter_map(async |server_name| { .filter_map(async |server_name| {
self.services self.services