Skip to content

Commit 7c12725

Browse files
stefanceriustefanceriu
committed
feat(spaces): expose the number of children each space room has
1 parent 76c51f8 commit 7c12725

File tree

6 files changed

+102
-21
lines changed

6 files changed

+102
-21
lines changed

‎bindings/matrix-sdk-ffi/src/spaces.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ pub struct SpaceServiceRoom {
183183
pub world_readable: Option<bool>,
184184
pub guest_can_join: bool,
185185

186+
pub children_count: u64,
186187
pub state: Option<Membership>,
187188
pub heroes: Option<Vec<RoomHero>>,
188189
}
@@ -200,6 +201,7 @@ impl From<UISpaceServiceRoom> for SpaceServiceRoom {
200201
join_rule: room.join_rule.map(Into::into),
201202
world_readable: room.world_readable,
202203
guest_can_join: room.guest_can_join,
204+
children_count: room.children_count,
203205
state: room.state.map(Into::into),
204206
heroes: room.heroes.map(|heroes| heroes.into_iter().map(Into::into).collect()),
205207
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ impl SpaceServiceGraph {
4949
self.nodes.values().filter(|node| node.parents.is_empty()).map(|node| &node.id).collect()
5050
}
5151

52+
pub fn children_of(&self, node_id: &OwnedRoomId) -> Vec<&OwnedRoomId> {
53+
self.nodes.get(node_id).map_or(vec![], |node| node.children.iter().collect())
54+
}
55+
5256
pub fn add_node(&mut self, node_id: OwnedRoomId) {
5357
self.nodes.entry(node_id.clone()).or_insert(SpaceServiceGraphNode::new(node_id));
5458
}
@@ -133,6 +137,8 @@ mod tests {
133137

134138
assert!(graph.nodes[&b].parents.contains(&a));
135139
assert!(graph.nodes[&c].parents.contains(&a));
140+
141+
assert_eq!(graph.children_of(&a), vec![&b, &c]);
136142
}
137143

138144
#[test]

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

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,13 @@ impl SpaceService {
147147
joined_spaces
148148
.iter()
149149
.flat_map(|room| {
150-
if root_notes.contains(&&room.room_id().to_owned()) {
151-
Some(SpaceServiceRoom::new_from_known(room.clone()))
150+
let room_id = room.room_id().to_owned();
151+
152+
if root_notes.contains(&&room_id) {
153+
Some(SpaceServiceRoom::new_from_known(
154+
room.clone(),
155+
graph.children_of(&room_id).len() as u64,
156+
))
152157
} else {
153158
None
154159
}
@@ -165,7 +170,7 @@ mod tests {
165170
use matrix_sdk_test::{
166171
JoinedRoomBuilder, LeftRoomBuilder, async_test, event_factory::EventFactory,
167172
};
168-
use ruma::{RoomVersionId, room::RoomType, room_id};
173+
use ruma::{RoomVersionId, owned_room_id, room::RoomType, room_id};
169174
use stream_assert::{assert_next_eq, assert_pending};
170175
use tokio_stream::StreamExt;
171176

@@ -248,6 +253,12 @@ mod tests {
248253
vec![parent_space_id]
249254
);
250255

256+
// and it has 2 children
257+
assert_eq!(
258+
space_service.joined_spaces().iter().map(|s| s.children_count).collect::<Vec<_>>(),
259+
vec![2]
260+
);
261+
251262
let parent_space = client.get_room(parent_space_id).unwrap();
252263
assert!(parent_space.is_space());
253264

@@ -315,37 +326,46 @@ mod tests {
315326

316327
assert_eq!(
317328
space_service.joined_spaces(),
318-
vec![SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap())]
329+
vec![SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap(), 0)]
319330
);
320331

321332
// Join the second space
322333

323334
server
324335
.sync_room(
325336
&client,
326-
JoinedRoomBuilder::new(second_space_id).add_state_event(factory.create(
327-
user_id,
328-
RoomVersionId::V1,
329-
Some(RoomType::Space),
330-
)),
337+
JoinedRoomBuilder::new(second_space_id)
338+
.add_state_event(factory.create(
339+
user_id,
340+
RoomVersionId::V1,
341+
Some(RoomType::Space),
342+
))
343+
.add_state_event(
344+
factory
345+
.space_child(
346+
second_space_id.to_owned(),
347+
owned_room_id!("!child:example.org"),
348+
)
349+
.sender(user_id),
350+
),
331351
)
332352
.await;
333353

334354
// And expect the list to update
335355
assert_eq!(
336356
space_service.joined_spaces(),
337357
vec![
338-
SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap()),
339-
SpaceServiceRoom::new_from_known(client.get_room(second_space_id).unwrap())
358+
SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap(), 0),
359+
SpaceServiceRoom::new_from_known(client.get_room(second_space_id).unwrap(), 1)
340360
]
341361
);
342362

343363
// The subscriber yields new results when a space is joined
344364
assert_next_eq!(
345365
joined_spaces_subscriber,
346366
vec![
347-
SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap()),
348-
SpaceServiceRoom::new_from_known(client.get_room(second_space_id).unwrap())
367+
SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap(), 0),
368+
SpaceServiceRoom::new_from_known(client.get_room(second_space_id).unwrap(), 1)
349369
]
350370
);
351371

@@ -354,7 +374,7 @@ mod tests {
354374
// and when one is left
355375
assert_next_eq!(
356376
joined_spaces_subscriber,
357-
vec![SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap())]
377+
vec![SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap(), 0)]
358378
);
359379

