fix build

CHANGELOG.md

@@ -1,14 +1,38 @@
 # TelegramBotAPI changelog
 
-## 0.32.10
+## 0.33.0
+
+**UPDATE UP TO Telegram Bot API 5.1**
+_**ALL DEPRECATIONS WERE REMOVED**_
 
 * `Common`:
     * `Version`:
         * `MicroUtils`: `0.4.28` -> `0.4.29`
 * `Core`:
     * `AdministratorChatMemberSerializer` and `ChatMemberSerializer` has changed their visibility: they are public for now
+    * Add `ChatInviteLinkRequest` with subrequests like `KnownChatInviteLinkRequest`
+    * Add `CreateChatInviteLink`/`EditChatInviteLink`/`RevokeChatInviteLink` requests
+    * Update `KickChatMember` to include `revokeMessages` flag
+    * Update `PromoteChatMember` to include `canManageVoiceChats` and `canManageChat` flags
+    * Add `ChatInviteLink` object
+        * Add `PrimaryInviteLink` for `ChatInviteLink` with `isPrimary == true`
+        * Add `CommonInviteLink` for `ChatInviteLink` with `isPrimary == false`
+    * `AdministratorChatMemberSerializer` has been set as public for several versions
+    * `ChatMemberSerializer` has been set as public for several versions
+    * Add `ChatMemberUpdated`
+    * Add `MessageAutoDeleteTimerChanged`
+    * Add `VoiceChatEvent`
+        * Add `VoiceChatEnded`
+        * Add `VoiceChatParticipantsInvited`
+    * Add `VoiceChatStarted`
+    * Add `ChatMemberUpdatedUpdate`
+        * Add `CommonChatMemberUpdatedUpdate`
+        * Add `MyChatMemberUpdatedUpdate`
+* `API`:
+    * All API extensions has been updated
 * `Behaviour Builder`:
     * Now content triggers and expectators will wait for channel posts too
+    * New waiters and triggers for `ChatMemberUpdated` and its variations
 
 ## 0.32.9
 

gradle.properties

@@ -17,6 +17,6 @@ micro_utils_version=0.4.29
 javax_activation_version=1.1.1
 
 library_group=dev.inmo
-library_version=0.32.10
+library_version=0.33.0
 
 github_release_plugin_version=2.2.12

tgbotapi.core/README.md

@@ -10,7 +10,7 @@ moments are describing by official [Telegram Bot API](https://core.telegram.org/
 
 ## Compatibility
 
-This version compatible with [4th of November 2020 update of TelegramBotAPI (version 5.0)](https://core.telegram.org/bots/api#november-4-2020).
+This version compatible with [9th of March 2021 update of TelegramBotAPI (version 5.1)](https://core.telegram.org/bots/api#march-9-2021).
 
 ## How to implement library?
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessageImpl.kt

@@ -20,5 +20,3 @@ data class ChannelContentMessageImpl<T: MessageContent>(
     override val senderBot: CommonBot?,
     override val authorSignature: AuthorSignature?
 ) : ChannelContentMessage<T>
-@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("ChannelContentMessageImpl", "dev.inmo.tgbotapi.types.message.ChannelContentMessageImpl"))
-typealias ChannelMessageImpl<T> = ChannelContentMessageImpl<T>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt

@@ -21,8 +21,6 @@ data class FromChannelGroupContentMessageImpl<T : MessageContent>(
     override val senderBot: CommonBot?,
     override val authorSignature: AuthorSignature?
 ) : FromChannelGroupContentMessage<T>
-@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("FromChannelGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.FromChannelGroupContentMessageImpl"))
-typealias FromChannelGroupMessageImpl<T> = FromChannelGroupContentMessageImpl<T>
 
 data class AnonymousGroupContentMessageImpl<T : MessageContent>(
     override val chat: GroupChat,
@@ -36,8 +34,6 @@ data class AnonymousGroupContentMessageImpl<T : MessageContent>(
     override val senderBot: CommonBot?,
     override val authorSignature: AuthorSignature?
 ) : AnonymousGroupContentMessage<T>
-@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("AnonymousGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.AnonymousGroupContentMessageImpl"))
-typealias AnonymousGroupMessageImpl<T> = AnonymousGroupContentMessageImpl<T>
 
 data class CommonGroupContentMessageImpl<T : MessageContent>(
     override val chat: GroupChat,
@@ -51,5 +47,3 @@ data class CommonGroupContentMessageImpl<T : MessageContent>(
     override val content: T,
     override val senderBot: CommonBot?
 ) : CommonGroupContentMessage<T>
-@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("CommonGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.CommonGroupContentMessageImpl"))
-typealias CommonGroupMessageImpl<T> = CommonGroupContentMessageImpl<T>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt

@@ -22,5 +22,3 @@ data class PrivateContentMessageImpl<T: MessageContent>(
     override val senderBot: CommonBot?,
     val paymentInfo: SuccessfulPaymentInfo?
 ) : PrivateContentMessage<T>
-@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PrivateContentMessageImpl", "dev.inmo.tgbotapi.types.message.PrivateContentMessageImpl"))
-typealias PrivateMessageImpl<T> = PrivateContentMessageImpl<T>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ChannelMessage.kt

@@ -9,5 +9,3 @@ interface ChannelContentMessage<T: MessageContent> : PossiblySentViaBotCommonMes
     override val senderChat: ChannelChat
         get() = chat
 }
