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

chore(base): Store name event's ID in BaseRoomInfo

Browse Source
This commit is contained in:
Jonas Platte
2022-05-02 16:29:42 +02:00
committed by Jonas Platte
parent 9e058b6202
commit f93baf7ed4
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/matrix-sdk-base/src/rooms/mod.rs
View File

@@ -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());

18
crates/matrix-sdk-base/src/rooms/normal.rs
View File

@@ -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()));
}