Merge branch '0.33.4' into klassindex

2024-11-30 14:08:44 +00:00 · 2021-04-16 18:08:21 +06:00 · 2021-04-16 18:08:21 +06:00 · aed93a4c91
commit aed93a4c91
parent b7f8e0217f 5451adf4ac
85 changed files with 833 additions and 328 deletions
--- a/.github/workflows/kdocs.yml
+++ b/.github/workflows/kdocs.yml
@ -0,0 +1,21 @@
+name: Publish KDocs
+on:
+  push:
+    branches:
+      - master
+jobs:
+  publishing:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build
+        run: ./gradlew dokkaHtml
+      - name: Publish KDocs
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs/build/dokka/html
+          publish_branch: kdocs
--- a/.github/workflows/packages_publishing.yml
+++ b/.github/workflows/packages_publishing.yml
@ -1,4 +1,3 @@
-
 name: Publish package to GitHub Packages
 on: [push]
 jobs:
@ -15,8 +14,10 @@ jobs:
          cat gradle.properties | sed -e "s/^library_version=\([0-9\.]*\)/library_version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp
          rm gradle.properties
          mv gradle.properties.tmp gradle.properties
-      - name: Build and publish
-        run: ./gradlew clean build publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication
+      - name: Build
+        run: ./gradlew build
+      - name: Publish
+        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication
        env:
          GITHUBPACKAGES_USER: ${{ github.actor }}
          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,14 +1,88 @@
 # TelegramBotAPI changelog

-## 0.32.10
+## 0.33.4
+
+* `Common`:
+    * `Version`:
+        * `uuid`: `0.2.3` -> `0.2.4`
+        * `MicroUtils`: `0.4.33` -> `0.4.35`
+* `Core`:
+    * All `TextSource` implementators have become `Serializable`
+        * New serializer `TextSourceSerializer`
+    * Interface`FromUserMessage` now extends `Message`
+    * New interface `FromUser`
+        * Interface `FromUserMessage` now extends `FromUser`
+* `Extensions Utils`
+    * Fixes in `parseCommandsWithParams`
+
+## 0.33.3
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.4.32` -> `0.4.33`
+        * `Ktor`: `1.5.2` -> `1.5.3`
+* `API`:
+    * Bot actions DSL (fix for [#358](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/358))
+* `Behaviour Builder`:
+    * Rewrite logic of `doInSubContextWithUpdatesFilter` and `doInSubContextWithFlowsUpdatesFilterSetup` extensions
+    * All triggers now work with `stopOnCompletion` set up to `false`
+
+## 0.33.2
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.4.30` -> `0.4.32`
+* `Behaviour Builder`:
+    * New typealias `MediaGroupFilter` has been added for `MediaGroup` expectators
+    * Several typealiases became `suspend`:
+        * `CallbackQueryMapper`
+        * `ChatMemberUpdatedMapper`
+        * `InlineQueryMapper`
+    * Commands got an additional parameter - `additionalFilter`. It will be called when all command filters were passed
+
+## 0.33.1
+
+* `Common`:
+    * `Version`:
+        * `Kotlin`: `1.4.31` -> `1.4.32`
+        * `MicroUtils`: `0.4.29` -> `0.4.30`
+        * `Klocks`: `2.0.6` -> `2.0.7`
+* `Utils Extensions`:
+    * Add extensions `parseCommandsWithParams`
+
+## 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