-@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("ChannelContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.ChannelContentMessage"))
-typealias ChannelMessage<T> = ChannelContentMessage<T>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupMessages.kt

@@ -7,8 +7,6 @@ import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 interface GroupContentMessage<T : MessageContent> : PublicContentMessage<T> {
     override val chat: GroupChat
 }
-@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("GroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.GroupContentMessage"))
-typealias GroupMessage<T> = GroupContentMessage<T>
 
 
 interface FromChannelGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, SignedMessage, WithSenderChatMessage {
@@ -16,16 +14,10 @@ interface FromChannelGroupContentMessage<T : MessageContent> : GroupContentMessa
     override val senderChat: ChannelChat
         get() = channel
 }
-@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("FromChannelGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.FromChannelGroupContentMessage"))
-typealias FromChannelGroupMessage<T> = FromChannelGroupContentMessage<T>
 
 interface AnonymousGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, SignedMessage, WithSenderChatMessage {
     override val senderChat: GroupChat
         get() = chat
 }
-@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("AnonymousGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.AnonymousGroupContentMessage"))
-typealias AnonymousGroupMessage<T> = AnonymousGroupContentMessage<T>
 
 interface CommonGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, FromUserMessage
-@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("CommonGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.CommonGroupContentMessage"))
-typealias CommonGroupMessage<T> = CommonGroupContentMessage<T>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PrivateMessage.kt

@@ -4,5 +4,3 @@ import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage
 
 interface PrivateContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, FromUserMessage
-@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PrivateContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.PrivateContentMessage"))
-typealias PrivateMessage<T> = PrivateContentMessage<T>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PublicMessage.kt

@@ -7,5 +7,3 @@ import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommo
 interface PublicContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T> {
     override val chat: PublicChat
 }
-@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PublicContentMessage", "dev.inmo.tgbotapi.types.message.PublicContentMessage"))
-typealias PublicMessage<T> = PublicContentMessage<T>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt

@@ -30,37 +30,4 @@ data class TextContent(
         allowSendingWithoutReply,
         replyMarkup
     )
