rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only pass formatted text if it is supported (Linux)

Browse Source
This commit is contained in:
Loren Burkholder 2021-02-13 18:59:17 -05:00 committed by Nicolas Werner
parent c74e68c945
commit 3dcbac8875
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/notifications/ManagerLinux.cpp
View File

@ -7,6 +7,7 @@
#include <QDBusPendingReply> #include <QDBusPendingReply>
#include <QDebug> #include <QDebug>
#include <QImage> #include <QImage>
#include <QTextDocumentFragment>
#include "Cache.h" #include "Cache.h"
#include "EventAccessors.h" #include "EventAccessors.h"
@ -59,7 +60,14 @@ NotificationsManager::postNotification(const mtx::responses::Notification &notif
const auto sender = cache::displayName( const auto sender = cache::displayName(
room_id, QString::fromStdString(mtx::accessors::sender(notification.event))); room_id, QString::fromStdString(mtx::accessors::sender(notification.event)));
const auto text = utils::event_body(notification.event); const auto text = utils::event_body(notification.event);
const auto formattedText = cmark_markdown_to_html(text.toStdString().c_str(), text.length(), CMARK_OPT_UNSAFE); auto formattedText = utils::markdownToHtml(text);
static QDBusInterface notifyApp("org.freedesktop.Notifications",
"/org/freedesktop/Notifications",
"org.freedesktop.Notifications");
auto capabilites = notifyApp.call("GetCapabilites");
if (!capabilites.arguments().contains("body-markup"))
formattedText = QTextDocumentFragment::fromHtml(formattedText).toPlainText();
QVariantMap hints; QVariantMap hints;
hints["image-data"] = icon; hints["image-data"] = icon;
@ -86,9 +94,6 @@ NotificationsManager::postNotification(const mtx::responses::Notification &notif
argumentList << hints; // hints argumentList << hints; // hints
argumentList << (int)-1; // timeout in ms argumentList << (int)-1; // timeout in ms
static QDBusInterface notifyApp("org.freedesktop.Notifications",
"/org/freedesktop/Notifications",
"org.freedesktop.Notifications");
QDBusPendingCall call = notifyApp.asyncCallWithArgumentList("Notify", argumentList); QDBusPendingCall call = notifyApp.asyncCallWithArgumentList("Notify", argumentList);
auto watcher = new QDBusPendingCallWatcher{call, this}; auto watcher = new QDBusPendingCallWatcher{call, this};
connect( connect(