360380
// but it doesn't when a non-space room gets joined
@@ -370,7 +390,7 @@ mod tests {
370390
assert_pending!(joined_spaces_subscriber);
371391
assert_eq!(
372392
space_service.joined_spaces(),
373-
vec![SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap())]
393+
vec![SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap(), 0)]
374394
);
375395
}
376396
}

‎crates/matrix-sdk-ui/src/spaces/room.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,17 @@ pub struct SpaceServiceRoom {
3232
pub world_readable: Option<bool>,
3333
pub guest_can_join: bool,
3434

35+
pub children_count: u64,
3536
pub state: Option<RoomState>,
3637
pub heroes: Option<Vec<RoomHero>>,
3738
}
3839

3940
impl SpaceServiceRoom {
40-
pub fn new_from_summary(summary: &RoomSummary, known_room: Option<Room>) -> Self {
41+
pub fn new_from_summary(
42+
summary: &RoomSummary,
43+
known_room: Option<Room>,
44+
children_count: u64,
45+
) -> Self {
4146
Self {
4247
room_id: summary.room_id.clone(),
4348
canonical_alias: summary.canonical_alias.clone(),
@@ -49,12 +54,13 @@ impl SpaceServiceRoom {
4954
join_rule: Some(summary.join_rule.clone()),
5055
world_readable: Some(summary.world_readable),
5156
guest_can_join: summary.guest_can_join,
57+
children_count,
5258
state: known_room.as_ref().map(|r| r.state()),
5359
heroes: known_room.map(|r| r.heroes()),
5460
}
5561
}
5662

57-
pub fn new_from_known(known_room: Room) -> Self {
63+
pub fn new_from_known(known_room: Room, children_count: u64) -> Self {
5864
let room_info = known_room.clone_info();
5965

6066
Self {
@@ -70,6 +76,7 @@ impl SpaceServiceRoom {
7076
.history_visibility()
7177
.map(|vis| *vis == HistoryVisibility::WorldReadable),
7278
guest_can_join: known_room.guest_access() == GuestAccess::CanJoin,
79+
children_count,
7380
state: Some(known_room.state()),
7481
heroes: Some(room_info.heroes().to_vec()),
7582
}

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ impl SpaceServiceRoomList {
6969
new_rooms.iter_mut().find(|room| &room.room_id == updated_room_id)
7070
&& let Some(update_room) = client_clone.get_room(updated_room_id)
7171
{
72-
*room = SpaceServiceRoom::new_from_known(update_room);
72+
*room = SpaceServiceRoom::new_from_known(
73+
update_room,
74+
room.children_count,
75+
);
7376
}
7477
});
7578

@@ -151,8 +154,16 @@ impl SpaceServiceRoomList {
151154
result
152155
.rooms
153156
.iter()
154-
.map(|room| (&room.summary, self.client.get_room(&room.summary.room_id)))
155-
.map(|(summary, room)| SpaceServiceRoom::new_from_summary(summary, room))
157+
.map(|room| {
158+
(
159+
&room.summary,
160+
self.client.get_room(&room.summary.room_id),
161+
room.children_state.len(),
162+
)
163+
})
164+
.map(|(summary, room, children_count)| {
165+
SpaceServiceRoom::new_from_summary(summary, room, children_count as u64)
166+
})
156167
.collect::<Vec<_>>(),
157168
);
158169

@@ -226,7 +237,10 @@ mod tests {
226237
// Paginating the room list
227238
server
228239
.mock_get_hierarchy()
229-
.ok_with_room_ids(vec![child_space_id_1, child_space_id_2])
240+
.ok_with_room_ids_and_children_state(
241+
vec![child_space_id_1, child_space_id_2],
242+
vec![room_id!("!child:example.org")],
243+
)
230244
.mount()
231245
.await;
232246

@@ -251,6 +265,7 @@ mod tests {
251265
false,
252266
),
253267
None,
268+
1
254269
),
255270
SpaceServiceRoom::new_from_summary(
256271
&RoomSummary::new(
@@ -261,6 +276,7 @@ mod tests {
261276
false,
262277
),
263278
None,
279+
1
264280
),
265281
]
266282
);

‎crates/matrix-sdk/src/test_utils/mocks/mod.rs

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4043,6 +4043,36 @@ impl<'a> MockEndpoint<'a, GetHierarchyEndpoint> {
40434043
})))
40444044
}
40454045

4046+
/// Returns a successful response containing the given room IDs and children
4047+
/// states
4048+
pub fn ok_with_room_ids_and_children_state(
4049+
self,
4050+
room_ids: Vec<&RoomId>,
4051+
children_state: Vec<&RoomId>,
4052+
) -> MatrixMock<'a> {
4053+
let children_state = children_state
4054+
.into_iter()
4055+
.map(|id| json!({ "type": "m.space.child", "state_key": id }))
4056+
.collect::<Vec<_>>();
4057+
4058+
let rooms = room_ids
4059+
.iter()
4060+
.map(|id| {
4061+
json!({
4062+
"room_id": id,
4063+
"num_joined_members": 1,
4064+
"world_readable": false,
4065+
"guest_can_join": false,
4066+
"children_state": children_state
4067+
})
4068+
})
4069+
.collect::<Vec<_>>();
4070+
4071+
self.respond_with(ResponseTemplate::new(200).set_body_json(json!({
4072+
"rooms": rooms,
4073+
})))
4074+
}
4075+
40464076
/// Returns a successful response with an empty list of rooms.
40474077
pub fn ok(self) -> MatrixMock<'a> {
40484078
self.respond_with(ResponseTemplate::new(200).set_body_json(json!({

0 commit comments

Comments
 (0)