From 481533bee2a517558e05bbf16305fe3747327a9a Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 9 Jul 2024 17:00:26 +0600 Subject: [PATCH 1/3] start update up to 15.1.0 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index cfd1d5e..309acff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ kotlin.daemon.jvmargs=-Xmx2g -Xms500m kotlin_version=1.9.23 -telegram_bot_api_version=15.0.0 -micro_utils_version=0.21.0 +telegram_bot_api_version=15.1.0 +micro_utils_version=0.21.2 serialization_version=1.6.3 ktor_version=2.3.11 From f750589fd301e450133dbc854e050bf75c43c914 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 10 Jul 2024 17:07:36 +0600 Subject: [PATCH 2/3] add sendPaid in StarTransactions bot --- .../src/main/kotlin/StarTransactionsBot.kt | 56 +++++++++++++++++-- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/StarTransactionsBot/src/main/kotlin/StarTransactionsBot.kt b/StarTransactionsBot/src/main/kotlin/StarTransactionsBot.kt index 92707ca..c7f3a55 100644 --- a/StarTransactionsBot/src/main/kotlin/StarTransactionsBot.kt +++ b/StarTransactionsBot/src/main/kotlin/StarTransactionsBot.kt @@ -7,25 +7,32 @@ import dev.inmo.tgbotapi.extensions.api.answers.answer import dev.inmo.tgbotapi.extensions.api.answers.payments.answerPreCheckoutQueryOk import dev.inmo.tgbotapi.extensions.api.bot.getMe import dev.inmo.tgbotapi.extensions.api.edit.edit +import dev.inmo.tgbotapi.extensions.api.files.downloadFile +import dev.inmo.tgbotapi.extensions.api.files.downloadFileToTemp import dev.inmo.tgbotapi.extensions.api.get.getStarTransactions import dev.inmo.tgbotapi.extensions.api.send.reply +import dev.inmo.tgbotapi.extensions.api.send.send import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling -import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.command -import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand -import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMessageDataCallbackQuery -import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onPreCheckoutQuery +import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.* import dev.inmo.tgbotapi.extensions.utils.extensions.sameChat import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton import dev.inmo.tgbotapi.extensions.utils.types.buttons.flatInlineKeyboard import dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard import dev.inmo.tgbotapi.extensions.utils.types.buttons.payButton import dev.inmo.tgbotapi.extensions.utils.withContentOrNull +import dev.inmo.tgbotapi.requests.abstracts.asMultipartFile import dev.inmo.tgbotapi.types.RawChatId import dev.inmo.tgbotapi.types.UserId import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.files.* +import dev.inmo.tgbotapi.types.media.TelegramPaidMediaPhoto +import dev.inmo.tgbotapi.types.media.TelegramPaidMediaVideo +import dev.inmo.tgbotapi.types.media.toTelegramPaidMediaPhoto +import dev.inmo.tgbotapi.types.media.toTelegramPaidMediaVideo import dev.inmo.tgbotapi.types.message.content.TextContent import dev.inmo.tgbotapi.types.message.textsources.TextSource import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList +import dev.inmo.tgbotapi.types.message.textsources.textSourcesOrElse import dev.inmo.tgbotapi.types.payments.LabeledPrice import dev.inmo.tgbotapi.types.payments.stars.StarTransaction import dev.inmo.tgbotapi.utils.* @@ -126,6 +133,47 @@ suspend fun main(vararg args: String) { ) } + onVisualGalleryMessages { + send( + it.chat, + 1, + it.content.group.mapNotNull { + val file = downloadFileToTemp(it.content.media) + when (it.content.media) { + is VideoFile -> { + TelegramPaidMediaVideo( + file.asMultipartFile() + ) + } + is PhotoSize -> { + TelegramPaidMediaPhoto( + file.asMultipartFile() + ) + } + else -> null + } + }, + it.content.textSources, + showCaptionAboveMedia = true + ) + } + + onPhoto { + send( + it.chat, + 1, + listOf(it.content.media.toTelegramPaidMediaPhoto()) + ) + } + + onVideo { + send( + it.chat, + 1, + listOf(it.content.media.toTelegramPaidMediaVideo()) + ) + } + allUpdatesFlow.subscribeSafelyWithoutExceptions(this) { println(it) } }.second.join() } From 9fb6570d21db2f28efbe62bad8783a4c6c99a329 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 10 Jul 2024 17:48:43 +0600 Subject: [PATCH 3/3] add refund reply and paid media info content additional println --- .../src/main/kotlin/StarTransactionsBot.kt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/StarTransactionsBot/src/main/kotlin/StarTransactionsBot.kt b/StarTransactionsBot/src/main/kotlin/StarTransactionsBot.kt index c7f3a55..6d0de74 100644 --- a/StarTransactionsBot/src/main/kotlin/StarTransactionsBot.kt +++ b/StarTransactionsBot/src/main/kotlin/StarTransactionsBot.kt @@ -174,6 +174,17 @@ suspend fun main(vararg args: String) { ) } + onPaidMediaInfoContent { + println(it) + } + + onRefundedPayment { + reply( + it, + "Received your refund: ${it.chatEvent.payment}" + ) + } + allUpdatesFlow.subscribeSafelyWithoutExceptions(this) { println(it) } }.second.join() }