From 0464ded37721aa7c8912842b4a20f29ce8a8016a Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Mon, 21 Aug 2023 14:46:09 +0300
Subject: [PATCH] Prevent mention crashes when room members are missing display
 names (objc interop)

---
 .../WYSIWYGInputToolbar/WysiwygInputToolbarView.swift  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift b/Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift
index edd951fd64..60b6edf943 100644
--- a/Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift
+++ b/Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift
@@ -207,8 +207,14 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
     }
 
     func mention(_ member: MXRoomMember) {
-        self.wysiwygViewModel.setMention(url: MXTools.permalinkToUser(withUserId: member.userId),
-                                         name: member.displayname,
+        guard let userId = member.userId else {
+            return
+        }
+        
+        let displayName = member.displayname ?? userId
+        
+        self.wysiwygViewModel.setMention(url: MXTools.permalinkToUser(withUserId: userId),
+                                         name: displayName,
                                          mentionType: .user)
     }