mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Use sound in native notifications on macOS.

Browse Source
This commit is contained in:
John Preston
2025-01-21 14:24:43 +04:00
parent 37c7b0c6d1
commit aa0c56876c
6 changed files with 70 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/window/notifications_manager.cpp
View File

@@ -118,8 +118,9 @@ constexpr auto kSystemAlertDuration = crl::time(0);
|| notifySettings->muteUnknown(from));
const auto fromAlert = !fromUnknown
&& !notifySettings->isMuted(from);
return (threadAlert || fromAlert)
? notifySettings->sound(thread).id
const auto &sound = notifySettings->sound(thread);
return ((threadAlert || fromAlert) && !sound.none)
? sound.id
: std::optional<DocumentId>();
}
@@ -1252,13 +1253,13 @@ void NativeManager::doShowNotification(NotificationFields &&fields) {
// #TODO optimize
auto userpicView = item->history()->peer->createUserpicView();
const auto owner = &item->history()->owner();
const auto soundPath = fields.soundId ? [=, id = *fields.soundId] {
return _localSoundCache.path(id, [=] {
const auto sound = fields.soundId ? [=, id = *fields.soundId] {
return _localSoundCache.sound(id, [=] {
return Core::App().notifications().lookupSoundBytes(owner, id);
}, [=] {
return Core::App().notifications().lookupSoundBytes(owner, 0);
});
} : Fn<QString()>();
} : Fn<NotificationSound()>();
doShowNativeNotification({
.peer = item->history()->peer,
.topicRootId = item->topicRootId(),
@@ -1266,7 +1267,7 @@ void NativeManager::doShowNotification(NotificationFields &&fields) {
.title = scheduled ? WrapFromScheduled(fullTitle) : fullTitle,
.subtitle = subtitle,
.message = text,
.soundPath = soundPath,
.sound = sound,
.options = options,
}, userpicView);
}