From 0c5932b3dadb0cc611759de8ea36c308228f0ee5 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Wed, 15 Dec 2021 01:03:05 +0100 Subject: [PATCH] Use a reasonable role for message source --- imports/NeoChat/Page/RoomPage.qml | 4 ++-- src/messageeventmodel.cpp | 3 ++- src/messageeventmodel.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml index 840f58b5f..c46e55288 100644 --- a/imports/NeoChat/Page/RoomPage.qml +++ b/imports/NeoChat/Page/RoomPage.qml @@ -583,7 +583,7 @@ Kirigami.ScrollablePage { author: event.author, message: event.message, eventId: event.eventId, - source: event.toolTip, + source: event.source, file: file, progressInfo: event.progressInfo, }); @@ -598,7 +598,7 @@ Kirigami.ScrollablePage { message: event.message, eventId: event.eventId, formattedBody: event.formattedBody, - source: event.toolTip, + source: event.source, eventType: event.eventType }); contextMenu.open(); diff --git a/src/messageeventmodel.cpp b/src/messageeventmodel.cpp index fb60b8d84..a1164b324 100644 --- a/src/messageeventmodel.cpp +++ b/src/messageeventmodel.cpp @@ -46,6 +46,7 @@ QHash MessageEventModel::roleNames() const roles[ShowSectionRole] = "showSection"; roles[ReactionRole] = "reaction"; roles[IsEditedRole] = "isEdited"; + roles[SourceRole] = "source"; roles[FormattedBodyRole] = "formattedBody"; return roles; } @@ -456,7 +457,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const return m_currentRoom->eventToString(evt); } - if (role == Qt::ToolTipRole) { + if (role == SourceRole) { return evt.originalJson(); } diff --git a/src/messageeventmodel.h b/src/messageeventmodel.h index 59a00271d..f7ec83345 100644 --- a/src/messageeventmodel.h +++ b/src/messageeventmodel.h @@ -40,6 +40,7 @@ public: ReactionRole, IsEditedRole, + SourceRole, // For debugging EventResolvedTypeRole,