backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-19 08:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixup: rename filter to compiled_filter in load_joined_room

Browse source 
Need to split this into a bunch of different fixup commits...
This commit is contained in:
Benjamin Lee 2024-05-21 15:03:30 -07:00
parent 1410b6f409
commit 738acd2b35
No known key found for this signature in database
GPG key ID: FB9624E2885D55A4
1 changed files with 44 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/api/client_server/sync.rs
View file

@ -402,7 +402,7 @@ async fn load_joined_room(
lazy_load_enabled: bool, lazy_load_enabled: bool,
lazy_load_send_redundant: bool, lazy_load_send_redundant: bool,
full_state: bool, full_state: bool,
filter: &CompiledFilterDefinition<'_>, compiled_filter: &CompiledFilterDefinition<'_>,
device_list_updates: &mut HashSet<OwnedUserId>, device_list_updates: &mut HashSet<OwnedUserId>,
left_encrypted_users: &mut HashSet<OwnedUserId>, left_encrypted_users: &mut HashSet<OwnedUserId>,
) -> Result<JoinedRoom> { ) -> Result<JoinedRoom> {
@ -423,8 +423,13 @@ async fn load_joined_room(
drop(insert_lock); drop(insert_lock);
} }
let (timeline_pdus, oldest_timeline_event, limited) = let (timeline_pdus, oldest_timeline_event, limited) = load_timeline(
load_timeline(sender_user, room_id, sincecount, 10, Some(filter))?; sender_user,
room_id,
sincecount,
10,
Some(compiled_filter),
)?;
let send_notification_counts = !timeline_pdus.is_empty() let send_notification_counts = !timeline_pdus.is_empty()
|| services() || services()
@ -461,7 +466,7 @@ async fn load_joined_room(
let since_shortstatehash = let since_shortstatehash =
services().rooms.user.get_token_shortstatehash(room_id, since)?; services().rooms.user.get_token_shortstatehash(room_id, since)?;
let skip_state_events = !filter.room.state.room_allowed(room_id); let skip_state_events = !compiled_filter.room.state.room_allowed(room_id);
let ( let (
heroes, heroes,
@ -619,7 +624,7 @@ async fn load_joined_room(
continue; continue;
}; };
if filter.room.state.pdu_event_allowed(&pdu) { if compiled_filter.room.state.pdu_event_allowed(&pdu) {
state_events.push(pdu); state_events.push(pdu);
} }
@ -640,7 +645,7 @@ async fn load_joined_room(
continue; continue;
}; };
if filter.room.state.pdu_event_allowed(&pdu) { if compiled_filter.room.state.pdu_event_allowed(&pdu) {
// This check is in case a bad user ID made it into // This check is in case a bad user ID made it into
// the database // the database
if let Ok(uid) = UserId::parse(&state_key) { if let Ok(uid) = UserId::parse(&state_key) {
@ -828,8 +833,9 @@ async fn load_joined_room(
let mut state_events = delta_state_events; let mut state_events = delta_state_events;
let mut lazy_loaded = HashSet::new(); let mut lazy_loaded = HashSet::new();
state_events state_events.retain(|pdu| {
.retain(|pdu| filter.room.state.pdu_event_allowed(pdu)); compiled_filter.room.state.pdu_event_allowed(pdu)
});
// Mark all member events we're returning as lazy-loaded // Mark all member events we're returning as lazy-loaded
for pdu in &state_events { for pdu in &state_events {
@ -879,7 +885,7 @@ async fn load_joined_room(
event.sender.as_str(), event.sender.as_str(),
)? )?
{ {
if filter if compiled_filter
.room .room
.state .state
.pdu_event_allowed(&member_event) .pdu_event_allowed(&member_event)
@ -947,14 +953,18 @@ async fn load_joined_room(
timeline_pdus.iter().map(|(_, pdu)| pdu.to_sync_room_event()).collect(); timeline_pdus.iter().map(|(_, pdu)| pdu.to_sync_room_event()).collect();
let mut edus = vec![]; let mut edus = vec![];
if filter.room.ephemeral.room_allowed(room_id) { if compiled_filter.room.ephemeral.room_allowed(room_id) {
// We only filter on event type for ephemeral events because none of the // We only filter on event type for ephemeral events because none of the
// other filter parameters apply to the specific ephemeral // other filter parameters apply to the specific ephemeral
// events we're generating (m.room.receipt and m.room.typing). // events we're generating (m.room.receipt and m.room.typing).
// If we add fields to either of these events, or start // If we add fields to either of these events, or start
// generating other event types in the future, we need to // generating other event types in the future, we need to
// reevaluate this. // reevaluate this.
if filter.room.ephemeral.type_allowed(ReceiptEventContent::TYPE) { if compiled_filter
.room
.ephemeral
.type_allowed(ReceiptEventContent::TYPE)
{
edus.extend( edus.extend(
services() services()
.rooms .rooms
@ -966,7 +976,7 @@ async fn load_joined_room(
); );
} }
if filter.room.ephemeral.type_allowed(TypingEventContent::TYPE) if compiled_filter.room.ephemeral.type_allowed(TypingEventContent::TYPE)
&& services().rooms.edus.typing.last_typing_update(room_id).await? && services().rooms.edus.typing.last_typing_update(room_id).await?
> since > since
{ {
@ -979,8 +989,8 @@ async fn load_joined_room(
} }
} }
let account_data_events = if filter.room.account_data.room_allowed(room_id) let account_data_events =
{ if compiled_filter.room.account_data.room_allowed(room_id) {
services() services()
.account_data .account_data
.changes_since(Some(room_id), sender_user, since)? .changes_since(Some(room_id), sender_user, since)?
@ -994,7 +1004,9 @@ async fn load_joined_room(
}) })
.ok() .ok()
}) })
.filter(|event| filter.room.account_data.raw_event_allowed(event)) .filter(|event| {
compiled_filter.room.account_data.raw_event_allowed(event)
})
.collect() .collect()
} else { } else {
vec![] vec![]