From df998ef67194bdd633df163eef53ec628fc8e090 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Sat, 20 Feb 2021 13:16:43 -0500
Subject: Get event text in event parser function

---
 src/notifications/ManagerLinux.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/notifications/ManagerLinux.cpp')

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();
 }
 
 /**
-- 
cgit 1.5.1