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

Add support for sound-file notification hint on Linux

Browse source
This commit is contained in:
Ilya Fedin 2025-01-23 13:42:45 +04:00 • committed by John Preston
parent 2b94cffe7e
commit 46cf7db242
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -192,7 +192,7 @@ private:
const not_null<Manager*> _manager; const not_null<Manager*> _manager;
NotificationId _id; NotificationId _id;
//Media::Audio::LocalDiskCache _sounds; Media::Audio::LocalDiskCache _sounds;
Gio::Application _application; Gio::Application _application;
Gio::Notification _notification; Gio::Notification _notification;
@ -222,7 +222,7 @@ NotificationData::NotificationData(
NotificationId id) NotificationId id)
: _manager(manager) : _manager(manager)
, _id(id) , _id(id)
//, _sounds(cWorkingDir() + u"tdata/audio_cache"_q) , _sounds(cWorkingDir() + u"tdata/audio_cache"_q)
, _application(UseGNotification() , _application(UseGNotification()
? Gio::Application::get_default() ? Gio::Application::get_default()
: nullptr) : nullptr)
@ -236,8 +236,7 @@ NotificationData::NotificationData(
bool NotificationData::init(const Info &info) { bool NotificationData::init(const Info &info) {
const auto &title = info.title; const auto &title = info.title;
const auto &subtitle = info.subtitle; const auto &subtitle = info.subtitle;
//const auto sound = info.sound ? info.sound() : Media::Audio::LocalSound();
//const auto path = sound ? _sounds.path(sound) : QString();
if (_application) { if (_application) {
_notification = Gio::Notification::new_( _notification = Gio::Notification::new_(
subtitle.isEmpty() subtitle.isEmpty()
@ -365,18 +364,23 @@ bool NotificationData::init(const Info &info) {
_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,
// otherwise use system sound
if (HasCapability("sound")) { if (HasCapability("sound")) {
if (Core::App().settings().soundNotify()) { const auto sound = info.sound
? info.sound()
: Media::Audio::LocalSound();
const auto path = sound
? _sounds.path(sound).toStdString()
: std::string();
if (!path.empty()) {
_hints.insert_value(
"sound-file",
GLib::Variant::new_string(path));
} else {
_hints.insert_value( _hints.insert_value(
"suppress-sound", "suppress-sound",
GLib::Variant::new_boolean(true)); GLib::Variant::new_boolean(true));
} else {
// sound name according to http://0pointer.de/public/sound-naming-spec.html
_hints.insert_value(
"sound-name",
GLib::Variant::new_string("message-new-instant"));
} }
} }
@ -624,8 +628,9 @@ bool ByDefault() {
"actions", "actions",
// To have quick reply // To have quick reply
"inline-reply", "inline-reply",
}, HasCapability) && ranges::any_of(std::array{
// To not to play sound with Don't Disturb activated // To not to play sound with Don't Disturb activated
// (no, using sound capability is not a way) "sound",
"inhibitions", "inhibitions",
}, HasCapability); }, HasCapability);
} }
@ -963,7 +968,9 @@ bool Manager::doSkipToast() const {
} }
void Manager::doMaybePlaySound(Fn<void()> playSound) { void Manager::doMaybePlaySound(Fn<void()> playSound) {
_private->invokeIfNotInhibited(std::move(playSound)); if (UseGNotification() || !HasCapability("sound")) {
_private->invokeIfNotInhibited(std::move(playSound));
}
} }
void Manager::doMaybeFlashBounce(Fn<void()> flashBounce) { void Manager::doMaybeFlashBounce(Fn<void()> flashBounce) {