commit 457f22b7104e41ce40d6c2ef78da3a8c8e55414b parent 5bfaaadf942c097c586f527a8760793d612f8e05 Author: Marcel <mtrnord1@gmail.com> Date: Mon, 1 Jun 2020 15:35:51 +0200 Prevent crash if room.members doesn't give me a member Took 3 minutes Diffstat:
| M | src/app/components/event_list.rs | | | 16 | ++++++++++------ |
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/app/components/event_list.rs b/src/app/components/event_list.rs @@ -184,12 +184,16 @@ impl EventList { fn get_event(&self, event: &MessageEvent) -> Html { let sender_displayname = { let room = self.props.current_room.as_ref().unwrap(); - let member = room.members.get(&event.sender).unwrap(); - member - .display_name - .as_ref() - .map(ToString::to_string) - .unwrap_or(event.sender.to_string()) + match room.members.get(&event.sender) { + None => { event.sender.to_string() } + Some(member) => { + member + .display_name + .as_ref() + .map(ToString::to_string) + .unwrap_or(event.sender.to_string()) + } + } }; match &event.content { MessageEventContent::Text(text_event) => {