Filter out the current parent space from the /hierarchy and SpaceRoomList responses.

Author: stefanceriu

crates/matrix-sdk-ui/src/spaces/room_list.rs

@@ -131,7 +131,7 @@ impl SpaceServiceRoomList {
         self.pagination_state.set(SpaceServiceRoomListPaginationState::Loading);
 
         let mut request = get_hierarchy::v1::Request::new(self.parent_space_id.clone());
-        request.max_depth = Some(uint!(1));
+        request.max_depth = Some(uint!(1)); // We only want the immediate children of the space
 
         if let PaginationToken::HasMore(ref token) = *self.token.lock().unwrap() {
             request.from = Some(token.clone());
@@ -155,15 +155,16 @@ impl SpaceServiceRoomList {
                     result
                         .rooms
                         .iter()
-                        .map(|room| {
-                            (
-                                &room.summary,
-                                self.client.get_room(&room.summary.room_id),
-                                room.children_state.len(),
-                            )
-                        })
-                        .map(|(summary, room, children_count)| {
-                            SpaceServiceRoom::new_from_summary(summary, room, children_count as u64)
+                        .flat_map(|room| {
+                            if room.summary.room_id == self.parent_space_id {
+                                None
+                            } else {
+                                Some(SpaceServiceRoom::new_from_summary(
+                                    &room.summary,
+                                    self.client.get_room(&room.summary.room_id),
+                                    room.children_state.len() as u64,
+                                ))
+                            }
                         })
                         .collect::<Vec<_>>(),
                 );
@@ -238,7 +239,7 @@ mod tests {
         // Paginating the room list
         server
             .mock_get_hierarchy()
-            .ok_with_room_ids(vec![child_space_id_1, child_space_id_2])
+            .ok_with_room_ids(vec![parent_space_id, child_space_id_1, child_space_id_2])
             .mount()
             .await;