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

add room alias server names for backfill, self check server name

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-03-14 01:05:43 -04:00 • committed by June
parent 9b2ccff7dd
commit 01b722beb0
1 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -929,6 +929,25 @@ impl Service {
return Ok(()); return Ok(());
} }
let mut servers: Vec<&ServerName> = vec![];
// add server names from room aliases on the room ID
let room_aliases = services().rooms.alias.local_aliases_for_room(room_id).collect::<Result<Vec<_>, _>>();
if let Ok(aliases) = &room_aliases {
for alias in aliases {
if alias.server_name() != services().globals.server_name() {
servers.push(alias.server_name());
}
}
}
// add room ID server name for backfill server
if let Some(server) = room_id.server_name() {
if server != services().globals.server_name() {
servers.push(server);
}
}
let power_levels: RoomPowerLevelsEventContent = services() let power_levels: RoomPowerLevelsEventContent = services()
.rooms .rooms
.state_accessor .state_accessor
@ -940,24 +959,26 @@ impl Service {
.transpose()? .transpose()?
.unwrap_or_default(); .unwrap_or_default();
let mut servers = power_levels // add server names of the list of admins in the room for backfill server
for server in power_levels
.users .users
.iter() .iter()
.filter(|(_, level)| **level > power_levels.users_default) .filter(|(_, level)| **level > power_levels.users_default)
.map(|(user_id, _)| user_id.server_name()) .map(|(user_id, _)| user_id.server_name())
.collect::<Vec<_>>(); .collect::<Vec<_>>()
{
if server != services().globals.server_name() {
servers.push(server);
}
}
// don't backfill from ourselves // don't backfill from ourselves (might be noop if we checked it above already)
if let Some(server_index) = if let Some(server_index) =
servers.clone().into_iter().position(|server| server == services().globals.server_name()) servers.clone().into_iter().position(|server| server == services().globals.server_name())
{ {
servers.remove(server_index); servers.remove(server_index);
} }
if let Some(server) = room_id.server_name() {
servers.push(server);
}
servers.sort_unstable(); servers.sort_unstable();
servers.dedup(); servers.dedup();
servers.shuffle(&mut rand::thread_rng()); servers.shuffle(&mut rand::thread_rng());