renamed several types

2025-09-16 13:49:26 +00:00 · 2024-03-16 21:21:34 +06:00
parent 544192ad5f
commit ffba4e9cef
29 changed files with 168 additions and 173 deletions
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/AnswerCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/AnswerCallbackQuery.kt
@@ -9,7 +9,7 @@ import kotlinx.serialization.builtins.serializer
@Serializable
 data class AnswerCallbackQuery(
    @SerialName(callbackQueryIdField)
-    val callbackQueryId: CallbackQueryIdentifier,
+    val callbackQueryId: CallbackQueryId,
    @SerialName(textField)
    val text: String? = null,
    @SerialName(showAlertField)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQueryId.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQueryId.kt
@@ -0,0 +1,13 @@
+package dev.inmo.tgbotapi.types
+
+import kotlinx.serialization.Serializable
+import kotlin.jvm.JvmInline
+
+@Serializable
+@JvmInline
+value class CallbackQueryId(
+    val string: String
+)
+
+@Deprecated("Renamed", ReplaceWith("CallbackQueryId", "dev.inmo.tgbotapi.types.CallbackQueryId"))
+typealias CallbackQueryIdentifier = CallbackQueryId
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQueryIdentifier.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQueryIdentifier.kt
@@ -1,10 +0,0 @@
-package dev.inmo.tgbotapi.types
-
-import kotlinx.serialization.Serializable
-import kotlin.jvm.JvmInline
-
-@Serializable
-@JvmInline
-value class CallbackQueryIdentifier(
-    val string: String
-)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineMessageIdentifier.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineMessageIdentifier.kt
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MediaGroupId.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MediaGroupId.kt
@@ -0,0 +1,13 @@
+package dev.inmo.tgbotapi.types
+
+import kotlinx.serialization.Serializable
+import kotlin.jvm.JvmInline
+
+@Serializable
+@JvmInline
+value class MediaGroupId(
+    val string: String
+)
+
+@Deprecated("Renamed", ReplaceWith("MediaGroupId", "dev.inmo.tgbotapi.types.MediaGroupId"))
+typealias MediaGroupIdentifier = MediaGroupId
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MediaGroupIdentifier.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MediaGroupIdentifier.kt
@@ -1,10 +0,0 @@
-package dev.inmo.tgbotapi.types
-
-import kotlinx.serialization.Serializable
-import kotlin.jvm.JvmInline
-
-@Serializable
-@JvmInline
-value class MediaGroupIdentifier(
-    val string: String
-)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelContentMessageImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelContentMessageImpl.kt
@@ -20,7 +20,7 @@ data class ChannelContentMessageImpl<T: MessageContent>(
    override val replyMarkup: InlineKeyboardMarkup?,
    override val senderBot: CommonBot?,
    override val authorSignature: AuthorSignature?,
-    override val mediaGroupId: MediaGroupIdentifier?,
+    override val mediaGroupId: MediaGroupId?,
 ) : ChannelContentMessage<T> {
    constructor(
        messageId: MessageId,
@@ -34,7 +34,7 @@ data class ChannelContentMessageImpl<T: MessageContent>(
        replyMarkup: InlineKeyboardMarkup?,
        senderBot: CommonBot?,
        authorSignature: AuthorSignature?,
-        mediaGroupId: MediaGroupIdentifier?,
+        mediaGroupId: MediaGroupId?,
    ) : this(
        messageId, chat, content, date, editDate, hasProtectedContent, forwardInfo.messageOrigin(), replyTo ?.let { ReplyInfo.Internal(it) }, replyMarkup, senderBot, authorSignature, mediaGroupId
    )
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt
@@ -22,7 +22,7 @@ data class ConnectedFromChannelGroupContentMessageImpl<T : MessageContent>(
    override val content: T,
    override val senderBot: CommonBot?,
    override val authorSignature: AuthorSignature?,
-    override val mediaGroupId: MediaGroupIdentifier?,
+    override val mediaGroupId: MediaGroupId?,
 ) : ConnectedFromChannelGroupContentMessage<T> {

    constructor(
@@ -38,7 +38,7 @@ data class ConnectedFromChannelGroupContentMessageImpl<T : MessageContent>(
        content: T,
        senderBot: CommonBot?,
        authorSignature: AuthorSignature?,
-        mediaGroupId: MediaGroupIdentifier?,
+        mediaGroupId: MediaGroupId?,
    ) : this(
        chat, channel, messageId, date, forwardInfo.messageOrigin(), editDate, hasProtectedContent, replyTo ?.let { ReplyInfo.Internal(it) }, replyMarkup, content, senderBot, authorSignature, mediaGroupId
    )
@@ -57,7 +57,7 @@ data class UnconnectedFromChannelGroupContentMessageImpl<T: MessageContent>(
    override val content: T,
    override val senderBot: CommonBot?,
    override val authorSignature: AuthorSignature?,
-    override val mediaGroupId: MediaGroupIdentifier?,
+    override val mediaGroupId: MediaGroupId?,
 ) : UnconnectedFromChannelGroupContentMessage<T> {
    constructor(
        chat: PreviewGroupChat,
@@ -72,7 +72,7 @@ data class UnconnectedFromChannelGroupContentMessageImpl<T: MessageContent>(
        content: T,
        senderBot: CommonBot?,
        authorSignature: AuthorSignature?,
-        mediaGroupId: MediaGroupIdentifier?,
+        mediaGroupId: MediaGroupId?,
    ) : this(
        chat, channel, messageId, date, forwardInfo.messageOrigin(), editDate, hasProtectedContent, replyTo ?.let { ReplyInfo.Internal(it) }, replyMarkup, content, senderBot, authorSignature, mediaGroupId
    )
@@ -90,7 +90,7 @@ data class AnonymousGroupContentMessageImpl<T : MessageContent>(
    override val content: T,
    override val senderBot: CommonBot?,
    override val authorSignature: AuthorSignature?,
-    override val mediaGroupId: MediaGroupIdentifier?,
+    override val mediaGroupId: MediaGroupId?,
 ) : AnonymousGroupContentMessage<T> {
    constructor(
        chat: PreviewGroupChat,
@@ -104,7 +104,7 @@ data class AnonymousGroupContentMessageImpl<T : MessageContent>(
        content: T,
        senderBot: CommonBot?,
        authorSignature: AuthorSignature?,
-        mediaGroupId: MediaGroupIdentifier?,
+        mediaGroupId: MediaGroupId?,
    ) : this(
        chat, messageId, date, forwardInfo.messageOrigin(), editDate, hasProtectedContent, replyTo ?.let { ReplyInfo.Internal(it) }, replyMarkup, content, senderBot, authorSignature, mediaGroupId
    )
@@ -122,7 +122,7 @@ data class CommonGroupContentMessageImpl<T : MessageContent>(
    override val replyMarkup: InlineKeyboardMarkup?,
    override val content: T,
    override val senderBot: CommonBot?,
-    override val mediaGroupId: MediaGroupIdentifier?,
+    override val mediaGroupId: MediaGroupId?,
    override val senderBoostsCount: Int?
 ) : CommonGroupContentMessage<T> {
    constructor(
@@ -137,7 +137,7 @@ data class CommonGroupContentMessageImpl<T : MessageContent>(
        replyMarkup: InlineKeyboardMarkup?,
        content: T,
        senderBot: CommonBot?,
-        mediaGroupId: MediaGroupIdentifier?,
+        mediaGroupId: MediaGroupId?,
        senderBoostsCount: Int?,
    ) : this(
        chat, messageId, from, date, forwardInfo.messageOrigin(), editDate, hasProtectedContent, replyTo ?.let { ReplyInfo.Internal(it) }, replyMarkup, content, senderBot, mediaGroupId, senderBoostsCount
@@ -158,7 +158,7 @@ data class FromChannelForumContentMessageImpl<T: MessageContent>(
    override val content: T,
    override val senderBot: CommonBot?,
    override val authorSignature: AuthorSignature?,
-    override val mediaGroupId: MediaGroupIdentifier?,
+    override val mediaGroupId: MediaGroupId?,
 ) : FromChannelForumContentMessage<T> {
    constructor(
        chat: PreviewForumChat,
@@ -174,7 +174,7 @@ data class FromChannelForumContentMessageImpl<T: MessageContent>(
        content: T,
        senderBot: CommonBot?,
        authorSignature: AuthorSignature?,
-        mediaGroupId: MediaGroupIdentifier?,
+        mediaGroupId: MediaGroupId?,
    ) : this(
        chat, channel, messageId, threadId, date, forwardInfo.messageOrigin(), editDate, hasProtectedContent, replyTo ?.let { ReplyInfo.Internal(it) }, replyMarkup, content, senderBot, authorSignature, mediaGroupId
    )
@@ -193,7 +193,7 @@ data class AnonymousForumContentMessageImpl<T : MessageContent>(
    override val content: T,
    override val senderBot: CommonBot?,
    override val authorSignature: AuthorSignature?,
-    override val mediaGroupId: MediaGroupIdentifier?,
+    override val mediaGroupId: MediaGroupId?,
 ) : AnonymousForumContentMessage<T> {
    constructor(
        chat: PreviewForumChat,
@@ -208,7 +208,7 @@ data class AnonymousForumContentMessageImpl<T : MessageContent>(
        content: T,
        senderBot: CommonBot?,
        authorSignature: AuthorSignature?,
-        mediaGroupId: MediaGroupIdentifier?,
+        mediaGroupId: MediaGroupId?,
    ) : this(
        chat, messageId, threadId, date, forwardInfo.messageOrigin(), editDate, hasProtectedContent, replyTo ?.let { ReplyInfo.Internal(it) }, replyMarkup, content, senderBot, authorSignature, mediaGroupId
    )
@@ -227,7 +227,7 @@ data class CommonForumContentMessageImpl<T : MessageContent>(
    override val replyMarkup: InlineKeyboardMarkup?,
    override val content: T,
    override val senderBot: CommonBot?,
-    override val mediaGroupId: MediaGroupIdentifier?,
+    override val mediaGroupId: MediaGroupId?,
    override val senderBoostsCount: Int?,
 ) : CommonForumContentMessage<T> {
    constructor(
@@ -243,7 +243,7 @@ data class CommonForumContentMessageImpl<T : MessageContent>(
        replyMarkup: InlineKeyboardMarkup?,
        content: T,
        senderBot: CommonBot?,
-        mediaGroupId: MediaGroupIdentifier?,
+        mediaGroupId: MediaGroupId?,
        senderBoostsCount: Int?,
    ) : this(
        chat, messageId, threadId, from, date, forwardInfo.messageOrigin(), editDate, hasProtectedContent, replyTo ?.let { ReplyInfo.Internal(it) }, replyMarkup, content, senderBot, mediaGroupId, senderBoostsCount
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateContentMessageImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateContentMessageImpl.kt
@@ -22,7 +22,7 @@ data class PrivateContentMessageImpl<T: MessageContent>(
    override val replyInfo: ReplyInfo?,
    override val replyMarkup: InlineKeyboardMarkup?,
    override val senderBot: CommonBot?,
-    override val mediaGroupId: MediaGroupIdentifier?,
+    override val mediaGroupId: MediaGroupId?,
 ) : PrivateContentMessage<T> {
    constructor(
        messageId: MessageId,
@@ -36,7 +36,7 @@ data class PrivateContentMessageImpl<T: MessageContent>(
        replyTo: AccessibleMessage?,
        replyMarkup: InlineKeyboardMarkup?,
        senderBot: CommonBot?,
-        mediaGroupId: MediaGroupIdentifier?,
+        mediaGroupId: MediaGroupId?,
    ) : this(
        messageId, from, chat, content, date, editDate, hasProtectedContent, forwardInfo.messageOrigin(), replyTo ?.let { ReplyInfo.Internal(it) }, replyMarkup, senderBot, mediaGroupId
    )
--- 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
@@ -60,7 +60,7 @@ internal data class RawMessage(
    private val via_bot: CommonBot? = null,
    private val edit_date: TelegramDate? = null,
    private val has_protected_content: Boolean? = null,
-    private val media_group_id: MediaGroupIdentifier? = null,
+    private val media_group_id: MediaGroupId? = null,
    private val author_signature: AuthorSignature? = null,
    private val text: String? = null,
    private val entities: RawMessageEntities? = null,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyMediaGroupMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyMediaGroupMessage.kt
@@ -1,8 +1,8 @@
 package dev.inmo.tgbotapi.types.message.abstracts

-import dev.inmo.tgbotapi.types.MediaGroupIdentifier
+import dev.inmo.tgbotapi.types.MediaGroupId
 import dev.inmo.tgbotapi.types.message.content.MessageContent

 interface PossiblyMediaGroupMessage<out T : MessageContent> : ContentMessage<T> {
-    val mediaGroupId: MediaGroupIdentifier?
+    val mediaGroupId: MediaGroupId?
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/AbstractsMedia.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/AbstractsMedia.kt
@@ -1,13 +1,11 @@
 package dev.inmo.tgbotapi.types.message.content

-import dev.inmo.tgbotapi.abstracts.TextedInput
-import dev.inmo.tgbotapi.types.MediaGroupIdentifier
+import dev.inmo.tgbotapi.types.MediaGroupId
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.abstracts.WithOptionalQuoteInfo
 import dev.inmo.tgbotapi.types.files.AudioFile
 import dev.inmo.tgbotapi.types.files.DocumentFile
 import dev.inmo.tgbotapi.types.media.*
-import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
 import dev.inmo.tgbotapi.types.message.abstracts.PossiblySentViaBotCommonMessage
 import kotlinx.serialization.Serializable

@@ -33,7 +31,7 @@ sealed interface MediaGroupCollectionContent<T : MediaGroupPartContent> : Texted
        val sourceMessage: PossiblySentViaBotCommonMessage<T>
    )
    val group: List<PartWrapper<T>>
-    val mediaGroupId: MediaGroupIdentifier
+    val mediaGroupId: MediaGroupId
 }

 sealed interface MediaGroupPartContent : TextedMediaContent {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/MediaGroupContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/MediaGroupContent.kt
@@ -14,7 +14,7 @@ import kotlinx.serialization.Serializable
@Serializable
 data class MediaGroupContent<T : MediaGroupPartContent>(
    override val group: List<MediaGroupCollectionContent.PartWrapper<T>>,
-    override val mediaGroupId: MediaGroupIdentifier,
+    override val mediaGroupId: MediaGroupId,
 ) : MediaGroupCollectionContent<T>, WithOptionalQuoteInfo {
    val mainContent: MediaGroupPartContent
        get() = group.first().content
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/CallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/CallbackQuery.kt
@@ -1,12 +1,11 @@
 package dev.inmo.tgbotapi.types.queries.callback

 import dev.inmo.tgbotapi.abstracts.FromUser
-import dev.inmo.tgbotapi.types.CallbackQueryIdentifier
+import dev.inmo.tgbotapi.types.CallbackQueryId
 import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.chat.User

 sealed interface CallbackQuery : FromUser {
-    val id: CallbackQueryIdentifier
+    val id: CallbackQueryId
    val chatInstance: String
    override val from: CommonUser
    override val user: CommonUser
@@ -14,7 +13,7 @@ sealed interface CallbackQuery : FromUser {
 }

 data class UnknownCallbackQueryType(
-    override val id: CallbackQueryIdentifier,
+    override val id: CallbackQueryId,
    override val from: CommonUser,
    override val chatInstance: String,
    val raw: String
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InaccessibleMessageDataCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InaccessibleMessageDataCallbackQuery.kt
@@ -1,14 +1,11 @@
 package dev.inmo.tgbotapi.types.queries.callback

-import dev.inmo.tgbotapi.types.CallbackQueryIdentifier
+import dev.inmo.tgbotapi.types.CallbackQueryId
 import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.chat.User
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.InaccessibleMessage
-import dev.inmo.tgbotapi.types.message.content.MessageContent

 data class InaccessibleMessageDataCallbackQuery(
-    override val id: CallbackQueryIdentifier,
+    override val id: CallbackQueryId,
    override val from: CommonUser,
    override val chatInstance: String,
    override val message: InaccessibleMessage,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InaccessibleMessageGameShortNameCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InaccessibleMessageGameShortNameCallbackQuery.kt
@@ -1,14 +1,11 @@
 package dev.inmo.tgbotapi.types.queries.callback

-import dev.inmo.tgbotapi.types.CallbackQueryIdentifier
+import dev.inmo.tgbotapi.types.CallbackQueryId
 import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.chat.User
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.InaccessibleMessage
-import dev.inmo.tgbotapi.types.message.content.MessageContent

 data class InaccessibleMessageGameShortNameCallbackQuery(
-    override val id: CallbackQueryIdentifier,
+    override val id: CallbackQueryId,
    override val from: CommonUser,
    override val chatInstance: String,
    override val message: InaccessibleMessage,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InlineMessageIdDataCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InlineMessageIdDataCallbackQuery.kt
@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable

@Serializable
 data class InlineMessageIdDataCallbackQuery(
-    override val id: CallbackQueryIdentifier,
+    override val id: CallbackQueryId,
    override val from: CommonUser,
    override val chatInstance: String,
    override val inlineMessageId: InlineMessageId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InlineMessageIdGameShortNameCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InlineMessageIdGameShortNameCallbackQuery.kt
@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.CommonUser

 data class InlineMessageIdGameShortNameCallbackQuery(
-    override val id: CallbackQueryIdentifier,
+    override val id: CallbackQueryId,
    override val from: CommonUser,
    override val chatInstance: String,
    override val inlineMessageId: InlineMessageId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/MessageDataCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/MessageDataCallbackQuery.kt
@@ -1,13 +1,12 @@
 package dev.inmo.tgbotapi.types.queries.callback

-import dev.inmo.tgbotapi.types.CallbackQueryIdentifier
+import dev.inmo.tgbotapi.types.CallbackQueryId
 import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.MessageContent

 data class MessageDataCallbackQuery(
-    override val id: CallbackQueryIdentifier,
+    override val id: CallbackQueryId,
    override val from: CommonUser,
    override val chatInstance: String,
    override val message: ContentMessage<MessageContent>,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/MessageGameShortNameCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/MessageGameShortNameCallbackQuery.kt
@@ -1,13 +1,12 @@
 package dev.inmo.tgbotapi.types.queries.callback

-import dev.inmo.tgbotapi.types.CallbackQueryIdentifier
+import dev.inmo.tgbotapi.types.CallbackQueryId
 import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.MessageContent

 data class MessageGameShortNameCallbackQuery(
-    override val id: CallbackQueryIdentifier,
+    override val id: CallbackQueryId,
    override val from: CommonUser,
    override val chatInstance: String,
    override val message: ContentMessage<MessageContent>,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/RawCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/RawCallbackQuery.kt
@@ -10,7 +10,7 @@ import kotlinx.serialization.Serializable
@Serializable
 internal data class RawCallbackQuery(
    @SerialName(idField)
-    val id: CallbackQueryIdentifier,
+    val id: CallbackQueryId,
    @SerialName(fromField)
    val from: CommonUser,
    @Serializable(TelegramBotAPIMessageDeserializeOnlySerializer::class)