Skip to content
Snippets Groups Projects
Commit dda3b0e7 authored by 🥺's avatar 🥺 :transgender_flag: Committed by 🥺
Browse files

default to None if "name" in `m.room.name` is empty

parent 3e902836
No related branches found
No related tags found
No related merge requests found
...@@ -230,10 +230,9 @@ pub fn room_state_get( ...@@ -230,10 +230,9 @@ pub fn room_state_get(
pub fn get_name(&self, room_id: &RoomId) -> Result<Option<String>> { pub fn get_name(&self, room_id: &RoomId) -> Result<Option<String>> {
services().rooms.state_accessor.room_state_get(room_id, &StateEventType::RoomName, "")?.map_or(Ok(None), |s| { services().rooms.state_accessor.room_state_get(room_id, &StateEventType::RoomName, "")?.map_or(Ok(None), |s| {
serde_json::from_str(s.content.get()).map(|c: RoomNameEventContent| Some(c.name)).map_err(|e| { Ok(serde_json::from_str(s.content.get())
error!("Invalid room name event in database for room {}. {}", room_id, e); .map(|c: RoomNameEventContent| Some(c.name))
Error::bad_database("Invalid room name event in database.") .unwrap_or_else(|_| None))
})
}) })
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment