add exceptions handling readme

2025-11-16 20:10:18 +00:00 · 2022-01-11 21:21:31 +06:00
893 changed files with 8759 additions and 29257 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,3 @@
 # These are supported funding model platforms

-custom: ['https://www.tinkoff.ru/rm/ovsyannikov.aleksey113/ObMJ712472', 'https://boosty.to/insanusmokrassar']
+custom: ['https://www.tinkoff.ru/rm/ovsyannikov.aleksey113/ObMJ712472']
--- a/.github/workflows/kdocs.yml
+++ b/.github/workflows/kdocs.yml
@@ -10,12 +10,12 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-java@v1
        with:
-          java-version: 11
+          java-version: 1.8
      - name: Build
-        run: ./gradlew dokkaHtmlMultiModule
+        run: ./gradlew dokkaHtml
      - name: Publish KDocs
        uses: peaceiris/actions-gh-pages@v3
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./build/dokka/htmlMultiModule
+          publish_dir: ./docs/build/dokka/html
          publish_branch: kdocs
--- a/.github/workflows/packages_publishing.yml
+++ b/.github/workflows/packages_publishing.yml
@@ -7,27 +7,21 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-java@v1
        with:
-          java-version: 11
-      - name: Setup LibCurl
-        run: sudo apt install -y libcurl4-openssl-dev
+          java-version: 1.8
+      - name: Fix android 31.0.0 dx
+        continue-on-error: true
+        run: cd /usr/local/lib/android/sdk/build-tools/31.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
      - name: Rewrite version
        run: |
          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
          cat gradle.properties | sed -e "s/^library_version=\([0-9\.]*\)/library_version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp
          rm gradle.properties
          mv gradle.properties.tmp gradle.properties
-      - name: KotlinSymbolProcessing execution
-        run: ./gradlew ksp
      - name: Build
        run: ./gradlew build
-      - name: Publish to Gitea
+      - name: Publish
        continue-on-error: true
-        run: ./gradlew publishAllPublicationsToGiteaRepository
-        env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-      - name: Publish to GithubPackages
-        continue-on-error: true
-        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel
+        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication
        env:
          GITHUBPACKAGES_USER: ${{ github.actor }}
          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,828 +1,5 @@
 # TelegramBotAPI changelog

