Skip to content

Commit 888fd02

Browse files
committed
Various fixes
1 parent 3fd2bf7 commit 888fd02

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

submodules/TelegramCore/Sources/TelegramEngine/Payments/AppStore.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,11 @@ private func apiInputStorePaymentPurpose(account: Account, purpose: AppStoreTran
6161
}
6262

6363
var message: Api.TextWithEntities?
64-
if let text {
64+
if let text, !text.isEmpty {
6565
flags |= (1 << 1)
66-
message = .textWithEntities(text: text, entities: apiEntitiesFromMessageTextEntities(entities ?? [], associatedPeers: SimpleDictionary()))
66+
message = .textWithEntities(text: text, entities: entities.flatMap { apiEntitiesFromMessageTextEntities($0, associatedPeers: SimpleDictionary()) } ?? [])
6767
}
68+
6869
return .inputStorePaymentPremiumGiftCode(flags: flags, users: apiInputUsers, boostPeer: apiBoostPeer, currency: currency, amount: amount, message: message)
6970
}
7071
case let .giveaway(boostPeerId, additionalPeerIds, countries, onlyNewSubscribers, showWinners, prizeDescription, randomId, untilDate, currency, amount):

submodules/TelegramCore/Sources/TelegramEngine/Payments/BotPaymentForm.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,13 +296,13 @@ func _internal_parseInputInvoice(transaction: Transaction, source: BotPaymentInv
296296
}
297297

298298
var inputPurposeFlags: Int32 = 0
299-
var textWithEntities: Api.TextWithEntities?
300-
if let text, let entities {
299+
var message: Api.TextWithEntities?
300+
if let text, !text.isEmpty {
301301
inputPurposeFlags |= (1 << 1)
302-
textWithEntities = .textWithEntities(text: text, entities: apiEntitiesFromMessageTextEntities(entities, associatedPeers: SimpleDictionary()))
302+
message = .textWithEntities(text: text, entities: entities.flatMap { apiEntitiesFromMessageTextEntities($0, associatedPeers: SimpleDictionary()) } ?? [])
303303
}
304304

305-
let inputPurpose: Api.InputStorePaymentPurpose = .inputStorePaymentPremiumGiftCode(flags: inputPurposeFlags, users: inputUsers, boostPeer: nil, currency: currency, amount: amount, message: textWithEntities)
305+
let inputPurpose: Api.InputStorePaymentPurpose = .inputStorePaymentPremiumGiftCode(flags: inputPurposeFlags, users: inputUsers, boostPeer: nil, currency: currency, amount: amount, message: message)
306306

307307
var flags: Int32 = 0
308308
if let _ = option.storeProductId {

0 commit comments

Comments
 (0)