-
-    @Deprecated(
-        "Useless due to fact that createResend currently use textSource and that will guarantee correct sending of message",
-        ReplaceWith("createResend")
-    )
-    override fun createResends(
-        chatId: ChatIdentifier,
-        disableNotification: Boolean,
-        replyToMessageId: MessageIdentifier?,
-        allowSendingWithoutReply: Boolean?,
-        replyMarkup: KeyboardMarkup?
-    ): List<Request<ContentMessage<TextContent>>> = listOf(
-        createResend(
-            chatId,
-            disableNotification,
-            replyToMessageId,
-            allowSendingWithoutReply,
-            replyMarkup
-        )
-    )
-
-    @Deprecated(
-        "Useless due to fact that createResend currently use textSource and that will guarantee correct sending of message",
-        ReplaceWith("createResend")
-    )
-    fun createResends(
-        chatId: ChatIdentifier,
-        disableNotification: Boolean,
-        replyToMessageId: MessageIdentifier?,
-        allowSendingWithoutReply: Boolean?,
-        replyMarkup: KeyboardMarkup?,
-        parseMode: ParseMode = defaultParseMode
-    ): List<Request<ContentMessage<TextContent>>> = createResends(chatId, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/ResendableContent.kt

@@ -14,12 +14,4 @@ interface ResendableContent {
         allowSendingWithoutReply: Boolean? = null,
         replyMarkup: KeyboardMarkup? = null
     ): Request<out Message>
-
-    fun createResends(
-        chatId: ChatIdentifier,
-        disableNotification: Boolean = false,
-        replyToMessageId: MessageIdentifier? = null,
-        allowSendingWithoutReply: Boolean? = null,
-        replyMarkup: KeyboardMarkup? = null
-    ): List<Request<out Message>> = listOf(createResend(chatId, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup))
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StorageFile.kt

@@ -37,8 +37,6 @@ data class StorageFile(
 ) {
     val input: Input
         get() = inputSource()
-    @Deprecated("This method will be fully replaced with input property", ReplaceWith("input"))
-    fun asInput() = input
 }
 
 @Suppress("NOTHING_TO_INLINE")

tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChatMemberUpdated.kt

@@ -0,0 +1,65 @@
+package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
+
+import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
+import dev.inmo.tgbotapi.extensions.utils.asCallbackQueryUpdate
+import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.types.CallbackQuery.CallbackQuery
+import dev.inmo.tgbotapi.types.CallbackQuery.DataCallbackQuery
+import dev.inmo.tgbotapi.types.ChatMemberUpdated
+import dev.inmo.tgbotapi.types.update.CommonChatMemberUpdatedUpdate
+import dev.inmo.tgbotapi.types.update.MyChatMemberUpdatedUpdate
+import dev.inmo.tgbotapi.types.update.abstracts.ChatMemberUpdatedUpdate
+import kotlinx.coroutines.flow.toList
+
+typealias ChatMemberUpdatedMapper<T> = T.() -> T?
+
+private suspend inline fun <reified T : ChatMemberUpdatedUpdate> BehaviourContext.waitChatMemberUpdated(
+    count: Int = 1,
+    initRequest: Request<*>? = null,
+    noinline errorFactory: NullableRequestBuilder<*> = { null },
+    noinline mapper: ChatMemberUpdatedMapper<ChatMemberUpdated>
+): List<ChatMemberUpdated> = expectFlow(
+    initRequest,
+    count,
+    errorFactory
+) {
+    (it as? T) ?.data.let(::listOfNotNull)
+}.toList().toList()
+
+private suspend inline fun <reified T : ChatMemberUpdatedUpdate> BehaviourContext.waitChatMemberUpdatedWithFilter(
+    count: Int = 1,
+    initRequest: Request<*>? = null,
+    noinline errorFactory: NullableRequestBuilder<*> = { null },
+    noinline filter: ChatMemberUpdatedMapper<ChatMemberUpdated>? = null
+) : List<ChatMemberUpdated> = waitChatMemberUpdated<T>(
+    count,
+    initRequest,
+    errorFactory
+) {
+    if (filter == null) {
+        this
+    } else {
+        filter(this)
+    }
+}
+
+suspend fun BehaviourContext.waitChatMemberUpdated(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: ChatMemberUpdatedMapper<ChatMemberUpdated>? = null
+) = waitChatMemberUpdatedWithFilter<ChatMemberUpdatedUpdate>(count, initRequest, errorFactory, filter)
+
+suspend fun BehaviourContext.waitCommonChatMemberUpdated(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: ChatMemberUpdatedMapper<ChatMemberUpdated>? = null
+) = waitChatMemberUpdatedWithFilter<CommonChatMemberUpdatedUpdate>(count, initRequest, errorFactory, filter)
+
+suspend fun BehaviourContext.waitMyChatMemberUpdated(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: ChatMemberUpdatedMapper<ChatMemberUpdated>? = null
+) = waitChatMemberUpdatedWithFilter<MyChatMemberUpdatedUpdate>(count, initRequest, errorFactory, filter)

tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatMemberUpdatedTriggers.kt

@@ -0,0 +1,61 @@
+package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
+
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.tgbotapi.extensions.behaviour_builder.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.expectFlow
+import dev.inmo.tgbotapi.extensions.utils.asChatMemberUpdatedUpdate
+import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
+import dev.inmo.tgbotapi.types.ChatMemberUpdated
+import dev.inmo.tgbotapi.types.update.CommonChatMemberUpdatedUpdate
+import dev.inmo.tgbotapi.types.update.MyChatMemberUpdatedUpdate
+import dev.inmo.tgbotapi.types.update.abstracts.ChatMemberUpdatedUpdate
+
+internal suspend inline fun <reified U : ChatMemberUpdatedUpdate> BehaviourContext.onChatMemberUpdatedInternal(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    noinline additionalFilter: (suspend (ChatMemberUpdated) -> Boolean)? = null,
+    noinline scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatMemberUpdated>
+) = flowsUpdatesFilter.expectFlow(bot) {
+    (it as? U) ?.data ?.let { chatMemberUpdated ->
+        if (additionalFilter == null || additionalFilter(chatMemberUpdated)) chatMemberUpdated else null
+    }.let(::listOfNotNull)
+}.subscribeSafelyWithoutExceptions(scope) { triggerChatMemberUpdated ->
+    doInSubContextWithUpdatesFilter(
+        updatesFilter = if (includeFilterByChatInBehaviourSubContext) {
+            { it.sourceChat() ?.id ?.chatId == triggerChatMemberUpdated.chat.id.chatId }
+        } else {
+            null
+        }
+    ) {
+        scenarioReceiver(triggerChatMemberUpdated)
+    }
+}
+
+suspend fun BehaviourContext.onChatMemberUpdated(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatMemberUpdated) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatMemberUpdated>
+) = onChatMemberUpdatedInternal<ChatMemberUpdatedUpdate>(
+    includeFilterByChatInBehaviourSubContext,
+    additionalFilter,
+    scenarioReceiver
+)
+
+suspend fun BehaviourContext.onCommonChatMemberUpdated(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatMemberUpdated) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatMemberUpdated>
+) = onChatMemberUpdatedInternal<CommonChatMemberUpdatedUpdate>(
+    includeFilterByChatInBehaviourSubContext,
+    additionalFilter,
+    scenarioReceiver
+)
+
+suspend fun BehaviourContext.onMyChatMemberUpdated(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatMemberUpdated) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatMemberUpdated>
+) = onChatMemberUpdatedInternal<MyChatMemberUpdatedUpdate>(
+    includeFilterByChatInBehaviourSubContext,
+    additionalFilter,
+    scenarioReceiver
+)

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt

