void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-06 15:13:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove not really needed notification capability checks

Browse source 
If the notification daemon doesn't support any of the hints, it will just ignore them
This commit is contained in:
Ilya Fedin 2024-03-11 02:26:16 +04:00 • committed by John Preston
parent 5394717ddc
commit abdfa4f785
1 changed files with 53 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
View file

@ -277,22 +277,18 @@ bool NotificationData::init(
_body = msg.toStdString(); _body = msg.toStdString();
} }
if (HasCapability("actions")) {
_actions.push_back("default"); _actions.push_back("default");
_actions.push_back(tr::lng_open_link(tr::now).toStdString()); _actions.push_back(tr::lng_open_link(tr::now).toStdString());
if (!options.hideMarkAsRead) { if (!options.hideMarkAsRead) {
// icon name according to https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html // icon name according to https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
_actions.push_back("mail-mark-read"); _actions.push_back("mail-mark-read");
_actions.push_back( _actions.push_back(tr::lng_context_mark_read(tr::now).toStdString());
tr::lng_context_mark_read(tr::now).toStdString());
} }
if (HasCapability("inline-reply") if (HasCapability("inline-reply") && !options.hideReplyButton) {
&& !options.hideReplyButton) {
_actions.push_back("inline-reply"); _actions.push_back("inline-reply");
_actions.push_back( _actions.push_back(tr::lng_notification_reply(tr::now).toStdString());
tr::lng_notification_reply(tr::now).toStdString());
_notificationRepliedSignalId = _notificationRepliedSignalId =
_interface.signal_notification_replied().connect([=]( _interface.signal_notification_replied().connect([=](
@ -309,8 +305,7 @@ bool NotificationData::init(
}); });
} }
_actionInvokedSignalId = _interface.signal_action_invoked().connect( _actionInvokedSignalId = _interface.signal_action_invoked().connect([=](
[=](
XdgNotifications::Notifications, XdgNotifications::Notifications,
uint id, uint id,
std::string actionName) { std::string actionName) {
@ -325,8 +320,8 @@ bool NotificationData::init(
}); });
}); });
_activationTokenSignalId = _activationTokenSignalId = _interface.signal_activation_token().connect(
_interface.signal_activation_token().connect([=]( [=](
XdgNotifications::Notifications, XdgNotifications::Notifications,
uint id, uint id,
std::string token) { std::string token) {
@ -334,15 +329,11 @@ bool NotificationData::init(
GLib::setenv("XDG_ACTIVATION_TOKEN", token, true); GLib::setenv("XDG_ACTIVATION_TOKEN", token, true);
} }
}); });
}
if (HasCapability("action-icons")) {
_hints.insert_value("action-icons", GLib::Variant::new_boolean(true)); _hints.insert_value("action-icons", GLib::Variant::new_boolean(true));
}
// suppress system sound if telegram sound activated, // suppress system sound if telegram sound activated,
// otherwise use system sound // otherwise use system sound
if (HasCapability("sound")) {
if (Core::App().settings().soundNotify()) { if (Core::App().settings().soundNotify()) {
_hints.insert_value( _hints.insert_value(
"suppress-sound", "suppress-sound",
@ -353,13 +344,10 @@ bool NotificationData::init(
"sound-name", "sound-name",
GLib::Variant::new_string("message-new-instant")); GLib::Variant::new_string("message-new-instant"));
} }
}
if (HasCapability("x-canonical-append")) {
_hints.insert_value( _hints.insert_value(
"x-canonical-append", "x-canonical-append",
GLib::Variant::new_string("true")); GLib::Variant::new_string("true"));
}
_hints.insert_value("category", GLib::Variant::new_string("im.received")); _hints.insert_value("category", GLib::Variant::new_string("im.received"));