ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix prepaid giveaway

Browse Source
This commit is contained in:
Ilya Laktyushin 2024-09-03 19:15:41 +04:00
parent ca9898eb83
commit f620d084bc
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/Telegram-iOS/en.lproj/Localizable.strings
View File

@ -12900,11 +12900,13 @@ Sorry for the inconvenience.";
"Stats.Boosts.Stars_1" = "%@ Star"; "Stats.Boosts.Stars_1" = "%@ Star";
"Stats.Boosts.Stars_any" = "%@ Stars"; "Stats.Boosts.Stars_any" = "%@ Stars";
"Stats.Boosts.StarsBoosts" = "12-month boosts"; "Stats.Boosts.StarsWinners_1" = "for %@ winner";
"Stats.Boosts.StarsWinners_any" = "among %@ winners";
"BoostGift.PrepaidGiveaway.StarsCount_1" = "%@ Star"; "BoostGift.PrepaidGiveaway.StarsCount_1" = "%@ Star";
"BoostGift.PrepaidGiveaway.StarsCount_any" = "%@ Stars"; "BoostGift.PrepaidGiveaway.StarsCount_any" = "%@ Stars";
"BoostGift.PrepaidGiveaway.StarsBoosts" = "12-month boosts"; "BoostGift.PrepaidGiveaway.StarsWinners_1" = "for %@ winner";
"BoostGift.PrepaidGiveaway.StarsWinners_any" = "among %@ winners";
"Stars.Transaction.Giveaway.Boost.Stars_1" = "%@ Star"; "Stars.Transaction.Giveaway.Boost.Stars_1" = "%@ Star";
"Stars.Transaction.Giveaway.Boost.Stars_any" = "%@ Stars"; "Stars.Transaction.Giveaway.Boost.Stars_any" = "%@ Stars";

11
submodules/PremiumUI/Sources/CreateGiveawayController.swift
View File

