chore(spaces): simplify the SpaceGraph interfaces

Fix graph reference crap

Author: stefanceriu

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

@@ -14,7 +14,7 @@
 
 use std::collections::{BTreeMap, BTreeSet};
 
-use ruma::OwnedRoomId;
+use ruma::{OwnedRoomId, RoomId};
 
 #[derive(Debug)]
 struct SpaceGraphNode {
@@ -51,14 +51,20 @@ impl SpaceGraph {
 
     /// Returns the root nodes of the graph, which are nodes without any
     /// parents.
-    pub(super) fn root_nodes(&self) -> Vec<&OwnedRoomId> {
-        self.nodes.values().filter(|node| node.parents.is_empty()).map(|node| &node.id).collect()
+    pub(super) fn root_nodes(&self) -> Vec<&RoomId> {
+        self.nodes
+            .values()
+            .filter(|node| node.parents.is_empty())
+            .map(|node| node.id.as_ref())
+            .collect()
     }
 
     /// Returns the children of a given node. If the node does not exist, it
     /// returns an empty vector.
-    pub(super) fn children_of(&self, node_id: &OwnedRoomId) -> Vec<&OwnedRoomId> {
-        self.nodes.get(node_id).map_or(vec![], |node| node.children.iter().collect())
+    pub(super) fn children_of(&self, node_id: &RoomId) -> Vec<&RoomId> {
+        self.nodes
+            .get(node_id)
+            .map_or(vec![], |node| node.children.iter().map(|id| id.as_ref()).collect())
     }
 
     /// Adds a node to the graph. If the node already exists, it does nothing.

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

@@ -229,12 +229,12 @@ impl SpaceService {
         joined_spaces
             .iter()
             .filter_map(|room| {
-                let room_id = room.room_id().to_owned();
+                let room_id = room.room_id();
 
-                if root_nodes.contains(&&room_id) {
+                if root_nodes.contains(&room_id) {
                     Some(SpaceRoom::new_from_known(
                         room.clone(),
-                        graph.children_of(&room_id).len() as u64,
+                        graph.children_of(room_id).len() as u64,
                     ))
                 } else {
                     None