chore: Refactor non_space.rs filter to space.rs, using new_filter_not in the FFI.

Author: pixlwave

bindings/matrix-sdk-ffi/src/room_list.rs

@@ -16,8 +16,8 @@ use matrix_sdk_ui::{
     room_list_service::filters::{
         new_filter_all, new_filter_any, new_filter_category, new_filter_deduplicate_versions,
         new_filter_favourite, new_filter_fuzzy_match_room_name, new_filter_invite,
-        new_filter_joined, new_filter_low_priority, new_filter_non_left, new_filter_non_space,
-        new_filter_none, new_filter_normalized_match_room_name, new_filter_not, new_filter_unread,
+        new_filter_joined, new_filter_low_priority, new_filter_non_left, new_filter_none,
+        new_filter_normalized_match_room_name, new_filter_not, new_filter_space, new_filter_unread,
         BoxedFilterFn, RoomCategory,
     },
     unable_to_decrypt_hook::UtdHookManager,
@@ -499,7 +499,7 @@ impl From<RoomListEntriesDynamicFilterKind> for BoxedFilterFn {
                 filters.into_iter().map(|filter| BoxedFilterFn::from(filter)).collect(),
             )),
             Kind::NonLeft => Box::new(new_filter_non_left()),
-            Kind::NonSpace => Box::new(new_filter_non_space()),
+            Kind::NonSpace => Box::new(new_filter_not(Box::new(new_filter_space()))),
             Kind::Joined => Box::new(new_filter_joined()),
             Kind::Unread => Box::new(new_filter_unread()),
             Kind::Favourite => Box::new(new_filter_favourite()),

crates/matrix-sdk-ui/src/room_list_service/filters/mod.rs

@@ -61,10 +61,10 @@ mod invite;
 mod joined;
 mod low_priority;
 mod non_left;
-mod non_space;
 mod none;
 mod normalized_match_room_name;
 mod not;
+mod space;
 mod unread;
 
 pub use all::new_filter as new_filter_all;
@@ -82,12 +82,12 @@ use matrix_sdk::Room;
 #[cfg(test)]
 use matrix_sdk_test::{JoinedRoomBuilder, SyncResponseBuilder};
 pub use non_left::new_filter as new_filter_non_left;
-pub use non_space::new_filter as new_filter_non_space;
 pub use none::new_filter as new_filter_none;
 pub use normalized_match_room_name::new_filter as new_filter_normalized_match_room_name;
 pub use not::new_filter as new_filter_not;
 #[cfg(test)]
 use ruma::RoomId;
+pub use space::new_filter as new_filter_space;
 use unicode_normalization::{UnicodeNormalization, char::is_combining_mark};
 pub use unread::new_filter as new_filter_unread;
 #[cfg(test)]

crates/matrix-sdk-ui/src/room_list_service/filters/non_space.rs renamed to crates/matrix-sdk-ui/src/room_list_service/filters/space.rs

@@ -14,26 +14,26 @@
 
 use super::{super::Room, Filter};
 
-struct NonSpaceRoomMatcher<F>
+struct SpaceRoomMatcher<F>
 where
     F: Fn(&Room) -> bool,
 {
-    is_not_space: F,
+    is_space: F,
 }
 
-impl<F> NonSpaceRoomMatcher<F>
+impl<F> SpaceRoomMatcher<F>
 where
     F: Fn(&Room) -> bool,
 {
     fn matches(&self, room: &Room) -> bool {
-        (self.is_not_space)(room)
+        (self.is_space)(room)
     }
 }
 
-/// Create a new filter that will filter out rooms that are not spaces, i.e.
+/// Create a new filter that will filter out rooms that are spaces, i.e.
 /// room with a `room_type` of `m.space` as defined in <https://spec.matrix.org/latest/client-server-api/#spaces>
 pub fn new_filter() -> impl Filter {
-    let matcher = NonSpaceRoomMatcher { is_not_space: move |room| !room.is_space() };
+    let matcher = SpaceRoomMatcher { is_space: move |room| room.is_space() };
 
     move |room| -> bool { matcher.matches(room) }
 }
@@ -47,14 +47,14 @@ mod tests {
     use super::{super::new_rooms, *};
 
     #[async_test]
-    async fn test_not_space() {
+    async fn test_space() {
         let (client, server) = logged_in_client_with_server().await;
         let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
 
-        let matcher = NonSpaceRoomMatcher { is_not_space: |_| false };
+        let matcher = SpaceRoomMatcher { is_space: |_| false };
         assert!(!matcher.matches(&room));
 
-        let matcher = NonSpaceRoomMatcher { is_not_space: |_| true };
+        let matcher = SpaceRoomMatcher { is_space: |_| true };
         assert!(matcher.matches(&room));
     }
 }