mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-02 23:45:44 +00:00
Code Issues Releases Wiki Activity

Excluded non-today birthdays from reminder in top bar from dialogs.

Browse Source
This commit is contained in:
23rd
2025-04-18 12:39:52 +03:00
committed by John Preston
parent 868c7b170e
commit d1898b9a0b
3 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Telegram/SourceFiles/data/data_session.cpp
View File

@@ -85,6 +85,7 @@ namespace Data {
namespace {
using ViewElement = HistoryView::Element;
using UserIds = std::vector<UserId>;
// s: box 100x100
// m: box 320x320
@@ -4985,7 +4986,7 @@ void Session::clearLocalStorage() {
_bigFileCache->clear();
}
rpl::producer<std::vector<UserId>> Session::contactBirthdays(bool force) {
rpl::producer<UserIds> Session::contactBirthdays(bool force) {
if ((_contactBirthdaysLastDayRequest != -1)
&& (_contactBirthdaysLastDayRequest == QDate::currentDate().day())
&& !force) {
@@ -5002,7 +5003,8 @@ rpl::producer<std::vector<UserId>> Session::contactBirthdays(bool force) {
).done([=](const MTPcontacts_ContactBirthdays &result) {
_contactBirthdaysRequestId = 0;
_contactBirthdaysLastDayRequest = QDate::currentDate().day();
auto users = std::vector<UserId>();
auto users = UserIds();
auto today = UserIds();
Session::processUsers(result.data().vusers());
for (const auto &tlContact : result.data().vcontacts().v) {
const auto peerId = tlContact.data().vcontact_id().v;
@@ -5012,15 +5014,20 @@ rpl::producer<std::vector<UserId>> Session::contactBirthdays(bool force) {
data.vday().v,
data.vmonth().v,
data.vyear().value_or_empty()));
if (Data::IsBirthdayToday(user->birthday())) {
today.push_back(peerToUser(user->id));
}
users.push_back(peerToUser(user->id));
}
}
_contactBirthdays = std::move(users);
_contactBirthdaysToday = std::move(today);
consumer.put_next_copy(_contactBirthdays);
}).fail([=](const MTP::Error &error) {
_contactBirthdaysRequestId = 0;
_contactBirthdaysLastDayRequest = QDate::currentDate().day();
_contactBirthdays = {};
_contactBirthdaysToday = {};
consumer.put_next({});
}).send();
@@ -5028,7 +5035,7 @@ rpl::producer<std::vector<UserId>> Session::contactBirthdays(bool force) {
};
}
std::optional<std::vector<UserId>> Session::knownContactBirthdays() const {
std::optional<UserIds> Session::knownContactBirthdays() const {
if ((_contactBirthdaysLastDayRequest == -1)
|| (_contactBirthdaysLastDayRequest != QDate::currentDate().day())) {
return std::nullopt;
@@ -5036,4 +5043,12 @@ std::optional<std::vector<UserId>> Session::knownContactBirthdays() const {
return _contactBirthdays;
}
std::optional<UserIds> Session::knownBirthdaysToday() const {
if ((_contactBirthdaysLastDayRequest == -1)
|| (_contactBirthdaysLastDayRequest != QDate::currentDate().day())) {
return std::nullopt;
}
return _contactBirthdaysToday;
}
} // namespace Data