Cleanup the list of required properties for MessageDelegateContextMenu

src/models/messageeventmodel.cpp

@@ -63,7 +63,6 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[ShowReactionsRole] = "showReactions";
     roles[SourceRole] = "source";
     roles[MimeTypeRole] = "mimeType";
-    roles[FormattedBodyRole] = "formattedBody";
     roles[AuthorIdRole] = "authorId";
     roles[VerifiedRole] = "verified";
     roles[DisplayNameForInitialsRole] = "displayNameForInitials";
@@ -480,16 +479,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return m_currentRoom->eventToGenericString(evt);
     }
 
-    if (role == FormattedBodyRole) {
-        if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
-            if (e->hasTextContent() && e->mimeType().name() != "text/plain") {
-                return static_cast<const Quotient::EventContent::TextContent *>(e->content())->body;
-            }
-        }
-
-        return {};
-    }
-
     if (role == PlainText) {
         return m_currentRoom->eventToString(evt);
     }

src/models/messageeventmodel.h

@@ -71,7 +71,6 @@ public:
         HighlightRole, /**< Whether the event should be highlighted. */
         SpecialMarksRole, /**< Whether the event is hidden or not. */
         ProgressInfoRole, /**< Progress info when downloading files. */
-        FormattedBodyRole, /**< The formatted body of a rich message. */
         GenericDisplayRole, /**< A generic string based upon the message type. */
 
         ShowLinkPreviewRole, /**< Whether a link preview should be shown. */

src/qml/Component/NeochatMaximizeComponent.qml

@@ -78,13 +78,12 @@ Components.AlbumMaximizeComponent {
     onItemRightClicked: {
         const contextMenu = fileDelegateContextMenu.createObject(parent, {
             author: root.author,
-            message: root.plainText,
             eventId: root.eventId,
             source: root.source,
             file: parent,
             mimeType: root.mimeType,
             progressInfo: root.progressInfo,
-            plainMessage: root.plainText,
+            plainText: root.plainText,
         });
         contextMenu.closeFullscreen.connect(root.close)
         contextMenu.open();

src/qml/Component/Timeline/TimelineContainer.qml

@@ -79,11 +79,6 @@ ColumnLayout {
      */
     required property string plainText
 
-    /**
-     * @brief The formatted body of the message.
-     */
-    required property string formattedBody
-
     /**
      * @brief The date of the event as a string.
      */
@@ -600,13 +595,12 @@ ColumnLayout {
     function openFileContext(file) {
         const contextMenu = fileDelegateContextMenu.createObject(root, {
             author: root.author,
-            message: root.plainText,
             eventId: root.eventId,
             source: root.source,
             file: file,
             mimeType: root.mimeType,
             progressInfo: root.progressInfo,
-            plainMessage: root.plainText,
+            plainText: root.plainText,
         });
         contextMenu.open();
     }
@@ -616,12 +610,10 @@ ColumnLayout {
         const contextMenu = messageDelegateContextMenu.createObject(root, {
             selectedText: selectedText,
             author: root.author,
-            message: root.plainText,
             eventId: root.eventId,
-            formattedBody: root.formattedBody,
             source: root.source,
             eventType: root.delegateType,
-            plainMessage: root.plainText,
+            plainText: root.plainText,
         });
         contextMenu.open();
     }

src/qml/Menu/Timeline/MessageDelegateContextMenu.qml

@@ -13,13 +13,11 @@ Loader {
     id: loadRoot
 
     required property var author
-    required property string message
     required property string eventId
     property var eventType
-    property string formattedBody: ""
     required property string source
     property string selectedText: ""
-    required property string plainMessage
+    required property string plainText
 
     property list<Kirigami.Action> nestedActions
 
@@ -54,7 +52,7 @@ Loader {
         Kirigami.Action {
             text: i18n("Copy")
             icon.name: "edit-copy"
-            onTriggered: Clipboard.saveText(loadRoot.selectedText === "" ? loadRoot.plainMessage : loadRoot.selectedText)
+            onTriggered: Clipboard.saveText(loadRoot.selectedText === "" ? loadRoot.plainText : loadRoot.selectedText)
         },
         Kirigami.Action {
             text: i18nc("@action:button 'Report' as in 'Report this event to the administrators'", "Report")
@@ -136,7 +134,7 @@ Loader {
                 Instantiator {
                     model: WebShortcutModel {
                         id: webshortcutmodel
-                        selectedText: loadRoot.selectedText ? loadRoot.selectedText : loadRoot.plainMessage
+                        selectedText: loadRoot.selectedText ? loadRoot.selectedText : loadRoot.plainText
                         onOpenUrl: RoomManager.visitNonMatrix(url)
                     }
                     delegate: QQC2.MenuItem {
@@ -240,7 +238,7 @@ Loader {
                                 wrapMode: Text.WordWrap
                             }
                             QQC2.Label {
-                                text: message
+                                text: plainText
                                 Layout.fillWidth: true
                                 wrapMode: Text.WordWrap