@@ -398,40 +398,24 @@ inline fun SecureValue.asSecureValueWithTranslations(): SecureValueWithTranslati
 inline fun SecureValue.requireSecureValueWithTranslations(): SecureValueWithTranslations = this as SecureValueWithTranslations
 @PreviewFeature
 inline fun Message.asAnonymousGroupContentMessageImpl(): AnonymousGroupContentMessageImpl<MessageContent>? = this as? AnonymousGroupContentMessageImpl<MessageContent>
-@Deprecated("Renamed", ReplaceWith("asAnonymousGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asAnonymousGroupContentMessageImpl"))
-inline fun Message.asAnonymousGroupMessageImpl() = asAnonymousGroupContentMessageImpl()
 @PreviewFeature
 inline fun Message.requireAnonymousGroupContentMessageImpl(): AnonymousGroupContentMessageImpl<MessageContent> = this as AnonymousGroupContentMessageImpl<MessageContent>
-@Deprecated("Renamed", ReplaceWith("requireAnonymousGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requireAnonymousGroupContentMessageImpl"))
-inline fun Message.requireAnonymousGroupMessageImpl() = requireAnonymousGroupContentMessageImpl()
 @PreviewFeature
 inline fun Message.asChannelContentMessageImpl(): ChannelContentMessageImpl<MessageContent>? = this as? ChannelContentMessageImpl<MessageContent>
-@Deprecated("Renamed", ReplaceWith("asChannelContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asChannelContentMessageImpl"))
-inline fun Message.asChannelMessageImpl() = asChannelContentMessageImpl()
 @PreviewFeature
 inline fun Message.requireChannelContentMessageImpl(): ChannelContentMessageImpl<MessageContent> = this as ChannelContentMessageImpl<MessageContent>
-@Deprecated("Renamed", ReplaceWith("requireChannelContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requireChannelContentMessageImpl"))
-inline fun Message.requireChannelMessageImpl() = requireChannelContentMessageImpl()
 @PreviewFeature
 inline fun Message.asFromChannelGroupContentMessageImpl(): FromChannelGroupContentMessageImpl<MessageContent>? = this as? FromChannelGroupContentMessageImpl<MessageContent>
