From cb7bb0167186d692f192929ef0094f0f36e67a2d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 16 Apr 2024 18:37:04 +0600 Subject: [PATCH] add sender_business_bot support --- .../types/message/BusinessContentMessageImpl.kt | 17 ++++++++++++++++- .../inmo/tgbotapi/types/message/RawMessage.kt | 4 +++- .../message/abstracts/BusinessContentMessage.kt | 2 ++ .../MediaGroupContentMessageCreator.kt | 3 ++- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/BusinessContentMessageImpl.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/BusinessContentMessageImpl.kt index 35a5ce36e2..28ba296012 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/BusinessContentMessageImpl.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/BusinessContentMessageImpl.kt @@ -26,6 +26,7 @@ data class BusinessContentMessageImpl( override val replyMarkup: InlineKeyboardMarkup?, override val senderBot: CommonBot?, override val mediaGroupId: MediaGroupId?, + override val senderBusinessBot: PreviewBot? = null ) : BusinessContentMessage { constructor( messageId: MessageId, @@ -41,7 +42,21 @@ data class BusinessContentMessageImpl( replyMarkup: InlineKeyboardMarkup?, senderBot: CommonBot?, mediaGroupId: MediaGroupId?, + senderBusinessBot: PreviewBot? = null, ) : this( - messageId, from, chat, businessConnectionId, content, date, editDate, hasProtectedContent, forwardInfo.messageOrigin(), replyTo ?.let { ReplyInfo.Internal(it) }, replyMarkup, senderBot, mediaGroupId + messageId = messageId, + from = from, + chat = chat, + businessConnectionId = businessConnectionId, + content = content, + date = date, + editDate = editDate, + hasProtectedContent = hasProtectedContent, + forwardOrigin = forwardInfo.messageOrigin(), + replyInfo = replyTo ?.let { ReplyInfo.Internal(it) }, + replyMarkup = replyMarkup, + senderBot = senderBot, + mediaGroupId = mediaGroupId, + senderBusinessBot = senderBusinessBot ) } diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt index 2f73f9063a..1a32f6efc9 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt @@ -142,6 +142,7 @@ internal data class RawMessage( // Business private val business_connection_id: BusinessConnectionId? = null, + private val sender_business_bot: PreviewBot? = null, // Giveaways private val giveaway_created: GiveawayCreated? = null, @@ -542,7 +543,8 @@ internal data class RawMessage( replyInfo, reply_markup, via_bot, - media_group_id + media_group_id, + sender_business_bot ) } else -> error("Unknown type of chat: $chat") diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/BusinessContentMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/BusinessContentMessage.kt index 437de858b7..09e314ea10 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/BusinessContentMessage.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/BusinessContentMessage.kt @@ -2,6 +2,7 @@ package dev.inmo.tgbotapi.types.message.abstracts import dev.inmo.tgbotapi.abstracts.types.WithBusinessConnectionId import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId +import dev.inmo.tgbotapi.types.chat.PreviewBot import dev.inmo.tgbotapi.types.chat.PreviewPrivateChat import dev.inmo.tgbotapi.types.message.content.MessageContent @@ -9,4 +10,5 @@ interface BusinessContentMessage : PossiblySentViaBotCommonMe WithBusinessConnectionId { override val chat: PreviewPrivateChat override val businessConnectionId: BusinessConnectionId + val senderBusinessBot: PreviewBot? } diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/MediaGroupContentMessageCreator.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/MediaGroupContentMessageCreator.kt index 7ea2203aa4..fb5953a7e2 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/MediaGroupContentMessageCreator.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/MediaGroupContentMessageCreator.kt @@ -42,7 +42,8 @@ fun List>.asMedia sourceMessage.replyInfo, sourceMessage.replyMarkup, sourceMessage.senderBot, - sourceMessage.mediaGroupId + sourceMessage.mediaGroupId, + sourceMessage.senderBusinessBot ) is PrivateContentMessage -> PrivateContentMessageImpl( sourceMessage.messageId,