-## 8.0.1
-
-* `Version`:
-    * `UUID`: `0.7.0` -> `0.7.1`
-    * `Ktor`: `2.3.0` -> `2.3.1`
-    * `MicroUtils`: `0.19.1` -> `0.19.2`
-
-## 8.0.0
-
-**THIS UPDATE CONTAINS BREAKING CHANGES**
-
-**ALL PROJECT DEPRECATIONS HAVE BEEN REMOVED**
-
-**IN THIS UPDATE KORLIBS HAVE BEEN UPDATED TO VERSION `4.0.2`. SINCE THAT VERSION A LOT OF PACKAGES HAVE BEEN RENAMED.
-MIGRATIONS USED IN THIS LIB:**
-
-* `com.soywiz.klock` -> `korlibs.time`
-* `com.soywiz.krypto` -> `korlibs.crypto`
-
-* `Versions`:
-    * `Korlibs`: `3.4.0` -> `4.0.3`
-    * `MicroUtils`: `0.18.4` -> `0.19.1`
-
-## 7.1.3
-
-* `Versions`:
-    * `Serialization`: `1.5.0` -> `1.5.1`
-    * `MicroUtils`: `0.18.1` -> `0.18.4`
-* `Core`:
-    * Actualize kdocs in `InputFile`
-* `BehaviourBuilder`:
-    * Now it is possible to use `waitMediaContent`/`waitMediaContentMessage`/`onMediaContent`
-    * Add `onMention`/`waitMention` functionality
-    * Add opportunity to map content with extensions to `Flow`
-
-## 7.1.2
-
-* `Versions`:
-  * `MicroUtils`: `0.18.0` -> `0.18.1`
-* `Core`:
-    * Now it is possible to serialize `Sticker`s
-
-## 7.1.1
-
-* `Versions`:
-  * `Kotlin`: `1.8.20` -> `1.8.21`
-  * `MicroUtils`: `0.17.8` -> `0.18.0`
-* `Utils`:
-    * Fixes in `makeLinkToMessage`
-
-## 7.1.0
-
-**This update contains changes according to the [Telegram Bot API 6.7](https://core.telegram.org/bots/api-changelog#april-21-2023)**
-
-* `API`:
-    * Rename `editMessageCaption` to `editMessageMedia` due to wrong old naming
-    * Add `edit` extensions for `InlineMessageIdentifier`s
-* `BehaviourBuilder`:
-    * `BehaviourContext` extensions `onDeepLink` and `waitDeepLinks` now can be used with `Regex` or `String` as first parameters
-
-## 7.0.2
-
-_This update brings experimental support of `linuxX64` and `mingwX64` platforms_
-
-* `Versions`:
-    * `Kotlin`: `1.8.10` -> `1.8.20`
-    * `MicroUtils`: `0.17.5` -> `0.17.8`
-    * `Ktor`: `2.2.4` -> `2.3.0`
-* `Core`:
-    * New `RequestsExecutor` - `MultipleClientKtorRequestsExecutor`
-    * Old `KtorRequestsExecutor` has been renamed to `DefaultKtorRequestsExecutor`
-    * `KtorRequestsExecutor` now is `expect class`
-        * On `JS`, `JVM` and `MinGWX64` platforms it is `DefaultKtorRequestsExecutor`
-        * On `LinuxX64` platform it is `MultipleClientKtorRequestsExecutor`
-
-## 7.0.1
-
-* `Core`:
-    * New interface `WithChat` which contains `chat` field
-        * `Message` now inherits `WithChat`
-        * `ChatMemberUpdated` now inherits `WithChat`
-* `Utils`:
-    * Improvements in `same`-notations
-
-## 7.0.0
-
-This update contains support of [Telegram Bot API 6.6](https://core.telegram.org/bots/api-changelog#march-9-2023)
-
-**THIS VERSION CONTAINS BREAKING CHANGES**:
-
-* All previous deprecations have been removed
-* Fully reworked mechanism of stickers creating and adding
-    * All separations of stickers types like `Animeted` have been replaces with type `StickerFormat`
-    * New `InputSticker` type (and all subtypes) as replacements for old raw fields in methods
-* Reworked mechanism of files uploading
-
-Other changes
-
-* `Versions`:
-  * `MicroUtils`: `0.17.3` -> `0.17.5`
-
-## 6.1.0
-
-* `Versions`:
-  * `MicroUtils`: `0.17.2` -> `0.17.3`
-* `API`:
-    * Fix of [#732](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/732)
-
-## 6.0.3
-
-* `Versions`:
-    * `MicroUtils`: `0.17.1` -> `0.17.2`
-* `Core`:
-    * `User` in `CallbackQuery` now is `CommonUser` as well as in `from`
-    * `User` in `InlineQuery` now is `CommonUser` as well as in `from`
-* `BehaviourBuilder`:
-    * Fixes in `DeepLink` triggers and waiters
-
-## 6.0.2
-
-* `Core`:
-    * Long polling now uses media groups debounce as in webhooks
-
-## 6.0.1
-
-* `Versions`:
-    * `Ktor`: `2.2.3` -> `2.2.4`
-    * `MicroUtils`: `0.17.0` -> `0.17.1`
-
-## 6.0.0
-
-* `Versions`:
-    * `Kotlin`: `1.7.22` -> `1.8.10`
-    * `MicroUtils`: `0.16.10` -> `0.17.0`
-    * `Serialization`: `1.4.1` -> `1.5.0`
-    * `uuid`: `0.6.0` -> `0.7.0`
-* `Core`:
-    * `*.link` extensions have been deprecated with renaming to avoid collisions with `link` methods
-* `API`:
-    * Add `TelegramBot.resend` methods
-* `BehaviourBuilder`:
-    * Add triggers and waiters for `VisualMediaGroupPartContent`
-* `Utils`:
-    * `*.link` extensions have been deprecated with renaming to avoid collisions with `link` methods
-
-## 5.2.1
-
-* `Core`:
-    * All the `CallbackQuery`es now will receive `CommonUser` instead of `User` due inability of bots to trigger any
-      inline interaction with others bots
-* `API`:
-    * Now `sentMessageFlow` will take each sent message in `handleLiveLocation`
-
-## 5.2.0
-
-* `Versions`:
-    * `MicroUtils`: `0.16.8` -> `0.16.10`
-
-## 5.1.1
-
-* `Core`:
-    * Add opportunity to get user link with `makeUserLink`
-* `BehaviourBuilder`:
-    * Fixes in content waiting expectators
-
-## 5.1.0
-
-[Bot API 6.5](https://core.telegram.org/bots/api-changelog#february-3-2023) support
-
-* `Core`:
-    * `ChatPermissions` now is interface and have two main realizations: `ChatPermissions.Granular` and
-      `ChatPermissions.Common`
-    * `RestrictedChatMember` now implements `ChatPermissions` too
-* `API`:
-    * Now it is possible to pass all long polling parameters in all places used it
-* `Issues`:
-    * Fix of [#697](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/697)
-
-## 5.0.2
-
-* `Versions`:
-    * `MicroUtils`: `0.16.6` -> `0.16.8`
-    * `Ktor`: `2.2.2` -> `2.2.3`
-* `BehaviourBuilder`:
-    * Fixes in `BehaviourContext.onEditedContentMessage` - now it will trigger callback on channel post edits too
-
-## 5.0.1
-
-* `Versions`:
-    * `MicroUtils`: `0.16.4` -> `0.16.6`
-    * `Ktor`: `2.2.1` -> `2.2.2`
-* `Core`:
-    * Fixes in `SendMediaGroup` request
-    * Fixes in `SetChatAdministratorCustomTitle` request (thanks to [@madhead](https://github.com/madhead))
-
-## 5.0.0
-
-[Bot API 6.4](https://core.telegram.org/bots/api-changelog#december-30-2022) support!
-
-* Long-polling improvements
-
-## 4.2.4
-
-* `Core`:
-    * Fixes in webhook parts adapter
-* `BehaviourBuilderWithFSM`:
-    * Fixes in `DefaultBehaviourContextWithFSM`
-
-## 4.2.3
-
-* `Versions`:
-  * `MicroUtils`: `0.16.2` -> `0.16.4`
-* `Core`:
-    * Simplify default `RequestsLimiter` (`ExceptionsOnlyLimiter`) (thanks to [@y9san9](https://github.com/y9san9) for help)
-
-## 4.2.2
-
-* `Versions`:
-    * `MicroUtils`: `0.16.0` -> `0.16.2`
-* `Core`:
-    * Fix of [#694](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/694): add opportunity to create `ChatId` and `ChatIdWithThreadId` from `IdChatIdentifier`
-
-## 4.2.1
-
-* `Versions`:
-    * `MicroUtils`: `0.15.0` -> `0.16.0`
-    * `Ktor`: `2.1.3` -> `2.2.1`
-* `Utils`:
-    * Improve support of `makeLinkToMessage` extensions
-
-## 4.2.0
-
-* `Versions`:
-    * `Kotlin`: `1.7.21` -> `1.7.22`
-    * `MicroUtils`: `0.14.4` -> `0.15.0`
-
-## 4.1.3
-
-* `Versions`:
-    * `MicroUtils`: `0.14.2` -> `0.14.4`
-* `Core`:
-    * `ContentMessage`, `CommonMessage`, `PossiblyMediaGroupMessage` and `PossiblySentViaBotCommonMessage` got `out`
-      variance
-    * `UserId` now is `ChatId` instead of `IdChatIdentififer`
-
-## 4.1.2
-
-* `Versions`:
-    * `MicroUtils`: `0.14.1` -> `0.14.2`
-* `BehaviourBuilder`:
-    * Fixes in `CallbackQuery` waiters
-
-## 4.1.1
-
-* `Core`:
-  * Add opportunity to create `IdChatIdentifier` with optional `threadId`
-  * New serializer `FullChatIdentifierSerializer` with serialization of `ChatIdWithThreadId`
-
-## 4.1.0
-
-* `Versions`:
-    * `Kotlin`: `1.7.20` -> `1.7.21`
-    * `MicroUtils`: `0.14.0` -> `0.14.1`
-    * `Korlibs`: `3.3.1` -> `3.4.0`
-    * `UUID`: `0.5.0` -> `0.6.0`
-* `Core`:
-  * All the chats identifiers has been rewritten as value classes
-  * New chat identifier: `ChatIdWithThreadId`
-  * `RawMessage` will create `ChatIdWithThreadId` chat id under the hood by default
-  * All the methods which potentially using `threadId` will try to take it from `chatId`
-* `API`:
-  * All default `threadId` null values has been replaced with auto-calculated threadId from chats/chat ids
-
-## 4.0.0
-
-**!!! THIS UPDATE CONTAINS FULL REWORK OF MEDIA GROUPS FUNCTIONALITY !!!**
-
-**THIS UPDATE CONTAINS BREAKING CHANGES**
-
-* `Common`:
-  * All the media groups have been rewritten. Since this update, there are no separated messages types for media groups,
-    but new type of content (`MediaGroupContent`) has been introduced
-  * [Bot API 6.3](https://core.telegram.org/bots/api-changelog#november-5-2022) support
-* `Versions`:
-  * `MicroUtils`: `0.13.2` -> `0.14.0`
-* `Core`:
-  * New requests
-
-## 3.3.1
-
-* `Versions`:
-    * `Ktor`: `2.1.2` -> `2.1.3`
-    * `Klock`: `3.2.0` -> `3.3.1`
-    * `MicroUtils`: `0.13.1` -> `0.13.2`
-* `Utils`:
-    * New extensions on `CommonMessage`: `hasCommands` and `hasNoCommands`. Useful for the `initialFilter` parameter in behaviour builder triggers.
-
-## 3.3.0
-
-**THIS VERSION CONTAINS UPGRADE KOTLIN (AND ALL RELATED LIBRARIES) UP TO 1.7.20**
-
-* `Versions`:
-    * `Kotlin`: `1.7.10` -> `1.7.20`
-    * `Kotlin Serialization`: `1.4.0` -> `1.4.1`
-    * `Korlibs`: `3.1.0` -> `3.2.0`
-    * `MicroUtils`: `0.12.17` -> `0.13.1`
-* `Core`:
-    * Add opportunity to create command text source and add command in entities builder
-      via `BotCommamd` (thanks to [d1shin](https://github.com/InsanusMokrassar/TelegramBotAPI/pull/664))
-* `API`:
-    * New extensions `TelegramBot#getStickerSetOrNull` and `TelegramBot#getStickerSetOrThrow`
-        * Old `TelegramBot#getStickerSet` has been deprecated
-* `Behaviour Builder`:
-    * Add opportunity to use triggers and waiters with `BotCommand` (thanks to [d1shin](https://github.com/InsanusMokrassar/TelegramBotAPI/pull/664))
-
-## 3.2.7
-
-* `Versions`:
-    * `MicroUtils`: `0.12.13` -> `0.12.17`
-    * `Ktor`: `2.1.1` -> `2.1.2`
-* `Utils`:
-  * Next classes become typealiases instead of classes:
-    * `ReplyKeyboardBuilder`
-    * `ReplyKeyboardRowBuilder`
-    * `InlineKeyboardBuilder`
-    * `InlineKeyboardRowBuilder`
-
-## 3.2.6
-
-* `Core`:
-    * Fixes in `ChatMemberSerializer#serialize` method
-    * Migration of `EntitiesBuilder` from `Utils` to `Core`
-* `API`:
-    * All the extensions related to text messages (replies, sending, editing) got their duplicates with `buildEntities` lambda and separator
-* `Utils`:
-    * Migration of `EntitiesBuilder` from `Utils` to `Core`
-
-## 3.2.5
-
-* `Common`:
-  * Improve support of new exceptions recovering mechanism
-
-## 3.2.4
-
-* `API`:
-    * New `edit`'s with chats and message ids
-
-## 3.2.3
-
-* `Core`:
-  * Fixes in `DeleteMyCommands`
-
-## 3.2.2
-
-* `Versions`:
-  * `MicroUtils`: `0.12.10` -> `0.12.13`
-* `Core`:
-  * `MessageIdentifier` has been renamed to `MessageId`
-* `API`:
-  * New `reply`'es with chats and message ids
-
-## 3.2.1
-
-* `Versions`:
-    * `Ktor`: `2.1.0` -> `2.1.1`
-    * `Korlibs`: `3.0.0` -> `3.1.0`
-    * `MicroUtils`: `0.12.4` -> `0.12.10`
-
-## 3.2.0
-
-**Since this update, `RequestsExecutor#execute` may throw only `BotException`. In case you wish to handle some exceptions from `execute` you must catch `BotException` and handle its `cause`**
-
-* `Versions`:
-    * `Serialization`: `1.4.0-RC` -> `1.4.0`
-    * `MicroUtils`: `0.12.1` -> `0.12.4`
-* `Core`:
-  * `SetWebhook#allowedUpdates` now is `ALL_UPDATES_LIST` by default instead of `null`
-* `API`:
-  * Extension `TelegramBot#setWebhook` parameter `allowedUpdates` now is `ALL_UPDATES_LIST` by default instead of `null`
-* `Utils`:
-  * All related to long polling extensions parameters `allowedUpdates` now are `ALL_UPDATES_LIST` by default instead of `null`
-
-## 3.1.1
-
-* `Common`:
-    * Complete Bot API 6.2 implementation
-
-## 3.1.0
-
-**This update contains including of Bot API 6.2**
-
-* `Versions`:
-    * `Ktor`: `2.0.3` -> `2.1.0`
-    * `MicroUtils`: `0.12.0` -> `0.12.1`
-* `Core`:
-  * Add support of `custom emoji`s
-  * Add support of `sticker_type`
-
-## 3.0.2
-
-**ALL OLD DEPRECATIONS HAVE BEEN REMOVED**
-
-**`copyMessage` HAVE CHANGED THEIR SIGNATURE BY SWAPPING FROM AND TO CHAT IDS**
-
-* `Versions`:
-  * `Kotlin`: `1.6.21` -> `1.7.10`
-  * `Serialization`: `1.3.3` -> `1.4.0-RC`
-  * `Korlibs`: `2.7.0` -> `3.0.0`
-  * `UUID`: `0.4.1` -> `0.5.0`
-  * `MicroUtils`: `0.11.13` -> `0.12.0`
-* `Core`:
-    * Interface `ReplyMakrup` has been renamed to `WithReplyMarkup` to correspond its purpose
-    * Data class `LeftChatMember` has been renamed to `LeftChatMemberEvent` to avoid type ambiguite with the other `LeftChatMember`
-    * `ForwardInfo` hierarchy has been fully reworked:
-      * `AnonymousForwardInfo` -> `ForwardInfo.ByAnonymous`
-      * `UserForwardInfo` -> `ForwardInfo.ByUser`
-      * `ForwardFromPublicChatInfo` -> `ForwardInfo.PublicChat`
-      * `ForwardFromChannelInfo` -> `ForwardInfo.PublicChat.FromChannel`
-      * `ForwardFromSupergroupInfo` -> `ForwardInfo.PublicChat.FromSupergroup`
-      * `ForwardInfo.PublicChat.SentByChannel` ___has been created___
-* `API`:
-    * Add new `Flow`-based live locations API
-    * Add `sendLocation` for sending live locations
-* `Utils`:
-  * **BREAKING CHANGES** Now all new classcasts (like `Chat.ifPrivateChat` etc.) have been rewritten to be generated with `ksp` and `kotlin poet`
-
-*Note: Versions 3.0.0 and 3.0.1 have been published with errors and didn't recommend to use*
-
-## 2.2.2
-
-* `Utils`:
-  * `buildEntities` now is inline
-* `Behaviour Builder`:
-  * Fixes in `CallbackQuery` triggers
-
-## 2.2.1
-
-* `Versions`:
-    * `Coroutines`: `1.6.3` -> `1.6.4`
-    * `MicroUtils`: `0.11.12` -> `0.11.13`
-* `Core`:
-    * New `typealiase`s for `CommonMessage` with all supported content types, more info: [PR](https://github.com/InsanusMokrassar/TelegramBotAPI/pull/629)
-* `Utils`:
-    * New extensions for all types of messages `*.withContentOrNull` and `*.withContentOrThrow` as analogies to the same ones from class casts
-
-## 2.2.0
-
-* `Core`:
-  * For `CopyMessage` order of parameters has been changed
-  * `ReplyForce` defaults changes:
-    * All old companion properties (like `ReplyForce.ReplyForceSelective`) have been renamed:
-      * `ReplyForceSelective` -> `Selective`
-      * `ReplyForceNonSelective` -> `NonSelective`
-      * `ReplyForceDefault` -> `Default`
-    * New companion functions:
-      * `ReplyForce#Selective`
-      * `ReplyForce#NonSelective`
-  * Rename `CreatorChatMember` -> `OwnerChatMember`
-* `API`:
-  * For `copyMessage` order of parameters has been changed
-* `Utils`:
-  * New extension `Message#sameChat`
-  * New extension `Message#sameMessage`
-  * New functions `flatInlineKeyboard` and `flatReplyKeyboard`
-  * Experimentally add new triple of class casts: `if*`, `*OrNull` and `*OrThrow`
-
-## 2.1.3
-
-* `Versions`:
-  * `MicroUtils`: `0.11.9` -> `0.11.12`
-* `Utils`:
-  * Rename `UserId` extension `link` to `userLink`
-* `Core`
-  * `ChatJoinRequest#inviteLink` is nullable due to the fact that join requests without link do not require invite link
-
-## 2.1.2
-
-* `Versions`:
-  * `Coroutines`: `1.6.1` -> `1.6.3`
-  * `Ktor`: `2.0.2` -> `2.0.3`
-  * `MicroUtils`: `0.11.6` -> `0.11.9`
-
-## 2.1.1
-
-* `API`:
-  * Now it is possible to edit any message text via `editMessageText` (but with warning)
-  * Now it is possible to edit any message caption via `editMessageCaption` (but with warning)
-  * Media message caption edit method (`editMessageCaption`) now returns the message with the same generic type (as it must be in telegram system)
-  * New extensions `TelegramBot#edit` has been added for all possible editions types
-  * New extensions `TelegramBot#send` has been added for all possible sending types
-  * New extensions `TelegramBot#delete` has been added
-* `Versions`:
-    * `MicroUtils`: `0.11.3` -> `0.11.6`
-
-## 2.1.0
-
-__This update contains including of [Telegram Bot API 6.1](https://core.telegram.org/bots/api-changelog#june-20-2022)__
-
-* Add support of functionality for `WebApp`s from [Bot API 6.1](https://core.telegram.org/bots/api-changelog#june-20-2022)
-* Add support of functionality for premium feature from [Bot API 6.1](https://core.telegram.org/bots/api-changelog#june-20-2022)
-* Add support of `addedToAttachmentMenu` in `CommonUser` from [Bot API 6.1](https://core.telegram.org/bots/api-changelog#june-20-2022)
-* Add support of `secret_token` in `SetWebhook` request from [Bot API 6.1](https://core.telegram.org/bots/api-changelog#june-20-2022)
-* Add support of `createInvoiceLink` request from [Bot API 6.1](https://core.telegram.org/bots/api-changelog#june-20-2022)
-
-## 2.0.3
-
-* `Core`:
-  * New function `regularln` for simple creating of `RegularTextSource` with new line in the end
-* `API`:
-  * New function `downloadFileToTemp` for simple downloading of file in filesystem and manipulation with avoiding of direct using input streams and other low-level things
-* `Versions`:
-    * `MicroUtils`: `0.11.0` -> `0.11.3`
-
-## 2.0.2
-
-* `Versions`:
-    * `MicroUtils`: `0.10.8` -> `0.11.0`
-    * `UUID`: `0.4.0` -> `0.4.1`
-
-## 2.0.1
-
-* `Versions`:
-    * `Ktor`: `2.0.1` -> `2.0.2`
-    * `MicroUtils`: `0.10.5` -> `0.10.8`
-* `Utils`:
-    * `TelegramBot#longPolling` now accepts `UpdatesFilter` instead of `FlowsUpdatesFilter`
-
-## 2.0.0
-
-___ALL PREVIOUS DEPRECATIONS HAVE BEEN REMOVED___
-
-* `Behaviour Builder`:
-    * Mappers have been removed from waiters extensions
-    * Triggers extensions now will use filtering inside of context receiver instead of passing the filters into `BehaviourContext`. That means that in the subcontext will not be used preinstalled filters for their `BehaviourContext` and filter of trigger will not be used in subcontext
-    * Waiters do not take count parameter anymore
-    * Waiters do not take filter parameter anymore. Use flows filters
-* `Utils`:
-    * Add opportunity to get event messages with specific `ChatEvent` type using `withEvent`/`requireWithEvent` (by analog with `withEvent` and `requireWithEvent`)
-
-## 1.1.3
-
-* `Behaviour Builder with FSM`:
-    * Typealias `StateHandlingErrorHandler` from `1.1.2` has been deprecated and should be replaced with the new one from microutils
-
-## 1.1.2
-
-* `Core`:
-    * Rename of `TelegramAPIUrlsKeeper#checkWebAppLink` -> `TelegramAPIUrlsKeeper#checkWebAppData` (fix of [#591](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/591))
-* `Behaviour Builder with FSM`:
-    * New typealias `StateHandlingErrorHandler`
-    * `BehaviourBuilderWithFSM` now accepts new parameter `onStateHandlingErrorHandler` which will be used in case if state has not been successfully completed
-
-## 1.1.1
-
-* `Versions`:
-    * `MicroUtils.Crypto` will not be provided with that library anymore. Instead, it is recommended to use `Korlibs.Krypto`. You still can add crypto from microutils using next groovy dependency: `dev.inmo:micro_utils.crypto:$micro_utils_version`
-* `Core`:
-    * Improvements in `TelegramAPIUrlsKeeper#checkWebAppLink`
-    * New field in `TelegramAPIUrlsKeeper#webAppDataSecretKeyHash`
-* `Behaviour Builder`:
-    * Extension `TelegramBot#buildBehaviour` now returns `BehaviourContext`
-
-## 1.1.0
-
-* `Utils`:
-    * New parameter `additionalApplicationEngineEnvironmentConfigurator` in `RequestsExecutor#setWebhookInfoAndStartListenWebhooks` and `startListenWebhooks`
-
-## 1.0.1
-
-* `Versions`:
-    * `Serialization`: `1.3.2` -> `1.3.3`
-    * `MicroUtils`: `0.10.3` -> `0.10.4`
-
-## 1.0.0
-
-__All the `tgbotapi.extensions.*` packages have been removed__
-
-* `Versions`:
-    * `Kotlin`: `1.6.10` -> `1.6.21`
-    * `Ktor`: `1.6.8` -> `2.0.1`
-    * `MicroUtils`: `0.9.24` -> `0.10.3`
-* `Core`:
-    * **`Ktor` package renamed. Migration:** `dev.inmo.tgbotapi.bot.Ktor` -> `dev.inmo.tgbotapi.bot.ktor`
-    * **`CallbackQuery` package renamed. Migration:** `dev.inmo.tgbotapi.types.CallbackQuery([\s\\.])` -> `dev.inmo.tgbotapi.types.queries.callback$1`
-    * **`ChatMember` package renamed. Migration:** `dev.inmo.tgbotapi.types.ChatMember([\s\\.])` -> `dev.inmo.tgbotapi.types.chat.member$1`
-    * **`ChatAdministratorRightsImpl` replaced. Migration:** `dev.inmo.tgbotapi.types.ChatAdministratorRightsImpl` -> `dev.inmo.tgbotapi.types.chat.member.ChatAdministratorRightsImpl`
-    * **`chat.abstract.extended` replaced. Migration:** `dev.inmo.tgbotapi.types.chat.abstract.extended` -> `dev.inmo.tgbotapi.types.chat.member.chat`
-    * **`chat.abstract` replaced. Migration:** `dev.inmo.tgbotapi.types.chat.abstract` -> `dev.inmo.tgbotapi.types.chat.member.chat`
-    * **`chat.extended` replaced. Migration:** `dev.inmo.tgbotapi.types.chat.extended` -> `dev.inmo.tgbotapi.types.chat.member.chat`
-    * **User interfaces have been fully replaced**:
-        * `dev.inmo.tgbotapi.types.User` -> `dev.inmo.tgbotapi.types.chat.User`
-        * `dev.inmo.tgbotapi.types.CommonUser` -> `dev.inmo.tgbotapi.types.chat.CommonUser`
-        * `dev.inmo.tgbotapi.types.ExtendedUser` -> `dev.inmo.tgbotapi.types.chat.ExtendedUser`
-        * `dev.inmo.tgbotapi.types.Bot` -> `dev.inmo.tgbotapi.types.chat.Bot`
-        * `dev.inmo.tgbotapi.types.CommonBot` -> `dev.inmo.tgbotapi.types.chat.CommonBot`
-        * `dev.inmo.tgbotapi.types.ExtendedBot` -> `dev.inmo.tgbotapi.types.chat.ExtendedBot`
-        * `dev.inmo.tgbotapi.types.UserSerializer` -> `dev.inmo.tgbotapi.types.chat.UserSerializer`
-    * **All `InputMedia` has been renamed as `TelegramMedia`. Migration:** `InputMedia` -> `TelegramMedia`
-        * `dev.inmo.tgbotapi.types.InputMedia` -> `dev.inmo.tgbotapi.types.media`
-    * **Replaces of `MessageContent`. Migrations:**
-        * `dev.inmo.tgbotapi.types.message.content.abstracts` -> `dev.inmo.tgbotapi.types.message.content`
-        * `dev.inmo.tgbotapi.types.message.content.media` -> `dev.inmo.tgbotapi.types.message.content`
-    * **Replaces of `TextSource`s. Migrations:** `dev.inmo.tgbotapi.types.MessageEntity.textsources` -> `dev.inmo.tgbotapi.types.message.textsources`
-    * **Replaces of `ParseMode`s. Migrations:** `dev.inmo.tgbotapi.types.ParseMode` -> `dev.inmo.tgbotapi.types.message`
-    * **Replaces of `MediaGroupUpdate`s. Migrations:** `dev.inmo.tgbotapi.types.update.MediaGroupUpdates` -> `dev.inmo.tgbotapi.types.update.media_group`
-    * **`InvoiceContent` has been replaced: `dev.inmo.tgbotapi.types.message.payments.InvoiceContent` -> `dev.inmo.tgbotapi.types.message.content.InvoiceContent`**
-    * **`PossiblySentViaBotCommonMessage` has been replaced: `dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage` -> `dev.inmo.tgbotapi.types.message.abstracts.PossiblySentViaBotCommonMessage`**
-    * **Edit live location requests have been replaced:**
-        * `dev.inmo.tgbotapi.requests.edit.LiveLocation` -> `dev.inmo.tgbotapi.requests.edit.location.live`
-        * `dev.inmo.tgbotapi.extensions.api.edit.LiveLocation` -> `dev.inmo.tgbotapi.extensions.api.edit.location.live`
-    * **Edit reply markup requests have been replaced:**
-        * `dev.inmo.tgbotapi.requests.edit.ReplyMarkup` -> `dev.inmo.tgbotapi.requests.edit.reply_markup`
-        * `dev.inmo.tgbotapi.extensions.api.edit.ReplyMarkup` -> `dev.inmo.tgbotapi.extensions.api.edit.reply_markup`
-    * **Common abstracts have been replaced: `dev.inmo.tgbotapi.CommonAbstracts` -> `dev.inmo.tgbotapi.abstracts`**
-    * Constructor of `UnknownInlineKeyboardButton` is not internal and can be created with any `json` ([#563](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/563))
-    * All the interfaces from `dev.inmo.tgbotapi.types.files.abstracts` have been replaced to `dev.inmo.tgbotapi.types.files` and converted to sealed ([#550](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/550))
-    * `PassportFile` has been replaced to `dev.inmo.tgbotapi.types.files`
-    * `StorageFile` has been deprecated (fix of [#556](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/556))
-        * `MultipartFile` do not require `StorageFile` anymore
-        * `InputFile` companion got functions to simplify creation of `InputFile`s
-        * New typealias `FileUrl` (represents `FileId` but declare that they are the same)
-* `BehaviourBuilder`:
-    * `SimpleFilter` now is a `fun interface` instead of just callback (fix of [#546](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/546))
-    * New extension `BehaviourContext#createSubContext`. It uses separated `AccumulatorFlow` and will retrieve updates by itself
-    * New extension `BehaviourContext#doInContext`
-    * Extension `BehaviourContext#doInSubContextWithUpdatesFilter` has been renamed to `BehaviourContext#createSubContextAndDoWithUpdatesFilter`
-    * Extension `BehaviourContext#doInSubContext` has been deprecated
-* `BehaviourContextWithFSM`:
-    * `launchStateHandling` lost its parameter `contextUpdatesFlow: Flow`
-    * `handleState` of `BehaviourContextWithFSM` now will get/create sub context for the state and launch handling in it
-    * `BehaviourWithFSMStateHandler` now extends `StatesHandler`
-    * `BehaviourWithFSMStateHandlerHolder` now extends `CheckableHandlerHolder` and `BehaviourWithFSMStateHandler`
-        * Function `checkHandleable` of `BehaviourWithFSMStateHandlerHolder` now is `suspend`
-
-## 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`:
--- a/README.md
+++ b/README.md
@@ -1,19 +1,8 @@
-# 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.7-blue)](https://core.telegram.org/bots/api-changelog#april-21-2023)
+# 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-5.6-blue)](https://core.telegram.org/bots/api-changelog#december-30-2021)

-|          Docs          |                                   [![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)                                    |
-|:----------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
-|      Useful repos      |                           [![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/)                           |
-|          Misc          |                              [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![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)                               |
-|       Platforms        |                                                                                                      ![JVM](https://img.shields.io/badge/JVM-red?style=plastic&logo=openjdk&logoColor=white) ![Js](https://img.shields.io/badge/JavaScript-323330?style=plastic&logo=javascript&logoColor=F7DF1E)                                                                                                       |
-| Experimental Platforms |                                                                                                [![Linux x64](https://img.shields.io/badge/LinuxX64-FCC624?style=plastic&logo=linux&logoColor=black)](https://kotlinlang.org/docs/native-target-support.html#tier-1) [![MinGW x64](https://img.shields.io/badge/MinGWX64-black?style=plastic&logo=windows&logoColor=green)](https://kotlinlang.org/docs/native-target-support.html#tier-1)                                                                                                 |
-
-<!--- [![Telegram Channel](./resources/tg_channel_qr.jpg)](https://t.me/ktgbotapi) --->
-
-<p align="center">
-  <a href="https://t.me/ktgbotapi">
-    <img src="./resources/tg_channel_qr.jpg">
-  </a>
-</p>
+| [![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)](https://forms.gle/2Hex2ynbHWHhi1KY7) [![Chat in Telegram](https://img.shields.io/static/v1?label=Telegram&message=Chat&color=blue)](https://t.me/InMoTelegramBotAPI) |
+|:---:|
+| [![Create bot](https://img.shields.io/static/v1?label=Github&message=Template&color=blue)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![Examples](https://img.shields.io/static/v1?label=Github&message=Examples&color=blue)](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/) [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Bookstack&message=Tutorial&color=blue)](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |

 Hello! This is a set of libraries for working with Telegram Bot API.

@@ -39,7 +28,7 @@ Other configuration examples:
 suspend fun main() {
  val bot = telegramBot(TOKEN)

-  bot.buildBehaviourWithLongPolling {
+  bot.buildBehaviour {
    println(getMe())
  
    onCommand("start") {
@@ -80,7 +69,7 @@ and maybe some updates it got after launch)
 suspend fun main() {
  val bot = telegramBot(TOKEN)

-  bot.buildBehaviourWithLongPolling {
+  bot.buildBehaviour {
    println(getMe())

    val nameReplyMarkup = ReplyKeyboardMarkup(
@@ -118,5 +107,5 @@ suspend fun main() {
 ### More examples

 You may find examples in [this project](https://github.com/InsanusMokrassar/TelegramBotAPI-examples). Besides, you are
-always welcome in our [bookstack](https://bookstack.inmo.dev/books/telegrambotapi) and
+always welcome in our [wiki](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/About-this-project) and
 [chat](https://t.me/InMoTelegramBotAPIChat).
--- a/build.gradle
+++ b/build.gradle
@@ -6,26 +6,19 @@ buildscript {
    }

    dependencies {
-        classpath libs.kotlin.gradle.plugin
-        classpath libs.kotlin.ksp.plugin
-        classpath libs.kotlin.serialization.plugin
-        classpath libs.kotlin.dokka.plugin
-        classpath libs.github.release.plugin
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "com.github.breadmoirai:github-release:$github_release_plugin_version"
    }
 }

 plugins {
-    alias(libs.plugins.kotlin.dokka)
+    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version" apply false
+    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 {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        google()
-        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
-    }
    if (it != rootProject.findProject("docs")) {
        tasks.whenTaskAdded { task ->
            if(task.name == "jsLegacyBrowserTest" || task.name == "jsLegacyNodeTest") {
@@ -34,7 +27,6 @@ allprojects {
        }
    }
 }
-apply from: "./extensions.gradle"

 private String getCurrentVersionChangelog() {
    OutputStream changelogDataOS = new ByteArrayOutputStream()
@@ -56,7 +48,7 @@ if (new File(projectDir, "secret.gradle").exists()) {
        owner "InsanusMokrassar"
        repo "TelegramBotAPI"

-        tagName "v$library_version"
+        tagName "$library_version"
        releaseName "$library_version"
        targetCommitish "$library_version"

--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -1,28 +1,50 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
+    }
+}
+
 plugins {
    id "org.jetbrains.kotlin.multiplatform"
    id "org.jetbrains.kotlin.plugin.serialization"
-    id "org.jetbrains.dokka"
+    id "org.jetbrains.dokka" version "$dokka_version"
 }

-project.description = "Full collection of all built-in tgbotapi tools"
-
-apply from: "$mppProjectWithSerializationPresetPath"
+repositories {
+    mavenLocal()
+    mavenCentral()
+}

 kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
    sourceSets {
        commonMain {
            dependencies {
-                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")
+                implementation kotlin('stdlib')
+
+                rootProject.subprojects.forEach {
+                    if (it != project) {
+                        api it
+                    }
+                }
            }
        }
    }
@@ -30,13 +52,12 @@ kotlin {

 private List<SourceDirectorySet> findSourcesWithName(String... approximateNames) {
    return parent.subprojects
-            .findAll { it != project && it.hasProperty("kotlin") }
-            .collectMany { it.kotlin.sourceSets }
-            .findAll { sourceSet ->
-                approximateNames.any { nameToFilter ->
-                    sourceSet.name.contains(nameToFilter)
-                }
-            }.collect { it.kotlin }
+        .findAll { it != project }
+        .collectMany { it.kotlin.sourceSets }
+        .findAll { sourceSet -> approximateNames.any {
+            nameToFilter -> sourceSet.name.contains(nameToFilter)
+            }
+        }.collect { it.kotlin }
 }

 Object callback = {
@@ -76,3 +97,8 @@ Object callback = {

 tasks.dokkaGfm(callback)
 tasks.dokkaHtml(callback)
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
--- a/docs/gradle.properties
+++ b/docs/gradle.properties
@@ -1 +1,3 @@
+dokka_version=1.6.0
+
 org.gradle.jvmargs=-Xmx1024m
--- a/extensions.gradle
+++ b/extensions.gradle
@@ -1,8 +0,0 @@
-allprojects {
-    ext {
-        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
-        mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle"
-
-        publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
-    }
-}
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,5 +5,19 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true

+kotlin_version=1.6.10
+kotlin_coroutines_version=1.6.0
+kotlin_serialisation_runtime_version=1.3.2
+klock_version=2.4.10
+uuid_version=0.3.1
+ktor_version=1.6.7
+
+
+micro_utils_version=0.9.1
+
+javax_activation_version=1.1.1
+
 library_group=dev.inmo
-library_version=8.0.1
+library_version=0.38.2
+
+github_release_plugin_version=2.2.12
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,73 +0,0 @@
-[versions]
-
-kotlin = "1.8.21"
-kotlin-serialization = "1.5.1"
-kotlin-coroutines = "1.6.4"
-
-javax-activation = "1.1.1"
-
-korlibs = "4.0.3"
-uuid = "0.7.1"
-ktor = "2.3.1"
-
-ksp = "1.8.21-1.0.11"
-kotlin-poet = "1.14.2"
-
-microutils = "0.19.2"
-
-github-release-plugin = "2.4.1"
-dokka = "1.8.10"
-
-[libraries]
-
-kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
-kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
-kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" }
-kotlin-serialization-properties = { module = "org.jetbrains.kotlinx:kotlinx-serialization-properties", version.ref = "kotlin-serialization" }
-kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlin" }
-kotlin-test-annotations-common = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" }
-kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
-kotlin-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref = "kotlin" }
-
-ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
-ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
-ktor-client-curl = { module = "io.ktor:ktor-client-curl", version.ref = "ktor" }
-ktor-client-winhttp = { module = "io.ktor:ktor-client-winhttp", version.ref = "ktor" }
-ktor-server = { module = "io.ktor:ktor-server", version.ref = "ktor" }
-ktor-server-host-common = { module = "io.ktor:ktor-server-host-common", version.ref = "ktor" }
-
-javax-activation = { module = "javax.activation:activation", version.ref = "javax-activation" }
-
-korlibs-klock =  { module = "com.soywiz.korlibs.klock:klock", version.ref = "korlibs" }
-korlibs-krypto =  { module = "com.soywiz.korlibs.krypto:krypto", version.ref = "korlibs" }
-
-uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
-
-microutils-coroutines = { module = "dev.inmo:micro_utils.coroutines", version.ref = "microutils" }
-microutils-serialization-base64 = { module = "dev.inmo:micro_utils.serialization.base64", version.ref = "microutils" }
-microutils-serialization-encapsulator = { module = "dev.inmo:micro_utils.serialization.encapsulator", version.ref = "microutils" }
-microutils-serialization-typedSerializer = { module = "dev.inmo:micro_utils.serialization.typed_serializer", version.ref = "microutils" }
-microutils-serialization-mapper = { module = "dev.inmo:micro_utils.serialization.mapper", version.ref = "microutils" }
-microutils-languageCodes = { module = "dev.inmo:micro_utils.language_codes", version.ref = "microutils" }
-microutils-ktor-common = { module = "dev.inmo:micro_utils.ktor.common", version.ref = "microutils" }
-microutils-fsm-common = { module = "dev.inmo:micro_utils.fsm.common", version.ref = "microutils" }
-
-# ksp dependencies
-
-kotlin-poet = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlin-poet" }
-ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
-
-# buildscript classpaths
-
-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-kotlin-ksp-plugin = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
-kotlin-serialization-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
-kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
-github-release-plugin = { module = "com.github.breadmoirai:github-release", version.ref = "github-release-plugin" }
-
-[plugins]
-
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
--- a/mppJsProject.gradle
+++ b/mppJsProject.gradle
@@ -1,32 +0,0 @@
-project.version = "$version"
-project.group = "$group"
-
-apply from: "$publishGradlePath"
-
-kotlin {
-    js (IR) {
-        browser()
-        nodejs()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation libs.kotlin
-                api libs.kotlin.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation libs.kotlin.test.common
-                implementation libs.kotlin.test.annotations.common
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation libs.kotlin.test.js
-                implementation libs.kotlin.test.junit
-            }
-        }
-    }
-}
--- a/mppProjectWithSerialization.gradle
+++ b/mppProjectWithSerialization.gradle
@@ -1,49 +0,0 @@
-project.version = "$library_version"
-project.group = "$library_group"
-
-kotlin {
-    jvm {
-        compilations.main {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
-    js (IR) {
-        browser()
-        nodejs()
-    }
-    linuxX64()
-    mingwX64()
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation libs.kotlin
-                api libs.kotlin.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation libs.kotlin.test.common
-                implementation libs.kotlin.test.annotations.common
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation libs.kotlin.test.junit
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation libs.kotlin.test.js
-                implementation libs.kotlin.test.junit
-            }
-        }
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
--- a/publish.kpsb
+++ b/publish.kpsb
@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${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":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
--- a/resources/tg_channel_qr.jpg
+++ b/resources/tg_channel_qr.jpg
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,10 +12,13 @@ pluginManagement {
 }

 include ":tgbotapi.core"
-include ":tgbotapi.ksp"
 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"
--- a/tgbotapi.api/build.gradle
+++ b/tgbotapi.api/build.gradle
@@ -1,21 +1,55 @@
+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"
-    id "org.jetbrains.dokka"
 }

-project.description = "API extensions with \"Telegram Bot API\"-like extensions for TelegramBot and RequestsExecutor"
+project.version = "$library_version"
+project.group = "$library_group"

-apply from: "$mppProjectWithSerializationPresetPath"
-apply from: "$publishGradlePath"
+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
+}
+
--- a/tgbotapi.api/publish.gradle
+++ b/tgbotapi.api/publish.gradle
@@ -0,0 +1,79 @@
+apply plugin: 'maven-publish'
+
+task javadocsJar(type: Jar) {
+    classifier = 'javadoc'
+}
+
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference"
+            name = "Telegram Bot API Extensions for API"
+            url = "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
+                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
+                    }
+                
+            }
+        }
+        repositories {
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+                maven {
+                    name = "GithubPackages"
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
+                    credentials {
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    }
+                }
+            }
+            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                maven {
+                    name = "sonatype"
+                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                    credentials {
+                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    }
+                }
+            }
+        }
+    }
+}
+    
+if (project.hasProperty("signing.gnupg.keyName")) {
+    apply plugin: 'signing'
+    
+    signing {
+        useGpgCmd()
+    
+        sign publishing.publications
+    }
+    
+    task signAll {
+        tasks.withType(Sign).forEach {
+            dependsOn(it)
+        }
+    }
+}
--- a/tgbotapi.api/publish.kpsb
+++ b/tgbotapi.api/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":"Telegram Bot API Extensions for API","description":"API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","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"}}}
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotBuilder.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotBuilder.kt
@@ -40,9 +40,8 @@ data class BotBuilder internal constructor(
 fun buildBot(
    token: String,
    apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
    block: BotBuilder.() -> Unit
 ) = telegramBot(
-    TelegramAPIUrlsKeeper(token, testServer, apiUrl),
+    TelegramAPIUrlsKeeper(token, apiUrl),
    BotBuilder().apply(block).createHttpClient()
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt
@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api

-import dev.inmo.tgbotapi.bot.ktor.telegramBot
+import dev.inmo.tgbotapi.bot.Ktor.telegramBot
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
 import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
@@ -13,7 +13,7 @@ import io.ktor.client.engine.*
 */
 fun telegramBot(
    urlsKeeper: TelegramAPIUrlsKeeper,
-    client: HttpClient = HttpClient()
+    client: HttpClient
 ): TelegramBot = telegramBot(urlsKeeper) {
    this.client = client
 }
@@ -66,19 +66,17 @@ inline fun telegramBot(
 inline fun telegramBot(
    token: String,
    apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
-    client: HttpClient = HttpClient()
-): TelegramBot = telegramBot(TelegramAPIUrlsKeeper(token, testServer, apiUrl), client)
+    client: HttpClient
+): TelegramBot = telegramBot(TelegramAPIUrlsKeeper(token, apiUrl), client)

@Suppress("NOTHING_TO_INLINE")
 inline fun <T: HttpClientEngineConfig> telegramBot(
    token: String,
    clientFactory: HttpClientEngineFactory<T>,
    apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
    noinline clientConfig: HttpClientConfig<T>.() -> Unit = {}
 ) = telegramBot(
-    TelegramAPIUrlsKeeper(token, testServer, apiUrl),
+    TelegramAPIUrlsKeeper(token, apiUrl),
    clientFactory,
    clientConfig
 )
@@ -92,10 +90,9 @@ inline fun telegramBot(
    token: String,
    clientEngine: HttpClientEngine,
    apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
    noinline clientConfig: HttpClientConfig<*>.() -> Unit = {}
 ) = telegramBot(
-    TelegramAPIUrlsKeeper(token, testServer, apiUrl),
+    TelegramAPIUrlsKeeper(token, apiUrl),
    clientEngine,
    clientConfig
 )
@@ -108,9 +105,8 @@ inline fun telegramBot(
 inline fun telegramBot(
    token: String,
    apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
    noinline clientConfig: HttpClientConfig<*>.() -> Unit
 ) = telegramBot(
-    TelegramAPIUrlsKeeper(token, testServer, apiUrl),
+    TelegramAPIUrlsKeeper(token, apiUrl),
    clientConfig
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DeleteMessage.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DeleteMessage.kt
@@ -3,51 +3,25 @@ package dev.inmo.tgbotapi.extensions.api
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.DeleteMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
+import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.message.content.MediaGroupCollectionContent
-import dev.inmo.tgbotapi.types.message.content.MediaGroupContent

 suspend fun TelegramBot.deleteMessage(
    chatId: ChatIdentifier,
-    messageId: MessageId
+    messageId: MessageIdentifier
 ) = execute(
    DeleteMessage(chatId, messageId)
 )

 suspend fun TelegramBot.deleteMessage(
    chat: Chat,
-    messageId: MessageId
+    messageId: MessageIdentifier
 ) = deleteMessage(chat.id, messageId)

 suspend fun TelegramBot.deleteMessage(
    message: Message
-): Boolean {
-    val mediaGroupContent = ((message as? ContentMessage<*>) ?.content as? MediaGroupCollectionContent<*>)
-    if (mediaGroupContent == null) {
-        return deleteMessage(message.chat, message.messageId)
-    } else {
-        return mediaGroupContent.group.map {
-            deleteMessage(it.sourceMessage)
-        }.all { it }
-    }
-}
-
-suspend fun TelegramBot.delete(
-    chatId: ChatIdentifier,
-    messageId: MessageId
-) = deleteMessage(chatId, messageId)
-
-suspend fun TelegramBot.delete(
-    chat: Chat,
-    messageId: MessageId
-) = deleteMessage(chat, messageId)
-
-suspend fun TelegramBot.delete(
-    message: Message
-) = deleteMessage(message)
+) = deleteMessage(message.chat, message.messageId)

 suspend fun Message.delete(
    requestsExecutor: TelegramBot
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/ForwardMessage.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/ForwardMessage.kt
@@ -3,62 +3,54 @@ package dev.inmo.tgbotapi.extensions.api
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.ForwardMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.threadId

 suspend fun TelegramBot.forwardMessage(
    fromChatId: ChatIdentifier,
    toChatId: ChatIdentifier,
-    messageId: MessageId,
-    threadId: MessageThreadId? = toChatId.threadId,
+    messageId: MessageIdentifier,
    disableNotification: Boolean = false,
    protectContent: Boolean = false
 ) = execute(
-    ForwardMessage(fromChatId, toChatId, messageId, threadId, disableNotification, protectContent)
+    ForwardMessage(fromChatId, toChatId, messageId, disableNotification, protectContent)
 )

 suspend fun TelegramBot.forwardMessage(
    fromChat: Chat,
    toChatId: ChatIdentifier,
-    messageId: MessageId,
-    threadId: MessageThreadId? = toChatId.threadId,
+    messageId: MessageIdentifier,
    disableNotification: Boolean = false,
    protectContent: Boolean = false
-) = forwardMessage(fromChat.id, toChatId, messageId, threadId, disableNotification, protectContent)
+) = forwardMessage(fromChat.id, toChatId, messageId, disableNotification, protectContent)

 suspend fun TelegramBot.forwardMessage(
    fromChatId: ChatIdentifier,
    toChat: Chat,
-    messageId: MessageId,
-    threadId: MessageThreadId? = toChat.id.threadId,
+    messageId: MessageIdentifier,
    disableNotification: Boolean = false,
    protectContent: Boolean = false
-) = forwardMessage(fromChatId, toChat.id, messageId, threadId, disableNotification, protectContent)
+) = forwardMessage(fromChatId, toChat.id, messageId, disableNotification, protectContent)

 suspend fun TelegramBot.forwardMessage(
    fromChat: Chat,
    toChat: Chat,
-    messageId: MessageId,
-    threadId: MessageThreadId? = toChat.id.threadId,
+    messageId: MessageIdentifier,
    disableNotification: Boolean = false,
    protectContent: Boolean = false
-) = forwardMessage(fromChat.id, toChat.id, messageId, threadId, disableNotification, protectContent)
+) = forwardMessage(fromChat.id, toChat.id, messageId, disableNotification, protectContent)

 suspend fun TelegramBot.forwardMessage(
    toChatId: ChatIdentifier,
    message: Message,
-    threadId: MessageThreadId? = toChatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false
-) = forwardMessage(message.chat, toChatId, message.messageId, threadId, disableNotification, protectContent)
+) = forwardMessage(message.chat, toChatId, message.messageId, disableNotification, protectContent)

 suspend fun TelegramBot.forwardMessage(
    toChat: Chat,
    message: Message,
-    threadId: MessageThreadId? = toChat.id.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false
-) = forwardMessage(message.chat, toChat, message.messageId, threadId, disableNotification, protectContent)
+) = forwardMessage(message.chat, toChat, message.messageId, disableNotification, protectContent)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt
@@ -1,57 +1,70 @@
 package dev.inmo.tgbotapi.extensions.api.InternalUtils

 import dev.inmo.tgbotapi.types.MediaGroupIdentifier
-import dev.inmo.tgbotapi.types.message.abstracts.PossiblySentViaBotCommonMessage
-import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
+import dev.inmo.tgbotapi.types.UpdateIdentifier
+import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
 import dev.inmo.tgbotapi.types.update.*
+import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.*
 import dev.inmo.tgbotapi.types.update.abstracts.*
-import dev.inmo.tgbotapi.utils.extensions.asMediaGroupMessage

-/**
- * Will convert incoming list of updates to list with [MediaGroupUpdate]s
- */
+internal fun Update.lastUpdateIdentifier(): UpdateIdentifier {
+    return if (this is SentMediaGroupUpdate) {
+        origins.last().updateId
+    } else {
+        updateId
+    }
+}
+
+internal fun List<Update>.lastUpdateIdentifier(): UpdateIdentifier? {
+    return maxByOrNull { it.updateId } ?.lastUpdateIdentifier()
+}
+
 internal fun List<Update>.convertWithMediaGroupUpdates(): List<Update> {
    val resultUpdates = mutableListOf<Update>()
-    val mediaGroups = mutableMapOf<MediaGroupIdentifier, MutableList<Pair<BaseSentMessageUpdate, PossiblySentViaBotCommonMessage<MediaGroupPartContent>>>>()
-
+    val mediaGroups = mutableMapOf<MediaGroupIdentifier, MutableList<BaseSentMessageUpdate>>()
    for (update in this) {
-        val message = (update.data as? PossiblySentViaBotCommonMessage<*>) ?.let {
-            if (it.content is MediaGroupPartContent) {
-                it as PossiblySentViaBotCommonMessage<MediaGroupPartContent>
-            } else {
-                null
-            }
-        }
-        val mediaGroupId = message ?.mediaGroupId
-        if (message == null || mediaGroupId == null) {
+        val data = (update.data as? MediaGroupMessage<*>)
+        if (data == null) {
            resultUpdates.add(update)
            continue
        }
        when (update) {
+            is BaseEditMessageUpdate -> resultUpdates.add(
+                update.toEditMediaGroupUpdate()
+            )
            is BaseSentMessageUpdate -> {
-                mediaGroups.getOrPut(mediaGroupId) {
+                mediaGroups.getOrPut(data.mediaGroupId) {
                    mutableListOf()
-                }.add(update to message)
+                }.add(update)
            }
            else -> resultUpdates.add(update)
        }
    }
-
-    mediaGroups.map { (_, updatesWithMessages) ->
-        val update = updatesWithMessages.maxBy { it.first.updateId }.first
-        resultUpdates.add(
-            update.copy(updatesWithMessages.map { it.second }.asMediaGroupMessage())
-        )
+    mediaGroups.values.map {
+        it.toSentMediaGroupUpdate() ?.let { mediaGroupUpdate ->
+            resultUpdates.add(mediaGroupUpdate)
+        }
    }
-
    resultUpdates.sortBy { it.updateId }
    return resultUpdates
 }

-/**
- * @return [EditMessageMediaGroupUpdate] in case if [this] is [EditMessageUpdate]. When [this] object is
- * [EditChannelPostUpdate] instance - will return [EditChannelPostMediaGroupUpdate]
- *
- * @throws IllegalStateException
- */
-internal fun BaseEditMessageUpdate.toEditMediaGroupUpdate() = this
+internal fun List<BaseSentMessageUpdate>.toSentMediaGroupUpdate(): SentMediaGroupUpdate? = (this as? SentMediaGroupUpdate) ?: let {
+    if (isEmpty()) {
+        return@let null
+    }
+    val resultList = sortedBy { it.updateId }
+    when (first()) {
+        is MessageUpdate -> MessageMediaGroupUpdate(resultList)
+        is ChannelPostUpdate -> ChannelPostMediaGroupUpdate(resultList)
+        else -> null
+    }
+}
+
+internal fun BaseEditMessageUpdate.toEditMediaGroupUpdate(): EditMediaGroupUpdate = (this as? EditMediaGroupUpdate) ?: let {
+    when (this) {
+        is EditMessageUpdate -> EditMessageMediaGroupUpdate(this)
+        is EditChannelPostUpdate -> EditChannelPostMediaGroupUpdate(this)
+        else -> error("Unsupported type of ${BaseEditMessageUpdate::class.simpleName}")
+    }
+}
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveFlowLocation.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveFlowLocation.kt
@@ -1,168 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob
-import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
-import dev.inmo.tgbotapi.abstracts.*
-import dev.inmo.tgbotapi.abstracts.types.WithReplyMarkup
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.edit
-import dev.inmo.tgbotapi.extensions.api.send.send
-import dev.inmo.tgbotapi.extensions.api.send.sendLiveLocation
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.location.LiveLocation
-import dev.inmo.tgbotapi.types.location.Location
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.content.LocationContent
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.FlowCollector
-import kotlinx.coroutines.flow.map
-import kotlinx.serialization.Serializable
-import kotlin.js.JsName
-import kotlin.jvm.JvmName
-import kotlin.math.ceil
-
-@Serializable
-data class EditLiveLocationInfo(
-    override val latitude: Double,
-    override val longitude: Double,
-    override val horizontalAccuracy: Meters? = null,
-    override val heading: Degrees? = null,
-    override val proximityAlertRadius: Meters? = null,
-    override val replyMarkup: InlineKeyboardMarkup? = null
-) : Locationed, HorizontallyAccured, ProximityAlertable, Headed, WithReplyMarkup
-
-/**
- * Will [sendLiveLocation] with the first [EditLiveLocationInfo] data and update than. Each [liveTimeMillis] passing,
- * the message will be sent again and new edits will be applied to the new message
- */
-suspend fun TelegramBot.handleLiveLocation(
-    chatId: ChatIdentifier,
-    locationsFlow: Flow<EditLiveLocationInfo>,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    threadId: MessageThreadId? = chatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    sentMessageFlow: FlowCollector<ContentMessage<LocationContent>>? = null
-) {
-    var currentLiveLocationMessage: ContentMessage<LocationContent>? = null
-    val updateMessageJob = CoroutineScope(currentCoroutineContext().LinkedSupervisorJob()).launchSafelyWithoutExceptions(start = CoroutineStart.LAZY) {
-        while (isActive) {
-            delay(liveTimeMillis)
-            // Remove previous location message info to resend live location message
-            currentLiveLocationMessage = null
-        }
-    }
-    locationsFlow.collect {
-        val capturedLiveLocationMessage = currentLiveLocationMessage
-        if (capturedLiveLocationMessage == null) {
-            updateMessageJob.start()
-            currentLiveLocationMessage = send(
-                chatId,
-                it.latitude,
-                it.longitude,
-                ceil(liveTimeMillis.toDouble() / 1000).toInt(),
-                it.horizontalAccuracy,
-                it.heading,
-                it.proximityAlertRadius,
-                threadId,
-                disableNotification,
-                protectContent,
-                replyToMessageId,
-                allowSendingWithoutReply,
-                it.replyMarkup
-            ).also {
-                sentMessageFlow ?.emit(it)
-            }
-        } else {
-            edit(
-                capturedLiveLocationMessage,
-                it.latitude,
-                it.longitude,
-                it.horizontalAccuracy,
-                it.heading,
-                it.proximityAlertRadius,
-                it.replyMarkup
-            ).also {
-                sentMessageFlow ?.emit(it)
-            }
-        }
-    }
-}
-
-/**
- * Will apply [Flow.map] to the [locationsFlow] to create [EditLiveLocationInfo] and pass the result flow to the
- * [handleLiveLocation] with [Flow] typed by [EditLiveLocationInfo]
- */
-@JvmName("handleLiveLocationWithLocation")
-@JsName("handleLiveLocationWithLocation")
-suspend fun TelegramBot.handleLiveLocation(
-    chatId: ChatIdentifier,
-    locationsFlow: Flow<Location>,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    threadId: MessageThreadId? = chatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    sentMessageFlow: FlowCollector<ContentMessage<LocationContent>>? = null
-) {
-    handleLiveLocation(
-        chatId,
-        locationsFlow.map {
-            EditLiveLocationInfo(
-                it.latitude,
-                it.longitude,
-                it.horizontalAccuracy,
-                (it as? LiveLocation) ?.heading,
-                (it as? LiveLocation) ?.proximityAlertRadius,
-                (it as? WithReplyMarkup) ?.replyMarkup as? InlineKeyboardMarkup
-            )
-        },
-        liveTimeMillis,
-        threadId,
-        disableNotification,
-        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        sentMessageFlow
-    )
-}
-
-/**
- * Will apply [Flow.map] to the [locationsFlow] to create [EditLiveLocationInfo] and pass the result flow to the
- * [handleLiveLocation] with [Flow] typed by [EditLiveLocationInfo]
- */
-@JvmName("handleLiveLocationWithLatLong")
-@JsName("handleLiveLocationWithLatLong")
-suspend fun TelegramBot.handleLiveLocation(
-    chatId: ChatIdentifier,
-    locationsFlow: Flow<Pair<Double, Double>>,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    threadId: MessageThreadId? = chatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    sentMessageFlow: FlowCollector<ContentMessage<LocationContent>>? = null
-) {
-    handleLiveLocation(
-        chatId,
-        locationsFlow.map { (lat, long) ->
-            EditLiveLocationInfo(
-                lat,
-                long
-            )
-        },
-        liveTimeMillis,
-        threadId,
-        disableNotification,
-        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        sentMessageFlow
-    )
-}
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveLocationProvider.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveLocationProvider.kt
@@ -1,39 +1,23 @@
 package dev.inmo.tgbotapi.extensions.api

-import korlibs.time.DateTime
-import korlibs.time.TimeSpan
-import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob
-import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
-import dev.inmo.tgbotapi.abstracts.types.WithReplyMarkup
+import com.soywiz.klock.DateTime
+import com.soywiz.klock.TimeSpan
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.edit
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.stopLiveLocation
-import dev.inmo.tgbotapi.extensions.api.send.send
-import dev.inmo.tgbotapi.extensions.api.send.sendLiveLocation
+import dev.inmo.tgbotapi.extensions.api.edit.LiveLocation.editLiveLocation
+import dev.inmo.tgbotapi.extensions.api.edit.LiveLocation.stopLiveLocation
 import dev.inmo.tgbotapi.requests.send.SendLiveLocation
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.location.LiveLocation
-import dev.inmo.tgbotapi.types.location.Location
 import dev.inmo.tgbotapi.types.location.StaticLocation
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.content.LocationContent
-import dev.inmo.tgbotapi.utils.extensions.threadIdOrNull
 import io.ktor.utils.io.core.Closeable
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import kotlin.js.JsName
-import kotlin.jvm.JvmName
 import kotlin.math.ceil

 val defaultLivePeriodDelayMillis = (livePeriodLimit.last - 60L) * 1000L
@@ -60,8 +44,7 @@ class LiveLocationProvider internal constructor(
        private set
        get() = field || leftUntilCloseMillis.millisecondsLong < 0L

-    var message: ContentMessage<LocationContent> = initMessage
-        private set
+    private var message: ContentMessage<LocationContent> = initMessage
    val lastLocation: LiveLocation
        get() = message.content.location as LiveLocation

@@ -107,10 +90,9 @@ suspend fun TelegramBot.startLiveLocation(
    initHorizontalAccuracy: Meters? = null,
    initHeading: Degrees? = null,
    initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
+    replyToMessageId: MessageIdentifier? = null,
    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
 ): LiveLocationProvider {
@@ -124,7 +106,6 @@ suspend fun TelegramBot.startLiveLocation(
            initHorizontalAccuracy,
            initHeading,
            initProximityAlertRadius,
-            threadId,
            disableNotification,
            protectContent,
            replyToMessageId,
@@ -154,10 +135,9 @@ suspend fun TelegramBot.startLiveLocation(
    initHorizontalAccuracy: Meters? = null,
    initHeading: Degrees? = null,
    initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = chat.id.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
+    replyToMessageId: MessageIdentifier? = null,
    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
 ): LiveLocationProvider = startLiveLocation(
@@ -169,7 +149,6 @@ suspend fun TelegramBot.startLiveLocation(
    initHorizontalAccuracy,
    initHeading,
    initProximityAlertRadius,
-    threadId,
    disableNotification,
    protectContent,
    replyToMessageId,
@@ -183,16 +162,15 @@ suspend fun TelegramBot.startLiveLocation(
 */
 suspend fun TelegramBot.startLiveLocation(
    scope: CoroutineScope,
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    location: StaticLocation,
    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
    initHorizontalAccuracy: Meters? = null,
    initHeading: Degrees? = null,
    initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
+    replyToMessageId: MessageIdentifier? = null,
    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
 ): LiveLocationProvider = startLiveLocation(
@@ -204,7 +182,6 @@ suspend fun TelegramBot.startLiveLocation(
    initHorizontalAccuracy,
    initHeading,
    initProximityAlertRadius,
-    threadId,
    disableNotification,
    protectContent,
    replyToMessageId,
@@ -224,10 +201,9 @@ suspend fun TelegramBot.startLiveLocation(
    initHorizontalAccuracy: Meters? = null,
    initHeading: Degrees? = null,
    initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = chat.id.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
+    replyToMessageId: MessageIdentifier? = null,
    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
 ): LiveLocationProvider = startLiveLocation(
@@ -239,7 +215,6 @@ suspend fun TelegramBot.startLiveLocation(
    initHorizontalAccuracy,
    initHeading,
    initProximityAlertRadius,
-    threadId,
    disableNotification,
    protectContent,
    replyToMessageId,
@@ -260,7 +235,6 @@ suspend inline fun TelegramBot.replyWithLiveLocation(
    initHorizontalAccuracy: Meters? = null,
    initHeading: Degrees? = null,
    initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = to.threadIdOrNull,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    allowSendingWithoutReply: Boolean? = null,
@@ -274,7 +248,6 @@ suspend inline fun TelegramBot.replyWithLiveLocation(
    initHorizontalAccuracy,
    initHeading,
    initProximityAlertRadius,
-    threadId,
    disableNotification,
    protectContent,
    to.messageId,
@@ -294,7 +267,6 @@ suspend inline fun TelegramBot.replyWithLiveLocation(
    initHorizontalAccuracy: Meters? = null,
    initHeading: Degrees? = null,
    initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = to.threadIdOrNull,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    allowSendingWithoutReply: Boolean? = null,
@@ -307,7 +279,6 @@ suspend inline fun TelegramBot.replyWithLiveLocation(
    initHorizontalAccuracy,
    initHeading,
    initProximityAlertRadius,
-    threadId,
    disableNotification,
    protectContent,
    to.messageId,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/StopPoll.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/StopPoll.kt
@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.StopPoll
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message

 /**
@@ -13,7 +13,7 @@ import dev.inmo.tgbotapi.types.message.abstracts.Message
 */
 suspend fun TelegramBot.stopPoll(
    chatId: ChatIdentifier,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(
    StopPoll(chatId, messageId, replyMarkup)
@@ -25,7 +25,7 @@ suspend fun TelegramBot.stopPoll(
 */
 suspend fun TelegramBot.stopPoll(
    chat: Chat,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = stopPoll(chat.id, messageId, replyMarkup)

@@ -34,7 +34,7 @@ suspend fun TelegramBot.stopPoll(
 * as a builder for that
 */
 suspend fun TelegramBot.stopPoll(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    message: Message,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = stopPoll(chatId, message.messageId, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerCallbackQuery.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerCallbackQuery.kt
@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.extensions.api.answers

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.answers.AnswerCallbackQuery
-import dev.inmo.tgbotapi.types.queries.callback.CallbackQuery
+import dev.inmo.tgbotapi.types.CallbackQuery.CallbackQuery
 import dev.inmo.tgbotapi.types.CallbackQueryIdentifier

 suspend fun TelegramBot.answerCallbackQuery(
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerInlineQuery.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerInlineQuery.kt
@@ -2,7 +2,6 @@ package dev.inmo.tgbotapi.extensions.api.answers

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.answers.AnswerInlineQuery
-import dev.inmo.tgbotapi.requests.answers.InlineQueryResultsButton
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
 import dev.inmo.tgbotapi.types.InlineQueries.query.InlineQuery
 import dev.inmo.tgbotapi.types.InlineQueryIdentifier
@@ -13,37 +12,8 @@ suspend fun TelegramBot.answerInlineQuery(
    cachedTime: Int? = null,
    isPersonal: Boolean? = null,
    nextOffset: String? = null,
-    button: InlineQueryResultsButton? = null
-) = execute(
-    AnswerInlineQuery(inlineQueryID, results, cachedTime, isPersonal, nextOffset, button)
-)
-
-suspend fun TelegramBot.answerInlineQuery(
-    inlineQuery: InlineQuery,
-    results: List<InlineQueryResult> = emptyList(),
-    cachedTime: Int? = null,
-    isPersonal: Boolean? = null,
-    nextOffset: String? = null,
-    button: InlineQueryResultsButton? = null
-) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, button)
-
-suspend fun TelegramBot.answer(
-    inlineQuery: InlineQuery,
-    results: List<InlineQueryResult> = emptyList(),
-    cachedTime: Int? = null,
-    isPersonal: Boolean? = null,
-    nextOffset: String? = null,
-    button: InlineQueryResultsButton? = null
-) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, button)
-
-suspend fun TelegramBot.answerInlineQuery(
-    inlineQueryID: InlineQueryIdentifier,
-    results: List<InlineQueryResult> = emptyList(),
-    cachedTime: Int? = null,
-    isPersonal: Boolean? = null,
-    nextOffset: String? = null,
-    switchPmText: String?,
-    switchPmParameter: String?
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
 ) = execute(
    AnswerInlineQuery(inlineQueryID, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
 )
@@ -54,8 +24,8 @@ suspend fun TelegramBot.answerInlineQuery(
    cachedTime: Int? = null,
    isPersonal: Boolean? = null,
    nextOffset: String? = null,
-    switchPmText: String?,
-    switchPmParameter: String?
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
 ) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)

 suspend fun TelegramBot.answer(
@@ -64,6 +34,6 @@ suspend fun TelegramBot.answer(
    cachedTime: Int? = null,
    isPersonal: Boolean? = null,
    nextOffset: String? = null,
-    switchPmText: String?,
-    switchPmParameter: String?
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
 ) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerWebAppQuery.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerWebAppQuery.kt
@@ -1,16 +0,0 @@
-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))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/ClearMyDefaultAdministratorRights.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/ClearMyDefaultAdministratorRights.kt
@@ -1,12 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.ClearMyDefaultAdministratorRights
-
-suspend fun TelegramBot.clearMyDefaultAdministratorRights(
-    forChannels: Boolean? = null
-) = execute(ClearMyDefaultAdministratorRights(forChannels))
-
-suspend fun TelegramBot.clearMyDefaultAdministratorRightsForChannels() = clearMyDefaultAdministratorRights(forChannels = true)
-
-suspend fun TelegramBot.clearMyDefaultAdministratorRightsForGroupsAndSupergroups() = clearMyDefaultAdministratorRights(forChannels = false)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyDefaultAdministratorRights.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyDefaultAdministratorRights.kt
@@ -1,12 +0,0 @@
-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)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyDescription.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyDescription.kt
@@ -1,16 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
-import dev.inmo.tgbotapi.requests.bot.GetMyDescription
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.getMyDescription(
-    languageCode: IetfLanguageCode? = null
-) = execute(GetMyDescription(languageCode))
-
-suspend fun TelegramBot.getMyDescription(
-    languageCode: String?
-) = getMyDescription(languageCode ?.let(::IetfLanguageCode))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyName.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyName.kt
@@ -1,16 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
-import dev.inmo.tgbotapi.requests.bot.GetMyName
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.getMyName(
-    languageCode: IetfLanguageCode? = null
-) = execute(GetMyName(languageCode))
-
-suspend fun TelegramBot.getMyName(
-    languageCode: String?
-) = getMyName(languageCode ?.let(::IetfLanguageCode))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyShortDescription.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyShortDescription.kt
@@ -1,16 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
-import dev.inmo.tgbotapi.requests.bot.GetMyShortDescription
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.getMyShortDescription(
-    languageCode: IetfLanguageCode? = null
-) = execute(GetMyShortDescription(languageCode))
-
-suspend fun TelegramBot.getMyShortDescription(
-    languageCode: String?
-) = getMyShortDescription(languageCode ?.let(::IetfLanguageCode))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDefaultAdministratorRights.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDefaultAdministratorRights.kt
@@ -1,18 +0,0 @@
-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.chat.member.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)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDescription.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDescription.kt
@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
-import dev.inmo.tgbotapi.requests.bot.GetMyDescription
-import dev.inmo.tgbotapi.requests.bot.SetMyDescription
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.setMyDescription(
-    description: String? = null,
-    languageCode: IetfLanguageCode? = null
-) = execute(SetMyDescription(description, languageCode))
-
-suspend fun TelegramBot.setMyDescription(
-    description: String?,
-    languageCode: String?
-) = setMyDescription(description, languageCode ?.let(::IetfLanguageCode))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyName.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyName.kt
@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
-import dev.inmo.tgbotapi.requests.bot.GetMyName
-import dev.inmo.tgbotapi.requests.bot.SetMyName
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.setMyName(
-    name: String? = null,
-    languageCode: IetfLanguageCode? = null
-) = execute(SetMyName(name, languageCode))
-
-suspend fun TelegramBot.setMyName(
-    name: String?,
-    languageCode: String?
-) = setMyName(name, languageCode ?.let(::IetfLanguageCode))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyShortDescription.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyShortDescription.kt
@@ -1,15 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.SetMyShortDescription
-
-suspend fun TelegramBot.setMyShortDescription(
-    shortDescription: String? = null,
-    languageCode: IetfLanguageCode? = null
-) = execute(SetMyShortDescription(shortDescription, languageCode))
-
-suspend fun TelegramBot.setMyShortDescription(
-    shortDescription: String?,
-    languageCode: String?
-) = setMyShortDescription(shortDescription, languageCode ?.let(::IetfLanguageCode))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/ExportChatInviteLink.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/ExportChatInviteLink.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.ExportChatInviteLink
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.exportChatInviteLink(
    chatId: ChatIdentifier
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/LeaveChat.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/LeaveChat.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.LeaveChat
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.leaveChat(
    chatId: ChatIdentifier
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CloseForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CloseForumTopic.kt
@@ -1,28 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.CloseForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.closeForumTopic(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId
-) = execute(
-    CloseForumTopic(
-        chatId,
-        messageThreadId
-    )
-)
-
-suspend fun TelegramBot.closeForumTopic(
-    chat: Chat,
-    messageThreadId: MessageThreadId
-) = closeForumTopic(chat.id, messageThreadId)
-
-suspend fun TelegramBot.closeForumTopic(
-    chat: Chat,
-    forumTopic: ForumTopic
-) = closeForumTopic(chat.id, forumTopic.messageThreadId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CloseGeneralForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CloseGeneralForumTopic.kt
@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.CloseForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.CloseGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.closeGeneralForumTopic(
-    chatId: ChatIdentifier
-) = execute(
-    CloseGeneralForumTopic(chatId)
-)
-
-suspend fun TelegramBot.closeGeneralForumTopic(
-    chat: Chat
-) = closeGeneralForumTopic(chat.id)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CreateForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CreateForumTopic.kt
@@ -1,29 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.CreateForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.CustomEmojiId
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.utils.RGBColor
-
-suspend fun TelegramBot.createForumTopic(
-    chatId: ChatIdentifier,
-    name: String,
-    color: RGBColor,
-    iconEmojiId: CustomEmojiId? = null
-) = execute(
-    CreateForumTopic(
-        chatId,
-        name,
-        color,
-        iconEmojiId
-    )
-)
-
-suspend fun TelegramBot.createForumTopic(
-    chat: Chat,
-    name: String,
-    color: RGBColor,
-    iconEmojiId: CustomEmojiId? = null
-) = createForumTopic(chat.id, name, color, iconEmojiId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/DeleteForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/DeleteForumTopic.kt
@@ -1,33 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.DeleteForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.deleteForumTopic(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId
-) = execute(
-    DeleteForumTopic(
-        chatId,
-        messageThreadId
-    )
-)
-
-suspend fun TelegramBot.deleteForumTopic(
-    chatId: ChatIdentifier,
-    forumTopic: ForumTopic
-) = deleteForumTopic(chatId, forumTopic.messageThreadId)
-
-suspend fun TelegramBot.deleteForumTopic(
-    chat: Chat,
-    messageThreadId: MessageThreadId
-) = deleteForumTopic(chat.id, messageThreadId)
-
-suspend fun TelegramBot.deleteForumTopic(
-    chat: Chat,
-    forumTopic: ForumTopic
-) = deleteForumTopic(chat.id, forumTopic.messageThreadId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/EditForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/EditForumTopic.kt
@@ -1,36 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.EditForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.CustomEmojiId
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.editForumTopic(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId,
-    name: String? = null,
-    iconEmojiId: CustomEmojiId? = null
-) = execute(
-    EditForumTopic(
-        chatId,
-        messageThreadId,
-        name,
-        iconEmojiId
-    )
-)
-
-suspend fun TelegramBot.editForumTopic(
-    chat: Chat,
-    messageThreadId: MessageThreadId,
-    name: String? = null,
-    iconEmojiId: CustomEmojiId? = null
-) = editForumTopic(chat.id, messageThreadId, name, iconEmojiId)
-
-suspend fun TelegramBot.editForumTopic(
-    chatIdentifier: ChatIdentifier,
-    forumTopic: ForumTopic,
-    iconEmojiId: CustomEmojiId? = forumTopic.iconEmojiId
-) = editForumTopic(chatIdentifier, forumTopic.messageThreadId, forumTopic.name, iconEmojiId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/EditGeneralForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/EditGeneralForumTopic.kt
@@ -1,30 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.EditForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.EditGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.CustomEmojiId
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.editGeneralForumTopic(
-    chatId: ChatIdentifier,
-    name: String
-) = execute(
-    EditGeneralForumTopic(
-        chatId,
-        name
-    )
-)
-
-suspend fun TelegramBot.editGeneralForumTopic(
-    chat: Chat,
-    name: String
-) = editGeneralForumTopic(chat.id, name)
-
-suspend fun TelegramBot.editGeneralForumTopic(
-    chatIdentifier: ChatIdentifier,
-    forumTopic: ForumTopic,
-) = editGeneralForumTopic(chatIdentifier, forumTopic.name)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/HideGeneralForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/HideGeneralForumTopic.kt
@@ -1,20 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.CloseForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.CloseGeneralForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.HideGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.hideGeneralForumTopic(
-    chatId: ChatIdentifier
-) = execute(
-    HideGeneralForumTopic(chatId)
-)
-
-suspend fun TelegramBot.hideGeneralForumTopic(
-    chat: Chat
-) = hideGeneralForumTopic(chat.id)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/ReopenForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/ReopenForumTopic.kt
@@ -1,28 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.ReopenForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.reopenForumTopic(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId
-) = execute(
-    ReopenForumTopic(
-        chatId,
-        messageThreadId
-    )
-)
-
-suspend fun TelegramBot.reopenForumTopic(
-    chat: Chat,
-    messageThreadId: MessageThreadId
-) = reopenForumTopic(chat.id, messageThreadId)
-
-suspend fun TelegramBot.reopenForumTopic(
-    chat: Chat,
-    forumTopic: ForumTopic
-) = reopenForumTopic(chat.id, forumTopic.messageThreadId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/ReopenGeneralForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/ReopenGeneralForumTopic.kt
@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.ReopenForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.ReopenGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.reopenGeneralForumTopic(
-    chatId: ChatIdentifier
-) = execute(
-    ReopenGeneralForumTopic(chatId)
-)
-
-suspend fun TelegramBot.reopenGeneralForumTopic(
-    chat: Chat
-) = reopenGeneralForumTopic(chat.id)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/UnhideGeneralForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/UnhideGeneralForumTopic.kt
@@ -1,21 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.CloseForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.CloseGeneralForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.HideGeneralForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.UnhideGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.unhideGeneralForumTopic(
-    chatId: ChatIdentifier
-) = execute(
-    UnhideGeneralForumTopic(chatId)
-)
-
-suspend fun TelegramBot.unhideGeneralForumTopic(
-    chat: Chat
-) = unhideGeneralForumTopic(chat.id)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/UnpinAllForumTopicMessages.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/UnpinAllForumTopicMessages.kt
@@ -1,28 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.UnpinAllForumTopicMessages
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.unpinAllForumTopicMessages(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId
-) = execute(
-    UnpinAllForumTopicMessages(
-        chatId,
-        messageThreadId
-    )
-)
-
-suspend fun TelegramBot.unpinAllForumTopicMessages(
-    chat: Chat,
-    messageThreadId: MessageThreadId
-) = unpinAllForumTopicMessages(chat.id, messageThreadId)
-
-suspend fun TelegramBot.unpinAllForumTopicMessages(
-    chat: Chat,
-    forumTopic: ForumTopic
-) = unpinAllForumTopicMessages(chat.id, forumTopic.messageThreadId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChat.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChat.kt
@@ -2,28 +2,11 @@ package dev.inmo.tgbotapi.extensions.api.chat.get

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.get.GetChat
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.ChannelChat
-import dev.inmo.tgbotapi.types.chat.ChannelChatImpl
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.chat.ExtendedChannelChat
-import dev.inmo.tgbotapi.types.chat.ExtendedChannelChatImpl
-import dev.inmo.tgbotapi.types.chat.ExtendedGroupChat
-import dev.inmo.tgbotapi.types.chat.ExtendedGroupChatImpl
-import dev.inmo.tgbotapi.types.chat.ExtendedPrivateChat
-import dev.inmo.tgbotapi.types.chat.ExtendedPrivateChatImpl
-import dev.inmo.tgbotapi.types.chat.ExtendedPublicChat
-import dev.inmo.tgbotapi.types.chat.ExtendedSupergroupChat
-import dev.inmo.tgbotapi.types.chat.ExtendedSupergroupChatImpl
-import dev.inmo.tgbotapi.types.chat.ExtendedUser
-import dev.inmo.tgbotapi.types.chat.GroupChat
-import dev.inmo.tgbotapi.types.chat.GroupChatImpl
-import dev.inmo.tgbotapi.types.chat.PrivateChat
-import dev.inmo.tgbotapi.types.chat.PrivateChatImpl
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.SupergroupChat
-import dev.inmo.tgbotapi.types.chat.SupergroupChatImpl
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.*
+import dev.inmo.tgbotapi.types.chat.abstracts.*
+import dev.inmo.tgbotapi.types.chat.abstracts.extended.*
+import dev.inmo.tgbotapi.types.chat.extended.*
 import dev.inmo.tgbotapi.utils.PreviewFeature

 suspend fun TelegramBot.getChat(
@@ -35,7 +18,7 @@ suspend fun TelegramBot.getChat(
 ) = getChat(chat.id)

 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedPublicChat] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -47,7 +30,7 @@ suspend fun TelegramBot.getChat(


 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedChannelChat] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -58,7 +41,7 @@ suspend fun TelegramBot.getChat(
 ) = getChat(chat.id) as ExtendedChannelChat

 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedChannelChatImpl] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -70,7 +53,7 @@ suspend fun TelegramBot.getChat(


 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedGroupChat] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -81,7 +64,7 @@ suspend fun TelegramBot.getChat(
 ) = getChat(chat.id) as ExtendedGroupChat

 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedGroupChatImpl] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -93,7 +76,7 @@ suspend fun TelegramBot.getChat(


 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedSupergroupChat] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -104,7 +87,7 @@ suspend fun TelegramBot.getChat(
 ) = getChat(chat.id) as ExtendedSupergroupChat

 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedSupergroupChatImpl] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -116,7 +99,7 @@ suspend fun TelegramBot.getChat(


 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedPrivateChat] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -127,7 +110,7 @@ suspend fun TelegramBot.getChat(
 ) = getChat(chat.id) as ExtendedPrivateChat

 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedPrivateChatImpl] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -138,7 +121,7 @@ suspend fun TelegramBot.getChat(
 ) = getChat(chat.id) as ExtendedPrivateChatImpl

 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedUser] with unsafe operator "as"
 *
 * @throws ClassCastException
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatAdministrators.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatAdministrators.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.get
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.get.GetChatAdministrators
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.getChatAdministrators(
    chatId: ChatIdentifier
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMemberCount.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMemberCount.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.get
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.get.GetChatMemberCount
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.getChatMemberCount(
    chatId: ChatIdentifier
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMenuButton.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMenuButton.kt
@@ -1,14 +0,0 @@
-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.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PrivateChat
-
-suspend fun TelegramBot.getChatMenuButton(
-    chatId: IdChatIdentifier
-) = execute(GetChatMenuButton(chatId))
-
-suspend fun TelegramBot.getChatMenuButton(
-    chat: PrivateChat
-) = getChatMenuButton(chat.id)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetDefaultChatMenuButton.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetDefaultChatMenuButton.kt
@@ -1,6 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.get
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.get.GetDefaultChatMenuButton
-
-suspend fun TelegramBot.getDefaultChatMenuButton() = execute(GetDefaultChatMenuButton)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetForumTopicIconStickers.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetForumTopicIconStickers.kt
@@ -1,6 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.get
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.get.GetForumTopicIconStickers
-
-suspend fun TelegramBot.getForumTopicIconStickers() = execute(GetForumTopicIconStickers)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/ApproveChatJoinRequest.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/ApproveChatJoinRequest.kt
@@ -2,11 +2,8 @@ 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.ChatIdentifier
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.ChatJoinRequest
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 import dev.inmo.tgbotapi.types.update.ChatJoinRequestUpdate

 suspend fun TelegramBot.approveChatJoinRequest(
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/CreateChatInviteLink.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/CreateChatInviteLink.kt
@@ -1,13 +1,10 @@
 package dev.inmo.tgbotapi.extensions.api.chat.invite_links

-import korlibs.time.DateTime
+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.ChatIdentifier
-import dev.inmo.tgbotapi.types.MembersLimit
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.toTelegramDate
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.createChatInviteLinkUnlimited(
    chatId: ChatIdentifier,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/DeclineChatJoinRequest.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/DeclineChatJoinRequest.kt
@@ -1,12 +1,10 @@
 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.ChatIdentifier
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.ChatJoinRequest
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 import dev.inmo.tgbotapi.types.update.ChatJoinRequestUpdate

 suspend fun TelegramBot.declineChatJoinRequest(
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/EditChatInviteLink.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/EditChatInviteLink.kt
@@ -1,14 +1,10 @@
 package dev.inmo.tgbotapi.extensions.api.chat.invite_links

-import korlibs.time.DateTime
+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.ChatIdentifier
-import dev.inmo.tgbotapi.types.ChatInviteLink
-import dev.inmo.tgbotapi.types.MembersLimit
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.toTelegramDate
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.editChatInviteLinkUnlimited(
    chatId: ChatIdentifier,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/RevokeChatInviteLink.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/RevokeChatInviteLink.kt
@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.invite_links.RevokeChatInviteLink
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.ChatInviteLink
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.revokeChatInviteLink(
    chatId: ChatIdentifier,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/BanChatMember.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/BanChatMember.kt
@@ -2,12 +2,8 @@ package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.BanChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.banChatMember(
    chatId: ChatIdentifier,
@@ -24,7 +20,7 @@ suspend fun TelegramBot.banChatMember(
 ) = banChatMember(chat.id, userId, untilDate, revokeMessages)

 suspend fun TelegramBot.banChatMember(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    user: User,
    untilDate: TelegramDate? = null,
    revokeMessages: Boolean? = null
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/BanChatSenderChat.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/BanChatSenderChat.kt
@@ -1,23 +1,23 @@
 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.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.banChatSenderChat(
    chatId: ChatIdentifier,
-    senderChatId: IdChatIdentifier
+    senderChatId: ChatId
 ) = execute(BanChatSenderChat(chatId, senderChatId))

 suspend fun TelegramBot.banChatSenderChat(
    chat: PublicChat,
-    senderChatId: IdChatIdentifier
+    senderChatId: ChatId
 ) = banChatSenderChat(chat.id, senderChatId)

 suspend fun TelegramBot.banChatSenderChat(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    senderChat: PublicChat
 ) = banChatSenderChat(chatId, senderChat.id)

--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/GetChatMember.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/GetChatMember.kt
@@ -2,11 +2,8 @@ package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.GetChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.getChatMember(
    chatId: ChatIdentifier,
@@ -19,7 +16,7 @@ suspend fun TelegramBot.getChatMember(
 ) = getChatMember(chat.id, userId)

 suspend fun TelegramBot.getChatMember(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    user: User
 ) = getChatMember(chatId, user.id)

--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatMember.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatMember.kt
@@ -2,12 +2,8 @@ package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.promoteChatMember(
    chatId: ChatIdentifier,
@@ -22,9 +18,8 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers: Boolean? = null,
    canPinMessages: Boolean? = null,
    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null
+    canManageVoiceChats: Boolean? = null,
+    canManageChat: Boolean?
 ) = execute(
    PromoteChatMember(
        chatId,
@@ -39,9 +34,8 @@ suspend fun TelegramBot.promoteChatMember(
        canRestrictMembers,
        canPinMessages,
        canPromoteMembers,
-        canManageVideoChats,
-        canManageChat,
-        canManageTopics
+        canManageVoiceChats,
+        canManageChat
    )
 )

@@ -58,9 +52,8 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers: Boolean? = null,
    canPinMessages: Boolean? = null,
    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null
+    canManageVoiceChats: Boolean? = null,
+    canManageChat: Boolean? = null
 ) = promoteChatMember(
    chat.id,
    userId,
@@ -74,13 +67,12 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers,
    canPinMessages,
    canPromoteMembers,
-    canManageVideoChats,
-    canManageChat,
-    canManageTopics
+    canManageVoiceChats,
+    canManageChat
 )

 suspend fun TelegramBot.promoteChatMember(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    user: User,
    untilDate: TelegramDate? = null,
    isAnonymous: Boolean? = null,
@@ -92,9 +84,8 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers: Boolean? = null,
    canPinMessages: Boolean? = null,
    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null
+    canManageVoiceChats: Boolean? = null,
+    canManageChat: Boolean? = null
 ) = promoteChatMember(
    chatId,
    user.id,
@@ -108,9 +99,8 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers,
    canPinMessages,
    canPromoteMembers,
-    canManageVideoChats,
-    canManageChat,
-    canManageTopics
+    canManageVoiceChats,
+    canManageChat
 )

 suspend fun TelegramBot.promoteChatMember(
@@ -126,9 +116,8 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers: Boolean? = null,
    canPinMessages: Boolean? = null,
    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null
+    canManageVoiceChats: Boolean? = null,
+    canManageChat: Boolean? = null
 ) = promoteChatMember(
    chat.id,
    user.id,
@@ -142,7 +131,6 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers,
    canPinMessages,
    canPromoteMembers,
-    canManageVideoChats,
-    canManageChat,
-    canManageTopics
+    canManageVoiceChats,
+    canManageChat
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/RestrictChatMember.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/RestrictChatMember.kt
@@ -2,43 +2,35 @@ package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.RestrictChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.ChatPermissions
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.restrictChatMember(
    chatId: ChatIdentifier,
    userId: UserId,
    untilDate: TelegramDate? = null,
-    permissions: ChatPermissions = ChatPermissions(),
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = execute(RestrictChatMember(chatId, userId, untilDate, permissions, useIndependentChatPermissions))
+    permissions: ChatPermissions = ChatPermissions()
+) = execute(RestrictChatMember(chatId, userId, untilDate, permissions))

 suspend fun TelegramBot.restrictChatMember(
    chat: PublicChat,
    userId: UserId,
    untilDate: TelegramDate? = null,
-    permissions: ChatPermissions = ChatPermissions(),
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = restrictChatMember(chat.id, userId, untilDate, permissions, useIndependentChatPermissions)
+    permissions: ChatPermissions = ChatPermissions()
+) = restrictChatMember(chat.id, userId, untilDate, permissions)

 suspend fun TelegramBot.restrictChatMember(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    user: User,
    untilDate: TelegramDate? = null,
-    permissions: ChatPermissions = ChatPermissions(),
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = restrictChatMember(chatId, user.id, untilDate, permissions, useIndependentChatPermissions)
+    permissions: ChatPermissions = ChatPermissions()
+) = restrictChatMember(chatId, user.id, untilDate, permissions)

 suspend fun TelegramBot.restrictChatMember(
    chat: PublicChat,
    user: User,
    untilDate: TelegramDate? = null,
-    permissions: ChatPermissions = ChatPermissions(),
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = restrictChatMember(chat.id, user.id, untilDate, permissions, useIndependentChatPermissions)
+    permissions: ChatPermissions = ChatPermissions()
+) = restrictChatMember(chat.id, user.id, untilDate, permissions)

--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/SetChatAdministratorCustomTitle.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/SetChatAdministratorCustomTitle.kt
@@ -2,13 +2,11 @@ package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.SetChatAdministratorCustomTitle
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.setChatAdministratorCustomTitle(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    userId: UserId,
    customTitle: String
 ) = execute(SetChatAdministratorCustomTitle(chatId, userId, customTitle))
@@ -20,7 +18,7 @@ suspend fun TelegramBot.setChatAdministratorCustomTitle(
 ) = setChatAdministratorCustomTitle(chat.id, userId, customTitle)

 suspend fun TelegramBot.setChatAdministratorCustomTitle(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    user: User,
    customTitle: String
 ) = setChatAdministratorCustomTitle(chatId, user.id, customTitle)
@@ -29,4 +27,4 @@ suspend fun TelegramBot.setChatAdministratorCustomTitle(
    chat: PublicChat,
    user: User,
    customTitle: String
-) = setChatAdministratorCustomTitle(chat.id, user.id, customTitle)
+) = setChatAdministratorCustomTitle(chat.id, user.id, customTitle)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/UnbanChatMember.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/UnbanChatMember.kt
@@ -2,11 +2,8 @@ package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.UnbanChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.unbanChatMember(
    chatId: ChatIdentifier,
@@ -21,7 +18,7 @@ suspend fun TelegramBot.unbanChatMember(
 ) = unbanChatMember(chat.id, userId, onlyIfBanned)

 suspend fun TelegramBot.unbanChatMember(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    user: User,
    onlyIfBanned: Boolean? = null
 ) = unbanChatMember(chatId, user.id, onlyIfBanned)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/UnbanChatSenderChat.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/UnbanChatSenderChat.kt
@@ -1,23 +1,22 @@
 package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.members.UnbanChatSenderChat
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+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: IdChatIdentifier
+    senderChatId: ChatId
 ) = execute(UnbanChatSenderChat(chatId, senderChatId))

 suspend fun TelegramBot.unbanChatSenderChat(
    chat: PublicChat,
-    senderChatId: IdChatIdentifier
+    senderChatId: ChatId
 ) = unbanChatSenderChat(chat.id, senderChatId)

 suspend fun TelegramBot.unbanChatSenderChat(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    senderChat: PublicChat
 ) = unbanChatSenderChat(chatId, senderChat.id)

--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/DeleteChatPhoto.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/DeleteChatPhoto.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.DeleteChatPhoto
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.deleteChatPhoto(
    chatId: ChatIdentifier
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/PinChatMessage.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/PinChatMessage.kt
@@ -3,19 +3,19 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.PinChatMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message

 suspend fun TelegramBot.pinChatMessage(
    chatId: ChatIdentifier,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    disableNotification: Boolean = false
 ) = execute(PinChatMessage(chatId, messageId, disableNotification))

 suspend fun TelegramBot.pinChatMessage(
    chat: Chat,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    disableNotification: Boolean = false
 ) = pinChatMessage(chat.id, messageId, disableNotification)

--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatDescription.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatDescription.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.SetChatDescription
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.setChatDescription(
    chatId: ChatIdentifier,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatMenuButton.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatMenuButton.kt
@@ -1,17 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.modify
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.modify.SetChatMenuButton
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.MenuButton
-import dev.inmo.tgbotapi.types.chat.PrivateChat
-
-suspend fun TelegramBot.setChatMenuButton(
-    chatId: IdChatIdentifier,
-    menuButton: MenuButton
-) = execute(SetChatMenuButton(chatId, menuButton))
-
-suspend fun TelegramBot.setChatMenuButton(
-    chat: PrivateChat,
-    menuButton: MenuButton
-) = setChatMenuButton(chat.id, menuButton)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPermissions.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPermissions.kt
@@ -4,16 +4,14 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.SetChatPermissions
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.chat.ChatPermissions
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.setDefaultChatMembersPermissions(
    chatId: ChatIdentifier,
-    permissions: ChatPermissions,
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = execute(SetChatPermissions(chatId, permissions, useIndependentChatPermissions))
+    permissions: ChatPermissions
+) = execute(SetChatPermissions(chatId, permissions))

 suspend fun TelegramBot.setDefaultChatMembersPermissions(
    chat: PublicChat,
-    permissions: ChatPermissions,
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = setDefaultChatMembersPermissions(chat.id, permissions, useIndependentChatPermissions)
+    permissions: ChatPermissions
+) = setDefaultChatMembersPermissions(chat.id, permissions)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPhoto.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPhoto.kt
@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
 import dev.inmo.tgbotapi.requests.chat.modify.SetChatPhoto
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.setChatPhoto(
    chatId: ChatIdentifier,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatTitle.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatTitle.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.SetChatTitle
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.setChatTitle(
    chatId: ChatIdentifier,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetDefaultChatMenuButton.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetDefaultChatMenuButton.kt
@@ -1,9 +0,0 @@
-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))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinAllChatMessages.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinAllChatMessages.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.UnpinAllChatMessages
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat

 suspend fun TelegramBot.unpinAllChatMessages(
    chatId: ChatIdentifier
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt
@@ -3,18 +3,18 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.UnpinChatMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message

 suspend fun TelegramBot.unpinChatMessage(
    chatId: ChatIdentifier,
-    messageId: MessageId? = null
+    messageId: MessageIdentifier? = null
 ) = execute(UnpinChatMessage(chatId, messageId))

 suspend fun TelegramBot.unpinChatMessage(
    chat: Chat,
-    messageId: MessageId? = null
+    messageId: MessageIdentifier? = null
 ) = unpinChatMessage(chat.id, messageId)

 suspend fun TelegramBot.unpinChatMessage(
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/DeleteChatStickerSet.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/DeleteChatStickerSet.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.stickers
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.stickers.DeleteChatStickerSet
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.SupergroupChat
+import dev.inmo.tgbotapi.types.chat.abstracts.SupergroupChat

 suspend fun TelegramBot.deleteChatStickerSet(
    chatId: ChatIdentifier
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/SetChatStickerSet.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/SetChatStickerSet.kt
@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.stickers.SetChatStickerSet
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.StickerSetName
-import dev.inmo.tgbotapi.types.chat.SupergroupChat
+import dev.inmo.tgbotapi.types.chat.abstracts.SupergroupChat

 suspend fun TelegramBot.setChatStickerSet(
    chatId: ChatIdentifier,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/Edits.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/Edits.kt
@@ -1,308 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit
-
-import dev.inmo.tgbotapi.abstracts.TextedWithTextSources
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.caption.editMessageCaption
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
-import dev.inmo.tgbotapi.extensions.api.edit.media.editMessageMedia
-import dev.inmo.tgbotapi.extensions.api.edit.reply_markup.editMessageReplyMarkup
-import dev.inmo.tgbotapi.extensions.api.edit.text.editMessageText
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.location.LiveLocation
-import dev.inmo.tgbotapi.types.media.TelegramMedia
-import dev.inmo.tgbotapi.types.message.ParseMode
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.message.content.*
-import dev.inmo.tgbotapi.types.message.textsources.TextSource
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.utils.EntitiesBuilderBody
-import dev.inmo.tgbotapi.utils.buildEntities
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun <T> TelegramBot.edit(
-    message: ContentMessage<T>,
-    text: String,
-    parseMode: ParseMode? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-): ContentMessage<T> where T : TextedWithTextSources, T : MediaContent {
-    return editMessageCaption(message, 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.edit(
-    message: ContentMessage<T>,
-    entities: List<TextSource>,
-    replyMarkup: InlineKeyboardMarkup? = null
-): ContentMessage<T> where T : TextedWithTextSources, T : MediaContent {
-    return editMessageCaption(message, entities, replyMarkup)
-}
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chatId, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chat: Chat,
-    messageId: MessageId,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chat, 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.edit(
-    message: ContentMessage<LocationContent>,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(message, 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.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(
-    chatId, messageId, location, replyMarkup
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chat: Chat,
-    messageId: MessageId,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chat, messageId, location, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    message: ContentMessage<LocationContent>,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(message, location, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    media: TelegramMedia,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageMedia(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.edit(
-    chat: Chat,
-    messageId: MessageId,
-    media: TelegramMedia,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageMedia(chat, messageId, media, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    message: ContentMessage<MediaContent>,
-    media: TelegramMedia,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageMedia(message, media, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(chatId, messageId, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chat: Chat,
-    messageId: MessageId,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(chat, messageId, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    message: Message,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(message, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    text: String,
-    parseMode: ParseMode? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(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.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    entities: TextSourcesList,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(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.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    separator: TextSource? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(chatId, messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    separator: String,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(chatId, messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    message: ContentMessage<TextContent>,
-    text: String,
-    parseMode: ParseMode? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = edit(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.edit(
-    message: ContentMessage<TextContent>,
-    entities: TextSourcesList,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = edit(message.chat.id, message.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.edit(
-    message: ContentMessage<TextContent>,
-    separator: TextSource? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(message, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    message: ContentMessage<TextContent>,
-    separator: String,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(message, buildEntities(separator, builderBody), 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>,
-    separator: TextSource? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(message, buildEntities(separator, builderBody), 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>,
-    separator: String,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(message, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/InlineEdits.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/InlineEdits.kt
@@ -1,114 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit
-
-import dev.inmo.tgbotapi.abstracts.TextedWithTextSources
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.caption.editMessageCaption
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
-import dev.inmo.tgbotapi.extensions.api.edit.media.editMessageMedia
-import dev.inmo.tgbotapi.extensions.api.edit.reply_markup.editMessageReplyMarkup
-import dev.inmo.tgbotapi.extensions.api.edit.text.editMessageText
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.location.LiveLocation
-import dev.inmo.tgbotapi.types.media.TelegramMedia
-import dev.inmo.tgbotapi.types.message.ParseMode
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.message.content.*
-import dev.inmo.tgbotapi.types.message.textsources.TextSource
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.utils.EntitiesBuilderBody
-import dev.inmo.tgbotapi.utils.buildEntities
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(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.edit(
-    messageId: InlineMessageIdentifier,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(
-    messageId, location, replyMarkup
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
-    media: TelegramMedia,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageMedia(messageId, media, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(messageId, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
-    text: String,
-    parseMode: ParseMode? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(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.edit(
-    messageId: InlineMessageIdentifier,
-    entities: TextSourcesList,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(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.edit(
-    messageId: InlineMessageIdentifier,
-    separator: TextSource? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
-    separator: String,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/EditChatMessageLiveLocation.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/EditChatMessageLiveLocation.kt
@@ -1,10 +1,10 @@
-package dev.inmo.tgbotapi.extensions.api.edit.location.live
+package dev.inmo.tgbotapi.extensions.api.edit.LiveLocation

 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.location.live.EditChatMessageLiveLocation
+import dev.inmo.tgbotapi.requests.edit.LiveLocation.EditChatMessageLiveLocation
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.location.LiveLocation
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.LocationContent
@@ -15,7 +15,7 @@ import dev.inmo.tgbotapi.types.message.content.LocationContent
 */
 suspend fun TelegramBot.editLiveLocation(
    chatId: ChatIdentifier,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    latitude: Double,
    longitude: Double,
    horizontalAccuracy: Meters? = null,
@@ -34,7 +34,7 @@ suspend fun TelegramBot.editLiveLocation(
 */
 suspend fun TelegramBot.editLiveLocation(
    chat: Chat,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    latitude: Double,
    longitude: Double,
    horizontalAccuracy: Meters? = null,
@@ -63,7 +63,7 @@ suspend fun TelegramBot.editLiveLocation(
 */
 suspend fun TelegramBot.editLiveLocation(
    chatId: ChatIdentifier,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    location: LiveLocation,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(
@@ -78,7 +78,7 @@ suspend fun TelegramBot.editLiveLocation(
 */
 suspend fun TelegramBot.editLiveLocation(
    chat: Chat,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    location: LiveLocation,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = editLiveLocation(chat.id, messageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/EditInlineMessageLiveLocation.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/EditInlineMessageLiveLocation.kt
@@ -1,7 +1,7 @@
-package dev.inmo.tgbotapi.extensions.api.edit.location.live
+package dev.inmo.tgbotapi.extensions.api.edit.LiveLocation

 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.location.live.EditInlineMessageLiveLocation
+import dev.inmo.tgbotapi.requests.edit.LiveLocation.EditInlineMessageLiveLocation
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.location.LiveLocation
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/StopChatMessageLiveLocation.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/StopChatMessageLiveLocation.kt
@@ -1,11 +1,11 @@
-package dev.inmo.tgbotapi.extensions.api.edit.location.live
+package dev.inmo.tgbotapi.extensions.api.edit.LiveLocation

 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.location.live.StopChatMessageLiveLocation
+import dev.inmo.tgbotapi.requests.edit.LiveLocation.StopChatMessageLiveLocation
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
+import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.LocationContent

@@ -15,7 +15,7 @@ import dev.inmo.tgbotapi.types.message.content.LocationContent
 */
 suspend fun TelegramBot.stopLiveLocation(
    chatId: ChatIdentifier,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(
    StopChatMessageLiveLocation(
@@ -29,7 +29,7 @@ suspend fun TelegramBot.stopLiveLocation(
 */
 suspend fun TelegramBot.stopLiveLocation(
    chat: Chat,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = stopLiveLocation(chat.id, messageId, replyMarkup)

--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/StopInlineMessageLiveLocation.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/StopInlineMessageLiveLocation.kt
@@ -1,7 +1,7 @@
-package dev.inmo.tgbotapi.extensions.api.edit.location.live
+package dev.inmo.tgbotapi.extensions.api.edit.LiveLocation

 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.location.live.StopInlineMessageLiveLocation
+import dev.inmo.tgbotapi.requests.edit.LiveLocation.StopInlineMessageLiveLocation
 import dev.inmo.tgbotapi.types.InlineMessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup

--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/reply_markup/EditChatMessageReplyMarkup.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/reply_markup/EditChatMessageReplyMarkup.kt
@@ -1,11 +1,11 @@
-package dev.inmo.tgbotapi.extensions.api.edit.reply_markup
+package dev.inmo.tgbotapi.extensions.api.edit.ReplyMarkup

 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.reply_markup.EditChatMessageReplyMarkup
+import dev.inmo.tgbotapi.requests.edit.ReplyMarkup.EditChatMessageReplyMarkup
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
+import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message

 /**
@@ -14,7 +14,7 @@ import dev.inmo.tgbotapi.types.message.abstracts.Message
 */
 suspend fun TelegramBot.editMessageReplyMarkup(
    chatId: ChatIdentifier,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(
    EditChatMessageReplyMarkup(chatId, messageId, replyMarkup)
@@ -26,7 +26,7 @@ suspend fun TelegramBot.editMessageReplyMarkup(
 */
 suspend fun TelegramBot.editMessageReplyMarkup(
    chat: Chat,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageReplyMarkup(chat.id, messageId, replyMarkup)

--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/reply_markup/EditInlineMessageReplyMarkup.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/reply_markup/EditInlineMessageReplyMarkup.kt
@@ -1,7 +1,7 @@
-package dev.inmo.tgbotapi.extensions.api.edit.reply_markup
+package dev.inmo.tgbotapi.extensions.api.edit.ReplyMarkup

 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.reply_markup.EditInlineMessageReplyMarkup
+import dev.inmo.tgbotapi.requests.edit.ReplyMarkup.EditInlineMessageReplyMarkup
 import dev.inmo.tgbotapi.types.InlineMessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup

--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditChatMessageCaption.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditChatMessageCaption.kt
@@ -1,19 +1,17 @@
 package dev.inmo.tgbotapi.extensions.api.edit.caption

-import dev.inmo.tgbotapi.abstracts.TextedWithTextSources
+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.message.textsources.TextSource
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.message.ParseMode
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.message.content.MediaContent
-import dev.inmo.tgbotapi.utils.RiskFeature
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent

 /**
 * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -21,7 +19,7 @@ import dev.inmo.tgbotapi.utils.RiskFeature
 */
 suspend fun TelegramBot.editMessageCaption(
    chatId: ChatIdentifier,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    text: String,
    parseMode: ParseMode? = null,
    replyMarkup: InlineKeyboardMarkup? = null
@@ -35,7 +33,7 @@ suspend fun TelegramBot.editMessageCaption(
 */
 suspend fun TelegramBot.editMessageCaption(
    chat: Chat,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    text: String,
    parseMode: ParseMode? = null,
    replyMarkup: InlineKeyboardMarkup? = null
@@ -50,9 +48,8 @@ suspend fun <T> TelegramBot.editMessageCaption(
    text: String,
    parseMode: ParseMode? = null,
    replyMarkup: InlineKeyboardMarkup? = null
-): ContentMessage<T> where T : TextedWithTextSources, T : MediaContent {
-    @Suppress("UNCHECKED_CAST")
-    return editMessageCaption(message.chat.id, message.messageId, text, parseMode, replyMarkup) as ContentMessage<T>
+): ContentMessage<MediaContent> where T : TextedWithTextSources, T : MediaContent {
+    return editMessageCaption(message.chat.id, message.messageId, text, parseMode, replyMarkup)
 }

 /**
@@ -61,7 +58,7 @@ suspend fun <T> TelegramBot.editMessageCaption(
 */
 suspend fun TelegramBot.editMessageCaption(
    chatId: ChatIdentifier,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(
@@ -74,7 +71,7 @@ suspend fun TelegramBot.editMessageCaption(
 */
 suspend fun TelegramBot.editMessageCaption(
    chat: Chat,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    entities: List<TextSource>,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageCaption(chat.id, messageId, entities, replyMarkup)
@@ -87,20 +84,6 @@ suspend fun <T> TelegramBot.editMessageCaption(
    message: ContentMessage<T>,
    entities: List<TextSource>,
    replyMarkup: InlineKeyboardMarkup? = null
-): ContentMessage<T> where T : TextedWithTextSources, T : MediaContent {
-    @Suppress("UNCHECKED_CAST")
-    return editMessageCaption(message.chat.id, message.messageId, entities, replyMarkup) as ContentMessage<T>
-}
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-@RiskFeature("This method is unsafe due to absence of any guaranties about the type of message. In case if message is not media message this method will throw an exception")
-suspend fun <T> TelegramBot.editMessageCaption(
-    message: Message,
-    entities: List<TextSource>,
-    replyMarkup: InlineKeyboardMarkup? = null
 ): ContentMessage<MediaContent> where T : TextedWithTextSources, T : MediaContent {
    return editMessageCaption(message.chat.id, message.messageId, entities, replyMarkup)
 }
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditInlineMessageCaption.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditInlineMessageCaption.kt
@@ -3,8 +3,8 @@ package dev.inmo.tgbotapi.extensions.api.edit.caption
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.edit.caption.EditInlineMessageCaption
 import dev.inmo.tgbotapi.types.InlineMessageIdentifier
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.message.ParseMode
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup

 /**
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditChatMessageMedia.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditChatMessageMedia.kt
@@ -3,12 +3,12 @@ package dev.inmo.tgbotapi.extensions.api.edit.media
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.edit.media.EditChatMessageMedia
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.media.TelegramMedia
-import dev.inmo.tgbotapi.types.MessageId
+import dev.inmo.tgbotapi.types.InputMedia.InputMedia
+import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.content.MediaContent
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent

 /**
 * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -16,8 +16,8 @@ import dev.inmo.tgbotapi.types.message.content.MediaContent
 */
 suspend fun TelegramBot.editMessageMedia(
    chatId: ChatIdentifier,
-    messageId: MessageId,
-    media: TelegramMedia,
+    messageId: MessageIdentifier,
+    media: InputMedia,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(
    EditChatMessageMedia(chatId, messageId, media, replyMarkup)
@@ -29,8 +29,8 @@ suspend fun TelegramBot.editMessageMedia(
 */
 suspend fun TelegramBot.editMessageMedia(
    chat: Chat,
-    messageId: MessageId,
-    media: TelegramMedia,
+    messageId: MessageIdentifier,
+    media: InputMedia,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageMedia(chat.id, messageId, media, replyMarkup)

@@ -40,6 +40,6 @@ suspend fun TelegramBot.editMessageMedia(
 */
 suspend fun TelegramBot.editMessageMedia(
    message: ContentMessage<out MediaContent>,
-    media: TelegramMedia,
+    media: InputMedia,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageMedia(message.chat.id, message.messageId, media, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditInlineMessageMedia.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditInlineMessageMedia.kt
@@ -3,15 +3,15 @@ package dev.inmo.tgbotapi.extensions.api.edit.media
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.edit.media.EditInlineMessageMedia
 import dev.inmo.tgbotapi.types.InlineMessageIdentifier
-import dev.inmo.tgbotapi.types.media.TelegramMedia
+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.editMessageMedia(
+suspend fun TelegramBot.editMessageCaption(
    inlineMessageId: InlineMessageIdentifier,
-    media: TelegramMedia,
+    media: InputMedia,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(EditInlineMessageMedia(inlineMessageId, media, replyMarkup))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditChatMessageText.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditChatMessageText.kt
@@ -3,16 +3,13 @@ package dev.inmo.tgbotapi.extensions.api.edit.text
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.edit.text.EditChatMessageText
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.message.ParseMode
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.content.TextContent
-import dev.inmo.tgbotapi.types.message.textsources.TextSource
-import dev.inmo.tgbotapi.utils.*

 /**
 * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -20,7 +17,7 @@ import dev.inmo.tgbotapi.utils.*
 */
 suspend fun TelegramBot.editMessageText(
    chatId: ChatIdentifier,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    text: String,
    parseMode: ParseMode? = null,
    disableWebPagePreview: Boolean? = null,
@@ -35,7 +32,7 @@ suspend fun TelegramBot.editMessageText(
 */
 suspend fun TelegramBot.editMessageText(
    chat: Chat,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    text: String,
    parseMode: ParseMode? = null,
    disableWebPagePreview: Boolean? = null,
@@ -60,7 +57,7 @@ suspend fun TelegramBot.editMessageText(
 */
 suspend fun TelegramBot.editMessageText(
    chatId: ChatIdentifier,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    entities: TextSourcesList,
    disableWebPagePreview: Boolean? = null,
    replyMarkup: InlineKeyboardMarkup? = null
@@ -68,70 +65,18 @@ suspend fun TelegramBot.editMessageText(
    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(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    separator: TextSource? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = editMessageText(chatId, messageId, buildEntities(separator, builderBody), 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: MessageId,
-    separator: String,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = editMessageText(chatId, messageId, buildEntities(separator, builderBody), 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: MessageId,
+    messageId: MessageIdentifier,
    entities: TextSourcesList,
    disableWebPagePreview: Boolean? = null,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageText(chat.id, messageId, entities, disableWebPagePreview, replyMarkup)

-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageText(
-    chat: Chat,
-    messageId: MessageId,
-    separator: TextSource? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = editMessageText(chat.id, messageId, buildEntities(separator, builderBody), 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: MessageId,
-    separator: String,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = editMessageText(chat.id, messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
-
 /**
 * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
 * as a builder for that
@@ -142,65 +87,3 @@ suspend fun TelegramBot.editMessageText(
    disableWebPagePreview: Boolean? = null,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageText(message.chat.id, message.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>,
-    separator: TextSource? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = editMessageText(message.chat.id, message.messageId, buildEntities(separator, builderBody), 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>,
-    separator: String,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = editMessageText(message.chat.id, message.messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-@RiskFeature("This method is unsafe due to absence of any guaranties about the type of message. In case if message is not text message this method will throw an exception")
-suspend fun TelegramBot.editMessageText(
-    message: Message,
-    entities: TextSourcesList,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(message.chat.id, message.messageId, entities, disableWebPagePreview, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-@RiskFeature("This method is unsafe due to absence of any guaranties about the type of message. In case if message is not text message this method will throw an exception")
-suspend fun TelegramBot.editMessageText(
-    message: Message,
-    separator: TextSource? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = editMessageText(message.chat.id, message.messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-@RiskFeature("This method is unsafe due to absence of any guaranties about the type of message. In case if message is not text message this method will throw an exception")
-suspend fun TelegramBot.editMessageText(
-    message: Message,
-    separator: String,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = editMessageText(message.chat.id, message.messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditInlineMessageText.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditInlineMessageText.kt
@@ -3,12 +3,9 @@ package dev.inmo.tgbotapi.extensions.api.edit.text
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.edit.text.EditInlineMessageText
 import dev.inmo.tgbotapi.types.InlineMessageIdentifier
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.message.ParseMode
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.message.textsources.TextSource
-import dev.inmo.tgbotapi.utils.EntitiesBuilderBody
-import dev.inmo.tgbotapi.utils.buildEntities

 /**
 * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -32,27 +29,3 @@ suspend fun TelegramBot.editMessageText(
    disableWebPagePreview: Boolean? = null,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(EditInlineMessageText(inlineMessageId, 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(
-    inlineMessageId: InlineMessageIdentifier,
-    separator: TextSource? = null,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = editMessageText(inlineMessageId, buildEntities(separator, builderBody), 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,
-    separator: String,
-    disableWebPagePreview: Boolean? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = editMessageText(inlineMessageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFile.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFile.kt
@@ -5,8 +5,8 @@ import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo
 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.TelegramMediaFile
-import dev.inmo.tgbotapi.types.message.content.MediaContent
+import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent

 suspend fun TelegramBot.downloadFile(
    filePath: String
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFileStream.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFileStream.kt
@@ -4,8 +4,8 @@ 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.TelegramMediaFile
-import dev.inmo.tgbotapi.types.message.content.MediaContent
+import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent

 suspend fun TelegramBot.downloadFileStream(
    filePath: String
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${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":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
				`@@ -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":"Telegram Bot API Extensions for API","description":"API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","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"}}}