add travis dokka step

2025-11-18 21:45:06 +00:00 · 2020-10-19 19:48:17 +06:00
679 changed files with 6162 additions and 24499 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,5 @@
 # These are supported funding model platforms

-custom: ['https://www.tinkoff.ru/rm/ovsyannikov.aleksey113/ObMJ712472']
+patreon: InsanusMokrassar
+
+custom: ['https://paypal.me/InsanusMokrassar?locale.x=ru_RU']
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,11 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "gradle" # See documentation for possible values
-    directory: "/tgbotapi.core" # Location of package manifests
-    schedule:
-      interval: "daily"
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,8 +1,6 @@
-api: "TelegramBotAPI-api/**"
-utils: "TelegramBotAPI-utils/**"
-behaviour-builder: "TelegramBotAPI-behaviour_builder/**"
-behaviour-builder_fsm: "TelegramBotAPI-behaviour_builder-fsm/**"
-core: "TelegramBotAPI-core/**" # currently not work
+api: "TelegramBotAPI-extensions-api/**"
+utils: "TelegramBotAPI-extensions-utils/**"
+core: "TelegramBotAPI/**" # currently not work

 code: "**/*.kt"
 gradle: "**/*.gradle"
--- a/.github/workflows/kdocs.yml
+++ b/.github/workflows/kdocs.yml
@@ -1,21 +0,0 @@
-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/label.yml
+++ b/.github/workflows/label.yml
@@ -12,7 +12,6 @@ on:
 jobs:
  triage:
    runs-on: ubuntu-latest
-    if: ${{ github.actor == github.repository_owner }}
    steps:
      - uses: actions/labeler@v2
        with:
--- a/.github/workflows/packages_publishing.yml
+++ b/.github/workflows/packages_publishing.yml
@@ -1,27 +0,0 @@
-name: Publish package to GitHub Packages
-on: [push]
-jobs:
-  publishing:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Fix android 31.0.0 dx
-        continue-on-error: true
-        run: cd /usr/local/lib/android/sdk/build-tools/31.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
-      - name: Rewrite version
-        run: |
-          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
-          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
-        run: ./gradlew build
-      - name: Publish
-        continue-on-error: true
-        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication
-        env:
-          GITHUBPACKAGES_USER: ${{ github.actor }}
-          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/write-good.yml
+++ b/.github/write-good.yml
@@ -0,0 +1 @@
+spellchecker: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,859 +1,5 @@
 # TelegramBotAPI changelog