--- a/docs/build.gradle
+++ b/docs/build.gradle
@ -36,7 +36,7 @@ kotlin {
            dependencies {
                implementation kotlin('stdlib')

-                project.parent.subprojects.forEach {
+                rootProject.subprojects.forEach {
                    if (it != project) {
                        api it
                    }
@ -56,7 +56,7 @@ private List<SourceDirectorySet> findSourcesWithName(String... approximateNames)
        }.collect { it.kotlin }
 }

-tasks.dokkaHtml {
+Object callback = {
    switch (true) {
        case project.hasProperty("DOKKA_PATH"):
            outputDirectory = project.property("DOKKA_PATH").toString()
@ -82,11 +82,14 @@ tasks.dokkaHtml {
        }

        named("jsMain") {
-            sourceRoots.setFrom(findSourcesWithName("jsMain", "commonMain"))
+            sourceRoots.setFrom(findSourcesWithName("jsMain"))
        }

        named("jvmMain") {
-            sourceRoots.setFrom(findSourcesWithName("jvmMain", "commonMain"))
+            sourceRoots.setFrom(findSourcesWithName("jvmMain"))
        }
    }
 }
+
+tasks.dokkaGfm(callback)
+tasks.dokkaHtml(callback)
--- a/docs/gradle.properties
+++ b/docs/gradle.properties
@ -1,3 +1,3 @@
-dokka_version=1.4.20
+dokka_version=1.4.30

 org.gradle.jvmargs=-Xmx1024m
--- a/gradle.properties
+++ b/gradle.properties
@ -5,18 +5,18 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true

-kotlin_version=1.4.31
+kotlin_version=1.4.32
 kotlin_coroutines_version=1.4.3
 kotlin_serialisation_runtime_version=1.1.0
-klock_version=2.0.6
-uuid_version=0.2.3
-ktor_version=1.5.2
+klock_version=2.0.7
+uuid_version=0.2.4
+ktor_version=1.5.3

-micro_utils_version=0.4.29
+micro_utils_version=0.4.35

 javax_activation_version=1.1.1

 library_group=dev.inmo
-library_version=0.32.10
+library_version=0.33.4

 github_release_plugin_version=2.2.12
--- a/settings.gradle
+++ b/settings.gradle
@ -1,4 +1,11 @@
 pluginManagement {
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "org.jetbrains.dokka") {
+                useModule("org.jetbrains.dokka:dokka-gradle-plugin:${requested.version}")
+            }
+        }
+    }
    repositories {
        gradlePluginPortal()
        jcenter()
--- a/tgbotapi.core/README.md
+++ b/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-changelog#march-9-2021).

 ## How to implement library?

--- a/tgbotapi.core/build.gradle
+++ b/tgbotapi.core/build.gradle
@ -54,6 +54,7 @@ kotlin {
                api "dev.inmo:micro_utils.coroutines:$micro_utils_version"
                api "dev.inmo:micro_utils.serialization.base64:$micro_utils_version"
                api "dev.inmo:micro_utils.serialization.encapsulator:$micro_utils_version"
+                api "dev.inmo:micro_utils.serialization.typed_serializer:$micro_utils_version"

                api "io.ktor:ktor-client-core:$ktor_version"
                api "com.github.matfax.klassindex:library:4.+"
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt
@ -6,6 +6,7 @@ interface Captioned {
    val caption: String?
 }

+@Deprecated("This interface is not used in library and will be removed soon")
 interface CaptionedOutput : Captioned {
    val parseMode: ParseMode?
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/FromUser.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/FromUser.kt
@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.CommonAbstracts
+
+import dev.inmo.tgbotapi.types.User
+
+interface FromUser {
+    val user: User
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt
@ -1,14 +1,17 @@
 package dev.inmo.tgbotapi.CommonAbstracts

+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourceSerializer
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.regular
 import dev.inmo.tgbotapi.types.MessageEntity.toTextParts
 import dev.inmo.tgbotapi.types.captionLength
 import dev.inmo.tgbotapi.types.textLength
+import kotlinx.serialization.Serializable

 const val DirectInvocationOfTextSourceConstructor = "It is strongly not recommended to use constructors directly instead of factory methods"

 typealias TextSourcesList = List<TextSource>

+@Serializable(TextSourceSerializer::class)
 interface TextSource {
    val markdown: String
    val markdownV2: String
@ -17,6 +20,10 @@ interface TextSource {

    val asText: String
        get() = source
+
+    companion object {
+        fun serializer() = TextSourceSerializer
+    }
 }

@Suppress("NOTHING_TO_INLINE")
@ -28,8 +35,13 @@ inline operator fun TextSource.plus(text: String) = listOf(this, regular(text))
@Suppress("NOTHING_TO_INLINE")
 inline operator fun List<TextSource>.plus(text: String) = this + regular(text)

+@Serializable(TextSourceSerializer::class)
 interface MultilevelTextSource : TextSource {
    val subsources: List<TextSource>
+
+    companion object {
+        fun serializer() = TextSourceSerializer
+    }
 }

 data class TextPart(
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/exceptions/RequestException.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/exceptions/RequestException.kt
@ -12,7 +12,7 @@ fun newRequestException(
    cause: Throwable? = null
 ) = response.description ?.let { description ->
    when {
-        description == "Bad Request: reply message not found" -> ReplyMessageNotFoundException(response, plainAnswer, message, cause)
+        description == "Bad Request: reply message not found" || description == "Bad Request: replied message not found" -> ReplyMessageNotFoundException(response, plainAnswer, message, cause)
        description == "Bad Request: message to edit not found" -> MessageToEditNotFoundException(response, plainAnswer, message, cause)
        description.contains("Bad Request: message is not modified") -> MessageIsNotModifiedException(response, plainAnswer, message, cause)
        description == "Unauthorized" -> UnauthorizedException(response, plainAnswer, message, cause)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/SetPassportDataErrors.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/SetPassportDataErrors.kt
@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.requests

-import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.passport.PassportElementError
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/abstracts/ChatInviteLinkRequest.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/abstracts/ChatInviteLinkRequest.kt
@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.DeserializationStrategy

 interface ChatInviteLinkRequest : SimpleRequest<CommonInviteLink> {
-    val chatId: ChatId
+    val chatId: ChatIdentifier

    override val resultDeserializer: DeserializationStrategy<CommonInviteLink>
        get() = CommonInviteLink.serializer()
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/invite_links/CreateChatInviteLink.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/invite_links/CreateChatInviteLink.kt
@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.invite_links

-import com.soywiz.klock.*
+import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.requests.chat.abstracts.EditChatInviteLinkRequest
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*
@ -8,14 +8,14 @@ import kotlinx.serialization.*
@Serializable
 data class CreateChatInviteLink(
    @SerialName(chatIdField)
-    override val chatId: ChatId,
+    override val chatId: ChatIdentifier,
    @SerialName(expireDateField)
-    private val expirationUnixTimeStamp: UnixTimeStamp? = null,
+    private val expirationUnixTimeStamp: TelegramDate? = null,
    @SerialName(memberLimitField)
    override val membersLimit: MembersLimit? = null
 ) : EditChatInviteLinkRequest {
    override val expireDate: DateTime?
-        get() = expirationUnixTimeStamp ?.seconds ?.let { DateTime(it.milliseconds) }
+        get() = expirationUnixTimeStamp ?.asDate
    override val requestSerializer: SerializationStrategy<*>
        get() = serializer()

@ -27,5 +27,5 @@ fun CreateChatInviteLink(
    expireDate: DateTime,
    membersLimit: MembersLimit? = null
 ): CreateChatInviteLink = CreateChatInviteLink(
-    chatId, expireDate.unixMillisDouble.milliseconds.seconds.toLong(), membersLimit
+    chatId, expireDate.toTelegramDate(), membersLimit
 )
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/invite_links/EditChatInviteLink.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/invite_links/EditChatInviteLink.kt
@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.invite_links

-import com.soywiz.klock.*
+import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.requests.chat.abstracts.EditChatInviteLinkRequest
 import dev.inmo.tgbotapi.requests.chat.abstracts.KnownChatInviteLinkRequest
 import dev.inmo.tgbotapi.types.*
@ -9,16 +9,16 @@ import kotlinx.serialization.*
@Serializable
 data class EditChatInviteLink(
    @SerialName(chatIdField)
-    override val chatId: ChatId,
+    override val chatId: ChatIdentifier,
    @SerialName(inviteLinkField)
    override val inviteLink: String,
    @SerialName(expireDateField)
-    private val expirationUnixTimeStamp: UnixTimeStamp? = null,
+    private val expirationUnixTimeStamp: TelegramDate? = null,
    @SerialName(memberLimitField)
    override val membersLimit: MembersLimit? = null
 ) : EditChatInviteLinkRequest, KnownChatInviteLinkRequest {
    override val expireDate: DateTime?
-        get() = expirationUnixTimeStamp ?.seconds ?.let { DateTime(it.milliseconds) }
+        get() = expirationUnixTimeStamp ?.asDate
    override val requestSerializer: SerializationStrategy<*>
        get() = serializer()

@ -26,10 +26,10 @@ data class EditChatInviteLink(
 }

 fun EditChatInviteLink(
-    chatId: ChatId,
+    chatId: ChatIdentifier,
    inviteLink: String,
    expireDate: DateTime,
    membersLimit: MembersLimit? = null
 ): EditChatInviteLink = EditChatInviteLink(
-    chatId, inviteLink, expireDate.unixMillisDouble.milliseconds.seconds.toLong(), membersLimit
+    chatId, inviteLink, expireDate.toTelegramDate(), membersLimit
 )
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/invite_links/RevokeChatInviteLink.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/invite_links/RevokeChatInviteLink.kt
@ -1,7 +1,5 @@
 package dev.inmo.tgbotapi.requests.chat.invite_links

-import com.soywiz.klock.*
-import dev.inmo.tgbotapi.requests.chat.abstracts.EditChatInviteLinkRequest
 import dev.inmo.tgbotapi.requests.chat.abstracts.KnownChatInviteLinkRequest
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*
@ -9,7 +7,7 @@ import kotlinx.serialization.*
@Serializable
 data class RevokeChatInviteLink(
    @SerialName(chatIdField)
-    override val chatId: ChatId,
+    override val chatId: ChatIdentifier,
    @SerialName(inviteLinkField)
    override val inviteLink: String
 ) : KnownChatInviteLinkRequest {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt
@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.requests.send.polls

 import com.soywiz.klock.DateTime
-import com.soywiz.klock.TimeSpan
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt
@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types

 import dev.inmo.micro_utils.common.Warning
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import kotlinx.serialization.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatInviteLink.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatInviteLink.kt
@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.types

-import com.soywiz.klock.*
+import com.soywiz.klock.DateTime
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt
@ -80,6 +80,8 @@ val openPeriodPollSecondsLimit = 5 .. 600

 val membersLimit = 1 .. 99999

+const val botActionActualityTime: Seconds = 5
+
 // Made as lazy for correct work in K/JS
 val telegramInlineModeGifPermittedMimeTypes by lazy {
    listOf(
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BoldTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BoldTextSource.kt
@ -3,10 +3,13 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable

 /**
 * @see bold
 */
+@Serializable
 data class BoldTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
    override val subsources: List<TextSource>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BotCommandTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BotCommandTextSource.kt
@ -4,12 +4,14 @@ import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
 import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 private val commandRegex = Regex("[/!][^@\\s]*")

 /**
 * @see botCommand
 */
+@Serializable
 data class BotCommandTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String
 ) : TextSource {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CashTagTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CashTagTextSource.kt
@ -3,10 +3,12 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 /**
 * @see cashTag
 */
+@Serializable
 data class CashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
    override val subsources: List<TextSource>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CodeTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CodeTextSource.kt
@ -4,10 +4,12 @@ import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
 import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 /**
 * @see code
 */
+@Serializable
 data class CodeTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String
 ) : TextSource {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/EMailTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/EMailTextSource.kt
@ -3,10 +3,12 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 /**
 * @see email
 */
+@Serializable
 data class EMailTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
    override val subsources: List<TextSource>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/HashTagTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/HashTagTextSource.kt
@ -3,10 +3,12 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 /**
 * @see hashtag
 */
+@Serializable
 data class HashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
    override val subsources: List<TextSource>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/ItalicTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/ItalicTextSource.kt
@ -3,10 +3,12 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 /**
 * @see italic
 */
+@Serializable
 data class ItalicTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
    override val subsources: List<TextSource>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt
@ -3,6 +3,7 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 private val String.withoutCommercialAt
    get() = if (startsWith("@")) {
@ -14,6 +15,7 @@ private val String.withoutCommercialAt
 /**
 * @see mention
 */
+@Serializable
 data class MentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
    override val subsources: List<TextSource>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PhoneNumberTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PhoneNumberTextSource.kt
@ -3,10 +3,12 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 /**
 * @see phone
 */
+@Serializable
 data class PhoneNumberTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
    override val subsources: List<TextSource>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PreTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PreTextSource.kt
@ -4,10 +4,12 @@ import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
 import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 /**
 * @see pre
 */
+@Serializable
 data class PreTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
    val language: String? = null
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/RegularTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/RegularTextSource.kt
@ -4,10 +4,12 @@ import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
 import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 /**
 * @see regular
 */
+@Serializable
 data class RegularTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String
 ) : TextSource {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/StrikethroughTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/StrikethroughTextSource.kt
@ -3,10 +3,12 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 /**
 * @see strikethrough
 */
+@Serializable
 data class StrikethroughTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
    override val subsources: List<TextSource>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextLinkTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextLinkTextSource.kt
@ -4,10 +4,12 @@ import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
 import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 /**
 * @see link
 */
+@Serializable
 data class TextLinkTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
    val url: String
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextMentionTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextMentionTextSource.kt
@ -4,10 +4,12 @@ import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 /**
 * @see mention
 */
+@Serializable
 data class TextMentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
    val user: User,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextSourceSerializer.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextSourceSerializer.kt
@ -0,0 +1,44 @@
+package dev.inmo.tgbotapi.types.MessageEntity.textsources
+
+import dev.inmo.micro_utils.serialization.typed_serializer.TypedSerializer
+import dev.inmo.tgbotapi.CommonAbstracts.TextSource
+import dev.inmo.tgbotapi.CommonAbstracts.justTextSources
+import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.RawMessageEntities
+import dev.inmo.tgbotapi.utils.RiskFeature
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.descriptors.*
+import kotlinx.serialization.encoding.*
+
+private val baseSerializers: Map<String, KSerializer<out TextSource>> = mapOf(
+    "regular" to RegularTextSource.serializer(),
+    "text_link" to TextLinkTextSource.serializer(),
+    "code" to CodeTextSource.serializer(),
+    "url" to URLTextSource.serializer(),
+    "pre" to PreTextSource.serializer(),
+    "bot_command" to BotCommandTextSource.serializer(),
+    "strikethrough" to StrikethroughTextSource.serializer(),
+    "italic" to ItalicTextSource.serializer(),
+    "bold" to BoldTextSource.serializer(),
+    "email" to EMailTextSource.serializer(),
+    "underline" to UnderlineTextSource.serializer(),
+    "mention" to MentionTextSource.serializer(),
+    "phone_number" to PhoneNumberTextSource.serializer(),
+    "text_mention" to TextMentionTextSource.serializer(),
+    "hashtag" to HashTagTextSource.serializer(),
+    "cashtag" to CashTagTextSource.serializer(),
+)
+
+@Serializer(TextSource::class)
+object TextSourceSerializer : TypedSerializer<TextSource>(TextSource::class, baseSerializers) {
+    override fun <T: TextSource> include(type: String, serializer: KSerializer<T>) {
+        require(type !in baseSerializers.keys)
+        super.include(type, serializer)
+    }
+
+    override fun exclude(type: String) {
+        require(type !in baseSerializers.keys)
+        super.exclude(type)
+    }
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/URLTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/URLTextSource.kt
@ -4,10 +4,12 @@ import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
 import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 /**
 * @see link
 */
+@Serializable
 data class URLTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String
 ) : TextSource {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/UnderlineTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/UnderlineTextSource.kt
@ -3,10 +3,12 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
+import kotlinx.serialization.Serializable

 /**
 * @see underline
 */
+@Serializable
 data class UnderlineTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
    override val subsources: List<TextSource>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessageImpl.kt
+++ b/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>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/MessageAutoDeleteTimerChanged.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/MessageAutoDeleteTimerChanged.kt
@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.message.ChatEvents

-import com.soywiz.klock.hours
 import dev.inmo.tgbotapi.types.Seconds
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
 import dev.inmo.tgbotapi.types.messageAutoDeleteTimeField
--- 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
@ -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>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt
@ -4,7 +4,8 @@ import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.*
+import dev.inmo.tgbotapi.types.message.abstracts.Message
+import dev.inmo.tgbotapi.types.message.abstracts.PrivateContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 import dev.inmo.tgbotapi.types.message.payments.SuccessfulPaymentInfo

@ -21,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>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ChannelMessage.kt
+++ b/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>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/FromUserMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/FromUserMessage.kt
@ -1,7 +1,5 @@
 package dev.inmo.tgbotapi.types.message.abstracts

-import dev.inmo.tgbotapi.types.User
+import dev.inmo.tgbotapi.CommonAbstracts.FromUser

-interface FromUserMessage {
-    val user: User
-}
+interface FromUserMessage : FromUser, Message
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupMessages.kt
+++ b/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>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PrivateMessage.kt
+++ b/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>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PublicMessage.kt
+++ b/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>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt
@ -5,7 +5,8 @@ import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.SendTextMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.*
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
+import dev.inmo.tgbotapi.types.ParseMode.defaultParseMode
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
@ -29,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)
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/ResendableContent.kt
+++ b/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))
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted/Email.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted/Email.kt
@ -3,8 +3,8 @@ package dev.inmo.tgbotapi.types.passport.encrypted
 import dev.inmo.micro_utils.serialization.base64.Base64BytesToFromStringSerializer
 import dev.inmo.tgbotapi.types.emailField
 import dev.inmo.tgbotapi.types.hashField
-import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportElementWithEmail
+import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted/EncryptedAddress.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted/EncryptedAddress.kt
@ -3,8 +3,8 @@ package dev.inmo.tgbotapi.types.passport.encrypted
 import dev.inmo.micro_utils.serialization.base64.Base64BytesToFromStringSerializer
 import dev.inmo.tgbotapi.types.dataField
 import dev.inmo.tgbotapi.types.passport.credentials.EncryptedData
-import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportElementWithData
+import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted/EncryptedPersonalDetails.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted/EncryptedPersonalDetails.kt
@ -3,8 +3,8 @@ package dev.inmo.tgbotapi.types.passport.encrypted
 import dev.inmo.micro_utils.serialization.base64.Base64BytesToFromStringSerializer
 import dev.inmo.tgbotapi.types.dataField
 import dev.inmo.tgbotapi.types.passport.credentials.EncryptedData
-import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportElementWithData
+import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted/PhoneNumber.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted/PhoneNumber.kt
@ -2,8 +2,8 @@ package dev.inmo.tgbotapi.types.passport.encrypted

 import dev.inmo.micro_utils.serialization.base64.Base64BytesToFromStringSerializer
 import dev.inmo.tgbotapi.types.hashField
-import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportElementWithPhoneNumber
+import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import dev.inmo.tgbotapi.types.phoneNumberField
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt
@ -28,6 +28,8 @@ interface FlowsUpdatesFilter : UpdatesFilter {
    val preCheckoutQueryFlow: Flow<PreCheckoutQueryUpdate>
    val pollFlow: Flow<PollUpdate>
    val pollAnswerFlow: Flow<PollAnswerUpdate>
+    val chatMemberUpdatedFlow: Flow<CommonChatMemberUpdatedUpdate>
+    val myChatMemberUpdatedFlow: Flow<MyChatMemberUpdatedUpdate>
    val unknownUpdateTypeFlow: Flow<UnknownUpdate>
 }

@ -74,5 +76,7 @@ class DefaultFlowsUpdatesFilter(
    override val preCheckoutQueryFlow: Flow<PreCheckoutQueryUpdate> = allUpdatesFlow.filterIsInstance()
    override val pollFlow: Flow<PollUpdate> = allUpdatesFlow.filterIsInstance()
    override val pollAnswerFlow: Flow<PollAnswerUpdate> = allUpdatesFlow.filterIsInstance()
+    override val chatMemberUpdatedFlow: Flow<CommonChatMemberUpdatedUpdate> = allUpdatesFlow.filterIsInstance()
+    override val myChatMemberUpdatedFlow: Flow<MyChatMemberUpdatedUpdate> = allUpdatesFlow.filterIsInstance()
    override val unknownUpdateTypeFlow: Flow<UnknownUpdate> = allUpdatesFlow.filterIsInstance()
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StorageFile.kt
+++ b/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")
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/passport/DecryptionContext.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/passport/DecryptionContext.kt
@ -1,14 +1,7 @@
 package dev.inmo.tgbotapi.utils.passport

 import dev.inmo.micro_utils.crypto.SourceBytes
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.DownloadFile
-import dev.inmo.tgbotapi.requests.get.GetFile
-import dev.inmo.tgbotapi.types.passport.credentials.EncryptedCredentials
 import dev.inmo.tgbotapi.types.passport.credentials.EncryptedData
-import dev.inmo.tgbotapi.types.passport.encrypted.PassportFile
-import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
-import kotlinx.serialization.json.JsonObject

 interface Decryptor {
    fun decrypt(data: EncryptedData): SourceBytes
--- a/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/TextSourcesTests.kt
+++ b/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/TextSourcesTests.kt
@ -0,0 +1,40 @@
+package dev.inmo.tgbotapi.types
+
+import dev.inmo.tgbotapi.CommonAbstracts.TextSource
+import dev.inmo.tgbotapi.CommonAbstracts.makeString
+import dev.inmo.tgbotapi.TestsJsonFormat
+import dev.inmo.tgbotapi.extensions.utils.formatting.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourceSerializer
+import kotlinx.serialization.PolymorphicSerializer
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.encodeToString
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class TextSourcesTests {
+    @Test
+    fun testThatTextSourcesSerializedCorrectly() {
+        val testList = buildEntities {
+            bold(
+                buildEntities {
+                    italic("It")
+                    regular(" ")
+                    link("is example", "https://is.example")
+                }
+            )
+            regular(" ")
+            underline("of")
+            regular(" ")
+            strikethrough("complex")
+            regular(" ")
+            pre("text", "kotlin")
+        }
+        val serialized = TestsJsonFormat.encodeToString(ListSerializer(TextSource.serializer()), testList)
+        val deserialized = TestsJsonFormat.decodeFromString(
+            ListSerializer(TextSource.serializer()),
+            serialized
+        )
+        assertEquals(testList, deserialized)
+        assertEquals(testList.makeString(), deserialized.makeString())
+    }
+}
--- a/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/passport/CredentialsDecrypting.kt
+++ b/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/passport/CredentialsDecrypting.kt
@ -4,11 +4,10 @@ import dev.inmo.micro_utils.crypto.decodeBase64
 import dev.inmo.tgbotapi.types.passport.credentials.DecryptedCredentials
 import dev.inmo.tgbotapi.types.passport.credentials.EncryptedCredentials
 import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
-import java.security.*
+import java.security.KeyFactory
+import java.security.PrivateKey
 import java.security.spec.PKCS8EncodedKeySpec
 import javax.crypto.Cipher
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec

 private val regexToRemoveFromKey = Regex("(-----(BEGIN|END) ((?:.*? KEY)|CERTIFICATE)-----|[\\s])")

--- a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/CreateChatInviteLink.kt
+++ b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/CreateChatInviteLink.kt
@ -0,0 +1,31 @@
+package dev.inmo.tgbotapi.extensions.api.chat.invite_links
+
+import com.soywiz.klock.DateTime
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.invite_links.CreateChatInviteLink
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
+
+suspend fun TelegramBot.createChatInviteLink(
+    chatId: ChatIdentifier,
+    expiration: TelegramDate? = null,
+    membersLimit: MembersLimit? = null
+) = execute(CreateChatInviteLink(chatId, expiration, membersLimit))
+
+suspend fun TelegramBot.createChatInviteLink(
+    chat: PublicChat,
+    expiration: TelegramDate? = null,
+    membersLimit: MembersLimit? = null
+) = createChatInviteLink(chat.id, expiration, membersLimit)
+
+suspend fun TelegramBot.createChatInviteLink(
+    chatId: ChatIdentifier,
+    expiration: DateTime,
+    membersLimit: MembersLimit? = null
+) = createChatInviteLink(chatId, expiration.toTelegramDate(), membersLimit)
+
+suspend fun TelegramBot.createChatInviteLink(
+    chat: PublicChat,
+    expiration: DateTime,
+    membersLimit: MembersLimit? = null
+) = createChatInviteLink(chat.id, expiration.toTelegramDate(), membersLimit)
--- a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/EditChatInviteLink.kt
+++ b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/EditChatInviteLink.kt
@ -0,0 +1,63 @@
+package dev.inmo.tgbotapi.extensions.api.chat.invite_links
+
+import com.soywiz.klock.DateTime
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.invite_links.EditChatInviteLink
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
+
+suspend fun TelegramBot.editChatInviteLink(
+    chatId: ChatIdentifier,
+    previousLink: String,
+    expiration: TelegramDate? = null,
+    membersLimit: MembersLimit? = null
+) = execute(EditChatInviteLink(chatId, previousLink, expiration, membersLimit))
+
+suspend fun TelegramBot.editChatInviteLink(
+    chat: PublicChat,
+    previousLink: String,
+    expiration: TelegramDate? = null,
+    membersLimit: MembersLimit? = null
+) = editChatInviteLink(chat.id, previousLink, expiration, membersLimit)
+
+suspend fun TelegramBot.editChatInviteLink(
+    chatId: ChatIdentifier,
+    previousLink: String,
+    expiration: DateTime,
+    membersLimit: MembersLimit? = null
+) = editChatInviteLink(chatId, previousLink, expiration.toTelegramDate(), membersLimit)
+
+suspend fun TelegramBot.editChatInviteLink(
+    chat: PublicChat,
+    previousLink: String,
+    expiration: DateTime,
+    membersLimit: MembersLimit? = null
+) = editChatInviteLink(chat.id, previousLink, expiration.toTelegramDate(), membersLimit)
+
+suspend fun TelegramBot.editChatInviteLink(
+    chat: ChatIdentifier,
+    previousLink: ChatInviteLink,
+    expiration: TelegramDate? = previousLink.expirationDateTime ?.toTelegramDate(),
+    membersLimit: MembersLimit? = previousLink.membersLimit
+) = editChatInviteLink(chat, previousLink.inviteLink, expiration, membersLimit)
+
+suspend fun TelegramBot.editChatInviteLink(
+    chat: ChatIdentifier,
+    previousLink: ChatInviteLink,
+    expiration: DateTime,
+    membersLimit: MembersLimit? = previousLink.membersLimit
+) = editChatInviteLink(chat, previousLink.inviteLink, expiration, membersLimit)
+
+suspend fun TelegramBot.editChatInviteLink(
+    chat: PublicChat,
+    previousLink: ChatInviteLink,
+    expiration: TelegramDate? = previousLink.expirationDateTime ?.toTelegramDate(),
+    membersLimit: MembersLimit? = previousLink.membersLimit
+) = editChatInviteLink(chat, previousLink.inviteLink, expiration, membersLimit)
+
+suspend fun TelegramBot.editChatInviteLink(
+    chat: PublicChat,
+    previousLink: ChatInviteLink,
+    expiration: DateTime,
+    membersLimit: MembersLimit? = previousLink.membersLimit
+) = editChatInviteLink(chat, previousLink.inviteLink, expiration, membersLimit)
--- a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/RevokeChatInviteLink.kt
+++ b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/RevokeChatInviteLink.kt
@ -0,0 +1,27 @@
+package dev.inmo.tgbotapi.extensions.api.chat.invite_links
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.invite_links.RevokeChatInviteLink
+import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.ChatInviteLink
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
+
+suspend fun TelegramBot.revokeChatInviteLink(
+    chatId: ChatIdentifier,
+    previousLink: String
+) = execute(RevokeChatInviteLink(chatId, previousLink))
+
+suspend fun TelegramBot.revokeChatInviteLink(
+    chat: PublicChat,
+    previousLink: String
+) = revokeChatInviteLink(chat.id, previousLink)
+
+suspend fun TelegramBot.revokeChatInviteLink(
+    chatId: ChatIdentifier,
+    previousLink: ChatInviteLink
+) = revokeChatInviteLink(chatId, previousLink.inviteLink)
+
+suspend fun TelegramBot.revokeChatInviteLink(
+    chat: PublicChat,
+    previousLink: ChatInviteLink
+) = revokeChatInviteLink(chat, previousLink.inviteLink)
--- a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendActionDSL.kt
+++ b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendActionDSL.kt
@ -0,0 +1,76 @@
+package dev.inmo.tgbotapi.extensions.api.send
+
+import dev.inmo.micro_utils.coroutines.safely
+import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.send.SendAction
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.actions.*
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
+import kotlinx.coroutines.*
+
+private const val refreshTime: MilliSeconds = (botActionActualityTime - 1) * 1000L
+typealias TelegramBotActionCallback<T> = suspend TelegramBot.() -> T
+
+suspend fun <T> TelegramBot.withAction(
+    actionRequest: SendAction,
+    block: TelegramBotActionCallback<T>
+): T {
+    val botActionJob = supervisorScope {
+        launch {
+            while (isActive) {
+                delay(refreshTime)
+                safelyWithoutExceptions {
+                    execute(actionRequest)
+                }
+            }
+        }
+    }
+    return try {
+        safely { block() }
+    } finally {
+        botActionJob.cancel()
+    }
+}
+
+suspend fun <T> TelegramBot.withAction(
+    chatId: ChatId,
+    action: BotAction,
+    block: TelegramBotActionCallback<T>
+) = withAction(
+    SendAction(chatId, action),
+    block
+)
+
+suspend fun <T> TelegramBot.withAction(
+    chat: Chat,
+    action: BotAction,
+    block: TelegramBotActionCallback<T>
+) = withAction(
+    chat.id,
+    action,
+    block
+)
+
+suspend fun <T> TelegramBot.withTypingAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, TypingAction, block)
+suspend fun <T> TelegramBot.withUploadPhotoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadPhotoAction, block)
+suspend fun <T> TelegramBot.withRecordVideoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, RecordVideoAction, block)
+suspend fun <T> TelegramBot.withUploadVideoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadVideoAction, block)
+suspend fun <T> TelegramBot.withRecordAudioAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, RecordAudioAction, block)
+suspend fun <T> TelegramBot.withUploadAudioAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadAudioAction, block)
+suspend fun <T> TelegramBot.withUploadDocumentAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadDocumentAction, block)
+suspend fun <T> TelegramBot.withFindLocationAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, FindLocationAction, block)
+suspend fun <T> TelegramBot.withRecordVideoNoteAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, RecordVideoNoteAction, block)
+suspend fun <T> TelegramBot.withUploadVideoNoteAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadVideoNoteAction, block)
+
+
+suspend fun <T> TelegramBot.withTypingAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, TypingAction, block)
+suspend fun <T> TelegramBot.withUploadPhotoAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadPhotoAction, block)
+suspend fun <T> TelegramBot.withRecordVideoAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, RecordVideoAction, block)
+suspend fun <T> TelegramBot.withUploadVideoAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadVideoAction, block)
+suspend fun <T> TelegramBot.withRecordAudioAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, RecordAudioAction, block)
+suspend fun <T> TelegramBot.withUploadAudioAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadAudioAction, block)
+suspend fun <T> TelegramBot.withUploadDocumentAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadDocumentAction, block)
+suspend fun <T> TelegramBot.withFindLocationAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, FindLocationAction, block)
+suspend fun <T> TelegramBot.withRecordVideoNoteAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, RecordVideoNoteAction, block)
+suspend fun <T> TelegramBot.withUploadVideoNoteAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadVideoNoteAction, block)
--- a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt
+++ b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt
@ -8,7 +8,6 @@ import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
-import dev.inmo.tgbotapi.types.message.content.abstracts.VisualMediaGroupContent
 import dev.inmo.tgbotapi.utils.RiskFeature

 /**
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext.kt
@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.extensions.behaviour_builder

 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.micro_utils.coroutines.weakLaunch
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
@ -36,14 +37,15 @@ suspend fun <T> BehaviourContext.doInSubContextWithFlowsUpdatesFilterSetup(
    newFlowsUpdatesFilterSetUp: BehaviourContextAndTypeReceiver<Unit, FlowsUpdatesFilter>?,
    stopOnCompletion: Boolean = true,
    behaviourContextReceiver: BehaviourContextReceiver<T>
-) = copy(
+): T = supervisorScope {
+    val newContext = copy(
        flowsUpdatesFilter = FlowsUpdatesFilter(),
-    scope = CoroutineScope(scope.coroutineContext + SupervisorJob())
-).run {
+        scope = this
+    )
    newFlowsUpdatesFilterSetUp ?.let {
-        it.apply { invoke(this@run, this@doInSubContextWithFlowsUpdatesFilterSetup.flowsUpdatesFilter) }
+        it.apply { invoke(newContext, this@doInSubContextWithFlowsUpdatesFilterSetup.flowsUpdatesFilter) }
    }
-    behaviourContextReceiver().also { if (stopOnCompletion) stop() }
+    newContext.behaviourContextReceiver().also { if (stopOnCompletion) stop() }
 }

 /**
@ -54,13 +56,17 @@ suspend fun <T> BehaviourContext.doInSubContextWithUpdatesFilter(
    updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>?,
    stopOnCompletion: Boolean = true,
    behaviourContextReceiver: BehaviourContextReceiver<T>
-) = doInSubContextWithFlowsUpdatesFilterSetup(
+): T = doInSubContextWithFlowsUpdatesFilterSetup(
    newFlowsUpdatesFilterSetUp = updatesFilter ?.let {
        { oldOne ->
-            oldOne.allUpdatesFlow.filter { updatesFilter(it) }.subscribeSafelyWithoutExceptions(scope, asUpdateReceiver)
+            weakLaunch {
+                oldOne.allUpdatesFlow.filter { updatesFilter(it) }.subscribeSafelyWithoutExceptions(this, asUpdateReceiver)
+            }
        }
    } ?: { oldOne ->
-         oldOne.allUpdatesFlow.subscribeSafelyWithoutExceptions(scope, asUpdateReceiver)
+        weakLaunch {
+            oldOne.allUpdatesFlow.subscribeSafelyWithoutExceptions(this, asUpdateReceiver)
+        }
    },
    stopOnCompletion,
    behaviourContextReceiver
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt
@ -8,7 +8,7 @@ import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.CallbackQuery.*
 import kotlinx.coroutines.flow.toList

-typealias CallbackQueryMapper<T> = T.() -> T?
+typealias CallbackQueryMapper<T> = suspend T.() -> T?

 private suspend fun <O> BehaviourContext.waitCallbackQueries(
    count: Int = 1,
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChatMemberUpdated.kt
+++ b/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> = suspend 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)
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt
@ -3,7 +3,8 @@
 package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations

 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.extensions.utils.asBaseSentMessageUpdate
+import dev.inmo.tgbotapi.extensions.utils.asChatEventMessage
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.message.ChatEvents.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitInlineQuery.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitInlineQuery.kt
@ -1,16 +1,14 @@
 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.extensions.utils.asInlineQueryUpdate
 import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.CallbackQuery.*
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery
 import dev.inmo.tgbotapi.types.InlineQueries.query.BaseInlineQuery
 import dev.inmo.tgbotapi.types.InlineQueries.query.LocationInlineQuery
 import kotlinx.coroutines.flow.toList

-typealias InlineQueryMapper<T> = T.() -> T?
+typealias InlineQueryMapper<T> = suspend T.() -> T?

 private suspend fun <O> BehaviourContext.waitInlineQueries(
    count: Int = 1,
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitMediaGroup.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitMediaGroup.kt
@ -11,12 +11,14 @@ import dev.inmo.tgbotapi.utils.PreviewFeature
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.flow.toList

+typealias MediaGroupFilter<T> = suspend List<MediaGroupMessage<T>>.() -> Boolean
+
@PreviewFeature
 internal suspend inline fun <reified T : MediaGroupContent> BehaviourContext.buildMediaGroupWaiter(
    count: Int = 1,
    initRequest: Request<*>? = null,
    noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: (suspend (List<MediaGroupMessage<T>>) -> Boolean)? = null
+    noinline filter: MediaGroupFilter<T>? = null
 ) = flowsUpdatesFilter.expectFlow(bot, initRequest, count, errorFactory) { update ->
    update.asSentMediaGroupUpdate() ?.data ?.let { mediaGroup ->
        if (mediaGroup.all { message -> message.content is T } && (filter == null || filter(mediaGroup as List<MediaGroupMessage<T>>))) {
@ -33,35 +35,35 @@ suspend fun BehaviourContext.waitMediaGroup(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
-    filter: (suspend (List<MediaGroupMessage<MediaGroupContent>>) -> Boolean)? = null
+    filter: MediaGroupFilter<MediaGroupContent>? = null
 ) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitPlaylist(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
-    filter: (suspend (List<MediaGroupMessage<AudioMediaGroupContent>>) -> Boolean)? = null
+    filter: MediaGroupFilter<AudioMediaGroupContent>? = null
 ) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitDocumentsGroup(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
-    filter: (suspend (List<MediaGroupMessage<DocumentMediaGroupContent>>) -> Boolean)? = null
+    filter: MediaGroupFilter<DocumentMediaGroupContent>? = null
 ) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitVisualGallery(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
-    filter: (suspend (List<MediaGroupMessage<VisualMediaGroupContent>>) -> Boolean)? = null
+    filter: MediaGroupFilter<VisualMediaGroupContent>? = null
 ) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitPhotoGallery(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
-    filter: (suspend (List<MediaGroupMessage<PhotoContent>>) -> Boolean)? = null
+    filter: MediaGroupFilter<PhotoContent>? = null
 ) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitVideoGallery(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
-    filter: (suspend (List<MediaGroupMessage<VideoContent>>) -> Boolean)? = null
+    filter: MediaGroupFilter<VideoContent>? = null
 ) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPassportData.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPassportData.kt
@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations

 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.extensions.utils.asMessageUpdate
+import dev.inmo.tgbotapi.extensions.utils.asPassportMessage
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.message.PassportMessage
 import dev.inmo.tgbotapi.types.passport.PassportData
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggers.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggers.kt
@ -4,7 +4,7 @@ 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.*
+import dev.inmo.tgbotapi.extensions.utils.asCallbackQueryUpdate
 import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
 import dev.inmo.tgbotapi.types.CallbackQuery.*

@ -26,7 +26,8 @@ internal suspend inline fun <reified T : CallbackQuery> BehaviourContext.onCallb
            { it.sourceChat() ?.id ?.chatId == triggerQuery.user.id.chatId }
        } else {
            null
-        }
+        },
+        stopOnCompletion = false
    ) {
        scenarioReceiver(triggerQuery)
    }
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatMemberUpdatedTriggers.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatMemberUpdatedTriggers.kt
@ -0,0 +1,62 @@
+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
+        },
+        stopOnCompletion = false
+    ) {
+        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
+)
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandling.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandling.kt
@ -11,6 +11,7 @@ suspend fun BehaviourContext.command(
    commandRegex: Regex,
    requireOnlyCommandInMessage: Boolean = true,
    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<TextContent>? = null,
    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<TextContent>>
 ): Job = onText(
    includeFilterByChatInBehaviourSubContext,
@ -22,7 +23,9 @@ suspend fun BehaviourContext.command(
        } else {
            true
        }
-        sizeRequirement && textSources.any { commandRegex.matches(it.asBotCommandTextSource() ?.command ?: return@any false) }
+        sizeRequirement && textSources.any {
+            commandRegex.matches(it.asBotCommandTextSource() ?.command ?: return@any false)
+        } && (additionalFilter ?.invoke(message) != false)
    },
    scenarioReceiver
 )
@ -30,19 +33,22 @@ suspend fun BehaviourContext.command(
    command: String,
    requireOnlyCommandInMessage: Boolean = true,
    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<TextContent>? = null,
    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<TextContent>>
-) = command(command.toRegex(), requireOnlyCommandInMessage, includeFilterByChatInBehaviourSubContext, scenarioReceiver)
+) = command(command.toRegex(), requireOnlyCommandInMessage, includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)

 suspend inline fun BehaviourContext.onCommand(
    commandRegex: Regex,
    requireOnlyCommandInMessage: Boolean = true,
    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    noinline additionalFilter: CommonMessageFilter<TextContent>? = null,
    noinline scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<TextContent>>
-): Job = command(commandRegex, requireOnlyCommandInMessage, includeFilterByChatInBehaviourSubContext, scenarioReceiver)
+): Job = command(commandRegex, requireOnlyCommandInMessage, includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)

 suspend inline fun BehaviourContext.onCommand(
    command: String,
    requireOnlyCommandInMessage: Boolean = true,
    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    noinline additionalFilter: CommonMessageFilter<TextContent>? = null,
    noinline scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<TextContent>>
-): Job = onCommand(command.toRegex(), requireOnlyCommandInMessage, includeFilterByChatInBehaviourSubContext, scenarioReceiver)
+): Job = onCommand(command.toRegex(), requireOnlyCommandInMessage, includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ContentTriggers.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ContentTriggers.kt
@ -50,7 +50,8 @@ internal suspend inline fun <reified T : MessageContent> BehaviourContext.onCont
            { it.sourceChat() ?.id ?.chatId == triggerMessage.chat.id.chatId }
        } else {
            null
-        }
+        },
+        stopOnCompletion = false
    ) {
        scenarioReceiver(triggerMessage)
    }
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt
@ -4,7 +4,8 @@ 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.*
+import dev.inmo.tgbotapi.extensions.utils.asBaseSentMessageUpdate
+import dev.inmo.tgbotapi.extensions.utils.asChatEventMessage
 import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
 import dev.inmo.tgbotapi.types.message.ChatEvents.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
@ -28,7 +29,8 @@ internal suspend inline fun <reified T : ChatEvent> BehaviourContext.onEvent(
    doInSubContextWithUpdatesFilter(
        updatesFilter = if (includeFilterByChatInBehaviourSubContext) {
            { it.sourceChat() ?.id ?.chatId == triggerMessage.chat.id.chatId }
-        } else null
+        } else null,
+        stopOnCompletion = false
    ) {
        scenarioReceiver(triggerMessage)
    }
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/InlineQueryTriggers.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/InlineQueryTriggers.kt
@ -5,8 +5,6 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.expectFlow
 import dev.inmo.tgbotapi.extensions.utils.asInlineQueryUpdate
 import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
-import dev.inmo.tgbotapi.types.CallbackQuery.DataCallbackQuery
-import dev.inmo.tgbotapi.types.CallbackQuery.GameShortNameCallbackQuery
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery
 import dev.inmo.tgbotapi.types.InlineQueries.query.BaseInlineQuery
 import dev.inmo.tgbotapi.types.InlineQueries.query.LocationInlineQuery
@ -29,7 +27,8 @@ internal suspend inline fun <reified T : InlineQuery> BehaviourContext.onInlineQ
            { it.sourceChat() ?.id ?.chatId == triggerQuery.from.id.chatId }
        } else {
            null
-        }
+        },
+        stopOnCompletion = false
    ) {
        scenarioReceiver(triggerQuery)
    }
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MediaGroupTriggers.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MediaGroupTriggers.kt
@ -5,12 +5,13 @@ 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.*
+import dev.inmo.tgbotapi.extensions.utils.asSentMediaGroupUpdate
 import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
 import dev.inmo.tgbotapi.extensions.utils.shortcuts.chat
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.*
-import dev.inmo.tgbotapi.types.message.content.media.*
+import dev.inmo.tgbotapi.types.message.content.media.PhotoContent
+import dev.inmo.tgbotapi.types.message.content.media.VideoContent
 import dev.inmo.tgbotapi.utils.PreviewFeature

@PreviewFeature
@ -31,7 +32,8 @@ internal suspend inline fun <reified T : MediaGroupContent> BehaviourContext.bui
    doInSubContextWithUpdatesFilter(
        updatesFilter = if (includeFilterByChatInBehaviourSubContext) {
            { it.sourceChat() ?.id ?.chatId == mediaGroupChat.id.chatId }
-        } else null
+        } else null,
+        stopOnCompletion = false
    ) {
        scenarioReceiver(mediaGroup)
    }
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PassportTriggers.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PassportTriggers.kt
@ -3,7 +3,8 @@ 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.*
+import dev.inmo.tgbotapi.extensions.utils.asMessageUpdate
+import dev.inmo.tgbotapi.extensions.utils.asPassportMessage
 import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
 import dev.inmo.tgbotapi.types.message.PassportMessage
 import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportElement
@ -24,7 +25,8 @@ suspend inline fun <reified T : EncryptedPassportElement> BehaviourContext.onPas
    doInSubContextWithUpdatesFilter(
        updatesFilter = if (includeFilterByChatInBehaviourSubContext) {
            { it.sourceChat() ?.id ?.chatId == triggerMessage.chat.id.chatId }
-        } else null
+        } else null,
+        stopOnCompletion = false
    ) {
        scenarioReceiver(triggerMessage)
    }
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt
@ -32,7 +32,10 @@ import dev.inmo.tgbotapi.types.dice.*
 import dev.inmo.tgbotapi.types.files.*
 import dev.inmo.tgbotapi.types.files.abstracts.*
 import dev.inmo.tgbotapi.types.message.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.LeftChatMember
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.voice.*
 import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.message.content.abstracts.*
@ -395,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
@ -451,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
@ -487,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
@ -523,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
@ -938,6 +897,18 @@ inline fun Update.asUnknownUpdate(): UnknownUpdate? = this as? UnknownUpdate
@PreviewFeature
 inline fun Update.requireUnknownUpdate(): UnknownUpdate = this as UnknownUpdate
@PreviewFeature
+inline fun Update.asCommonChatMemberUpdatedUpdate(): CommonChatMemberUpdatedUpdate? = this as? CommonChatMemberUpdatedUpdate
+@PreviewFeature
+inline fun Update.requireCommonChatMemberUpdatedUpdate(): CommonChatMemberUpdatedUpdate = this as CommonChatMemberUpdatedUpdate
+@PreviewFeature
+inline fun Update.asMyChatMemberUpdatedUpdate(): MyChatMemberUpdatedUpdate? = this as? MyChatMemberUpdatedUpdate
+@PreviewFeature
+inline fun Update.requireMyChatMemberUpdatedUpdate(): MyChatMemberUpdatedUpdate = this as MyChatMemberUpdatedUpdate
+@PreviewFeature
+inline fun Update.asChatMemberUpdatedUpdate(): ChatMemberUpdatedUpdate? = this as? ChatMemberUpdatedUpdate
+@PreviewFeature
+inline fun Update.requireChatMemberUpdatedUpdate(): ChatMemberUpdatedUpdate = this as ChatMemberUpdatedUpdate
+@PreviewFeature
 inline fun TelegramMediaFile.asAnimationFile(): AnimationFile? = this as? AnimationFile
@PreviewFeature
 inline fun TelegramMediaFile.requireAnimationFile(): AnimationFile = this as AnimationFile
@ -1245,3 +1216,79 @@ inline fun DiceAnimationType.requireFootballDiceAnimationType(): FootballDiceAni
 inline fun DiceAnimationType.asSlotMachineDiceAnimationType(): SlotMachineDiceAnimationType? = this as? SlotMachineDiceAnimationType
@PreviewFeature
 inline fun DiceAnimationType.requireSlotMachineDiceAnimationType(): SlotMachineDiceAnimationType = this as SlotMachineDiceAnimationType
+@PreviewFeature
+inline fun ChatEvent.asChannelChatCreated(): ChannelChatCreated? = this as? ChannelChatCreated
+@PreviewFeature
+inline fun ChatEvent.requireChannelChatCreated(): ChannelChatCreated = this as ChannelChatCreated
+@PreviewFeature
+inline fun ChatEvent.asDeleteChatPhoto(): DeleteChatPhoto? = this as? DeleteChatPhoto
+@PreviewFeature
+inline fun ChatEvent.requireDeleteChatPhoto(): DeleteChatPhoto = this as DeleteChatPhoto
+@PreviewFeature
+inline fun ChatEvent.asGroupChatCreated(): GroupChatCreated? = this as? GroupChatCreated
+@PreviewFeature
+inline fun ChatEvent.requireGroupChatCreated(): GroupChatCreated = this as GroupChatCreated
+@PreviewFeature
+inline fun ChatEvent.asLeftChatMember(): LeftChatMember? = this as? LeftChatMember
+@PreviewFeature
+inline fun ChatEvent.requireLeftChatMember(): LeftChatMember = this as LeftChatMember
+@PreviewFeature
+inline fun ChatEvent.asMessageAutoDeleteTimerChanged(): MessageAutoDeleteTimerChanged? = this as? MessageAutoDeleteTimerChanged
+@PreviewFeature
+inline fun ChatEvent.requireMessageAutoDeleteTimerChanged(): MessageAutoDeleteTimerChanged = this as MessageAutoDeleteTimerChanged
+@PreviewFeature
+inline fun ChatEvent.asNewChatMembers(): NewChatMembers? = this as? NewChatMembers
+@PreviewFeature
+inline fun ChatEvent.requireNewChatMembers(): NewChatMembers = this as NewChatMembers
+@PreviewFeature
+inline fun ChatEvent.asNewChatPhoto(): NewChatPhoto? = this as? NewChatPhoto
+@PreviewFeature
+inline fun ChatEvent.requireNewChatPhoto(): NewChatPhoto = this as NewChatPhoto
+@PreviewFeature
+inline fun ChatEvent.asNewChatTitle(): NewChatTitle? = this as? NewChatTitle
+@PreviewFeature
+inline fun ChatEvent.requireNewChatTitle(): NewChatTitle = this as NewChatTitle
+@PreviewFeature
+inline fun ChatEvent.asPinnedMessage(): PinnedMessage? = this as? PinnedMessage
+@PreviewFeature
+inline fun ChatEvent.requirePinnedMessage(): PinnedMessage = this as PinnedMessage
+@PreviewFeature
+inline fun ChatEvent.asProximityAlertTriggered(): ProximityAlertTriggered? = this as? ProximityAlertTriggered
+@PreviewFeature
+inline fun ChatEvent.requireProximityAlertTriggered(): ProximityAlertTriggered = this as ProximityAlertTriggered
+@PreviewFeature
+inline fun ChatEvent.asSupergroupChatCreated(): SupergroupChatCreated? = this as? SupergroupChatCreated
+@PreviewFeature
+inline fun ChatEvent.requireSupergroupChatCreated(): SupergroupChatCreated = this as SupergroupChatCreated
+@PreviewFeature
+inline fun ChatEvent.asChannelEvent(): ChannelEvent? = this as? ChannelEvent
+@PreviewFeature
+inline fun ChatEvent.requireChannelEvent(): ChannelEvent = this as ChannelEvent
+@PreviewFeature
+inline fun ChatEvent.asCommonEvent(): CommonEvent? = this as? CommonEvent
+@PreviewFeature
+inline fun ChatEvent.requireCommonEvent(): CommonEvent = this as CommonEvent
+@PreviewFeature
+inline fun ChatEvent.asGroupEvent(): GroupEvent? = this as? GroupEvent
+@PreviewFeature
+inline fun ChatEvent.requireGroupEvent(): GroupEvent = this as GroupEvent
+@PreviewFeature
+inline fun ChatEvent.asSupergroupEvent(): SupergroupEvent? = this as? SupergroupEvent
+@PreviewFeature
+inline fun ChatEvent.requireSupergroupEvent(): SupergroupEvent = this as SupergroupEvent
+@PreviewFeature
+inline fun ChatEvent.asVoiceChatEvent(): VoiceChatEvent? = this as? VoiceChatEvent
+@PreviewFeature
+inline fun ChatEvent.requireVoiceChatEvent(): VoiceChatEvent = this as VoiceChatEvent
+@PreviewFeature
+inline fun ChatEvent.asVoiceChatEnded(): VoiceChatEnded? = this as? VoiceChatEnded
+@PreviewFeature
+inline fun ChatEvent.requireVoiceChatEnded(): VoiceChatEnded = this as VoiceChatEnded
+@PreviewFeature
+inline fun ChatEvent.asVoiceChatParticipantsInvited(): VoiceChatParticipantsInvited? = this as? VoiceChatParticipantsInvited
+@PreviewFeature
+inline fun ChatEvent.requireVoiceChatParticipantsInvited(): VoiceChatParticipantsInvited = this as VoiceChatParticipantsInvited
+@PreviewFeature
+inline fun ChatEvent.asVoiceChatStarted(): VoiceChatStarted? = this as? VoiceChatStarted
+@PreviewFeature
+inline fun ChatEvent.requireVoiceChatStarted(): VoiceChatStarted = this as VoiceChatStarted
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ContentMessageConversations.kt
+++ b/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>()
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/SlotMachineUtils.kt
+++ b/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]
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/TextCaptionBotCommandsParser.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/TextCaptionBotCommandsParser.kt
@ -0,0 +1,65 @@
+package dev.inmo.tgbotapi.extensions.utils.extensions
+
+import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.BotCommandTextSource
+import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
+import dev.inmo.tgbotapi.types.message.content.TextContent
+import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
+
+
+val defaultArgsSeparator = Regex(" ")
+/**
+ * Parse commands and their args. Logic will find command, get all subsequent data as args until new command
+ */
+fun List<TextSource>.parseCommandsWithParams(
+    argsSeparator: Regex = defaultArgsSeparator
+): MutableMap<String, Array<String>> {
+    val result = mutableMapOf<String, Array<String>>()
+    var currentBotCommandSource: BotCommandTextSource? = null
+    var currentArgs = ""
+    fun includeCurrent() = currentBotCommandSource ?.let {
+        currentArgs = currentArgs.trim()
+        if (currentArgs.isNotEmpty()) {
+            result[it.command] = currentArgs.split(argsSeparator).toTypedArray()
+            currentArgs = ""
+        }
+    }
+    for (textSource in this) {
+        if (textSource is BotCommandTextSource) {
+            includeCurrent()
+            currentBotCommandSource = textSource
+        } else {
+            currentArgs += textSource.source
+        }
+    }
+    includeCurrent()
+    return result
+}
+
+/**
+ * Parse commands and their args. Logic will find command, get all subsequent data as args until new command
+ */
+fun TextedInput.parseCommandsWithParams(
+    argsSeparator: Regex = defaultArgsSeparator
+) = textSources.parseCommandsWithParams(argsSeparator)
+
+/**
+ * Parse commands and their args. Logic will find command, get all subsequent data as args until new command
+ */
+fun TextedOutput.parseCommandsWithParams(
+    argsSeparator: Regex = defaultArgsSeparator
+) = entities ?.parseCommandsWithParams(argsSeparator) ?: emptyMap()
+
+/**
+ * Parse commands and their args. Logic will find command, get all subsequent data as args until new command
+ */
+fun CaptionedInput.parseCommandsWithParams(
+    argsSeparator: Regex = defaultArgsSeparator
+) = textSources.parseCommandsWithParams(argsSeparator)
+
+/**
+ * Parse commands and their args. Logic will find command, get all subsequent data as args until new command
+ */
+fun ContentMessage<TextContent>.parseCommandsWithParams(
+    argsSeparator: Regex = defaultArgsSeparator
+) = content.parseCommandsWithParams(argsSeparator)
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt
@ -14,10 +14,8 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.updateshandlers.*
 import dev.inmo.tgbotapi.utils.*
 import io.ktor.client.features.HttpRequestTimeoutException
-import io.ktor.utils.io.core.use
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
-import kotlin.coroutines.coroutineContext

 fun TelegramBot.startGettingOfUpdatesByLongPolling(
    timeoutSeconds: Seconds = 30,
@ -160,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,
@ -192,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
-)
-
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/MediaGroupsIncluder.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/MediaGroupsIncluder.kt
@ -2,7 +2,6 @@ package dev.inmo.tgbotapi.extensions.utils.updates.retrieving

 import dev.inmo.tgbotapi.extensions.utils.updates.convertWithMediaGroupUpdates
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.updateshandlers.UpdateReceiver