From f93baf7ed4ac8816c19da8c7584cee175d9c41a1 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@element.io>
Date: Mon, 2 May 2022 16:29:42 +0200
Subject: [PATCH] chore(base): Store name event's ID in BaseRoomInfo

---
 crates/matrix-sdk-base/src/rooms/mod.rs    | 10 +++++-----
 crates/matrix-sdk-base/src/rooms/normal.rs | 18 ++++++++++++++----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/crates/matrix-sdk-base/src/rooms/mod.rs b/crates/matrix-sdk-base/src/rooms/mod.rs
index a54991ad8..03d3b7bf9 100644
--- a/crates/matrix-sdk-base/src/rooms/mod.rs
+++ b/crates/matrix-sdk-base/src/rooms/mod.rs
@@ -12,7 +12,8 @@ use ruma::{
             create::RoomCreateEventContent, encryption::RoomEncryptionEventContent,
             guest_access::RoomGuestAccessEventContent,
             history_visibility::RoomHistoryVisibilityEventContent,
-            join_rules::RoomJoinRulesEventContent, tombstone::RoomTombstoneEventContent,
+            join_rules::RoomJoinRulesEventContent, name::RoomNameEventContent,
+            tombstone::RoomTombstoneEventContent,
         },
         AnyStrippedStateEvent, AnySyncStateEvent, EmptyStateKey, RedactContent,
         RedactedEventContent, StateEventContent, StrippedStateEvent, SyncStateEvent,
@@ -159,7 +160,7 @@ pub struct BaseRoomInfo {
     /// The maximal power level that can be found in this room.
     pub(crate) max_power_level: i64,
     /// The `m.room.name` of this room.
-    pub(crate) name: Option<String>,
+    name: Option<MinimalStateEvent<RoomNameEventContent>>,
     /// The `m.room.tombstone` event content of this room.
     pub(crate) tombstone: Option<RoomTombstoneEventContent>,
     /// The topic of this room.
@@ -198,8 +199,7 @@ impl BaseRoomInfo {
                 self.avatar = Some(a.into());
             }
             AnySyncStateEvent::RoomName(n) => {
-                self.name =
-                    n.as_original().and_then(|n| n.content.name.as_ref().map(|n| n.to_string()));
+                self.name = Some(n.into());
             }
             AnySyncStateEvent::RoomCreate(c) if self.create.is_none() => {
                 self.create = Some(c.into());
@@ -248,7 +248,7 @@ impl BaseRoomInfo {
                 self.avatar = Some(a.into());
             }
             AnyStrippedStateEvent::RoomName(n) => {
-                self.name = n.content.name.as_ref().map(|n| n.to_string());
+                self.name = Some(n.into());
             }
             AnyStrippedStateEvent::RoomCreate(c) if self.create.is_none() => {
                 self.create = Some(c.into());
diff --git a/crates/matrix-sdk-base/src/rooms/normal.rs b/crates/matrix-sdk-base/src/rooms/normal.rs
index 9b52a9272..679b275a8 100644
--- a/crates/matrix-sdk-base/src/rooms/normal.rs
+++ b/crates/matrix-sdk-base/src/rooms/normal.rs
@@ -252,7 +252,7 @@ impl Room {
 
     /// Get the `m.room.name` of this room.
     pub fn name(&self) -> Option<String> {
-        self.inner.read().unwrap().base_info.name.clone()
+        self.inner.read().unwrap().name().map(ToOwned::to_owned)
     }
 
     /// Has the room been tombstoned.
@@ -342,7 +342,7 @@ impl Room {
         let summary = {
             let inner = self.inner.read().unwrap();
 
-            if let Some(name) = &inner.base_info.name {
+            if let Some(name) = &inner.name() {
                 let name = name.trim();
                 return Ok(DisplayName::Named(name.to_owned()));
             } else if let Some(alias) = inner.canonical_alias() {
@@ -780,6 +780,10 @@ impl RoomInfo {
             _ => &JoinRule::Public,
         }
     }
+
+    fn name(&self) -> Option<&str> {
+        Some(self.base_info.name.as_ref()?.as_original()?.content.name.as_ref()?.as_ref())
+    }
 }
 
 #[cfg(test)]
@@ -796,6 +800,7 @@ mod test {
                     MembershipState, OriginalSyncRoomMemberEvent, RoomMemberEventContent,
                     StrippedRoomMemberEvent,
                 },
+                name::RoomNameEventContent,
             },
             StateUnsigned,
         },
@@ -852,12 +857,17 @@ mod test {
             event_id: None,
         });
 
+        let name_event = MinimalStateEvent::Original(OriginalMinimalStateEvent {
+            content: RoomNameEventContent::new(Some("Test Room".try_into().unwrap())),
+            event_id: None,
+        });
+
         // has precedence
         room.inner.write().unwrap().base_info.canonical_alias = Some(canonical_alias_event.clone());
         assert_eq!(room.display_name().await.unwrap(), DisplayName::Aliased("test".to_owned()));
 
         // has precedence
-        room.inner.write().unwrap().base_info.name = Some("Test Room".to_owned());
+        room.inner.write().unwrap().base_info.name = Some(name_event.clone());
         assert_eq!(room.display_name().await.unwrap(), DisplayName::Named("Test Room".to_owned()));
 
         let (_, room) = make_room(RoomType::Invited);
@@ -868,7 +878,7 @@ mod test {
         assert_eq!(room.display_name().await.unwrap(), DisplayName::Aliased("test".to_owned()));
 
         // has precedence
-        room.inner.write().unwrap().base_info.name = Some("Test Room".to_owned());
+        room.inner.write().unwrap().base_info.name = Some(name_event);
         assert_eq!(room.display_name().await.unwrap(), DisplayName::Named("Test Room".to_owned()));
     }