diff --git a/src/eventhandler.cpp b/src/eventhandler.cpp index 5019ed90e..fd912c7c4 100644 --- a/src/eventhandler.cpp +++ b/src/eventhandler.cpp @@ -277,7 +277,7 @@ QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent { if (event->isRedacted()) { auto reason = event->redactedBecause()->reason(); - return (reason.isEmpty()) ? i18n("[This message was deleted]") : i18n("[This message was deleted: %1]", reason); + return (reason.isEmpty()) ? i18n("[This message was deleted]") : i18n("[This message was deleted: %1]", reason.toHtmlEscaped()); } const bool prettyPrint = (format == Qt::RichText); diff --git a/src/models/messagecontentmodel.cpp b/src/models/messagecontentmodel.cpp index 643c37f4f..0009fdda7 100644 --- a/src/models/messagecontentmodel.cpp +++ b/src/models/messagecontentmodel.cpp @@ -271,11 +271,6 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const if (m_event == nullptr) { return QString(); } - if (m_event->isRedacted()) { - auto reason = m_event->redactedBecause()->reason(); - return (reason.isEmpty()) ? i18n("[This message was deleted]") - : i18n("[This message was deleted: %1]", m_event->redactedBecause()->reason()); - } if (!component.content.isEmpty()) { return component.content; } diff --git a/src/models/messageeventmodel.cpp b/src/models/messageeventmodel.cpp index 9efc0540a..f90170c9e 100644 --- a/src/models/messageeventmodel.cpp +++ b/src/models/messageeventmodel.cpp @@ -433,11 +433,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const const auto &evt = isPending ? **pendingIt : **timelineIt; if (role == Qt::DisplayRole) { - if (evt.isRedacted()) { - auto reason = evt.redactedBecause()->reason(); - return (reason.isEmpty()) ? i18n("[This message was deleted]") - : i18n("[This message was deleted: %1]", evt.redactedBecause()->reason().toHtmlEscaped()); - } return EventHandler::richBody(m_currentRoom, &evt); }