optimize imports

0.38.22

.github/FUNDING.yml

@@ -1,5 +1,3 @@
 # These are supported funding model platforms
 
-patreon: InsanusMokrassar
-
-custom: ['https://paypal.me/InsanusMokrassar?locale.x=ru_RU']
+custom: ['https://www.tinkoff.ru/rm/ovsyannikov.aleksey113/ObMJ712472']

.github/labeler.yml

@@ -1,6 +1,8 @@
-api: "TelegramBotAPI-extensions-api/**"
-utils: "TelegramBotAPI-extensions-utils/**"
-core: "TelegramBotAPI/**" # currently not work
+api: "TelegramBotAPI-api/**"
+utils: "TelegramBotAPI-utils/**"
+behaviour-builder: "TelegramBotAPI-behaviour_builder/**"
+behaviour-builder_fsm: "TelegramBotAPI-behaviour_builder-fsm/**"
+core: "TelegramBotAPI-core/**" # currently not work
 
 code: "**/*.kt"
 gradle: "**/*.gradle"

.github/workflows/kdocs.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Build
         run: ./gradlew dokkaHtml
       - name: Publish KDocs

.github/workflows/label.yml

@@ -12,6 +12,7 @@ on:
 jobs:
   triage:
     runs-on: ubuntu-latest
+    if: ${{ github.actor == github.repository_owner }}
     steps:
       - uses: actions/labeler@v2
         with:

.github/workflows/packages_publishing.yml

@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Rewrite version
         run: |
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
@@ -17,7 +17,8 @@ jobs:
       - name: Build
         run: ./gradlew build
       - name: Publish
-        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication
+        continue-on-error: true
+        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel
         env:
           GITHUBPACKAGES_USER: ${{ github.actor }}
           GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

.github/write-good.yml

@@ -1 +0,0 @@
-spellchecker: true

.gitignore

@@ -10,4 +10,5 @@ build/
 out/
 
 local.properties
+kotlin-js-store/
 secret.gradle

CHANGELOG.md

@@ -1,5 +1,647 @@
 # TelegramBotAPI changelog
 
