From 1572af3a7177ead07fefe51f914cccfea8adfa8e Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 7 Jun 2022 08:15:09 +0300 Subject: [PATCH] Fixed limits in bubble to show more relevant value in server-side boxes. --- Telegram/SourceFiles/boxes/premium_limits_box.cpp | 10 ++++++---- .../SourceFiles/inline_bots/bot_attach_web_view.cpp | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.cpp b/Telegram/SourceFiles/boxes/premium_limits_box.cpp index 0e5cf03bf..01a71de63 100644 --- a/Telegram/SourceFiles/boxes/premium_limits_box.cpp +++ b/Telegram/SourceFiles/boxes/premium_limits_box.cpp @@ -520,11 +520,12 @@ void ChannelsLimitBox( const auto defaultLimit = Limit(session, "channels_limit_default", 500); const auto premiumLimit = Limit(session, "channels_limit_premium", 1000); + const auto current = (premium ? premiumLimit : defaultLimit); auto text = rpl::combine( tr::lng_channels_limit1( lt_count, - rpl::single(premium ? premiumLimit : defaultLimit), + rpl::single(current), Ui::Text::RichLangValue), (premium ? tr::lng_channels_limit2_final(Ui::Text::RichLangValue) @@ -542,7 +543,7 @@ void ChannelsLimitBox( tr::lng_channels_limit_title(), std::move(text), "channels", - { defaultLimit, defaultLimit, premiumLimit, &st::premiumIconGroups }, + { defaultLimit, current, premiumLimit, &st::premiumIconGroups }, premium, true); @@ -615,11 +616,12 @@ void PublicLinksLimitBox( session, "channels_public_limit_premium", 20); + const auto current = (premium ? premiumLimit : defaultLimit); auto text = rpl::combine( tr::lng_links_limit1( lt_count, - rpl::single(premium ? premiumLimit : defaultLimit), + rpl::single(current), Ui::Text::RichLangValue), (premium ? tr::lng_links_limit2_final(Ui::Text::RichLangValue) @@ -637,7 +639,7 @@ void PublicLinksLimitBox( tr::lng_links_limit_title(), std::move(text), "channels_public", - { defaultLimit, defaultLimit, premiumLimit, &st::premiumIconLinks }, + { defaultLimit, current, premiumLimit, &st::premiumIconLinks }, premium, true); diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp index 8d1374b28..33f2c5ce9 100644 --- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp +++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp @@ -375,7 +375,7 @@ bool PeerMatchesTypes( PeerTypes ParseChooseTypes(const QString &choose) { auto result = PeerTypes(); - for (const auto entry : choose.split(QChar(' '))) { + for (const auto &entry : choose.split(QChar(' '))) { if (entry == "users") { result |= PeerType::User; } else if (entry == "bots") {