add sender_business_bot support

This commit is contained in:
InsanusMokrassar 2024-04-16 18:37:04 +06:00
parent a7b2bb820b
commit cb7bb01671
4 changed files with 23 additions and 3 deletions

View File

@ -26,6 +26,7 @@ data class BusinessContentMessageImpl<T: MessageContent>(
override val replyMarkup: InlineKeyboardMarkup?, override val replyMarkup: InlineKeyboardMarkup?,
override val senderBot: CommonBot?, override val senderBot: CommonBot?,
override val mediaGroupId: MediaGroupId?, override val mediaGroupId: MediaGroupId?,
override val senderBusinessBot: PreviewBot? = null
) : BusinessContentMessage<T> { ) : BusinessContentMessage<T> {
constructor( constructor(
messageId: MessageId, messageId: MessageId,
@ -41,7 +42,21 @@ data class BusinessContentMessageImpl<T: MessageContent>(
replyMarkup: InlineKeyboardMarkup?, replyMarkup: InlineKeyboardMarkup?,
senderBot: CommonBot?, senderBot: CommonBot?,
mediaGroupId: MediaGroupId?, mediaGroupId: MediaGroupId?,
senderBusinessBot: PreviewBot? = null,
) : this( ) : 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
) )
} }

View File

@ -142,6 +142,7 @@ internal data class RawMessage(
// Business // Business
private val business_connection_id: BusinessConnectionId? = null, private val business_connection_id: BusinessConnectionId? = null,
private val sender_business_bot: PreviewBot? = null,
// Giveaways // Giveaways
private val giveaway_created: GiveawayCreated? = null, private val giveaway_created: GiveawayCreated? = null,
@ -542,7 +543,8 @@ internal data class RawMessage(
replyInfo, replyInfo,
reply_markup, reply_markup,
via_bot, via_bot,
media_group_id media_group_id,
sender_business_bot
) )
} }
else -> error("Unknown type of chat: $chat") else -> error("Unknown type of chat: $chat")

View File

@ -2,6 +2,7 @@ package dev.inmo.tgbotapi.types.message.abstracts
import dev.inmo.tgbotapi.abstracts.types.WithBusinessConnectionId import dev.inmo.tgbotapi.abstracts.types.WithBusinessConnectionId
import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId 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.chat.PreviewPrivateChat
import dev.inmo.tgbotapi.types.message.content.MessageContent import dev.inmo.tgbotapi.types.message.content.MessageContent
@ -9,4 +10,5 @@ interface BusinessContentMessage<T: MessageContent> : PossiblySentViaBotCommonMe
WithBusinessConnectionId { WithBusinessConnectionId {
override val chat: PreviewPrivateChat override val chat: PreviewPrivateChat
override val businessConnectionId: BusinessConnectionId override val businessConnectionId: BusinessConnectionId
val senderBusinessBot: PreviewBot?
} }

View File

@ -42,7 +42,8 @@ fun <T : MediaGroupPartContent> List<PossiblySentViaBotCommonMessage<T>>.asMedia
sourceMessage.replyInfo, sourceMessage.replyInfo,
sourceMessage.replyMarkup, sourceMessage.replyMarkup,
sourceMessage.senderBot, sourceMessage.senderBot,
sourceMessage.mediaGroupId sourceMessage.mediaGroupId,
sourceMessage.senderBusinessBot
) )
is PrivateContentMessage -> PrivateContentMessageImpl( is PrivateContentMessage -> PrivateContentMessageImpl(
sourceMessage.messageId, sourceMessage.messageId,