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

Added refresh of top bar suggestion on day changed for birthdays.

Browse source
This commit is contained in:
23rd 2025-05-15 09:21:29 +03:00
parent 606dfd29d3
commit ba31bbace8
4 changed files with 49 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Telegram/SourceFiles/boxes/star_gift_box.cpp
View file

@ -3629,10 +3629,7 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
void ChooseStarGiftRecipient(
not_null<Window::SessionController*> window) {
const auto session = &window->session();
const auto lifetime = std::make_shared<rpl::lifetime>();
session->promoSuggestions().contactBirthdays(
) | rpl::start_with_next(crl::guard(session, [=] {
lifetime->destroy();
session->promoSuggestions().requestContactBirthdays([=] {
auto controller = std::make_unique<Controller>(
session,
[=](not_null<PeerData*> peer, PickType type) {
@ -3657,7 +3654,7 @@ void ChooseStarGiftRecipient(
window->show(
Box<PeerListBox>(std::move(controller), std::move(initBox)),
LayerOption::KeepOther);
}), *lifetime);
});
}
void ShowStarGiftBox(

88
Telegram/SourceFiles/data/components/promo_suggestions.cpp
View file

@ -134,9 +134,15 @@ void PromoSuggestions::refreshTopPromotion() {
changedCustom = true;
}
const auto changedContactBirthdaysLastDayRequest =
_contactBirthdaysLastDayRequest != -1
&& _contactBirthdaysLastDayRequest
!= QDate::currentDate().day();
if (changedPendingSuggestions
|| changedDismissedSuggestions
|| changedCustom) {
|| changedCustom
|| changedContactBirthdaysLastDayRequest) {
_refreshed.fire({});
}
});
@ -234,58 +240,52 @@ std::optional<CustomSuggestion> PromoSuggestions::custom() const {
return _custom;
}
rpl::producer<UserIds> PromoSuggestions::contactBirthdays(bool force) {
void PromoSuggestions::requestContactBirthdays(Fn<void()> done, bool force) {
if ((_contactBirthdaysLastDayRequest != -1)
&& (_contactBirthdaysLastDayRequest == QDate::currentDate().day())
&& !force) {
return rpl::single(_contactBirthdays);
return done();
}
if (_contactBirthdaysRequestId) {
_session->api().request(_contactBirthdaysRequestId).cancel();
}
return [=](auto consumer) {
auto lifetime = rpl::lifetime();
_contactBirthdaysRequestId = _session->api().request(
MTPcontacts_GetBirthdays()
).done([=](const MTPcontacts_ContactBirthdays &result) {
_contactBirthdaysRequestId = 0;
_contactBirthdaysLastDayRequest = QDate::currentDate().day();
auto users = UserIds();
auto today = UserIds();
_session->data().processUsers(result.data().vusers());
for (const auto &tlContact : result.data().vcontacts().v) {
const auto peerId = tlContact.data().vcontact_id().v;
if (const auto user = _session->data().user(peerId)) {
const auto &data = tlContact.data().vbirthday().data();
user->setBirthday(Data::Birthday(
data.vday().v,
data.vmonth().v,
data.vyear().value_or_empty()));
if (user->isSelf()
|| user->isInaccessible()
|| user->isBlocked()) {
continue;
}
if (Data::IsBirthdayToday(user->birthday())) {
today.push_back(peerToUser(user->id));
}
users.push_back(peerToUser(user->id));
_contactBirthdaysRequestId = _session->api().request(
MTPcontacts_GetBirthdays()
).done([=](const MTPcontacts_ContactBirthdays &result) {
_contactBirthdaysRequestId = 0;
_contactBirthdaysLastDayRequest = QDate::currentDate().day();
auto users = UserIds();
auto today = UserIds();
_session->data().processUsers(result.data().vusers());
for (const auto &tlContact : result.data().vcontacts().v) {
const auto peerId = tlContact.data().vcontact_id().v;
if (const auto user = _session->data().user(peerId)) {
const auto &data = tlContact.data().vbirthday().data();
user->setBirthday(Data::Birthday(
data.vday().v,
data.vmonth().v,
data.vyear().value_or_empty()));
if (user->isSelf()
|| user->isInaccessible()
|| user->isBlocked()) {
continue;
}
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();
return lifetime;
};
}
_contactBirthdays = std::move(users);
_contactBirthdaysToday = std::move(today);
done();
}).fail([=](const MTP::Error &error) {
_contactBirthdaysRequestId = 0;
_contactBirthdaysLastDayRequest = QDate::currentDate().day();
_contactBirthdays = {};
_contactBirthdaysToday = {};
done();
}).send();
}
std::optional<UserIds> PromoSuggestions::knownContactBirthdays() const {

3
Telegram/SourceFiles/data/components/promo_suggestions.h
View file

@ -45,8 +45,7 @@ public:
rpl::producer<> value() const;
// Create rpl::producer<> refreshed() const; on memand.
[[nodiscard]] rpl::producer<std::vector<UserId>> contactBirthdays(
bool force = false);
void requestContactBirthdays(Fn<void()> done, bool force = false);
[[nodiscard]] auto knownContactBirthdays() const
-> std::optional<std::vector<UserId>>;
[[nodiscard]] auto knownBirthdaysToday() const

5
Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
View file

@ -240,8 +240,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
return;
} else if (session->premiumCanBuy()
&& promo->current(kSugBirthdayContacts.utf8())) {
promo->contactBirthdays(
) | rpl::start_with_next(crl::guard(content, [=] {
promo->requestContactBirthdays(crl::guard(content, [=] {
const auto users = promo->knownBirthdaysToday().value_or(
std::vector<UserId>());
if (users.empty()) {
@ -369,7 +368,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
state->desiredWrapToggle.force_assign(
Toggle{ true, anim::type::normal });
}), state->giftsLifetime);
}));
return;
} else if (promo->current(kSugSetBirthday.utf8())
&& !Data::IsBirthdayToday(session->user()->birthday())) {