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

Unify redaction handling

Browse Source 
The code in messageeventmodel was calling to EventHandler::getBody who
already handles reaction handlings

(cherry picked from commit 16b27700f5)
This commit is contained in:
Carl Schwan
2024-09-06 16:16:09 +02:00
committed by Tobias Fella
parent 0f05c1b921
commit 18db04d073
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/eventhandler.cpp
View File

@@ -294,7 +294,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
{ {
if (event->isRedacted()) { if (event->isRedacted()) {
auto reason = event->redactedBecause()->reason(); auto reason = event->redactedBecause()->reason();
return (reason.isEmpty()) ? i18n("<i>[This message was deleted]</i>") : i18n("<i>[This message was deleted: %1]</i>", reason); return (reason.isEmpty()) ? i18n("<i>[This message was deleted]</i>") : i18n("<i>[This message was deleted: %1]</i>", reason.toHtmlEscaped());
} }
const bool prettyPrint = (format == Qt::RichText); const bool prettyPrint = (format == Qt::RichText);

5
src/models/messagecontentmodel.cpp
View File

@@ -225,11 +225,6 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
if (m_event == nullptr) { if (m_event == nullptr) {
return QString(); return QString();
} }
if (m_event->isRedacted()) {
auto reason = m_event->redactedBecause()->reason();
return (reason.isEmpty()) ? i18n("<i>[This message was deleted]</i>")
: i18n("<i>[This message was deleted: %1]</i>", m_event->redactedBecause()->reason());
}
if (!component.content.isEmpty()) { if (!component.content.isEmpty()) {
return component.content; return component.content;
} }

5
src/models/messageeventmodel.cpp
View File

@@ -433,11 +433,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
EventHandler eventHandler(m_currentRoom, &evt); EventHandler eventHandler(m_currentRoom, &evt);
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
if (evt.isRedacted()) {
auto reason = evt.redactedBecause()->reason();
return (reason.isEmpty()) ? i18n("<i>[This message was deleted]</i>")
: i18n("<i>[This message was deleted: %1]</i>", evt.redactedBecause()->reason().toHtmlEscaped());
}
return eventHandler.getRichBody(); return eventHandler.getRichBody();
} }