-@Deprecated("Renamed", ReplaceWith("asFromChannelGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asFromChannelGroupContentMessageImpl"))
-inline fun Message.asFromChannelGroupMessageImpl() = asFromChannelGroupContentMessageImpl()
 @PreviewFeature
 inline fun Message.requireFromChannelGroupContentMessageImpl(): FromChannelGroupContentMessageImpl<MessageContent> = this as FromChannelGroupContentMessageImpl<MessageContent>
-@Deprecated("Renamed", ReplaceWith("requireFromChannelGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requireFromChannelGroupContentMessageImpl"))
-inline fun Message.requireFromChannelGroupMessageImpl() = requireFromChannelGroupContentMessageImpl()
 @PreviewFeature
 inline fun Message.asPassportMessage(): PassportMessage? = this as? PassportMessage
 @PreviewFeature
 inline fun Message.requirePassportMessage(): PassportMessage = this as PassportMessage
 @PreviewFeature
 inline fun Message.asPrivateContentMessageImpl(): PrivateContentMessageImpl<MessageContent>? = this as? PrivateContentMessageImpl<MessageContent>
-@Deprecated("Renamed", ReplaceWith("asPrivateContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asPrivateContentMessageImpl"))
-inline fun Message.asPrivateMessageImpl() = asPrivateContentMessageImpl()
 @PreviewFeature
 inline fun Message.requirePrivateContentMessageImpl(): PrivateContentMessageImpl<MessageContent> = this as PrivateContentMessageImpl<MessageContent>
-@Deprecated("Renamed", ReplaceWith("requirePrivateContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requirePrivateContentMessageImpl"))
-inline fun Message.requirePrivateMessageImpl() = requirePrivateContentMessageImpl()
 @PreviewFeature
 inline fun Message.asChannelEventMessage(): ChannelEventMessage<ChannelEvent>? = this as? ChannelEventMessage<ChannelEvent>
 @PreviewFeature
@@ -454,32 +438,20 @@ inline fun Message.asCommonSupergroupEventMessage(): CommonSupergroupEventMessag
 inline fun Message.requireCommonSupergroupEventMessage(): CommonSupergroupEventMessage<SupergroupEvent> = this as CommonSupergroupEventMessage<SupergroupEvent>
 @PreviewFeature
 inline fun Message.asAnonymousGroupContentMessage(): AnonymousGroupContentMessage<MessageContent>? = this as? AnonymousGroupContentMessage<MessageContent>
-@Deprecated("Renamed", ReplaceWith("asAnonymousGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asAnonymousGroupContentMessage"))
-inline fun Message.asAnonymousGroupMessage() = asAnonymousGroupContentMessage()
 @PreviewFeature
 inline fun Message.requireAnonymousGroupContentMessage(): AnonymousGroupContentMessage<MessageContent> = this as AnonymousGroupContentMessage<MessageContent>
-@Deprecated("Renamed", ReplaceWith("requireAnonymousGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireAnonymousGroupContentMessage"))
-inline fun Message.requireAnonymousGroupMessage() = requireAnonymousGroupContentMessage()
 @PreviewFeature
 inline fun Message.asChannelContentMessage(): ChannelContentMessageImpl<MessageContent>? = this as? ChannelContentMessageImpl<MessageContent>
-@Deprecated("Renamed", ReplaceWith("asChannelContentMessage", "dev.inmo.tgbotapi.extensions.utils.asChannelContentMessage"))
-inline fun Message.asChannelMessage() = asChannelContentMessage()
 @PreviewFeature
 inline fun Message.requireChannelContentMessage(): ChannelContentMessageImpl<MessageContent> = this as ChannelContentMessageImpl<MessageContent>
-@Deprecated("Renamed", ReplaceWith("requireChannelContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireChannelContentMessage"))
-inline fun Message.requireChannelMessage() = requireChannelContentMessage()
 @PreviewFeature
 inline fun Message.asChatEventMessage(): ChatEventMessage<ChatEvent>? = this as? ChatEventMessage<ChatEvent>
 @PreviewFeature
 inline fun Message.requireChatEventMessage(): ChatEventMessage<ChatEvent> = this as ChatEventMessage<ChatEvent>
 @PreviewFeature
 inline fun Message.asCommonGroupContentMessage(): CommonGroupContentMessage<MessageContent>? = this as? CommonGroupContentMessage<MessageContent>
-@Deprecated("Renamed", ReplaceWith("asCommonGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asCommonGroupContentMessage"))
-inline fun Message.asCommonGroupMessage() = asCommonGroupContentMessage()
 @PreviewFeature
 inline fun Message.requireCommonGroupContentMessage(): CommonGroupContentMessage<MessageContent> = this as CommonGroupContentMessage<MessageContent>