-## 0.36.1
-
-* `Common`:
-    * `Version`:
-        * `Klock`: `2.4.6` -> `2.4.7`
-        * `Ktor`: `1.6.4` -> `1.6.5`
-        * `MicroUtils`: `0.7.3` -> `0.7.5`
-
-## 0.36.1
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.7.2` -> `0.7.3`
-* `API`:
-    * Fix `getMyCommands` overloads conflict when no arguments provided
-* `Utils`:
-    * `buildEntities` DSL now have parameter `separator` to specify `TextSource` that will be inserted between other sources
-
-## 0.36.0
-
-**ALL PREVIOUS DEPRECATIONS HAVE BEEN REMOVED**
-**ALL EXTENSION PACKAGES HAS BEEN RENAMES**. Old packages are still available, but will be removed in next major update:
-
-* `tgbotapi.extensions.api` -> `tgbotape.api`
-* `tgbotapi.extensions.utils` -> `tgbotape.utils`
-* `tgbotapi.extensions.behaviour_builder` -> `tgbotape.behaviour_builder`
-
-* `Common`:
-    * `Version`:
-        * `Serialization`: `1.2.2` -> `1.3.0`
-        * `MicroUtils`: `0.5.28` -> `0.7.2`
-        * `Klock`: `2.4.3` -> `2.4.6`
-        * `Ktor`: `1.6.3` -> `1.6.4`
-* `Core`:
-    * `PrivateContentMessageImpl#paymentInfo` now is deprecated and will always be null
-    * `PayInlineKeyboardButton#pay` now is deprecated
-    * `RowBuilder` and `MatrixBuilder` now are open and available for extending
-    * `MatrixBuilder#matrix` will return read-only new list instead of original internal `mutMatrix`
-    * Introduced new type of events `SuccessfulPaymentEvent` instead of putting of payment inside of message
-    * New type of events union: `PublicChatEvent`. `CommonEvent` is still union of any `ChatEvent`
-    * New `AbstractFlowsUpdatesFilter` with default `lazy` realization for all typed flows
-    * `FlowsUpdatesFilter` fun now have `onBufferOverflow` and `upstreamUpdatesFlow` as incoming params
-        * `DefaultFlowsUpdatesFilter` now use additional `upstreamUpdatesFlow` as source of updates
-* `Utils`:
-    * Two new dsl:
-        * `inlineKeyboard` for creating `InlineKeyboardMarkup`
-        * `replyKeyboard` for creating `ReplyKeyboardMarkup`
-    * Cast helpers for `Message` (thanks to [madhead](https://github.com/madhead)):
-        * `asPossiblyReplyMessage`: tries to cast a `Message` to `PossiblyReplyMessage`, returns `null` if the message is not of that type
-        * `requirePossiblyReplyMessage`: casts a `Message` to `PossiblyReplyMessage`, fails if the message is not of that type
-        * `whenPossiblyReplyMessage`: tries to cast a `Message` to `PossiblyReplyMessage` and runs the given block of code with it, if the cast is successful
-    * New type `WithUser` for unioning of all types with `user`
-        * `FromUser` now extends `WithUser`
-        * Cast helpers for type `WithUser`: `asWithUser`, `whenWithUser`, `requireWithUser`
-* `Behaviour Builder`:
-    * New expecters and waiters:
-        * `waitShippingQueries`/`onShippingQuery`
-        * `waitPreCheckoutQueries`/`onPreCheckoutQuery`
-        * `waitChosenInlineResult`/`onChosenInlineResult`
-        * `waitPollUpdates`/`onPollUpdates`
-* `Behaviour Builder FSM extension`:
-    * See [Difference between old Behaviour Builder and new one with FSM](https://telegra.ph/Difference-between-old-Behaviour-Builder-and-new-one-with-FSM-10-18)
-
-## 0.35.9
-
-* `Common`:
-    * `Version`:
-        * `Kotlin`: `1.5.30` -> `1.5.31`
-        * `Klock`: `2.4.1` -> `2.4.2`
-        * `MicroUtils`: `0.5.25` -> `0.5.28`
-* `Core`:
-    * New `BotAction` implementation - `CustomBotAction`
-    * `LocationContent` has been divided to two different types: `LiveLocationContent` and `StaticLocationContent`
-* `API`:
-    * Two new extensions: `TelegramBot#answer` with `CallbackQuery` and `InlineQuery`
-* `Behaviour Builder`:
-    * All triggers have been changed to use two filters: filter for in subcontext data and filter for incoming data
-    * New waiters for edited content
-    * New extension `BehaviourContext#followLocation`
-    * New factory-functions:
-        * `BehaviourContextReceiver`
-        * `BehaviourContextAndTypeReceiver`
-        * `BehaviourContextAndTwoTypesReceiver`
-    * Old API for triggers with the flags like `includeFilterByChatInBehaviourSubContext` have been deprecated
-
-## 0.35.8
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.5.24` -> `0.5.25`
-        * `UUID`: `0.3.0` -> `0.3.1`
-* `Core`:
-    * `MultipartRequestCallFactory` now will use file name as multipart `filename` parameter instead of generated file id
-    * New extension `MPPFile#asMultipartFile`
-* `API`
-    * Fixes in `TelegramBot#withAction`
-* `Behaviour Builder`:
-    * New extensions `BehaviourContext#commandWithArgs` and `BehaviourContext#onCommandWithArgs`
-
-## 0.35.7
-
-* `Common`:
-    * `Version`:
-        * `Kotlin`: `1.5.21` -> `1.5.30`
-        * `Klock`: `2.3.3` -> `2.4.1`
-        * `Ktor`: `1.6.2` -> `1.6.3`
-        * `Coroutines`: `1.5.1` -> `1.5.2`
-        * `MicroUtils`: `0.5.21` -> `0.5.24`
-
-## 0.35.6
-
-* `Common`:
-    * `Version`:
-        * `Klock`: `2.3.1` -> `2.3.3`
-        * `MicroUtils`: `0.5.19` -> `0.5.21`
-* `Core`:
-    * All `FlowsUpdatesFilter` flows have been renamed and updated
-* `Utils`:
-    * Extensions `allSentMessagesFlow` and `allSentMediaGroupsFlow` have been deprecated
-
-## 0.35.5
-
-**MIME TYPES FOR REQUESTS HAVE BEEN DEPRECATED DUE TO REDUNDANCY OF MIME TYPES IN FILES SENDING**
-
-* `Core`:
-    * Several new extensions `ByteReadChannel#asStorageFile` and `ByteReadChannelAllocator#asStorageFile`
-    * Several new extensions `ByteArray#asMultipartFile`, `ByteReadChannel#asMultipartFile` and
-    `ByteReadChannelAllocator#asMultipartFile`
-    * New extension `StorageFile#asMultipartFile`
-* `API`:
-    * New extensions `TelegramBot#downloadFile` for writing of incoming bytes to the file
-    * New extensions `TelegramBot#downloadFileStream` and `TelegramBot#downloadFileStreamAllocator` for getting of input
-    streams instead of whole bytes arrays
-    * Old extensions `TelegramBot#downloadFile` has been replaced to the new package. Migration: replace in your project
-    `import dev.inmo.tgbotapi.extensions.api.downloadFile` with `import dev.inmo.tgbotapi.extensions.api.files.downloadFile`
-    * `PathedFile#filename` extension has been deprecated, and new property `PathedFile#fileName` has been included
-      directly in `PathedFile`
-* `Utils`:
-    * Add several functions `convertToStorageFile` and extensions `TelegramBot#convertToStorageFile`
-
-## 0.35.4 Hotfix
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.5.18` -> `0.5.19`
-
-## 0.35.3
-
-* `Common`:
-    * `Version`:
-        * `Klock`: `2.2.0` -> `2.3.1`
-        * `Ktor`: `1.6.1` -> `1.6.2`
-        * `MicroUtils`: `0.5.16` -> `0.5.18`
-* `Core`:
-    * **`SimpleRequestCallFactory` and `MultipartRequestCallFactory` became a classes instead of objects to avoid
-    collisions in different bots**
-    * Support of strongly-typed ietf language codes has been added
-* `API`:
-    * New extension `TelegramBot#downloadFile` for any `MediaContent`
-* `Behaviour Builder`:
-    * New provider `defaultCoroutineScopeProvider`
-        * Now it is not necessary to provide `CoroutineScope` to `TelegramBot#buildBehaviour`
-        extension
-    * New `TelegramBot#buildBehaviour` extension with `FlowUpdatesFilter` and `CoroutineScope` with
-    default `CoroutineScope`
-    * New typealias `SimpleFilter` for unifying triggers filter signatures
-         * All waiters got real filters (`SimpleFilter`) and rename old filters as mappers
-    * New extensions for `Any`: `as`/`when`/`require` for `WithOptionalLanguageCode` and `WithLanguageCode`
-
-## 0.35.2
-
-* `Common`:
-    * `Version`:
-        * `Kotlin`: `1.5.20` -> `1.5.21`
-        * `Coroutines`: `1.5.0` -> `1.5.1`
-        * `Serialization`: `1.2.1` -> `1.2.2`
-        * `Klock`: `2.1.2` -> `2.2.0`
-        * `Ktor`: `1.6.0` -> `1.6.1`
-        * `MicroUtils`: `0.5.15` -> `0.5.16`
-
-## 0.35.1
-
-* `Common`:
-    * `Version`:
-        * `Kotlin`: `1.5.10` -> `1.5.20`
-        * `MicroUtils`: `0.5.6` -> `0.5.15`
-* `Core`:
-    * New interface `MyCommandsRequest` (also see `Bot API 5.3` below)
-    * New extensions `TextSourcesList#make*String` for all parse modes
-    * All `MessageContent` subclasses now serializable
-    * `ChosenInlineResult` was replaced and modified to be sealed
-    * `ChosenInlineResult` now extends `FromUser`
-    * Added `Update#sourceUser` method
-    * More types assumed as sent by user types now implements `FromUser` interface
-    * Added `Any#whenFromUser`, `Any#asFromUser` and`Any#requireFromUser` extensions
-    * `MedaGroupUpdate` and its direct extenders `SentMediaGroupUpdate` and `EditMediaGroupUpdate` became
-      `sealed interface`s
-    * New built-in `RequestException` implementator `GetUpdatesConflict` has been added
-* `Behaviour Builder`:
-    * ❗️ All triggers (`on*` extensions) have been modified to work in parallel by some marker by default (new parameter
-      `markerFactory`, in most cases will work async for different chats)
-    * New extensions `telegramBotWithBehaviour`
-    * All behaviour builder extensions got new parameter `defaultExceptionsHandler`
-    * Class `BehaviourContext` was rewritten as an interface with default realization `DefaultBehaviourContext` and
-      factory `BehaviourContext(TelegramBot, CoroutineScope, FlowsUpdatesFilter)`
-    * Extension `buildBehaviour` (and all related extensions/functions) for opportunity to pass
-      `defaultExceptionsHandler`
-    * Trigger `onContentMessage` and waiter `waitContentMessage` now may include media groups
-* `API`:
-    * All `reply` and subsequent extensions have been replaced in send package
-* `Utils`:
-    * With class casts like `as*` and `require*` now you may use `when*` with parameter callback
-    * Methods of `EntitiesBuilder` now will return builder itself, so you may create sequences like
-      `buildEntities { bold("Hello,") + italic(" world") }` directly in `buildEntities` body
-    * New extension `TelegramBot#longPollingFlow` has been added with returning value `Flow` with updates
-* `Bot API 5.3`:
-    * Add type `BotCommandScope`, its serializer `BotCommandScopeSerializer` and all its children
-    * New request `DeleteMyCommands` and updates in `GetMyCommands` and `SetMyCommands`
-    * Renames according to `And more` of [June 25, 2021](https://core.telegram.org/bots/api-changelog#june-25-2021) update
-
-## 0.35.0
-
-**ALL PREVIOUS DEPRECATIONS HAVE BEEN REMOVED**
-**JS PART NOW USE IR COMPILER ONLY**
-
-* `Common`:
-    * `Version`:
-        * `Kotlin`: `1.4.72` -> `1.5.10`
-        * `MicroUtils`: `0.4.36` -> `0.5.6`
-        * `Coroutines`: `1.4.3` -> `1.5.0`
-        * `Serialization`: `1.1.0` -> `1.2.1`
-        * `Klock`: `2.0.7` -> `2.1.2`
-        * `UUID`: `0.2.3` -> `0.3.0`
-        * `Ktor`: `1.5.4` -> `1.6.0`
-* `Core`:
-    * `ForceReply` has been renamed to `ReplyForce`
-    * `Captioned` and `Explained` interfaces have been removed
-    * `RecordAudioAction` and `UploadAudioAction` (and all related to these actions functionality) have been removed
-    * `TextSource` interface and all related things have been replaced
-    * `CallbackQuery` interface and all its extenders/implementers become `sealed`
-    * `InputMedia` interface and all its extenders/implementers become `sealed`
-    * `ParseMode` interface and all its extenders/implementers become `sealed`
-    * `ChatMember` becomes `sealed`
-    * `KeyboardMarkup` becomes `sealed`
-    * `LeftChatMember` and `MemberChatMember` become interfaces. All their code were replaced to the `*Impl` classes
-    * Most of `sealed` classes have been modified to be interfaces
-    * Most serializers becomes public, but they are still `RistFeature`
-    * For `EntitiesBuilder` multilevel text sources builders with callback have been added
-
-## 0.34.1
-
-* `Common`:
-    * `Version`:
-        * `ktor`: `1.5.3` -> `1.5.4`
-        * `MicroUtils`: `0.4.35` -> `0.4.36`
-* `Core`
-    * Fix in creating of text sources list
-
-## 0.34.0
-
-_**It is recommended to use [0.34.1](https://github.com/InsanusMokrassar/TelegramBotAPI/releases/tag/0.34.1) version due to the bug in 0.34.0 related to rewriting of `TextSource`s creating mechanism.**_
-
-**UPDATE UP TO Telegram Bot API 5.2**
-
-_**ALL OLD DEPRECATIONS WERE REMOVED**_
-
-* `Core`:
-    * Type `ChatType` has been added
-    * New `ExtendedChat` for unknown messages `UnknownExtendedChat` has been added
-    * `SendInvoice#startParameter` becomes optional and replaced in `SendInvoice` constructor
-    * New interface `CommonSendInvoiceData` has been added
-        * Fields `CommonSendInvoiceData#maxTipAmount` and `CommonSendInvoiceData#suggestedTipAmounts` have been added
-    * New type `InputInvoiceMessageContent` has been added
-    * New interface `TextedWithTextSources` on top of `Texted` interface
-        * Interface `TextedInput` now extends `TextedWithTextSources` with overriding of `textSources` field as not
-          nullable
-        * `textSources` become main field in `TextedInput`
-            * **MIGRATION** Remove all `import dev.inmo.tgbotapi.CommonAbstracts.textSources` in your project
-            * `textEntities` become are calculable property in `TextedInput`
-  * Interface `Captioned` and `CaptionedInput` now is deprecated
-      * Most of captions usages were replaced with texts
-  * Interface `Explained` and `ExplainedInput` now is deprecated
-      * Most of captions usages were replaced with texts
-    * Interface `VoiceChatEvent` now is `CommonEvent`
-  * Mechanism of `RawMessageEntity` converting were fully rewritten
-
-## 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
-
-* `Common`:
-    * `Version`:
-        * `Kotlin`: `1.4.30` -> `1.4.31`
-        * `Ktor`: `1.5.1` -> `1.5.2`
-        * `MicroUtils`: `0.4.26` -> `0.4.28`
-        * `Coroutines`: `1.4.2` -> `1.4.3`
-
-## 0.32.8
-
-* `Common`:
-    * `Version`:
-        * `Serialization`: `1.1.0-RC` -> `1.1.0`
-        * `MicroUtils`: `0.4.25` -> `0.4.26`
-
-## 0.32.7
-
-* `Core`:
-    * New variable `LeftRestrictionsChatPermissions` and `RestrictionsChatPermissions`
-* `Extensions Utils`:
-    * `DiceAnimationType` class casts
-* `Behaviour Builder`:
-    * Now `doInSubContextWithUpdatesFilter` and `doInSubContext` will automatically subscribe on updates of parent
-      `BehaviourContext`
-    * `doInSubContextWithFlowsUpdatesFilterSetup`, `doInSubContextWithUpdatesFilter` and `doInSubContext` got new
-      parameter `stopOnCompletion` to be able to disable stopping of behaviour context on finishing
-
-## 0.32.6
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.4.24` -> `0.4.25`
-* `Extensions API`:
-    * New extension `TelegramBot#replyWithDice`
-* `Extensions Utils`:
-    * `SlotMachineReelImages` has been renamed to `SlotMachineReelImage`
-    * `SlotMachineReelImage` got two built-in parameters: `text` and `number`
-    * New extension `String#asSlotMachineReelImage`
-
-## 0.32.5
-
-* `Core`:
-    * Add `mention` variants for user ids and receiver variants ([#294](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/294))
-    * Now `AbstractRequestCallFactory` will set up one-second delay for zero timeouts in `GetUpdate` requests
-    * Several extensions for `TelegramBotAPI` like `retrieveAccumulatedUpdates` have been added as a solution for
-    [#293](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/293)
-    * Links for `tg://user?id=<user_id>` have been updated ([#292](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/292))
-    * All usages of captions or texts in resends and same things have been replaced with `textSources`
-    * Global `defaultParseMode` has been added ([#291](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/291))
-
-## 0.32.4
-
-* `Common`:
-    * `Version`:
-        * `Kotlin`: `1.4.21` -> `1.4.30`
-        * `Klock`: `2.0.4` -> `2.0.6`
-        * `MicroUtils`: `0.4.23` -> `0.4.24`
-* `Core`:
-    * Renames:
-        * `ChannelMessage` -> `ChannelContentMessage`
-        * `PublicMessage` -> `PublicContentMessage`
-            * `GroupMessage` -> `GroupContentMessage`
-                * `FromChannelGroupMessage` -> `FromChannelGroupContentMessage`
-                * `AnonymousGroupMessage` -> `AnonymousGroupContentMessage`
-                * `CommonGroupMessage` -> `CommonGroupContentMessage`
-        * `PrivateMessage` -> `PrivateContentMessage`
-* `Extensions Utils`:
-    * Renames of extensions in `ClassCasts` according to changes in `Core`
-
-## 0.32.3
-
-* `Behaviour Builder`:
-    * Add expectators and waiters for inline queries
-
-## 0.32.2
-
-* `Core`:
-    * Fix of [#275](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/275)
-
-## 0.32.1
-
-* `Core`:
-    * Fix of [#272](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/272)
-* `Utils`:
-    * Fix of [#273](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/273)
-
-## 0.32.0
-
-**THIS UPDATE CONTAINS BREAKING CHANGES**
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.4.16` -> `0.4.23`
-        * `Klock`: `0.2.3` -> `0.2.4`
-        * `Ktor`: `1.5.0` -> `1.5.1`
-* `Core`:
-    * **BREAKING CHANGE** Now `MediaGroupMessage` have a generic type related to `MediaGroupContent`
-        * Methods and types related to `MediaGroupMessage` have been modified according to their meanings
-    * **Important Change** `FlowsUpdatesFilter` now is an interface. Old class has been renamed to
-      `DefaultFlowsUpdatesFilter` and factory method `FlowsUpdatesFilter` has been added
-    * **PASSPORT** Full support of `Telegram Passport API`
-        * `PassportData`
-        * All variants of `EncryptedPassportElement`
-        * All variants of `SecureValue`
-        * All variants of `PassportElementError`
-        * New request `SetPassportDataErrors`
-        * `Credentials`:
-            * `EncryptedCredentials`
-            * `DeryptedCredentials`
-            * `EndDataCredentials`
-* `Behaviour Builder`:
-    * Trigger and expectation extensions for `MessageContent` (`onContentMessage` and `waitContentMessage`)
-    * `onMediaGroup` has been replaced
-    * `waitMediaGroup` has been added
-    * `onVisualMediaGroup` now is just an alternative to `onVisualGallery`
-    * `command` and `onCommand` expectations has been added for commands `String` variant
-    * New extensions `BehaviourContext#oneOf`, `BehaviourContext#parallel` and `Deferred<T>#withAction`
-    * Several renames:
-        * `waitAudioMediaGroup` -> `waitAudioMediaGroupContent`
-        * `waitDocumentMediaGroup` -> `waitDocumentMediaGroupContent`
-        * `waitMediaGroup` -> `waitAnyMediaGroupContent`
-        * `waitVisualMediaGroup` -> `waitVisualMediaGroupContent`
-    * New extensions `BehaviourContext#waitPassportMessagesWith` and `BehaviourContext#waitAnyPassportMessages`
-    * New extensions `BehaviourContext#onPassportMessage` and `BehaviourContext#onPassportMessageWith`
-* `Utils`:
-    * New `ClassCasts` for
-        * `Message`
-        * **PASSPORT** `EncryptedPassportElement`
-        * **PASSPORT** `PassportElementError`
-        * **PASSPORT** `SecureValue`
-    * Several tools for decryption have been added:
-        * `AESDecryptor` is available for `JVM` platform
-        * Extensions `EncryptedCredentials#decryptWithPKCS8PrivateKey` are available for `JVM`
-        platform
-        * Extensions `EndDataCredentials#decryptData` and `FileCredentials#decryptFile` have been added
-        * Several extensions `createDecryptor`
-        * Several extensions `doInDecryptionContextWithPKCS8Key`
-    * New extension `Flow#passportMessages`
-    * In most of webhook setting up functions/methods now available parameter `mediaGroupsDebounceTimeMillis`
-* `API`:
-    * **PASSPORT** New extensions `TelegramBot#setPassportDataErrors`
-
-## 0.31.0
-
-**THIS UPDATE CONTAINS BREAKING CHANGES**
-
-* `Common`:
-    * **ALL DEPRECATIONS CREATED SINCE 0.30.0 WERE REMOVED**
-* `Behaviour Builder`:
-    * Extension `TelegramBot#buildBehaviour` have changed its return value: now it is `Job` instead of
-      `FlowsUpdatesFilter`
-* `Utils`
-    * New extensions `TelegramBot#longPolling` were added as new recommended way to start getting updates via long
-      polling
-        * Old extensions `RequestsExecutor#startGettingFlowsUpdatesByLongPolling` has been deprecated
-
-## 0.30.13
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.4.15` -> `0.4.16`
-* `Core`:
-    * New variable `FlowsUpdatesFilter#allUpdatesWithoutMediaGroupsGroupingFlow` which will contains updates without
-      `SentMediaGroupUpdate`
-* `Utils`:
-    * Extensions for `ResendableContent` has been added
-    * Extensions for `TextSource` has been added
-* `Behaviour Builder`:
-    * Project has been created :)
-
-## 0.30.12
-
-* `Utils`:
-    * Class casts has been added. Now you can write something like `message.asGroupMessage() ?.let { ... }` instead of
-    `(message as? GroupMessage<*>) ?.let { ... }`
-
-## 0.30.11
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.4.11` -> `0.4.15`
-        * `Klock`: `2.0.1` -> `2.0.3`
-        * `Ktor`: `1.4.3` -> `1.5.0`
-* `Core`:
-    * All bot actions got functions for short calling, like `recordVideo` for `RecordVideoNote`
-    * All bot actions got class-cast shortcuts
-
-## 0.30.10
-
-* `Common`:
-    * `Version`:
-        * `Kotlin`: `1.4.20` -> `1.4.21`
-        * `Klock`: `2.0.0` -> `2.0.1`
-        * `Ktor`: `1.4.2` -> `1.4.3`
-        * `MicroUtils`: `0.4.6` -> `0.4.11`
-* `API Extensions`:
-    * New function `buildBot`
-
-## 0.30.9
-
-* `Common`:
-    * `Version`:
-        * `UUID`: `0.2.2` -> `0.2.3`
-        * `Coroutines`: `1.4.1` -> `1.4.2`
-        * `MicroUtils`: `0.4.3` -> `0.4.6`
-* `Core`:
-    * Add `BowlingDiceAnimationType`
-
-## 0.30.8
-
-* `Common`:
-    * `Version`:
-        * `Kotlin`: `1.4.10` -> `1.4.20`
-        * `Klock`: `1.12.1` -> `2.0.0`
-        * `MicroUtils`: `0.4.1` -> `0.4.3`
-
-## 0.30.7
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.4.0` -> `0.4.1`
-* `Core`:
-    * `TelegramAPIUrlsKeeper` will fix ending of host url since this version
-    * New mechanisms in`PowLimiter` and `CommonLimiter` has been added
-    * New builder `KtorRequestsExecutorBuilder`
-        * New function `telegramBot`
-* `Utils`:
-    * Simple function `telegramBot(TelegramAPIUrlsKeeper)` has been deprecated with replacement by almost the same
-    function in `Core`
-
-## 0.30.6
-
-* `Core`
-    * `TextSource` properties has been renamed:
-        * `asMarkdownSource` -> `markdown`
-        * `asMarkdownV2Source` -> `markdownV2`
-        * `asHtmlSource` -> `html`
-    * `PrivateChat` override `id` property with type `UserId`
-    * Several new extensions and functions in links creation:
-        * New function `makeUsernameLink` with parameter `String`
-            * New extension `Username#link` and function `makeLink(Username)`
-        * Function `makeLinkToMessage` now able to get any type of chat
-            * New extension `Message#link`
-        * Old functions `makeLinkToAddStickerSet...` has been deprecated:
-            * `makeLinkToAddStickerSet`
-            * `makeLinkToAddStickerSetInMarkdownV2`
-            * `makeLinkToAddStickerSetInMarkdown`
-            * `makeLinkToAddStickerSetInHtml`
-
-## 0.30.5
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.3.3` -> `0.4.0`
-* `Core`:
-    * Mechanism of `ChatMember` serialization has been changed
-        * Since this version any `ChatMember` can be serialized (even outside in case it marked by `@Serializable`)
-        * Since this version any `ChatMember` (included in this project) can be deserialized in common way
-    * `User` property `id` has changed its type: now it is `UserId` (under the hood it is the same as `ChatId`)
-
-## 0.30.4
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.3.1` -> `0.3.3`
-* `Core`:
-    * `MultilevelTextSource#textSources` has been safely renamed to `subsources`
-    * `TextContent#fullEntitiesList` has been deprecated
-    * Now `TextContent` implements `TextedInput`
-        * `TextContent#entities` has been deprecated
-    * `GroupEventMessage` now overrides `chatEvent` with type `GroupEvent`
-    * `SupergroupEventMessage` now overrides `chatEvent` with type `SupergroupEvent`
-    * Any `ChatEventMessage` now have generic type of its `chatEvent` (just like messages)
-* `Utils`:
-    * Old extensions related to chat events are deprecated:
-        * `Flow<ChatEventMessage<*>>#divideBySource`
-        * `Flow<ChatEventMessage<*>>#onlyChannelEvents`
-        * `Flow<ChatEventMessage<*>>#onlyGroupEvents`
-        * `Flow<ChatEventMessage<*>>#onlySupergroupEvents`
-    * A lot of extensions for `Flow<ChatEventMessage>` has been added:
-        * `FlowsUpdatesFilter#events`
-        * `FlowsUpdatesFilter#channelEvents`
-        * `FlowsUpdatesFilter#groupEvents`
-        * `FlowsUpdatesFilter#supergroupEvents`
-        * And a lot of other filters with specific types
-
-## 0.30.3
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.3.0` -> `0.3.1`
-* `Core`:
-    * New type of requests exceptions `TooMuchRequestsException`. In fact it will be rare case when you will get this
-    exception
-    * `EmptyLimiter` has been renamed to `ExceptionsOnlyLimiter` and currently will stop requests after
-    `TooMuchRequestsException` happen until retry time is actual
-        * Now `ExceptionsOnlyLimiter` (previously `EmptyLimiter`) is a class
-    * `AbstractRequestCallFactory` currently will not look at the response and wait if it have `RetryAfter` error. New
-    behaviour aimed on delegating of this work to `RequestsLimiter`
-
-## 0.30.2
-
-* `Common`:
-    * `Version`:
-        * `Ktor`: `1.4.1` -> `1.4.2`
-* `Core`:
-    * New sealed class `SetWebhookRequest` which can be used in `SetWebhook` requests
-* `Utils`:
-    * Extensions `setWebhookInfoAndStartListenWebhooks` has been united in one extension with `SetWebhookRequest`
-    incoming parameter
-
-## 0.30.1
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.2.7` -> `0.3.0`
-* `Utils`:
-    *  Builder-style DSL for text sources - `buildEntities` (thanks to [djaler](https://github.com/djaler))
-
-## 0.30.0 Bot API 5.0
-
-**THIS UPDATE CONTAINS A LOT OF BREAKING CHANGES. PLEASE, BE CAREFUL ON UPGRADING OF YOUR PROJECT**
-
-* `Common`:
-    * `Version`:
-        * `Coroutine`: `1.4.0` -> `1.4.1`
-        * **NEW** `MicroUtils`: `0.2.7`
-* `Core`:
-    * Support of `logOut` method (`LogOut` object as a `Request`)
-    * Support of `close` method (`Close` object as a `Request`)
-    * `SetWebhook` updates:
-        * New field `ipAddress`. It works the same as `ip_address` in [setWebhook](https://core.telegram.org/bots/api#setwebhook)
-        section
-        * New field `dropPendingUpdates`. It works the same as `drop_pending_updates` in [setWebhook](https://core.telegram.org/bots/api#setwebhook)
-        section
-    * New field `ExtendedPrivateChat#bio`
-    * New data class `ChatLocation`
-    * New field `UnbanChatMember#onlyIfBanned`
-    * New fields `ExtendedChannelChat#linkedGroupChatId` and `ExtendedSupergroupChat#linkedChannelChatId`
-    * New fields `ExtendedSupergroupChat#location`
-    * New fields `AudioFile#fileName` and `VideoFile#fileName`
-    * New fields `SendDocument#disableContentTypeDetection` and `InputMediaDocument#disableContentTypeDetection`
-    * New request `UnpinAllChatMessages`
-    * New parameter for `unpinChatMessage` method: `messageId`
-    * New dice type `FootballDiceAnimationType`
-    * Limits for dices has been changed
-    * `commonDiceResultLimit` has been deprecated
-    * New field `DiceAnimationType#valueLimits`
-    * Locations updates:
-        * New interface `Headed` with property `heading`
-        * New interface `HorizontallyAccured` with property `horizontalAccuracy`
-        * New interface `ProximityAlertable` with property `proximityAlertRadius`
-        * `Location` class has been separated:
-            * `StaticLocation` for static locations
-            * `LiveLocation` for live locations
-        * Property `Livable#livePeriod` now use typealias type `Seconds` (the same by meaning - `Int`)
-        * `EditLocationMessage` now extends `Locationed`, `HorizontallyAccured`, `ProximityAlertable` and `Headed` interfaces
-            * New properties in `EditChatMessageLiveLocation`: `horizontalAccuracy`, `heading`, `proximityAlertRadius`
-            * New properties in `EditInlineMessageLiveLocation`: `horizontalAccuracy`, `heading`, `proximityAlertRadius`
-        * Main constructor of `SendLocation` now is internal. Instead of that currently available next factories:
-            * `SendLocation` - sending of static location without live parameters
-            * `SendStaticLocation` - sending of static location without live parameters
-            * `SendLiveLocation` - sending of live location with live parameters
-        * `PositionedSendMessageRequest` now extends `Locationed`
-        * `LocationContent#createResend` now can create `LiveLocation`
-    * Support of `ProximityAlertTriggered`. It is `CommonEvent`
-    * Property `pollQuestionTextLength` now have maximum up to `300`
-    * Anonymous Admins:
-        * New field `AdministratorChatMember#isAnonymous`
-    * Several new interfaces of messages:
-        * `SignedMessage` - any message which possibly have `authorSignature`
-        * `WithSenderChatMessage` - any message which have `senderChat`. Property `senderChat` is not-nullable due to
-        separation of implementators
-        * `PublicMessage` - all channel messages have property `val chat: PublicChat` instead of common `val chat: Chat`
-            * `ChannelMessage` - all channel messages have property `val chat: ChannelChat` instead of common `val chat: Chat`
-                * Old `ChannelMessage` was safely renamed to `ChannelMessageImpl` (old name was set as typealias and deprecated)
-            * `GroupMessage` - all group messages have property `val chat: GroupChat` instead of common `val chat: Chat`
-                * `FromChannelGroupMessage` - instances should have property `val channel: ChannelChat`
-                * `AnonymousGroupMessage` - instances may have setup property `authorSignature`
-                * `CommonGroupMessage` - just common message
-            * `PrivateMessage` - works like previous `CommonMessageImpl`
-            * Previous `CommonMessageImpl` safely renamed to `PrivateMessageImpl`
-    * New property `PromoteChatMember#isAnonymous`
-    * Update all classes which must have `entities`/`caption_entities` fields
-    * New request `CopyMessage`
-    * New extension `List<TextSource>#makeString` for more comfortable work with new api with entities
-    * Support for Google Places identifiers for venues
-    * New extensions for text sources separating:
-        * `List<TextSource>#separateForMessage`
-        * `List<TextSource>#separateForCaption`
-        * `List<TextSource>#separateForText`
-    * Rewritten work with text sources and text parts:
-        * Now any `Message` type with entities will have full list of entities. That means that parts without any
-        formatter entities will use `RegularTextSource`
-        * `MultilevelTextSource#textParts` has been deprecated. Now each `MultilevelTextSource` have its own
-        `textSources` list
-    * New dsl for creating of `TextSource` lists
-    * Built-in `handleSafely` and `ExceptionHandler` is deprecated
-    * New common factories for `StorageFile`
-* `API`:
-    * Extensions `TelegramBot#pinChatMessage` now support any `Chat` and `Message`s from any `Chat`
-    * New extensions `TelegramBot#unpinAllChatMessages`
-    * Extensions `TelegramBot#promoteChatMember` got `isAnonymous` parameter
-    * All old api methods has been actualized to their analogs in `Core`
-    * All `telegramBot` with `token: String` got `apiUrl` parameter
-    * Factory `telegramBotWithCustomClientConfig` has been renamed to `telegramBot`
-
-## 0.29.4
-
-* `Core`:
-    * `diceResultLimit` now is deprecated, use `commonDiceResultLimit` instead
-    * New extension `slotMachineDiceResultLimit`
-* `Utils`:
-    * New enum `SlotMachineReelImages`
-    * New extension `Int#asSlotMachineReelImage`
-    * New data class `SlotMachineResult`
-        * New extension `Dice#calculateSlotMachineResult`
-
-## 0.29.3
-
-* `Common`:
-    * Version updates:
-        * `Serialization`: `1.0.0` -> `1.0.1`
-* `Core`:
-    * New annotation `RiskFeature`. This annotation will be applied to the things which contains unsafe types usage
-        * `SendMediaGroup` factory now marked with `RiskFeature`
-    * Media groups updates:
-        * New functions `SendPlaylist`
-        * New functions `SendDocumentsGroup`
-        * New functions `SendVisualMediaGroup`
-    * New type `VisualMediaGroupMemberInputMedia : MediaGroupMemberInputMedia`
-        * `InputMediaPhoto` now implements `VisualMediaGroupMemberInputMedia` instead of `MediaGroupMemberInputMedia`
-        * `InputMediaVideo` now implements `VisualMediaGroupMemberInputMedia` instead of `MediaGroupMemberInputMedia`
-    * New type `VisualMediaGroupContent : MediaGroupContent`
-        * `PhotoContent` now implements `VisualMediaGroupContent` instead of `MediaGroupContent`
-        * `VideoContent` now implements `VisualMediaGroupContent` instead of `MediaGroupContent`
-    * New type `AudioMediaGroupContent : MediaGroupContent`
-        * `AudioContent` now implements `AudioMediaGroupContent` instead of `MediaContent` and `CaptionedInput`
-    * New type `DocumentMediaGroupContent : MediaGroupContent`
-        * `DocumentContent` now implements `DocumentMediaGroupContent` instead of `MediaContent` and `CaptionedInput`
-    * New type `AudioMediaGroupMemberInputMedia : MediaGroupMemberInputMedia`
-        * `InputMediaAudio` now implements `AudioMediaGroupMemberInputMedia`
-    * New type `DocumentMediaGroupMemberInputMedia : MediaGroupMemberInputMedia`
-        * `InputMediaDocument` now implements `DocumentMediaGroupMemberInputMedia`
-    * New extension `AudioFile#toInputMediaAudio`
-    * `AudioContent` now implements `MediaGroupContent`
-    * New extension `DocumentFile#toInputMediaDocument`
-    * `DocumentContent` now implements `MediaGroupContent`
-    * New dice type `SlotMachineDiceAnimationType`
-    * New extension `TelegramMediaFile#asDocumentFile`
-    * New extension `VideoFile#toInputMediaVideo`
-    * New exception `WrongFileIdentifierException`
-    * Extension `String#toInputMediaFileAttachmentName` now is deprecated
-    * Property `ThumbedInputMedia#thumbMedia` now is deprecated
-* `API`:
-    * New extensions for media groups:
-        * `TelegramBot#sendPlaylist`
-        * `TelegramBot#replyWithPlaylist`
-        * `TelegramBot#sendDocumentsGroup`
-        * `TelegramBot#replyWithDocumentsGroup`
-        * `TelegramBot#sendVisualMediaGroup`
-        * `TelegramBot#replyWithVisualMediaGroup`
-* `Utils`:
-    * New extensions for `Flow`s:
-        * `Flow<SentMediaGroupUpdate>#mediaGroupVisualMessages`
-        * `Flow<SentMediaGroupUpdate>#mediaGroupAudioMessages`
-        * `Flow<SentMediaGroupUpdate>#mediaGroupDocumentMessages`
-    * New extensions for `FlowsUpdatesFilter`:
-        * `FlowsUpdatesFilter#audioMessagesWithMediaGroups`
-        * `FlowsUpdatesFilter#mediaGroupAudioMessages`
-        * `FlowsUpdatesFilter#documentMessagesWithMediaGroups`
-        * `FlowsUpdatesFilter#mediaGroupDocumentMessages`
-        * `FlowsUpdatesFilter#mediaGroupVisualMessages`
-
-## 0.29.2
-
-* `Common`:
-    * Version updates:
-        * `Coroutines`: `1.3.9` -> `1.4.0`
-    * Internal broadcast channels were replaced with `SharedFlow`
-* `TelegramBotAPI-extensions-utils`:
-    * Extension `ReceiveChannel#debounceByValue` has been deprecated
-
 ## 0.29.1

 * `Common`:
--- a/README.md
+++ b/README.md
@@ -1,128 +1,137 @@
-[Participate in our common survey ☺](https://forms.gle/q6Xf8K3fD1pPsYUw9)
-
 # TelegramBotAPI

- [TelegramBotAPI](#telegrambotapi)
-  * [Examples](#examples)
-    + [Most common example](#most-common-example)
-    + [Handling only last messages](#handling-only-last-messages)
-    + [Build a little bit more complex behaviour](#build-a-little-bit-more-complex-behaviour)
-    + [More examples](#more-examples)
-
-<small><i><a href='http://ecotrust-canada.github.io/markdown-toc/'>Table of contents generated with markdown-toc</a></i></small>
-
-Hello! This is a set of libraries for working with Telegram Bot API.
-
-| Common info                           | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://github.com/InsanusMokrassar/TelegramBotAPI/workflows/Build/badge.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI/actions) [Small survey](https://forms.gle/2Hex2ynbHWHhi1KY7)|
+| Common info                           | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI.svg?branch=master)](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI) [Small survey](https://forms.gle/2Hex2ynbHWHhi1KY7)|
 | -------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Useful links | [![Chat in Telegram](https://img.shields.io/static/v1?label=Talk&message=Telegram&color=blue)](https://t.me/InMoTelegramBotAPI) [![Create bot](https://img.shields.io/static/v1?label=Github&message=Template&color=blue)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![KDocs](https://img.shields.io/static/v1?label=Open&message=kdocs&color=blue)](https://tgbotapi.inmo.dev/index.html) [Examples](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/), [Mini tutorial](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
-| TelegramBotAPI Core status                 | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core) |
-| TelegramBotAPI API Extensions status      | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.api) |
-| TelegramBotAPI Util Extensions status | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.utils) |
-| TelegramBotAPI Behaviour Builder Extensions status | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.behaviour_builder/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.behaviour_builder) |
-| TelegramBotAPI Behaviour Builder FSM Extensions status | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.behaviour_builder.fsm/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.behaviour_builder.fsm) |
-| TelegramBotAPI All status                 | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi)                                                             |
+| Useful links | [![Chat in Telegram](badges/chat.svg)](https://t.me/InMoTelegramBotAPI) [![KDocs](badges/kdocs.svg)](https://tgbotapi.inmo.dev/docs/index.html) [Examples](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/), [Mini tutorial](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
+| TelegramBotAPI Core status                 | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.core/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.core/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core) |
+| TelegramBotAPI Extensions status      | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api) |
+| TelegramBotAPI Util Extensions status | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils) |
+| TelegramBotAPI All status                 | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi)                                                             |

-## Examples
+**At the time of publication of version `0.28.0` there are errors in serialization plugins like
+[kotlinx.serialization#1004](https://github.com/Kotlin/kotlinx.serialization/issues/1004). It is possible, that both JVM
+and JS version may work improperly in some cases with `kotlinx.serialization` version `1.0.0-RC`**

-There are several things you need to do to launch examples below:

-* Add `mavenCentral()` to your project repositories
-    * [Maven variant](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/Including-in-your-project#pomxml)
-* Add dependency `implementation "dev.inmo:tgbotapi:$tgbotapi_version"` 
-    * Replace `tgbotapi_version` with exact version (see last one in the table above) or put variable with this name in project
-    * Alternative variant for maven [here](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/Including-in-your-project#telegrambotapi)
+It is a complex of libraries for working with `TelegramBotAPI` in type-safe and strict way as much as it possible. In
+the list of this complex currently next projects:

-More including instructions [available here](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/Including-in-your-project).
-Other configuration examples:
+* [TelegramBotAPI Core](tgbotapi.core/README.md) - core of library. In fact it is independent library and can be used alone
+  without any additional library
+* [TelegramBotAPI API Extensions](tgbotapi.extensions.api/README.md) - contains extensions (mostly for
+  `RequestsExecutor`), which allows to use the core library in more pleasant way
+* [TelegramBotAPI Util Extensions](tgbotapi.extensions.utils/README.md) - contains extensions for more comfortable
+work with commands, updates and other different things
+* [TelegramBotAPI](tgbotapi/README.md) - concentration of all previously mentioned libraries

-* [For multiplatform](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/tree/master/ResenderBot)
-* [For JVM](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/blob/master/GetMeBot/build.gradle)
+Most part of some specific solves or unuseful
+moments are describing by official [Telegram Bot API](https://core.telegram.org/bots/api).

-### Most common example
+## JavaScript notes

-```kotlin
-suspend fun main() {
-  val bot = telegramBot(TOKEN)
+### Versions before `0.28.0`

-  bot.buildBehaviour {
-    println(getMe())
-  
-    onCommand("start") {
-      reply(it, "Hi:)")
-    }
-  }.join()
+In case if you are want to use this library inside of browser, you will need additional settings (thanks for help to [Alexander Nozik](https://research.jetbrains.org/researchers/altavir)):
+
+<details>
+<summary>Gradle build script help (for versions before 0.28.0)</summary>
+
+```groovy
+dependencies {
+    /* ... */
+
+    implementation "com.github.insanusmokrassar:TelegramBotAPI:$tgbot_api_version"
+    implementation "com.github.insanusmokrassar:TelegramBotAPI-extensions-api:$tgbot_api_version" // optional
+    implementation "com.github.insanusmokrassar:TelegramBotAPI-extensions-utils:$tgbot_api_version" // optional
+
+    /* Block of dependencies for correct building in browser */
+    implementation(npm("fs"))
+    implementation(npm("bufferutil"))
+    implementation(npm("utf-8-validate"))
+    implementation(npm("abort-controller"))
+    implementation(npm("text-encoding"))
 }
-```

-In this example you will see information about this bot at the moment of starting and answer with `Hi:)` every time it
-gets message `/start`
+/* ... */

-### Handling only last messages
-
-```kotlin
-suspend fun main() {
-  val bot = telegramBot(TOKEN)
-
-  val flowsUpdatesFilter = FlowsUpdatesFilter()
-  bot.buildBehaviour(flowUpdatesFilter = flowsUpdatesFilter) {
-    println(getMe())
-  
-    onCommand("start") {
-      reply(it, "Hi:)")
-    }
-
-    retrieveAccumulatedUpdates(this).join()
-  }
-}
-```
-
-The main difference with the previous example is that bot will get only last updates (accumulated before bot launch
-and maybe some updates it got after launch)
-
-### Build a little bit more complex behaviour
-
-```kotlin
-suspend fun main() {
-  val bot = telegramBot(TOKEN)
-
-  bot.buildBehaviour {
-    println(getMe())
-
-    val nameReplyMarkup = ReplyKeyboardMarkup(
-      matrix {
-        row {
-          +SimpleKeyboardButton("nope")
+kotlin {
+    target {
+        browser {
+            /* Block for fix of exception in absence of some functionality, https://github.com/ktorio/ktor/issues/1339 */
+            dceTask {
+                dceOptions {
+                    keep("ktor-ktor-io.\$\$importsForInline\$\$.ktor-ktor-io.io.ktor.utils.io")
+                }
+            }
        }
-      }
-    )
-    onCommand("start") {
-      val photo = waitPhoto(
-        SendTextMessage(it.chat.id, "Send me your photo please")
-      ).first()
-
-      val name = waitText(
-        SendTextMessage(
-          it.chat.id,
-          "Send me your name or choose \"nope\"",
-          replyMarkup = nameReplyMarkup
-        )
-      ).first().text.takeIf { it != "nope" }
-
-      sendPhoto(
-        it.chat,
-        photo.mediaCollection,
-        entities = buildEntities {
-          if (name != null) regular(name) // may be collapsed up to name ?.let(::regular)
-        }
-      )
    }
-  }.join()
 }
 ```

-### More examples
+</details>

-You may find examples in [this project](https://github.com/InsanusMokrassar/TelegramBotAPI-examples). Besides, you are
-always welcome in our [wiki](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/About-this-project) and
-[chat](https://t.me/InMoTelegramBotAPIChat).
+## Ok, where should I start?
+
+![Libraries hierarchy](resources/TelegramBotAPI-libraries-hierarchy.svg)
+
+In most cases, the most simple way will be to implement [TelegramBotAPI](TelegramBotAPI/README.md) - it contains
+all necessary tools for comfort usage of this library. If you want to exclude some libraries, you can implement just
+[TelegramBotAPI API Extensions](tgbotapi.extensions.api/README.md),
+[TelegramBotAPI Util Extensions](tgbotapi.extensions.utils/README.md) or even
+[TelegramBotAPI Core](tgbotapi.core/README.md).
+
+If you want to dive deeper in the core of library or develop something for it - welcome to learn more from
+[TelegramBotAPI Core](tgbotapi.core/README.md) and our [Telegram Chat](https://teleg.one/InMoTelegramBotAPIChat).
+
+Anyway, all libraries are very typical inside of them. Examples:
+
+* In `TelegramBotAPI` common request look like `requestsExecutor.execute(SomeRequest())`
+* `tgbotapi.extensions.api` typical syntax look like `requestsExecutor.someRequest()` (in most cases it would be
+better to use `bot` name instead of `requestsExecutor`)
+* `tgbotapi.extensions.utils` will look like `filter.filterBaseMessageUpdates(chatId).filterExactCommands(Regex("^.*$"))...`
+
+## Build instruction
+
+If you want to build this project or to contribute, there are several recommendations:
+
+### Build
+
+In case if you want to just build project, run next command:
+
+```bash
+./gradlew clean build
+```
+
+On windows:
+
+```
+gradlew.bat clean build
+```
+
+### Publishing for work with your version locally
+
+In case, if you want to work in your other projects using your modification (or some state) of this library,
+you can use next code:
+
+```bash
+./gradlew clean build publishToMavenLocal
+```
+
+On windows:
+
+```
+gradlew.bat clean build publishToMavenLocal
+```
+
+But you must remember, that in this case your local maven repo must be the first one from
+your project retrieving libraries:
+
+```groovy
+repositories {
+    mavenLocal() // that must be the first one
+    jcenter()
+    mavenCentral()
+}
+```
+
+Besides, for your own version you can change variable `library_version` in the file [gradle.properties](./gradle.properties).
--- a/TelegramBotAPI.drawio
+++ b/TelegramBotAPI.drawio
--- a/TelegramBotAPI.minder
+++ b/TelegramBotAPI.minder
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<minder version="1.11.1">
+  <theme name="default" label="Default" index="-1"/>
+  <styles>
+    <style level="0" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+    <style level="1" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+    <style level="2" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+    <style level="3" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+    <style level="4" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+    <style level="5" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+    <style level="6" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+    <style level="7" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+    <style level="8" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+    <style level="9" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+    <style level="10" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+  </styles>
+  <drawarea x="-320.56697591145837" y="-10.028254191080691" scale="0.75"/>
+  <images/>
+  <nodes>
+    <node id="0" posx="748.88964843749955" posy="119.42341613769531" width="472" height="168" side="top" fold="false" treesize="603" layout="Downwards" group="false">
+      <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="439" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
+      <nodename posx="764.88964843749955" posy="135.42341613769531" maxwidth="488.96484375">
+        <text data="tgbotapi.core&#10;&#10;Root project with API. It is not recommended to use its requests directly and better to use at least tgbotapi.extensions.api"/>
+      </nodename>
+      <nodenote></nodenote>
+      <nodes>
+        <node id="1" posx="781.88964843749955" posy="387.42341613769531" width="406" height="145" side="bottom" fold="false" treesize="603" color="#68b723" colorroot="true" layout="Downwards" group="false">
+          <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="none" nodewidth="394" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
+          <nodename posx="797.88964843749955" posy="403.42341613769531" maxwidth="419.451171875">
+            <text data="TelegramBotAPI extensions&#10;&#10;Family of projects which are fully based on TelegramBotAPI and extend its functionality"/>
+          </nodename>
+          <nodenote></nodenote>
+          <nodes>
+            <node id="2" posx="683.38964843749955" posy="632.42341613769531" width="296" height="191" side="bottom" fold="false" treesize="296" color="#68b723" colorroot="true" layout="Downwards" group="false">
+              <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="203" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
+              <nodename posx="699.38964843749955" posy="648.42341613769531" maxwidth="295.90315755208337">
+                <text data="tgbotapi.extensions.api&#10;&#10;Extensions project for make requests more look like in the Telegram Bot API and give opportunity to use it's easier"/>
+              </nodename>
+              <nodenote></nodenote>
+            </node>
+            <node id="3" posx="979.38964843749955" posy="632.42341613769531" width="307" height="168" side="bottom" fold="false" treesize="307" color="#68b723" colorroot="true" layout="Downwards" group="false">
+              <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="286" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
+              <nodename posx="995.38964843749955" posy="648.42341613769531" maxwidth="299.252197265625">
+                <text data="tgbotapi.extensions.utils&#10;&#10;Extensions project with utils things which will make easier different operations"/>
+              </nodename>
+              <nodenote></nodenote>
+            </node>
+          </nodes>
+        </node>
+      </nodes>
+    </node>
+    <node id="4" posx="815.52319335937455" posy="948.04447937011719" width="329" height="213" side="top" fold="false" treesize="329" layout="Downwards" group="false">
+      <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="388" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
+      <nodename posx="831.52319335937455" posy="964.04447937011719" maxwidth="394.3671875">
+        <text data="tgbotapi&#10;&#10;Here included all available TelegramBotAPI libraries:&#13;&#10;&#13;&#10;* tgbotapi.core&#13;&#10;* tgbotapi.extensions.api&#13;&#10;* tgbotapi.extensions.utils">
+          <color>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+          </color>
+        </text>
+      </nodename>
+      <nodenote></nodenote>
+    </node>
+  </nodes>
+  <groups/>
+  <connections>
+    <connection from_id="2" to_id="4" drag_x="905.70642089843705" drag_y="891.23394775390625" color="#777777">
+      <style connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+      <title></title>
+      <note></note>
+    </connection>
+    <connection from_id="3" to_id="4" drag_x="1056.456420898437" drag_y="885.48394775390625" color="#777777">
+      <style connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+      <title></title>
+      <note></note>
+    </connection>
+  </connections>
+  <stickers/>
+</minder>
--- a/badges/chat.svg
+++ b/badges/chat.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="104" height="20">
+    <linearGradient id="b" x2="0" y2="100%">
+        <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+        <stop offset="1" stop-opacity=".1"/>
+    </linearGradient>
+    <clipPath id="a">
+        <rect width="104" height="20" rx="3" fill="#fff"/>
+    </clipPath>
+    <g clip-path="url(#a)">
+        <path fill="#555" d="M0 0h65v20H0z"/>
+        <path fill="#007ec6" d="M35 0h69v20H35z"/>
+        <path fill="url(#b)" d="M0 0h104v20H0z"/>
+    </g>
+    <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110">
+        <text x="175" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)">Talk</text>
+        <text x="175" y="140" transform="scale(.1)">Talk</text>
+        <text x="690" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)">Telegram</text>
+        <text x="690" y="140" transform="scale(.1)">Telegram</text>
+    </g>
+</svg>
--- a/badges/kdocs.svg
+++ b/badges/kdocs.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="104" height="20">
+    <linearGradient id="b" x2="0" y2="100%">
+        <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+        <stop offset="1" stop-opacity=".1"/>
+    </linearGradient>
+    <clipPath id="a">
+        <rect width="104" height="20" rx="3" fill="#fff"/>
+    </clipPath>
+    <g clip-path="url(#a)">
+        <path fill="#555" d="M0 0h65v20H0z"/>
+        <path fill="#007ec6" d="M45 0h69v20H45z"/>
+        <path fill="url(#b)" d="M0 0h104v20H0z"/>
+    </g>
+    <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110">
+        <text x="225" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)">Open</text>
+        <text x="225" y="140" transform="scale(.1)">Open</text>
+        <text x="740" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)">KDocs</text>
+        <text x="740" y="140" transform="scale(.1)">KDocs</text>
+    </g>
+</svg>
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,7 @@
 buildscript {
    repositories {
        mavenLocal()
+        jcenter()
        mavenCentral()
        maven { url "https://plugins.gradle.org/m2/" }
    }
@@ -8,6 +9,7 @@ buildscript {
    dependencies {
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version"
        classpath "com.github.breadmoirai:github-release:$github_release_plugin_version"
    }
 }
@@ -17,17 +19,6 @@ plugins {
    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version" apply false
 }

-// temporal crutch until legacy tests will be stabled or legacy target will be removed
-allprojects {
-    if (it != rootProject.findProject("docs")) {
-        tasks.whenTaskAdded { task ->
-            if(task.name == "jsLegacyBrowserTest" || task.name == "jsLegacyNodeTest") {
-                task.enabled = false
-            }
-        }
-    }
-}
-
 private String getCurrentVersionChangelog() {
    OutputStream changelogDataOS = new ByteArrayOutputStream()
    exec {
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -1,6 +1,7 @@
 buildscript {
    repositories {
        mavenLocal()
+        jcenter()
        mavenCentral()
    }

@@ -19,12 +20,13 @@ plugins {

 repositories {
    mavenLocal()
+    jcenter()
    mavenCentral()
 }

 kotlin {
    jvm()
-    js(IR) {
+    js(BOTH) {
        browser()
        nodejs()
    }
@@ -34,7 +36,7 @@ kotlin {
            dependencies {
                implementation kotlin('stdlib')

-                rootProject.subprojects.forEach {
+                project.parent.subprojects.forEach {
                    if (it != project) {
                        api it
                    }
@@ -44,17 +46,29 @@ kotlin {
    }
 }

-private List<SourceDirectorySet> findSourcesWithName(String... approximateNames) {
-    return parent.subprojects
-        .findAll { it != project }
-        .collectMany { it.kotlin.sourceSets }
-        .findAll { sourceSet -> approximateNames.any {
-            nameToFilter -> sourceSet.name.contains(nameToFilter)
+private Closure includeSourcesInDokka(String... approximateNames) {
+    return {
+        parent.subprojects.forEach {
+            if (it != project) {
+                File srcDir = new File(it.projectDir.absolutePath, "src")
+                if (srcDir.exists() && srcDir.isDirectory()) {
+                    srcDir.eachFile { file ->
+                        if (approximateNames.any { file.name.contains(it) } && file.isDirectory()) {
+                            String pathToSrc = file.absolutePath
+                            sourceRoot {
+                                path = pathToSrc
+                            }
+                        }
+                    }
+                }
            }
-        }.collect { it.kotlin }
+        }
+    }
 }

-Object callback = {
+dokka {
+    outputFormat = 'html'
+
    switch (true) {
        case project.hasProperty("DOKKA_PATH"):
            outputDirectory = project.property("DOKKA_PATH").toString()
@@ -64,30 +78,19 @@ Object callback = {
            break
    }

-    dokkaSourceSets {
-        configureEach {
-            skipDeprecated.set(true)
+    multiplatform {
+        global {
+            skipDeprecated = true

            sourceLink {
-                localDirectory.set(file("./"))
-                remoteUrl.set(new URL("https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/"))
-                remoteLineSuffix.set("#L")
+                path = "./"
+                url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/"
+                lineSuffix = "#L"
            }
        }

-        named("commonMain") {
-            sourceRoots.setFrom(findSourcesWithName("commonMain"))
-        }
-
-        named("jsMain") {
-            sourceRoots.setFrom(findSourcesWithName("jsMain"))
-        }
-
-        named("jvmMain") {
-            sourceRoots.setFrom(findSourcesWithName("jvmMain"))
-        }
+        common(includeSourcesInDokka("commonMain"))
+        js(includeSourcesInDokka("jsMain"/*, "commonMain"*/))
+        jvm(includeSourcesInDokka("jvmMain"/*, "commonMain"*/))
    }
 }
-
-tasks.dokkaGfm(callback)
-tasks.dokkaHtml(callback)
--- a/docs/gradle.properties
+++ b/docs/gradle.properties
@@ -1,3 +1,3 @@
-dokka_version=1.5.31
+dokka_version=0.10.1

 org.gradle.jvmargs=-Xmx1024m
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,22 +1,21 @@
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx1024m
 kotlin.code.style=official
 org.gradle.parallel=true
 kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true

-kotlin_version=1.5.31
-kotlin_coroutines_version=1.5.2
-kotlin_serialisation_runtime_version=1.3.0
-klock_version=2.4.7
-uuid_version=0.3.1
-ktor_version=1.6.5
-
-micro_utils_version=0.7.5
+kotlin_version=1.4.10
+kotlin_coroutines_version=1.3.9
+kotlin_serialisation_runtime_version=1.0.0
+klock_version=1.12.1
+uuid_version=0.2.2
+ktor_version=1.4.1

 javax_activation_version=1.1.1

 library_group=dev.inmo
-library_version=0.36.2
+library_version=0.29.1

+gradle_bintray_plugin_version=1.8.5
 github_release_plugin_version=2.2.12
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
--- a/resources/TelegramBotAPI-libraries-hierarchy.svg
+++ b/resources/TelegramBotAPI-libraries-hierarchy.svg
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,24 +1,5 @@
-pluginManagement {
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id == "org.jetbrains.dokka") {
-                useModule("org.jetbrains.dokka:dokka-gradle-plugin:${requested.version}")
-            }
-        }
-    }
-    repositories {
-        gradlePluginPortal()
-    }
-}
-
 include ":tgbotapi.core"
-include ":tgbotapi.api"
-include ":tgbotapi.utils"
-include ":tgbotapi.behaviour_builder"
-include ":tgbotapi.behaviour_builder.fsm"
 include ":tgbotapi.extensions.api"
 include ":tgbotapi.extensions.utils"
-include ":tgbotapi.extensions.behaviour_builder"
-include ":tgbotapi.extensions.behaviour_builder.fsm"
 include ":tgbotapi"
 include ":docs"
--- a/tgbotapi.api/build.gradle
+++ b/tgbotapi.api/build.gradle
@@ -1,50 +0,0 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-    }
-}
-
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization"
-}
-
-project.version = "$library_version"
-project.group = "$library_group"
-
-apply from: "publish.gradle"
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
-kotlin {
-    jvm()
-    js(IR) {
-        browser()
-        nodejs()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-                api project(":tgbotapi.core")
-            }
-        }
-    }
-}
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
-    }
-}
-
--- a/tgbotapi.api/mpp_publish_template.kpsb
+++ b/tgbotapi.api/mpp_publish_template.kpsb
@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Extensions for API","description":"API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}
--- a/tgbotapi.api/publish.gradle
+++ b/tgbotapi.api/publish.gradle
@@ -1,69 +0,0 @@
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference"
-            name = "Telegram Bot API Extensions for API"
-            url = "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
-                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
-                    }
-                
-            }
-        }
-        repositories {
-            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
-                maven {
-                    name = "GithubPackages"
-                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
-                    credentials {
-                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
-                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
-                    }
-                }
-            }
-            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                maven {
-                    name = "sonatype"
-                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                    credentials {
-                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                    }
-                }
-            }
-        }
-    }
-}
-
-signing {
-    useGpgCmd()
-    sign publishing.publications
-}
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt
@@ -1,112 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.tgbotapi.bot.Ktor.telegramBot
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
-import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
-import io.ktor.client.HttpClient
-import io.ktor.client.HttpClientConfig
-import io.ktor.client.engine.*
-
-/**
- * Allows to create bot using bot [urlsKeeper] and already prepared [client]
- */
-fun telegramBot(
-    urlsKeeper: TelegramAPIUrlsKeeper,
-    client: HttpClient
-): TelegramBot = telegramBot(urlsKeeper) {
-    this.client = client
-}
-
-/**
- * Allows to create bot using bot [urlsKeeper] and specify [HttpClientEngineFactory] by passing [clientFactory] param and optionally
- * configure it with [clientConfig]
- */
-@Suppress("NOTHING_TO_INLINE")
-inline fun <T: HttpClientEngineConfig> telegramBot(
-    urlsKeeper: TelegramAPIUrlsKeeper,
-    clientFactory: HttpClientEngineFactory<T>,
-    noinline clientConfig: HttpClientConfig<T>.() -> Unit = {}
-) = telegramBot(
-    urlsKeeper,
-    HttpClient(clientFactory, clientConfig)
-)
-
-/**
- * Allows to create bot using bot [urlsKeeper] and specify [HttpClientEngine] by passing [clientEngine] param and optionally
- * configure [HttpClient] using [clientConfig]
- */
-@Suppress("NOTHING_TO_INLINE")
-inline fun telegramBot(
-    urlsKeeper: TelegramAPIUrlsKeeper,
-    clientEngine: HttpClientEngine,
-    noinline clientConfig: HttpClientConfig<*>.() -> Unit = {}
-) = telegramBot(
-    urlsKeeper,
-    HttpClient(clientEngine, clientConfig)
-)
-
-/**
- * Allows to create bot using bot [urlsKeeper] and specify [HttpClientEngine] by configuring [HttpClient] using
- * [clientConfig]
- */
-@Suppress("NOTHING_TO_INLINE")
-inline fun telegramBot(
-    urlsKeeper: TelegramAPIUrlsKeeper,
-    noinline clientConfig: HttpClientConfig<*>.() -> Unit
-) = telegramBot(
-    urlsKeeper,
-    HttpClient(clientConfig)
-)
-
-/**
- * Allows to create bot using bot [token], [apiUrl] (for custom api servers) and already prepared [client]
- */
-@Suppress("NOTHING_TO_INLINE")
-inline fun telegramBot(
-    token: String,
-    apiUrl: String = telegramBotAPIDefaultUrl,
-    client: HttpClient
-): TelegramBot = telegramBot(TelegramAPIUrlsKeeper(token, apiUrl), client)
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun <T: HttpClientEngineConfig> telegramBot(
-    token: String,
-    clientFactory: HttpClientEngineFactory<T>,
-    apiUrl: String = telegramBotAPIDefaultUrl,
-    noinline clientConfig: HttpClientConfig<T>.() -> Unit = {}
-) = telegramBot(
-    TelegramAPIUrlsKeeper(token, apiUrl),
-    clientFactory,
-    clientConfig
-)
-
-/**
- * Allows to create bot using bot [token] and specify [HttpClientEngine] by passing [clientEngine] param and optionally
- * configure [HttpClient] using [clientConfig]
- */
-@Suppress("NOTHING_TO_INLINE")
-inline fun telegramBot(
-    token: String,
-    clientEngine: HttpClientEngine,
-    apiUrl: String = telegramBotAPIDefaultUrl,
-    noinline clientConfig: HttpClientConfig<*>.() -> Unit = {}
-) = telegramBot(
-    TelegramAPIUrlsKeeper(token, apiUrl),
-    clientEngine,
-    clientConfig
-)
-
-/**
- * Allows to create bot using bot [token] and [apiUrl] and specify [HttpClientEngine] by configuring [HttpClient] using
- * [clientConfig]
- */
-@Suppress("NOTHING_TO_INLINE")
-inline fun telegramBot(
-    token: String,
-    apiUrl: String = telegramBotAPIDefaultUrl,
-    noinline clientConfig: HttpClientConfig<*>.() -> Unit
-) = telegramBot(
-    TelegramAPIUrlsKeeper(token, apiUrl),
-    clientConfig
-)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/Close.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/Close.kt
@@ -1,7 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.local.Close
-
-@Suppress("unused")
-suspend inline fun TelegramBot.close() = execute(Close)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveLocationProvider.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveLocationProvider.kt
@@ -1,275 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import com.soywiz.klock.DateTime
-import com.soywiz.klock.TimeSpan
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.LiveLocation.editLiveLocation
-import dev.inmo.tgbotapi.extensions.api.edit.LiveLocation.stopLiveLocation
-import dev.inmo.tgbotapi.requests.send.SendLiveLocation
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.location.LiveLocation
-import dev.inmo.tgbotapi.types.location.StaticLocation
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.message.content.LocationContent
-import io.ktor.utils.io.core.Closeable
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import kotlin.math.ceil
-
-val defaultLivePeriodDelayMillis = (livePeriodLimit.last - 60L) * 1000L
-
-/**
- * @see startLiveLocation
- */
-class LiveLocationProvider internal constructor(
-    private val requestsExecutor: TelegramBot,
-    scope: CoroutineScope,
-    autoCloseTimeDelay: Double,
-    initMessage: ContentMessage<LocationContent>
-) : Closeable {
-    private val doWhenClose = {
-        scope.launch {
-            requestsExecutor.stopLiveLocation(message)
-        }
-    }
-    private val autoCloseTime = DateTime.now() + TimeSpan(autoCloseTimeDelay)
-    val leftUntilCloseMillis: TimeSpan
-        get() = autoCloseTime - DateTime.now()
-
-    var isClosed: Boolean = false
-        private set
-        get() = field || leftUntilCloseMillis.millisecondsLong < 0L
-
-    private var message: ContentMessage<LocationContent> = initMessage
-    val lastLocation: LiveLocation
-        get() = message.content.location as LiveLocation
-
-    /**
-     * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
-     * as a builder for that
-     */
-    suspend fun updateLocation(
-        location: LiveLocation,
-        replyMarkup: InlineKeyboardMarkup? = null
-    ): LiveLocation {
-        if (!isClosed) {
-            message = requestsExecutor.editLiveLocation(
-                message,
-                location,
-                replyMarkup
-            )
-            return lastLocation
-        } else {
-            error("LiveLocation is closed")
-        }
-    }
-
-    override fun close() {
-        if (isClosed) {
-            return
-        }
-        isClosed = true
-        doWhenClose()
-    }
-}
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.startLiveLocation(
-    scope: CoroutineScope,
-    chatId: ChatIdentifier,
-    latitude: Double,
-    longitude: Double,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    initHorizontalAccuracy: Meters? = null,
-    initHeading: Degrees? = null,
-    initProximityAlertRadius: Meters? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-): LiveLocationProvider {
-    val liveTimeAsDouble = liveTimeMillis.toDouble()
-    val locationMessage = execute(
-        SendLiveLocation(
-            chatId,
-            latitude,
-            longitude,
-            ceil(liveTimeAsDouble / 1000).toInt(),
-            initHorizontalAccuracy,
-            initHeading,
-            initProximityAlertRadius,
-            disableNotification,
-            replyToMessageId,
-            allowSendingWithoutReply,
-            replyMarkup
-        )
-    )
-
-    return LiveLocationProvider(
-        this,
-        scope,
-        liveTimeAsDouble,
-        locationMessage
-    )
-}
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.startLiveLocation(
-    scope: CoroutineScope,
-    chat: Chat,
-    latitude: Double,
-    longitude: Double,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    initHorizontalAccuracy: Meters? = null,
-    initHeading: Degrees? = null,
-    initProximityAlertRadius: Meters? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-): LiveLocationProvider = startLiveLocation(
-    scope,
-    chat.id,
-    latitude,
-    longitude,
-    liveTimeMillis,
-    initHorizontalAccuracy,
-    initHeading,
-    initProximityAlertRadius,
-    disableNotification,
-    replyToMessageId,
-    allowSendingWithoutReply,
-    replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.startLiveLocation(
-    scope: CoroutineScope,
-    chatId: ChatId,
-    location: StaticLocation,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    initHorizontalAccuracy: Meters? = null,
-    initHeading: Degrees? = null,
-    initProximityAlertRadius: Meters? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-): LiveLocationProvider = startLiveLocation(
-    scope,
-    chatId,
-    location.latitude,
-    location.longitude,
-    liveTimeMillis,
-    initHorizontalAccuracy,
-    initHeading,
-    initProximityAlertRadius,
-    disableNotification,
-    replyToMessageId,
-    allowSendingWithoutReply,
-    replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.startLiveLocation(
-    scope: CoroutineScope,
-    chat: Chat,
-    location: StaticLocation,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    initHorizontalAccuracy: Meters? = null,
-    initHeading: Degrees? = null,
-    initProximityAlertRadius: Meters? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-): LiveLocationProvider = startLiveLocation(
-    scope,
-    chat.id,
-    location.latitude,
-    location.longitude,
-    liveTimeMillis,
-    initHorizontalAccuracy,
-    initHeading,
-    initProximityAlertRadius,
-    disableNotification,
-    replyToMessageId,
-    allowSendingWithoutReply,
-    replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.replyWithLiveLocation(
-    to: Message,
-    scope: CoroutineScope,
-    latitude: Double,
-    longitude: Double,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    initHorizontalAccuracy: Meters? = null,
-    initHeading: Degrees? = null,
-    initProximityAlertRadius: Meters? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = startLiveLocation(
-    scope,
-    to.chat,
-    latitude,
-    longitude,
-    liveTimeMillis,
-    initHorizontalAccuracy,
-    initHeading,
-    initProximityAlertRadius,
-    disableNotification,
-    to.messageId,
-    allowSendingWithoutReply,
-    replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.replyWithLiveLocation(
-    to: Message,
-    scope: CoroutineScope,
-    location: StaticLocation,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    initHorizontalAccuracy: Meters? = null,
-    initHeading: Degrees? = null,
-    initProximityAlertRadius: Meters? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = startLiveLocation(
-    scope,
-    to.chat,
-    location,
-    liveTimeMillis,
-    initHorizontalAccuracy,
-    initHeading,
-    initProximityAlertRadius,
-    disableNotification,
-    to.messageId,
-    allowSendingWithoutReply,
-    replyMarkup
-)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LogOut.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LogOut.kt
@@ -1,6 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.local.LogOut
-
-suspend inline fun TelegramBot.logOut() = execute(LogOut)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/DeleteMyCommands.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/DeleteMyCommands.kt
@@ -1,17 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.DeleteMyCommands
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.deleteMyCommands(
-    scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLanguageCode?
-) = execute(DeleteMyCommands(scope, languageCode))
-
-suspend fun TelegramBot.deleteMyCommands(
-    scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: String? = null
-) = deleteMyCommands(scope, languageCode ?.let(::IetfLanguageCode))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt
@@ -1,17 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.getMyCommands(
-    scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLanguageCode? = null
-) = execute(GetMyCommands(scope, languageCode))
-
-suspend fun TelegramBot.getMyCommands(
-    scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: String?
-) = getMyCommands(scope, languageCode ?.let(::IetfLanguageCode))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt
@@ -1,32 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.SetMyCommands
-import dev.inmo.tgbotapi.types.BotCommand
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.setMyCommands(
-    commands: List<BotCommand>,
-    scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLanguageCode?
-) = execute(SetMyCommands(commands, scope, languageCode))
-
-suspend fun TelegramBot.setMyCommands(
-    vararg commands: BotCommand,
-    scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLanguageCode?
-) = setMyCommands(commands.toList(), scope, languageCode)
-
-suspend fun TelegramBot.setMyCommands(
-    commands: List<BotCommand>,
-    scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: String? = null
-) = setMyCommands(commands, scope, languageCode ?.let(::IetfLanguageCode))
-
-suspend fun TelegramBot.setMyCommands(
-    vararg commands: BotCommand,
-    scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: String? = null
-) = setMyCommands(commands.toList(), scope, languageCode)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/CreateChatInviteLink.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/CreateChatInviteLink.kt
@@ -1,31 +0,0 @@
-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.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/EditChatInviteLink.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/EditChatInviteLink.kt
@@ -1,63 +0,0 @@
-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.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/RevokeChatInviteLink.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/RevokeChatInviteLink.kt
@@ -1,27 +0,0 @@
-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.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/BanChatMember.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/BanChatMember.kt
@@ -1,34 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.members
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.members.BanChatMember
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
-
-suspend fun TelegramBot.banChatMember(
-    chatId: ChatIdentifier,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    revokeMessages: Boolean? = null
-) = execute(BanChatMember(chatId, userId, untilDate, revokeMessages))
-
-suspend fun TelegramBot.banChatMember(
-    chat: PublicChat,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    revokeMessages: Boolean? = null
-) = banChatMember(chat.id, userId, untilDate, revokeMessages)
-
-suspend fun TelegramBot.banChatMember(
-    chatId: ChatId,
-    user: User,
-    untilDate: TelegramDate? = null,
-    revokeMessages: Boolean? = null
-) = banChatMember(chatId, user.id, untilDate, revokeMessages)
-
-suspend fun TelegramBot.banChatMember(
-    chat: PublicChat,
-    user: User,
-    untilDate: TelegramDate? = null,
-    revokeMessages: Boolean? = null
-) = banChatMember(chat.id, user.id, untilDate, revokeMessages)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinAllChatMessages.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinAllChatMessages.kt
@@ -1,14 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.modify
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.modify.UnpinAllChatMessages
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-
-suspend fun TelegramBot.unpinAllChatMessages(
-    chatId: ChatIdentifier
-) = execute(UnpinAllChatMessages(chatId))
-
-suspend fun TelegramBot.unpinAllChatMessages(
-    chat: Chat
-) = unpinAllChatMessages(chat.id)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt
@@ -1,22 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.modify
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.modify.UnpinChatMessage
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-
-suspend fun TelegramBot.unpinChatMessage(
-    chatId: ChatIdentifier,
-    messageId: MessageIdentifier? = null
-) = execute(UnpinChatMessage(chatId, messageId))
-
-suspend fun TelegramBot.unpinChatMessage(
-    chat: Chat,
-    messageId: MessageIdentifier? = null
-) = unpinChatMessage(chat.id, messageId)
-
-suspend fun TelegramBot.unpinChatMessage(
-    message: Message
-) = unpinChatMessage(message.chat.id, message.messageId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/EditChatMessageLiveLocation.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/EditChatMessageLiveLocation.kt
@@ -1,94 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit.LiveLocation
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.LiveLocation.EditChatMessageLiveLocation
-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.location.LiveLocation
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.content.LocationContent
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editLiveLocation(
-    chatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(
-    EditChatMessageLiveLocation(
-        chatId, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editLiveLocation(
-    chat: Chat,
-    messageId: MessageIdentifier,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chat.id, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editLiveLocation(
-    message: ContentMessage<LocationContent>,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(message.chat, message.messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editLiveLocation(
-    chatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(
-    EditChatMessageLiveLocation(
-        chatId, messageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editLiveLocation(
-    chat: Chat,
-    messageId: MessageIdentifier,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chat.id, messageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editLiveLocation(
-    message: ContentMessage<LocationContent>,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(message.chat, message.messageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditChatMessageCaption.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditChatMessageCaption.kt
@@ -1,89 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit.caption
-
-import dev.inmo.tgbotapi.CommonAbstracts.TextedWithTextSources
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.caption.EditChatMessageCaption
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageCaption(
-    chatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    text: String,
-    parseMode: ParseMode? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(
-    EditChatMessageCaption(chatId, messageId, text, parseMode, replyMarkup)
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageCaption(
-    chat: Chat,
-    messageId: MessageIdentifier,
-    text: String,
-    parseMode: ParseMode? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageCaption(chat.id, messageId, text, parseMode, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun <T> TelegramBot.editMessageCaption(
-    message: ContentMessage<T>,
-    text: String,
-    parseMode: ParseMode? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-): ContentMessage<MediaContent> where T : TextedWithTextSources, T : MediaContent {
-    return editMessageCaption(message.chat.id, message.messageId, text, parseMode, replyMarkup)
-}
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageCaption(
-    chatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    entities: TextSourcesList,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(
-    EditChatMessageCaption(chatId, messageId, entities, replyMarkup)
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageCaption(
-    chat: Chat,
-    messageId: MessageIdentifier,
-    entities: List<TextSource>,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageCaption(chat.id, messageId, entities, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun <T> TelegramBot.editMessageCaption(
-    message: ContentMessage<T>,
-    entities: List<TextSource>,
-    replyMarkup: InlineKeyboardMarkup? = null
-): ContentMessage<MediaContent> where T : TextedWithTextSources, T : MediaContent {
-    return editMessageCaption(message.chat.id, message.messageId, entities, replyMarkup)
-}
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditInlineMessageCaption.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditInlineMessageCaption.kt
@@ -1,29 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit.caption
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.caption.EditInlineMessageCaption
-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageCaption(
-    inlineMessageId: InlineMessageIdentifier,
-    text: String,
-    parseMode: ParseMode? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(EditInlineMessageCaption(inlineMessageId, text, parseMode, replyMarkup))
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageCaption(
-    inlineMessageId: InlineMessageIdentifier,
-    entities: TextSourcesList,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(EditInlineMessageCaption(inlineMessageId, entities, replyMarkup))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditChatMessageText.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditChatMessageText.kt
@@ -1,89 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit.text
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.text.EditChatMessageText
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.content.TextContent
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageText(
-    chatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    text: String,
-    parseMode: ParseMode? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(
-    EditChatMessageText(chatId, messageId, text, parseMode, disableWebPagePreview, replyMarkup)
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageText(
-    chat: Chat,
-    messageId: MessageIdentifier,
-    text: String,
-    parseMode: ParseMode? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(chat.id, messageId, text, parseMode, disableWebPagePreview, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageText(
-    message: ContentMessage<TextContent>,
-    text: String,
-    parseMode: ParseMode? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(message.chat.id, message.messageId, text, parseMode, disableWebPagePreview, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageText(
-    chatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    entities: TextSourcesList,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(
-    EditChatMessageText(chatId, messageId, entities, disableWebPagePreview, replyMarkup)
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageText(
-    chat: Chat,
-    messageId: MessageIdentifier,
-    entities: TextSourcesList,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(chat.id, messageId, entities, disableWebPagePreview, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageText(
-    message: ContentMessage<TextContent>,
-    entities: TextSourcesList,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(message.chat.id, message.messageId, entities, disableWebPagePreview, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditInlineMessageText.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditInlineMessageText.kt
@@ -1,31 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit.text
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.text.EditInlineMessageText
-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageText(
-    inlineMessageId: InlineMessageIdentifier,
-    text: String,
-    parseMode: ParseMode? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(EditInlineMessageText(inlineMessageId, text, parseMode, disableWebPagePreview, replyMarkup))
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageText(
-    inlineMessageId: InlineMessageIdentifier,
-    entities: TextSourcesList,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(EditInlineMessageText(inlineMessageId, entities, disableWebPagePreview, replyMarkup))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFileStream.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFileStream.kt
@@ -1,28 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.files
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo
-import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.types.files.PathedFile
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-
-suspend fun TelegramBot.downloadFileStream(
-    filePath: String
-) = downloadFileStreamAllocator(filePath).invoke()
-
-suspend fun TelegramBot.downloadFileStream(
-    pathedFile: PathedFile
-) = downloadFileStream(pathedFile.filePath)
-
-suspend fun TelegramBot.downloadFileStream(
-    fileId: FileId
-) = downloadFileStream(getFileAdditionalInfo(fileId))
-
-suspend fun TelegramBot.downloadFileStream(
-    file: TelegramMediaFile
-) = downloadFileStream(getFileAdditionalInfo(file))
-
-suspend fun TelegramBot.downloadFileStream(
-    file: MediaContent
-) = downloadFileStream(getFileAdditionalInfo(file.media))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFileStreamAllocator.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFileStreamAllocator.kt
@@ -1,29 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.files
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo
-import dev.inmo.tgbotapi.requests.DownloadFileStream
-import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.types.files.PathedFile
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-
-suspend fun TelegramBot.downloadFileStreamAllocator(
-    filePath: String
-) = execute(DownloadFileStream(filePath))
-
-suspend fun TelegramBot.downloadFileStreamAllocator(
-    pathedFile: PathedFile
-) = downloadFileStreamAllocator(pathedFile.filePath)
-
-suspend fun TelegramBot.downloadFileStreamAllocator(
-    fileId: FileId
-) = downloadFileStreamAllocator(getFileAdditionalInfo(fileId))
-
-suspend fun TelegramBot.downloadFileStreamAllocator(
-    file: TelegramMediaFile
-) = downloadFileStreamAllocator(getFileAdditionalInfo(file))
-
-suspend fun TelegramBot.downloadFileStreamAllocator(
-    file: MediaContent
-) = downloadFileStreamAllocator(getFileAdditionalInfo(file.media))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/passport/SetPassportDataErrors.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/passport/SetPassportDataErrors.kt
@@ -1,46 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.passport
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.SetPassportDataErrors
-import dev.inmo.tgbotapi.types.User
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.message.PassportMessage
-import dev.inmo.tgbotapi.types.passport.PassportData
-import dev.inmo.tgbotapi.types.passport.PassportElementError
-import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportElement
-import dev.inmo.tgbotapi.utils.passport.Decryptor
-
-suspend fun TelegramBot.setPassportDataErrors(
-    userId: UserId,
-    errors: List<PassportElementError>
-) = execute(SetPassportDataErrors(userId, errors))
-suspend fun TelegramBot.setPassportDataErrors(
-    user: User,
-    errors: List<PassportElementError>
-) = setPassportDataErrors(user.id, errors)
-
-suspend fun TelegramBot.setPassportDataErrors(
-    userId: UserId,
-    passportData: PassportData,
-    decryptor: Decryptor,
-    mapper: suspend Decryptor.(EncryptedPassportElement) -> PassportElementError
-): Boolean = setPassportDataErrors(
-    userId,
-    passportData.data.map { decryptor.mapper(it) }.also {
-        if (it.isEmpty()) {
-            return@setPassportDataErrors false
-        }
-    }
-)
-suspend fun TelegramBot.setPassportDataErrors(
-    user: User,
-    passportData: PassportData,
-    decryptor: Decryptor,
-    mapper: suspend Decryptor.(EncryptedPassportElement) -> PassportElementError
-) = setPassportDataErrors(user.id, passportData, decryptor, mapper)
-
-suspend fun TelegramBot.setPassportDataErrors(
-    passportMessage: PassportMessage,
-    decryptor: Decryptor,
-    mapper: suspend Decryptor.(EncryptedPassportElement) -> PassportElementError
-) = setPassportDataErrors(passportMessage.user, passportMessage.passportData, decryptor, mapper)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/CopyMessage.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/CopyMessage.kt
@@ -1,198 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.send.CopyMessage
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.copyMessage(
-    fromChatId: ChatIdentifier,
-    toChatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    CopyMessage(fromChatId, toChatId, messageId, text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.copyMessage(
-    fromChat: Chat,
-    toChatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChat.id, toChatId, messageId, text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.copyMessage(
-    fromChatId: ChatIdentifier,
-    toChat: Chat,
-    messageId: MessageIdentifier,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChatId, toChat.id, messageId, text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.copyMessage(
-    fromChat: Chat,
-    toChat: Chat,
-    messageId: MessageIdentifier,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChat.id, toChat.id, messageId, text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.copyMessage(
-    toChatId: ChatIdentifier,
-    message: Message,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(message.chat, toChatId, message.messageId, text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.copyMessage(
-    toChat: Chat,
-    message: Message,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(message.chat, toChat, message.messageId, text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.copyMessage(
-    fromChatId: ChatIdentifier,
-    toChatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    CopyMessage(fromChatId, toChatId, messageId, entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.copyMessage(
-    fromChat: Chat,
-    toChatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChat.id, toChatId, messageId, entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.copyMessage(
-    fromChatId: ChatIdentifier,
-    toChat: Chat,
-    messageId: MessageIdentifier,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChatId, toChat.id, messageId, entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.copyMessage(
-    fromChat: Chat,
-    toChat: Chat,
-    messageId: MessageIdentifier,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChat.id, toChat.id, messageId, entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.copyMessage(
-    toChatId: ChatIdentifier,
-    message: Message,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(message.chat, toChatId, message.messageId, entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.copyMessage(
-    toChat: Chat,
-    message: Message,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(message.chat, toChat, message.messageId, entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt
@@ -1,801 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.send.games.sendGame
-import dev.inmo.tgbotapi.extensions.api.send.media.*
-import dev.inmo.tgbotapi.extensions.api.send.payments.sendInvoice
-import dev.inmo.tgbotapi.extensions.api.send.polls.sendQuizPoll
-import dev.inmo.tgbotapi.extensions.api.send.polls.sendRegularPoll
-import dev.inmo.tgbotapi.requests.abstracts.InputFile
-import dev.inmo.tgbotapi.requests.send.media.rawSendingMediaGroupsWarning
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.InputMedia.*
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.dice.DiceAnimationType
-import dev.inmo.tgbotapi.types.files.*
-import dev.inmo.tgbotapi.types.games.Game
-import dev.inmo.tgbotapi.types.location.StaticLocation
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.payments.LabeledPrice
-import dev.inmo.tgbotapi.types.payments.abstracts.Currency
-import dev.inmo.tgbotapi.types.polls.*
-import dev.inmo.tgbotapi.types.venue.Venue
-import dev.inmo.tgbotapi.utils.RiskFeature
-
-
-// Contact
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    phoneNumber: String,
-    firstName: String,
-    lastName: String? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendContact(
-    to.chat,
-    phoneNumber,
-    firstName,
-    lastName,
-    disableNotification,
-    to.messageId,
-    allowSendingWithoutReply,
-    replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    contact: Contact,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendContact(
-    to.chat,
-    contact,
-    disableNotification,
-    to.messageId,
-    allowSendingWithoutReply,
-    replyMarkup
-)
-
-
-// Dice
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.replyWithDice(
-    to: Message,
-    animationType: DiceAnimationType? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendDice(to.chat, animationType, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    animationType: DiceAnimationType,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = replyWithDice(to, animationType, disableNotification, allowSendingWithoutReply, replyMarkup)
-
-
-// Location
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    latitude: Double,
-    longitude: Double,
-    disableNotification: Boolean = false,
-    replyMarkup: KeyboardMarkup? = null
-) = sendLocation(
-    to.chat,
-    latitude,
-    longitude,
-    disableNotification,
-    to.messageId,
-    replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    location: StaticLocation,
-    disableNotification: Boolean = false,
-    replyMarkup: KeyboardMarkup? = null
-) = sendLocation(
-    to.chat,
-    location,
-    disableNotification,
-    to.messageId,
-    replyMarkup
-)
-
-
-// Text message
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    text: String,
-    parseMode: ParseMode? = null,
-    disableWebPagePreview: Boolean? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendTextMessage(
-    to.chat,
-    text,
-    parseMode,
-    disableWebPagePreview,
-    disableNotification,
-    to.messageId,
-    allowSendingWithoutReply,
-    replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    entities: TextSourcesList,
-    disableWebPagePreview: Boolean? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendTextMessage(
-    to.chat,
-    entities,
-    disableWebPagePreview,
-    disableNotification,
-    to.messageId,
-    allowSendingWithoutReply,
-    replyMarkup
-)
-
-
-// Venue
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    latitude: Double,
-    longitude: Double,
-    title: String,
-    address: String,
-    foursquareId: FoursquareId? = null,
-    foursquareType: FoursquareType? = null,
-    googlePlaceId: GooglePlaceId? = null,
-    googlePlaceType: GooglePlaceType? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVenue(
-    chat = to.chat,
-    latitude = latitude,
-    longitude = longitude,
-    title = title,
-    address = address,
-    foursquareId = foursquareId,
-    foursquareType = foursquareType,
-    googlePlaceId = googlePlaceId,
-    googlePlaceType = googlePlaceType,
-    disableNotification = disableNotification,
-    replyToMessageId = to.messageId,
-    allowSendingWithoutReply = allowSendingWithoutReply,
-    replyMarkup = replyMarkup
-)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    location: StaticLocation,
-    title: String,
-    address: String,
-    foursquareId: FoursquareId? = null,
-    foursquareType: FoursquareType? = null,
-    googlePlaceId: GooglePlaceId? = null,
-    googlePlaceType: GooglePlaceType? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVenue(
-    chat = to.chat,
-    latitude = location.latitude,
-    longitude = location.longitude,
-    title = title,
-    address = address,
-    foursquareId = foursquareId,
-    foursquareType = foursquareType,
-    googlePlaceId = googlePlaceId,
-    googlePlaceType = googlePlaceType,
-    disableNotification = disableNotification,
-    replyToMessageId = to.messageId,
-    allowSendingWithoutReply = allowSendingWithoutReply,
-    replyMarkup = replyMarkup
-)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    venue: Venue,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVenue(
-    chat = to.chat,
-    venue = venue,
-    disableNotification = disableNotification,
-    replyToMessageId = to.messageId,
-    allowSendingWithoutReply = allowSendingWithoutReply,
-    replyMarkup = replyMarkup
-)
-
-
-// Game
-
-suspend inline fun TelegramBot.replyWithGame(
-    to: Message,
-    gameShortName: String,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendGame(
-    to.chat, gameShortName, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup
-)
-
-suspend inline fun TelegramBot.replyWithGame(
-    to: Message,
-    game: Game,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendGame(
-    to.chat, game.title, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup
-)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    game: Game,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = replyWithGame(to, game, disableNotification, allowSendingWithoutReply, replyMarkup)
-
-
-// Animation
-
-suspend inline fun TelegramBot.replyWithAnimation(
-    to: Message,
-    animation: InputFile,
-    thumb: InputFile? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(
-    to.chat,
-    animation,
-    thumb,
-    text,
-    parseMode,
-    duration,
-    width,
-    height,
-    disableNotification,
-    to.messageId,
-    allowSendingWithoutReply,
-    replyMarkup
-)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    animation: AnimationFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(to.chat, animation, text, parseMode, duration, width, height, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.replyWithAnimation(
-    to: Message,
-    animation: InputFile,
-    entities: TextSourcesList,
-    thumb: InputFile? = null,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(
-    to.chat,
-    animation,
-    thumb,
-    entities,
-    duration,
-    width,
-    height,
-    disableNotification,
-    to.messageId,
-    allowSendingWithoutReply,
-    replyMarkup
-)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    animation: AnimationFile,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(to.chat, animation, entities, duration, width, height, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-
-// Audio
-
-suspend inline fun TelegramBot.replyWithAudio(
-    to: Message,
-    audio: InputFile,
-    thumb: InputFile? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    performer: String? = null,
-    title: String? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAudio(to.chat, audio, thumb, text, parseMode, duration, performer, title, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    audio: AudioFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    title: String? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAudio(to.chat, audio, text, parseMode, title, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.replyWithAudio(
-    to: Message,
-    audio: InputFile,
-    thumb: InputFile? = null,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    performer: String? = null,
-    title: String? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAudio(to.chat, audio, thumb, entities, duration, performer, title, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    audio: AudioFile,
-    entities: TextSourcesList,
-    title: String? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAudio(to.chat, audio, entities, title, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-
-// Documents
-
-suspend inline fun TelegramBot.replyWithDocument(
-    to: Message,
-    document: InputFile,
-    thumb: InputFile? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null,
-    disableContentTypeDetection: Boolean? = null
-) = sendDocument(to.chat, document, thumb, text, parseMode, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    document: DocumentFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null,
-    disableContentTypeDetection: Boolean? = null
-) = sendDocument(to.chat, document, text, parseMode, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection)
-
-suspend inline fun TelegramBot.replyWithDocument(
-    to: Message,
-    document: InputFile,
-    thumb: InputFile? = null,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null,
-    disableContentTypeDetection: Boolean? = null
-) = sendDocument(to.chat, document, thumb, entities, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    document: DocumentFile,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null,
-    disableContentTypeDetection: Boolean? = null
-) = sendDocument(to.chat, document, entities, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection)
-
-
-// Media Group
-
-@RiskFeature(rawSendingMediaGroupsWarning)
-suspend inline fun TelegramBot.replyWithMediaGroup(
-    to: Message,
-    media: List<MediaGroupMemberInputMedia>,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null
-) = sendMediaGroup(to.chat, media, disableNotification, to.messageId, allowSendingWithoutReply)
-
-suspend inline fun TelegramBot.replyWithPlaylist(
-    to: Message,
-    media: List<AudioMediaGroupMemberInputMedia>,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null
-) = sendPlaylist(to.chat, media, disableNotification, to.messageId, allowSendingWithoutReply)
-
-suspend inline fun TelegramBot.replyWithDocuments(
-    to: Message,
-    media: List<DocumentMediaGroupMemberInputMedia>,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null
-) = sendDocumentsGroup(to.chat, media, disableNotification, to.messageId, allowSendingWithoutReply)
-
-suspend inline fun TelegramBot.replyWithGallery(
-    to: Message,
-    media: List<VisualMediaGroupMemberInputMedia>,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null
-) = sendVisualMediaGroup(to.chat, media, disableNotification, to.messageId, allowSendingWithoutReply)
-
-
-// Photo
-
-suspend inline fun TelegramBot.replyWithPhoto(
-    to: Message,
-    fileId: InputFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, fileId, text, parseMode, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    photo: Photo,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, photo, text, parseMode, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-
-suspend inline fun TelegramBot.replyWithPhoto(
-    to: Message,
-    fileId: InputFile,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, fileId, entities, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    photo: Photo,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, photo, entities, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-
-// Sticker
-
-suspend inline fun TelegramBot.replyWithSticker(
-    to: Message,
-    sticker: InputFile,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendSticker(to.chat, sticker, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    sticker: Sticker,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendSticker(to.chat, sticker, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-
-// Videos
-
-suspend inline fun TelegramBot.replyWithVideo(
-    to: Message,
-    video: InputFile,
-    thumb: InputFile? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideo(to.chat, video, thumb, text, parseMode, duration, width, height, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    video: VideoFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideo(to.chat, video, text, parseMode, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.replyWithVideo(
-    to: Message,
-    video: InputFile,
-    thumb: InputFile? = null,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideo(to.chat, video, thumb, entities, duration, width, height, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    video: VideoFile,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideo(to.chat, video, entities, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-
-// VideoNotes
-
-suspend inline fun TelegramBot.replyWithVideoNote(
-    to: Message,
-    videoNote: InputFile,
-    thumb: InputFile? = null,
-    duration: Long? = null,
-    size: Int? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideoNote(to.chat, videoNote, thumb, duration, size, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    videoNote: VideoNoteFile,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideoNote(to.chat, videoNote, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-
-// Voice
-
-suspend inline fun TelegramBot.replyWithVoice(
-    to: Message,
-    voice: InputFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVoice(to.chat, voice, text, parseMode, duration, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    voice: VoiceFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVoice(to.chat, voice, text, parseMode, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-
-suspend inline fun TelegramBot.replyWithVoice(
-    to: Message,
-    voice: InputFile,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVoice(to.chat, voice, entities, duration, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    voice: VoiceFile,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVoice(to.chat, voice, entities, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-
-// Invoice
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    title: String,
-    description: String,
-    payload: String,
-    providerToken: String,
-    currency: Currency,
-    prices: List<LabeledPrice>,
-    maxTipAmount: Int? = null,
-    suggestedTipAmounts: List<Int>? = null,
-    startParameter: StartParameter? = null,
-    providerData: String? = null,
-    requireName: Boolean = false,
-    requirePhoneNumber: Boolean = false,
-    requireEmail: Boolean = false,
-    requireShippingAddress: Boolean = false,
-    shouldSendPhoneNumberToProvider: Boolean = false,
-    shouldSendEmailToProvider: Boolean = false,
-    priceDependOnShipAddress: Boolean = false,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = sendInvoice(to.chat.id, title, description, payload, providerToken, currency, prices, maxTipAmount, suggestedTipAmounts, startParameter, providerData, requireName, requirePhoneNumber, requireEmail, requireShippingAddress, shouldSendPhoneNumberToProvider, shouldSendEmailToProvider, priceDependOnShipAddress, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-
-// Polls
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    question: String,
-    options: List<String>,
-    isAnonymous: Boolean = true,
-    isClosed: Boolean = false,
-    allowMultipleAnswers: Boolean = false,
-    closeInfo: ScheduledCloseInfo? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendRegularPoll(to.chat, question, options, isAnonymous, isClosed, allowMultipleAnswers, closeInfo, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    poll: RegularPoll,
-    isClosed: Boolean = false,
-    question: String = poll.question,
-    options: List<String> = poll.options.map { it.text },
-    isAnonymous: Boolean = poll.isAnonymous,
-    allowMultipleAnswers: Boolean = poll.allowMultipleAnswers,
-    closeInfo: ScheduledCloseInfo? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendRegularPoll(to.chat, poll, isClosed, question, options, isAnonymous, allowMultipleAnswers, closeInfo, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    question: String,
-    options: List<String>,
-    correctOptionId: Int,
-    isAnonymous: Boolean = true,
-    isClosed: Boolean = false,
-    explanation: String? = null,
-    parseMode: ParseMode? = null,
-    closeInfo: ScheduledCloseInfo? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendQuizPoll(to.chat, question, options, correctOptionId, isAnonymous, isClosed, explanation, parseMode, closeInfo, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    quizPoll: QuizPoll,
-    isClosed: Boolean = false,
-    question: String = quizPoll.question,
-    options: List<String> = quizPoll.options.map { it.text },
-    correctOptionId: Int = quizPoll.correctOptionId ?: error("Correct option ID must be provided by income QuizPoll or by developer"),
-    isAnonymous: Boolean = quizPoll.isAnonymous,
-    explanation: String? = null,
-    parseMode: ParseMode? = null,
-    closeInfo: ScheduledCloseInfo? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendQuizPoll(to.chat, isClosed, quizPoll, question, options, correctOptionId, isAnonymous, explanation, parseMode, closeInfo, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    question: String,
-    options: List<String>,
-    correctOptionId: Int,
-    entities: TextSourcesList,
-    isAnonymous: Boolean = true,
-    isClosed: Boolean = false,
-    closeInfo: ScheduledCloseInfo? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendQuizPoll(to.chat, question, options, correctOptionId, isAnonymous, isClosed, entities, closeInfo, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    quizPoll: QuizPoll,
-    entities: TextSourcesList,
-    isClosed: Boolean = false,
-    question: String = quizPoll.question,
-    options: List<String> = quizPoll.options.map { it.text },
-    correctOptionId: Int = quizPoll.correctOptionId ?: error("Correct option ID must be provided by income QuizPoll or by developer"),
-    isAnonymous: Boolean = quizPoll.isAnonymous,
-    closeInfo: ScheduledCloseInfo? = null,
-    disableNotification: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendQuizPoll(to.chat, isClosed, quizPoll, question, options, correctOptionId, isAnonymous, entities, closeInfo, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendActionDSL.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendActionDSL.kt
@@ -1,73 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send
-
-import dev.inmo.micro_utils.coroutines.safelyWithResult
-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.*
-import kotlin.coroutines.coroutineContext
-
-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 = CoroutineScope(coroutineContext).launch {
-        while (isActive) {
-            delay(refreshTime)
-            safelyWithoutExceptions {
-                execute(actionRequest)
-            }
-        }
-    }
-    val result = safelyWithResult { block() }
-    botActionJob.cancel()
-    return result.getOrThrow()
-}
-
-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.withRecordVoiceAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, RecordVoiceAction, block)
-suspend fun <T> TelegramBot.withUploadVoiceAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadVoiceAction, 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.withRecordVoiceAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, RecordVoiceAction, block)
-suspend fun <T> TelegramBot.withUploadVoiceAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadVoiceAction, 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.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendLocation.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendLocation.kt
@@ -1,139 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.send.SendStaticLocation
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.location.StaticLocation
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendLocation(
-    chatId: ChatIdentifier,
-    latitude: Double,
-    longitude: Double,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendStaticLocation(
-        chatId,
-        latitude,
-        longitude,
-        disableNotification = disableNotification,
-        replyToMessageId = replyToMessageId,
-        replyMarkup = replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendLocation(
-    chatId: ChatIdentifier,
-    location: StaticLocation,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendLocation(
-    chatId,
-    location.latitude,
-    location.longitude,
-    disableNotification,
-    replyToMessageId,
-    replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendLocation(
-    chat: Chat,
-    latitude: Double,
-    longitude: Double,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendLocation(
-    chat.id,
-    latitude,
-    longitude,
-    disableNotification,
-    replyToMessageId,
-    replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendLocation(
-    chat: Chat,
-    location: StaticLocation,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendLocation(
-    chat.id,
-    location.latitude,
-    location.longitude,
-    disableNotification,
-    replyToMessageId,
-    replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendStaticLocation(
-    chatId: ChatIdentifier,
-    latitude: Double,
-    longitude: Double,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendLocation(chatId, latitude, longitude, disableNotification, replyToMessageId, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendStaticLocation(
-    chatId: ChatIdentifier,
-    location: StaticLocation,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendLocation(chatId, location.latitude, location.longitude, disableNotification, replyToMessageId, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendStaticLocation(
-    chat: Chat,
-    latitude: Double,
-    longitude: Double,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendLocation(chat.id, latitude, longitude, disableNotification, replyToMessageId, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendStaticLocation(
-    chat: Chat,
-    location: StaticLocation,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendLocation(chat.id, location.latitude, location.longitude, disableNotification, replyToMessageId, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendMessage.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendMessage.kt
@@ -1,136 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.send.SendTextMessage
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendMessage(
-    chatId: ChatIdentifier,
-    text: String,
-    parseMode: ParseMode? = null,
-    disableWebPagePreview: Boolean? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendTextMessage(chatId, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendTextMessage(
-    chatId: ChatIdentifier,
-    text: String,
-    parseMode: ParseMode? = null,
-    disableWebPagePreview: Boolean? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendMessage(
-    chatId, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendMessage(
-    chat: Chat,
-    text: String,
-    parseMode: ParseMode? = null,
-    disableWebPagePreview: Boolean? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendMessage(chat.id, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendTextMessage(
-    chat: Chat,
-    text: String,
-    parseMode: ParseMode? = null,
-    disableWebPagePreview: Boolean? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendTextMessage(chat.id, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendMessage(
-    chatId: ChatIdentifier,
-    entities: TextSourcesList,
-    disableWebPagePreview: Boolean? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendTextMessage(chatId, entities, disableWebPagePreview, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendTextMessage(
-    chatId: ChatIdentifier,
-    entities: TextSourcesList,
-    disableWebPagePreview: Boolean? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendMessage(
-    chatId, entities, disableWebPagePreview, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendMessage(
-    chat: Chat,
-    entities: TextSourcesList,
-    disableWebPagePreview: Boolean? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendMessage(chat.id, entities, disableWebPagePreview, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendTextMessage(
-    chat: Chat,
-    entities: TextSourcesList,
-    disableWebPagePreview: Boolean? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendTextMessage(chat.id, entities, disableWebPagePreview, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt
@@ -1,187 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.send.SendVenue
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.location.StaticLocation
-import dev.inmo.tgbotapi.types.venue.Venue
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVenue(
-    chatId: ChatIdentifier,
-    latitude: Double,
-    longitude: Double,
-    title: String,
-    address: String,
-    foursquareId: FoursquareId? = null,
-    foursquareType: FoursquareType? = null,
-    googlePlaceId: GooglePlaceId? = null,
-    googlePlaceType: GooglePlaceType? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendVenue(
-        chatId = chatId,
-        latitude = latitude,
-        longitude = longitude,
-        title = title,
-        address = address,
-        foursquareId = foursquareId,
-        foursquareType = foursquareType,
-        googlePlaceId = googlePlaceId,
-        googlePlaceType = googlePlaceType,
-        disableNotification = disableNotification,
-        replyToMessageId = replyToMessageId,
-        allowSendingWithoutReply = allowSendingWithoutReply,
-        replyMarkup = replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVenue(
-    chat: Chat,
-    latitude: Double,
-    longitude: Double,
-    title: String,
-    address: String,
-    foursquareId: FoursquareId? = null,
-    foursquareType: FoursquareType? = null,
-    googlePlaceId: GooglePlaceId? = null,
-    googlePlaceType: GooglePlaceType? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVenue(
-    chatId = chat.id,
-    latitude = latitude,
-    longitude = longitude,
-    title = title,
-    address = address,
-    foursquareId = foursquareId,
-    foursquareType = foursquareType,
-    googlePlaceId = googlePlaceId,
-    googlePlaceType = googlePlaceType,
-    disableNotification = disableNotification,
-    replyToMessageId = replyToMessageId,
-    allowSendingWithoutReply = allowSendingWithoutReply,
-    replyMarkup = replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVenue(
-    chatId: ChatIdentifier,
-    location: StaticLocation,
-    title: String,
-    address: String,
-    foursquareId: FoursquareId? = null,
-    foursquareType: FoursquareType? = null,
-    googlePlaceId: GooglePlaceId? = null,
-    googlePlaceType: GooglePlaceType? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVenue(
-    chatId = chatId,
-    latitude = location.latitude,
-    longitude = location.longitude,
-    title = title,
-    address = address,
-    foursquareId = foursquareId,
-    foursquareType = foursquareType,
-    googlePlaceId = googlePlaceId,
-    googlePlaceType = googlePlaceType,
-    disableNotification = disableNotification,
-    replyToMessageId = replyToMessageId,
-    allowSendingWithoutReply = allowSendingWithoutReply,
-    replyMarkup = replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVenue(
-    chat: Chat,
-    location: StaticLocation,
-    title: String,
-    address: String,
-    foursquareId: FoursquareId? = null,
-    foursquareType: FoursquareType? = null,
-    googlePlaceId: GooglePlaceId? = null,
-    googlePlaceType: GooglePlaceType? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVenue(
-    chatId = chat.id,
-    latitude = location.latitude,
-    longitude = location.longitude,
-    title = title,
-    address = address,
-    foursquareId = foursquareId,
-    foursquareType = foursquareType,
-    googlePlaceId = googlePlaceId,
-    googlePlaceType = googlePlaceType,
-    disableNotification = disableNotification,
-    replyToMessageId = replyToMessageId,
-    allowSendingWithoutReply = allowSendingWithoutReply,
-    replyMarkup = replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVenue(
-    chatId: ChatIdentifier,
-    venue: Venue,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendVenue(
-        chatId = chatId,
-        venue = venue,
-        disableNotification = disableNotification,
-        replyToMessageId = replyToMessageId,
-        allowSendingWithoutReply = allowSendingWithoutReply,
-        replyMarkup = replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVenue(
-    chat: Chat,
-    venue: Venue,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVenue(
-    chatId = chat.id,
-    venue = venue,
-    disableNotification = disableNotification,
-    replyToMessageId = replyToMessageId,
-    allowSendingWithoutReply = allowSendingWithoutReply,
-    replyMarkup = replyMarkup
-)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAnimation.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAnimation.kt
@@ -1,190 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send.media
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.InputFile
-import dev.inmo.tgbotapi.requests.send.media.SendAnimation
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.files.AnimationFile
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendAnimation(
-    chatId: ChatIdentifier,
-    animation: InputFile,
-    thumb: InputFile? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendAnimation(
-        chatId,
-        animation,
-        thumb,
-        text,
-        parseMode,
-        duration,
-        width,
-        height,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendAnimation(
-    chatId: ChatIdentifier,
-    animation: AnimationFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(
-    chatId, animation.fileId, animation.thumb ?.fileId, text, parseMode, duration, width, height, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendAnimation(
-    chat: Chat,
-    animation: InputFile,
-    thumb: InputFile? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(chat.id, animation, thumb, text, parseMode, duration, width, height, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendAnimation(
-    chat: Chat,
-    animation: AnimationFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(chat.id, animation, text, parseMode, duration, width, height, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendAnimation(
-    chatId: ChatIdentifier,
-    animation: InputFile,
-    thumb: InputFile? = null,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendAnimation(
-        chatId,
-        animation,
-        thumb,
-        entities,
-        duration,
-        width,
-        height,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendAnimation(
-    chatId: ChatIdentifier,
-    animation: AnimationFile,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(
-    chatId, animation.fileId, animation.thumb ?.fileId, entities, duration, width, height, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendAnimation(
-    chat: Chat,
-    animation: InputFile,
-    thumb: InputFile? = null,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(chat.id, animation, thumb, entities, duration, width, height, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendAnimation(
-    chat: Chat,
-    animation: AnimationFile,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(chat.id, animation, entities, duration, width, height, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAudio.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAudio.kt
@@ -1,178 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send.media
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.InputFile
-import dev.inmo.tgbotapi.requests.send.media.SendAudio
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.files.AudioFile
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendAudio(
-    chatId: ChatIdentifier,
-    audio: InputFile,
-    thumb: InputFile? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    performer: String? = null,
-    title: String? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendAudio(
-        chatId,
-        audio,
-        thumb,
-        text,
-        parseMode,
-        duration,
-        performer,
-        title,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendAudio(
-    chat: Chat,
-    audio: InputFile,
-    thumb: InputFile? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    performer: String? = null,
-    title: String? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAudio(chat.id, audio, thumb, text, parseMode, duration, performer, title, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendAudio(
-    chatId: ChatIdentifier,
-    audio: AudioFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    title: String? = audio.title,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAudio(chatId, audio.fileId, audio.thumb ?.fileId, text, parseMode, audio.duration, audio.performer, title, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendAudio(
-    chat: Chat,
-    audio: AudioFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    title: String? = audio.title,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAudio(chat.id, audio, text, parseMode, title, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendAudio(
-    chatId: ChatIdentifier,
-    audio: InputFile,
-    thumb: InputFile? = null,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    performer: String? = null,
-    title: String? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendAudio(
-        chatId,
-        audio,
-        thumb,
-        entities,
-        duration,
-        performer,
-        title,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendAudio(
-    chat: Chat,
-    audio: InputFile,
-    thumb: InputFile? = null,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    performer: String? = null,
-    title: String? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAudio(chat.id, audio, thumb, entities, duration, performer, title, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendAudio(
-    chatId: ChatIdentifier,
-    audio: AudioFile,
-    entities: TextSourcesList,
-    title: String? = audio.title,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAudio(chatId, audio.fileId, audio.thumb ?.fileId, entities, audio.duration, audio.performer, title, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendAudio(
-    chat: Chat,
-    audio: AudioFile,
-    entities: TextSourcesList,
-    title: String? = audio.title,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendAudio(chat.id, audio, entities, title, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendDocument.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendDocument.kt
@@ -1,169 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send.media
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.InputFile
-import dev.inmo.tgbotapi.requests.send.media.SendDocument
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.files.DocumentFile
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendDocument(
-    chatId: ChatIdentifier,
-    document: InputFile,
-    thumb: InputFile? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null,
-    disableContentTypeDetection: Boolean? = null
-) = execute(
-    SendDocument(
-        chatId,
-        document,
-        thumb,
-        text,
-        parseMode,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup,
-        disableContentTypeDetection
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendDocument(
-    chat: Chat,
-    document: InputFile,
-    thumb: InputFile? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null,
-    disableContentTypeDetection: Boolean? = null
-) = sendDocument(chat.id, document, thumb, text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendDocument(
-    chatId: ChatIdentifier,
-    document: DocumentFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null,
-    disableContentTypeDetection: Boolean? = null
-) = sendDocument(
-    chatId, document.fileId, document.thumb ?.fileId, text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendDocument(
-    chat: Chat,
-    document: DocumentFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null,
-    disableContentTypeDetection: Boolean? = null
-) = sendDocument(chat.id, document, text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendDocument(
-    chatId: ChatIdentifier,
-    document: InputFile,
-    thumb: InputFile? = null,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null,
-    disableContentTypeDetection: Boolean? = null
-) = execute(
-    SendDocument(
-        chatId,
-        document,
-        thumb,
-        entities,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup,
-        disableContentTypeDetection
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendDocument(
-    chat: Chat,
-    document: InputFile,
-    thumb: InputFile? = null,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null,
-    disableContentTypeDetection: Boolean? = null
-) = sendDocument(chat.id, document, thumb, entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendDocument(
-    chatId: ChatIdentifier,
-    document: DocumentFile,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null,
-    disableContentTypeDetection: Boolean? = null
-) = sendDocument(
-    chatId, document.fileId, document.thumb ?.fileId, entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendDocument(
-    chat: Chat,
-    document: DocumentFile,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null,
-    disableContentTypeDetection: Boolean? = null
-) = sendDocument(chat.id, document, entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt
@@ -1,124 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send.media
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.send.media.*
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.InputMedia.*
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
-import dev.inmo.tgbotapi.utils.RiskFeature
-
-/**
- * @see SendMediaGroup
- */
-@RiskFeature(rawSendingMediaGroupsWarning)
-suspend fun TelegramBot.sendMediaGroup(
-    chatId: ChatIdentifier,
-    media: List<MediaGroupMemberInputMedia>,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = execute(
-    SendMediaGroup<MediaGroupContent>(
-        chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply
-    )
-)
-
-/**
- * @see SendMediaGroup
- */
-@RiskFeature(rawSendingMediaGroupsWarning)
-suspend fun TelegramBot.sendMediaGroup(
-    chat: Chat,
-    media: List<MediaGroupMemberInputMedia>,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendMediaGroup(
-    chat.id, media, disableNotification, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendPlaylist
- */
-suspend fun TelegramBot.sendPlaylist(
-    chatId: ChatIdentifier,
-    media: List<AudioMediaGroupMemberInputMedia>,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = execute(
-    SendPlaylist(
-        chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply
-    )
-)
-
-/**
- * @see SendPlaylist
- */
-suspend fun TelegramBot.sendPlaylist(
-    chat: Chat,
-    media: List<AudioMediaGroupMemberInputMedia>,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendPlaylist(
-    chat.id, media, disableNotification, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendDocumentsGroup
- */
-suspend fun TelegramBot.sendDocumentsGroup(
-    chatId: ChatIdentifier,
-    media: List<DocumentMediaGroupMemberInputMedia>,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = execute(
-    SendDocumentsGroup(
-        chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply
-    )
-)
-
-/**
- * @see SendDocumentsGroup
- */
-suspend fun TelegramBot.sendDocumentsGroup(
-    chat: Chat,
-    media: List<DocumentMediaGroupMemberInputMedia>,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendDocumentsGroup(
-    chat.id, media, disableNotification, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendVisualMediaGroup
- */
-suspend fun TelegramBot.sendVisualMediaGroup(
-    chatId: ChatIdentifier,
-    media: List<VisualMediaGroupMemberInputMedia>,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = execute(
-    SendVisualMediaGroup(
-        chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply
-    )
-)
-
-/**
- * @see SendVisualMediaGroup
- */
-suspend fun TelegramBot.sendVisualMediaGroup(
-    chat: Chat,
-    media: List<VisualMediaGroupMemberInputMedia>,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendVisualMediaGroup(
-    chat.id, media, disableNotification, replyToMessageId, allowSendingWithoutReply
-)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendPhoto.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendPhoto.kt
@@ -1,151 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send.media
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.InputFile
-import dev.inmo.tgbotapi.requests.send.media.SendPhoto
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.files.Photo
-import dev.inmo.tgbotapi.types.files.biggest
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendPhoto(
-    chatId: ChatIdentifier,
-    fileId: InputFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendPhoto(
-        chatId,
-        fileId,
-        text,
-        parseMode,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendPhoto(
-    chat: Chat,
-    fileId: InputFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat.id, fileId, text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendPhoto(
-    chatId: ChatIdentifier,
-    photo: Photo,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chatId, photo.biggest() ?.fileId ?: error("Photo content must not be empty"), text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendPhoto(
-    chat: Chat,
-    photo: Photo,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat.id, photo, text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendPhoto(
-    chatId: ChatIdentifier,
-    fileId: InputFile,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendPhoto(
-        chatId,
-        fileId,
-        entities,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendPhoto(
-    chat: Chat,
-    fileId: InputFile,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat.id, fileId, entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendPhoto(
-    chatId: ChatIdentifier,
-    photo: Photo,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chatId, photo.biggest() ?.fileId ?: error("Photo content must not be empty"), entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendPhoto(
-    chat: Chat,
-    photo: Photo,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat.id, photo, entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideo.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideo.kt
@@ -1,177 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send.media
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.InputFile
-import dev.inmo.tgbotapi.requests.send.media.SendVideo
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.files.VideoFile
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVideo(
-    chatId: ChatIdentifier,
-    video: InputFile,
-    thumb: InputFile? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendVideo(
-        chatId,
-        video,
-        thumb,
-        text,
-        parseMode,
-        duration,
-        width,
-        height,
-        null,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVideo(
-    chatId: ChatIdentifier,
-    video: VideoFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chatId, video.fileId, video.thumb ?.fileId, text, parseMode, video.duration, video.width, video.height, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVideo(
-    chat: Chat,
-    video: InputFile,
-    thumb: InputFile? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chat.id, video, thumb, text, parseMode, duration, width, height, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVideo(
-    chat: Chat,
-    video: VideoFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chat.id, video, text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendVideo(
-    chatId: ChatIdentifier,
-    video: InputFile,
-    thumb: InputFile? = null,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendVideo(
-        chatId,
-        video,
-        thumb,
-        entities,
-        duration,
-        width,
-        height,
-        null,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendVideo(
-    chatId: ChatIdentifier,
-    video: VideoFile,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chatId, video.fileId, video.thumb ?.fileId, entities, video.duration, video.width, video.height, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendVideo(
-    chat: Chat,
-    video: InputFile,
-    thumb: InputFile? = null,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    width: Int? = null,
-    height: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chat.id, video, thumb, entities, duration, width, height, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendVideo(
-    chat: Chat,
-    video: VideoFile,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chat.id, video, entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideoNote.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideoNote.kt
@@ -1,82 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send.media
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.InputFile
-import dev.inmo.tgbotapi.requests.send.media.SendVideoNote
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.files.VideoNoteFile
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVideoNote(
-    chatId: ChatIdentifier,
-    videoNote: InputFile,
-    thumb: InputFile? = null,
-    duration: Long? = null,
-    size: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendVideoNote(
-        chatId,
-        videoNote,
-        thumb,
-        duration,
-        size,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVideoNote(
-    chatId: ChatIdentifier,
-    videoNote: VideoNoteFile,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideoNote(
-    chatId, videoNote.fileId, videoNote.thumb ?.fileId, videoNote.duration, videoNote.width, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVideoNote(
-    chat: Chat,
-    videoNote: InputFile,
-    thumb: InputFile? = null,
-    duration: Long? = null,
-    size: Int? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideoNote(chat.id, videoNote, thumb, duration, size, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVideoNote(
-    chat: Chat,
-    videoNote: VideoNoteFile,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVideoNote(chat.id, videoNote, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVoice.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVoice.kt
@@ -1,160 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send.media
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.InputFile
-import dev.inmo.tgbotapi.requests.send.media.SendVoice
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.files.VoiceFile
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVoice(
-    chatId: ChatIdentifier,
-    voice: InputFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendVoice(
-        chatId,
-        voice,
-        text,
-        parseMode,
-        duration,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVoice(
-    chat: Chat,
-    voice: InputFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    duration: Long? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVoice(chat.id, voice, text, parseMode, duration, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVoice(
-    chatId: ChatIdentifier,
-    voice: VoiceFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVoice(
-    chatId, voice.fileId, text, parseMode, voice.duration, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendVoice(
-    chat: Chat,
-    voice: VoiceFile,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVoice(chat.id, voice, text, parseMode, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendVoice(
-    chatId: ChatIdentifier,
-    voice: InputFile,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    SendVoice(
-        chatId,
-        voice,
-        entities,
-        duration,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendVoice(
-    chat: Chat,
-    voice: InputFile,
-    entities: TextSourcesList,
-    duration: Long? = null,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVoice(chat.id, voice, entities, duration, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendVoice(
-    chatId: ChatIdentifier,
-    voice: VoiceFile,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVoice(
-    chatId, voice.fileId, entities, voice.duration, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup
-)
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendVoice(
-    chat: Chat,
-    voice: VoiceFile,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendVoice(chat.id, voice, entities, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
--- a/tgbotapi.api/src/jvmMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFileToFile.kt
+++ b/tgbotapi.api/src/jvmMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFileToFile.kt
@@ -1,64 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.files
-
-import dev.inmo.micro_utils.coroutines.doOutsideOfCoroutine
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo
-import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.types.files.PathedFile
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-import io.ktor.util.cio.use
-import io.ktor.util.cio.writeChannel
-import io.ktor.utils.io.copyTo
-import kotlinx.coroutines.job
-import java.io.File
-import kotlin.coroutines.coroutineContext
-
-suspend fun TelegramBot.downloadFile(
-    filePath: String,
-    destFile: File
-): File {
-    val readChannel = downloadFileStream(filePath)
-
-    destFile.deleteRecursively()
-    destFile.parentFile.mkdirs()
-    doOutsideOfCoroutine { destFile.createNewFile() }
-
-    destFile.writeChannel(coroutineContext.job).use {
-        readChannel.copyTo(this)
-    }
-
-    return destFile
-}
-
-suspend fun TelegramBot.downloadFile(
-    pathedFile: PathedFile,
-    destFile: File
-) = downloadFile(
-    pathedFile.filePath,
-    destFile
-)
-
-suspend fun TelegramBot.downloadFile(
-    fileId: FileId,
-    destFile: File
-) = downloadFile(
-    getFileAdditionalInfo(fileId),
-    destFile
-)
-
-suspend fun TelegramBot.downloadFile(
-    file: TelegramMediaFile,
-    destFile: File
-): File = downloadFile(
-    getFileAdditionalInfo(file),
-    destFile
-)
-
-suspend fun TelegramBot.downloadFile(
-    file: MediaContent,
-    destFile: File
-) = downloadFile(
-    getFileAdditionalInfo(file.media),
-    destFile
-)
--- a/tgbotapi.behaviour_builder.fsm/README.md
+++ b/tgbotapi.behaviour_builder.fsm/README.md
@@ -1,32 +0,0 @@
-# TelegramBotAPI Behaviour Builder FSM Extensions
-
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.behaviour_builder.fsm/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.behaviour_builder.fsm)
-
-## What is it?
-
-
-This extension has been created to integrate finite state machine in [BehaviourBuilder](../tgbotapi.behaviour_builder/README.md).
-In case you wish to use some custom store for steps (states), you may extend `StatesManager` or use `DefaultStatesManager`
-with custom `DefaultStatesManagerRepo`. See [Examples repo](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/tree/master/FSMBot)
-to get more info and see how it works on base level.
-
-Lets see several examples:
-
-```kotlin
-data class StateRealization(override val context: ChatId) : State
-
-bot.telegramBotWithBehaviourAndFSMAndStartLongPolling(TOKEN) {
-    strictlyOn<StateRealization> {
-        // here your logic of state
-        it // you must return from state handler some other state as a result of this one or null if you want to complete the chain
-    }
-
-    onCommand("start") {
-        startChain(StateRealization(it.chat.id)) // starting of chain with StateRealization state
-    }
-}
-```
-
-Currently, for the states there is only one restriction - your state must implements `State` interface and override `context` to define it. It may be important that `context` will be used under the hood for comparison with contexts of other states in some situations in it may be important to correctly realize `equals` method.
-
-It is important, that all other methods are the same as for [BehaviourBuilder](../tgbotapi.behaviour_builder/README.md).
--- a/tgbotapi.behaviour_builder.fsm/build.gradle
+++ b/tgbotapi.behaviour_builder.fsm/build.gradle
@@ -1,50 +0,0 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-    }
-}
-
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization"
-}
-
-project.version = "$library_version"
-project.group = "$library_group"
-
-apply from: "publish.gradle"
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
-kotlin {
-    jvm()
-    js(IR) {
-        browser()
-        nodejs()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-                api project(":tgbotapi.behaviour_builder")
-                api "dev.inmo:micro_utils.fsm.common:$micro_utils_version"
-            }
-        }
-    }
-}
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
-    }
-}
--- a/tgbotapi.behaviour_builder.fsm/mpp_publish_template.kpsb
+++ b/tgbotapi.behaviour_builder.fsm/mpp_publish_template.kpsb
@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot Behaviour Builder FSM Extensions","description":"FSM extension for dev.inmo:tgbotapi.extensions.behaviour_builder.fsm","url":"https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.behaviour_builder","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}
--- a/tgbotapi.behaviour_builder.fsm/publish.gradle
+++ b/tgbotapi.behaviour_builder.fsm/publish.gradle
@@ -1,69 +0,0 @@
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "FSM extension for dev.inmo:tgbotapi.extensions.behaviour_builder.fsm"
-            name = "Telegram Bot Behaviour Builder FSM Extensions"
-            url = "https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.behaviour_builder"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
-                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
-                    }
-                
-            }
-        }
-        repositories {
-            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
-                maven {
-                    name = "GithubPackages"
-                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
-                    credentials {
-                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
-                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
-                    }
-                }
-            }
-            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                maven {
-                    name = "sonatype"
-                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                    credentials {
-                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                    }
-                }
-            }
-        }
-    }
-}
-
-signing {
-    useGpgCmd()
-    sign publishing.publications
-}
--- a/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM.kt
+++ b/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM.kt
@@ -1,113 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder
-
-import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
-import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
-import dev.inmo.micro_utils.fsm.common.*
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-import dev.inmo.micro_utils.coroutines.accumulatorFlow
-import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.BufferOverflow
-import kotlinx.coroutines.flow.*
-
-private suspend fun <I : State> BehaviourContextWithFSM.launchStateHandling(
-    state: State,
-    contextUpdatesFlow: Flow<Update>,
-    handlers: List<BehaviourWithFSMStateHandlerHolder<out I>>
-): State? {
-    return handlers.firstOrNull { it.checkHandleable(state) } ?.run {
-        handleState(contextUpdatesFlow, state)
-    }
-}
-
-/**
- * Interface which combine [BehaviourContext] and [StatesMachine]. Subcontext of triggers and states contexts must have
- * one common flow of updates and must not lose updates between updates
- *
- * @see DefaultBehaviourContextWithFSM
- * @see buildBehaviourWithFSM
- */
-interface BehaviourContextWithFSM : BehaviourContext, StatesMachine {
-    suspend fun start() = start(this)
-
-    override fun copy(
-        bot: TelegramBot,
-        scope: CoroutineScope,
-        broadcastChannelsSize: Int,
-        onBufferOverflow: BufferOverflow,
-        upstreamUpdatesFlow: Flow<Update>?,
-        updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>?
-    ): BehaviourContextWithFSM
-
-    companion object {
-        operator fun invoke(
-            behaviourContext: BehaviourContext,
-            handlers: List<BehaviourWithFSMStateHandlerHolder<*>>,
-            statesManager: StatesManager
-        ) = DefaultBehaviourContextWithFSM(behaviourContext, statesManager, handlers)
-    }
-}
-
-/**
- * Default realization of [BehaviourContextWithFSM]. It uses [behaviourContext] as a base for this object as
- * [BehaviourContext], but managing substates contexts updates for avoiding of updates lost between states
- */
-class DefaultBehaviourContextWithFSM(
-    private val behaviourContext: BehaviourContext,
-    private val statesManager: StatesManager,
-    private val handlers: List<BehaviourWithFSMStateHandlerHolder<*>>
-) : BehaviourContext by behaviourContext, BehaviourContextWithFSM {
-    private val updatesFlows = mutableMapOf<Any, Flow<Update>>()
-    private fun getContextUpdatesFlow(context: Any) = updatesFlows.getOrPut(context) {
-        allUpdatesFlow.accumulatorFlow(scope)
-    }
-    override suspend fun StatesMachine.handleState(state: State): State? = launchStateHandling(
-        state,
-        allUpdatesFlow,
-        handlers
-    )
-
-    override fun start(scope: CoroutineScope): Job = scope.launchSafelyWithoutExceptions {
-        val statePerformer: suspend (State) -> Unit = { state: State ->
-            val newState = launchStateHandling(state, getContextUpdatesFlow(state.context), handlers)
-            if (newState != null) {
-                statesManager.update(state, newState)
-            } else {
-                statesManager.endChain(state)
-            }
-        }
-        statesManager.onStartChain.subscribeSafelyWithoutExceptions(this) {
-            launch { statePerformer(it) }
-        }
-        statesManager.onChainStateUpdated.subscribeSafelyWithoutExceptions(this) { (old, new) ->
-            if (old.context != new.context) {
-                updatesFlows.remove(old.context)
-            }
-            launch { statePerformer(new) }
-        }
-        statesManager.onEndChain.subscribeSafelyWithoutExceptions(this) {
-            updatesFlows.remove(it.context)
-        }
-
-        statesManager.getActiveStates().forEach {
-            launch { statePerformer(it) }
-        }
-    }
-
-    override suspend fun startChain(state: State) {
-        statesManager.startChain(state)
-    }
-
-    override fun copy(
-        bot: TelegramBot,
-        scope: CoroutineScope,
-        broadcastChannelsSize: Int,
-        onBufferOverflow: BufferOverflow,
-        upstreamUpdatesFlow: Flow<Update>?,
-        updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>?
-    ): BehaviourContextWithFSM = BehaviourContextWithFSM(
-        behaviourContext.copy(bot, scope, broadcastChannelsSize, onBufferOverflow, upstreamUpdatesFlow, updatesFilter),
-        handlers,
-        statesManager
-    )
-}
--- a/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSMBuilder.kt
+++ b/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSMBuilder.kt
@@ -1,204 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder
-
-import dev.inmo.micro_utils.coroutines.*
-import dev.inmo.micro_utils.fsm.common.*
-import dev.inmo.micro_utils.fsm.common.managers.DefaultStatesManager
-import dev.inmo.micro_utils.fsm.common.managers.InMemoryDefaultStatesManagerRepo
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling
-import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingOfUpdatesByLongPolling
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
-import dev.inmo.tgbotapi.utils.PreviewFeature
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.Flow
-import kotlin.reflect.KClass
-
-class BehaviourContextWithFSMBuilder internal constructor(
-    private val resultBehaviourContext: BehaviourContextWithFSM,
-    private val handlers: MutableList<BehaviourWithFSMStateHandlerHolder<*>>
-) : BehaviourContextWithFSM by resultBehaviourContext {
-    internal constructor(
-        baseBehaviourContext: BehaviourContext,
-        statesManager: StatesManager = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
-        handlers: MutableList<BehaviourWithFSMStateHandlerHolder<*>> = mutableListOf()
-    ) : this(DefaultBehaviourContextWithFSM(baseBehaviourContext, statesManager, handlers), handlers)
-
-    /**
-     * Add NON STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Non strict means that
-     * for input [State] will be used [KClass.isInstance] and any inheritor of [kClass] will pass this requirement
-     *
-     * @see BehaviourWithFSMStateHandlerHolder
-     * @see onStateOrSubstate
-     */
-    fun <I : State> add(kClass: KClass<I>, handler: BehaviourWithFSMStateHandler<I>) {
-        handlers.add(BehaviourWithFSMStateHandlerHolder(kClass, false, handler))
-    }
-
-    /**
-     * Add STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Strict means that
-     * for input [State] will be used [State]::class == [kClass] and any [State] with exactly the same type will pass
-     * requirements
-     *
-     * @see BehaviourWithFSMStateHandlerHolder
-     * @see strictlyOn
-     */
-    fun <I : State> addStrict(kClass: KClass<I>, handler: BehaviourWithFSMStateHandler<I>) {
-        handlers.add(BehaviourWithFSMStateHandlerHolder(kClass, true, handler))
-    }
-
-
-    /**
-     * Add NON STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Non strict means that
-     * for input [State] will be used [KClass.isInstance] and any inheritor of [kClass] will pass this requirement
-     *
-     * @see BehaviourWithFSMStateHandlerHolder
-     * @see BehaviourContextWithFSMBuilder.add
-     */
-    @Suppress("MemberVisibilityCanBePrivate")
-    inline fun <reified I : State> onStateOrSubstate(handler: BehaviourWithFSMStateHandler<I>) {
-        add(I::class, handler)
-    }
-
-    /**
-     * Add STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Strict means that
-     * for input [State] will be used [State]::class == [kClass] and any [State] with exactly the same type will pass
-     * requirements
-     *
-     * @see BehaviourWithFSMStateHandlerHolder
-     * @see BehaviourContextWithFSMBuilder.addStrict
-     */
-    @Suppress("MemberVisibilityCanBePrivate")
-    inline fun <reified I : State> strictlyOn(handler: BehaviourWithFSMStateHandler<I>) {
-        addStrict(I::class, handler)
-    }
-
-    /**
-     * Returns completed [resultBehaviourContext], [handlers] and [statesManager]
-     */
-    internal fun build() = resultBehaviourContext
-}
-
-/**
- * Creates [BehaviourContextWithFSM] via creating of [DefaultBehaviourContext] with [this] as [TelegramBot],
- * [scope] as target scope for that [DefaultBehaviourContext] and [upstreamUpdatesFlow]. Pass [statesManager]
- * to customize some internal logic of states changes. Pass [presetHandlers] in case you have some list of
- * [BehaviourWithFSMStateHandlerHolder] with presets.
- *
- * !!! WARNING !!! This method WILL NOT call [BehaviourContextWithFSM.start] of result object and WILL NOT
- * start any updates retrieving. See [buildBehaviourWithFSMAndStartLongPolling] or
- * [telegramBotWithBehaviourAndFSMAndStartLongPolling] in case you wish to start [longPolling] automatically
- */
-suspend fun TelegramBot.buildBehaviourWithFSM(
-    upstreamUpdatesFlow: Flow<Update>? = null,
-    scope: CoroutineScope = defaultCoroutineScopeProvider(),
-    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    statesManager: StatesManager = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
-    presetHandlers: MutableList<BehaviourWithFSMStateHandlerHolder<*>> = mutableListOf(),
-    block: CustomBehaviourContextReceiver<BehaviourContextWithFSMBuilder, Unit>
-): BehaviourContextWithFSM = BehaviourContextWithFSMBuilder(
-    DefaultBehaviourContext(
-        this,
-        defaultExceptionsHandler ?.let { scope + ContextSafelyExceptionHandler(it) } ?: scope,
-        upstreamUpdatesFlow = upstreamUpdatesFlow
-    ),
-    statesManager,
-    presetHandlers
-).apply { block() }.build()
-
-/**
- * Use [buildBehaviourWithFSM] to create [BehaviourContextWithFSM] and launch getting of updates
- * using [longPolling]. For [longPolling] will be used result [BehaviourContextWithFSM] for both parameters
- * flowsUpdatesFilter and scope
- */
-suspend fun TelegramBot.buildBehaviourWithFSMAndStartLongPolling(
-    upstreamUpdatesFlow: Flow<Update>? = null,
-    scope: CoroutineScope = defaultCoroutineScopeProvider(),
-    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    statesManager: StatesManager = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
-    presetHandlers: MutableList<BehaviourWithFSMStateHandlerHolder<*>> = mutableListOf(),
-    block: CustomBehaviourContextReceiver<BehaviourContextWithFSMBuilder, Unit>
-): Pair<BehaviourContextWithFSM, Job> = buildBehaviourWithFSM(
-    upstreamUpdatesFlow,
-    scope,
-    defaultExceptionsHandler,
-    statesManager,
-    presetHandlers,
-    block
-).run {
-    this to scope.launch {
-        start()
-        longPolling(flowsUpdatesFilter, scope = scope)
-    }
-}
-
-/**
- * Creates [BehaviourContextWithFSM] via creating of [DefaultBehaviourContext] with [this] as [TelegramBot],
- * [scope] as target scope for that [DefaultBehaviourContext] and [FlowsUpdatesFilter.allUpdatesFlow] of
- * [flowUpdatesFilter] as [DefaultBehaviourContext.upstreamUpdatesFlow]. Pass [statesManager]
- * to customize some internal logic of states changes. Pass [presetHandlers] in case you have some list of
- * [BehaviourWithFSMStateHandlerHolder] with presets.
- * Use this method in case you wish to make some additional actions with [flowUpdatesFilter].
- *
- * !!! WARNING !!! This method WILL NOT call [BehaviourContextWithFSM.start] of result object and WILL NOT
- * start any updates retrieving. See [buildBehaviourWithFSMAndStartLongPolling] or
- * [telegramBotWithBehaviourAndFSMAndStartLongPolling] in case you wish to start [longPolling] automatically
- *
- * @see BehaviourContext
- * @see BehaviourContextWithFSM
- * @see longPolling
- * @see BehaviourContextWithFSMBuilder.strictlyOn
- * @see BehaviourContextWithFSMBuilder.onStateOrSubstate
- */
-@PreviewFeature
-suspend fun TelegramBot.buildBehaviourWithFSM(
-    flowUpdatesFilter: FlowsUpdatesFilter,
-    scope: CoroutineScope = defaultCoroutineScopeProvider(),
-    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    statesManager: StatesManager = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
-    presetHandlers: MutableList<BehaviourWithFSMStateHandlerHolder<*>> = mutableListOf(),
-    block: CustomBehaviourContextReceiver<BehaviourContextWithFSMBuilder, Unit>
-): BehaviourContextWithFSM = BehaviourContextWithFSMBuilder(
-    DefaultBehaviourContext(
-        this,
-        defaultExceptionsHandler ?.let { scope + ContextSafelyExceptionHandler(it) } ?: scope,
-        upstreamUpdatesFlow = flowUpdatesFilter.allUpdatesFlow
-    ),
-    statesManager,
-    presetHandlers
-).apply { block() }.build()
-
-/**
- * Use [buildBehaviourWithFSM] to create [BehaviourContextWithFSM] and launch getting of updates
- * using [longPolling]. For [longPolling] will be used result [BehaviourContextWithFSM] for both parameters
- * flowsUpdatesFilter and scope
- *
- * @see buildBehaviourWithFSMAndStartLongPolling
- * @see BehaviourContext
- * @see longPolling
- * @see BehaviourContextWithFSMBuilder.strictlyOn
- * @see BehaviourContextWithFSMBuilder.onStateOrSubstate
- */
-@PreviewFeature
-suspend fun TelegramBot.buildBehaviourWithFSMAndStartLongPolling(
-    scope: CoroutineScope = defaultCoroutineScopeProvider(),
-    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    statesManager: StatesManager = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
-    presetHandlers: MutableList<BehaviourWithFSMStateHandlerHolder<*>> = mutableListOf(),
-    block: CustomBehaviourContextReceiver<BehaviourContextWithFSMBuilder, Unit>
-) = FlowsUpdatesFilter().let {
-    buildBehaviourWithFSM(
-        it,
-        scope,
-        defaultExceptionsHandler,
-        statesManager,
-        presetHandlers,
-        block
-    ).run {
-        start()
-        longPolling(
-            flowsUpdatesFilter,
-            scope = scope
-        )
-    }
-}
--- a/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourWithFSMStateHandler.kt
+++ b/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourWithFSMStateHandler.kt
@@ -1,7 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder
-
-import dev.inmo.micro_utils.fsm.common.*
-
-fun interface BehaviourWithFSMStateHandler<T : State> {
-    suspend fun BehaviourContextWithFSM.handleState(state: T): State?
-}
--- a/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourWithFSMStateHandlerHolder.kt
+++ b/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourWithFSMStateHandlerHolder.kt
@@ -1,52 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder
-
-import dev.inmo.micro_utils.coroutines.LinkedSupervisorScope
-import dev.inmo.micro_utils.coroutines.weakLaunch
-import dev.inmo.micro_utils.fsm.common.*
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.collect
-import kotlin.reflect.KClass
-
-/**
- * Special holder for [BehaviourContextWithFSM]. This holder helps [BehaviourContextWithFSM] to understand whether it
- * can handle input [State] with [delegateTo] or not
- *
- * @param inputKlass This [KClass] will be used to compare input [State] type and declare ability of [delegateTo] to
- * handle incoming [State]. See [checkHandleable] for more info
- * @param strict This flag will be used in [checkHandleable] to choose strategy of checking incoming [State]
- * @param delegateTo This handler will be called in case [checkHandleable] returns true with class caster incoming
- * [State] in [handleState]
- */
-class BehaviourWithFSMStateHandlerHolder<I : State>(
-    private val inputKlass: KClass<I>,
-    private val strict: Boolean = false,
-    private val delegateTo: BehaviourWithFSMStateHandler<I>
-) {
-    /**
-     * Check ability of [delegateTo] to handle this [state]
-     *
-     * @return When [state]::class exactly equals to [inputKlass] will always return true. Otherwise when [strict]
-     * mode is disabled, will be used [KClass.isInstance] of [inputKlass] for checking
-     */
-    fun checkHandleable(state: State) = state::class == inputKlass || (!strict && inputKlass.isInstance(state))
-
-    /**
-     * Handling of state :)
-     *
-     * @param contextUpdatesFlow This [Flow] will be used as source of updates. By contract, this [Flow] must be common
-     * for all [State]s of incoming [state] [State.context] and for the whole chain inside of [BehaviourContextWithFSM]
-     */
-    suspend fun BehaviourContextWithFSM.handleState(
-        contextUpdatesFlow: Flow<Update>,
-        state: State
-    ): State? {
-        val subscope = scope.LinkedSupervisorScope()
-        return with(copy(scope = subscope, upstreamUpdatesFlow = contextUpdatesFlow)) {
-            with(delegateTo) {
-                handleState(state as I)
-            }
-        }
-    }
-}
--- a/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/TelegramBotWithFSM.kt
+++ b/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/TelegramBotWithFSM.kt
@@ -1,90 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder
-
-import dev.inmo.micro_utils.coroutines.ExceptionHandler
-import dev.inmo.micro_utils.fsm.common.StatesManager
-import dev.inmo.micro_utils.fsm.common.managers.DefaultStatesManager
-import dev.inmo.micro_utils.fsm.common.managers.InMemoryDefaultStatesManagerRepo
-import dev.inmo.tgbotapi.bot.Ktor.KtorRequestsExecutorBuilder
-import dev.inmo.tgbotapi.bot.Ktor.telegramBot
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingOfUpdatesByLongPolling
-import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
-import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlin.coroutines.coroutineContext
-
-
-/**
- * Create bot using [telegramBot] and start listening for updates using [buildBehaviourWithFSM].
- * Use this method in case you wish to make some additional actions with [flowsUpdatesFilter].
- *
- * **WARNING** This method WILL NOT launch any listening of updates. Use something like
- * [startGettingOfUpdatesByLongPolling] or tools for work with webhooks
- *
- * @return Created bot which has been used to create [BehaviourContext] via [buildBehaviourWithFSM]
- *
- * @see [BehaviourContext]
- * @see [buildBehaviourWithFSM]
- * @see startGettingOfUpdatesByLongPolling
- */
-suspend fun telegramBotWithBehaviourAndFSM(
-    token: String,
-    flowsUpdatesFilter: FlowsUpdatesFilter,
-    scope: CoroutineScope? = null,
-    apiUrl: String = telegramBotAPIDefaultUrl,
-    builder: KtorRequestsExecutorBuilder.() -> Unit = {},
-    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    statesManager: StatesManager = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
-    presetHandlers: MutableList<BehaviourWithFSMStateHandlerHolder<*>> = mutableListOf(),
-    block: CustomBehaviourContextReceiver<BehaviourContextWithFSMBuilder, Unit>
-): TelegramBot = telegramBot(
-    token,
-    apiUrl,
-    builder
-).apply {
-    buildBehaviourWithFSMAndStartLongPolling(
-        flowsUpdatesFilter.allUpdatesFlow,
-        scope ?: CoroutineScope(coroutineContext),
-        defaultExceptionsHandler,
-        statesManager,
-        presetHandlers,
-        block
-    )
-}
-
-/**
- * Create bot using [telegramBot] and start listening for updates using [buildBehaviourWithFSMAndStartLongPolling]. This
- * method will launch updates retrieving via long polling inside of [buildBehaviourWithFSMAndStartLongPolling]
- *
- * @return Pair of [TelegramBot] and [Job]. This [Job] can be used to stop listening updates in your [block] you passed
- * here
- *
- * @see BehaviourContext
- * @see buildBehaviourWithFSMAndStartLongPolling
- * @see startGettingOfUpdatesByLongPolling
- */
-suspend fun telegramBotWithBehaviourAndFSMAndStartLongPolling(
-    token: String,
-    scope: CoroutineScope? = null,
-    apiUrl: String = telegramBotAPIDefaultUrl,
-    builder: KtorRequestsExecutorBuilder.() -> Unit = {},
-    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    statesManager: StatesManager = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
-    presetHandlers: MutableList<BehaviourWithFSMStateHandlerHolder<*>> = mutableListOf(),
-    block: CustomBehaviourContextReceiver<BehaviourContextWithFSMBuilder, Unit>
-): Pair<TelegramBot, Job> {
-    return telegramBot(
-        token,
-        apiUrl,
-        builder
-    ).let {
-        it to it.buildBehaviourWithFSMAndStartLongPolling (
-            scope ?: CoroutineScope(coroutineContext),
-            defaultExceptionsHandler,
-            statesManager,
-            presetHandlers,
-            block
-        )
-    }
-}
--- a/tgbotapi.behaviour_builder/README.md
+++ b/tgbotapi.behaviour_builder/README.md
@@ -1,66 +0,0 @@
-# TelegramBotAPI Behaviour Builder Extensions
-
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.behaviour_builder/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.behaviour_builder)
-
-## What is it?
-
-This extension was created to make it more simple to build bot steps handling. Usually, you must use something like:
-
-```kotlin
-val bot = telegramBot(TOKEN)
-bot.startGettingFlowsUpdatesByLongPolling {
-    messagesFlow.subscribeSafelyWithoutExceptions {
-        // ...
-    }
-    // here I already tired to write this example 😫
-}
-```
-
-This library offer other way to do a lot of routine in more simple way:
-
-```kotlin
-telegramBotWithBehaviour(token) {
-    onCommand("start".regex) {
-        execute(SendTextMessage(it.chat.id, "This bot can ...")) // replaceable with reply(it, "This bot can ...") when you are using `tgbotapi.extensions.api`
-    }
-}
-```
-
-## Triggers
-
-In terminology of this project the `Triggers` are things which have no initial message, may have own filter for incoming
-messages and filter messages for context which will be used in subcontext. Full syntax with `onText` as an example:
-
-```kotlin
-telegramBotWithBehaviour(TOKEN) {
-    onText(
-        includeFilterByChatInBehaviourSubContext = true, // if false - last lambda will receive all messages instead of filtered by chat messages
-        additionalFilter = { message: CommonMessage<TextContent> ->
-            // here you may check incoming message for any requirements before it will be passed to the main lambda
-        }
-    ) { message: CommonMessage<TextContent> -> // this here is `BehaviourContext`
-        // here put your actions and additional waiters
-    }
-}
-```
-
-## Waiters
-
-Waiters targeted to get some content "here and now", they must be used inside some trigger main lambda:
-
-```kotlin
-telegramBotWithBehaviour(TOKEN) {
-    onCommand("start") { message: CommonMessage<TextContent> ->
-        val userPhotos = waitPhoto(
-            SendTextMessage(it.chat.id, "Ok, send me some photo, please"), // init request, can be any `Request` object
-            { update: Update -> // That is update which is NOT passed requirements. In current context we expect some photo, but received something else
-                SendTextMessage(it.chat.id, "Excuse me, but I can accept only photos") // it could be null
-            },
-            2, // some count of photos
-            includeMediaGroups = true, // if false, messages related to some media group will be skipped and recognized as incorrect
-        ) { message: CommonMessate<PhotoContent> -> // this method is optional and you can use it in case you want to add some additional requirements checks
-            message.content // return null if message didn't passed requirements
-        }
-    }
-}
-```
--- a/tgbotapi.behaviour_builder/build.gradle
+++ b/tgbotapi.behaviour_builder/build.gradle
@@ -1,49 +0,0 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-    }
-}
-
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization"
-}
-
-project.version = "$library_version"
-project.group = "$library_group"
-
-apply from: "publish.gradle"
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
-kotlin {
-    jvm()
-    js(IR) {
-        browser()
-        nodejs()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-                api project(":tgbotapi.utils")
-            }
-        }
-    }
-}
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
-    }
-}
--- a/tgbotapi.behaviour_builder/mpp_publish_template.kpsb
+++ b/tgbotapi.behaviour_builder/mpp_publish_template.kpsb
@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Steps Extensions","description":"This extensions project contains tools for simple interaction with chats","url":"https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.steps","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}
--- a/tgbotapi.behaviour_builder/publish.gradle
+++ b/tgbotapi.behaviour_builder/publish.gradle
@@ -1,69 +0,0 @@
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "This extensions project contains tools for simple interaction with chats"
-            name = "Telegram Bot API Steps Extensions"
-            url = "https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.steps"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
-                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
-                    }
-                
-            }
-        }
-        repositories {
-            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
-                maven {
-                    name = "GithubPackages"
-                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
-                    credentials {
-                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
-                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
-                    }
-                }
-            }
-            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                maven {
-                    name = "sonatype"
-                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                    credentials {
-                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                    }
-                }
-            }
-        }
-    }
-}
-
-signing {
-    useGpgCmd()
-    sign publishing.publications
-}
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourBuilders.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourBuilders.kt
@@ -1,80 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder
-
-import dev.inmo.micro_utils.coroutines.ContextSafelyExceptionHandler
-import dev.inmo.micro_utils.coroutines.ExceptionHandler
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling
-import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingOfUpdatesByLongPolling
-import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
-import dev.inmo.tgbotapi.utils.PreviewFeature
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.plus
-
-/**
- * This function is used in [buildBehaviour] extensions to provide default [CoroutineScope] and allow to avoid all
- * unnecessary parameters except of block
- */
-expect var defaultCoroutineScopeProvider: () -> CoroutineScope
-
-/**
- * Use this method in case you wish to make some additional actions with [flowUpdatesFilter].
- *
- * **WARNING** This method WILL NOT launch any listening of updates. Use something like
- * [startGettingOfUpdatesByLongPolling] or tools for work with webhooks
- *
- * @see [BehaviourContext]
- * @see startGettingOfUpdatesByLongPolling
- */
-@PreviewFeature
-suspend fun TelegramBot.buildBehaviour(
-    flowUpdatesFilter: FlowsUpdatesFilter,
-    scope: CoroutineScope = defaultCoroutineScopeProvider(),
-    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    block: BehaviourContextReceiver<Unit>
-) {
-    BehaviourContext(
-        this,
-        scope.let {
-              if (defaultExceptionsHandler == null) {
-                  it
-              } else {
-                  it + ContextSafelyExceptionHandler(defaultExceptionsHandler)
-              }
-        },
-        flowUpdatesFilter
-    ).block()
-}
-
-/**
- * Use this method to build bot behaviour and run it via long polling. In case you wish to get [FlowsUpdatesFilter] for
- * additional manipulations, you must provide external [FlowsUpdatesFilter] in other [buildBehaviour] function.
- *
- * @see buildBehaviour
- * @see BehaviourContext
- * @see startGettingOfUpdatesByLongPolling
- */
-@PreviewFeature
-suspend fun TelegramBot.buildBehaviourWithLongPolling(
-    scope: CoroutineScope = defaultCoroutineScopeProvider(),
-    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    block: BehaviourContextReceiver<Unit>
-) = FlowsUpdatesFilter().let {
-    buildBehaviour(
-        it,
-        scope,
-        defaultExceptionsHandler,
-        block
-    )
-    longPolling(
-        it,
-        scope = scope
-    )
-}
-
-@PreviewFeature
-@Deprecated("Renamed to buildBehaviourWithLongPolling")
-suspend fun TelegramBot.buildBehaviour(
-    scope: CoroutineScope = defaultCoroutineScopeProvider(),
-    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    block: BehaviourContextReceiver<Unit>
-) = buildBehaviourWithLongPolling(scope, defaultExceptionsHandler, block)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext.kt
@@ -1,176 +0,0 @@
-@file:Suppress("NOTHING_TO_INLINE")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder
-
-import dev.inmo.micro_utils.coroutines.*
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-import dev.inmo.tgbotapi.updateshandlers.*
-import dev.inmo.tgbotapi.utils.RiskFeature
-import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.BufferOverflow
-import kotlinx.coroutines.flow.*
-
-typealias CustomBehaviourContextReceiver<BC, T> = suspend BC.() -> T
-typealias BehaviourContextReceiver<T> = CustomBehaviourContextReceiver<BehaviourContext, T>
-typealias CustomBehaviourContextAndTypeReceiver<BC, T, I> = suspend BC.(I) -> T
-typealias BehaviourContextAndTypeReceiver<T, I> = CustomBehaviourContextAndTypeReceiver<BehaviourContext, T, I>
-typealias CustomBehaviourContextAndTwoTypesReceiver<BC, T, I1, I2> = suspend BC.(I1, I2) -> T
-typealias BehaviourContextAndTwoTypesReceiver<T, I1, I2> = CustomBehaviourContextAndTwoTypesReceiver<BehaviourContext, T, I1, I2>
-inline fun <T> BehaviourContextReceiver(noinline block: BehaviourContextReceiver<T>) = block
-inline fun <BC, T> CustomBehaviourContextReceiver(noinline block: CustomBehaviourContextReceiver<BC, T>) = block
-inline fun <T, I> BehaviourContextAndTypeReceiver(noinline block: BehaviourContextAndTypeReceiver<T, I>) = block
-inline fun <T, I1, I2> BehaviourContextAndTwoTypesReceiver(noinline block: BehaviourContextAndTwoTypesReceiver<T, I1, I2>) = block
-internal inline fun <BC, T, I1, I2> CustomBehaviourContextAndTwoTypesReceiver<BC, T, I1, I2>.toOneType(
-    i1: I1,
-): CustomBehaviourContextAndTypeReceiver<BC, T, I2> = { invoke(this, i1, it) }
-
-/**
- * This class contains all necessary tools for work with bots and especially for [buildBehaviour]
- *
- * @see DefaultBehaviourContext
- */
-interface BehaviourContext : FlowsUpdatesFilter, TelegramBot, CoroutineScope {
-    val bot: TelegramBot
-        get() = this
-
-    /**
-     * Will be used for creating of some subscriptions inside of methods, updates listening and different other things
-     * in context of working with [CoroutineScope] and coroutines.
-     */
-    val scope: CoroutineScope
-        get() = this
-
-    /**
-     * This parameter will be used to subscribe on different types of update
-     */
-    val flowsUpdatesFilter: FlowsUpdatesFilter
-        get() = this
-
-    fun copy(
-        bot: TelegramBot = this.bot,
-        scope: CoroutineScope = this.scope,
-        broadcastChannelsSize: Int = 100,
-        onBufferOverflow: BufferOverflow = BufferOverflow.SUSPEND,
-        upstreamUpdatesFlow: Flow<Update>? = null,
-        updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>? = null
-    ): BehaviourContext
-
-    @Deprecated("This method is not recommended to use and will be removed in near release")
-    fun copy(
-        bot: TelegramBot,
-        scope: CoroutineScope = this.scope,
-        flowsUpdatesFilter: FlowsUpdatesFilter = this.flowsUpdatesFilter
-    ): BehaviourContext = copy(upstreamUpdatesFlow = flowsUpdatesFilter.allUpdatesFlow)
-}
-
-class DefaultBehaviourContext(
-    override val bot: TelegramBot,
-    override val scope: CoroutineScope,
-    broadcastChannelsSize: Int = 100,
-    onBufferOverflow: BufferOverflow = BufferOverflow.SUSPEND,
-    private val upstreamUpdatesFlow: Flow<Update>? = null,
-    private val updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>? = null
-) : AbstractFlowsUpdatesFilter(), TelegramBot by bot, CoroutineScope by scope, BehaviourContext {
-
-    private val additionalUpdatesSharedFlow = MutableSharedFlow<Update>(0, broadcastChannelsSize, onBufferOverflow)
-    override val allUpdatesFlow: Flow<Update> = (additionalUpdatesSharedFlow.asSharedFlow()).let {
-        if (upstreamUpdatesFlow != null) {
-            (it + upstreamUpdatesFlow).distinctUntilChanged { old, new -> old.updateId == new.updateId }
-        } else {
-            it
-        }
-    }.let {
-        val updatesFilter = updatesFilter
-        if (updatesFilter != null) {
-            it.filter { updatesFilter(it) }
-        } else {
-            it
-        }
-    }
-    override val asUpdateReceiver: UpdateReceiver<Update> = additionalUpdatesSharedFlow::emit
-
-    override fun copy(
-        bot: TelegramBot,
-        scope: CoroutineScope,
-        broadcastChannelsSize: Int,
-        onBufferOverflow: BufferOverflow,
-        upstreamUpdatesFlow: Flow<Update>?,
-        updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>?
-    ): BehaviourContext = DefaultBehaviourContext(bot, scope, broadcastChannelsSize, onBufferOverflow, upstreamUpdatesFlow, updatesFilter)
-}
-
-fun BehaviourContext(
-    bot: TelegramBot,
-    scope: CoroutineScope,
-    flowsUpdatesFilter: FlowsUpdatesFilter = FlowsUpdatesFilter()
-) = DefaultBehaviourContext(bot, scope, upstreamUpdatesFlow = flowsUpdatesFilter.allUpdatesFlow)
-
-inline fun <T> BehaviourContext(
-    bot: TelegramBot,
-    scope: CoroutineScope,
-    flowsUpdatesFilter: FlowsUpdatesFilter = FlowsUpdatesFilter(),
-    crossinline block: BehaviourContext.() -> T
-) = DefaultBehaviourContext(bot, scope, upstreamUpdatesFlow = flowsUpdatesFilter.allUpdatesFlow).run(block)
-
-/**
- * Creates new one [BehaviourContext], adding subsequent [FlowsUpdatesFilter] in case [newFlowsUpdatesFilterSetUp] is provided and
- * [CoroutineScope] as new [BehaviourContext.scope]. You must do all subscription/running of longPolling manually.
- *
- * @param newFlowsUpdatesFilterSetUp As a parameter receives [FlowsUpdatesFilter] from old [this] [BehaviourContext.flowsUpdatesFilter]
- */
-@RiskFeature("It is recommended to use doInSubContextWithUpdatesFilter instead. " +
-    "This method is low level and should not be used in case you are not pretty sure you need it.")
-@Deprecated("This method is useless and will not be used in future")
-suspend fun <T, BC : BehaviourContext> BC.doInSubContextWithFlowsUpdatesFilterSetup(
-    newFlowsUpdatesFilterSetUp: CustomBehaviourContextAndTypeReceiver<BC, Unit, FlowsUpdatesFilter>?,
-    stopOnCompletion: Boolean = true,
-    behaviourContextReceiver: CustomBehaviourContextReceiver<BC, T>
-): T = (copy(
-    scope = LinkedSupervisorScope(),
-) as BC).run {
-    withContext(coroutineContext) {
-        newFlowsUpdatesFilterSetUp ?.let {
-            it.apply { invoke(this@run, this@doInSubContextWithFlowsUpdatesFilterSetup.flowsUpdatesFilter) }
-        }
-        behaviourContextReceiver().also { if (stopOnCompletion) stop() }
-    }
-}
-
-/**
- * Creates new one [BehaviourContext], adding subsequent [FlowsUpdatesFilter] in case [updatesFilter] is provided and
- * [CoroutineScope] as new [BehaviourContext.scope]
- */
-suspend fun <T, BC : BehaviourContext> BC.doInSubContextWithUpdatesFilter(
-    updatesFilter: CustomBehaviourContextAndTypeReceiver<BC, Boolean, Update>?,
-    stopOnCompletion: Boolean = true,
-    updatesUpstreamFlow: Flow<Update> = allUpdatesFlow,
-    scope: CoroutineScope = LinkedSupervisorScope(),
-    behaviourContextReceiver: CustomBehaviourContextReceiver<BC, T>
-): T = copy(
-    scope = scope,
-    updatesFilter = updatesFilter ?.let { _ ->
-        {
-            (this as? BC) ?.run {
-                updatesFilter(it)
-            } ?: true
-        }
-    },
-    upstreamUpdatesFlow = updatesUpstreamFlow
-).run {
-    withContext(coroutineContext) {
-        behaviourContextReceiver().also { if (stopOnCompletion) stop() }
-    }
-}
-
-suspend fun <T> BehaviourContext.doInSubContext(
-    stopOnCompletion: Boolean = true,
-    updatesUpstreamFlow: Flow<Update> = allUpdatesFlow,
-    scope: CoroutineScope = LinkedSupervisorScope(),
-    behaviourContextReceiver: BehaviourContextReceiver<T>
-) = doInSubContextWithUpdatesFilter(updatesFilter = null, stopOnCompletion, updatesUpstreamFlow, scope, behaviourContextReceiver)
-
-/**
- * This method will cancel ALL subsequent contexts, expectations and waiters
- */
-fun BehaviourContext.stop() = scope.cancel()
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/TelegramBot.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/TelegramBot.kt
@@ -1,89 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder
-
-import dev.inmo.micro_utils.coroutines.ExceptionHandler
-import dev.inmo.tgbotapi.bot.Ktor.KtorRequestsExecutorBuilder
-import dev.inmo.tgbotapi.bot.Ktor.telegramBot
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingOfUpdatesByLongPolling
-import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
-import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
-import kotlinx.coroutines.*
-import kotlin.coroutines.coroutineContext
-
-/**
- * Create bot using [telegramBot] and start listening for updates using [buildBehaviour].
- * Use this method in case you wish to make some additional actions with [flowsUpdatesFilter].
- *
- * **WARNING** This method WILL NOT launch any listening of updates. Use something like
- * [startGettingOfUpdatesByLongPolling] or tools for work with webhooks
- *
- * @return Created bot which has been used to create [BehaviourContext] via [buildBehaviour]
- *
- * @see [BehaviourContext]
- * @see [buildBehaviour]
- * @see startGettingOfUpdatesByLongPolling
- */
-suspend fun telegramBotWithBehaviour(
-    token: String,
-    flowsUpdatesFilter: FlowsUpdatesFilter,
-    scope: CoroutineScope? = null,
-    apiUrl: String = telegramBotAPIDefaultUrl,
-    builder: KtorRequestsExecutorBuilder.() -> Unit = {},
-    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    block: BehaviourContextReceiver<Unit>
-): TelegramBot = telegramBot(
-    token,
-    apiUrl,
-    builder
-).apply {
-    buildBehaviour(
-        flowsUpdatesFilter,
-        scope ?: CoroutineScope(coroutineContext),
-        defaultExceptionsHandler,
-        block
-    )
-}
-
-/**
- * Create bot using [telegramBot] and start listening for updates using [buildBehaviourWithLongPolling].
- * Use this method in case you wish to make some additional actions with [flowsUpdatesFilter].
- *
- * **WARNING** This method WILL launch updates listening inside of calling [buildBehaviourWithLongPolling]
- *
- * @return Pair of [TelegramBot] and [Job]. This [Job] can be used to stop listening updates in your [block] you passed
- * here
- *
- * @see [BehaviourContext]
- * @see buildBehaviourWithLongPolling
- * @see startGettingOfUpdatesByLongPolling
- */
-suspend fun telegramBotWithBehaviourAndLongPolling(
-    token: String,
-    scope: CoroutineScope? = null,
-    apiUrl: String = telegramBotAPIDefaultUrl,
-    builder: KtorRequestsExecutorBuilder.() -> Unit = {},
-    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    block: BehaviourContextReceiver<Unit>
-): Pair<TelegramBot, Job> {
-    return telegramBot(
-        token,
-        apiUrl,
-        builder
-    ).let {
-        it to it.buildBehaviourWithLongPolling(
-            scope ?: CoroutineScope(coroutineContext),
-            defaultExceptionsHandler,
-            block
-        )
-    }
-}
-
-@Deprecated("Renamed to telegramBotWithBehaviourAndLongPolling")
-suspend fun telegramBotWithBehaviour(
-    token: String,
-    scope: CoroutineScope? = null,
-    apiUrl: String = telegramBotAPIDefaultUrl,
-    builder: KtorRequestsExecutorBuilder.() -> Unit = {},
-    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    block: BehaviourContextReceiver<Unit>
-) = telegramBotWithBehaviourAndLongPolling(token, scope, apiUrl, builder, defaultExceptionsHandler, block)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/Variants.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/Variants.kt
@@ -1,32 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder
-
-import dev.inmo.micro_utils.coroutines.DeferredAction
-import dev.inmo.micro_utils.coroutines.invokeFirstOf
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.async
-
-suspend fun <T> BehaviourContext.parallel(
-    action: BehaviourContextReceiver<T>
-) = async {
-    action()
-}
-
-inline infix fun <T, O> Deferred<T>.withAction(noinline callback: suspend (T) -> O) = DeferredAction(this, callback)
-
-inline fun <T> Deferred<T>.asAction() = DeferredAction(this) { it }
-
-suspend fun <O> BehaviourContext.oneOfActions(
-    deferredActions: Iterable<DeferredAction<*, O>>
-) = deferredActions.invokeFirstOf(scope)
-
-suspend fun <O> BehaviourContext.oneOfActions(
-    vararg deferredActions: DeferredAction<*, O>
-) = this@oneOfActions.oneOfActions(deferredActions.toList())
-
-suspend fun <O> BehaviourContext.oneOf(
-    deferredActions: Iterable<Deferred<O>>
-) = oneOfActions(deferredActions.map { it.asAction() })
-
-suspend fun <O> BehaviourContext.oneOf(
-    vararg deferredActions: Deferred<O>
-) = oneOf(deferredActions.toList())
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/Base.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/Base.kt
@@ -1,126 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.micro_utils.coroutines.safelyWithResult
-import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.utils.flatMap
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
-import dev.inmo.tgbotapi.utils.RiskFeature
-import dev.inmo.tgbotapi.utils.lowLevelRiskFeatureMessage
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.flow.*
-
-private val cancelledByFilterException = CancellationException("Cancelled by filter precreatedException")
-
-typealias RequestBuilder<T> = suspend (Update) -> Request<T>
-typealias NullableRequestBuilder<T> = suspend (Update) -> Request<T>?
-
-/**
- * @param initRequest If not null, this request will be sent by [bot] before returning value
- * @param count If set, result [Flow] will return [count] elements on each [Flow.collect]
- * @param errorFactory If set, this factory will be used to produce requests in case when user have sent incorrect data
- * @param cancelRequestFactory If set, this factory will be used to produce requests in case when it is required to say
- * user that chain of scenario has been cancelled
- * @param cancelTrigger When this trigger returns true, chain is cancelled
- * @param filter It is main param, which will be called on each update. When it return not null, result will be returned
- * as is, but when it returns null, then will be called [cancelTrigger] (if it will return true - [cancelRequestFactory]
- * will be called too), [errorFactory] and then will be returned null
- */
-@RiskFeature(lowLevelRiskFeatureMessage)
-suspend fun <T> FlowsUpdatesFilter.expectFlow(
-    bot: TelegramBot,
-    initRequest: Request<*>? = null,
-    count: Int? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    cancelRequestFactory: NullableRequestBuilder<*> = { null },
-    cancelTrigger: suspend (Update) -> Boolean = { cancelRequestFactory(it) != null },
-    filter: suspend (Update) -> List<T>
-): Flow<T> {
-    val flow = allUpdatesFlow.map {
-        val result = safelyWithResult { filter(it) }
-        if (result.isFailure || result.getOrThrow().isEmpty()) {
-            if (cancelTrigger(it)) {
-                cancelRequestFactory(it) ?.also {
-                    safelyWithResult { bot.execute(it) }
-                    throw cancelledByFilterException
-                }
-            }
-            errorFactory(it) ?.also { errorRequest ->
-                safelyWithoutExceptions { bot.execute(errorRequest) }
-            }
-            emptyList()
-        } else {
-            result.getOrThrow()
-        }
-    }.flatMap()
-    val result = if (count == null) {
-        flow
-    } else {
-        flow.take(count)
-    }
-    initRequest ?.also { safelyWithoutExceptions { bot.execute(initRequest) } }
-    return result
-}
-
-/**
- * @param initRequest If not null, this request will be sent by [bot] before returning value
- * @param count If set, result [Flow] will return [count] elements on each [Flow.collect]
- * @param errorFactory If set, this factory will be used to produce requests in case when user have sent incorrect data
- * @param cancelRequestFactory If set, this factory will be used to produce requests in case when it is required to say
- * user that chain of scenario has been cancelled
- * @param cancelTrigger When this trigger returns true, chain is cancelled
- * @param filter It is main param, which will be called on each update. When it return not null, result will be returned
- * as is, but when it returns null, then will be called [cancelTrigger] (if it will return true - [cancelRequestFactory]
- * will be called too), [errorFactory] and then will be returned null
- */
-suspend fun <T> BehaviourContext.expectFlow(
-    initRequest: Request<*>? = null,
-    count: Int? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    cancelRequestFactory: NullableRequestBuilder<*> = { null },
-    cancelTrigger: suspend (Update) -> Boolean = { cancelRequestFactory(it) != null },
-    filter: suspend (Update) -> List<T>
-) = flowsUpdatesFilter.expectFlow(bot, initRequest, count, errorFactory, cancelRequestFactory, cancelTrigger, filter)
-
-/**
- * @param initRequest If not null, this request will be sent by [bot] before returning value
- * @param errorFactory If set, this factory will be used to produce requests in case when user have sent incorrect data
- * @param cancelRequestFactory If set, this factory will be used to produce requests in case when it is required to say
- * user that chain of scenario has been cancelled
- * @param cancelTrigger When this trigger returns true, chain is cancelled
- * @param filter It is main param, which will be called on each update. When it return not null, result will be returned
- * as is, but when it returns null, then will be called [cancelTrigger] (if it will return true - [cancelRequestFactory]
- * will be called too), [errorFactory] and then will be returned null
- */
-@RiskFeature(lowLevelRiskFeatureMessage)
-suspend fun <T> FlowsUpdatesFilter.expectOne(
-    bot: TelegramBot,
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    cancelRequestFactory: NullableRequestBuilder<*> = { null },
-    cancelTrigger: suspend (Update) -> Boolean = { cancelRequestFactory(it) != null },
-    filter: suspend (Update) -> T?
-): T = expectFlow(bot, initRequest, 1, errorFactory, cancelRequestFactory, cancelTrigger) {
-    listOfNotNull(filter.invoke(it))
-}.first()
-
-/**
- * @param initRequest If not null, this request will be sent by [bot] before returning value
- * @param errorFactory If set, this factory will be used to produce requests in case when user have sent incorrect data
- * @param cancelRequestFactory If set, this factory will be used to produce requests in case when it is required to say
- * user that chain of scenario has been cancelled
- * @param cancelTrigger When this trigger returns true, chain is cancelled
- * @param filter It is main param, which will be called on each update. When it return not null, result will be returned
- * as is, but when it returns null, then will be called [cancelTrigger] (if it will return true - [cancelRequestFactory]
- * will be called too), [errorFactory] and then will be returned null
- */
-suspend fun <T> BehaviourContext.expectOne(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    cancelRequestFactory: NullableRequestBuilder<*> = { null },
-    cancelTrigger: suspend (Update) -> Boolean = { cancelRequestFactory(it) != null },
-    filter: suspend (Update) -> T?
-) = flowsUpdatesFilter.expectOne(bot, initRequest, errorFactory, cancelRequestFactory, cancelTrigger, filter)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt
@@ -1,124 +0,0 @@
-@file:Suppress("unused")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.asCallbackQueryUpdate
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.CallbackQuery.*
-import kotlinx.coroutines.flow.toList
-
-typealias CallbackQueryMapper<T> = suspend T.() -> T?
-
-private suspend fun <O> BehaviourContext.waitCallbackQueries(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    filter: SimpleFilter<CallbackQuery>? = null,
-    mapper: suspend CallbackQuery.() -> O?
-): List<O> = expectFlow(
-    initRequest,
-    count,
-    errorFactory
-) {
-    val data = it.asCallbackQueryUpdate() ?.data
-    if (data != null && (filter == null || filter(data))) {
-        data.mapper().let(::listOfNotNull)
-    } else {
-        emptyList()
-    }
-}.toList().toList()
-
-
-private suspend inline fun <reified T : CallbackQuery> BehaviourContext.waitCallbacks(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<T>? = null,
-    noinline mapper: CallbackQueryMapper<T>? = null
-) : List<T> = waitCallbackQueries<T>(
-    count,
-    initRequest,
-    errorFactory,
-    filter ?.let {
-        {
-            (it as? T) ?.let { filter(it) } == true
-        }
-    }
-) {
-    if (this is T) {
-        if (mapper == null) {
-            this
-        } else {
-            mapper(this)
-        }
-    } else {
-        null
-    }
-}
-
-
-suspend fun BehaviourContext.waitDataCallbackQuery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<DataCallbackQuery>? = null,
-    mapper: CallbackQueryMapper<DataCallbackQuery>? = null
-) = waitCallbacks(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitGameShortNameCallbackQuery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<GameShortNameCallbackQuery>? = null,
-    mapper: CallbackQueryMapper<GameShortNameCallbackQuery>? = null
-) = waitCallbacks(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitInlineMessageIdCallbackQuery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<InlineMessageIdCallbackQuery>? = null,
-    mapper: CallbackQueryMapper<InlineMessageIdCallbackQuery>? = null
-) = waitCallbacks(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitInlineMessageIdDataCallbackQuery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<InlineMessageIdDataCallbackQuery>? = null,
-    mapper: CallbackQueryMapper<InlineMessageIdDataCallbackQuery>? = null
-) = waitCallbacks(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitInlineMessageIdGameShortNameCallbackQuery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<InlineMessageIdGameShortNameCallbackQuery>? = null,
-    mapper: CallbackQueryMapper<InlineMessageIdGameShortNameCallbackQuery>? = null
-) = waitCallbacks(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitMessageCallbackQuery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<MessageCallbackQuery>? = null,
-    mapper: CallbackQueryMapper<MessageCallbackQuery>? = null
-) = waitCallbacks(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitMessageDataCallbackQuery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<MessageDataCallbackQuery>? = null,
-    mapper: CallbackQueryMapper<MessageDataCallbackQuery>? = null
-) = waitCallbacks(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitMessageGameShortNameCallbackQuery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<MessageGameShortNameCallbackQuery>? = null,
-    mapper: CallbackQueryMapper<MessageGameShortNameCallbackQuery>? = null
-) = waitCallbacks(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitUnknownCallbackQuery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<UnknownCallbackQueryType>? = null,
-    mapper: CallbackQueryMapper<UnknownCallbackQueryType>? = null
-) = waitCallbacks(count, initRequest, errorFactory, filter, mapper)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChatMemberUpdated.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChatMemberUpdated.kt
@@ -1,74 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.requests.abstracts.Request
-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 filter: SimpleFilter<T>? = null,
-    noinline mapper: ChatMemberUpdatedMapper<ChatMemberUpdated>
-): List<ChatMemberUpdated> = expectFlow(
-    initRequest,
-    count,
-    errorFactory
-) {
-    val casted = (it as? T) ?: return@expectFlow emptyList()
-    if (filter == null || filter(casted)) {
-        casted.data.mapper().let(::listOfNotNull)
-    } else {
-        emptyList()
-    }
-}.toList().toList()
-
-private suspend inline fun <reified T : ChatMemberUpdatedUpdate> BehaviourContext.waitChatMemberUpdatedWithFilter(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<T>? = null,
-    noinline mapper: ChatMemberUpdatedMapper<ChatMemberUpdated>? = null
-) : List<ChatMemberUpdated> = waitChatMemberUpdated<T>(
-    count,
-    initRequest,
-    errorFactory,
-    filter,
-) {
-    if (mapper == null) {
-        this
-    } else {
-        mapper(this)
-    }
-}
-
-suspend fun BehaviourContext.waitChatMemberUpdated(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatMemberUpdatedUpdate>? = null,
-    mapper: ChatMemberUpdatedMapper<ChatMemberUpdated>? = null
-) = waitChatMemberUpdatedWithFilter<ChatMemberUpdatedUpdate>(count, initRequest, errorFactory, filter, mapper)
-
-suspend fun BehaviourContext.waitCommonChatMemberUpdated(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonChatMemberUpdatedUpdate>? = null,
-    mapper: ChatMemberUpdatedMapper<ChatMemberUpdated>? = null
-) = waitChatMemberUpdatedWithFilter<CommonChatMemberUpdatedUpdate>(count, initRequest, errorFactory, filter, mapper)
-
-suspend fun BehaviourContext.waitMyChatMemberUpdated(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<MyChatMemberUpdatedUpdate>? = null,
-    mapper: ChatMemberUpdatedMapper<ChatMemberUpdated>? = null
-) = waitChatMemberUpdatedWithFilter<MyChatMemberUpdatedUpdate>(count, initRequest, errorFactory, filter, mapper)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChosenInlineResult.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChosenInlineResult.kt
@@ -1,82 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.*
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.*
-import dev.inmo.tgbotapi.types.polls.*
-import kotlinx.coroutines.flow.toList
-
-typealias ChosenInlineResultMapper<T> = suspend T.() -> T?
-
-private suspend fun <O> BehaviourContext.waitChosenInlineResultsUpdates(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    filter: SimpleFilter<ChosenInlineResult>? = null,
-    mapper: suspend ChosenInlineResult.() -> O?
-): List<O> = expectFlow(
-    initRequest,
-    count,
-    errorFactory
-) {
-    val data = it.asChosenInlineResultUpdate() ?.data
-    if (data != null && (filter == null || filter(data))) {
-        data.mapper().let(::listOfNotNull)
-    } else {
-        emptyList()
-    }
-}.toList().toList()
-
-
-private suspend inline fun <reified T : ChosenInlineResult> BehaviourContext.waitChosenInlineResults(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<T>? = null,
-    noinline mapper: ChosenInlineResultMapper<T>? = null
-) : List<T> = this@waitChosenInlineResults.waitChosenInlineResultsUpdates<T>(
-    count,
-    initRequest,
-    errorFactory,
-    filter ?.let {
-        {
-            (it as? T) ?.let { filter(it) } == true
-        }
-    }
-) {
-    if (this is T) {
-        if (mapper == null) {
-            this
-        } else {
-            mapper(this)
-        }
-    } else {
-        null
-    }
-}
-
-suspend fun BehaviourContext.waitChosenInlineResult(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChosenInlineResult>? = null,
-    mapper: ChosenInlineResultMapper<ChosenInlineResult>? = null
-) = waitChosenInlineResults(count, initRequest, errorFactory, filter, mapper)
-
-suspend fun BehaviourContext.waitLocationChosenInlineResult(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<LocationChosenInlineResult>? = null,
-    mapper: PollMapper<LocationChosenInlineResult>? = null
-) = waitChosenInlineResults(count, initRequest, errorFactory, filter, mapper)
-
-suspend fun BehaviourContext.waitBaseChosenInlineResult(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<BaseChosenInlineResult>? = null,
-    mapper: PollMapper<BaseChosenInlineResult>? = null
-) = waitChosenInlineResults(count, initRequest, errorFactory, filter, mapper)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt
@@ -1,267 +0,0 @@
-@file:Suppress("unused")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.withContent
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
-import dev.inmo.tgbotapi.types.message.content.*
-import dev.inmo.tgbotapi.types.message.content.abstracts.*
-import dev.inmo.tgbotapi.types.message.content.media.*
-import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
-import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate
-import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.toList
-import kotlin.reflect.KClass
-
-typealias CommonMessageToContentMapper<T> = suspend CommonMessage<T>.() -> T?
-
-private suspend fun <O> BehaviourContext.waitCommonMessage(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    includeMediaGroups: Boolean = true,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    filter: SimpleFilter<CommonMessage<MessageContent>>? = null,
-    mapper: suspend CommonMessage<MessageContent>.() -> O?
-): Flow<O> = expectFlow(
-    initRequest,
-    count,
-    errorFactory
-) {
-    val messages = when (it) {
-        is SentMediaGroupUpdate -> {
-            if (includeMediaGroups) {
-                it.data.map { it as CommonMessage<MessageContent> }
-            } else {
-                emptyList()
-            }
-        }
-        is BaseSentMessageUpdate -> listOf(it.data)
-        else -> return@expectFlow emptyList()
-    }
-    messages.mapNotNull { message ->
-        val asCommonMessage = message as CommonMessage<MessageContent>
-        if (filter == null || filter(asCommonMessage)) {
-            asCommonMessage.mapper()
-        } else {
-            null
-        }
-    }
-}
-
-internal inline fun <reified T : MessageContent> contentConverter(
-    noinline mapper: CommonMessageToContentMapper<T>? = null
-): suspend CommonMessage<MessageContent>.() -> T? = mapper ?.let {
-    {
-        if (content is T) {
-            @Suppress("UNCHECKED_CAST")
-            val message = (this as CommonMessage<T>)
-            safelyWithoutExceptions { mapper(message) }
-        } else {
-            null
-        }
-    }
-} ?: { content as? T }
-
-private suspend inline fun <reified T : MessageContent> BehaviourContext.waitContent(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    includeMediaGroups: Boolean = true,
-    noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<CommonMessage<T>>? = null,
-    noinline mapper: CommonMessageToContentMapper<T>? = null
-) : List<T> = waitCommonMessage<T>(
-    count,
-    initRequest,
-    includeMediaGroups,
-    errorFactory,
-    filter ?.let {
-        {
-            it.withContent<T>() ?.let { filter(it) } == true
-        }
-    },
-    contentConverter(mapper)
-).toList()
-
-suspend fun BehaviourContext.waitContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<MessageContent>>? = null,
-    mapper: CommonMessageToContentMapper<MessageContent>? = null
-) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitContact(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<ContactContent>>? = null,
-    mapper: CommonMessageToContentMapper<ContactContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitDice(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<DiceContent>>? = null,
-    mapper: CommonMessageToContentMapper<DiceContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitGame(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<GameContent>>? = null,
-    mapper: CommonMessageToContentMapper<GameContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitLocation(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<LocationContent>>? = null,
-    mapper: CommonMessageToContentMapper<LocationContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitLiveLocation(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<LiveLocationContent>>? = null,
-    mapper: CommonMessageToContentMapper<LiveLocationContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitStaticLocation(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<StaticLocationContent>>? = null,
-    mapper: CommonMessageToContentMapper<StaticLocationContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitPoll(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<PollContent>>? = null,
-    mapper: CommonMessageToContentMapper<PollContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitText(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<TextContent>>? = null,
-    mapper: CommonMessageToContentMapper<TextContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVenue(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<VenueContent>>? = null,
-    mapper: CommonMessageToContentMapper<VenueContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitAudioMediaGroupContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<AudioMediaGroupContent>>? = null,
-    mapper: CommonMessageToContentMapper<AudioMediaGroupContent>? = null
-) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitDocumentMediaGroupContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<DocumentMediaGroupContent>>? = null,
-    mapper: CommonMessageToContentMapper<DocumentMediaGroupContent>? = null
-) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitMedia(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<MediaContent>>? = null,
-    mapper: CommonMessageToContentMapper<MediaContent>? = null
-) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitAnyMediaGroupContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<MediaGroupContent>>? = null,
-    mapper: CommonMessageToContentMapper<MediaGroupContent>? = null
-) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVisualMediaGroupContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<VisualMediaGroupContent>>? = null,
-    mapper: CommonMessageToContentMapper<VisualMediaGroupContent>? = null
-) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitAnimation(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<AnimationContent>>? = null,
-    mapper: CommonMessageToContentMapper<AnimationContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitAudio(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<AudioContent>>? = null,
-    mapper: CommonMessageToContentMapper<AudioContent>? = null
-) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitDocument(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<DocumentContent>>? = null,
-    mapper: CommonMessageToContentMapper<DocumentContent>? = null
-) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitPhoto(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<PhotoContent>>? = null,
-    mapper: CommonMessageToContentMapper<PhotoContent>? = null
-) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitSticker(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<StickerContent>>? = null,
-    mapper: CommonMessageToContentMapper<StickerContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVideo(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<VideoContent>>? = null,
-    mapper: CommonMessageToContentMapper<VideoContent>? = null
-) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVideoNote(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<VideoNoteContent>>? = null,
-    mapper: CommonMessageToContentMapper<VideoNoteContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVoice(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<VoiceContent>>? = null,
-    mapper: CommonMessageToContentMapper<VoiceContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitInvoice(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<InvoiceContent>>? = null,
-    mapper: CommonMessageToContentMapper<InvoiceContent>? = null
-) = waitContent(count, initRequest, false, errorFactory, filter, mapper)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEditedContent.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEditedContent.kt
@@ -1,250 +0,0 @@
-@file:Suppress("unused")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.asCommonMessage
-import dev.inmo.tgbotapi.extensions.utils.withContent
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
-import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
-import dev.inmo.tgbotapi.types.message.content.*
-import dev.inmo.tgbotapi.types.message.content.abstracts.*
-import dev.inmo.tgbotapi.types.message.content.media.*
-import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
-import dev.inmo.tgbotapi.types.update.abstracts.BaseEditMessageUpdate
-import kotlinx.coroutines.flow.toList
-
-private suspend fun <O> BehaviourContext.waitEditedCommonMessage(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    includeMediaGroups: Boolean = true,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    filter: SimpleFilter<CommonMessage<MessageContent>>? = null,
-    mapper: suspend CommonMessage<MessageContent>.() -> O?
-): List<O> = expectFlow(
-    initRequest,
-    count,
-    errorFactory
-) {
-    val messages = when (it) {
-        is BaseEditMessageUpdate -> {
-            val commonMessage = it.data.asCommonMessage()
-            if (commonMessage !is MediaGroupMessage<*> || includeMediaGroups) {
-                listOf(commonMessage)
-            } else {
-                emptyList()
-            }
-        }
-        else -> return@expectFlow emptyList()
-    }
-    messages.mapNotNull { message ->
-        val asCommonMessage = message as CommonMessage<MessageContent>
-        if (filter == null || filter(asCommonMessage)) {
-            asCommonMessage.mapper()
-        } else {
-            null
-        }
-    }
-}.toList().toList()
-
-private suspend inline fun <reified T : MessageContent> BehaviourContext.waitEditedContent(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    includeMediaGroups: Boolean = true,
-    noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<CommonMessage<T>>? = null,
-    noinline mapper: CommonMessageToContentMapper<T>? = null
-) : List<T> = waitEditedCommonMessage<T>(
-    count,
-    initRequest,
-    includeMediaGroups,
-    errorFactory,
-    filter ?.let {
-        {
-            it.withContent<T>() ?.let { filter(it) } == true
-        }
-    },
-    contentConverter(mapper)
-)
-
-suspend fun BehaviourContext.waitEditedContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<MessageContent>>? = null,
-    mapper: CommonMessageToContentMapper<MessageContent>? = null
-) = waitEditedContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedContact(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<ContactContent>>? = null,
-    mapper: CommonMessageToContentMapper<ContactContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedDice(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<DiceContent>>? = null,
-    mapper: CommonMessageToContentMapper<DiceContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedGame(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<GameContent>>? = null,
-    mapper: CommonMessageToContentMapper<GameContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedLocation(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<LocationContent>>? = null,
-    mapper: CommonMessageToContentMapper<LocationContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedLiveLocation(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<LiveLocationContent>>? = null,
-    mapper: CommonMessageToContentMapper<LiveLocationContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedStaticLocation(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<StaticLocationContent>>? = null,
-    mapper: CommonMessageToContentMapper<StaticLocationContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
-@Deprecated("Potentially, this trigger will never be used. Use `waitPollUpdates` instead")
-suspend fun BehaviourContext.waitEditedPoll(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<PollContent>>? = null,
-    mapper: CommonMessageToContentMapper<PollContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedText(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<TextContent>>? = null,
-    mapper: CommonMessageToContentMapper<TextContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedVenue(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<VenueContent>>? = null,
-    mapper: CommonMessageToContentMapper<VenueContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedAudioMediaGroupContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<AudioMediaGroupContent>>? = null,
-    mapper: CommonMessageToContentMapper<AudioMediaGroupContent>? = null
-) = waitEditedContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedDocumentMediaGroupContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<DocumentMediaGroupContent>>? = null,
-    mapper: CommonMessageToContentMapper<DocumentMediaGroupContent>? = null
-) = waitEditedContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedMedia(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<MediaContent>>? = null,
-    mapper: CommonMessageToContentMapper<MediaContent>? = null
-) = waitEditedContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedAnyMediaGroupContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<MediaGroupContent>>? = null,
-    mapper: CommonMessageToContentMapper<MediaGroupContent>? = null
-) = waitEditedContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedVisualMediaGroupContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<VisualMediaGroupContent>>? = null,
-    mapper: CommonMessageToContentMapper<VisualMediaGroupContent>? = null
-) = waitEditedContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedAnimation(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<AnimationContent>>? = null,
-    mapper: CommonMessageToContentMapper<AnimationContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedAudio(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<AudioContent>>? = null,
-    mapper: CommonMessageToContentMapper<AudioContent>? = null
-) = waitEditedContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedDocument(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<DocumentContent>>? = null,
-    mapper: CommonMessageToContentMapper<DocumentContent>? = null
-) = waitEditedContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedPhoto(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<PhotoContent>>? = null,
-    mapper: CommonMessageToContentMapper<PhotoContent>? = null
-) = waitEditedContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedSticker(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<StickerContent>>? = null,
-    mapper: CommonMessageToContentMapper<StickerContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedVideo(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<VideoContent>>? = null,
-    mapper: CommonMessageToContentMapper<VideoContent>? = null
-) = waitEditedContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedVideoNote(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<VideoNoteContent>>? = null,
-    mapper: CommonMessageToContentMapper<VideoNoteContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedVoice(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<VoiceContent>>? = null,
-    mapper: CommonMessageToContentMapper<VoiceContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedInvoice(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<InvoiceContent>>? = null,
-    mapper: CommonMessageToContentMapper<InvoiceContent>? = null
-) = waitEditedContent(count, initRequest, false, errorFactory, filter, mapper)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt
@@ -1,236 +0,0 @@
-@file:Suppress("unused")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-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.*
-import dev.inmo.tgbotapi.types.message.ChatEvents.voice.*
-import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
-import dev.inmo.tgbotapi.types.message.payments.SuccessfulPaymentEvent
-import kotlinx.coroutines.flow.toList
-
-typealias EventMessageToEventMapper<T> = suspend ChatEventMessage<T>.() -> T?
-
-private suspend fun <O> BehaviourContext.waitEventMessages(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<ChatEvent>>? = null,
-    mapper: suspend ChatEventMessage<ChatEvent>.() -> O?
-): List<O> = expectFlow(
-    initRequest,
-    count,
-    errorFactory
-) {
-    val data = it.asBaseSentMessageUpdate() ?.data ?.asChatEventMessage()
-    if (data != null && (filter == null || filter(data))) {
-        data.mapper().let(::listOfNotNull)
-    } else {
-        emptyList()
-    }
-}.toList().toList()
-
-
-private suspend inline fun <reified T : ChatEvent> BehaviourContext.waitEvents(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<ChatEventMessage<T>>? = null,
-    noinline mapper: EventMessageToEventMapper<T>? = null
-) : List<T> = waitEventMessages<T>(
-    initRequest,
-    errorFactory,
-    count,
-    filter ?.let {
-        {
-            (it.chatEvent as? T) ?.let { filter(it as ChatEventMessage<T>) } == true
-        }
-    }
-) {
-    if (chatEvent is T) {
-        @Suppress("UNCHECKED_CAST")
-        val message = (this as ChatEventMessage<T>)
-        if (mapper == null) {
-            message.chatEvent
-        } else {
-            mapper(message)
-        }
-    } else {
-        null
-    }
-}
-
-suspend fun BehaviourContext.waitChannelEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<ChannelEvent>>? = null,
-    mapper: EventMessageToEventMapper<ChannelEvent>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-
-suspend fun BehaviourContext.waitPrivateEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<PrivateEvent>>? = null,
-    mapper: EventMessageToEventMapper<PrivateEvent>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-
-suspend fun BehaviourContext.waitChatEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<ChatEvent>>? = null,
-    mapper: EventMessageToEventMapper<ChatEvent>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-
-suspend fun BehaviourContext.waitVoiceChatEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VoiceChatEvent>>? = null,
-    mapper: EventMessageToEventMapper<VoiceChatEvent>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVoiceChatStartedEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VoiceChatStarted>>? = null,
-    mapper: EventMessageToEventMapper<VoiceChatStarted>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVoiceChatEndedEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VoiceChatEnded>>? = null,
-    mapper: EventMessageToEventMapper<VoiceChatEnded>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVoiceChatParticipantsInvitedEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VoiceChatParticipantsInvited>>? = null,
-    mapper: EventMessageToEventMapper<VoiceChatParticipantsInvited>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-
-suspend fun BehaviourContext.waitMessageAutoDeleteTimerChangedEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<MessageAutoDeleteTimerChanged>>? = null,
-    mapper: EventMessageToEventMapper<MessageAutoDeleteTimerChanged>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-
-
-suspend fun BehaviourContext.waitPublicChatEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<PublicChatEvent>>? = null,
-    mapper: EventMessageToEventMapper<PublicChatEvent>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitCommonEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<CommonEvent>>? = null,
-    mapper: EventMessageToEventMapper<CommonEvent>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-
-suspend fun BehaviourContext.waitGroupEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<GroupEvent>>? = null,
-    mapper: EventMessageToEventMapper<GroupEvent>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitSupergroupEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<SupergroupEvent>>? = null,
-    mapper: EventMessageToEventMapper<SupergroupEvent>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-
-suspend fun BehaviourContext.waitChannelChatCreatedEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<ChannelChatCreated>>? = null,
-    mapper: EventMessageToEventMapper<ChannelChatCreated>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitDeleteChatPhotoEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<DeleteChatPhoto>>? = null,
-    mapper: EventMessageToEventMapper<DeleteChatPhoto>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitGroupChatCreatedEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<GroupChatCreated>>? = null,
-    mapper: EventMessageToEventMapper<GroupChatCreated>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitLeftChatMemberEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<LeftChatMember>>? = null,
-    mapper: EventMessageToEventMapper<LeftChatMember>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitNewChatPhotoEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<NewChatPhoto>>? = null,
-    mapper: EventMessageToEventMapper<NewChatPhoto>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitNewChatMembersEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<NewChatMembers>>? = null,
-    mapper: EventMessageToEventMapper<NewChatMembers>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitNewChatTitleEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<NewChatTitle>>? = null,
-    mapper: EventMessageToEventMapper<NewChatTitle>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitPinnedMessageEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<PinnedMessage>>? = null,
-    mapper: EventMessageToEventMapper<PinnedMessage>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitProximityAlertTriggeredEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<ProximityAlertTriggered>>? = null,
-    mapper: EventMessageToEventMapper<ProximityAlertTriggered>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitSupergroupChatCreatedEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<SupergroupChatCreated>>? = null,
-    mapper: EventMessageToEventMapper<SupergroupChatCreated>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitSuccessfulPaymentEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<SuccessfulPaymentEvent>>? = null,
-    mapper: EventMessageToEventMapper<SuccessfulPaymentEvent>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitInlineQuery.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitInlineQuery.kt
@@ -1,80 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.asInlineQueryUpdate
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.InlineQueries.query.*
-import kotlinx.coroutines.flow.toList
-
-typealias InlineQueryMapper<T> = suspend T.() -> T?
-
-private suspend fun <O> BehaviourContext.waitInlineQueries(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    filter: SimpleFilter<InlineQuery>? = null,
-    mapper: suspend InlineQuery.() -> O?
-): List<O> = expectFlow(
-    initRequest,
-    count,
-    errorFactory
-) {
-    val data = it.asInlineQueryUpdate() ?.data
-    if (data != null && (filter == null || filter(data))) {
-        data.mapper().let(::listOfNotNull)
-    } else {
-        emptyList()
-    }
-}.toList().toList()
-
-
-private suspend inline fun <reified T : InlineQuery> BehaviourContext.waitInlines(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<T>? = null,
-    noinline mapper: InlineQueryMapper<T>? = null
-) : List<T> = waitInlineQueries<T>(
-    count,
-    initRequest,
-    errorFactory,
-    filter ?.let {
-        {
-            (it as? T) ?.let { casted -> filter(casted) } == true
-        }
-    }
-) {
-    if (this is T) {
-        if (mapper == null) {
-            this
-        } else {
-            mapper(this)
-        }
-    } else {
-        null
-    }
-}
-
-suspend fun BehaviourContext.waitAnyInlineQuery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<InlineQuery>? = null,
-    mapper: InlineQueryMapper<InlineQuery>? = null
-) = waitInlines(count, initRequest, errorFactory, filter, mapper)
-
-suspend fun BehaviourContext.waitBaseInlineQuery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<BaseInlineQuery>? = null,
-    mapper: InlineQueryMapper<BaseInlineQuery>? = null
-) = waitInlines(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitLocationInlineQuery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<LocationInlineQuery>? = null,
-    mapper: InlineQueryMapper<LocationInlineQuery>? = null
-) = waitInlines(count, initRequest, errorFactory, filter, mapper)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitMediaGroup.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitMediaGroup.kt
@@ -1,69 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.utils.asSentMediaGroupUpdate
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
-import dev.inmo.tgbotapi.types.message.content.abstracts.*
-import dev.inmo.tgbotapi.types.message.content.media.PhotoContent
-import dev.inmo.tgbotapi.types.message.content.media.VideoContent
-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: 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>>))) {
-            listOf(
-                mediaGroup.map { it.content as T }
-            )
-        } else {
-            null
-        }
-    } ?: emptyList()
-}.take(count).toList()
-
-suspend fun BehaviourContext.waitMediaGroup(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: MediaGroupFilter<MediaGroupContent>? = null
-) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
-suspend fun BehaviourContext.waitPlaylist(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: MediaGroupFilter<AudioMediaGroupContent>? = null
-) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
-suspend fun BehaviourContext.waitDocumentsGroup(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: MediaGroupFilter<DocumentMediaGroupContent>? = null
-) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
-suspend fun BehaviourContext.waitVisualGallery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: MediaGroupFilter<VisualMediaGroupContent>? = null
-) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
-suspend fun BehaviourContext.waitPhotoGallery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: MediaGroupFilter<PhotoContent>? = null
-) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
-suspend fun BehaviourContext.waitVideoGallery(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: MediaGroupFilter<VideoContent>? = null
-) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPassportData.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPassportData.kt
@@ -1,65 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-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
-import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportElement
-import dev.inmo.tgbotapi.utils.RiskFeature
-import kotlinx.coroutines.flow.toList
-
-typealias PassportMessageMapper = suspend PassportMessage.() -> PassportData
-
-@RiskFeature("Do not use this message directly, use waitPassportMessagesWith or waitAnyPassportMessages instead")
-suspend fun <O> BehaviourContext.waitPassportMessages(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<PassportMessage>? = null,
-    mapper: suspend PassportMessage.() -> O?
-): List<O> = expectFlow(
-    initRequest,
-    count,
-    errorFactory
-) {
-    val data = it.asMessageUpdate() ?.data ?.asPassportMessage() ?: return@expectFlow emptyList()
-    if (filter == null || filter(data)) {
-        data.mapper().let(::listOfNotNull)
-    } else {
-        emptyList()
-    }
-}.toList().toList()
-
-suspend inline fun <reified T : EncryptedPassportElement> BehaviourContext.waitPassportMessagesWith(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<PassportMessage>? = null,
-    noinline mapper: PassportMessageMapper? = null
-) : List<PassportData> = waitPassportMessages(
-    initRequest,
-    errorFactory,
-    count,
-    filter
-) {
-    if (passportData.data.any { it is T }) {
-        if (mapper == null) {
-            passportData
-        } else {
-            mapper(this)
-        }
-    } else {
-        null
-    }
-}
-
-suspend fun BehaviourContext.waitAnyPassportMessages(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<PassportMessage>? = null,
-    mapper: PassportMessageMapper? = null
-) = waitPassportMessagesWith<EncryptedPassportElement>(count, initRequest, errorFactory, filter, mapper)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPollAnswers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPollAnswers.kt
@@ -1,68 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.*
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.polls.*
-import kotlinx.coroutines.flow.toList
-
-typealias PollAnswerMapper = suspend PollAnswer.() -> PollAnswer?
-
-private suspend fun <O> BehaviourContext.waitPollsAnswers(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    filter: SimpleFilter<PollAnswer>? = null,
-    mapper: suspend PollAnswer.() -> O?
-): List<O> = expectFlow(
-    initRequest,
-    count,
-    errorFactory
-) {
-    val data = it.asPollAnswerUpdate() ?.data
-    if (data != null && (filter == null || filter(data))) {
-        data.mapper().let(::listOfNotNull)
-    } else {
-        emptyList()
-    }
-}.toList().toList()
-
-
-private suspend inline fun BehaviourContext.waitPollAnswers(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<PollAnswer>? = null,
-    noinline mapper: PollAnswerMapper? = null
-) : List<PollAnswer> = this@waitPollAnswers.waitPollsAnswers<PollAnswer>(
-    count,
-    initRequest,
-    errorFactory,
-    filter ?.let {
-        {
-            (it as? PollAnswer) ?.let { filter(it) } == true
-        }
-    }
-) {
-    if (this is PollAnswer) {
-        if (mapper == null) {
-            this
-        } else {
-            mapper(this)
-        }
-    } else {
-        null
-    }
-}
-
-/**
- * This wait will be triggered only for stopped polls and polls, which are sent by the bot
- */
-suspend fun BehaviourContext.waitPollAnswers(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<PollAnswer>? = null,
-    mapper: PollAnswerMapper? = null
-) = waitPollAnswers(count, initRequest, errorFactory, filter, mapper)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPollUpdates.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPollUpdates.kt
@@ -1,90 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.*
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.polls.*
-import kotlinx.coroutines.flow.toList
-
-typealias PollMapper<T> = suspend T.() -> T?
-
-private suspend fun <O> BehaviourContext.waitPollsUpdates(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    filter: SimpleFilter<Poll>? = null,
-    mapper: suspend Poll.() -> O?
-): List<O> = expectFlow(
-    initRequest,
-    count,
-    errorFactory
-) {
-    val data = it.asPollUpdate() ?.data
-    if (data != null && (filter == null || filter(data))) {
-        data.mapper().let(::listOfNotNull)
-    } else {
-        emptyList()
-    }
-}.toList().toList()
-
-
-private suspend inline fun <reified T : Poll> BehaviourContext.waitPolls(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<T>? = null,
-    noinline mapper: PollMapper<T>? = null
-) : List<T> = this@waitPolls.waitPollsUpdates<T>(
-    count,
-    initRequest,
-    errorFactory,
-    filter ?.let {
-        {
-            (it as? T) ?.let { filter(it) } == true
-        }
-    }
-) {
-    if (this is T) {
-        if (mapper == null) {
-            this
-        } else {
-            mapper(this)
-        }
-    } else {
-        null
-    }
-}
-
-/**
- * This wait will be triggered only for stopped polls and polls, which are sent by the bot
- */
-suspend fun BehaviourContext.waitPollUpdates(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<Poll>? = null,
-    mapper: PollMapper<Poll>? = null
-) = waitPolls(count, initRequest, errorFactory, filter, mapper)
-
-/**
- * This wait will be triggered only for stopped polls and polls, which are sent by the bot
- */
-suspend fun BehaviourContext.waitQuizPollUpdates(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<QuizPoll>? = null,
-    mapper: PollMapper<QuizPoll>? = null
-) = waitPolls(count, initRequest, errorFactory, filter, mapper)
-
-/**
- * This wait will be triggered only for stopped polls and polls, which are sent by the bot
- */
-suspend fun BehaviourContext.waitRegularPollUpdates(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<RegularPoll>? = null,
-    mapper: PollMapper<RegularPoll>? = null
-) = waitPolls(count, initRequest, errorFactory, filter, mapper)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPreCheckoutQuery.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPreCheckoutQuery.kt
@@ -1,51 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.asPreCheckoutQueryUpdate
-import dev.inmo.tgbotapi.extensions.utils.asShippingQueryUpdate
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.payments.PreCheckoutQuery
-import dev.inmo.tgbotapi.types.payments.ShippingQuery
-import kotlinx.coroutines.flow.toList
-
-typealias PreCheckoutQueryMapper = suspend PreCheckoutQuery.() -> PreCheckoutQuery?
-
-private suspend fun <O> BehaviourContext.waitPreCheckoutQueries(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    filter: SimpleFilter<PreCheckoutQuery>? = null,
-    mapper: suspend PreCheckoutQuery.() -> O?
-): List<O> = expectFlow(
-    initRequest,
-    count,
-    errorFactory
-) {
-    val data = it.asPreCheckoutQueryUpdate() ?.data
-    if (data != null && (filter == null || filter(data))) {
-        data.mapper().let(::listOfNotNull)
-    } else {
-        emptyList()
-    }
-}.toList().toList()
-
-
-suspend fun BehaviourContext.waitPreCheckoutQueries(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<PreCheckoutQuery>? = null,
-    mapper: PreCheckoutQueryMapper? = null
-) : List<PreCheckoutQuery> = waitPreCheckoutQueries(
-    count,
-    initRequest,
-    errorFactory,
-    filter
-) {
-    if (mapper == null) {
-        this
-    } else {
-        mapper(this)
-    }
-}
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitShippingQuery.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitShippingQuery.kt
@@ -1,49 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.asShippingQueryUpdate
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.payments.ShippingQuery
-import kotlinx.coroutines.flow.toList
-
-typealias ShippingQueryMapper = suspend ShippingQuery.() -> ShippingQuery?
-
-private suspend fun <O> BehaviourContext.waitShippingQueries(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    filter: SimpleFilter<ShippingQuery>? = null,
-    mapper: suspend ShippingQuery.() -> O?
-): List<O> = expectFlow(
-    initRequest,
-    count,
-    errorFactory
-) {
-    val data = it.asShippingQueryUpdate() ?.data
-    if (data != null && (filter == null || filter(data))) {
-        data.mapper().let(::listOfNotNull)
-    } else {
-        emptyList()
-    }
-}.toList().toList()
-
-
-suspend fun BehaviourContext.waitShippingQueries(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ShippingQuery>? = null,
-    mapper: ShippingQueryMapper? = null
-) : List<ShippingQuery> = waitShippingQueries(
-    count,
-    initRequest,
-    errorFactory,
-    filter
-) {
-    if (mapper == null) {
-        this
-    } else {
-        mapper(this)
-    }
-}
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/filters/MessageFilterByChat.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/filters/MessageFilterByChat.kt
@@ -1,56 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.filters
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver
-import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
-import dev.inmo.tgbotapi.types.CallbackQuery.CallbackQuery
-import dev.inmo.tgbotapi.types.ChatMemberUpdated
-import dev.inmo.tgbotapi.types.InlineQueries.query.InlineQuery
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.payments.PreCheckoutQuery
-import dev.inmo.tgbotapi.types.payments.ShippingQuery
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-
-/**
- * Allow only events from the same chat as base [Message]
- */
-val MessageFilterByChat: BehaviourContextAndTwoTypesReceiver<Boolean, Message, Update> = { message, update ->
-    update.sourceChat() ?.id == message.chat.id
-}
-/**
- * Allow only events from the same chat as base [List] of [Message]
- */
-val MessagesFilterByChat: BehaviourContextAndTwoTypesReceiver<Boolean, List<Message>, Update> = { messages, update ->
-    val sourceChatId = update.sourceChat() ?.id
-    sourceChatId != null && messages.all { sourceChatId == it.chat.id }
-}
-
-/**
- * Allow only updates from the same user as base [CallbackQuery.user]
- */
-val CallbackQueryFilterByUser: BehaviourContextAndTwoTypesReceiver<Boolean, CallbackQuery, Update> = { query, update ->
-    update.sourceChat() ?.id == query.user.id
-}
-/**
- * Allow only updates from the same user as base [ShippingQuery.user]
- */
-val ShippingQueryFilterByUser: BehaviourContextAndTwoTypesReceiver<Boolean, ShippingQuery, Update> = { query, update ->
-    update.sourceChat() ?.id == query.user.id
-}
-/**
- * Allow only updates from the same user as base [ShippingQuery.user]
- */
-val PreCheckoutQueryFilterByUser: BehaviourContextAndTwoTypesReceiver<Boolean, PreCheckoutQuery, Update> = { query, update ->
-    update.sourceChat() ?.id == query.user.id
-}
-/**
- * Allow only updates from the same user as base [InlineQuery.from]
- */
-val InlineQueryFilterByUser: BehaviourContextAndTwoTypesReceiver<Boolean, InlineQuery, Update> = { query, update ->
-    update.sourceChat() ?.id == query.from.id
-}
-/**
- * Allow only events from the same chat as base [ChatMemberUpdated]
- */
-val ChatMemberUpdatedFilterByChat: BehaviourContextAndTwoTypesReceiver<Boolean, ChatMemberUpdated, Update> = { updated, update ->
-    update.sourceChat() ?.id == updated.chat.id
-}
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/filters/MessageFilterExcludingMediaGroups.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/filters/MessageFilterExcludingMediaGroups.kt
@@ -1,21 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.filters
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver
-import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.CommonMessageFilter
-import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
-import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-
-/**
- * Allow only messages which are not [MediaGroupMessage]
- */
-val MessageFilterExcludingMediaGroups: BehaviourContextAndTwoTypesReceiver<Boolean, CommonMessage<*>, Update> = { message, update ->
-    update !is MediaGroupMessage<*>
-}
-
-/**
- * Allow only messages which are not [MediaGroupMessage]
- */
-val CommonMessageFilterExcludeMediaGroups: CommonMessageFilter<*> = {
-    it !is MediaGroupMessage<*>
-}
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggers.kt
@@ -1,237 +0,0 @@
-@file:Suppress("unused")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CallbackQueryFilterByUser
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByUserCallbackQueryMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
-import dev.inmo.tgbotapi.extensions.utils.asCallbackQueryUpdate
-import dev.inmo.tgbotapi.types.CallbackQuery.*
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-
-internal suspend inline fun <BC : BehaviourContext, reified T : CallbackQuery> BC.onCallbackQuery(
-    noinline initialFilter: SimpleFilter<T>? = null,
-    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in T, Any> = ByUserCallbackQueryMarkerFactory,
-    noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, T>
-) = on(markerFactory, initialFilter, subcontextUpdatesFilter, scenarioReceiver) {
-    (it.asCallbackQueryUpdate() ?.data as? T) ?.let(::listOfNotNull)
-}
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onDataCallbackQuery(
-    initialFilter: SimpleFilter<DataCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DataCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in DataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DataCallbackQuery>
-) = onCallbackQuery(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onGameShortNameCallbackQuery(
-    initialFilter: SimpleFilter<GameShortNameCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, GameShortNameCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in GameShortNameCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, GameShortNameCallbackQuery>
-) = onCallbackQuery(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onInlineMessageIdCallbackQuery(
-    initialFilter: SimpleFilter<InlineMessageIdCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineMessageIdCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in InlineMessageIdCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, InlineMessageIdCallbackQuery>
-) = onCallbackQuery(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
-    initialFilter: SimpleFilter<InlineMessageIdDataCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineMessageIdDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in InlineMessageIdDataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, InlineMessageIdDataCallbackQuery>
-) = onCallbackQuery(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onInlineMessageIdGameShortNameCallbackQuery(
-    initialFilter: SimpleFilter<InlineMessageIdGameShortNameCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineMessageIdGameShortNameCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in InlineMessageIdGameShortNameCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, InlineMessageIdGameShortNameCallbackQuery>
-) = onCallbackQuery(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onMessageCallbackQuery(
-    initialFilter: SimpleFilter<MessageCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MessageCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in MessageCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, MessageCallbackQuery>
-) = onCallbackQuery(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
-    initialFilter: SimpleFilter<MessageDataCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MessageDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in MessageDataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, MessageDataCallbackQuery>
-) = onCallbackQuery(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onMessageGameShortNameCallbackQuery(
-    initialFilter: SimpleFilter<MessageGameShortNameCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MessageGameShortNameCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in MessageGameShortNameCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, MessageGameShortNameCallbackQuery>
-) = onCallbackQuery(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onUnknownCallbackQueryType(
-    initialFilter: SimpleFilter<UnknownCallbackQueryType>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, UnknownCallbackQueryType, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in UnknownCallbackQueryType, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, UnknownCallbackQueryType>
-) = onCallbackQuery(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatMemberUpdatedTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatMemberUpdatedTriggers.kt
@@ -1,96 +0,0 @@
-@file:Suppress("unused")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.ChatMemberUpdatedFilterByChat
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByChatChatMemberUpdatedMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
-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 dev.inmo.tgbotapi.types.update.abstracts.Update
-
-internal suspend inline fun <BC : BehaviourContext, reified U : ChatMemberUpdatedUpdate> BC.onChatMemberUpdatedInternal(
-    noinline initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
-    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
-    markerFactory: MarkerFactory<ChatMemberUpdated, Any> = ByChatChatMemberUpdatedMarkerFactory,
-    noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatMemberUpdated>
-) = on(markerFactory, initialFilter, subcontextUpdatesFilter, scenarioReceiver) {
-    ((it as? U) ?.data) ?.let(::listOfNotNull)
-}
-
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onChatMemberUpdated(
-    initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
-    markerFactory: MarkerFactory<ChatMemberUpdated, Any> = ByChatChatMemberUpdatedMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatMemberUpdated>
-) = onChatMemberUpdatedInternal<BC, ChatMemberUpdatedUpdate>(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberUpdated(
-    initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
-    markerFactory: MarkerFactory<ChatMemberUpdated, Any> = ByChatChatMemberUpdatedMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatMemberUpdated>
-) = onChatMemberUpdatedInternal<BC, CommonChatMemberUpdatedUpdate>(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberUpdated(
-    initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
-    markerFactory: MarkerFactory<ChatMemberUpdated, Any> = ByChatChatMemberUpdatedMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatMemberUpdated>
-) = onChatMemberUpdatedInternal<BC, MyChatMemberUpdatedUpdate>(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChosenInlineResultTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChosenInlineResultTriggers.kt
@@ -1,93 +0,0 @@
-@file:Suppress("unused")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.*
-import dev.inmo.tgbotapi.extensions.utils.asChosenInlineResultUpdate
-import dev.inmo.tgbotapi.extensions.utils.asPollUpdate
-import dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.*
-import dev.inmo.tgbotapi.types.polls.*
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-
-internal suspend inline fun <BC : BehaviourContext, reified T : ChosenInlineResult> BC.onChosenInlineResultBase(
-    noinline initialFilter: SimpleFilter<T>? = null,
-    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = null,
-    markerFactory: MarkerFactory<in T, Any> = ByUserIdChosenInlineResultMarkerFactory,
-    noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, T>
-) = on(markerFactory, initialFilter, subcontextUpdatesFilter, scenarioReceiver) {
-    (it.asChosenInlineResultUpdate() ?.data as? T) ?.let(::listOfNotNull)
-}
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onChosenInlineResult(
-    initialFilter: SimpleFilter<ChosenInlineResult>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChosenInlineResult, Update>? = null,
-    markerFactory: MarkerFactory<in ChosenInlineResult, Any> = ByUserIdChosenInlineResultMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChosenInlineResult>
-) = onChosenInlineResultBase(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onLocationChosenInlineResult(
-    initialFilter: SimpleFilter<LocationChosenInlineResult>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, LocationChosenInlineResult, Update>? = null,
-    markerFactory: MarkerFactory<in LocationChosenInlineResult, Any> = ByUserIdChosenInlineResultMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, LocationChosenInlineResult>
-) = onChosenInlineResultBase(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onBaseChosenInlineResult(
-    initialFilter: SimpleFilter<BaseChosenInlineResult>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, BaseChosenInlineResult, Update>? = null,
-    markerFactory: MarkerFactory<in BaseChosenInlineResult, Any> = ByUserIdChosenInlineResultMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, BaseChosenInlineResult>
-) = onChosenInlineResultBase(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandling.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandling.kt
@@ -1,121 +0,0 @@
-@file:Suppress("unused")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CommonMessageFilterExcludeMediaGroups
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.MessageFilterByChat
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByChatMessageMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times
-import dev.inmo.tgbotapi.extensions.utils.asBotCommandTextSource
-import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithParams
-import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
-import dev.inmo.tgbotapi.types.message.content.TextContent
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-import kotlinx.coroutines.Job
-
-
-suspend fun <BC : BehaviourContext> BC.command(
-    commandRegex: Regex,
-    requireOnlyCommandInMessage: Boolean = true,
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
-): Job = onText(
-    CommonMessageFilter<TextContent> { message ->
-        val content = message.content
-        val textSources = content.textSources
-        val sizeRequirement = if (requireOnlyCommandInMessage) {
-            textSources.size == 1
-        } else {
-            true
-        }
-        sizeRequirement && textSources.any {
-            commandRegex.matches(it.asBotCommandTextSource() ?.command ?: return@any false)
-        }
-    }.let {
-        initialFilter ?.times(it) ?: it
-    },
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-suspend fun <BC : BehaviourContext> BC.command(
-    command: String,
-    requireOnlyCommandInMessage: Boolean = true,
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
-) = command(command.toRegex(), requireOnlyCommandInMessage, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-suspend inline fun <BC : BehaviourContext> BC.onCommand(
-    commandRegex: Regex,
-    requireOnlyCommandInMessage: Boolean = true,
-    noinline initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
-): Job = command(commandRegex, requireOnlyCommandInMessage, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-suspend inline fun <BC : BehaviourContext> BC.onCommand(
-    command: String,
-    requireOnlyCommandInMessage: Boolean = true,
-    noinline initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
-): Job = onCommand(command.toRegex(), requireOnlyCommandInMessage, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-suspend fun <BC : BehaviourContext> BC.commandWithArgs(
-    commandRegex: Regex,
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, CommonMessage<TextContent>, Array<String>>
-) = command(
-    commandRegex,
-    requireOnlyCommandInMessage = false,
-    initialFilter = initialFilter,
-    subcontextUpdatesFilter = subcontextUpdatesFilter,
-    markerFactory = markerFactory
-) {
-    val args = it.parseCommandsWithParams().let { commandsWithArgs ->
-        val key = commandsWithArgs.keys.firstOrNull { it.matches(commandRegex) } ?: return@let null
-        commandsWithArgs[key]
-    } ?: emptyArray()
-    scenarioReceiver(it, args)
-}
-
-suspend fun <BC : BehaviourContext> BC.commandWithArgs(
-    command: String,
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, CommonMessage<TextContent>, Array<String>>
-) = commandWithArgs(
-    command.toRegex(),
-    initialFilter = initialFilter,
-    subcontextUpdatesFilter = subcontextUpdatesFilter,
-    markerFactory = markerFactory,
-    scenarioReceiver = scenarioReceiver
-)
-
-suspend inline fun <BC : BehaviourContext> BC.onCommandWithArgs(
-    commandRegex: Regex,
-    noinline initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    noinline scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, CommonMessage<TextContent>, Array<String>>
-): Job = commandWithArgs(commandRegex, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-suspend inline fun <BC : BehaviourContext> BC.onCommandWithArgs(
-    command: String,
-    noinline initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    noinline scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, CommonMessage<TextContent>, Array<String>>
-): Job = onCommandWithArgs(command.toRegex(), initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ContentTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ContentTriggers.kt
@@ -1,591 +0,0 @@
-@file:Suppress("unused", "UNCHECKED_CAST")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CommonMessageFilterExcludeMediaGroups
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.MessageFilterByChat
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByChatMessageMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
-import dev.inmo.tgbotapi.extensions.utils.whenCommonMessage
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
-import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
-import dev.inmo.tgbotapi.types.message.content.*
-import dev.inmo.tgbotapi.types.message.content.abstracts.*
-import dev.inmo.tgbotapi.types.message.content.media.*
-import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
-import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate
-import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-
-typealias CommonMessageFilter<T> = SimpleFilter<CommonMessage<T>>
-inline fun <T : MessageContent> CommonMessageFilter(noinline block: CommonMessageFilter<T>) = block
-
-internal suspend inline fun <BC : BehaviourContext, reified T : MessageContent> BC.onContent(
-    noinline initialFilter: CommonMessageFilter<T>? = null,
-    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<T>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<T>, Any> = ByChatMessageMarkerFactory,
-    noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<T>>
-) = on(markerFactory, initialFilter, subcontextUpdatesFilter, scenarioReceiver) {
-    when (it) {
-        is BaseSentMessageUpdate -> it.data.whenCommonMessage(::listOfNotNull)
-        is SentMediaGroupUpdate -> it.data
-        else -> null
-    } ?.mapNotNull { message ->
-        if (message.content is T) message as CommonMessage<T> else null
-    }
-}
-
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onContentMessage(
-    initialFilter: CommonMessageFilter<MessageContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MessageContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<MessageContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<MessageContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onContact(
-    initialFilter: CommonMessageFilter<ContactContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<ContactContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<ContactContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<ContactContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onDice(
-    initialFilter: CommonMessageFilter<DiceContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<DiceContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<DiceContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<DiceContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onGame(
-    initialFilter: CommonMessageFilter<GameContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<GameContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<GameContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<GameContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onLocation(
-    initialFilter: CommonMessageFilter<LocationContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<LocationContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<LocationContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<LocationContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onLiveLocation(
-    initialFilter: CommonMessageFilter<LiveLocationContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<LiveLocationContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<LiveLocationContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<LiveLocationContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onStaticLocation(
-    initialFilter: CommonMessageFilter<StaticLocationContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<StaticLocationContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<StaticLocationContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<StaticLocationContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onPoll(
-    initialFilter: CommonMessageFilter<PollContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<PollContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<PollContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<PollContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onText(
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onVenue(
-    initialFilter: CommonMessageFilter<VenueContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VenueContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<VenueContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<VenueContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onAudioMediaGroup(
-    initialFilter: CommonMessageFilter<AudioMediaGroupContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AudioMediaGroupContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<AudioMediaGroupContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<AudioMediaGroupContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onDocumentMediaGroupContent(
-    initialFilter: CommonMessageFilter<DocumentMediaGroupContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<DocumentMediaGroupContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<DocumentMediaGroupContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<DocumentMediaGroupContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onMediaCollection(
-    initialFilter: CommonMessageFilter<MediaCollectionContent<TelegramMediaFile>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MediaCollectionContent<TelegramMediaFile>>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<MediaCollectionContent<TelegramMediaFile>>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<MediaCollectionContent<TelegramMediaFile>>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onMedia(
-    initialFilter: CommonMessageFilter<MediaContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MediaContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<MediaContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<MediaContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onAnimation(
-    initialFilter: CommonMessageFilter<AnimationContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AnimationContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<AnimationContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<AnimationContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onAudio(
-    initialFilter: CommonMessageFilter<AudioContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AudioContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<AudioContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<AudioContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onDocument(
-    initialFilter: CommonMessageFilter<DocumentContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<DocumentContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<DocumentContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<DocumentContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onPhoto(
-    initialFilter: CommonMessageFilter<PhotoContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<PhotoContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<PhotoContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<PhotoContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onSticker(
-    initialFilter: CommonMessageFilter<StickerContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<StickerContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<StickerContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<StickerContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onVideo(
-    initialFilter: CommonMessageFilter<VideoContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VideoContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<VideoContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<VideoContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onVideoNote(
-    initialFilter: CommonMessageFilter<VideoNoteContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VideoNoteContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<VideoNoteContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<VideoNoteContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onVoice(
-    initialFilter: CommonMessageFilter<VoiceContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VoiceContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<VoiceContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<VoiceContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onInvoice(
-    initialFilter: CommonMessageFilter<InvoiceContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<InvoiceContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<InvoiceContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<InvoiceContent>>
-) = onContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EditedContentTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EditedContentTriggers.kt
@@ -1,540 +0,0 @@
-
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */@file:Suppress("unused", "UNCHECKED_CAST")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CommonMessageFilterExcludeMediaGroups
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.MessageFilterByChat
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByChatMessageMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
-import dev.inmo.tgbotapi.extensions.utils.asEditMessageUpdate
-import dev.inmo.tgbotapi.extensions.utils.withContent
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
-import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
-import dev.inmo.tgbotapi.types.message.content.*
-import dev.inmo.tgbotapi.types.message.content.abstracts.*
-import dev.inmo.tgbotapi.types.message.content.media.*
-import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
-import dev.inmo.tgbotapi.types.update.abstracts.BaseEditMessageUpdate
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-import dev.inmo.tgbotapi.utils.PreviewFeature
-
-@PreviewFeature
-internal suspend inline fun <BC : BehaviourContext, reified T : MessageContent> BC.onEditedContent(
-    noinline initialFilter: CommonMessageFilter<T>? = null,
-    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<T>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<T>, Any> = ByChatMessageMarkerFactory,
-    noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<T>>
-) = on(markerFactory, initialFilter, subcontextUpdatesFilter, scenarioReceiver) {
-    when (it) {
-        is BaseEditMessageUpdate -> (it.asEditMessageUpdate() ?.data ?.withContent<T>())
-        else -> null
-    } ?.let(::listOfNotNull)
-}
-
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedContentMessage(
-    initialFilter: CommonMessageFilter<MessageContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MessageContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<MessageContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<MessageContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedContact(
-    initialFilter: CommonMessageFilter<ContactContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<ContactContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<ContactContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<ContactContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedDice(
-    initialFilter: CommonMessageFilter<DiceContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<DiceContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<DiceContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<DiceContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedGame(
-    initialFilter: CommonMessageFilter<GameContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<GameContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<GameContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<GameContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedLocation(
-    initialFilter: CommonMessageFilter<LocationContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<LocationContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<LocationContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<LocationContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-@Deprecated("Potentially, this trigger will never be used. Use `onPollUpdated` instead")
-suspend fun <BC : BehaviourContext> BC.onEditedPoll(
-    initialFilter: CommonMessageFilter<PollContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<PollContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<PollContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<PollContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedText(
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedVenue(
-    initialFilter: CommonMessageFilter<VenueContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VenueContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<VenueContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<VenueContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedAudioMediaGroup(
-    initialFilter: CommonMessageFilter<AudioMediaGroupContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AudioMediaGroupContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<AudioMediaGroupContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<AudioMediaGroupContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedDocumentMediaGroupContent(
-    initialFilter: CommonMessageFilter<DocumentMediaGroupContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<DocumentMediaGroupContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<DocumentMediaGroupContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<DocumentMediaGroupContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedMediaCollection(
-    initialFilter: CommonMessageFilter<MediaCollectionContent<TelegramMediaFile>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MediaCollectionContent<TelegramMediaFile>>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<MediaCollectionContent<TelegramMediaFile>>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<MediaCollectionContent<TelegramMediaFile>>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedMedia(
-    initialFilter: CommonMessageFilter<MediaContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MediaContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<MediaContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<MediaContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedAnimation(
-    initialFilter: CommonMessageFilter<AnimationContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AnimationContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<AnimationContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<AnimationContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedAudio(
-    initialFilter: CommonMessageFilter<AudioContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AudioContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<AudioContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<AudioContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedDocument(
-    initialFilter: CommonMessageFilter<DocumentContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<DocumentContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<DocumentContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<DocumentContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedPhoto(
-    initialFilter: CommonMessageFilter<PhotoContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<PhotoContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<PhotoContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<PhotoContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedSticker(
-    initialFilter: CommonMessageFilter<StickerContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<StickerContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<StickerContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<StickerContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedVideo(
-    initialFilter: CommonMessageFilter<VideoContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VideoContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<VideoContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<VideoContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedVideoNote(
-    initialFilter: CommonMessageFilter<VideoNoteContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VideoNoteContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<VideoNoteContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<VideoNoteContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedVoice(
-    initialFilter: CommonMessageFilter<VoiceContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VoiceContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<VoiceContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<VoiceContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedInvoice(
-    initialFilter: CommonMessageFilter<InvoiceContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<InvoiceContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<InvoiceContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<InvoiceContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt
@@ -1,466 +0,0 @@
-@file:Suppress("unused")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.MessageFilterByChat
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByChatMessageMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
-import dev.inmo.tgbotapi.extensions.utils.asBaseSentMessageUpdate
-import dev.inmo.tgbotapi.extensions.utils.asChatEventMessage
-import dev.inmo.tgbotapi.types.message.ChatEvents.*
-import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
-import dev.inmo.tgbotapi.types.message.ChatEvents.voice.*
-import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
-import dev.inmo.tgbotapi.types.message.payments.SuccessfulPaymentEvent
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-
-internal suspend inline fun <BC : BehaviourContext, reified T : ChatEvent> BC.onEvent(
-    noinline initialFilter: SimpleFilter<ChatEventMessage<T>>? = null,
-    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<T>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<T>, Any> = ByChatMessageMarkerFactory,
-    noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<T>>
-) = on(markerFactory, initialFilter, subcontextUpdatesFilter, scenarioReceiver) {
-    (it.asBaseSentMessageUpdate() ?.data ?.asChatEventMessage() ?.takeIf { it.chatEvent is T } as? ChatEventMessage<T>) ?.let(::listOfNotNull)
-}
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onChannelEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<ChannelEvent>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<ChannelEvent>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<ChannelEvent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<ChannelEvent>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onPrivateEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<PrivateEvent>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<PrivateEvent>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<PrivateEvent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<PrivateEvent>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onChatEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<ChatEvent>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<ChatEvent>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<ChatEvent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<ChatEvent>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onVoiceChatEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VoiceChatEvent>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VoiceChatEvent>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VoiceChatEvent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VoiceChatEvent>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onVoiceChatStartedEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VoiceChatStarted>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VoiceChatStarted>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VoiceChatStarted>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VoiceChatStarted>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onVoiceChatEndedEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VoiceChatEnded>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VoiceChatEnded>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VoiceChatEnded>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VoiceChatEnded>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onVoiceChatParticipantsInvitedEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VoiceChatParticipantsInvited>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VoiceChatParticipantsInvited>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VoiceChatParticipantsInvited>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VoiceChatParticipantsInvited>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onMessageAutoDeleteTimerChangedEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<MessageAutoDeleteTimerChanged>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<MessageAutoDeleteTimerChanged>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<MessageAutoDeleteTimerChanged>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<MessageAutoDeleteTimerChanged>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onPublicChatEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<PublicChatEvent>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<PublicChatEvent>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<PublicChatEvent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<PublicChatEvent>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onCommonEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<CommonEvent>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<CommonEvent>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<CommonEvent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<CommonEvent>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onGroupEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<GroupEvent>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<GroupEvent>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<GroupEvent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<GroupEvent>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onSupergroupEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<SupergroupEvent>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<SupergroupEvent>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<SupergroupEvent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<SupergroupEvent>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onChannelChatCreated(
-    initialFilter: SimpleFilter<ChatEventMessage<ChannelChatCreated>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<ChannelChatCreated>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<ChannelChatCreated>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<ChannelChatCreated>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onDeleteChatPhoto(
-    initialFilter: SimpleFilter<ChatEventMessage<DeleteChatPhoto>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<DeleteChatPhoto>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<DeleteChatPhoto>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<DeleteChatPhoto>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onGroupChatCreated(
-    initialFilter: SimpleFilter<ChatEventMessage<GroupChatCreated>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<GroupChatCreated>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<GroupChatCreated>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<GroupChatCreated>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onLeftChatMember(
-    initialFilter: SimpleFilter<ChatEventMessage<LeftChatMember>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<LeftChatMember>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<LeftChatMember>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<LeftChatMember>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onNewChatMembers(
-    initialFilter: SimpleFilter<ChatEventMessage<NewChatMembers>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<NewChatMembers>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<NewChatMembers>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<NewChatMembers>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onNewChatPhoto(
-    initialFilter: SimpleFilter<ChatEventMessage<NewChatPhoto>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<NewChatPhoto>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<NewChatPhoto>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<NewChatPhoto>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onNewChatTitle(
-    initialFilter: SimpleFilter<ChatEventMessage<NewChatTitle>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<NewChatTitle>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<NewChatTitle>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<NewChatTitle>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onPinnedMessage(
-    initialFilter: SimpleFilter<ChatEventMessage<PinnedMessage>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<PinnedMessage>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<PinnedMessage>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<PinnedMessage>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onProximityAlertTriggered(
-    initialFilter: SimpleFilter<ChatEventMessage<ProximityAlertTriggered>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<ProximityAlertTriggered>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<ProximityAlertTriggered>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<ProximityAlertTriggered>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onSupergroupChatCreated(
-    initialFilter: SimpleFilter<ChatEventMessage<SupergroupChatCreated>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<SupergroupChatCreated>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<SupergroupChatCreated>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<SupergroupChatCreated>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * Please, remember that [SuccessfulPaymentEvent] will be retrieved only in case you will correctly handle
- * [dev.inmo.tgbotapi.types.payments.PreCheckoutQuery] (via [onPreCheckoutQuery], for example)
- *
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param markerFactory Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onSuccessfulPayment(
-    initialFilter: SimpleFilter<ChatEventMessage<SuccessfulPaymentEvent>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<SuccessfulPaymentEvent>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<SuccessfulPaymentEvent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<SuccessfulPaymentEvent>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/InlineQueryTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/InlineQueryTriggers.kt
@@ -1,78 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.InlineQueryFilterByUser
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByUserInlineQueryMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
-import dev.inmo.tgbotapi.extensions.utils.asInlineQueryUpdate
-import dev.inmo.tgbotapi.types.InlineQueries.query.*
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-
-internal suspend inline fun <BC : BehaviourContext, reified T : InlineQuery> BC.onInlineQuery(
-    noinline initialFilter: SimpleFilter<T>? = null,
-    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = InlineQueryFilterByUser,
-    markerFactory: MarkerFactory<in T, Any> = ByUserInlineQueryMarkerFactory,
-    noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, T>
-) = on(markerFactory, initialFilter, subcontextUpdatesFilter, scenarioReceiver) {
-    (it.asInlineQueryUpdate() ?.data as? T) ?.let(::listOfNotNull)
-}
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onAnyInlineQuery(
-    initialFilter: SimpleFilter<InlineQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineQuery, Update>? = InlineQueryFilterByUser,
-    markerFactory: MarkerFactory<in InlineQuery, Any> = ByUserInlineQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, InlineQuery>
-) = onInlineQuery(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onBaseInlineQuery(
-    initialFilter: SimpleFilter<BaseInlineQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, BaseInlineQuery, Update>? = InlineQueryFilterByUser,
-    markerFactory: MarkerFactory<in BaseInlineQuery, Any> = ByUserInlineQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, BaseInlineQuery>
-) = onInlineQuery(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onLocationInlineQuery(
-    initialFilter: SimpleFilter<LocationInlineQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, LocationInlineQuery, Update>? = InlineQueryFilterByUser,
-    markerFactory: MarkerFactory<in LocationInlineQuery, Any> = ByUserInlineQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, LocationInlineQuery>
-) = onInlineQuery(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Extensions for API","description":"API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}