Various fixes

This commit is contained in:
Ilya Laktyushin 2024-11-12 03:36:11 +04:00
parent 3fd2bf7f2f
commit 888fd0254e
2 changed files with 7 additions and 6 deletions

View File

@ -61,10 +61,11 @@ private func apiInputStorePaymentPurpose(account: Account, purpose: AppStoreTran
}
var message: Api.TextWithEntities?
if let text {
if let text, !text.isEmpty {
flags |= (1 << 1)
message = .textWithEntities(text: text, entities: apiEntitiesFromMessageTextEntities(entities ?? [], associatedPeers: SimpleDictionary()))
message = .textWithEntities(text: text, entities: entities.flatMap { apiEntitiesFromMessageTextEntities($0, associatedPeers: SimpleDictionary()) } ?? [])
}
return .inputStorePaymentPremiumGiftCode(flags: flags, users: apiInputUsers, boostPeer: apiBoostPeer, currency: currency, amount: amount, message: message)
}
case let .giveaway(boostPeerId, additionalPeerIds, countries, onlyNewSubscribers, showWinners, prizeDescription, randomId, untilDate, currency, amount):

View File

@ -296,13 +296,13 @@ func _internal_parseInputInvoice(transaction: Transaction, source: BotPaymentInv
}
var inputPurposeFlags: Int32 = 0
var textWithEntities: Api.TextWithEntities?
if let text, let entities {
var message: Api.TextWithEntities?
if let text, !text.isEmpty {
inputPurposeFlags |= (1 << 1)
textWithEntities = .textWithEntities(text: text, entities: apiEntitiesFromMessageTextEntities(entities, associatedPeers: SimpleDictionary()))
message = .textWithEntities(text: text, entities: entities.flatMap { apiEntitiesFromMessageTextEntities($0, associatedPeers: SimpleDictionary()) } ?? [])
}
let inputPurpose: Api.InputStorePaymentPurpose = .inputStorePaymentPremiumGiftCode(flags: inputPurposeFlags, users: inputUsers, boostPeer: nil, currency: currency, amount: amount, message: textWithEntities)
let inputPurpose: Api.InputStorePaymentPurpose = .inputStorePaymentPremiumGiftCode(flags: inputPurposeFlags, users: inputUsers, boostPeer: nil, currency: currency, amount: amount, message: message)
var flags: Int32 = 0
if let _ = option.storeProductId {