diff --git a/src/notifications/ManagerLinux.cpp b/src/notifications/ManagerLinux.cpp
index 202f2a9d..9bcda1b2 100644
--- a/src/notifications/ManagerLinux.cpp
+++ b/src/notifications/ManagerLinux.cpp
@@ -7,6 +7,7 @@
#include <QDBusPendingReply>
#include <QDebug>
#include <QImage>
+#include <QRegularExpression>
#include <QTextDocumentFragment>
#include <functional>
@@ -176,9 +177,12 @@ NotificationsManager::formatNotification(const mtx::events::collections::Timelin
.replace("<em>", "<i>")
.replace("</em>", "</i>")
.replace("<strong>", "<b>")
- .replace("</strong>", "</b>");
+ .replace("</strong>", "</b>")
+ .replace(QRegularExpression("(<mx-reply>.+\\<\\/mx-reply\\>)"), "");
- return QTextDocumentFragment::fromHtml(mtx::accessors::formattedBodyWithFallback(e))
+ return QTextDocumentFragment::fromHtml(
+ mtx::accessors::formattedBodyWithFallback(e).replace(
+ QRegularExpression("(<mx-reply>.+\\<\\/mx-reply\\>)"), ""))
.toPlainText();
}
diff --git a/src/notifications/ManagerMac.cpp b/src/notifications/ManagerMac.cpp
index a74df2c7..c9678638 100644
--- a/src/notifications/ManagerMac.cpp
+++ b/src/notifications/ManagerMac.cpp
@@ -1,5 +1,6 @@
#include "Manager.h"
+#include <QRegularExpression>
#include <QTextDocumentFragment>
#include "EventAccessors.h"
@@ -8,5 +9,8 @@
QString
NotificationsManager::formatNotification(const mtx::events::collections::TimelineEvents &e)
{
- return QTextDocumentFragment::fromHtml(mtx::accessors::formattedBodyWithFallback(e)).toPlainText();
+ return QTextDocumentFragment::fromHtml(
+ mtx::accessors::formattedBodyWithFallback(e).replace(
+ QRegularExpression("(<mx-reply>.+\\<\\/mx-reply\\>)"), ""))
+ .toPlainText();
}
diff --git a/src/notifications/ManagerWin.cpp b/src/notifications/ManagerWin.cpp
index 47b4c178..026c912f 100644
--- a/src/notifications/ManagerWin.cpp
+++ b/src/notifications/ManagerWin.cpp
@@ -5,6 +5,7 @@
#include "notifications/Manager.h"
#include "wintoastlib.h"
+#include <QRegularExpression>
#include <QTextDocumentFragment>
#include "EventAccessors.h"
@@ -80,6 +81,8 @@ NotificationsManager::removeNotification(const QString &, const QString &)
QString
NotificationsManager::formatNotification(const mtx::events::collections::TimelineEvents &e)
{
- return QTextDocumentFragment::fromHtml(mtx::accessors::formattedBodyWithFallback(e)).toPlainText();
+ return QTextDocumentFragment::fromHtml(
+ mtx::accessors::formattedBodyWithFallback(e).replace(
+ QRegularExpression("(<mx-reply>.+\\<\\/mx-reply\\>)"), ""))
+ .toPlainText();
}
-
|
