From eb1e54c8df2eb87ce47541eb6854e9562c4aedc3 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 22 Dec 2021 00:18:33 +0100
Subject: [PATCH] Make edits replace the previous notification on Linux
---
src/notifications/ManagerLinux.cpp | 33 +++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/notifications/ManagerLinux.cpp b/src/notifications/ManagerLinux.cpp
index a3a2dbe88..29e9a5b7d 100644
--- a/src/notifications/ManagerLinux.cpp
+++ b/src/notifications/ManagerLinux.cpp
@@ -82,8 +82,14 @@ NotificationsManager::postNotification(const mtx::responses::Notification ¬if
const auto event_id = QString::fromStdString(mtx::accessors::event_id(notification.event));
const auto room_name = QString::fromStdString(cache::singleRoomInfo(notification.room_id).name);
- auto postNotif = [this, room_id, event_id, room_name, icon](QString text) {
- emit systemPostNotificationCb(room_id, event_id, room_name, text, icon);
+ const auto replaces_event_id =
+ QString::fromStdString(mtx::accessors::relations(notification.event).replaces().value_or(""));
+
+ auto postNotif = [this, room_id, event_id, room_name, icon, replaces_event_id](QString text) {
+ if (replaces_event_id.isEmpty())
+ emit systemPostNotificationCb(room_id, event_id, room_name, text, icon);
+ else
+ emit systemPostNotificationCb(room_id, replaces_event_id, room_name, text, icon);
};
QString template_ = getMessageTemplate(notification);
@@ -149,12 +155,25 @@ NotificationsManager::systemPostNotification(const QString &room_id,
hints["desktop-entry"] = "nheko";
hints["category"] = "im.received";
+ uint replace_id = 0;
+ if (!event_id.isEmpty()) {
+ for (auto elem = notificationIds.begin(); elem != notificationIds.end(); ++elem) {
+ if (elem.value().roomId != room_id)
+ continue;
+
+ if (elem.value().eventId == event_id) {
+ replace_id = elem.key();
+ break;
+ }
+ }
+ }
+
QList<QVariant> argumentList;
- argumentList << "nheko"; // app_name
- argumentList << (uint)0; // replace_id
- argumentList << ""; // app_icon
- argumentList << roomName; // summary
- argumentList << text; // body
+ argumentList << "nheko"; // app_name
+ argumentList << (uint)replace_id; // replace_id
+ argumentList << ""; // app_icon
+ argumentList << roomName; // summary
+ argumentList << text; // body
// The list of actions has always the action name and then a localized version of that
// action. Currently we just use an empty string for that.
--
GitLab