1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-07-02 16:38:36 +00:00

refactor: Do not extract members for room each time

This commit is contained in:
Andriy Kushnir (Orhideous) 2022-11-28 01:58:25 +02:00 committed by Nyaaori
parent 5987452cfc
commit e71ad56e68
No known key found for this signature in database
GPG key ID: E7819C3ED4D1F82E
2 changed files with 24 additions and 17 deletions

View file

@ -1082,8 +1082,9 @@ fn get_missing_events(
if event_room_id != room_id {
warn!(
"Evil event detected: Event {} found while searching in room {}",
queued_events[i], room_id
?room_id,
evil_event = ?queued_events[i],
"Evil event detected while searching in room"
);
return Err(Error::BadRequest(
ErrorKind::InvalidParam,
@ -1091,9 +1092,26 @@ 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(
sender_servername,
room_id,
current_server_members.as_slice(),
&queued_events[i],
)?;