@ -779,13 +779,13 @@ private func createGiveawayControllerEntries(
text = presentationData.strings.BoostGift_PrepaidGiveawayMonths("\(months)").string text = presentationData.strings.BoostGift_PrepaidGiveawayMonths("\(months)").string
case let .stars(stars, _): case let .stars(stars, _):
title = presentationData.strings.BoostGift_PrepaidGiveaway_StarsCount(Int32(stars)) title = presentationData.strings.BoostGift_PrepaidGiveaway_StarsCount(Int32(stars))
text = presentationData.strings.BoostGift_PrepaidGiveaway_StarsBoosts text = presentationData.strings.BoostGift_PrepaidGiveaway_StarsWinners(prepaidGiveaway.quantity)
} }
entries.append(.prepaid(presentationData.theme, title, text, prepaidGiveaway)) entries.append(.prepaid(presentationData.theme, title, text, prepaidGiveaway))
} }
var starsPerUser: Int64 = 0 var starsPerUser: Int64 = 0
if case .starsGiveaway = state.mode, !starsGiveawayOptions.isEmpty { if case .generic = subject, case .starsGiveaway = state.mode, !starsGiveawayOptions.isEmpty {
let selectedOption = starsGiveawayOptions.first(where: { $0.giveawayOption.count == state.stars })! let selectedOption = starsGiveawayOptions.first(where: { $0.giveawayOption.count == state.stars })!
entries.append(.starsHeader(presentationData.theme, presentationData.strings.BoostGift_Stars_Title.uppercased(), presentationData.strings.BoostGift_Stars_Boosts(selectedOption.giveawayOption.yearlyBoosts).uppercased())) entries.append(.starsHeader(presentationData.theme, presentationData.strings.BoostGift_Stars_Title.uppercased(), presentationData.strings.BoostGift_Stars_Boosts(selectedOption.giveawayOption.yearlyBoosts).uppercased()))
@ -868,6 +868,8 @@ private func createGiveawayControllerEntries(
switch state.mode { switch state.mode {
case .giveaway, .starsGiveaway: case .giveaway, .starsGiveaway:
if case .starsGiveaway = state.mode { if case .starsGiveaway = state.mode {
if case .prepaid = subject {
} else {
var values: [Int32] = [1] var values: [Int32] = [1]
if let selectedOption = starsGiveawayOptions.first(where: { $0.giveawayOption.count == state.stars }) { if let selectedOption = starsGiveawayOptions.first(where: { $0.giveawayOption.count == state.stars }) {
values = selectedOption.giveawayOption.winners.map { $0.users } values = selectedOption.giveawayOption.winners.map { $0.users }
@ -877,6 +879,7 @@ private func createGiveawayControllerEntries(
entries.append(.subscriptions(presentationData.theme, state.winners, values)) entries.append(.subscriptions(presentationData.theme, state.winners, values))
entries.append(.subscriptionsInfo(presentationData.theme, presentationData.strings.BoostGift_Stars_WinnersInfo)) entries.append(.subscriptionsInfo(presentationData.theme, presentationData.strings.BoostGift_Stars_WinnersInfo))
} }
}
} else { } else {
if case .generic = subject { if case .generic = subject {
entries.append(.subscriptionsHeader(presentationData.theme, presentationData.strings.BoostGift_QuantityTitle.uppercased(), presentationData.strings.BoostGift_QuantityBoosts(state.subscriptions * 4))) entries.append(.subscriptionsHeader(presentationData.theme, presentationData.strings.BoostGift_QuantityTitle.uppercased(), presentationData.strings.BoostGift_QuantityBoosts(state.subscriptions * 4)))
@ -1023,9 +1026,11 @@ public func createGiveawayController(context: AccountContext, updatedPresentatio
let initialSubscriptions: Int32 let initialSubscriptions: Int32
let initialStars: Int64 let initialStars: Int64
let initialWinners: Int32 let initialWinners: Int32
var initialMode: CreateGiveawayControllerState.Mode = .giveaway
if case let .prepaid(prepaidGiveaway) = subject { if case let .prepaid(prepaidGiveaway) = subject {
if case let .stars(stars, _) = prepaidGiveaway.prize { if case let .stars(stars, _) = prepaidGiveaway.prize {
initialStars = stars initialStars = stars
initialMode = .starsGiveaway
} else { } else {
initialStars = 500 initialStars = 500
} }
@ -1052,7 +1057,7 @@ public func createGiveawayController(context: AccountContext, updatedPresentatio
let minDate = currentTime + 60 * 1 let minDate = currentTime + 60 * 1
let maxDate = currentTime + context.userLimits.maxGiveawayPeriodSeconds let maxDate = currentTime + context.userLimits.maxGiveawayPeriodSeconds
let initialState: CreateGiveawayControllerState = CreateGiveawayControllerState(mode: .giveaway, subscriptions: initialSubscriptions, stars: initialStars, winners: initialWinners, time: expiryTime) let initialState: CreateGiveawayControllerState = CreateGiveawayControllerState(mode: initialMode, subscriptions: initialSubscriptions, stars: initialStars, winners: initialWinners, time: expiryTime)
let statePromise = ValuePromise(initialState, ignoreRepeated: true) let statePromise = ValuePromise(initialState, ignoreRepeated: true)
let stateValue = Atomic(value: initialState) let stateValue = Atomic(value: initialState)

2
submodules/StatisticsUI/Sources/ChannelStatsController.swift
View File

@ -1448,7 +1448,7 @@ private func boostsEntries(
text = presentationData.strings.Stats_Boosts_PrepaidGiveawayMonths("\(months)").string text = presentationData.strings.Stats_Boosts_PrepaidGiveawayMonths("\(months)").string
case let .stars(stars, _): case let .stars(stars, _):
title = presentationData.strings.Stats_Boosts_Stars(Int32(stars)) title = presentationData.strings.Stats_Boosts_Stars(Int32(stars))
text = presentationData.strings.Stats_Boosts_StarsBoosts text = presentationData.strings.Stats_Boosts_StarsWinners(giveaway.quantity)
} }
entries.append(.boostPrepaid(i, presentationData.theme, title, text, giveaway)) entries.append(.boostPrepaid(i, presentationData.theme, title, text, giveaway))
i += 1 i += 1