fix(ui): Handle the case where we are sorting a room with itself.

This patch removes a bug… (TODO)
matrix-org · Jul 1, 2024 · 2d906b7 · 2d906b7
1 parent 98aae99
commit 2d906b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/crates/matrix-sdk-ui/src/room_list_service/sorters/name.rs b/crates/matrix-sdk-ui/src/room_list_service/sorters/name.rs
@@ -28,6 +28,10 @@ where
     F: Fn(&Room, &Room) -> (Option<String>, Option<String>),
 {
     fn matches(&self, left: &Room, right: &Room) -> Ordering {
+        if left.id() == right.id() {
+            return Ordering::Greater;
+        }
+
         let (left_name, right_name) = (self.names)(left, right);
 
         left_name.cmp(&right_name)

diff --git a/crates/matrix-sdk-ui/src/room_list_service/sorters/recency.rs b/crates/matrix-sdk-ui/src/room_list_service/sorters/recency.rs
@@ -30,6 +30,11 @@ where
     F: Fn(&Room, &Room) -> (Option<LatestEvent>, Option<LatestEvent>),
 {
     fn matches(&self, left: &Room, right: &Room) -> Ordering {
+        // `left` and `right` are the same room.
+        if left.id() == right.id() {
+            return Ordering::Greater;
+        }
+
         match (self.latest_events)(left, right) {
             (Some(left_latest_event), Some(right_latest_event)) => left_latest_event
                 .event_origin_server_ts()