add exceptions handling readme

.github/workflows/kdocs.yml

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

.github/workflows/packages_publishing.yml

@@ -7,7 +7,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
+          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 "[^/]*$"`"
@@ -18,7 +21,7 @@ jobs:
         run: ./gradlew build
       - name: Publish
         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 }}

CHANGELOG.md

@@ -1,276 +1,5 @@
 # TelegramBotAPI changelog
 
-## 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`:

README.md

@@ -1,8 +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.0-blue)](https://core.telegram.org/bots/api-changelog#april-16-2022)
+# 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)
 
-| [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://github.com/InsanusMokrassar/TelegramBotAPI/workflows/Build/badge.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI/actions) [![Small survey](https://img.shields.io/static/v1?label=Google&message=Survey&color=blue&logo=google-sheets)](https://docs.google.com/forms/d/e/1FAIpQLSctdJHT_aEniyYT0-IUAEfo1hsIlezX2owlkEAYX4KPl2V2_A/viewform?usp=sf_link) [![Chat in Telegram](https://img.shields.io/static/v1?label=Telegram&message=Chat&color=blue&logo=telegram)](https://t.me/InMoTelegramBotAPI) |
+| [![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&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![Examples](https://img.shields.io/static/v1?label=Github&message=Examples&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/) [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue&logo=kotlin)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Bookstack&message=Tutorial&color=blue&logo=bookstack)](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
+| [![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.
 
@@ -28,7 +28,7 @@ Other configuration examples:
 suspend fun main() {
   val bot = telegramBot(TOKEN)
 
-  bot.buildBehaviourWithLongPolling {
+  bot.buildBehaviour {
     println(getMe())
   
     onCommand("start") {
@@ -69,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(

docs/build.gradle

@@ -40,17 +40,11 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib')
 
-                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")
+                rootProject.subprojects.forEach {
+                    if (it != project) {
+                        api it
+                    }
+                }
             }
         }
     }

docs/gradle.properties

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

gradle.properties

@@ -5,21 +5,19 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true
 
-kotlin_version=1.6.21
-kotlin_coroutines_version=1.6.1
-kotlin_serialisation_runtime_version=1.3.3
-korlibs_version=2.7.0
-uuid_version=0.4.0
-ktor_version=2.0.1
+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.10.4
+
+micro_utils_version=0.9.1
 
 javax_activation_version=1.1.1
 
-
-dokka_version=1.6.21
-
 library_group=dev.inmo
-library_version=1.1.1
+library_version=0.38.2
 
-github_release_plugin_version=2.3.7
+github_release_plugin_version=2.2.12

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

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":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

settings.gradle

@@ -16,6 +16,9 @@ include ":tgbotapi.api"
 include ":tgbotapi.utils"
 include ":tgbotapi.behaviour_builder"
 include ":tgbotapi.behaviour_builder.fsm"
+include ":tgbotapi.extensions.api"
+include ":tgbotapi.extensions.utils"
+include ":tgbotapi.extensions.behaviour_builder"
+include ":tgbotapi.extensions.behaviour_builder.fsm"
 include ":tgbotapi"
-include ":tgbotapi.webapps"
 include ":docs"

tgbotapi.api/build.gradle

@@ -17,9 +17,8 @@ plugins {
 
 project.version = "$library_version"
 project.group = "$library_group"
-project.description = "API extensions with \"Telegram Bot API\"-like extensions for TelegramBot and RequestsExecutor"
 
-apply from: "../publish.gradle"
+apply from: "publish.gradle"
 
 repositories {
     mavenLocal()

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)
+        }
+    }
+}

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"}}}

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()
 )

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
 )

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

@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.DeleteMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 suspend fun TelegramBot.deleteMessage(

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

@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.ForwardMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 suspend fun TelegramBot.forwardMessage(

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt

@@ -4,8 +4,8 @@ import dev.inmo.tgbotapi.types.MediaGroupIdentifier
 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.types.update.media_group.*
 
 internal fun Update.lastUpdateIdentifier(): UpdateIdentifier {
     return if (this is SentMediaGroupUpdate) {

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

@@ -3,13 +3,13 @@ package dev.inmo.tgbotapi.extensions.api
 import com.soywiz.klock.DateTime
 import com.soywiz.klock.TimeSpan
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.stopLiveLocation
+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.StaticLocation
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage

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
 
 /**

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(

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))

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)

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)

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)

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

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

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

@@ -2,8 +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.*
 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(
@@ -15,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
@@ -27,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
@@ -38,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
@@ -50,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
@@ -61,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
@@ -73,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
@@ -84,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
@@ -96,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
@@ -107,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
@@ -118,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

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

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

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.*
-import dev.inmo.tgbotapi.types.chat.PrivateChat
-
-suspend fun TelegramBot.getChatMenuButton(
-    chatId: ChatId
-) = execute(GetChatMenuButton(chatId))
-
-suspend fun TelegramBot.getChatMenuButton(
-    chat: PrivateChat
-) = getChatMenuButton(chat.id)

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

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

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

@@ -3,8 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.invite_links
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.invite_links.ApproveChatJoinRequest
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.*
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 import dev.inmo.tgbotapi.types.update.ChatJoinRequestUpdate
 
 suspend fun TelegramBot.approveChatJoinRequest(

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

@@ -4,7 +4,7 @@ import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.invite_links.CreateChatInviteLink
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 
 suspend fun TelegramBot.createChatInviteLinkUnlimited(
     chatId: ChatIdentifier,

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

@@ -1,10 +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.*
-import dev.inmo.tgbotapi.types.chat.*
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 import dev.inmo.tgbotapi.types.update.ChatJoinRequestUpdate
 
 suspend fun TelegramBot.declineChatJoinRequest(

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

@@ -4,7 +4,7 @@ import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.invite_links.EditChatInviteLink
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 
 suspend fun TelegramBot.editChatInviteLinkUnlimited(
     chatId: ChatIdentifier,

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,

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

@@ -3,8 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.members
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.BanChatMember
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 
 suspend fun TelegramBot.banChatMember(
     chatId: ChatIdentifier,

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

@@ -1,9 +1,10 @@
 package dev.inmo.tgbotapi.extensions.api.chat.members
 
 import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.members.BanChatMember
 import dev.inmo.tgbotapi.requests.chat.members.BanChatSenderChat
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 
 suspend fun TelegramBot.banChatSenderChat(
     chatId: ChatIdentifier,

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

@@ -3,8 +3,7 @@ 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.*
-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.getChatMember(
     chatId: ChatIdentifier,

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

@@ -3,8 +3,7 @@ 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.*
-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.promoteChatMember(
     chatId: ChatIdentifier,
@@ -19,7 +18,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
     canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
+    canManageVoiceChats: Boolean? = null,
     canManageChat: Boolean?
 ) = execute(
     PromoteChatMember(
@@ -35,7 +34,7 @@ suspend fun TelegramBot.promoteChatMember(
         canRestrictMembers,
         canPinMessages,
         canPromoteMembers,
-        canManageVideoChats,
+        canManageVoiceChats,
         canManageChat
     )
 )
@@ -53,7 +52,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
     canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
+    canManageVoiceChats: Boolean? = null,
     canManageChat: Boolean? = null
 ) = promoteChatMember(
     chat.id,
@@ -68,7 +67,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers,
     canPinMessages,
     canPromoteMembers,
-    canManageVideoChats,
+    canManageVoiceChats,
     canManageChat
 )
 
@@ -85,7 +84,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
     canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
+    canManageVoiceChats: Boolean? = null,
     canManageChat: Boolean? = null
 ) = promoteChatMember(
     chatId,
@@ -100,7 +99,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers,
     canPinMessages,
     canPromoteMembers,
-    canManageVideoChats,
+    canManageVoiceChats,
     canManageChat
 )
 
@@ -117,7 +116,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
     canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
+    canManageVoiceChats: Boolean? = null,
     canManageChat: Boolean? = null
 ) = promoteChatMember(
     chat.id,
@@ -132,6 +131,6 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers,
     canPinMessages,
     canPromoteMembers,
-    canManageVideoChats,
+    canManageVoiceChats,
     canManageChat
 )

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

@@ -3,8 +3,8 @@ 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.*
-import dev.inmo.tgbotapi.types.chat.*
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.chat.ChatPermissions
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 
 suspend fun TelegramBot.restrictChatMember(
     chatId: ChatIdentifier,

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

@@ -3,8 +3,7 @@ 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.*
-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.setChatAdministratorCustomTitle(
     chatId: ChatId,
@@ -28,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)

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

@@ -3,8 +3,7 @@ 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.*
-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.unbanChatMember(
     chatId: ChatIdentifier,

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

@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.members
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.*
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 
 suspend fun TelegramBot.unbanChatSenderChat(
     chatId: ChatIdentifier,

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

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

@@ -4,7 +4,7 @@ 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.MessageIdentifier
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 suspend fun TelegramBot.pinChatMessage(

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,

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

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

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

@@ -4,7 +4,7 @@ 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,

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,

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,

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))

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

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

@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.UnpinChatMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 suspend fun TelegramBot.unpinChatMessage(

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

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,

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

@@ -1,19 +1,18 @@
 package dev.inmo.tgbotapi.extensions.api.edit.LiveLocation
 
 import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.edit.LiveLocation.EditChatMessageLiveLocation
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.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
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-@Deprecated("Replaced", ReplaceWith("editLiveLocation", "dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation"))
 suspend fun TelegramBot.editLiveLocation(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
@@ -23,13 +22,16 @@ suspend fun TelegramBot.editLiveLocation(
     heading: Degrees? = null,
     proximityAlertRadius: Meters? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chatId, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
+) = execute(
+    EditChatMessageLiveLocation(
+        chatId, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup
+    )
+)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-@Deprecated("Replaced", ReplaceWith("editLiveLocation", "dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation"))
 suspend fun TelegramBot.editLiveLocation(
     chat: Chat,
     messageId: MessageIdentifier,
@@ -39,13 +41,12 @@ suspend fun TelegramBot.editLiveLocation(
     heading: Degrees? = null,
     proximityAlertRadius: Meters? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chat, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
+) = editLiveLocation(chat.id, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-@Deprecated("Replaced", ReplaceWith("editLiveLocation", "dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation"))
 suspend fun TelegramBot.editLiveLocation(
     message: ContentMessage<LocationContent>,
     latitude: Double,
@@ -54,39 +55,40 @@ suspend fun TelegramBot.editLiveLocation(
     heading: Degrees? = null,
     proximityAlertRadius: Meters? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(message, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
+) = editLiveLocation(message.chat, message.messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-@Deprecated("Replaced", ReplaceWith("editLiveLocation", "dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation"))
 suspend fun TelegramBot.editLiveLocation(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
     location: LiveLocation,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chatId, messageId, location, replyMarkup)
+) = execute(
+    EditChatMessageLiveLocation(
+        chatId, messageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup
+    )
+)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-@Deprecated("Replaced", ReplaceWith("editLiveLocation", "dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation"))
 suspend fun TelegramBot.editLiveLocation(
     chat: Chat,
     messageId: MessageIdentifier,
     location: LiveLocation,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chat, messageId, location, replyMarkup)
+) = editLiveLocation(chat.id, messageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-@Deprecated("Replaced", ReplaceWith("editLiveLocation", "dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation"))
 suspend fun TelegramBot.editLiveLocation(
     message: ContentMessage<LocationContent>,
     location: LiveLocation,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(message, location, replyMarkup)
+) = editLiveLocation(message.chat, message.messageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)

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

@@ -1,13 +1,11 @@
 package dev.inmo.tgbotapi.extensions.api.edit.LiveLocation
 
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
-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
 
-@Deprecated("Replaced", ReplaceWith("editLiveLocation", "dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation"))
 suspend fun TelegramBot.editLiveLocation(
     inlineMessageId: InlineMessageIdentifier,
     latitude: Double,
@@ -16,10 +14,13 @@ suspend fun TelegramBot.editLiveLocation(
     heading: Degrees? = null,
     proximityAlertRadius: Meters? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(inlineMessageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
-@Deprecated("Replaced", ReplaceWith("editLiveLocation", "dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation"))
+) = execute(
+    EditInlineMessageLiveLocation(
+        inlineMessageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup
+    )
+)
 suspend fun TelegramBot.editLiveLocation(
     inlineMessageId: InlineMessageIdentifier,
     location: LiveLocation,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(inlineMessageId, location, replyMarkup)
+) = editLiveLocation(inlineMessageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)

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

@@ -1,12 +1,11 @@
 package dev.inmo.tgbotapi.extensions.api.edit.LiveLocation
 
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.stopLiveLocation
-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.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
 
@@ -14,30 +13,31 @@ import dev.inmo.tgbotapi.types.message.content.LocationContent
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-@Deprecated("Replaced", ReplaceWith("stopLiveLocation", "dev.inmo.tgbotapi.extensions.api.edit.location.live.stopLiveLocation"))
 suspend fun TelegramBot.stopLiveLocation(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
-) = stopLiveLocation(chatId, messageId, replyMarkup)
+) = execute(
+    StopChatMessageLiveLocation(
+        chatId, messageId, replyMarkup
+    )
+)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-@Deprecated("Replaced", ReplaceWith("stopLiveLocation", "dev.inmo.tgbotapi.extensions.api.edit.location.live.stopLiveLocation"))
 suspend fun TelegramBot.stopLiveLocation(
     chat: Chat,
     messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
-) = stopLiveLocation(chat, messageId, replyMarkup)
+) = stopLiveLocation(chat.id, messageId, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-@Deprecated("Replaced", ReplaceWith("stopLiveLocation", "dev.inmo.tgbotapi.extensions.api.edit.location.live.stopLiveLocation"))
 suspend fun TelegramBot.stopLiveLocation(
     message: ContentMessage<LocationContent>,
     replyMarkup: InlineKeyboardMarkup? = null
-) = stopLiveLocation(message, replyMarkup)
+) = stopLiveLocation(message.chat, message.messageId, replyMarkup)

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

@@ -1,8 +1,7 @@
 package dev.inmo.tgbotapi.extensions.api.edit.LiveLocation
 
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.stopLiveLocation
-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
 
@@ -10,8 +9,11 @@ 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
  */
-@Deprecated("Replaced", ReplaceWith("stopLiveLocation", "dev.inmo.tgbotapi.extensions.api.edit.location.live.stopLiveLocation"))
 suspend fun TelegramBot.stopLiveLocation(
     inlineMessageId: InlineMessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
-) = stopLiveLocation(inlineMessageId, replyMarkup)
+) = execute(
+    StopInlineMessageLiveLocation(
+        inlineMessageId, replyMarkup
+    )
+)

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

@@ -1,42 +1,41 @@
 package dev.inmo.tgbotapi.extensions.api.edit.ReplyMarkup
 
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.reply_markup.editMessageReplyMarkup
+import dev.inmo.tgbotapi.requests.edit.ReplyMarkup.EditChatMessageReplyMarkup
 import dev.inmo.tgbotapi.types.ChatIdentifier
 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
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-@Deprecated("Replaced", ReplaceWith("editMessageReplyMarkup", "dev.inmo.tgbotapi.extensions.api.edit.reply_markup.editMessageReplyMarkup"))
 suspend fun TelegramBot.editMessageReplyMarkup(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(chatId, messageId, replyMarkup)
+) = execute(
+    EditChatMessageReplyMarkup(chatId, messageId, replyMarkup)
+)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-@Deprecated("Replaced", ReplaceWith("editMessageReplyMarkup", "dev.inmo.tgbotapi.extensions.api.edit.reply_markup.editMessageReplyMarkup"))
 suspend fun TelegramBot.editMessageReplyMarkup(
     chat: Chat,
     messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(chat, messageId, replyMarkup)
+) = editMessageReplyMarkup(chat.id, messageId, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-@Deprecated("Replaced", ReplaceWith("editMessageReplyMarkup", "dev.inmo.tgbotapi.extensions.api.edit.reply_markup.editMessageReplyMarkup"))
 suspend fun TelegramBot.editMessageReplyMarkup(
     message: Message,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(message, replyMarkup)
+) = editMessageReplyMarkup(message.chat.id, message.messageId, replyMarkup)
 

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

@@ -1,8 +1,7 @@
 package dev.inmo.tgbotapi.extensions.api.edit.ReplyMarkup
 
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.reply_markup.editMessageReplyMarkup
-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
 
@@ -10,8 +9,7 @@ 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
  */
-@Deprecated("Replaced", ReplaceWith("editMessageReplyMarkup", "dev.inmo.tgbotapi.extensions.api.edit.reply_markup.editMessageReplyMarkup"))
 suspend fun TelegramBot.editMessageReplyMarkup(
     inlineMessageId: InlineMessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(inlineMessageId, replyMarkup)
+) = execute(EditInlineMessageReplyMarkup(inlineMessageId, replyMarkup))

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

@@ -1,17 +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.MessageEntity.textsources.TextSource
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.message.ParseMode
+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.content.MediaContent
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]

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
 
 /**

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

@@ -1,94 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit.location.live
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.location.live.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.location.LiveLocation
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.content.LocationContent
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editLiveLocation(
-    chatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(
-    EditChatMessageLiveLocation(
-        chatId, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editLiveLocation(
-    chat: Chat,
-    messageId: MessageIdentifier,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chat.id, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editLiveLocation(
-    message: ContentMessage<LocationContent>,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(message.chat, message.messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editLiveLocation(
-    chatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(
-    EditChatMessageLiveLocation(
-        chatId, messageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editLiveLocation(
-    chat: Chat,
-    messageId: MessageIdentifier,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chat.id, messageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editLiveLocation(
-    message: ContentMessage<LocationContent>,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(message.chat, message.messageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/EditInlineMessageLiveLocation.kt

@@ -1,26 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit.location.live
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.location.live.EditInlineMessageLiveLocation
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.location.LiveLocation
-
-suspend fun TelegramBot.editLiveLocation(
-    inlineMessageId: InlineMessageIdentifier,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(
-    EditInlineMessageLiveLocation(
-        inlineMessageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup
-    )
-)
-suspend fun TelegramBot.editLiveLocation(
-    inlineMessageId: InlineMessageIdentifier,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(inlineMessageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)

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

@@ -1,43 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit.location.live
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.location.live.StopChatMessageLiveLocation
-import dev.inmo.tgbotapi.types.ChatIdentifier
-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.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.content.LocationContent
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.stopLiveLocation(
-    chatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(
-    StopChatMessageLiveLocation(
-        chatId, messageId, replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.stopLiveLocation(
-    chat: Chat,
-    messageId: MessageIdentifier,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = stopLiveLocation(chat.id, messageId, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.stopLiveLocation(
-    message: ContentMessage<LocationContent>,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = stopLiveLocation(message.chat, message.messageId, replyMarkup)

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

@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit.location.live
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.location.live.StopInlineMessageLiveLocation
-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.stopLiveLocation(
-    inlineMessageId: InlineMessageIdentifier,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(
-    StopInlineMessageLiveLocation(
-        inlineMessageId, replyMarkup
-    )
-)

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.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]
@@ -17,7 +17,7 @@ import dev.inmo.tgbotapi.types.message.content.MediaContent
 suspend fun TelegramBot.editMessageMedia(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
-    media: TelegramMedia,
+    media: InputMedia,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(
     EditChatMessageMedia(chatId, messageId, media, replyMarkup)
@@ -30,7 +30,7 @@ suspend fun TelegramBot.editMessageMedia(
 suspend fun TelegramBot.editMessageMedia(
     chat: Chat,
     messageId: MessageIdentifier,
-    media: TelegramMedia,
+    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)

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

@@ -3,7 +3,7 @@ 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
 
 /**
@@ -12,6 +12,6 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
  */
 suspend fun TelegramBot.editMessageCaption(
     inlineMessageId: InlineMessageIdentifier,
-    media: TelegramMedia,
+    media: InputMedia,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(EditInlineMessageMedia(inlineMessageId, media, replyMarkup))

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

@@ -1,41 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit.reply_markup
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.reply_markup.EditChatMessageReplyMarkup
-import dev.inmo.tgbotapi.types.ChatIdentifier
-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.message.abstracts.Message
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageReplyMarkup(
-    chatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(
-    EditChatMessageReplyMarkup(chatId, messageId, replyMarkup)
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageReplyMarkup(
-    chat: Chat,
-    messageId: MessageIdentifier,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(chat.id, messageId, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageReplyMarkup(
-    message: Message,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(message.chat.id, message.messageId, replyMarkup)
-

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

@@ -1,15 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit.reply_markup
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.edit.reply_markup.EditInlineMessageReplyMarkup
-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageReplyMarkup(
-    inlineMessageId: InlineMessageIdentifier,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = execute(EditInlineMessageReplyMarkup(inlineMessageId, replyMarkup))

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

@@ -3,11 +3,11 @@ 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.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.message.ParseMode
+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.content.TextContent
 

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

@@ -3,8 +3,8 @@ 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
 
 /**

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

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

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

@@ -5,8 +5,8 @@ import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo
 import dev.inmo.tgbotapi.requests.DownloadFileStream
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.files.PathedFile
-import dev.inmo.tgbotapi.types.files.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.downloadFileStreamAllocator(
     filePath: String

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/GetGameHighScoresByChat.kt

@@ -3,8 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.games
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.games.GetGameHighScoresByChat
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.GameContent
 

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/GetGameHighScoresByInlineMessageId.kt

@@ -3,7 +3,6 @@ package dev.inmo.tgbotapi.extensions.api.games
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.games.GetGameHighScoresByInlineMessageId
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.CommonUser
 
 suspend fun TelegramBot.getGameScore(
     userId: UserId,

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/SetGameScoreByChatId.kt

@@ -3,8 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.games
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.games.SetGameScoreByChatId
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.GameContent
 

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/SetGameScoreByInlineMessageId.kt

@@ -3,7 +3,6 @@ package dev.inmo.tgbotapi.extensions.api.games
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.games.SetGameScoreByInlineMessageId
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.CommonUser
 
 suspend fun TelegramBot.setGameScore(
     userId: UserId,

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

@@ -3,8 +3,8 @@ package dev.inmo.tgbotapi.extensions.api.get
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.requests.get.GetFile
-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.getFileAdditionalInfo(
     fileId: FileId

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

@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.extensions.api.get
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.get.GetUserProfilePhotos
-import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.CommonUser
 import dev.inmo.tgbotapi.types.UserId
 
 suspend fun TelegramBot.getUserProfilePhotos(

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/passport/SetPassportDataErrors.kt

@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.extensions.api.passport
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.SetPassportDataErrors
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.User
 import dev.inmo.tgbotapi.types.UserId
 import dev.inmo.tgbotapi.types.message.PassportMessage
 import dev.inmo.tgbotapi.types.passport.PassportData

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/CopyMessage.kt

@@ -3,11 +3,11 @@ package dev.inmo.tgbotapi.extensions.api.send
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.send.CopyMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.message.ParseMode
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 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.message.abstracts.Message
 
 /**

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/CopyMessages.kt

@@ -2,15 +2,19 @@ package dev.inmo.tgbotapi.extensions.api.send
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.send.media.sendMediaGroup
+import dev.inmo.tgbotapi.requests.send.CopyMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.media.*
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.InputMedia.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.message.ParseMode
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
+import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
-import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
-import dev.inmo.tgbotapi.types.update.media_group.SentMediaGroupUpdate
+import dev.inmo.tgbotapi.types.message.abstracts.Message
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
+import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.MediaGroupUpdate
+import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate
 
 /**
  * Send media group via [sendMediaGroup] extension with edited [entities] of first [messages] element. Other elements
@@ -26,13 +30,13 @@ suspend inline fun TelegramBot.copyMessages(
     replyToMessageId: MessageIdentifier? = null,
     allowSendingWithoutReply: Boolean? = null
 ): List<MediaGroupMessage<MediaGroupContent>> {
-    val first = messages.first().content.toMediaGroupMemberTelegramMedia().let {
+    val first = messages.first().content.toMediaGroupMemberInputMedia().let {
         if (text != null) {
             when (it) {
-                is TelegramMediaAudio -> it.copy(text = text, parseMode = parseMode)
-                is TelegramMediaDocument -> it.copy(text = text, parseMode = parseMode)
-                is TelegramMediaPhoto -> it.copy(text = text, parseMode = parseMode)
-                is TelegramMediaVideo -> it.copy(text = text, parseMode = parseMode)
+                is InputMediaAudio -> it.copy(text = text, parseMode = parseMode)
+                is InputMediaDocument -> it.copy(text = text, parseMode = parseMode)
+                is InputMediaPhoto -> it.copy(text = text, parseMode = parseMode)
+                is InputMediaVideo -> it.copy(text = text, parseMode = parseMode)
             }
         } else {
             it
@@ -42,7 +46,7 @@ suspend inline fun TelegramBot.copyMessages(
     return sendMediaGroup(
         toChatId,
         listOf(first) + messages.drop(1).map {
-            it.content.toMediaGroupMemberTelegramMedia()
+            it.content.toMediaGroupMemberInputMedia()
         },
         disableNotification,
         protectContent,
@@ -109,19 +113,19 @@ suspend inline fun TelegramBot.copyMessages(
     replyToMessageId: MessageIdentifier? = null,
     allowSendingWithoutReply: Boolean? = null
 ): List<MediaGroupMessage<MediaGroupContent>> {
-    val first = messages.first().content.toMediaGroupMemberTelegramMedia().let {
+    val first = messages.first().content.toMediaGroupMemberInputMedia().let {
         when (it) {
-            is TelegramMediaAudio -> TelegramMediaAudio(it.file, entities, it.duration, it.performer, it.title, it.thumb)
-            is TelegramMediaDocument -> TelegramMediaDocument(it.file, entities, it.thumb, it.disableContentTypeDetection)
-            is TelegramMediaPhoto -> TelegramMediaPhoto(it.file, entities)
-            is TelegramMediaVideo -> TelegramMediaVideo(it.file, entities, it.width, it.height, it.duration, it.thumb)
+            is InputMediaAudio -> InputMediaAudio(it.file, entities, it.duration, it.performer, it.title, it.thumb)
+            is InputMediaDocument -> InputMediaDocument(it.file, entities, it.thumb, it.disableContentTypeDetection)
+            is InputMediaPhoto -> InputMediaPhoto(it.file, entities)
+            is InputMediaVideo -> InputMediaVideo(it.file, entities, it.width, it.height, it.duration, it.thumb)
         }
     }
 
     return sendMediaGroup(
         toChatId,
         listOf(first) + messages.drop(1).map {
-            it.content.toMediaGroupMemberTelegramMedia()
+            it.content.toMediaGroupMemberInputMedia()
         },
         disableNotification,
         protectContent,

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt

@@ -9,21 +9,16 @@ import dev.inmo.tgbotapi.extensions.api.send.polls.sendRegularPoll
 import dev.inmo.tgbotapi.requests.abstracts.InputFile
 import dev.inmo.tgbotapi.requests.send.media.rawSendingMediaGroupsWarning
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.media.*
-import dev.inmo.tgbotapi.types.message.textsources.TextSource
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.message.ParseMode
+import dev.inmo.tgbotapi.types.InputMedia.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
 import dev.inmo.tgbotapi.types.dice.DiceAnimationType
 import dev.inmo.tgbotapi.types.files.*
-import dev.inmo.tgbotapi.types.files.TelegramMediaFile
-import dev.inmo.tgbotapi.types.files.Sticker
 import dev.inmo.tgbotapi.types.games.Game
-import dev.inmo.tgbotapi.types.location.*
+import dev.inmo.tgbotapi.types.location.StaticLocation
 import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.payments.LabeledPrice
 import dev.inmo.tgbotapi.types.payments.abstracts.Currency
 import dev.inmo.tgbotapi.types.polls.*
@@ -121,7 +116,6 @@ suspend inline fun TelegramBot.reply(
     longitude: Double,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendLocation(
     to.chat,
@@ -129,7 +123,6 @@ suspend inline fun TelegramBot.reply(
     longitude,
     disableNotification,
     protectContent,
-    allowSendingWithoutReply,
     to.messageId,
     replyMarkup
 )
@@ -143,14 +136,12 @@ suspend inline fun TelegramBot.reply(
     location: StaticLocation,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendLocation(
     to.chat,
     location,
     disableNotification,
     protectContent,
-    allowSendingWithoutReply,
     to.messageId,
     replyMarkup
 )
@@ -523,7 +514,7 @@ suspend inline fun TelegramBot.reply(
 @RiskFeature(rawSendingMediaGroupsWarning)
 suspend inline fun TelegramBot.replyWithMediaGroup(
     to: Message,
-    media: List<MediaGroupMemberTelegramMedia>,
+    media: List<MediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null
@@ -531,7 +522,7 @@ suspend inline fun TelegramBot.replyWithMediaGroup(
 
 suspend inline fun TelegramBot.replyWithPlaylist(
     to: Message,
-    media: List<AudioMediaGroupMemberTelegramMedia>,
+    media: List<AudioMediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null
@@ -539,7 +530,7 @@ suspend inline fun TelegramBot.replyWithPlaylist(
 
 suspend inline fun TelegramBot.replyWithDocuments(
     to: Message,
-    media: List<DocumentMediaGroupMemberTelegramMedia>,
+    media: List<DocumentMediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null
@@ -547,7 +538,7 @@ suspend inline fun TelegramBot.replyWithDocuments(
 
 suspend inline fun TelegramBot.replyWithGallery(
     to: Message,
-    media: List<VisualMediaGroupMemberTelegramMedia>,
+    media: List<VisualMediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null
@@ -578,17 +569,6 @@ suspend inline fun TelegramBot.reply(
     replyMarkup: KeyboardMarkup? = null
 ) = sendPhoto(to.chat, photo, text, parseMode, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    photoSize: PhotoSize,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, photoSize, text, parseMode, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
-
 
 suspend inline fun TelegramBot.replyWithPhoto(
     to: Message,
@@ -610,16 +590,6 @@ suspend inline fun TelegramBot.reply(
     replyMarkup: KeyboardMarkup? = null
 ) = sendPhoto(to.chat, photo, entities, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    photoSize: PhotoSize,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, photoSize, entities, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
-
 
 // Sticker
 
@@ -893,329 +863,3 @@ suspend inline fun TelegramBot.reply(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendQuizPoll(to.chat, isClosed, quizPoll, question, options, correctOptionId, isAnonymous, entities, closeInfo, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    poll: Poll,
-    isClosed: Boolean = false,
-    question: String = poll.question,
-    options: List<String> = poll.options.map { it.text },
-    isAnonymous: Boolean = poll.isAnonymous,
-    closeInfo: ScheduledCloseInfo? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = when (poll) {
-    is RegularPoll -> reply(
-        to = to,
-        poll = poll,
-        isClosed = isClosed,
-        question = question,
-        options = options,
-        isAnonymous = isAnonymous,
-        allowMultipleAnswers = isAnonymous,
-        closeInfo = closeInfo,
-        disableNotification = disableNotification,
-        protectContent = protectContent,
-        allowSendingWithoutReply = allowSendingWithoutReply,
-        replyMarkup = replyMarkup
-    )
-    is UnknownPollType -> error("Unable to send poll with unknown type ($poll)")
-    is QuizPoll -> reply(
-        to = to,
-        quizPoll = poll,
-        entities = poll.textSources,
-        isClosed = isClosed,
-        question = question,
-        options = options,
-        isAnonymous = isAnonymous,
-        closeInfo = closeInfo,
-        disableNotification = disableNotification,
-        protectContent = protectContent,
-        allowSendingWithoutReply = allowSendingWithoutReply,
-        replyMarkup = replyMarkup
-    )
-}
-
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    fromChatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChatId, to.chat.id, messageId, text, parseMode, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    fromChat: Chat,
-    messageId: MessageIdentifier,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = reply(to, fromChat.id, messageId, text, parseMode, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    copy: Message,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = reply(to, copy.chat.id, copy.messageId, text, parseMode, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
-
-suspend fun TelegramBot.reply(
-    to: Message,
-    content: MessageContent,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) {
-    execute(
-        content.createResend(
-            to.chat.id,
-            disableNotification,
-            protectContent,
-            to.messageId,
-            allowSendingWithoutReply,
-            replyMarkup
-        )
-    )
-}
-
-suspend fun TelegramBot.reply(
-    to: Message,
-    mediaFile: TelegramMediaFile,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) {
-    when (mediaFile) {
-        is AudioFile -> reply(
-            to = to,
-            audio = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is AnimationFile -> reply(
-            to = to,
-            animation = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is VoiceFile -> reply(
-            to = to,
-            voice = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is VideoFile -> reply(
-            to = to,
-            video = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is VideoNoteFile -> reply(
-            to = to,
-            videoNote = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is DocumentFile -> reply(
-            to = to,
-            document = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is Sticker -> reply(
-            to = to,
-            sticker = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is PhotoSize -> reply(
-            to = to,
-            photoSize = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        else -> reply(
-            to = to,
-            document = mediaFile.asDocumentFile(),
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-    }
-}
-
-suspend fun TelegramBot.reply(
-    to: Message,
-    content: TextedMediaContent,
-    text: String?,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) {
-    when (content) {
-        is VoiceContent -> reply(
-            to = to,
-            voice = content.media,
-            text = text,
-            parseMode = parseMode,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is AudioMediaGroupContent -> reply(
-            to = to,
-            audio = content.media,
-            text = text,
-            parseMode = parseMode,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is PhotoContent -> reply(
-            to = to,
-            photoSize = content.media,
-            text = text,
-            parseMode = parseMode,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is VideoContent -> reply(
-            to = to,
-            video = content.media,
-            text = text,
-            parseMode = parseMode,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is AnimationContent -> reply(
-            to = to,
-            animation = content.media,
-            text = text,
-            parseMode = parseMode,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        else -> reply(
-            to = to,
-            document = content.media.asDocumentFile(),
-            text = text,
-            parseMode = parseMode,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-    }
-}
-
-suspend fun TelegramBot.reply(
-    to: Message,
-    content: TextedMediaContent,
-    entities: List<TextSource>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) {
-    when (content) {
-        is VoiceContent -> reply(
-            to = to,
-            voice = content.media,
-            entities = entities,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is AudioMediaGroupContent -> reply(
-            to = to,
-            audio = content.media,
-            entities = entities,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is PhotoContent -> reply(
-            to = to,
-            photoSize = content.media,
-            entities = entities,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is VideoContent -> reply(
-            to = to,
-            video = content.media,
-            entities = entities,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is AnimationContent -> reply(
-            to = to,
-            animation = content.media,
-            entities = entities,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        else -> reply(
-            to = to,
-            document = content.media.asDocumentFile(),
-            entities = entities,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-    }
-}

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendAction.kt

@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.send.SendAction
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.actions.*
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 
 suspend fun TelegramBot.sendBotAction(
     chatId: ChatIdentifier,

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendActionDSL.kt

@@ -6,22 +6,17 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.send.SendAction
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.actions.*
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import kotlinx.coroutines.*
-import kotlin.contracts.*
 import kotlin.coroutines.coroutineContext
 
 private const val refreshTime: MilliSeconds = (botActionActualityTime - 1) * 1000L
 typealias TelegramBotActionCallback<T> = suspend TelegramBot.() -> T
 
-@OptIn(ExperimentalContracts::class)
 suspend fun <T> TelegramBot.withAction(
     actionRequest: SendAction,
     block: TelegramBotActionCallback<T>
 ): T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
     val botActionJob = CoroutineScope(coroutineContext).launch {
         while (isActive) {
             delay(refreshTime)
@@ -35,190 +30,46 @@ suspend fun <T> TelegramBot.withAction(
     return result.getOrThrow()
 }
 
-@OptIn(ExperimentalContracts::class)
 suspend fun <T> TelegramBot.withAction(
     chatId: ChatId,
     action: BotAction,
     block: TelegramBotActionCallback<T>
-): T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(
-        SendAction(chatId, action),
-        block
-    )
-}
+) = withAction(
+    SendAction(chatId, action),
+    block
+)
 
-@OptIn(ExperimentalContracts::class)
 suspend fun <T> TelegramBot.withAction(
     chat: Chat,
     action: BotAction,
     block: TelegramBotActionCallback<T>
-): T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(
-        chat.id,
-        action,
-        block
-    )
-}
+) = withAction(
+    chat.id,
+    action,
+    block
+)
 
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withTypingAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, TypingAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadPhotoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, UploadPhotoAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVideoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, RecordVideoAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVideoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, UploadVideoAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVoiceAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, RecordVoiceAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVoiceAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, UploadVoiceAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadDocumentAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, UploadDocumentAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withFindLocationAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, FindLocationAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVideoNoteAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, RecordVideoNoteAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVideoNoteAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, UploadVideoNoteAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withChooseStickerAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, ChooseStickerAction, block)
-}
+suspend fun <T> TelegramBot.withTypingAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, TypingAction, block)
+suspend fun <T> TelegramBot.withUploadPhotoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadPhotoAction, block)
+suspend fun <T> TelegramBot.withRecordVideoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, RecordVideoAction, block)
+suspend fun <T> TelegramBot.withUploadVideoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadVideoAction, block)
+suspend fun <T> TelegramBot.withRecordVoiceAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, RecordVoiceAction, block)
+suspend fun <T> TelegramBot.withUploadVoiceAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadVoiceAction, block)
+suspend fun <T> TelegramBot.withUploadDocumentAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadDocumentAction, block)
+suspend fun <T> TelegramBot.withFindLocationAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, FindLocationAction, block)
+suspend fun <T> TelegramBot.withRecordVideoNoteAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, RecordVideoNoteAction, block)
+suspend fun <T> TelegramBot.withUploadVideoNoteAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadVideoNoteAction, block)
+suspend fun <T> TelegramBot.withChooseStickerAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, ChooseStickerAction, block)
 
 
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withTypingAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, TypingAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadPhotoAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, UploadPhotoAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVideoAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, RecordVideoAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVideoAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, UploadVideoAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVoiceAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, RecordVoiceAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVoiceAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, UploadVoiceAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadDocumentAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, UploadDocumentAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withFindLocationAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, FindLocationAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVideoNoteAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, RecordVideoNoteAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVideoNoteAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, UploadVideoNoteAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withChooseStickerAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, ChooseStickerAction, block)
-}
+suspend fun <T> TelegramBot.withTypingAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, TypingAction, block)
+suspend fun <T> TelegramBot.withUploadPhotoAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadPhotoAction, block)
+suspend fun <T> TelegramBot.withRecordVideoAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, RecordVideoAction, block)
+suspend fun <T> TelegramBot.withUploadVideoAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadVideoAction, block)
+suspend fun <T> TelegramBot.withRecordVoiceAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, RecordVoiceAction, block)
+suspend fun <T> TelegramBot.withUploadVoiceAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadVoiceAction, block)
+suspend fun <T> TelegramBot.withUploadDocumentAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadDocumentAction, block)
+suspend fun <T> TelegramBot.withFindLocationAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, FindLocationAction, block)
+suspend fun <T> TelegramBot.withRecordVideoNoteAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, RecordVideoNoteAction, block)
+suspend fun <T> TelegramBot.withUploadVideoNoteAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadVideoNoteAction, block)
+suspend fun <T> TelegramBot.withChooseStickerAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, ChooseStickerAction, block)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendContact.kt

@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.send.SendContact
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendDice.kt

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.requests.send.SendDice
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.dice.DiceAnimationType
 
 /**

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendLocation.kt

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.requests.send.SendStaticLocation
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.location.StaticLocation
 
 /**
@@ -18,7 +18,6 @@ suspend fun TelegramBot.sendLocation(
     longitude: Double,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = execute(
@@ -28,7 +27,6 @@ suspend fun TelegramBot.sendLocation(
         longitude,
         disableNotification = disableNotification,
         protectContent = protectContent,
-        allowSendingWithoutReply = allowSendingWithoutReply,
         replyToMessageId = replyToMessageId,
         replyMarkup = replyMarkup
     )
@@ -43,7 +41,6 @@ suspend fun TelegramBot.sendLocation(
     location: StaticLocation,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendLocation(
@@ -52,7 +49,6 @@ suspend fun TelegramBot.sendLocation(
     location.longitude,
     disableNotification,
     protectContent,
-    allowSendingWithoutReply,
     replyToMessageId,
     replyMarkup
 )
@@ -67,7 +63,6 @@ suspend fun TelegramBot.sendLocation(
     longitude: Double,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendLocation(
@@ -76,7 +71,6 @@ suspend fun TelegramBot.sendLocation(
     longitude,
     disableNotification,
     protectContent,
-    allowSendingWithoutReply,
     replyToMessageId,
     replyMarkup
 )
@@ -90,7 +84,6 @@ suspend fun TelegramBot.sendLocation(
     location: StaticLocation,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendLocation(
@@ -99,7 +92,6 @@ suspend fun TelegramBot.sendLocation(
     location.longitude,
     disableNotification,
     protectContent,
-    allowSendingWithoutReply,
     replyToMessageId,
     replyMarkup
 )
@@ -114,10 +106,9 @@ suspend fun TelegramBot.sendStaticLocation(
     longitude: Double,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendLocation(chatId, latitude, longitude, disableNotification, protectContent, allowSendingWithoutReply, replyToMessageId, replyMarkup)
+) = sendLocation(chatId, latitude, longitude, disableNotification, protectContent, replyToMessageId, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -128,10 +119,9 @@ suspend fun TelegramBot.sendStaticLocation(
     location: StaticLocation,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendLocation(chatId, location.latitude, location.longitude, disableNotification, protectContent, allowSendingWithoutReply, replyToMessageId, replyMarkup)
+) = sendLocation(chatId, location.latitude, location.longitude, disableNotification, protectContent, replyToMessageId, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -143,10 +133,9 @@ suspend fun TelegramBot.sendStaticLocation(
     longitude: Double,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendLocation(chat.id, latitude, longitude, disableNotification, protectContent, allowSendingWithoutReply, replyToMessageId, replyMarkup)
+) = sendLocation(chat.id, latitude, longitude, disableNotification, protectContent, replyToMessageId, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -157,7 +146,6 @@ suspend fun TelegramBot.sendStaticLocation(
     location: StaticLocation,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendLocation(chat.id, location.latitude, location.longitude, disableNotification, protectContent, allowSendingWithoutReply, replyToMessageId, replyMarkup)
+) = sendLocation(chat.id, location.latitude, location.longitude, disableNotification, protectContent, replyToMessageId, replyMarkup)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendMessage.kt

@@ -3,11 +3,11 @@ package dev.inmo.tgbotapi.extensions.api.send
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.send.SendTextMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.message.ParseMode
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt

@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.send.SendVenue
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.location.StaticLocation
 import dev.inmo.tgbotapi.types.venue.Venue
 

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/games/SendGame.kt

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.requests.send.games.SendGame
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.games.Game
 
 /**

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAnimation.kt

@@ -4,11 +4,11 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.InputFile
 import dev.inmo.tgbotapi.requests.send.media.SendAnimation
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.message.ParseMode
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 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.files.AnimationFile
 
 /**

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAudio.kt

@@ -4,11 +4,11 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.InputFile
 import dev.inmo.tgbotapi.requests.send.media.SendAudio
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.message.ParseMode
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 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.files.AudioFile
 
 /**

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendDocument.kt

@@ -4,11 +4,11 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.InputFile
 import dev.inmo.tgbotapi.requests.send.media.SendDocument
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.message.ParseMode
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 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.files.DocumentFile
 
 /**

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt

@@ -3,15 +3,11 @@ package dev.inmo.tgbotapi.extensions.api.send.media
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.send.media.*
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.media.*
+import dev.inmo.tgbotapi.types.InputMedia.*
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
-import dev.inmo.tgbotapi.types.message.content.VisualMediaGroupContent
-import dev.inmo.tgbotapi.types.message.content.AudioContent
-import dev.inmo.tgbotapi.types.message.content.DocumentContent
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 import dev.inmo.tgbotapi.utils.RiskFeature
-import kotlin.jvm.JvmName
 
 /**
  * @see SendMediaGroup
@@ -19,7 +15,7 @@ import kotlin.jvm.JvmName
 @RiskFeature(rawSendingMediaGroupsWarning)
 suspend fun TelegramBot.sendMediaGroup(
     chatId: ChatIdentifier,
-    media: List<MediaGroupMemberTelegramMedia>,
+    media: List<MediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
@@ -36,39 +32,7 @@ suspend fun TelegramBot.sendMediaGroup(
 @RiskFeature(rawSendingMediaGroupsWarning)
 suspend fun TelegramBot.sendMediaGroup(
     chat: Chat,
-    media: List<MediaGroupMemberTelegramMedia>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendMediaGroup(
-    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendMediaGroup
- */
-@RiskFeature(rawSendingMediaGroupsWarning)
-@JvmName("sendMedaGroupByContent")
-suspend fun TelegramBot.sendMediaGroup(
-    chatId: ChatIdentifier,
-    media: List<MediaGroupContent>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendMediaGroup(
-    chatId, media.map { it.toMediaGroupMemberTelegramMedia() }, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendMediaGroup
- */
-@RiskFeature(rawSendingMediaGroupsWarning)
-@JvmName("sendMedaGroupByContent")
-suspend fun TelegramBot.sendMediaGroup(
-    chat: Chat,
-    media: List<MediaGroupContent>,
+    media: List<MediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
@@ -82,7 +46,7 @@ suspend fun TelegramBot.sendMediaGroup(
  */
 suspend fun TelegramBot.sendPlaylist(
     chatId: ChatIdentifier,
-    media: List<AudioMediaGroupMemberTelegramMedia>,
+    media: List<AudioMediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
@@ -98,37 +62,7 @@ suspend fun TelegramBot.sendPlaylist(
  */
 suspend fun TelegramBot.sendPlaylist(
     chat: Chat,
-    media: List<AudioMediaGroupMemberTelegramMedia>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendPlaylist(
-    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendPlaylist
- */
-@JvmName("sendPlaylistByContent")
-suspend fun TelegramBot.sendPlaylist(
-    chatId: ChatIdentifier,
-    media: List<AudioContent>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendPlaylist(
-    chatId, media.map { it.toMediaGroupMemberTelegramMedia() }, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendPlaylist
- */
-@JvmName("sendPlaylistByContent")
-suspend fun TelegramBot.sendPlaylist(
-    chat: Chat,
-    media: List<AudioContent>,
+    media: List<AudioMediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
@@ -142,7 +76,7 @@ suspend fun TelegramBot.sendPlaylist(
  */
 suspend fun TelegramBot.sendDocumentsGroup(
     chatId: ChatIdentifier,
-    media: List<DocumentMediaGroupMemberTelegramMedia>,
+    media: List<DocumentMediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
@@ -158,37 +92,7 @@ suspend fun TelegramBot.sendDocumentsGroup(
  */
 suspend fun TelegramBot.sendDocumentsGroup(
     chat: Chat,
-    media: List<DocumentMediaGroupMemberTelegramMedia>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendDocumentsGroup(
-    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendDocumentsGroup
- */
-@JvmName("sendDocumentsByContent")
-suspend fun TelegramBot.sendDocumentsGroup(
-    chatId: ChatIdentifier,
-    media: List<DocumentContent>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendDocumentsGroup(
-    chatId, media.map { it.toMediaGroupMemberTelegramMedia() }, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendDocumentsGroup
- */
-@JvmName("sendDocumentsByContent")
-suspend fun TelegramBot.sendDocumentsGroup(
-    chat: Chat,
-    media: List<DocumentContent>,
+    media: List<DocumentMediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
@@ -202,7 +106,7 @@ suspend fun TelegramBot.sendDocumentsGroup(
  */
 suspend fun TelegramBot.sendVisualMediaGroup(
     chatId: ChatIdentifier,
-    media: List<VisualMediaGroupMemberTelegramMedia>,
+    media: List<VisualMediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
@@ -218,37 +122,7 @@ suspend fun TelegramBot.sendVisualMediaGroup(
  */
 suspend fun TelegramBot.sendVisualMediaGroup(
     chat: Chat,
-    media: List<VisualMediaGroupMemberTelegramMedia>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendVisualMediaGroup(
-    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendVisualMediaGroup
- */
-@JvmName("sendVisualMediaGroupByContent")
-suspend fun TelegramBot.sendVisualMediaGroup(
-    chatId: ChatIdentifier,
-    media: List<VisualMediaGroupContent>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendVisualMediaGroup(
-    chatId, media.map { it.toMediaGroupMemberTelegramMedia() }, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendVisualMediaGroup
- */
-@JvmName("sendVisualMediaGroupByContent")
-suspend fun TelegramBot.sendVisualMediaGroup(
-    chat: Chat,
-    media: List<VisualMediaGroupContent>,
+    media: List<VisualMediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,