From 663d63b009f75529592824490bd4966b94d67c83 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 7 Jun 2024 01:18:55 +0600 Subject: [PATCH] update invoices API --- CHANGELOG.md | 2 ++ .../tgbotapi/extensions/api/send/payments/SendInvoice.kt | 8 ++++---- .../inmo/tgbotapi/requests/send/payments/SendInvoice.kt | 8 ++------ 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 008cec03ba..9aa353a4eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 14.0.1 +* In `core` and `api` modules related to invoices changed their APIs to suite current API + ## 14.0.0 **Add support of [Telegram Bots API 7.4](https://core.telegram.org/bots/api-changelog#may-28-2024)** diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/payments/SendInvoice.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/payments/SendInvoice.kt index a88f10c3f0..247764768e 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/payments/SendInvoice.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/payments/SendInvoice.kt @@ -82,7 +82,7 @@ suspend fun TelegramBot.sendInvoice( title: String, description: String, payload: String, - prices: List, + price: LabeledPrice, maxTipAmount: Int? = null, suggestedTipAmounts: List? = null, startParameter: StartParameter? = null, @@ -101,7 +101,7 @@ suspend fun TelegramBot.sendInvoice( replyParameters: ReplyParameters? = null, replyMarkup: InlineKeyboardMarkup? = null ) = execute( - SendInvoice(chatId, title, description, payload, null, Currency.XTR, prices, maxTipAmount, suggestedTipAmounts ?.sorted(), startParameter, providerData, requireName, requirePhoneNumber, requireEmail, requireShippingAddress, shouldSendPhoneNumberToProvider, shouldSendEmailToProvider, priceDependOnShipAddress, threadId, disableNotification, protectContent, effectId, replyParameters, replyMarkup) + SendInvoice(chatId, title, description, payload, price, maxTipAmount, suggestedTipAmounts ?.sorted(), startParameter, providerData, requireName, requirePhoneNumber, requireEmail, requireShippingAddress, shouldSendPhoneNumberToProvider, shouldSendEmailToProvider, priceDependOnShipAddress, threadId, disableNotification, protectContent, effectId, replyParameters, replyMarkup) ) /** @@ -113,7 +113,7 @@ suspend fun TelegramBot.sendInvoice( title: String, description: String, payload: String, - prices: List, + price: LabeledPrice, maxTipAmount: Int? = null, suggestedTipAmounts: List? = null, startParameter: StartParameter? = null, @@ -135,7 +135,7 @@ suspend fun TelegramBot.sendInvoice( title = title, description = description, payload = payload, - prices = prices, + price = price, maxTipAmount = maxTipAmount, suggestedTipAmounts = suggestedTipAmounts, startParameter = startParameter, diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt index ff5eda11ed..1c25673893 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt @@ -105,9 +105,7 @@ data class SendInvoice( title: String, description: String, payload: String, - prices: List, - maxTipAmount: Int? = null, - suggestedTipAmounts: List? = null, + price: LabeledPrice, providerData: String? = null, requireName: Boolean = false, requirePhoneNumber: Boolean = false, @@ -129,9 +127,7 @@ data class SendInvoice( payload = payload, providerToken = null, currency = Currency.XTR, - prices = prices, - maxTipAmount = maxTipAmount, - suggestedTipAmounts = suggestedTipAmounts, + prices = listOf(price), providerData = providerData, requireName = requireName, requirePhoneNumber = requirePhoneNumber,