+## 0.38.23
+
+* `BehaviourHandler`:
+    * Add support of fallback triggers (fix of [#560](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/560))
+
+## 0.38.22
+
+* `Core`:
+    * New constant `tgWebAppStartParamField`
+    * All keyboards builders and rows blocks becomes not crossinline
+
+## 0.38.21
+
+* `WebApps`:
+    * `WebAppInitData#queryId` now have correct js name of field
+    * New function `sendDataOrWorkWithQueryId`
+
+## 0.38.20
+
+* `BehaviourBuilder FSM`:
+    * Hotfixes
+* `WebApps`:
+    * New extension `TelegramBot#answerWebAppQuery`
+    * New function `handleResult`
+
+## 0.38.19
+
+* `BehaviourBuilder`:
+    * Hotfixes
+* `BehaviourBuilder FSM`:
+    * `BehaviourContextWithFSMBuilder` deprecated in favor to `BehaviourContextWithFSM`
+    * Now it is possible to define additional handlers in subcontexts of `BehaviourBuilderWithFSM`
+
+## 0.38.18
+
+* `Core`:
+    * Add support of test servers (fix of [#577](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/577))
+* `BehaviourBuilder`:
+    * Fixes in extension `BehaviourContext#doInSubContextWithUpdatesFilter` (thanks to [xzima](https://github.com/xzima))
+
+## 0.38.17
+
+* `Core`:
+    * Add `BotCommandScopeChat` as new `BotCommandScope` (fix of [#574](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/574))
+    * `BotCommandScope` companion got several properties and functions for more useful scope creation
+
+## 0.38.16
+
+* `Core`:
+    * `TelegramAPIUrlsKeeper` now have two new things: properties `webAppDataSecretKey` and fun `checkWebAppLink`
+
+## 0.38.15
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.20` -> `0.9.24`
+* `Core`:
+    * Fixes in `MessageContent#serializationModule`
+* `BehaviourBuilder`:
+    * Add triggers for `DataCallbackQuery` and subtypes with regex checking of data
+
+## 0.38.14
+
+__This update contains including of [Telegram Bot API 6.0](https://core.telegram.org/bots/api-changelog#april-16-2022)__
+
+* `Core`:
+    * Constructor of `UnknownInlineKeyboardButton` is not internal and can be created with any `json`
+* `WebApps`:
+    * Created 🎉
+
+## 0.38.13
+
+* `Core`:
+    * Fixes in `mention` creation
+    * Deprecate `StorageFileInfo`
+* `BehaviourBuilder`:
+    * In the expectations a lot of `on*Message` extensions have been added (like `onContentMessage`). These extensions could be useful when with the `Content` its message info is important
+
+## 0.38.12
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.17` -> `0.9.19`
+        * `Coroutines`: `1.6.0` -> `1.6.1`
+* `Core`:
+    * New type `TextedMediaContent` which will unite `TextedInput` and `MediaContent`
+    * `MediaGroupContent` and all subsequent inheritors have been replaced to the package `dev.inmo.tgbotapi.types.message.content.media`
+    * `MediaGroupContent` Now extends `TextedMediaContent` instead of `MediaContent`
+    * Add `reply` functions with the texted content with including of text
+* `Utils`:
+    * Improve work with retrieving of accumulated updates
+
+## 0.38.11
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.16` -> `0.9.17`
+        * `Klock`: `2.6.3` -> `2.7.0`
+* `Core`:
+    * Fixes in `TextSourcesList` creating in from `RawMessageEntities`
+    * Old ways to create keyboards (`matrix` and `row`) have been deprecated
+* `API`:
+    * Add ability to `reply` with `Poll`
+    * Add ability to `reply` with any `MessageContent`
+    * Add ability to `reply` with any `TelegramMediaFile`
+
+## 0.38.10
+
+* `API`:
+    * All `with*Action` extensions got a contracts which declare that `block` will be called once
+    * Add several extensions `TelegramBot#sendPhoto` with `PhotoSize`
+    * Add several extensions `TelegramBot#reply` with `PhotoSize`
+
+## 0.38.9
+
+* `Core`:
+    * New function `MessageContent.Companion#serializationModule`
+    * Now it is possible to create `TelegramBot` (`RequestsExecutor`) with several bots under the hood and opportunity
+      for bots requests load balancing or fault-fix via sending of the requests via another bot
+* `API`:
+    * Add replies which will use another message as a source for reply (`copyMessage`)
+
+## 0.38.8
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.12` -> `0.9.16`
+        * `Klock`: `2.6.2` -> `2.6.3`
+        * `Ktor`: `1.6.7` -> `1.6.8`
+* `BehaviourBuilder`:
+    * Fixes in `onMediaGroup` and dependent functions
+    * Add several new extensions for `SimpleFilter`:
+        * `SimpleFilter#listAll`
+        * `SimpleFilter#listAny`
+        * `SimpleFilter#listNone`
+
+## 0.38.7
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.9` -> `0.9.12`
+        * `Klock`: `2.5.2` -> `2.6.2`
+* `Core`:
+    * `SimplePollOption#votes` now is `0` by default
+    * New function `PollOption.Companion#simple`
+
+## 0.38.6
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.6` -> `0.9.9`
+        * `Klock`: `2.4.13` -> `2.5.2`
+* `Core`:
+    * New member of `MentionTextSource` - `username`
+
+## 0.38.5
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.5` -> `0.9.6`
+* `Core`:
+    * `Username` got new property `usernameWithoutAt` which will return `username` without leading `@`
+* `Utils`:
+    * Several new functions for working with deep links:
+        * `makeUsernameDeepLinkPrefix`
+        * `makeTelegramDeepLink`
+        * `makeDeepLink`
+
+## 0.38.4
+
+__This update contains including of [Telegram Bot API 5.7](https://core.telegram.org/bots/api-changelog#january-31-2022)__
+
+* `Core`:
+    * Support of new fields `Sticker`
+    * Support of new fields `StickerSet`
+    * Support of new fields in creating of sticker set and sticker
+* `Utils`:
+    * Rename `PathedFile` to avoid clash with core file (fix of [#529](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/529))
+
+## 0.38.3
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.1` -> `0.9.2`
+        * `Klock`: `2.4.10` -> `2.4.12`
+        * `UUID`: `0.3.1` -> `0.4.0`
+* `API`
+    * New extensions `TelegramBot#send*` for media groups with contents
+
+## 0.38.2
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.0` -> `0.9.1`
+* `API`
+    * New extensions `TelegramBot#copyMessages` for media groups
+
+## 0.38.1
+
+* `Core`:
+    * `MessageCallbackQuery` (and all implementers as well) has changed the type of `message`: now it is `ContentMessage<MessageContent>` instead of `Message`
+    * New type `ForwardFromPublicChatInfo` as extender of `ForwardInfo`:
+        * `ForwardFromChannelInfo` now extends `ForwardFromPublicChatInfo`
+        * `ForwardFromSupergroupInfo` now extends `ForwardFromPublicChatInfo`
+    * New type of events: `UserLoggedIn`
+* `Utils`:
+    * ([#511](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/511)) New extensions properties (raw fields as in original API) for several types have been added:
+        * `Message`
+        * `CallbackQuery`
+        * `ChosenInlineResult`
+        * `InlineQuery`
+        * `Poll`
+
+## 0.38.0
+
+_This update contains [Telegram Bot API 5.6](https://core.telegram.org/bots/api-changelog#december-30-2021) implementation_
+
+_This update contains migration onto Kotlin 1.6_
+
+_This update has changed constructors of all `CommonMessage` implementations_
+
+
+* `Common`:
+    * `Version`:
+        * `Kotlin`: `1.5.31` -> `1.6.10`
+        * `Coroutines`: `1.5.2` -> `1.6.0`
+        * `Serialization`: `1.3.1` -> `1.3.2`
+        * `Klock`: `2.4.8` -> `2.4.10`
+        * `Ktor`: `1.6.5` -> `1.6.7`
+        * `MicroUtils`: `0.8.7` -> `0.9.0`
+* `Core`:
+    * Add `SpoilerTextSource` (as part of `Telegram Bot API 5.6` update)
+    * Add support of `protect_content` as a field `protectContent` in all send message requests and parameter in all
+      functions related to that requests (as part of `Telegram Bot API 5.6` update)
+    * **ALL IMPLEMENTERS OF `CommonMessage` HAS CHANGED THEIR CONSTRUCTOR: NOW THEY GET `hasProtectedContent` instead of
+      `forwardable` (inversed) field**
+        * `ChannelContentMessageImpl`
+        * `ChannelMediaGroupMessage`
+        * `CommonMediaGroupMessage`
+        * `GroupContentMessage` implementers
+            * `ConnectedFromChannelGroupContentMessageImpl`
+            * `UnconnectedFromChannelGroupContentMessageImpl`
+            * `AnonymousGroupContentMessageImpl`
+            * `CommonGroupContentMessageImpl`
+        * `PrivateContentMessageImpl`
+
+## 0.37.4
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.8.7` -> `0.8.9`
+* `Core`:
+    * New `SupergroupEvent` subtype: `MigratedToSupergroup`. This event is sent when a group is converted to a supergroup while bot is in the group.
+    * Helper extenstion functions on `ChatEvent` to cast it to `MigratedToSupergroup`.
+
+## 0.37.3 Hotfix of 0.37.2
+
+* `Core`:
+    * Fixes in hierarchy (and creating) of messages from channels
+
+---
+
+`0.37.2` changelog:
+
+_This update contains [Telegram Bot API 5.5](https://core.telegram.org/bots/api-changelog#december-7-2021) implementation_
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.8.2` -> `0.8.7`
+* `Core`:
+    * New request type: `ChatSenderRequest`
+        * New request `BanChatSenderChat`
+        * New request `UnbanChatSenderChat`
+    * `ExtendedPrivateChat` got new properties: `hasPrivateForwards` and `allowCreateUserIdLink` (same as `hasPrivateForwards`)
+    * All `ContentMessage` got field `forwardable` (old constructors marked as `Deprecated`)
+    * `FromChannelGroupContentMessage` has been divided for two interfaces (and corresponding classes):
+        * `ConnectedFromChannelGroupContentMessage` (and `ConnectedFromChannelGroupContentMessageImpl`) for connected to the group channels messages
+        * `UnconnectedFromChannelGroupContentMessage` (and `UnconnectedFromChannelGroupContentMessageImpl`) for unconnected channels
+* `API`:
+    * New extensions `TelegramBot#banChatSenderChat`
+    * New extensions `TelegramBot#unbanChatSenderChat`
+* `Utils`:
+    * Fix of `EntitiesBuilder#linkln`
+
+## 0.37.2 Telegram Bot API 5.5
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.8.2` -> `0.8.7`
+* `Core`:
+    * New request type: `ChatSenderRequest`
+        * New request `BanChatSenderChat`
+        * New request `UnbanChatSenderChat`
+    * `ExtendedPrivateChat` got new properties: `hasPrivateForwards` and `allowCreateUserIdLink` (same as `hasPrivateForwards`)
+    * All `ContentMessage` got field `forwardable` (old constructors marked as `Deprecated`)
+    * `ChannelContentMessage` has been divided for two interfaces (and corresponding classes):
+        * `ConnectedChannelContentMessage` (and `ConnectedChannelContentMessageImpl`) for connected to the group channels messages
+        * `UnconnectedChannelContentMessage` (and `UnconnectedChannelContentMessageImpl`) for unconnected channels
+* `API`:
+    * New extensions `TelegramBot#banChatSenderChat`
+    * New extensions `TelegramBot#unbanChatSenderChat`
+* `Utils`:
+    * Fix of `EntitiesBuilder#linkln`
+
+## 0.37.1
+
+* `Common`:
+    * `Version`:
+        * `Serialization`: `1.3.0` -> `1.3.1`
+        * `Klock`: `2.4.7` -> `2.4.8`
+        * `MicroUtils`: `0.8.1` -> `0.8.2`
+
+## 0.37.0 Telegram Bot API 5.4
+
+**ALL DEPRECATIONS WERE REMOVED**
+
+* `Common`:
+    * `Version`:
+        * `Klock`: `2.4.6` -> `2.4.7`
+        * `Ktor`: `1.6.4` -> `1.6.5`
+        * `MicroUtils`: `0.7.3` -> `0.8.1`
+* `Core`:
+    * Replacement of simple `CreateChatInviteLink` and `EditChatInviteLink` with several new:
+        * `CreateChatInviteLinkSimple`
+        * `CreateChatInviteLinkWithLimitedMembers`
+        * `CreateChatInviteLinkWithJoinRequest`
+        * `EditChatInviteLinkSimple`
+        * `EditChatInviteLinkWithLimitedMembers`
+        * `EditChatInviteLinkWithJoinRequest`
+    * New `BotAction`: `ChooseStickerAction`
+    * Now requester will throw exceptions related to responses decoding directly instead of wrapping in
+      `RequestException`
+    * 
+* `BehaviourBuilder FSM`:
+    * **Incompatible changes** (now generics are used in state machines)
+    * `strictlyOn` and `onStateOrSubstate` now are part of `BehaviourContextWithFSMBuilder`
+
+## 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`:

README.md

@@ -1,18 +1,11 @@
-[Participate in our common survey ☺](https://forms.gle/q6Xf8K3fD1pPsYUw9)
+# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-6.0-blue)](https://core.telegram.org/bots/api-changelog#april-16-2022)
 
-# TelegramBotAPI
+| [![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://img.shields.io/static/v1?label=Google&message=Survey&color=blue&logo=google-sheets)](https://docs.google.com/forms/d/e/1FAIpQLSctdJHT_aEniyYT0-IUAEfo1hsIlezX2owlkEAYX4KPl2V2_A/viewform?usp=sf_link) [![Chat in Telegram](https://img.shields.io/static/v1?label=Telegram&message=Chat&color=blue&logo=telegram)](https://t.me/InMoTelegramBotAPI) |
+|:---:|
+| [![Create bot](https://img.shields.io/static/v1?label=Github&message=Template&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![Examples](https://img.shields.io/static/v1?label=Github&message=Examples&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/) [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue&logo=kotlin)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Bookstack&message=Tutorial&color=blue&logo=bookstack)](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
 
 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)|
-| -------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Useful links | [![Chat in Telegram](badges/chat.svg)](https://t.me/InMoTelegramBotAPI) [![Create bot](badges/template.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![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                 | [![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.extensions.api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api) |
-| TelegramBotAPI Util Extensions status | [![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 Behaviour Builder Extensions status | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.behaviour_builder/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.behaviour_builder) |
-| 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)                                                             |
-
 ## Examples
 
 There are several things you need to do to launch examples below:
@@ -35,7 +28,7 @@ Other configuration examples:
 suspend fun main() {
   val bot = telegramBot(TOKEN)
 
-  bot.buildBehaviour {
+  bot.buildBehaviourWithLongPolling {
     println(getMe())
   
     onCommand("start") {
@@ -76,7 +69,7 @@ and maybe some updates it got after launch)
 suspend fun main() {
   val bot = telegramBot(TOKEN)
 
-  bot.buildBehaviour {
+  bot.buildBehaviourWithLongPolling {
     println(getMe())
 
     val nameReplyMarkup = ReplyKeyboardMarkup(

TelegramBotAPI.minder

@@ -1,311 +0,0 @@
-<?xml version="1.0"?>
-<minder version="1.11.3">
-  <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="-950.47548925255796" y="-49.650554065281653" scale="0.5"/>
-  <images/>
-  <nodes>
-    <node id="0" posx="1378.798161778599" posy="159.04571601189673" width="472" height="168" side="top" fold="false" treesize="743" 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="1394.798161778599" posy="175.04571601189673" 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="1411.798161778599" posy="427.04571601189673" width="406" height="145" side="bottom" fold="false" treesize="743" 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="1427.798161778599" posy="443.04571601189673" 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="1247.298161778599" posy="672.04571601189673" 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="1263.298161778599" posy="688.04571601189673" 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="1609.298161778599" posy="672.04571601189673" width="307" height="168" side="bottom" fold="false" treesize="439" 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="1625.298161778599" posy="688.04571601189673" maxwidth="299.252197265625">
-                <text data="tgbotapi.extensions.utils&#10;&#10;Extensions project with utils things which will make easier different operations"/>
-              </nodename>
-              <nodenote></nodenote>
-              <nodes>
-                <node id="4" posx="1543.298161778599" posy="940.04571601189673" width="439" height="122" side="bottom" fold="false" treesize="439" color="#68b723" colorroot="false" layout="Downwards" group="false">
-                  <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="387" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
-                  <nodename posx="1559.298161778599" posy="956.04571601189673" maxwidth="408.97932942708348">
-                    <text data="tgbotapi.extensions.behaviour_builder&#10;&#10;Extension project for building bot behaviour via special dsl"/>
-                  </nodename>
-                  <nodenote></nodenote>
-                </node>
-              </nodes>
-            </node>
-          </nodes>
-        </node>
-      </nodes>
-    </node>
-    <node id="5" posx="1391.8445078072455" posy="1155.6062730594231" width="461" height="236" side="bottom" fold="false" treesize="461" layout="Downwards" group="false">
-      <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="430" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
-      <nodename posx="1407.8445078072455" posy="1171.6062730594231" maxwidth="453.885498046875">
-        <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&#10;* tgbotapi.extensions.behaviour_builder">
-          <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="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="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="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="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="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="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)"/>
-            <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)"/>
-            <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)"/>
-            <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="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-            <range start="139" end="140" extra="rgb(255,0,0)"/>
-          </color>
-        </text>
-      </nodename>
-      <nodenote></nodenote>
-    </node>
-  </nodes>
-  <groups/>
-  <connections>
-    <connection from_id="2" to_id="5" drag_x="1475.8213347929195" drag_y="1014.8259945356604" color="#777777">
-      <style connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
-      <title></title>
-      <note></note>
-    </connection>
-    <connection from_id="4" to_id="5" drag_x="1691.5447998046875" drag_y="1107.00439453125" 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="5" drag_x="1483.48876953125" drag_y="896.18115234375">
-      <style connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
-      <title></title>
-      <note></note>
-    </connection>
-  </connections>
-  <stickers/>
-</minder>

badges/chat.svg

@@ -1,20 +0,0 @@
-<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>

badges/kdocs.svg

@@ -1,20 +0,0 @@
-<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>

badges/template.svg

@@ -1,20 +0,0 @@
-<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)">Bot</text>
-        <text x="175" y="140" transform="scale(.1)">Bot</text>
-        <text x="690" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)">Template</text>
-        <text x="690" y="140" transform="scale(.1)">Template</text>
-    </g>
-</svg>

build.gradle

@@ -1,7 +1,6 @@
 buildscript {
     repositories {
         mavenLocal()
-        jcenter()
         mavenCentral()
         maven { url "https://plugins.gradle.org/m2/" }
     }
@@ -18,6 +17,17 @@ 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 {

docs/build.gradle

@@ -1,7 +1,6 @@
 buildscript {
     repositories {
         mavenLocal()
-        jcenter()
         mavenCentral()
     }
 
@@ -20,13 +19,18 @@ plugins {
 
 repositories {
     mavenLocal()
-    jcenter()
     mavenCentral()
 }
 
 kotlin {
-    jvm()
-    js(BOTH) {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
         browser()
         nodejs()
     }
@@ -36,11 +40,17 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib')
 
-                rootProject.subprojects.forEach {
-                    if (it != project) {
-                        api it
-                    }
-                }
+                api project(":tgbotapi.core")
+                api project(":tgbotapi.api")
+                api project(":tgbotapi.utils")
+                api project(":tgbotapi.behaviour_builder")
+                api project(":tgbotapi.behaviour_builder.fsm")
+                api project(":tgbotapi")
+            }
+        }
+        jsMain {
+            dependencies {
+                api project(":tgbotapi.webapps")
             }
         }
     }
@@ -93,3 +103,8 @@ Object callback = {
 
 tasks.dokkaGfm(callback)
 tasks.dokkaHtml(callback)
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

docs/gradle.properties

@@ -1,3 +1 @@
-dokka_version=1.4.30
-
 org.gradle.jvmargs=-Xmx1024m

gradle.properties

@@ -5,18 +5,21 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true
 
-kotlin_version=1.4.32
-kotlin_coroutines_version=1.4.3
-kotlin_serialisation_runtime_version=1.1.0
-klock_version=2.0.7
-uuid_version=0.2.3
-ktor_version=1.5.2
+kotlin_version=1.6.10
+kotlin_coroutines_version=1.6.1
+kotlin_serialisation_runtime_version=1.3.2
+klock_version=2.7.0
+uuid_version=0.4.0
+ktor_version=1.6.8
 
-micro_utils_version=0.4.32
+micro_utils_version=0.9.24
 
 javax_activation_version=1.1.1
 
-library_group=dev.inmo
-library_version=0.33.2
 
-github_release_plugin_version=2.2.12
+dokka_version=1.6.10
+
+library_group=dev.inmo
+library_version=0.38.23
+
+github_release_plugin_version=2.3.7

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-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip

publish.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'maven-publish'
-apply plugin: 'signing'
 
 task javadocsJar(type: Jar) {
     classifier = 'javadoc'
@@ -10,8 +9,8 @@ publishing {
         artifact javadocsJar
 
         pom {
-            description = "This project just include all subproject of TelegramBotAPI"
-            name = "Telegram Bot API"
+            description = "${project.description}"
+            name = "${project.name}"
             url = "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI"
 
             scm {
@@ -62,8 +61,19 @@ publishing {
         }
     }
 }
-
-signing {
-    useGpgCmd()
-    sign publishing.publications
+    
+if (project.hasProperty("signing.gnupg.keyName")) {
+    apply plugin: 'signing'
+    
+    signing {
+        useGpgCmd()
+    
+        sign publishing.publications
+    }
+    
+    task signAll {
+        tasks.withType(Sign).forEach {
+            dependsOn(it)
+        }
+    }
 }

publish.kpsb

@@ -0,0 +1 @@
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","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/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

readmes/exceptions_handling.md

@@ -0,0 +1,97 @@
+# Exceptions handling
+
+Unfortunatelly, exceptions handling in this library is a bit difficult in some places, but that have at least two reasons: flexibility and usability.
+
+## "In place" handling
+
+In case you know, where exceptions are happening, you may use several tools for exceptions catching:
+
+* Catching with result
+* Catching with callback
+
+### Catching with result
+
+If you prefer to receive `Result` objects instead of some weird callbacks, you may use the next syntax:
+
+```kotlin
+safelyWithResult {
+    // do something
+}.onSuccess { // will be called if everything is right
+    // handle success
+}.onFailure { // will be called if something went wrong
+    // handle error
+    it.printStackTrace()
+}.getOrThrow() // will return value or throw exception
+```
+
+### Catching with callback
+
+Also there is more simple (in some cases) way to handle exceptions with callbacks:
+
+```kotlin
+safely(
+  {
+      // handle error
+      it.printStackTrace()
+      null // return value
+  }
+) {
+    // do something
+}
+```
+
+### Bonus: different types of handling
+
+There are two types of handling:
+
+* Just safely - when you are using something to obviously retrieve value or throw exception. When handling callback has been skipped, it will throw exception by default. For example:
+```kotlin
+safely(
+    {
+        it.printStackTrace()
+        "error"
+    }
+) {
+    error("Hi :)") // emulate exception throwing
+    "ok"
+} // result will be with type String
+```
+* Safely without exceptions - almost the same as `safely`, but this type by default allow to return nullable value (when exception was thrown) instead of just throwing (as with `safely`):
+```kotlin
+safelyWithouExceptions {
+    // do something
+} // will returns nullable result type
+```
+
+## Global exceptions handling
+
+The most simple way to configure exceptions handling is to change `CoroutineContext` when you are creating your `CoroutineScope` for bot processing:
+
+```kotlin
+val bot = telegramBot("TOKEN")
+
+bot.buildBehaviour (
+    scope = scope,
+    defaultExceptionsHandler = {
+        it.printStackTrace()
+    }
+) {
+    // ...
+}
+```
+
+OR
+
+```kotlin
+val bot = telegramBotWithBehaviour (
+    "TOKEN",
+    scope = scope,
+    defaultExceptionsHandler = {
+        it.printStackTrace()
+    }
+) {
+    // ...
+}
+```
+
+Here we have used `ContextSafelyExceptionHandler` class. It will pass default handling of exceptions and will call the block in most cases when something inside of your bot logic has thrown exception.

settings.gradle

@@ -8,13 +8,18 @@ pluginManagement {
     }
     repositories {
         gradlePluginPortal()
-        jcenter()
     }
 }
 
 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 ":tgbotapi.webapps"
 include ":docs"

tgbotapi.api/README.md

@@ -1,7 +1,6 @@
-# TelegramBotAPI extensions
+# TelegramBotAPI API extensions
 
-[![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)
+[![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)
 
 ## What is it?
 
@@ -17,10 +16,9 @@ This library always compatible with original `tgbotapi.core` library version
 
 Common ways to implement this library are presented here. In some cases it will require additional steps
 like inserting of additional libraries (like `kotlin stdlib`). In the examples will be used variable
-`telegrambotapi-extensions-api.version`, which must be set up by developer. Available versions are presented on
-[bintray](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api), next version is last published:
+`telegrambotapi-extensions-api.version`, which must be set up by developer.
 
-[![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.api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.api)
 
 ### Maven
 
@@ -29,7 +27,7 @@ Dependency config presented here:
 ```xml
 <dependency>
   <groupId>dev.inmo</groupId>
-  <artifactId>tgbotapi.extensions.api</artifactId>
+  <artifactId>tgbotapi.api</artifactId>
   <version>${telegrambotapi-extensions-api.version}</version>
 </dependency>
 ```
@@ -38,18 +36,18 @@ Dependency config presented here:
 
 To use last versions you will need to add one line in repositories block of your `build.gradle`:
 
-`jcenter()` or `mavenCentral()`
+`mavenCentral()`
 
 And add next line to your dependencies block:
 
 ```groovy
-implementation "dev.inmo:tgbotapi.extensions.api:$telegrambotapi_extensions_api_version"
+implementation "dev.inmo:tgbotapi.api:$telegrambotapi_extensions_api_version"
 ```
 
 or for old gradle:
 
 ```groovy
-compile "dev.inmo:tgbotapi.extensions.api:$telegrambotapi_extensions_api_version"
+compile "dev.inmo:tgbotapi.api:$telegrambotapi_extensions_api_version"
 ```
 
 ## Example of usage and comparison with `TelegramBotAPI`
@@ -71,7 +69,7 @@ val bot = telegramBot("IT IS YOUR TOKEN") {
 
 In all examples supposed that you have created bot.
 
-| tgbotapi.core | tgbotapi.extensions.api |
+| tgbotapi.core | tgbotapi.api |
 |---------------------|-------------------------------|
 | bot.execute(GetMe) |    bot.getMe()          |
 | bot.execute(SendTextMessage(someChatId, text)) | bot.sendTextMessage(chat, text) |
@@ -79,8 +77,8 @@ In all examples supposed that you have created bot.
 ## Updates
 
 **Currently, these paragraphs almost outdated due to the fact that extensions for listening of updates and webhooks were
-replaced into `tgbotapi.extensions.utils`. But, most part of information below is correct with small fixes and
-adding of `tgbotapi.extensions.utils` dependency.**
+replaced into `tgbotapi.utils`. But, most part of information below is correct with small fixes and
+adding of `tgbotapi.utils` dependency.**
 
 Usually, it is more comfortable to use filter object to get separated types of updates:
 

tgbotapi.api/build.gradle

@@ -0,0 +1,56 @@
+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"
+project.description = "API extensions with \"Telegram Bot API\"-like extensions for TelegramBot and RequestsExecutor"
+
+apply from: "../publish.gradle"
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+                api project(":tgbotapi.core")
+            }
+        }
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotBuilder.kt

@@ -40,8 +40,9 @@ data class BotBuilder internal constructor(
 fun buildBot(
     token: String,
     apiUrl: String = telegramBotAPIDefaultUrl,
+    testServer: Boolean = false,
     block: BotBuilder.() -> Unit
 ) = telegramBot(
-    TelegramAPIUrlsKeeper(token, apiUrl),
+    TelegramAPIUrlsKeeper(token, testServer, apiUrl),
     BotBuilder().apply(block).createHttpClient()
 )

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt

@@ -13,7 +13,7 @@ import io.ktor.client.engine.*
  */
 fun telegramBot(
     urlsKeeper: TelegramAPIUrlsKeeper,
-    client: HttpClient
+    client: HttpClient = HttpClient()
 ): TelegramBot = telegramBot(urlsKeeper) {
     this.client = client
 }
@@ -66,17 +66,19 @@ inline fun telegramBot(
 inline fun telegramBot(
     token: String,
     apiUrl: String = telegramBotAPIDefaultUrl,
-    client: HttpClient
-): TelegramBot = telegramBot(TelegramAPIUrlsKeeper(token, apiUrl), client)
+    testServer: Boolean = false,
+    client: HttpClient = HttpClient()
+): TelegramBot = telegramBot(TelegramAPIUrlsKeeper(token, testServer, apiUrl), client)
 
 @Suppress("NOTHING_TO_INLINE")
 inline fun <T: HttpClientEngineConfig> telegramBot(
     token: String,
     clientFactory: HttpClientEngineFactory<T>,
     apiUrl: String = telegramBotAPIDefaultUrl,
+    testServer: Boolean = false,
     noinline clientConfig: HttpClientConfig<T>.() -> Unit = {}
 ) = telegramBot(
-    TelegramAPIUrlsKeeper(token, apiUrl),
+    TelegramAPIUrlsKeeper(token, testServer, apiUrl),
     clientFactory,
     clientConfig
 )
@@ -90,9 +92,10 @@ inline fun telegramBot(
     token: String,
     clientEngine: HttpClientEngine,
     apiUrl: String = telegramBotAPIDefaultUrl,
+    testServer: Boolean = false,
     noinline clientConfig: HttpClientConfig<*>.() -> Unit = {}
 ) = telegramBot(
-    TelegramAPIUrlsKeeper(token, apiUrl),
+    TelegramAPIUrlsKeeper(token, testServer, apiUrl),
     clientEngine,
     clientConfig
 )
@@ -105,8 +108,9 @@ inline fun telegramBot(
 inline fun telegramBot(
     token: String,
     apiUrl: String = telegramBotAPIDefaultUrl,
+    testServer: Boolean = false,
     noinline clientConfig: HttpClientConfig<*>.() -> Unit
 ) = telegramBot(
-    TelegramAPIUrlsKeeper(token, apiUrl),
+    TelegramAPIUrlsKeeper(token, testServer, apiUrl),
     clientConfig
 )

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/ForwardMessage.kt

@@ -11,40 +11,46 @@ suspend fun TelegramBot.forwardMessage(
     fromChatId: ChatIdentifier,
     toChatId: ChatIdentifier,
     messageId: MessageIdentifier,
-    disableNotification: Boolean = false
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false
 ) = execute(
-    ForwardMessage(fromChatId, toChatId, messageId, disableNotification)
+    ForwardMessage(fromChatId, toChatId, messageId, disableNotification, protectContent)
 )
 
 suspend fun TelegramBot.forwardMessage(
     fromChat: Chat,
     toChatId: ChatIdentifier,
     messageId: MessageIdentifier,
-    disableNotification: Boolean = false
-) = forwardMessage(fromChat.id, toChatId, messageId, disableNotification)
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false
+) = forwardMessage(fromChat.id, toChatId, messageId, disableNotification, protectContent)
 
 suspend fun TelegramBot.forwardMessage(
     fromChatId: ChatIdentifier,
     toChat: Chat,
     messageId: MessageIdentifier,
-    disableNotification: Boolean = false
-) = forwardMessage(fromChatId, toChat.id, messageId, disableNotification)
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false
+) = forwardMessage(fromChatId, toChat.id, messageId, disableNotification, protectContent)
 
 suspend fun TelegramBot.forwardMessage(
     fromChat: Chat,
     toChat: Chat,
     messageId: MessageIdentifier,
-    disableNotification: Boolean = false
-) = forwardMessage(fromChat.id, toChat.id, messageId, disableNotification)
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false
+) = forwardMessage(fromChat.id, toChat.id, messageId, disableNotification, protectContent)
 
 suspend fun TelegramBot.forwardMessage(
     toChatId: ChatIdentifier,
     message: Message,
-    disableNotification: Boolean = false
-) = forwardMessage(message.chat, toChatId, message.messageId, disableNotification)
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false
+) = forwardMessage(message.chat, toChatId, message.messageId, disableNotification, protectContent)
 
 suspend fun TelegramBot.forwardMessage(
     toChat: Chat,
     message: Message,
-    disableNotification: Boolean = false
-) = forwardMessage(message.chat, toChat, message.messageId, disableNotification)
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false
+) = forwardMessage(message.chat, toChat, message.messageId, disableNotification, protectContent)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveLocationProvider.kt

@@ -21,6 +21,10 @@ 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,
@@ -44,6 +48,10 @@ class LiveLocationProvider internal constructor(
     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
@@ -69,6 +77,10 @@ class LiveLocationProvider internal constructor(
     }
 }
 
+/**
+ * @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,
@@ -79,6 +91,7 @@ suspend fun TelegramBot.startLiveLocation(
     initHeading: Degrees? = null,
     initProximityAlertRadius: Meters? = null,
     disableNotification: Boolean = false,
+    protectContent: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
@@ -94,6 +107,7 @@ suspend fun TelegramBot.startLiveLocation(
             initHeading,
             initProximityAlertRadius,
             disableNotification,
+            protectContent,
             replyToMessageId,
             allowSendingWithoutReply,
             replyMarkup
@@ -108,6 +122,10 @@ suspend fun TelegramBot.startLiveLocation(
     )
 }
 
+/**
+ * @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,
@@ -118,6 +136,7 @@ suspend fun TelegramBot.startLiveLocation(
     initHeading: Degrees? = null,
     initProximityAlertRadius: Meters? = null,
     disableNotification: Boolean = false,
+    protectContent: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
@@ -131,11 +150,16 @@ suspend fun TelegramBot.startLiveLocation(
     initHeading,
     initProximityAlertRadius,
     disableNotification,
+    protectContent,
     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,
@@ -145,6 +169,7 @@ suspend fun TelegramBot.startLiveLocation(
     initHeading: Degrees? = null,
     initProximityAlertRadius: Meters? = null,
     disableNotification: Boolean = false,
+    protectContent: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
@@ -158,11 +183,16 @@ suspend fun TelegramBot.startLiveLocation(
     initHeading,
     initProximityAlertRadius,
     disableNotification,
+    protectContent,
     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,
@@ -172,6 +202,7 @@ suspend fun TelegramBot.startLiveLocation(
     initHeading: Degrees? = null,
     initProximityAlertRadius: Meters? = null,
     disableNotification: Boolean = false,
+    protectContent: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
@@ -185,11 +216,16 @@ suspend fun TelegramBot.startLiveLocation(
     initHeading,
     initProximityAlertRadius,
     disableNotification,
+    protectContent,
     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,
@@ -200,6 +236,7 @@ suspend inline fun TelegramBot.replyWithLiveLocation(
     initHeading: Degrees? = null,
     initProximityAlertRadius: Meters? = null,
     disableNotification: Boolean = false,
+    protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = startLiveLocation(
@@ -212,11 +249,16 @@ suspend inline fun TelegramBot.replyWithLiveLocation(
     initHeading,
     initProximityAlertRadius,
     disableNotification,
+    protectContent,
     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,
@@ -226,6 +268,7 @@ suspend inline fun TelegramBot.replyWithLiveLocation(
     initHeading: Degrees? = null,
     initProximityAlertRadius: Meters? = null,
     disableNotification: Boolean = false,
+    protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = startLiveLocation(
@@ -237,6 +280,7 @@ suspend inline fun TelegramBot.replyWithLiveLocation(
     initHeading,
     initProximityAlertRadius,
     disableNotification,
+    protectContent,
     to.messageId,
     allowSendingWithoutReply,
     replyMarkup

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/StopPoll.kt

@@ -7,6 +7,10 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 
+/**
+ * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
+ * as a builder for that
+ */
 suspend fun TelegramBot.stopPoll(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
@@ -15,18 +19,30 @@ suspend fun TelegramBot.stopPoll(
     StopPoll(chatId, messageId, replyMarkup)
 )
 
+/**
+ * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
+ * as a builder for that
+ */
 suspend fun TelegramBot.stopPoll(
     chat: Chat,
     messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = stopPoll(chat.id, messageId, replyMarkup)
 
+/**
+ * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
+ * as a builder for that
+ */
 suspend fun TelegramBot.stopPoll(
     chatId: ChatId,
     message: Message,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = stopPoll(chatId, message.messageId, replyMarkup)
 
+/**
+ * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
+ * as a builder for that
+ */
 suspend fun TelegramBot.stopPoll(
     chat: Chat,
     message: Message,

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerCallbackQuery.kt

@@ -20,3 +20,11 @@ suspend fun TelegramBot.answerCallbackQuery(
     url: String? = null,
     cachedTimeSeconds: Int? = null
 ) = answerCallbackQuery(callbackQuery.id, text, showAlert, url, cachedTimeSeconds)
+
+suspend fun TelegramBot.answer(
+    callbackQuery: CallbackQuery,
+    text: String? = null,
+    showAlert: Boolean? = null,
+    url: String? = null,
+    cachedTimeSeconds: Int? = null
+) = answerCallbackQuery(callbackQuery.id, text, showAlert, url, cachedTimeSeconds)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerInlineQuery.kt

@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.answers
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.answers.AnswerInlineQuery
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery
+import dev.inmo.tgbotapi.types.InlineQueries.query.InlineQuery
 import dev.inmo.tgbotapi.types.InlineQueryIdentifier
 
 suspend fun TelegramBot.answerInlineQuery(
@@ -27,3 +27,13 @@ suspend fun TelegramBot.answerInlineQuery(
     switchPmText: String? = null,
     switchPmParameter: String? = null
 ) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
+
+suspend fun TelegramBot.answer(
+    inlineQuery: InlineQuery,
+    results: List<InlineQueryResult> = emptyList(),
+    cachedTime: Int? = null,
+    isPersonal: Boolean? = null,
+    nextOffset: String? = null,
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
+) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerWebAppQuery.kt

@@ -0,0 +1,16 @@
+package dev.inmo.tgbotapi.extensions.api.answers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.answers.AnswerWebAppQuery
+import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
+import dev.inmo.tgbotapi.types.WebAppQueryId
+
+suspend fun TelegramBot.answerWebAppQuery(
+    webAppQueryId: WebAppQueryId,
+    result: InlineQueryResult
+) = execute(AnswerWebAppQuery(webAppQueryId, result))
+
+suspend fun TelegramBot.answer(
+    webAppQueryId: WebAppQueryId,
+    result: InlineQueryResult
+) = execute(AnswerWebAppQuery(webAppQueryId, result))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/ClearMyDefaultAdministratorRights.kt

@@ -0,0 +1,13 @@
+package dev.inmo.tgbotapi.extensions.api.bot
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.bot.ClearMyDefaultAdministratorRights
+import dev.inmo.tgbotapi.types.ChatAdministratorRightsImpl
+
+suspend fun TelegramBot.clearMyDefaultAdministratorRights(
+    forChannels: Boolean? = null
+) = execute(ClearMyDefaultAdministratorRights(forChannels))
+
+suspend fun TelegramBot.clearMyDefaultAdministratorRightsForChannels() = clearMyDefaultAdministratorRights(forChannels = true)
+
+suspend fun TelegramBot.clearMyDefaultAdministratorRightsForGroupsAndSupergroups() = clearMyDefaultAdministratorRights(forChannels = false)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/DeleteMyCommands.kt

@@ -0,0 +1,17 @@
+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))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt

@@ -0,0 +1,17 @@
+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))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyDefaultAdministratorRights.kt

@@ -0,0 +1,12 @@
+package dev.inmo.tgbotapi.extensions.api.bot
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.bot.GetMyDefaultAdministratorRights
+
+suspend fun TelegramBot.getMyDefaultAdministratorRights(
+    forChannels: Boolean? = null
+) = execute(GetMyDefaultAdministratorRights(forChannels))
+
+suspend fun TelegramBot.getMyDefaultAdministratorRightsForChannels() = getMyDefaultAdministratorRights(forChannels = true)
+
+suspend fun TelegramBot.getMyDefaultAdministratorRightsForGroupsAndSupergroups() = getMyDefaultAdministratorRights(forChannels = false)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt

@@ -0,0 +1,32 @@
+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)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDefaultAdministratorRights.kt

@@ -0,0 +1,18 @@
+package dev.inmo.tgbotapi.extensions.api.bot
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.bot.SetMyDefaultAdministratorRights
+import dev.inmo.tgbotapi.types.ChatAdministratorRightsImpl
+
+suspend fun TelegramBot.setMyDefaultAdministratorRights(
+    rights: ChatAdministratorRightsImpl,
+    forChannels: Boolean? = null
+) = execute(SetMyDefaultAdministratorRights(rights, forChannels))
+
+suspend fun TelegramBot.setMyDefaultAdministratorRightsForChannels(
+    rights: ChatAdministratorRightsImpl
+) = setMyDefaultAdministratorRights(rights, forChannels = true)
+
+suspend fun TelegramBot.setMyDefaultAdministratorRightsForGroupsAndSupergroups(
+    rights: ChatAdministratorRightsImpl
+) = setMyDefaultAdministratorRights(rights, forChannels = false)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMemberCount.kt

@@ -1,14 +1,14 @@
 package dev.inmo.tgbotapi.extensions.api.chat.get
 
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.get.GetChatMembersCount
+import dev.inmo.tgbotapi.requests.chat.get.GetChatMemberCount
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 
-suspend fun TelegramBot.getChatMembersCount(
+suspend fun TelegramBot.getChatMemberCount(
     chatId: ChatIdentifier
-) = execute(GetChatMembersCount(chatId))
+) = execute(GetChatMemberCount(chatId))
 
-suspend fun TelegramBot.getChatMembersCount(
+suspend fun TelegramBot.getChatMemberCount(
     chat: PublicChat
-) = getChatMembersCount(chat.id)
+) = getChatMemberCount(chat.id)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMenuButton.kt

@@ -0,0 +1,15 @@
+package dev.inmo.tgbotapi.extensions.api.chat.get
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.get.GetChatMenuButton
+import dev.inmo.tgbotapi.requests.chat.modify.*
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PrivateChat
+
+suspend fun TelegramBot.getChatMenuButton(
+    chatId: ChatId
+) = execute(GetChatMenuButton(chatId))
+
+suspend fun TelegramBot.getChatMenuButton(
+    chat: PrivateChat
+) = getChatMenuButton(chat.id)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetDefaultChatMenuButton.kt

@@ -0,0 +1,8 @@
+package dev.inmo.tgbotapi.extensions.api.chat.get
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.get.GetDefaultChatMenuButton
+import dev.inmo.tgbotapi.requests.chat.modify.SetDefaultChatMenuButton
+import dev.inmo.tgbotapi.types.MenuButton
+
+suspend fun TelegramBot.getDefaultChatMenuButton() = execute(GetDefaultChatMenuButton)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/ApproveChatJoinRequest.kt

@@ -0,0 +1,39 @@
+package dev.inmo.tgbotapi.extensions.api.chat.invite_links
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.invite_links.ApproveChatJoinRequest
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
+import dev.inmo.tgbotapi.types.update.ChatJoinRequestUpdate
+
+suspend fun TelegramBot.approveChatJoinRequest(
+    chatId: ChatIdentifier,
+    userId: UserId
+) = execute(ApproveChatJoinRequest(chatId, userId))
+
+suspend fun TelegramBot.approveChatJoinRequest(
+    chat: PublicChat,
+    userId: UserId
+) = approveChatJoinRequest(chat.id, userId)
+
+suspend fun TelegramBot.approveChatJoinRequest(
+    chatId: ChatIdentifier,
+    user: User
+) = approveChatJoinRequest(chatId, user.id)
+
+suspend fun TelegramBot.approveChatJoinRequest(
+    chat: PublicChat,
+    user: User
+) = approveChatJoinRequest(chat.id, user.id)
+
+suspend fun TelegramBot.approveChatJoinRequest(
+    chatJoinRequest: ChatJoinRequest
+) = approveChatJoinRequest(chatJoinRequest.chat, chatJoinRequest.user)
+
+suspend fun TelegramBot.approve(
+    chatJoinRequest: ChatJoinRequest
+) = approveChatJoinRequest(chatJoinRequest)
+
+suspend fun TelegramBot.approveChatJoinRequest(
+    chatJoinRequestUpdate: ChatJoinRequestUpdate
+) = approveChatJoinRequest(chatJoinRequestUpdate.data)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/CreateChatInviteLink.kt

@@ -0,0 +1,83 @@
+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.createChatInviteLinkUnlimited(
+    chatId: ChatIdentifier,
+    name: String? = null,
+    expiration: TelegramDate? = null
+) = execute(CreateChatInviteLink.unlimited(chatId, name, expiration))
+
+suspend fun TelegramBot.createChatInviteLinkUnlimited(
+    chat: PublicChat,
+    name: String? = null,
+    expiration: TelegramDate? = null,
+) = createChatInviteLinkUnlimited(chat.id, name, expiration)
+
+suspend fun TelegramBot.createChatInviteLinkUnlimited(
+    chatId: ChatIdentifier,
+    expiration: DateTime,
+    name: String? = null,
+) = createChatInviteLinkUnlimited(chatId, name, expiration.toTelegramDate())
+
+suspend fun TelegramBot.createChatInviteLinkUnlimited(
+    chat: PublicChat,
+    expiration: DateTime,
+    name: String? = null
+) = createChatInviteLinkUnlimited(chat.id, name, expiration.toTelegramDate())
+
+suspend fun TelegramBot.createChatInviteLinkWithLimitedMembers(
+    chatId: ChatIdentifier,
+    membersLimit: MembersLimit,
+    name: String? = null,
+    expiration: TelegramDate? = null
+) = execute(CreateChatInviteLink.withLimitedMembers(chatId, membersLimit, name, expiration))
+
+suspend fun TelegramBot.createChatInviteLinkWithLimitedMembers(
+    chat: PublicChat,
+    membersLimit: MembersLimit,
+    name: String? = null,
+    expiration: TelegramDate? = null,
+) = createChatInviteLinkWithLimitedMembers(chat.id, membersLimit, name, expiration)
+
+suspend fun TelegramBot.createChatInviteLinkWithLimitedMembers(
+    chatId: ChatIdentifier,
+    membersLimit: MembersLimit,
+    expiration: DateTime,
+    name: String? = null,
+) = createChatInviteLinkWithLimitedMembers(chatId, membersLimit, name, expiration.toTelegramDate())
+
+suspend fun TelegramBot.createChatInviteLinkWithLimitedMembers(
+    chat: PublicChat,
+    membersLimit: MembersLimit,
+    expiration: DateTime,
+    name: String? = null,
+) = createChatInviteLinkWithLimitedMembers(chat.id, membersLimit, name, expiration.toTelegramDate())
+
+suspend fun TelegramBot.createChatInviteLinkWithJoinRequest(
+    chatId: ChatIdentifier,
+    name: String? = null,
+    expiration: TelegramDate? = null
+) = execute(CreateChatInviteLink.withJoinRequest(chatId, name, expiration))
+
+suspend fun TelegramBot.createChatInviteLinkWithJoinRequest(
+    chat: PublicChat,
+    name: String? = null,
+    expiration: TelegramDate? = null,
+) = createChatInviteLinkWithJoinRequest(chat.id, name, expiration)
+
+suspend fun TelegramBot.createChatInviteLinkWithJoinRequest(
+    chatId: ChatIdentifier,
+    expiration: DateTime,
+    name: String? = null,
+) = createChatInviteLinkWithJoinRequest(chatId, name, expiration.toTelegramDate())
+
+suspend fun TelegramBot.createChatInviteLinkWithJoinRequest(
+    chat: PublicChat,
+    expiration: DateTime,
+    name: String? = null,
+) = createChatInviteLinkWithJoinRequest(chat.id, name, expiration.toTelegramDate())

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/DeclineChatJoinRequest.kt

@@ -0,0 +1,40 @@
+package dev.inmo.tgbotapi.extensions.api.chat.invite_links
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.invite_links.ApproveChatJoinRequest
+import dev.inmo.tgbotapi.requests.chat.invite_links.DeclineChatJoinRequest
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
+import dev.inmo.tgbotapi.types.update.ChatJoinRequestUpdate
+
+suspend fun TelegramBot.declineChatJoinRequest(
+    chatId: ChatIdentifier,
+    userId: UserId
+) = execute(DeclineChatJoinRequest(chatId, userId))
+
+suspend fun TelegramBot.declineChatJoinRequest(
+    chat: PublicChat,
+    userId: UserId
+) = declineChatJoinRequest(chat.id, userId)
+
+suspend fun TelegramBot.declineChatJoinRequest(
+    chatId: ChatIdentifier,
+    user: User
+) = declineChatJoinRequest(chatId, user.id)
+
+suspend fun TelegramBot.declineChatJoinRequest(
+    chat: PublicChat,
+    user: User
+) = declineChatJoinRequest(chat.id, user.id)
+
+suspend fun TelegramBot.declineChatJoinRequest(
+    chatJoinRequest: ChatJoinRequest
+) = declineChatJoinRequest(chatJoinRequest.chat, chatJoinRequest.user)
+
+suspend fun TelegramBot.decline(
+    chatJoinRequest: ChatJoinRequest
+) = declineChatJoinRequest(chatJoinRequest)
+
+suspend fun TelegramBot.declineChatJoinRequest(
+    chatJoinRequestUpdate: ChatJoinRequestUpdate
+) = declineChatJoinRequest(chatJoinRequestUpdate.data)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/EditChatInviteLink.kt

@@ -0,0 +1,183 @@
+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.editChatInviteLinkUnlimited(
+    chatId: ChatIdentifier,
+    previousLink: String,
+    name: String? = null,
+    expiration: TelegramDate? = null
+) = execute(EditChatInviteLink.unlimited(chatId, previousLink, name, expiration))
+
+suspend fun TelegramBot.editChatInviteLinkUnlimited(
+    chat: PublicChat,
+    previousLink: String,
+    name: String? = null,
+    expiration: TelegramDate? = null,
+) = editChatInviteLinkUnlimited(chat.id, previousLink, name, expiration)
+
+suspend fun TelegramBot.editChatInviteLinkUnlimited(
+    chatId: ChatIdentifier,
+    previousLink: String,
+    expiration: DateTime,
+    name: String? = null,
+) = editChatInviteLinkUnlimited(chatId, previousLink, name , expiration.toTelegramDate())
+
+suspend fun TelegramBot.editChatInviteLinkUnlimited(
+    chat: PublicChat,
+    previousLink: String,
+    expiration: DateTime,
+    name: String? = null,
+) = editChatInviteLinkUnlimited(chat.id, previousLink, name , expiration.toTelegramDate())
+
+suspend fun TelegramBot.editChatInviteLinkWithLimitedMembers(
+    chatId: ChatIdentifier,
+    previousLink: String,
+    membersLimit: MembersLimit,
+    name: String? = null,
+    expiration: TelegramDate? = null
+) = execute(EditChatInviteLink.withLimitedMembers(chatId, previousLink, membersLimit, name, expiration))
+
+suspend fun TelegramBot.editChatInviteLinkWithLimitedMembers(
+    chat: PublicChat,
+    previousLink: String,
+    membersLimit: MembersLimit,
+    name: String? = null,
+    expiration: TelegramDate? = null,
+) = editChatInviteLinkWithLimitedMembers(chat.id, previousLink, membersLimit, name, expiration)
+
+suspend fun TelegramBot.editChatInviteLinkWithLimitedMembers(
+    chatId: ChatIdentifier,
+    previousLink: String,
+    membersLimit: MembersLimit,
+    expiration: DateTime,
+    name: String? = null,
+) = editChatInviteLinkWithLimitedMembers(chatId, previousLink, membersLimit, name , expiration.toTelegramDate())
+
+suspend fun TelegramBot.editChatInviteLinkWithLimitedMembers(
+    chat: PublicChat,
+    previousLink: String,
+    membersLimit: MembersLimit,
+    expiration: DateTime,
+    name: String? = null,
+) = editChatInviteLinkWithLimitedMembers(chat.id, previousLink, membersLimit, name , expiration.toTelegramDate())
+
+suspend fun TelegramBot.editChatInviteLinkWithJoinRequest(
+    chatId: ChatIdentifier,
+    previousLink: String,
+    name: String? = null,
+    expiration: TelegramDate? = null
+) = execute(EditChatInviteLink.withJoinRequest(chatId, previousLink, name, expiration))
+
+suspend fun TelegramBot.editChatInviteLinkWithJoinRequest(
+    chat: PublicChat,
+    previousLink: String,
+    name: String? = null,
+    expiration: TelegramDate? = null,
+) = editChatInviteLinkWithJoinRequest(chat.id, previousLink, name, expiration)
+
+suspend fun TelegramBot.editChatInviteLinkWithJoinRequest(
+    chatId: ChatIdentifier,
+    previousLink: String,
+    expiration: DateTime,
+    name: String? = null,
+) = editChatInviteLinkWithJoinRequest(chatId, previousLink, name , expiration.toTelegramDate())
+
+suspend fun TelegramBot.editChatInviteLinkWithJoinRequest(
+    chat: PublicChat,
+    previousLink: String,
+    expiration: DateTime,
+    name: String? = null,
+) = editChatInviteLinkWithJoinRequest(chat.id, previousLink, name , expiration.toTelegramDate())
+
+suspend fun TelegramBot.editChatInviteLinkUnlimited(
+    chatId: ChatIdentifier,
+    previousLink: ChatInviteLink,
+    name: String? = null,
+    expiration: TelegramDate? = null
+) = editChatInviteLinkUnlimited(chatId, previousLink.inviteLink, name, expiration)
+
+suspend fun TelegramBot.editChatInviteLinkUnlimited(
+    chat: PublicChat,
+    previousLink: ChatInviteLink,
+    name: String? = null,
+    expiration: TelegramDate? = null,
+) = editChatInviteLinkUnlimited(chat.id, previousLink, name, expiration)
+
+suspend fun TelegramBot.editChatInviteLinkUnlimited(
+    chatId: ChatIdentifier,
+    previousLink: ChatInviteLink,
+    expiration: DateTime,
+    name: String? = null,
+) = editChatInviteLinkUnlimited(chatId, previousLink, name, expiration.toTelegramDate())
+
+suspend fun TelegramBot.editChatInviteLinkUnlimited(
+    chat: PublicChat,
+    previousLink: ChatInviteLink,
+    expiration: DateTime,
+    name: String? = null,
+) = editChatInviteLinkUnlimited(chat.id, previousLink, name , expiration.toTelegramDate())
+
+suspend fun TelegramBot.editChatInviteLinkWithLimitedMembers(
+    chatId: ChatIdentifier,
+    previousLink: ChatInviteLink,
+    membersLimit: MembersLimit,
+    name: String? = null,
+    expiration: TelegramDate? = null
+) = editChatInviteLinkWithLimitedMembers(chatId, previousLink.inviteLink, membersLimit, name, expiration)
+
+suspend fun TelegramBot.editChatInviteLinkWithLimitedMembers(
+    chat: PublicChat,
+    previousLink: ChatInviteLink,
+    membersLimit: MembersLimit,
+    name: String? = null,
+    expiration: TelegramDate? = null,
+) = editChatInviteLinkWithLimitedMembers(chat.id, previousLink, membersLimit, name, expiration)
+
+suspend fun TelegramBot.editChatInviteLinkWithLimitedMembers(
+    chatId: ChatIdentifier,
+    previousLink: ChatInviteLink,
+    membersLimit: MembersLimit,
+    expiration: DateTime,
+    name: String? = null,
+) = editChatInviteLinkWithLimitedMembers(chatId, previousLink, membersLimit, name , expiration.toTelegramDate())
+
+suspend fun TelegramBot.editChatInviteLinkWithLimitedMembers(
+    chat: PublicChat,
+    previousLink: ChatInviteLink,
+    membersLimit: MembersLimit,
+    expiration: DateTime,
+    name: String? = null,
+) = editChatInviteLinkWithLimitedMembers(chat.id, previousLink, membersLimit, name , expiration.toTelegramDate())
+
+suspend fun TelegramBot.editChatInviteLinkWithJoinRequest(
+    chatId: ChatIdentifier,
+    previousLink: ChatInviteLink,
+    name: String? = null,
+    expiration: TelegramDate? = null
+) = editChatInviteLinkWithJoinRequest(chatId, previousLink.inviteLink, name, expiration)
+
+suspend fun TelegramBot.editChatInviteLinkWithJoinRequest(
+    chat: PublicChat,
+    previousLink: ChatInviteLink,
+    name: String? = null,
+    expiration: TelegramDate? = null,
+) = editChatInviteLinkWithJoinRequest(chat.id, previousLink, name, expiration)
+
+suspend fun TelegramBot.editChatInviteLinkWithJoinRequest(
+    chatId: ChatIdentifier,
+    previousLink: ChatInviteLink,
+    expiration: DateTime,
+    name: String? = null,
+) = editChatInviteLinkWithJoinRequest(chatId, previousLink, name , expiration.toTelegramDate())
+
+suspend fun TelegramBot.editChatInviteLinkWithJoinRequest(
+    chat: PublicChat,
+    previousLink: ChatInviteLink,
+    expiration: DateTime,
+    name: String? = null,
+) = editChatInviteLinkWithJoinRequest(chat.id, previousLink, name , expiration.toTelegramDate())

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/BanChatMember.kt

@@ -1,34 +1,34 @@
 package dev.inmo.tgbotapi.extensions.api.chat.members
 
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.members.KickChatMember
+import dev.inmo.tgbotapi.requests.chat.members.BanChatMember
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 
-suspend fun TelegramBot.kickChatMember(
+suspend fun TelegramBot.banChatMember(
     chatId: ChatIdentifier,
     userId: UserId,
     untilDate: TelegramDate? = null,
     revokeMessages: Boolean? = null
-) = execute(KickChatMember(chatId, userId, untilDate, revokeMessages))
+) = execute(BanChatMember(chatId, userId, untilDate, revokeMessages))
 
-suspend fun TelegramBot.kickChatMember(
+suspend fun TelegramBot.banChatMember(
     chat: PublicChat,
     userId: UserId,
     untilDate: TelegramDate? = null,
     revokeMessages: Boolean? = null
-) = kickChatMember(chat.id, userId, untilDate, revokeMessages)
+) = banChatMember(chat.id, userId, untilDate, revokeMessages)
 
-suspend fun TelegramBot.kickChatMember(
+suspend fun TelegramBot.banChatMember(
     chatId: ChatId,
     user: User,
     untilDate: TelegramDate? = null,
     revokeMessages: Boolean? = null
-) = kickChatMember(chatId, user.id, untilDate, revokeMessages)
+) = banChatMember(chatId, user.id, untilDate, revokeMessages)
 
-suspend fun TelegramBot.kickChatMember(
+suspend fun TelegramBot.banChatMember(
     chat: PublicChat,
     user: User,
     untilDate: TelegramDate? = null,
     revokeMessages: Boolean? = null
-) = kickChatMember(chat.id, user.id, untilDate, revokeMessages)
+) = banChatMember(chat.id, user.id, untilDate, revokeMessages)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/BanChatSenderChat.kt

@@ -0,0 +1,27 @@
+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.requests.chat.members.BanChatSenderChat
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
+
+suspend fun TelegramBot.banChatSenderChat(
+    chatId: ChatIdentifier,
+    senderChatId: ChatId
+) = execute(BanChatSenderChat(chatId, senderChatId))
+
+suspend fun TelegramBot.banChatSenderChat(
+    chat: PublicChat,
+    senderChatId: ChatId
+) = banChatSenderChat(chat.id, senderChatId)
+
+suspend fun TelegramBot.banChatSenderChat(
+    chatId: ChatId,
+    senderChat: PublicChat
+) = banChatSenderChat(chatId, senderChat.id)
+
+suspend fun TelegramBot.banChatSenderChat(
+    chat: PublicChat,
+    senderChat: PublicChat,
+) = banChatSenderChat(chat.id, senderChat)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatMember.kt

@@ -18,7 +18,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
     canPromoteMembers: Boolean? = null,
-    canManageVoiceChats: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
     canManageChat: Boolean?
 ) = execute(
     PromoteChatMember(
@@ -34,7 +34,7 @@ suspend fun TelegramBot.promoteChatMember(
         canRestrictMembers,
         canPinMessages,
         canPromoteMembers,
-        canManageVoiceChats,
+        canManageVideoChats,
         canManageChat
     )
 )
@@ -52,7 +52,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
     canPromoteMembers: Boolean? = null,
-    canManageVoiceChats: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null
 ) = promoteChatMember(
     chat.id,
@@ -67,7 +67,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers,
     canPinMessages,
     canPromoteMembers,
-    canManageVoiceChats,
+    canManageVideoChats,
     canManageChat
 )
 
@@ -84,7 +84,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
     canPromoteMembers: Boolean? = null,
-    canManageVoiceChats: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null
 ) = promoteChatMember(
     chatId,
@@ -99,7 +99,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers,
     canPinMessages,
     canPromoteMembers,
-    canManageVoiceChats,
+    canManageVideoChats,
     canManageChat
 )
 
@@ -116,7 +116,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
     canPromoteMembers: Boolean? = null,
-    canManageVoiceChats: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null
 ) = promoteChatMember(
     chat.id,
@@ -131,6 +131,6 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers,
     canPinMessages,
     canPromoteMembers,
-    canManageVoiceChats,
+    canManageVideoChats,
     canManageChat
 )

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/UnbanChatSenderChat.kt

@@ -0,0 +1,26 @@
+package dev.inmo.tgbotapi.extensions.api.chat.members
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.members.*
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
+
+suspend fun TelegramBot.unbanChatSenderChat(
+    chatId: ChatIdentifier,
+    senderChatId: ChatId
+) = execute(UnbanChatSenderChat(chatId, senderChatId))
+
+suspend fun TelegramBot.unbanChatSenderChat(
+    chat: PublicChat,
+    senderChatId: ChatId
+) = unbanChatSenderChat(chat.id, senderChatId)
+
+suspend fun TelegramBot.unbanChatSenderChat(
+    chatId: ChatId,
+    senderChat: PublicChat
+) = unbanChatSenderChat(chatId, senderChat.id)
+
+suspend fun TelegramBot.unbanChatSenderChat(
+    chat: PublicChat,
+    senderChat: PublicChat,
+) = unbanChatSenderChat(chat.id, senderChat)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatMenuButton.kt

@@ -0,0 +1,16 @@
+package dev.inmo.tgbotapi.extensions.api.chat.modify
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.modify.*
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PrivateChat
+
+suspend fun TelegramBot.setChatMenuButton(
+    chatId: ChatId,
+    menuButton: MenuButton
+) = execute(SetChatMenuButton(chatId, menuButton))
+
+suspend fun TelegramBot.setChatMenuButton(
+    chat: PrivateChat,
+    menuButton: MenuButton
+) = setChatMenuButton(chat.id, menuButton)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetDefaultChatMenuButton.kt

@@ -0,0 +1,9 @@
+package dev.inmo.tgbotapi.extensions.api.chat.modify
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.modify.SetDefaultChatMenuButton
+import dev.inmo.tgbotapi.types.MenuButton
+
+suspend fun TelegramBot.setDefaultChatMenuButton(
+    menuButton: MenuButton
+) = execute(SetDefaultChatMenuButton(menuButton))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/EditChatMessageLiveLocation.kt

@@ -9,6 +9,10 @@ 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,
@@ -24,6 +28,10 @@ suspend fun TelegramBot.editLiveLocation(
     )
 )
 
+/**
+ * @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,
@@ -35,6 +43,10 @@ suspend fun TelegramBot.editLiveLocation(
     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,
@@ -45,6 +57,10 @@ suspend fun TelegramBot.editLiveLocation(
     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,
@@ -56,6 +72,10 @@ suspend fun TelegramBot.editLiveLocation(
     )
 )
 
+/**
+ * @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,
@@ -63,6 +83,10 @@ suspend fun TelegramBot.editLiveLocation(
     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,

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/StopChatMessageLiveLocation.kt

@@ -9,6 +9,10 @@ import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 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.stopLiveLocation(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
@@ -19,12 +23,20 @@ suspend fun TelegramBot.stopLiveLocation(
     )
 )
 
+/**
+ * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
+ * as a builder for that
+ */
 suspend fun TelegramBot.stopLiveLocation(
     chat: Chat,
     messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = stopLiveLocation(chat.id, messageId, replyMarkup)
 
+/**
+ * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
+ * as a builder for that
+ */
 suspend fun TelegramBot.stopLiveLocation(
     message: ContentMessage<LocationContent>,
     replyMarkup: InlineKeyboardMarkup? = null

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/StopInlineMessageLiveLocation.kt

@@ -5,6 +5,10 @@ import dev.inmo.tgbotapi.requests.edit.LiveLocation.StopInlineMessageLiveLocatio
 import dev.inmo.tgbotapi.types.InlineMessageIdentifier
 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.stopLiveLocation(
     inlineMessageId: InlineMessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt

@@ -8,6 +8,10 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 
+/**
+ * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
+ * as a builder for that
+ */
 suspend fun TelegramBot.editMessageReplyMarkup(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
@@ -16,12 +20,20 @@ suspend fun TelegramBot.editMessageReplyMarkup(
     EditChatMessageReplyMarkup(chatId, messageId, replyMarkup)
 )
 
+/**
+ * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
+ * as a builder for that
+ */
 suspend fun TelegramBot.editMessageReplyMarkup(
     chat: Chat,
     messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageReplyMarkup(chat.id, messageId, replyMarkup)
 
+/**
+ * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
+ * as a builder for that
+ */
 suspend fun TelegramBot.editMessageReplyMarkup(
     message: Message,
     replyMarkup: InlineKeyboardMarkup? = null

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt

@@ -5,6 +5,10 @@ import dev.inmo.tgbotapi.requests.edit.ReplyMarkup.EditInlineMessageReplyMarkup
 import dev.inmo.tgbotapi.types.InlineMessageIdentifier
 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.editMessageReplyMarkup(
     inlineMessageId: InlineMessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditChatMessageCaption.kt

@@ -1,10 +1,11 @@
 package dev.inmo.tgbotapi.extensions.api.edit.caption
 
-import dev.inmo.tgbotapi.CommonAbstracts.CaptionedInput
-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
+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
@@ -12,6 +13,10 @@ 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,
@@ -22,6 +27,10 @@ suspend fun TelegramBot.editMessageCaption(
     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,
@@ -30,24 +39,36 @@ suspend fun TelegramBot.editMessageCaption(
     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 : CaptionedInput, T : MediaContent {
+): 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: List<TextSource>,
+    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,
@@ -55,10 +76,14 @@ suspend fun TelegramBot.editMessageCaption(
     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 : CaptionedInput, T : MediaContent {
+): ContentMessage<MediaContent> where T : TextedWithTextSources, T : MediaContent {
     return editMessageCaption(message.chat.id, message.messageId, entities, replyMarkup)
 }

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditInlineMessageCaption.kt

@@ -1,12 +1,16 @@
 package dev.inmo.tgbotapi.extensions.api.edit.caption
 
-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 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,
@@ -14,8 +18,12 @@ suspend fun TelegramBot.editMessageCaption(
     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: List<TextSource>,
+    entities: TextSourcesList,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(EditInlineMessageCaption(inlineMessageId, entities, replyMarkup))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditChatMessageMedia.kt

@@ -10,6 +10,10 @@ 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.editMessageMedia(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
@@ -19,6 +23,10 @@ suspend fun TelegramBot.editMessageMedia(
     EditChatMessageMedia(chatId, messageId, media, replyMarkup)
 )
 
+/**
+ * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
+ * as a builder for that
+ */
 suspend fun TelegramBot.editMessageMedia(
     chat: Chat,
     messageId: MessageIdentifier,
@@ -26,6 +34,10 @@ suspend fun TelegramBot.editMessageMedia(
     replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageMedia(chat.id, messageId, media, replyMarkup)
 
+/**
+ * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
+ * as a builder for that
+ */
 suspend fun TelegramBot.editMessageMedia(
     message: ContentMessage<out MediaContent>,
     media: InputMedia,

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditInlineMessageMedia.kt

@@ -6,6 +6,10 @@ import dev.inmo.tgbotapi.types.InlineMessageIdentifier
 import dev.inmo.tgbotapi.types.InputMedia.InputMedia
 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,
     media: InputMedia,

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditChatMessageText.kt

@@ -1,9 +1,9 @@
 package dev.inmo.tgbotapi.extensions.api.edit.text
 
-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 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
@@ -11,6 +11,10 @@ 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,
@@ -22,6 +26,10 @@ suspend fun TelegramBot.editMessageText(
     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,
@@ -31,6 +39,10 @@ suspend fun TelegramBot.editMessageText(
     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,
@@ -39,27 +51,39 @@ suspend fun TelegramBot.editMessageText(
     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: List<TextSource>,
+    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: List<TextSource>,
+    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: List<TextSource>,
+    entities: TextSourcesList,
     disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(message.chat.id, message.messageId, entities, disableWebPagePreview, replyMarkup)
+) = editMessageText(message.chat.id, message.messageId, entities, disableWebPagePreview, replyMarkup)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditInlineMessageText.kt

@@ -1,12 +1,16 @@
 package dev.inmo.tgbotapi.extensions.api.edit.text
 
-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 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,
@@ -15,9 +19,13 @@ suspend fun TelegramBot.editMessageText(
     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: List<TextSource>,
+    entities: TextSourcesList,
     disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(EditInlineMessageText(inlineMessageId, entities, disableWebPagePreview, replyMarkup))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFile.kt

@@ -1,4 +1,4 @@
-package dev.inmo.tgbotapi.extensions.api
+package dev.inmo.tgbotapi.extensions.api.files
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo
@@ -6,6 +6,7 @@ import dev.inmo.tgbotapi.requests.DownloadFile
 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.downloadFile(
     filePath: String
@@ -15,8 +16,8 @@ suspend fun TelegramBot.downloadFile(
 
 suspend fun TelegramBot.downloadFile(
     pathedFile: PathedFile
-): ByteArray = execute(
-    DownloadFile(pathedFile.filePath)
+): ByteArray = downloadFile(
+    pathedFile.filePath
 )
 
 suspend fun TelegramBot.downloadFile(
@@ -30,3 +31,9 @@ suspend fun TelegramBot.downloadFile(
 ): ByteArray = downloadFile(
     getFileAdditionalInfo(file)
 )
+
+suspend fun TelegramBot.downloadFile(
+    file: MediaContent
+): ByteArray = downloadFile(
+    getFileAdditionalInfo(file.media)
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFileStream.kt

@@ -0,0 +1,28 @@
+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))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFileStreamAllocator.kt

@@ -0,0 +1,29 @@
+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))