implement room.state.(not_)rooms filter on /sync

src/api/client_server/sync.rs

@@ -443,6 +443,8 @@ async fn load_joined_room(
     let since_shortstatehash =
         services().rooms.user.get_token_shortstatehash(room_id, since)?;
 
+    let skip_state_events = !filter.room.state.room_allowed(room_id);
+
     let (
         heroes,
         joined_member_count,
@@ -583,6 +585,7 @@ async fn load_joined_room(
             let mut state_events = Vec::new();
             let mut lazy_loaded = HashSet::new();
 
+            if !skip_state_events {
                 let mut i = 0;
                 for (shortstatekey, id) in current_state_ids {
                     let (event_type, state_key) = services()
@@ -591,7 +594,8 @@ async fn load_joined_room(
                         .get_statekey_from_short(shortstatekey)?;
 
                     if event_type != StateEventType::RoomMember {
-                    let Some(pdu) = services().rooms.timeline.get_pdu(&id)?
+                        let Some(pdu) =
+                            services().rooms.timeline.get_pdu(&id)?
                         else {
                             error!("Pdu in state not found: {}", id);
                             continue;
@@ -608,7 +612,8 @@ async fn load_joined_room(
                 // TODO: Delete the following line when this is resolved: https://github.com/vector-im/element-web/issues/22565
                 || *sender_user == state_key
                     {
-                    let Some(pdu) = services().rooms.timeline.get_pdu(&id)?
+                        let Some(pdu) =
+                            services().rooms.timeline.get_pdu(&id)?
                         else {
                             error!("Pdu in state not found: {}", id);
                             continue;
@@ -627,6 +632,7 @@ async fn load_joined_room(
                         }
                     }
                 }
+            }
 
             // Reset lazy loading because this is an initial sync
             services().rooms.lazy_loading.lazy_load_reset(
@@ -792,6 +798,9 @@ async fn load_joined_room(
                     (None, None, Vec::new())
                 };
 
+            let state_events = if skip_state_events {
+                vec![]
+            } else {
                 let mut state_events = delta_state_events;
                 let mut lazy_loaded = HashSet::new();
 
@@ -808,25 +817,33 @@ async fn load_joined_room(
                                 lazy_loaded.insert(state_key_userid);
                             }
                             Err(e) => {
-                            error!("Invalid state key for member event: {}", e);
+                                error!(
+                                    "Invalid state key for member event: {}",
+                                    e
+                                );
                             }
                         }
                     }
                 }
 
                 // Fetch contextual member state events for events from the
-            // timeline, and mark them as lazy-loaded as well.
+                // timeline, and mark them as lazy-loaded as
+                // well.
                 for (_, event) in &timeline_pdus {
                     if lazy_loaded.contains(&event.sender) {
                         continue;
                     }
 
-                if !services().rooms.lazy_loading.lazy_load_was_sent_before(
+                    if !services()
+                        .rooms
+                        .lazy_loading
+                        .lazy_load_was_sent_before(
                             sender_user,
                             sender_device,
                             room_id,
                             &event.sender,
-                )? || lazy_load_send_redundant
+                        )?
+                        || lazy_load_send_redundant
                     {
                         if let Some(member_event) =
                             services().rooms.state_accessor.room_state_get(
@@ -853,6 +870,9 @@ async fn load_joined_room(
                     )
                     .await;
 
+                state_events
+            };
+
             (
                 heroes,
                 joined_member_count,
@@ -1026,7 +1046,11 @@ async fn handle_left_room(
         }
     };
 
-    if !services().rooms.metadata.exists(&room_id)? {
+    let state = if !filter.room.state.room_allowed(&room_id) {
+        State {
+            events: vec![],
+        }
+    } else if !services().rooms.metadata.exists(&room_id)? {
         // This is just a rejected invite, not a room we know
         let event = PduEvent {
             event_id: EventId::new(services().globals.server_name()).into(),
@@ -1051,29 +1075,19 @@ async fn handle_left_room(
             signatures: None,
         };
 
-        left_rooms.insert(
+        State {
-            room_id,
-            LeftRoom {
-                account_data: RoomAccountData {
-                    events: Vec::new(),
-                },
-                timeline,
-                state: State {
             events: vec![event.to_sync_state_event()],
-                },
-            },
-        );
-
-        return Ok(());
         }
-
+    } else {
         let mut left_state_events = Vec::new();
 
         let since_shortstatehash =
             services().rooms.user.get_token_shortstatehash(&room_id, since)?;
 
         let since_state_ids = match since_shortstatehash {
-        Some(s) => services().rooms.state_accessor.state_full_ids(s).await?,
+            Some(s) => {
+                services().rooms.state_accessor.state_full_ids(s).await?
+            }
             None => HashMap::new(),
         };
 
@@ -1088,8 +1102,10 @@ async fn handle_left_room(
             return Ok(());
         };
 
-    let Some(left_shortstatehash) =
+        let Some(left_shortstatehash) = services()
-        services().rooms.state_accessor.pdu_shortstatehash(&left_event_id)?
+            .rooms
+            .state_accessor
+            .pdu_shortstatehash(&left_event_id)?
         else {
             error!("Leave event has no state");
             return Ok(());
@@ -1121,7 +1137,8 @@ async fn handle_left_room(
                     // TODO: Delete the following line when this is resolved: https://github.com/vector-im/element-web/issues/22565
                     || *sender_user == state_key
                 {
-                let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
+                    let Some(pdu) = services().rooms.timeline.get_pdu(&id)?
+                    else {
                         error!("Pdu in state not found: {}", id);
                         continue;
                     };
@@ -1136,6 +1153,11 @@ async fn handle_left_room(
             }
         }
 
+        State {
+            events: left_state_events,
+        }
+    };
+
     left_rooms.insert(
         room_id.clone(),
         LeftRoom {
@@ -1143,9 +1165,7 @@ async fn handle_left_room(
                 events: Vec::new(),
             },
             timeline,
-            state: State {
+            state,
-                events: left_state_events,
-            },
         },
     );
 

src/utils/filter.rs

@@ -159,6 +159,7 @@ pub(crate) struct CompiledFilterDefinition<'a> {
 pub(crate) struct CompiledRoomFilter<'a> {
     rooms: AllowDenyList<'a, RoomId>,
     pub(crate) timeline: CompiledRoomEventFilter<'a>,
+    pub(crate) state: CompiledRoomEventFilter<'a>,
 }
 
 pub(crate) struct CompiledRoomEventFilter<'a> {
@@ -197,6 +198,7 @@ impl<'a> TryFrom<&'a RoomFilter> for CompiledRoomFilter<'a> {
                 &source.not_rooms,
             ),
             timeline: (&source.timeline).try_into()?,
+            state: (&source.state).try_into()?,
         })
     }
 }