Fix HTML escaping artefacts

Author: KitsuneRal

client/models/messageeventmodel.cpp

@@ -449,7 +449,8 @@ QVariant MessageEventModel::data(const QModelIndex& idx, int role) const
             }
             , [this] (const RoomMemberEvent& e) {
                 // FIXME: Rewind to the name that was at the time of this event
-                auto subjectName = m_currentRoom->safeMemberName(e.userId());
+                const auto subjectName =
+                    m_currentRoom->safeMemberName(e.userId()).toHtmlEscaped();
                 // The below code assumes senderName output in AuthorRole
                 switch( e.membership() )
                 {

client/qml/TimelineItem.qml

@@ -157,6 +157,7 @@ Item {
                 elide: Text.ElideRight
 
                 color: textColor
+                textFormat: Label.PlainText
                 font.bold: !xchatStyle
                 renderType: settings.render_type
 
@@ -234,14 +235,23 @@ Item {
                     rightPadding: 2
                     x: -textScrollBar.position * contentWidth
 
+                    // Doesn't work for attributes
+                    function toHtmlEscaped(txt) {
+                        // Make sure to replace & first
+                        var eTxt = txt.replace(/&/g, '&')
+                                  .replace(/</g, '&lt;').replace(/>/g, '&gt;')
+                        console.log(eTxt)
+                        return eTxt
+                    }
+
                     selectByMouse: true
                     readOnly: true
                     textFormat: TextEdit.RichText
                     // FIXME: The text is clumsy and slows down creation
                     text: (actionEvent && !xchatStyle ?
                            ("<a href='#mention' style='text-decoration:none;color:\"" +
                                     defaultPalette.text + "\"'><b>" +
-                                    authorName + "</b></a> ") : ""
+                                    toHtmlEscaped(authorName) + "</b></a> ") : ""
                           ) + display +
                           (annotation ? "<br><em>" + annotation + "</em>" : "")
                     horizontalAlignment: Text.AlignLeft

client/quaternionroom.cpp

@@ -99,7 +99,7 @@ bool QuaternionRoom::canSwitchVersions() const
 
 QString QuaternionRoom::safeMemberName(const QString& userId) const
 {
-    return sanitized(roomMembername(userId)).toHtmlEscaped();
+    return sanitized(roomMembername(userId));
 }
 
 void QuaternionRoom::countChanged()