From bdf192df58ef123b5747a01e7fe5e6a94ac8ba1d Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Sat, 2 Mar 2024 19:36:46 +0100
Subject: [PATCH] Use plaintext in devtools room selection combo

---
 src/models/roomlistmodel.cpp | 4 ++++
 src/models/roomlistmodel.h   | 1 +
 src/qml/RoomData.qml         | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/models/roomlistmodel.cpp b/src/models/roomlistmodel.cpp
index 925539846..f41628f39 100644
--- a/src/models/roomlistmodel.cpp
+++ b/src/models/roomlistmodel.cpp
@@ -208,6 +208,9 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
     if (role == DisplayNameRole) {
         return room->displayName();
     }
+    if (role == EscapedDisplayNameRole) {
+        return room->displayName().toHtmlEscaped();
+    }
     if (role == AvatarRole) {
         return room->avatarMediaId();
     }
@@ -282,6 +285,7 @@ QHash<int, QByteArray> RoomListModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
     roles[DisplayNameRole] = "displayName";
+    roles[EscapedDisplayNameRole] = "escapedDisplayName";
     roles[AvatarRole] = "avatar";
     roles[CanonicalAliasRole] = "canonicalAlias";
     roles[TopicRole] = "topic";
diff --git a/src/models/roomlistmodel.h b/src/models/roomlistmodel.h
index 8cdc2da66..d28c7fb15 100644
--- a/src/models/roomlistmodel.h
+++ b/src/models/roomlistmodel.h
@@ -37,6 +37,7 @@ public:
      */
     enum EventRoles {
         DisplayNameRole = Qt::DisplayRole, /**< The display name of the room. */
+        EscapedDisplayNameRole, /**< HTML-Escaped display name of the room. */
         AvatarRole, /**< The source URL for the room's avatar. */
         CanonicalAliasRole, /**< The room canonical alias. */
         TopicRole, /**< The room topic. */
diff --git a/src/qml/RoomData.qml b/src/qml/RoomData.qml
index 87d380ebf..291d46c77 100644
--- a/src/qml/RoomData.qml
+++ b/src/qml/RoomData.qml
@@ -23,8 +23,9 @@ ColumnLayout {
         FormCard.FormComboBoxDelegate {
             id: roomComboBox
             text: i18n("Room")
-            textRole: "displayName"
+            textRole: "escapedDisplayName"
             valueRole: "roomId"
+            displayText: roomListModel.data(roomListModel.index(currentIndex, 0), RoomListModel.DisplayNameRole)
             model: RoomListModel {
                 id: roomListModel
                 connection: root.connection