ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a reasonable role for message source

Browse Source
This commit is contained in:
Tobias Fella
2021-12-15 01:03:05 +01:00
parent 332d6c9782
commit 0c5932b3da
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
imports/NeoChat/Page/RoomPage.qml
View File

@@ -583,7 +583,7 @@ Kirigami.ScrollablePage {
author: event.author, author: event.author,
message: event.message, message: event.message,
eventId: event.eventId, eventId: event.eventId,
source: event.toolTip, source: event.source,
file: file, file: file,
progressInfo: event.progressInfo, progressInfo: event.progressInfo,
}); });
@@ -598,7 +598,7 @@ Kirigami.ScrollablePage {
message: event.message, message: event.message,
eventId: event.eventId, eventId: event.eventId,
formattedBody: event.formattedBody, formattedBody: event.formattedBody,
source: event.toolTip, source: event.source,
eventType: event.eventType eventType: event.eventType
}); });
contextMenu.open(); contextMenu.open();

3
src/messageeventmodel.cpp
View File

@@ -46,6 +46,7 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
roles[ShowSectionRole] = "showSection"; roles[ShowSectionRole] = "showSection";
roles[ReactionRole] = "reaction"; roles[ReactionRole] = "reaction";
roles[IsEditedRole] = "isEdited"; roles[IsEditedRole] = "isEdited";
roles[SourceRole] = "source";
roles[FormattedBodyRole] = "formattedBody"; roles[FormattedBodyRole] = "formattedBody";
return roles; return roles;
} }
@@ -456,7 +457,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
return m_currentRoom->eventToString(evt); return m_currentRoom->eventToString(evt);
} }
if (role == Qt::ToolTipRole) { if (role == SourceRole) {
return evt.originalJson(); return evt.originalJson();
} }

1
src/messageeventmodel.h
View File

@@ -40,6 +40,7 @@ public:
ReactionRole, ReactionRole,
IsEditedRole, IsEditedRole,
SourceRole,
// For debugging // For debugging
EventResolvedTypeRole, EventResolvedTypeRole,