RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added initial API support for different boosts lists.

This commit is contained in:
23rd 2023-11-02 15:28:17 +03:00 committed by John Preston
parent 6fcf80c6cf
commit 79b5f7eda9
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Telegram/SourceFiles/api/api_statistics.cpp
View File

@ -533,8 +533,13 @@ rpl::producer<rpl::no_value, QString> Boosts::request() {
}; };
_boostStatus.link = qs(data.vboost_url()); _boostStatus.link = qs(data.vboost_url());
requestBoosts({}, [=](Data::BoostsListSlice &&slice) { using namespace Data;
_boostStatus.firstSlice = std::move(slice); requestBoosts({ .gifts = false }, [=](BoostsListSlice &&slice) {
_boostStatus.firstSliceBoosts = std::move(slice);
requestBoosts({ .gifts = true }, [=](BoostsListSlice &&s) {
_boostStatus.firstSliceGifts = std::move(s);
consumer.put_done();
});
consumer.put_done(); consumer.put_done();
}); });
}).fail([=](const MTP::Error &error) { }).fail([=](const MTP::Error &error) {
@ -553,9 +558,11 @@ void Boosts::requestBoosts(
} }
constexpr auto kTlFirstSlice = tl::make_int(kFirstSlice); constexpr auto kTlFirstSlice = tl::make_int(kFirstSlice);
constexpr auto kTlLimit = tl::make_int(kLimit); constexpr auto kTlLimit = tl::make_int(kLimit);
const auto gifts = token.gifts;
_requestId = _api.request(MTPpremium_GetBoostsList( _requestId = _api.request(MTPpremium_GetBoostsList(
// MTP_flags(MTPpremium_GetBoostsList::Flag::f_gifts), gifts
MTP_flags(0), ? MTP_flags(MTPpremium_GetBoostsList::Flag::f_gifts)
: MTP_flags(0),
_peer->input, _peer->input,
MTP_string(token.next), MTP_string(token.next),
token.next.isEmpty() ? kTlFirstSlice : kTlLimit token.next.isEmpty() ? kTlFirstSlice : kTlLimit
@ -596,12 +603,13 @@ void Boosts::requestBoosts(
} }
done(Data::BoostsListSlice{ done(Data::BoostsListSlice{
.list = std::move(list), .list = std::move(list),
.total = data.vcount().v, .multipliedTotal = data.vcount().v,
.allLoaded = (data.vcount().v == data.vboosts().v.size()), .allLoaded = (data.vcount().v == data.vboosts().v.size()),
.token = Data::BoostsListSlice::OffsetToken{ .token = Data::BoostsListSlice::OffsetToken{
data.vnext_offset() .next = data.vnext_offset()
? qs(*data.vnext_offset()) ? qs(*data.vnext_offset())
: QString() : QString(),
.gifts = gifts,
}, },
}); });
}).fail([=] { }).fail([=] {

6
Telegram/SourceFiles/data/data_boosts.h
View File

@ -42,16 +42,18 @@ struct Boost final {
struct BoostsListSlice final { struct BoostsListSlice final {
struct OffsetToken final { struct OffsetToken final {
QString next; QString next;
bool gifts = false;
}; };
std::vector<Boost> list; std::vector<Boost> list;
int total = 0; int multipliedTotal = 0;
bool allLoaded = false; bool allLoaded = false;
OffsetToken token; OffsetToken token;
}; };
struct BoostStatus final { struct BoostStatus final {
BoostsOverview overview; BoostsOverview overview;
BoostsListSlice firstSlice; BoostsListSlice firstSliceBoosts;
BoostsListSlice firstSliceGifts;
QString link; QString link;
}; };

6
Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.cpp
View File

@ -271,7 +271,7 @@ void InnerWidget::fill() {
::Settings::AddDivider(inner); ::Settings::AddDivider(inner);
::Settings::AddSkip(inner); ::Settings::AddSkip(inner);
if (status.firstSlice.total > 0) { if (status.firstSliceBoosts.multipliedTotal > 0) {
auto boostClicked = [=](const Data::Boost &boost) { auto boostClicked = [=](const Data::Boost &boost) {
if (!boost.giftCodeLink.slug.isEmpty()) { if (!boost.giftCodeLink.slug.isEmpty()) {
ResolveGiftCode(_controller, boost.giftCodeLink.slug); ResolveGiftCode(_controller, boost.giftCodeLink.slug);
@ -294,10 +294,10 @@ void InnerWidget::fill() {
header->setTitle(tr::lng_boosts_list_title( header->setTitle(tr::lng_boosts_list_title(
tr::now, tr::now,
lt_count, lt_count,
status.firstSlice.total)); status.firstSliceBoosts.total));
header->setSubTitle({}); header->setSubTitle({});
Statistics::AddBoostsList( Statistics::AddBoostsList(
status.firstSlice, status.firstSliceBoosts,
inner, inner,
std::move(boostClicked), std::move(boostClicked),
_peer, _peer,

2
Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
View File

@ -757,7 +757,7 @@ void AddBoostsList(
BoostCallback boostClickedCallback, BoostCallback boostClickedCallback,
not_null<PeerData*> peer, not_null<PeerData*> peer,
rpl::producer<QString> title) { rpl::producer<QString> title) {
const auto max = firstSlice.total; const auto max = firstSlice.multipliedTotal;
struct State final { struct State final {
State(BoostsDescriptor d) : controller(std::move(d)) { State(BoostsDescriptor d) : controller(std::move(d)) {
} }