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

Make edits replace the previous notification on Linux

This commit is contained in:
Nicolas Werner 2021-12-22 00:18:33 +01:00
parent bccab87a5c
commit eb1e54c8df
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/notifications/ManagerLinux.cpp
View File

@ -82,8 +82,14 @@ NotificationsManager::postNotification(const mtx::responses::Notification &notif
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.