TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Pull up invariants from the loop

Browse source
This commit is contained in:
Andriy Kushnir (Orhideous) 2022-12-08 23:41:10 +02:00
parent 179aafc974
commit 7f8f6b52d9
No known key found for this signature in database
GPG key ID: 62E078AB621B0D15
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/api/server_server.rs
View file

@ -1058,6 +1058,23 @@ fn get_missing_events(
latest_events: &[OwnedEventId], latest_events: &[OwnedEventId],
limit: UInt, limit: UInt,
) -> Result<Vec<Box<RawJsonValue>>> { ) -> Result<Vec<Box<RawJsonValue>>> {
let (room_members, room_errors): (Vec<_>, Vec<_>) = services()
.rooms
.state_cache
.room_members(room_id)
.partition(Result::is_ok);
// Just log errors and continue with correct users
if !room_errors.is_empty() {
warn!(?room_id, "Some errors occurred when fetching room members");
}
let current_server_members: Vec<OwnedUserId> = room_members
.into_iter()
.map(Result::unwrap)
.filter(|member| member.server_name() == sender_servername)
.collect();
let limit = u64::from(limit) as usize; let limit = u64::from(limit) as usize;
let mut queued_events = latest_events.to_owned(); let mut queued_events = latest_events.to_owned();
@ -1094,23 +1111,6 @@ fn get_missing_events(
)); ));
} }
let (room_members, room_errors): (Vec<_>, Vec<_>) = services()
.rooms
.state_cache
.room_members(room_id)
.partition(Result::is_ok);
// Just log errors and continue with correct users
if !room_errors.is_empty() {
warn!(?room_id, "Some errors occurred when fetching room members");
}
let current_server_members: Vec<OwnedUserId> = room_members
.into_iter()
.map(Result::unwrap)
.filter(|member| member.server_name() == sender_servername)
.collect();
let event_is_visible = services().rooms.state_accessor.server_can_see_event( let event_is_visible = services().rooms.state_accessor.server_can_see_event(
sender_servername, sender_servername,
current_server_members.as_slice(), current_server_members.as_slice(),