diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp index 6ff4aa130..947b48297 100644 --- a/Telegram/SourceFiles/api/api_premium.cpp +++ b/Telegram/SourceFiles/api/api_premium.cpp @@ -39,9 +39,9 @@ namespace { }; } -[[nodiscard]] Data::SubscriptionOptions GiftCodesFromTL( +[[nodiscard]] Data::PremiumSubscriptionOptions GiftCodesFromTL( const QVector &tlOptions) { - auto options = SubscriptionOptionsFromTL(tlOptions); + auto options = PremiumSubscriptionOptionsFromTL(tlOptions); for (auto i = 0; i < options.size(); i++) { const auto &tlOption = tlOptions[i].data(); const auto perUserText = Ui::FillAmountAndCurrency( @@ -143,7 +143,7 @@ void Premium::reloadPromo() { const auto &data = result.data(); _session->data().processUsers(data.vusers()); - _subscriptionOptions = SubscriptionOptionsFromTL( + _subscriptionOptions = PremiumSubscriptionOptionsFromTL( data.vperiod_options().v); for (const auto &option : data.vperiod_options().v) { if (option.data().vmonths().v == 1) { @@ -372,7 +372,7 @@ void Premium::resolveGiveawayInfo( }).send(); } -const Data::SubscriptionOptions &Premium::subscriptionOptions() const { +const Data::PremiumSubscriptionOptions &Premium::subscriptionOptions() const { return _subscriptionOptions; } @@ -547,7 +547,7 @@ Payments::InvoicePremiumGiftCode PremiumGiftCodeOptions::invoice( }; } -Data::SubscriptionOptions PremiumGiftCodeOptions::options(int amount) { +Data::PremiumSubscriptionOptions PremiumGiftCodeOptions::options(int amount) { const auto it = _subscriptionOptions.find(amount); if (it != end(_subscriptionOptions)) { return it->second; diff --git a/Telegram/SourceFiles/api/api_premium.h b/Telegram/SourceFiles/api/api_premium.h index 83423fcd2..e05ddfaf7 100644 --- a/Telegram/SourceFiles/api/api_premium.h +++ b/Telegram/SourceFiles/api/api_premium.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "data/data_subscription_option.h" +#include "data/data_premium_subscription_option.h" #include "mtproto/sender.h" class History; @@ -106,7 +106,7 @@ public: Fn done); [[nodiscard]] auto subscriptionOptions() const - -> const Data::SubscriptionOptions &; + -> const Data::PremiumSubscriptionOptions &; [[nodiscard]] rpl::producer<> somePremiumRequiredResolved() const; void resolvePremiumRequired(not_null user); @@ -156,7 +156,7 @@ private: MsgId _giveawayInfoMessageId = 0; Fn _giveawayInfoDone; - Data::SubscriptionOptions _subscriptionOptions; + Data::PremiumSubscriptionOptions _subscriptionOptions; rpl::event_stream<> _somePremiumRequiredResolved; base::flat_set> _resolvePremiumRequiredUsers; @@ -170,7 +170,7 @@ public: PremiumGiftCodeOptions(not_null peer); [[nodiscard]] rpl::producer request(); - [[nodiscard]] Data::SubscriptionOptions options(int amount); + [[nodiscard]] Data::PremiumSubscriptionOptions options(int amount); [[nodiscard]] const std::vector &availablePresets() const; [[nodiscard]] int monthsFromPreset(int monthsIndex); [[nodiscard]] Payments::InvoicePremiumGiftCode invoice( @@ -200,8 +200,9 @@ private: int quantity = 0; }; using Amount = int; + using PremiumSubscriptionOptions = Data::PremiumSubscriptionOptions; const not_null _peer; - base::flat_map _subscriptionOptions; + base::flat_map _subscriptionOptions; struct { std::vector months; std::vector totalCosts; diff --git a/Telegram/SourceFiles/api/api_premium_option.cpp b/Telegram/SourceFiles/api/api_premium_option.cpp index 135082e94..bd3056a75 100644 --- a/Telegram/SourceFiles/api/api_premium_option.cpp +++ b/Telegram/SourceFiles/api/api_premium_option.cpp @@ -13,7 +13,7 @@ namespace Api { constexpr auto kDiscountDivider = 1.; -Data::SubscriptionOption CreateSubscriptionOption( +Data::PremiumSubscriptionOption CreateSubscriptionOption( int months, int monthlyAmount, int64 amount, diff --git a/Telegram/SourceFiles/api/api_premium_option.h b/Telegram/SourceFiles/api/api_premium_option.h index 5758a8cb8..afe66ac4a 100644 --- a/Telegram/SourceFiles/api/api_premium_option.h +++ b/Telegram/SourceFiles/api/api_premium_option.h @@ -7,11 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "data/data_subscription_option.h" +#include "data/data_premium_subscription_option.h" namespace Api { -[[nodiscard]] Data::SubscriptionOption CreateSubscriptionOption( +[[nodiscard]] Data::PremiumSubscriptionOption CreateSubscriptionOption( int months, int monthlyAmount, int64 amount, @@ -19,22 +19,22 @@ namespace Api { const QString &botUrl); template -[[nodiscard]] Data::SubscriptionOptions SubscriptionOptionsFromTL( - const QVector