-@Deprecated("Renamed", ReplaceWith("requireCommonGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireCommonGroupContentMessage"))
-inline fun Message.requireCommonGroupMessage() = requireCommonGroupContentMessage()
 @PreviewFeature
 inline fun Message.asCommonMessage(): CommonMessage<MessageContent>? = this as? CommonMessage<MessageContent>
 @PreviewFeature
@@ -490,24 +462,16 @@ inline fun Message.asContentMessage(): ContentMessage<MessageContent>? = this as
 inline fun Message.requireContentMessage(): ContentMessage<MessageContent> = this as ContentMessage<MessageContent>
 @PreviewFeature
 inline fun Message.asFromChannelGroupContentMessage(): FromChannelGroupContentMessage<MessageContent>? = this as? FromChannelGroupContentMessage<MessageContent>
-@Deprecated("Renamed", ReplaceWith("asFromChannelGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asFromChannelGroupContentMessage"))
-inline fun Message.asFromChannelGroupMessage() = asFromChannelGroupContentMessage()
 @PreviewFeature
 inline fun Message.requireFromChannelGroupContentMessage(): FromChannelGroupContentMessage<MessageContent> = this as FromChannelGroupContentMessage<MessageContent>
-@Deprecated("Renamed", ReplaceWith("requireFromChannelGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireFromChannelGroupContentMessage"))
-inline fun Message.requireFromChannelGroupMessage() = requireFromChannelGroupContentMessage()
 @PreviewFeature
 inline fun Message.asGroupEventMessage(): GroupEventMessage<GroupEvent>? = this as? GroupEventMessage<GroupEvent>
 @PreviewFeature
 inline fun Message.requireGroupEventMessage(): GroupEventMessage<GroupEvent> = this as GroupEventMessage<GroupEvent>
 @PreviewFeature
 inline fun Message.asGroupContentMessage(): GroupContentMessage<MessageContent>? = this as? GroupContentMessage<MessageContent>
-@Deprecated("Renamed", ReplaceWith("asGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asGroupContentMessage"))
-inline fun Message.asGroupMessage() = asGroupContentMessage()
 @PreviewFeature
 inline fun Message.requireGroupContentMessage(): GroupContentMessage<MessageContent> = this as GroupContentMessage<MessageContent>
-@Deprecated("Renamed", ReplaceWith("requireGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireGroupContentMessage"))
-inline fun Message.requireGroupMessage() = requireGroupContentMessage()
 @PreviewFeature
 inline fun Message.asMediaGroupMessage(): MediaGroupMessage<MediaGroupContent>? = this as? MediaGroupMessage<MediaGroupContent>
 @PreviewFeature
@@ -526,20 +490,12 @@ inline fun Message.asPossiblyPaymentMessage(): PossiblyPaymentMessage? = this as
 inline fun Message.requirePossiblyPaymentMessage(): PossiblyPaymentMessage = this as PossiblyPaymentMessage
 @PreviewFeature
 inline fun Message.asPrivateContentMessage(): PrivateContentMessage<MessageContent>? = this as? PrivateContentMessage<MessageContent>
-@Deprecated("Renamed", ReplaceWith("asPrivateContentMessage", "dev.inmo.tgbotapi.extensions.utils.asPrivateContentMessage"))
-inline fun Message.asPrivateMessage() = asPrivateContentMessage()
 @PreviewFeature
 inline fun Message.requirePrivateContentMessage(): PrivateContentMessage<MessageContent> = this as PrivateContentMessage<MessageContent>
-@Deprecated("Renamed", ReplaceWith("requirePrivateContentMessage", "dev.inmo.tgbotapi.extensions.utils.requirePrivateContentMessage"))
-inline fun Message.requirePrivateMessage() = requirePrivateContentMessage()
 @PreviewFeature
 inline fun Message.asPublicContentMessage(): PublicContentMessage<MessageContent>? = this as? PublicContentMessage<MessageContent>
-@Deprecated("Renamed", ReplaceWith("asPublicContentMessage", "dev.inmo.tgbotapi.extensions.utils.asPublicContentMessage"))
-inline fun Message.asPublicMessage() = asPublicContentMessage()
 @PreviewFeature
 inline fun Message.requirePublicContentMessage(): PublicContentMessage<MessageContent> = this as PublicContentMessage<MessageContent>
