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

Fixed limits in bubble to show more relevant value in server-side boxes.

Browse source
This commit is contained in:
23rd 2022-06-07 08:15:09 +03:00
parent 9e9a269439
commit 1572af3a71
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Telegram/SourceFiles/boxes/premium_limits_box.cpp
View file

@ -520,11 +520,12 @@ void ChannelsLimitBox(
const auto defaultLimit = Limit(session, "channels_limit_default", 500); const auto defaultLimit = Limit(session, "channels_limit_default", 500);
const auto premiumLimit = Limit(session, "channels_limit_premium", 1000); const auto premiumLimit = Limit(session, "channels_limit_premium", 1000);
const auto current = (premium ? premiumLimit : defaultLimit);
auto text = rpl::combine( auto text = rpl::combine(
tr::lng_channels_limit1( tr::lng_channels_limit1(
lt_count, lt_count,
rpl::single(premium ? premiumLimit : defaultLimit), rpl::single(current),
Ui::Text::RichLangValue), Ui::Text::RichLangValue),
(premium (premium
? tr::lng_channels_limit2_final(Ui::Text::RichLangValue) ? tr::lng_channels_limit2_final(Ui::Text::RichLangValue)
@ -542,7 +543,7 @@ void ChannelsLimitBox(
tr::lng_channels_limit_title(), tr::lng_channels_limit_title(),
std::move(text), std::move(text),
"channels", "channels",
{ defaultLimit, defaultLimit, premiumLimit, &st::premiumIconGroups }, { defaultLimit, current, premiumLimit, &st::premiumIconGroups },
premium, premium,
true); true);
@ -615,11 +616,12 @@ void PublicLinksLimitBox(
session, session,
"channels_public_limit_premium", "channels_public_limit_premium",
20); 20);
const auto current = (premium ? premiumLimit : defaultLimit);
auto text = rpl::combine( auto text = rpl::combine(
tr::lng_links_limit1( tr::lng_links_limit1(
lt_count, lt_count,
rpl::single(premium ? premiumLimit : defaultLimit), rpl::single(current),
Ui::Text::RichLangValue), Ui::Text::RichLangValue),
(premium (premium
? tr::lng_links_limit2_final(Ui::Text::RichLangValue) ? tr::lng_links_limit2_final(Ui::Text::RichLangValue)
@ -637,7 +639,7 @@ void PublicLinksLimitBox(
tr::lng_links_limit_title(), tr::lng_links_limit_title(),
std::move(text), std::move(text),
"channels_public", "channels_public",
{ defaultLimit, defaultLimit, premiumLimit, &st::premiumIconLinks }, { defaultLimit, current, premiumLimit, &st::premiumIconLinks },
premium, premium,
true); true);

2
Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
View file

@ -375,7 +375,7 @@ bool PeerMatchesTypes(
PeerTypes ParseChooseTypes(const QString &choose) { PeerTypes ParseChooseTypes(const QString &choose) {
auto result = PeerTypes(); auto result = PeerTypes();
for (const auto entry : choose.split(QChar(' '))) { for (const auto &entry : choose.split(QChar(' '))) {
if (entry == "users") { if (entry == "users") {
result |= PeerType::User; result |= PeerType::User;
} else if (entry == "bots") { } else if (entry == "bots") {