mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-18 13:40:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(spaces): have space children with an order field set come before the others in room lists

Browse Source
This commit is contained in:
Stefan Ceriu
2025-10-22 11:28:23 +03:00
committed by Stefan Ceriu
parent 34d71b0392
commit d36b68b7d1
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/matrix-sdk-ui/src/spaces/room_list.rs
View File

@@ -371,8 +371,8 @@ impl SpaceRoomList {
.cmp(b_order)
.then(a_state.origin_server_ts.cmp(&b_state.origin_server_ts))
.then(a.room_id.cmp(&b.room_id)),
(Some(_), None) => Ordering::Greater,
(None, Some(_)) => Ordering::Less,
(Some(_), None) => Ordering::Less,
(None, Some(_)) => Ordering::Greater,
(None, None) => a_state
.origin_server_ts
.cmp(&b_state.origin_server_ts)
@@ -850,8 +850,8 @@ mod tests {
Ordering::Less
);
// Finally, when one of the rooms is missing `children_state` data the
// other one should take precedence
// When one of the rooms is missing `children_state` data the other one
// should take precedence
assert_eq!(
SpaceRoomList::compare_rooms(
&make_space_room(owned_room_id!("!Viola:a.b"), None, None, &mut children_state),
@@ -866,6 +866,8 @@ mod tests {
Ordering::Greater
);
// If the `order` is missing from one of the rooms but `children_state`
// is present then the other one should come first
assert_eq!(
SpaceRoomList::compare_rooms(
&make_space_room(
@@ -882,7 +884,7 @@ mod tests {
),
&children_state,
),
Ordering::Less
Ordering::Greater
);
}
@@ -923,9 +925,8 @@ mod tests {
order: Option<&str>,
origin_server_ts: u32,
) -> HierarchySpaceChildEvent {
let json = json!({
let mut json = json!({
"content": {
"order": order.unwrap_or(""),
"via": []
},
"origin_server_ts": origin_server_ts,
@@ -934,6 +935,10 @@ mod tests {
"type": "m.space.child"
});
if let Some(order) = order {
json["content"]["order"] = json!(order);
}
from_value::<HierarchySpaceChildEvent>(json).unwrap()
}
}