-@Deprecated("Renamed", ReplaceWith("requirePublicContentMessage", "dev.inmo.tgbotapi.extensions.utils.requirePublicContentMessage"))
-inline fun Message.requirePublicMessage() = requirePublicContentMessage()
 @PreviewFeature
 inline fun Message.asSignedMessage(): SignedMessage? = this as? SignedMessage
 @PreviewFeature

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ContentMessageConversations.kt

@@ -13,16 +13,6 @@ private inline fun <reified T : MessageContent> Flow<ContentMessage<*>>.withCont
     it.withContent<T>()
 }
 
-@Deprecated("This method will be removed in next major update")
-fun <T : MessageContent> Flow<ContentMessage<*>>.withContentType(contentType: KClass<T>) = mapNotNull {
-    if (contentType.isInstance(it.content)) {
-        @Suppress("UNCHECKED_CAST")
-        it as ContentMessage<T>
-    } else {
-        null
-    }
-}
-
 fun Flow<ContentMessage<*>>.onlyAnimationContentMessages() = withContentType<AnimationContent>()
 fun Flow<ContentMessage<*>>.onlyAudioContentMessages() = withContentType<AudioContent>()
 fun Flow<ContentMessage<*>>.onlyContactContentMessages() = withContentType<ContactContent>()

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/SlotMachineUtils.kt

@@ -16,8 +16,6 @@ enum class SlotMachineReelImage(val text: String, val number: Int) {
     LEMON("\uD83C\uDF4B", 2),
     SEVEN("7", 3)
 }
-@Deprecated("Renamed", ReplaceWith("SlotMachineReelImage", "dev.inmo.tgbotapi.extensions.utils.SlotMachineReelImage"))
-typealias SlotMachineReelImages = SlotMachineReelImage
 
 /**
  * @return First [SlotMachineReelImage] with [SlotMachineReelImage.number] equal to receiver OR [SlotMachineReelImage.SEVEN]

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt

@@ -158,26 +158,6 @@ fun TelegramBot.longPolling(
     flowUpdatesPreset: FlowsUpdatesFilter.() -> Unit
 ): Job = longPolling(FlowsUpdatesFilter(flowsUpdatesFilterUpdatesKeeperCount).apply(flowUpdatesPreset), timeoutSeconds, scope, exceptionsHandler)
 
-/**
- * This method will create a new one [FlowsUpdatesFilter]. This method could be unsafe due to the fact that it will start
- * getting updates IMMEDIATELY. That means that your bot will be able to skip some of them until you will call
- * [kotlinx.coroutines.flow.Flow.collect] on one of [FlowsUpdatesFilter] flows. To avoid it, you can pass
- * [flowUpdatesPreset] lambda - it will be called BEFORE starting updates getting
- */
-@FlowPreview
-@Deprecated("Will be removed soon", ReplaceWith("longPolling", "dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling"))
-@Suppress("unused")
-fun RequestsExecutor.startGettingFlowsUpdatesByLongPolling(
-    timeoutSeconds: Seconds = 30,
-    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
-    exceptionsHandler: ExceptionHandler<Unit>? = null,
-    flowsUpdatesFilterUpdatesKeeperCount: Int = 100,
-    flowUpdatesPreset: FlowsUpdatesFilter.() -> Unit = {}
-): FlowsUpdatesFilter = FlowsUpdatesFilter(flowsUpdatesFilterUpdatesKeeperCount).apply {
-    flowUpdatesPreset()
-    startGettingOfUpdatesByLongPolling(timeoutSeconds, scope, exceptionsHandler, allowedUpdates, asUpdateReceiver)
-}
-
 fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
     updatesFilter: UpdatesFilter,
     timeoutSeconds: Seconds = 30,
@@ -190,88 +170,3 @@ fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
     updatesFilter.allowedUpdates,
     updatesFilter.asUpdateReceiver
 )
