From af79e268557c199d2e3a7a0da7e417a042b7e7db Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 23 Jun 2024 15:23:58 +0600 Subject: [PATCH] add support for businessConnectionId in stopPoll --- .../dev/inmo/tgbotapi/extensions/api/StopPoll.kt | 13 +++++++++---- .../kotlin/dev/inmo/tgbotapi/requests/StopPoll.kt | 6 +++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/StopPoll.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/StopPoll.kt index 3bb90f8cbe..4b799e4ecc 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/StopPoll.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/StopPoll.kt @@ -3,6 +3,7 @@ package dev.inmo.tgbotapi.extensions.api import dev.inmo.tgbotapi.bot.TelegramBot import dev.inmo.tgbotapi.requests.StopPoll import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import dev.inmo.tgbotapi.types.chat.Chat import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage @@ -14,9 +15,10 @@ import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage suspend fun TelegramBot.stopPoll( chatId: ChatIdentifier, messageId: MessageId, + businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, replyMarkup: InlineKeyboardMarkup? = null ) = execute( - StopPoll(chatId, messageId, replyMarkup) + StopPoll(chatId, messageId, businessConnectionId, replyMarkup) ) /** @@ -26,8 +28,9 @@ suspend fun TelegramBot.stopPoll( suspend fun TelegramBot.stopPoll( chat: Chat, messageId: MessageId, + businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, replyMarkup: InlineKeyboardMarkup? = null -) = stopPoll(chat.id, messageId, replyMarkup) +) = stopPoll(chat.id, messageId, businessConnectionId, replyMarkup) /** * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] @@ -36,8 +39,9 @@ suspend fun TelegramBot.stopPoll( suspend fun TelegramBot.stopPoll( chatId: IdChatIdentifier, message: AccessibleMessage, + businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, replyMarkup: InlineKeyboardMarkup? = null -) = stopPoll(chatId, message.messageId, replyMarkup) +) = stopPoll(chatId, message.messageId, businessConnectionId, replyMarkup) /** * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] @@ -46,5 +50,6 @@ suspend fun TelegramBot.stopPoll( suspend fun TelegramBot.stopPoll( chat: Chat, message: AccessibleMessage, + businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, replyMarkup: InlineKeyboardMarkup? = null -) = stopPoll(chat.id, message.messageId, replyMarkup) +) = stopPoll(chat.id, message.messageId, businessConnectionId, replyMarkup) diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/StopPoll.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/StopPoll.kt index 392c34c90e..b980afae88 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/StopPoll.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/StopPoll.kt @@ -1,9 +1,11 @@ package dev.inmo.tgbotapi.requests import dev.inmo.tgbotapi.abstracts.types.MessageAction +import dev.inmo.tgbotapi.abstracts.types.OptionallyBusinessConnectionRequest import dev.inmo.tgbotapi.abstracts.types.WithReplyMarkup import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import dev.inmo.tgbotapi.types.polls.Poll import dev.inmo.tgbotapi.types.polls.PollSerializer @@ -15,9 +17,11 @@ data class StopPoll( override val chatId: ChatIdentifier, @SerialName(messageIdField) override val messageId: MessageId, + @SerialName(businessConnectionIdField) + override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, @SerialName(replyMarkupField) override val replyMarkup: InlineKeyboardMarkup? = null -) : MessageAction, SimpleRequest, WithReplyMarkup { +) : MessageAction, SimpleRequest, WithReplyMarkup, OptionallyBusinessConnectionRequest { override fun method(): String = "stopPoll" override val resultDeserializer: DeserializationStrategy get() = PollSerializer