RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-04-01 23:00:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix custom notification sounds for all chats.

Browse Source
This commit is contained in:
John Preston 2022-05-03 16:23:39 +04:00
parent e3f65d2346
commit 8b89cfc4cb
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Telegram/SourceFiles/data/notify/data_notify_settings.cpp
View File

@ -161,25 +161,7 @@ void NotifySettings::updateLocal(not_null<PeerData*> peer) {
} else { } else {
_mutedPeers.erase(peer); _mutedPeers.erase(peer);
} }
cacheSound(peer->notifySound());
if (const auto sound = peer->notifySound(); sound && sound->id) {
if (const auto doc = _owner->document(sound->id); !doc->isNull()) {
cacheSound(doc);
} else {
_ringtones.pendingIds.push_back(sound->id);
if (!_ringtones.pendingLifetime) {
// Not requested yet.
_owner->session().api().ringtones().listUpdates(
) | rpl::start_with_next([=] {
for (const auto id : base::take(_ringtones.pendingIds)) {
cacheSound(id);
}
_ringtones.pendingLifetime.destroy();
}, _ringtones.pendingLifetime);
_owner->session().api().ringtones().requestList();
}
}
}
} }
void NotifySettings::cacheSound(DocumentId id) { void NotifySettings::cacheSound(DocumentId id) {
@ -196,6 +178,28 @@ void NotifySettings::cacheSound(not_null<DocumentData*> document) {
document->save(Data::FileOriginRingtones(), QString()); document->save(Data::FileOriginRingtones(), QString());
} }
void NotifySettings::cacheSound(const std::optional<NotifySound> &sound) {
if (!sound || !sound->id) {
return;
} else if (const auto doc = _owner->document(sound->id); !doc->isNull()) {
cacheSound(doc);
return;
}
_ringtones.pendingIds.push_back(sound->id);
if (_ringtones.pendingLifetime) {
return;
}
// Not requested yet.
_owner->session().api().ringtones().listUpdates(
) | rpl::start_with_next([=] {
for (const auto id : base::take(_ringtones.pendingIds)) {
cacheSound(id);
}
_ringtones.pendingLifetime.destroy();
}, _ringtones.pendingLifetime);
_owner->session().api().ringtones().requestList();
}
void NotifySettings::updateLocal(DefaultNotify type) { void NotifySettings::updateLocal(DefaultNotify type) {
defaultValue(type).updates.fire({}); defaultValue(type).updates.fire({});
@ -220,6 +224,7 @@ void NotifySettings::updateLocal(DefaultNotify type) {
_owner->enumerateBroadcasts(callback); _owner->enumerateBroadcasts(callback);
break; break;
} }
cacheSound(defaultValue(type).settings.sound());
} }
std::shared_ptr<DocumentMedia> NotifySettings::lookupRingtone( std::shared_ptr<DocumentMedia> NotifySettings::lookupRingtone(

2
Telegram/SourceFiles/data/notify/data_notify_settings.h
View File

@ -71,6 +71,8 @@ private:
rpl::event_stream<> updates; rpl::event_stream<> updates;
}; };
void cacheSound(const std::optional<NotifySound> &sound);
[[nodiscard]] bool isMuted( [[nodiscard]] bool isMuted(
not_null<const PeerData*> peer, not_null<const PeerData*> peer,
crl::time *changesIn) const; crl::time *changesIn) const;