-
-@Deprecated("Will be removed soon", ReplaceWith("longPolling", "dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling"))
-fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
-    messageCallback: UpdateReceiver<MessageUpdate>? = null,
-    messageMediaGroupCallback: UpdateReceiver<MessageMediaGroupUpdate>? = null,
-    editedMessageCallback: UpdateReceiver<EditMessageUpdate>? = null,
-    editedMessageMediaGroupCallback: UpdateReceiver<EditMessageMediaGroupUpdate>? = null,
-    channelPostCallback: UpdateReceiver<ChannelPostUpdate>? = null,
-    channelPostMediaGroupCallback: UpdateReceiver<ChannelPostMediaGroupUpdate>? = null,
-    editedChannelPostCallback: UpdateReceiver<EditChannelPostUpdate>? = null,
-    editedChannelPostMediaGroupCallback: UpdateReceiver<EditChannelPostMediaGroupUpdate>? = null,
-    chosenInlineResultCallback: UpdateReceiver<ChosenInlineResultUpdate>? = null,
-    inlineQueryCallback: UpdateReceiver<InlineQueryUpdate>? = null,
-    callbackQueryCallback: UpdateReceiver<CallbackQueryUpdate>? = null,
-    shippingQueryCallback: UpdateReceiver<ShippingQueryUpdate>? = null,
-    preCheckoutQueryCallback: UpdateReceiver<PreCheckoutQueryUpdate>? = null,
-    pollCallback: UpdateReceiver<PollUpdate>? = null,
-    pollAnswerCallback: UpdateReceiver<PollAnswerUpdate>? = null,
-    timeoutSeconds: Seconds = 30,
-    exceptionsHandler: ExceptionHandler<Unit>? = null,
-    scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
-): Job {
-    return startGettingOfUpdatesByLongPolling(
-        SimpleUpdatesFilter(
-            messageCallback,
-            messageMediaGroupCallback,
-            editedMessageCallback,
-            editedMessageMediaGroupCallback,
-            channelPostCallback,
-            channelPostMediaGroupCallback,
-            editedChannelPostCallback,
-            editedChannelPostMediaGroupCallback,
-            chosenInlineResultCallback,
-            inlineQueryCallback,
-            callbackQueryCallback,
-            shippingQueryCallback,
-            preCheckoutQueryCallback,
-            pollCallback,
-            pollAnswerCallback
-        ),
-        timeoutSeconds,
-        exceptionsHandler,
-        scope
-    )
-}
-
-@Deprecated("Will be removed soon", ReplaceWith("longPolling", "dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling"))
-@Suppress("unused")
-fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
-    messageCallback: UpdateReceiver<MessageUpdate>? = null,
-    mediaGroupCallback: UpdateReceiver<MediaGroupUpdate>? = null,
-    editedMessageCallback: UpdateReceiver<EditMessageUpdate>? = null,
-    channelPostCallback: UpdateReceiver<ChannelPostUpdate>? = null,
-    editedChannelPostCallback: UpdateReceiver<EditChannelPostUpdate>? = null,
-    chosenInlineResultCallback: UpdateReceiver<ChosenInlineResultUpdate>? = null,
-    inlineQueryCallback: UpdateReceiver<InlineQueryUpdate>? = null,
-    callbackQueryCallback: UpdateReceiver<CallbackQueryUpdate>? = null,
-    shippingQueryCallback: UpdateReceiver<ShippingQueryUpdate>? = null,
-    preCheckoutQueryCallback: UpdateReceiver<PreCheckoutQueryUpdate>? = null,
-    pollCallback: UpdateReceiver<PollUpdate>? = null,
-    pollAnswerCallback: UpdateReceiver<PollAnswerUpdate>? = null,
-    timeoutSeconds: Seconds = 30,
-    exceptionsHandler: ExceptionHandler<Unit>? = null,
-    scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
-): Job = startGettingOfUpdatesByLongPolling(
-    messageCallback = messageCallback,
-    messageMediaGroupCallback = mediaGroupCallback,
-    editedMessageCallback = editedMessageCallback,
-    editedMessageMediaGroupCallback = mediaGroupCallback,
-    channelPostCallback = channelPostCallback,
-    channelPostMediaGroupCallback = mediaGroupCallback,
-    editedChannelPostCallback = editedChannelPostCallback,
-    editedChannelPostMediaGroupCallback = mediaGroupCallback,
-    chosenInlineResultCallback = chosenInlineResultCallback,
-    inlineQueryCallback = inlineQueryCallback,
-    callbackQueryCallback = callbackQueryCallback,
-    shippingQueryCallback = shippingQueryCallback,
-    preCheckoutQueryCallback = preCheckoutQueryCallback,
-    pollCallback = pollCallback,
-    pollAnswerCallback = pollAnswerCallback,
-    timeoutSeconds = timeoutSeconds,
-    exceptionsHandler = exceptionsHandler,
-    scope = scope
-)
-