d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-23 19:38:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Connect to the notifications interface once it becomes available

Browse source 
Currently does not work and not fix #693, because the signal isn't
actually emitted, if the service is already available...
This commit is contained in:
Nicolas Werner 2023-06-09 00:37:02 +02:00
parent 8259891a42
commit 81305c3aef
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 55 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/notifications/Manager.h
View file

@ -14,6 +14,7 @@
#if defined(NHEKO_DBUS_SYS)
#include <QtDBus/QDBusArgument>
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusServiceWatcher>
#endif
struct roomEventId
@ -58,7 +59,8 @@ public:
#endif
private:
QDBusInterface dbus;
std::optional<QDBusInterface> dbus;
QDBusServiceWatcher watcher;
void systemPostNotification(const QString &room_id,
const QString &event_id,
@ -67,8 +69,8 @@ private:
const QImage &icon);
void closeNotification(uint id);
const bool hasMarkup_;
const bool hasImages_;
bool hasMarkup_ = false;
bool hasImages_ = false;
#endif
#if defined(Q_OS_MACOS)

79
src/notifications/ManagerLinux.cpp
View file

@ -22,6 +22,7 @@
#include "Cache.h"
#include "EventAccessors.h"
#include "Logging.h"
#include "MxcImageProvider.h"
#include "UserSettingsPage.h"
#include "Utils.h"
@ -29,47 +30,45 @@
NotificationsManager::NotificationsManager(QObject *parent)
: QObject(parent)
, dbus(QStringLiteral("org.freedesktop.Notifications"),
QStringLiteral("/org/freedesktop/Notifications"),
QStringLiteral("org.freedesktop.Notifications"),
QDBusConnection::sessionBus(),
this)
, hasMarkup_{std::invoke([this]() -> bool {
auto caps = dbus.call("GetCapabilities").arguments();
for (const auto &x : qAsConst(caps))
if (x.toStringList().contains("body-markup"))
return true;
return false;
})}
, hasImages_{std::invoke([this]() -> bool {
auto caps = dbus.call("GetCapabilities").arguments();
for (const auto &x : qAsConst(caps))
if (x.toStringList().contains("body-images"))
return true;
return false;
})}
, watcher(this)
{
qDBusRegisterMetaType<QImage>();
// clang-format off
QDBusConnection::sessionBus().connect(QStringLiteral("org.freedesktop.Notifications"),
connect(&watcher, &QDBusServiceWatcher::serviceRegistered, this, [this](QString) {
dbus.emplace(QStringLiteral("org.freedesktop.Notifications"),
QStringLiteral("/org/freedesktop/Notifications"),
QStringLiteral("org.freedesktop.Notifications"),
QStringLiteral("ActionInvoked"),
this,
SLOT(actionInvoked(uint,QString)));
QDBusConnection::sessionBus().connect(QStringLiteral("org.freedesktop.Notifications"),
QStringLiteral("/org/freedesktop/Notifications"),
QStringLiteral("org.freedesktop.Notifications"),
QStringLiteral("NotificationClosed"),
QDBusConnection::sessionBus(),
this);
connect(
&*dbus, SIGNAL(ActionInvoked(uint, QString)), this, SLOT(actionInvoked(uint, QString)));
connect(&*dbus,
SIGNAL(NotificationClosed(uint, uint)),
this,
SLOT(notificationClosed(uint, uint)));
QDBusConnection::sessionBus().connect(QStringLiteral("org.freedesktop.Notifications"),
QStringLiteral("/org/freedesktop/Notifications"),
QStringLiteral("org.freedesktop.Notifications"),
QStringLiteral("NotificationReplied"),
connect(&*dbus,
SIGNAL(NotificationReplied(uint, QString)),
this,
SLOT(notificationReplied(uint, QString)));
hasMarkup_ = false;
hasImages_ = false;
auto caps = dbus->call("GetCapabilities").arguments();
for (const auto &x : qAsConst(caps)) {
if (x.toStringList().contains("body-markup"))
hasMarkup_ = true;
if (x.toStringList().contains("body-images"))
hasImages_ = true;
}
});
watcher.setWatchMode(QDBusServiceWatcher::WatchForRegistration);
watcher.setConnection(QDBusConnection::sessionBus());
watcher.addWatchedService(QStringLiteral("org.freedesktop.Notifications"));
// clang-format off
// clang-format on
connect(this,
@ -155,6 +154,12 @@ NotificationsManager::systemPostNotification(const QString &room_id,
const QString &text,
const QImage &icon)
{
if (!dbus) {
nhlog::ui()->warn(
"Dropping notification because we could not connect to the dbus interface.");
return;
}
QVariantMap hints;
hints[QStringLiteral("image-data")] = icon;
hints[QStringLiteral("sound-name")] = "message-new-instant";
@ -196,7 +201,7 @@ NotificationsManager::systemPostNotification(const QString &room_id,
argumentList << hints; // hints
argumentList << (int)-1; // timeout in ms
QDBusPendingCall call = dbus.asyncCallWithArgumentList(QStringLiteral("Notify"), argumentList);
QDBusPendingCall call = dbus->asyncCallWithArgumentList(QStringLiteral("Notify"), argumentList);
auto watcher = new QDBusPendingCallWatcher{call, this};
connect(
watcher, &QDBusPendingCallWatcher::finished, this, [watcher, this, room_id, event_id]() {
@ -212,7 +217,13 @@ NotificationsManager::systemPostNotification(const QString &room_id,
void
NotificationsManager::closeNotification(uint id)
{
auto call = dbus.asyncCall(QStringLiteral("CloseNotification"), (uint)id); // replace_id
if (!dbus) {
nhlog::ui()->warn(
"Not removing notification because we could not connect to the dbus interface.");
return;
}
auto call = dbus->asyncCall(QStringLiteral("CloseNotification"), (uint)id); // replace_id
auto watcher = new QDBusPendingCallWatcher{call, this};
connect(watcher, &QDBusPendingCallWatcher::finished, this, [watcher]() {
if (watcher->reply().type() == QDBusMessage::ErrorMessage) {