From 22fd44df104e5aef39444e5d669b1bd43cbf290b Mon Sep 17 00:00:00 2001
From: Andy Balaam <andy.balaam@matrix.org>
Date: Wed, 14 Jun 2023 15:31:25 +0100
Subject: [PATCH] Fix comments from review feedback

---
 crates/matrix-sdk-base/src/rooms/normal.rs | 6 ++++--
 crates/matrix-sdk-base/src/sliding_sync.rs | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/crates/matrix-sdk-base/src/rooms/normal.rs b/crates/matrix-sdk-base/src/rooms/normal.rs
index badb7399a..986c474e5 100644
--- a/crates/matrix-sdk-base/src/rooms/normal.rs
+++ b/crates/matrix-sdk-base/src/rooms/normal.rs
@@ -85,11 +85,13 @@ pub enum RoomState {
 
 impl From<&MembershipState> for RoomState {
     fn from(membership_state: &MembershipState) -> Self {
+        // We consider Ban, Knock and Leave to be Left, because they all mean we are not
+        // in the room.
         match membership_state {
-            MembershipState::Ban => Self::Left, // TODO: is this right?
+            MembershipState::Ban => Self::Left,
             MembershipState::Invite => Self::Invited,
             MembershipState::Join => Self::Joined,
-            MembershipState::Knock => Self::Left, // TODO: is this right?
+            MembershipState::Knock => Self::Left,
             MembershipState::Leave => Self::Left,
             _ => panic!("Unexpected MembershipState: {}", membership_state),
         }
diff --git a/crates/matrix-sdk-base/src/sliding_sync.rs b/crates/matrix-sdk-base/src/sliding_sync.rs
index 5e6674a1a..b35d18bb3 100644
--- a/crates/matrix-sdk-base/src/sliding_sync.rs
+++ b/crates/matrix-sdk-base/src/sliding_sync.rs
@@ -497,7 +497,7 @@ mod test {
         set_room_left(&mut room, user_id);
         let response = response_with_room(room_id, room).await;
         client.process_sliding_sync(&response).await.expect("Failed to process sync");
-        // (sanity: state is invite)
+        // (sanity: state is left)
         assert_eq!(client.get_room(room_id).unwrap().state(), RoomState::Left);
 
         // And then get invited back