summary refs log tree commit diff
path: root/src/notifications/ManagerLinux.cpp
diff options
context:
space:
mode:
authorLoren Burkholder <computersemiexpert@outlook.com>2021-02-20 13:16:43 -0500
committerNicolas Werner <nicolas.werner@hotmail.de>2021-03-17 19:17:15 +0100
commitdf998ef67194bdd633df163eef53ec628fc8e090 (patch)
tree38f65c6bac70dbec2c1ff5e467868b6530dec9e6 /src/notifications/ManagerLinux.cpp
parentAdd "replied" marker to regular reply messages (diff)
downloadnheko-df998ef67194bdd633df163eef53ec628fc8e090.tar.xz
Get event text in event parser function
Diffstat (limited to 'src/notifications/ManagerLinux.cpp')
-rw-r--r--src/notifications/ManagerLinux.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/notifications/ManagerLinux.cpp b/src/notifications/ManagerLinux.cpp

index ab4a6d93..202f2a9d 100644 --- a/src/notifications/ManagerLinux.cpp +++ b/src/notifications/ManagerLinux.cpp
@@ -11,6 +11,7 @@ #include <functional> +#include "EventAccessors.h" #include "Utils.h" NotificationsManager::NotificationsManager(QObject *parent) @@ -161,7 +162,7 @@ NotificationsManager::notificationClosed(uint id, uint reason) * specified at https://www.freedesktop.org/wiki/Specifications/StatusNotifierItem/Markup/ */ QString -NotificationsManager::formatNotification(const QString &text) +NotificationsManager::formatNotification(const mtx::events::collections::TimelineEvents &e) { static const auto hasMarkup = std::invoke([this]() -> bool { for (auto x : dbus.call("GetCapabilities").arguments()) @@ -169,14 +170,16 @@ NotificationsManager::formatNotification(const QString &text) return true; return false; }); + if (hasMarkup) - return QString(text) + return mtx::accessors::formattedBodyWithFallback(e) .replace("<em>", "<i>") .replace("</em>", "</i>") .replace("<strong>", "<b>") .replace("</strong>", "</b>"); - return QTextDocumentFragment::fromHtml(text).toPlainText(); + return QTextDocumentFragment::fromHtml(mtx::accessors::formattedBodyWithFallback(e)) + .toPlainText(); } /**