From e1c94f772dadeecf357003d5de44c80ac92289d8 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 6 Jan 2022 13:54:22 +0600 Subject: [PATCH] MessageCallbackQuery#message now is ContentMessage --- CHANGELOG.md | 3 +++ .../tgbotapi/types/CallbackQuery/MessageCallbackQuery.kt | 5 +++-- .../tgbotapi/types/CallbackQuery/MessageDataCallbackQuery.kt | 5 +++-- .../inmo/tgbotapi/types/CallbackQuery/RawCallbackQuery.kt | 5 +++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8f0125a0a..8dc902d3b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 0.38.1 +* `Core`: + * `MessageCallbackQuery` (and all implementers as well) has changed the type of `message`: now it is `ContentMessage` instead of `Message` + ## 0.38.0 _This update contains [Telegram Bot API 5.6](https://core.telegram.org/bots/api-changelog#december-30-2021) implementation_ diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageCallbackQuery.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageCallbackQuery.kt index 666d9b829c..7db3589341 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageCallbackQuery.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageCallbackQuery.kt @@ -1,7 +1,8 @@ package dev.inmo.tgbotapi.types.CallbackQuery -import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent sealed interface MessageCallbackQuery : CallbackQuery { - val message: Message + val message: ContentMessage } diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageDataCallbackQuery.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageDataCallbackQuery.kt index e276bd219e..fac77ae179 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageDataCallbackQuery.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageDataCallbackQuery.kt @@ -2,12 +2,13 @@ package dev.inmo.tgbotapi.types.CallbackQuery import dev.inmo.tgbotapi.types.CallbackQueryIdentifier import dev.inmo.tgbotapi.types.User -import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent data class MessageDataCallbackQuery( override val id: CallbackQueryIdentifier, override val from: User, override val chatInstance: String, - override val message: Message, + override val message: ContentMessage, override val data: String ) : DataCallbackQuery, MessageCallbackQuery diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/RawCallbackQuery.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/RawCallbackQuery.kt index 4184a8902f..379095335d 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/RawCallbackQuery.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/RawCallbackQuery.kt @@ -1,8 +1,9 @@ package dev.inmo.tgbotapi.types.CallbackQuery import dev.inmo.tgbotapi.types.* -import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.message.abstracts.* import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -13,7 +14,7 @@ internal data class RawCallbackQuery( @SerialName(fromField) val from: User, @Serializable(TelegramBotAPIMessageDeserializeOnlySerializer::class) - val message: Message? = null, + val message: ContentMessage? = null, @SerialName(inlineMessageIdField) val inlineMessageId: InlineMessageIdentifier? = null, @SerialName("chat_instance")