additional fixes in live location

0.23.0

CHANGELOG.md

@@ -1,5 +1,173 @@
 # TelegramBotAPI changelog
 
+## 0.23.0 TelegramBotAPI 4.6
+
+* `Poll` now is sealed class
+    * `RegularPoll` type was added to represent polls with type `regular`
+    * `QuizPoll` type was added to represent polls with type `quiz`
+    * `UnknownPollType` type was added to represent polls which are unknown in current version
+* `AnonymousPollOption` was renamed to `SimplePollOption`
+* `SendPoll` was rewritten as sealed class
+    * `SendRegularPoll` was created and represent `sendPoll` method with type `regular`
+    * `SendQuizPoll` was created and represent `sendPoll` method with type `quiz`
+* `Poll#createRequest` extension was added
+* `PollAnswerUpdate` type of update was added
+    * `PollAnswer` type was added
+    * `UpdatesFilter` now support work with `PollAnswerUpdate`
+* `language` field in PreTextSource now correctly passed from telegram MessageEntities
+* `KeyboardButton` now is sealed class
+    * Fixed problem of incorrect representation of this class (any type of request can be created separately)
+    * Added new types of `KeyboardButton`:
+        * `UnknownKeyboardButton`
+        * `SimpleKeyboardButton`
+        * `RequestContactKeyboardButton`
+        * `RequestLocationKeyboardButton`
+        * `RequestPollKeyboardButton`
+    * Added new type `KeyboardButtonPollType`:
+        * `UnknownKeyboardButtonPollType`
+        * `RegularKeyboardButtonPollType`
+        * `QuizKeyboardButtonPollType`
+* `User` now is sealed class
+    * `CommonUser` was added as representation of default `User`
+    * `Bot` was added as representation of bot user (it is sealed class)
+        * `ExtendedBot` with additional info
+        * `CommonBot` with simple info
+    * `GetMe` now return `ExtendedBot` object
+    * Now extension `javaLocale` is extension for `CommonUser`
+
+### 0.23.1
+
+* Versions updates:
+    * Klock `1.8.6` -> `1.8.7`
+    * Ktor `1.3.0` -> `1.3.1`
+* Now it is possible to get updates by polling with custom executor engine
+* `CommonMultipartFileRequest` now is internal
+* Added `LiveLocation` class for more useful tracking live locations
+* `InvoiceOfPayment` is renamed to `InvoiceContent` and now is `MessageContent` instead of `PaymentInfo`
+* `SendInvoice` now return `ContentMessage<InvoiceContent>`
+* `paymentInfo` inside of `CommonMessageImpl` now can be set only to `SuccessfulPaymentInfo`
+* Added `RecordVideoNoteAction` and `UploadVideoNoteAction` for `record_video_note` and `upload_video_note` actions
+* For most part of messages was added `RequestsExecutor` extensions for more useful way of usage
+* `toInputFile` extensions now will return more exact types
+
+## 0.22.0
+
+* **`KtorCallFactory` must return `HttpStatement` instead of `HttpClientCall`**
+* `SendMessage` was renamed to `SendTextMessage` and previous `SendMessage` is deprecated
+* All `AbleToBe*` interfaces was renamed to `Possibly*`
+    * `AbleToBeEditedMessage` -> `PossiblyEditedMessage`
+    * `AbleToBeForwardedMessage` -> `PossiblyForwardedMessage`
+    * `AbleToBeMarkedUp` -> `PossiblyMarkedUp`
+    * `AbleToBeEditedMessage` -> `PossiblyEditedMessage`
+* `ForwardedMessage` type was renamed to `ForwardInfo`
+    * `AnonymousForwardedMessage` -> `AnonymousForwardInfo`
+    * `UserForwardedMessage` -> `UserForwardInfo`
+    * `ForwardedFromChannelMessage` -> `ForwardFromChannelInfo`
+    * `PossiblyForwardedMessage#forwarded` field now renamed to `forwardInfo`
+* All serializers in library now are `internal`. **If you have used some of them or I have marked as internal by a
+mistake - don't hesitate to say this.**
+* `EditChatMessage` now have generic type and extends `SimpleRequest<ContentMessage<GenericType>>`
+* `ResendableContent` now extends `Request<out Message>` instead of `Request<Message>`
+* Most part of requests have changed return type. They are listed below:
+    <details>
+    
+    * `ForwardMessage`
+    * `GetChatAdministrators`
+    * `EditChatMessageLiveLocation`
+    * `StopChatMessageLiveLocation`
+    * `EditChatMessageText`
+    * `EditChatMessageCaption`
+    * `EditChatMessageMedia`
+    * `EditChatMessageReplyMarkup`
+    * `SendAnimation`
+    * `SendAudio`
+    * `SendContact`
+    * `SendLocation`
+    * `SendTextMessage`
+    * `SendPoll`
+    * `SendVenue`
+    * `SendGame`
+    * `SendDocument`
+    * `SendMediaGroup`
+    * `SendPhoto`
+    * `SendVideo`
+    * `SendVideoNote`
+    * `SendVoice`
+    * `SendSticker`
+    
+    </details>
+* Changed type of `createResend`
+    <details>
+    
+    * `GameContent`
+    * `LocationContent`
+    * `PollContent`
+    * `TextContent`
+    * `VenueContent`
+    * `AnimationContent`
+    * `AudioContent`
+    * `DocumentContent`
+    * `ContactContent`
+    * `PhotoContent`
+    * `VideoContent`
+    * `VideoNoteContent`
+    * `VoiceContent`
+    * `StickerContent`
+    
+    </details>
+* Version updates:
+    * Ktor `1.2.6` -> `1.3.0`
+
+### 0.22.1 MediaContent#asInputMedia
+
+* All `MediaContent` instances now can create their `InputMedia` analog
+* New annotation `PreviewFeature` was added to mark new thing as preview for the time
+while they can work incorrectly
+* Added links utils:
+    * `makeLinkToMessage` have two signatures - for direct creating using username and for abstract creating using
+    chat id
+
+### 0.22.2 CashTag and independent updates handling
+
+* `cashtag` entity type was added
+* Several `Unknown*` realizations was added:
+    * `UnknownUpdateType`
+    * `UnknownMessageType`
+    * `UnknownChatType`
+    * `UnknownCallbackQueryType`
+* `UpdatesFilter` now have one additional income callback: `unknownUpdateTypeCallback`
+    * `createSimpleUpdateFilter` can receive one more callback: `unknownCallback` (for `unknownUpdateTypeCallback`)
+
+## 0.21.0 TelegramBotAPI 4.5
+
+* _**All `MessageEntity`'es now are replaced with `TextPart`**_
+* Added support of strikethrough and underline
+    * Added `UnderlineTextSource`
+    * Added `StrikethroughTextSource`
+    * Added support in `RawMessageEntity`
+* Added support of `MarkdownV2`
+* Now will not be thrown exception when there is income unknown type of `RawMessageEntity`. Instead of this will be
+created `RegularTextSource` with the same text
+* Fixed problem that usually string formatting did not trigger escaping of control characters
+* Actualized work with `pre` type of text - now it is possible to use `language` for formatting of text
+* Removed constructor of `TextMentionTextSource`, which was deprecated previously
+* All `TelegramMediaFile` instances now have field `fileUniqueId`, which represents `file_unique_id` field from API
+* Now `ChatPhoto` have two additional fields: `smallFileUniqueId` and `bigFileUniqueId`
+* Now any administrator object instance have `customTitle` nullable field
+* Added the new request `SetChatAdministratorCustomTitle` to manage the custom titles of administrators promoted by the
+bot.
+* Added the field `slowModeDelay` to the `ExtendedSupergroupChat` objects.
+
+* `CaptionedInput` now have extension `fullEntitiesList` which will return list of `TextPart` with `RegularSource`'s
+* `TextPart` added - it will be used as part of some text and can be not related to telegram bot
+* `MultilevelTextSource` was added - it is type of `TextSource`, which can have subsources as parts of this text
+* In all `TextSource`s all fields now are lazy for avoiding of potential risk for performance issues
+
+* Updates in versions:
+    * Coroutines `1.3.2` -> `1.3.3`
+    * Klock `1.8.0` -> `1.8.6`
+    * UUID `0.0.6` -> `0.0.7`
+
 ## 0.20.0 MPP Migration
 
 * Time library change: `joda-time` -> `com.soywiz.korlibs.klock:klock`
@@ -8,6 +176,35 @@
 * `User` now have no field `userLocale`
     * For `Java` there is `User#javaLocale` extension function, which will give an old locale work way
 
+### 0.20.1
+
+* `User` now implement `PrivateChat`
+* `TextMentionMessageEntity` now accept `PrivateChat` instead of `User` in main constructor
+    * `TextMentionMessageEntity` now contains not user, but contains `PrivateChat`
+    * Fixed: `TextMentionMessageEntity#asHtmlSource` previously worked incorrect
+* Abstraction `TextSource`
+    * `MessageEntity` now extends `TextSource`
+    * `createFormattedText` method now accept `List<TextSource>`
+    * `createHtmlText` method now accept `List<TextSource>`
+    * `createMarkdownText` method now accept `List<TextSource>`
+    * A lot of `TextSource` implementors was added. More info [here](src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/)
+        * All `MessageEntity` implementations now are using new `TextSource` analogues as delegates
+
+### 0.20.2
+
+* New exception type `MessageIsNotModifierException` was added
+* New exception type `MessageToEditNotFoundException` was added
+* Now exceptions in requests will be caught correctly
+
+### 0.20.3
+
+* Now `LeftChatMamber` is a `CommonEvent`
+
+### 0.20.4
+
+* Now `setWebhook` supports setting up of path for listening
+* Now `setWebhook` supports custom listen address even if certificate was not provided
+
 ## 0.19.0 ImplicitReflection removing
 
 * Total rework of serialization for requests. Now all `SimpleRequest` children have:

README.md

@@ -1,7 +1,7 @@
 # TelegramBotAPI
 
 [![Download](https://api.bintray.com/packages/insanusmokrassar/StandardRepository/TelegramBotAPI/images/download.svg) ](https://bintray.com/insanusmokrassar/StandardRepository/TelegramBotAPI/_latestVersion)
-[![Build Status](https://jenkins.insanusmokrassar.space/buildStatus/icon?job=TelegramBotAPI_master__publishing)](https://jenkins.insanusmokrassar.space/job/TelegramBotAPI_master__publishing/)
+[![Build Status](https://jenkins.insanusmokrassar.com/buildStatus/icon?job=TelegramBotAPI_master__publishing)](https://jenkins.insanusmokrassar.com/job/TelegramBotAPI_master__publishing/)
 
 ## What is it?
 
@@ -10,9 +10,9 @@ moments are describing by official [Telegram Bot API](https://core.telegram.org/
 
 ## Compatibility
 
-This version compatible with [29th of July 2019 update of TelegramBotAPI](https://core.telegram.org/bots/api#july-29-2019).
+This version compatible with [23th of January 2020 update of TelegramBotAPI (version 4.6)](https://core.telegram.org/bots/api#january-23-2020).
 There is Telegram Passport API exception of implemented functionality, which was presented in
-[August 2018 update of TelegramBotAPI](https://core.telegram.org/bots/api#august-27-2018) update. It will be implemented
+[August 2018 update of TelegramBotAPI](https://core.telegram.org/bots/api-changelog#august-27-2018) update. It will be implemented
 as soon as possible. All APIs that are not included are presented
 [wiki](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/Not-included-API).
 
@@ -25,8 +25,17 @@ like inserting of additional libraries (like `kotlin stdlib`). In the examples w
 
 [![Download](https://api.bintray.com/packages/insanusmokrassar/StandardRepository/TelegramBotAPI/images/download.svg) ](https://bintray.com/insanusmokrassar/StandardRepository/TelegramBotAPI/_latestVersion)
 
+Currently, last versions of library can be available from the Maven repository with errors (for the reason difficult in publishing
+of signed artifacts in Bintray). You can:
+
+* Use earlier version (available version you can find
+[here](https://mvnrepository.com/artifact/com.github.insanusmokrassar/TelegramBotAPI))
+* Add `jCenter` repository in build config
+
 ### Maven
 
+Dependency config presented here:
+
 ```xml
 <dependency>
   <groupId>com.github.insanusmokrassar</groupId>
@@ -37,14 +46,20 @@ like inserting of additional libraries (like `kotlin stdlib`). In the examples w
 
 ### Gradle
 
+To use last versions you will need to add one line in repositories block of your `build.gradle`:
+
+`jcenter()` or `mavenCentral()`
+
+And add next line to your dependencies block:
+
 ```groovy
-implementation "com.github.insanusmokrassar:TelegramBotAPI:${telegrambotapi.version}"
+implementation "com.github.insanusmokrassar:TelegramBotAPI:$telegrambotapi_version"
 ```
 
-### Gradle (old)
+or for old gradle:
 
 ```groovy
-compile "com.github.insanusmokrassar:TelegramBotAPI:${telegrambotapi.version}"
+compile "com.github.insanusmokrassar:TelegramBotAPI:$telegrambotapi_version"
 ```
 
 ## How to work with library?
@@ -52,19 +67,19 @@ compile "com.github.insanusmokrassar:TelegramBotAPI:${telegrambotapi.version}"
 For now, this library have no some API god-object. Instead of this, this library has several
 important objects:
 
-* [RequestsExecutor](src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/RequestsExecutor.kt)
-* [Requests](src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests)
-* [Types](src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types)
+* [RequestsExecutor](https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/RequestsExecutor.kt)
+* [Requests](https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests)
+* [Types](https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types)
 
 ### Types
 
 Types declare different objects representation. For example, `Chat` for now represented as
 interface and has several realisations:
 
-* PrivateChat
-* GroupChat
-* SupergroupChat
-* ChannelChat
+* `PrivateChat`
+* `GroupChat`
+* `SupergroupChat`
+* `ChannelChat`
 
 Instead of common garbage with all information as in original [Chat](https://core.telegram.org/bots/api#chat),
 here it was separated for more obvious difference between chats types and their possible content.
@@ -81,10 +96,16 @@ val requestsExecutor: RequestsExecutor = ...
 requestsExecutor.execute(GetMe())
 ``` 
 
-The result type of [GetMe](src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/GetMe) request is
-[User](src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/User). In fact, in this result must contain
-`isBot` equal to `true` always.
+Or you can use new syntax:
 
+```kotlin
+val bot: RequestsExecutor = ...
+bot.getMe()
+```
+
+The result type of [GetMe (and getMe extension)](https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/GetMe.kt)
+request is
+[ExtendedBot](https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/User.kt).
 
 ### RequestsExecutor
 
@@ -93,31 +114,38 @@ realisation of `RequestsExecutor`, but it is possible, that in future it will be
 project. How to create `RequestsExecutor`:
 
 ```kotlin
-val requestsExecutor = KtorRequestsExecutor(TOKEN)
+val requestsExecutor = KtorRequestsExecutor(
+    TelegramAPIUrlsKeeper(TOKEN)
+)
 ```
 
-Here `KtorRequestsExecutor` - default realisation with Ktor. `TOKEN` is just a token of bot which was retrieved
-according to [instruction](https://core.telegram.org/bots#3-how-do-i-create-a-bot).
+Here:
 
-Besides, for correct usage of this, you must implement in your project both one of engines for client and server
-Ktor libraries:
+* `KtorRequestsExecutor` - default realisation with [ktor](https://ktor.io)
+* `TelegramAPIUrlsKeeper` - special keeper, which  you can save and use for getting files full urls (`resolveFileURL`
+extension inside of `PathedFile.kt`)
+* `TOKEN` is just a token of bot which was retrieved according to
+[instruction](https://core.telegram.org/bots#3-how-do-i-create-a-bot).
+
+By default, for JVM there is implemented `CIO` client engine, but there is not server engine. Both can be changed like
+here:
 
 ```groovy
 dependencies {
     // ...
-    implementation "io.ktor:ktor-server-cio:$ktor_version"
-    implementation "io.ktor:ktor-client-okhttp:$ktor_version"
+    implementation "io.ktor:ktor-server-cio:$ktor_version" // for implementing of server engine
+    implementation "io.ktor:ktor-client-okhttp:$ktor_version" // for implementing of additional client engine
     // ...
 }
 ```
 
-It is able to avoid using of `server` dependency in case if will not be used `Webhook`s. In this case,
+You can avoid using of `server` dependency in case if you will not use `Webhook`s. In this case,
 dependencies list will be simplify:
 
 ```groovy
 dependencies {
     // ...
-    implementation "io.ktor:ktor-client-okhttp:$ktor_version"
+    implementation "io.ktor:ktor-client-okhttp:$ktor_version" // for implementing of additional client engine
     // ...
 }
 ```
@@ -140,7 +168,7 @@ Currently webhook method contains `UpdatesFilter` as necessary argument for gett
 separate getting updates for media groups - they are accumulating with debounce in one second
 (for being sure that all objects of media group was received).
 
-Updates polling also support `UpdatesFilter` but you must not use it and can get updates directly
+Updates polling also support `UpdatesFilter` but it is not required to use it and you can get updates directly
 in `UpdateReceiver`, which you will provide to `startGettingOfUpdates` method
 
 ### Webhook set up
@@ -173,6 +201,6 @@ Here:
 
 * `WEBHOOK_URL` - the url which will be used by Telegram system to send updates
 * `INTERNAL_PORT` - the port which will be used in bot for listening of updates
-* `filter` - instance of [UpdatesFilter](src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/UpdatesFilter.kt),
+* `filter` - instance of [UpdatesFilter](https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/UpdatesFilter.kt),
 which will be used to filter incoming updates
 * `ENGINE_FACTORY` - used factory name, for example, `CIO` in case of usage `io.ktor:ktor-server-cio` as server engine

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

build.gradle

@@ -17,7 +17,7 @@ plugins {
     id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
 }
 
-project.version = "0.19.0-kmpp-migration"
+project.version = "0.23.1"
 project.group = "com.github.insanusmokrassar"
 
 apply from: "publish.gradle"
@@ -31,15 +31,17 @@ repositories {
 
 kotlin {
     jvm()
-//    js()
+    js()
 
     sourceSets {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib')
-                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+                api "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$kotlin_coroutines_version"
                 api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$kotlin_serialisation_runtime_version"
+
                 api "com.soywiz.korlibs.klock:klock:$klock_version"
+                api "com.benasher44:uuid:$uuid_version"
 
                 api "io.ktor:ktor-client-core:$ktor_version"
             }
@@ -68,10 +70,12 @@ kotlin {
             }
         }
 
-//        jsMain {
-//            dependencies {
-//                api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:$kotlin_serialisation_runtime_version"
-//            }
-//        }
+        jsMain {
+            dependencies {
+                api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:$kotlin_serialisation_runtime_version"
+                api "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$kotlin_coroutines_version"
+                api "io.ktor:ktor-client-js:$ktor_version"
+            }
+        }
     }
 }

gradle.properties

@@ -1,11 +1,9 @@
 kotlin.code.style=official
 kotlin_version=1.3.61
-kotlin_coroutines_version=1.3.2
+kotlin_coroutines_version=1.3.3
 kotlin_serialisation_runtime_version=0.14.0
-klock_version=1.8.0
-ktor_version=1.2.6
+klock_version=1.8.7
+uuid_version=0.0.7
+ktor_version=1.3.1
 
 gradle_bintray_plugin_version=1.8.4
-
-project_public_name=Telegram Bot API
-project_public_description=Library for Object-Oriented and type-safe work with Telegram Bot API

maven.publish.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'maven-publish'
-apply plugin: 'signing'
 
 task javadocsJar(type: Jar) {
     classifier = 'javadoc'
@@ -35,25 +34,24 @@ publishing {
                 }
 
                 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"
                         }
+                    
                 }
             }
         }
     }
-}
-
-signing {
-    useGpgCmd()
-    sign(publishing.publications)
-}
+}

publish.gradle

@@ -5,6 +5,26 @@ apply from: "maven.publish.gradle"
 bintray {
     user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
     key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+    filesSpec {
+        from "${buildDir}/publications/"
+        eachFile {
+            String directorySubname = it.getFile().parentFile.name
+            if (it.getName() == "module.json") {
+                if (directorySubname == "kotlinMultiplatform") {
+                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module")
+                } else {
+                    it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
+                }
+            } else {
+                if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") {
+                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.pom")
+                } else {
+                    it.exclude()
+                }
+            }
+        }
+        into "${project.group}".replace(".", "/")
+    }
     pkg {
         repo = "StandardRepository"
         name = "${project.name}"
@@ -14,14 +34,22 @@ bintray {
             name = "${project.version}"
             released = new Date()
             vcsTag = "${project.version}"
+            gpg {
+                sign = true
+                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
+            }
         }
     }
 }
 
 bintrayUpload.doFirst {
     publications = publishing.publications.collect {
-        it.name
-    }
+        if (it.name.contains('kotlinMultiplatform')) {
+            null
+        } else {
+            it.name
+        }
+    } - null
 }
 
 bintrayUpload.dependsOn publishToMavenLocal

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Captioned.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts
 
-import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.MessageEntity
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.utils.fullListOfSubSource
 
 interface Captioned {
     val caption: String?
@@ -12,5 +12,7 @@ interface CaptionedOutput : Captioned {
 }
 
 interface CaptionedInput : Captioned {
-    val captionEntities: List<MessageEntity>
+    val captionEntities: List<TextPart>
 }
+
+fun CaptionedInput.fullEntitiesList() = caption ?.fullListOfSubSource(captionEntities) ?.map { it.source } ?: emptyList()

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/TextSource.kt

@@ -0,0 +1,17 @@
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts
+
+interface TextSource {
+    val asMarkdownSource: String
+    val asMarkdownV2Source: String
+    val asHtmlSource: String
+}
+
+
+interface MultilevelTextSource : TextSource {
+    val textParts: List<TextPart>
+}
+
+data class TextPart(
+    val range: IntRange,
+    val source: TextSource
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/KtorCallFactory.kt

@@ -2,12 +2,12 @@ package com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
 import io.ktor.client.HttpClient
-import io.ktor.client.call.HttpClientCall
+import io.ktor.client.statement.HttpStatement
 
 interface KtorCallFactory {
     suspend fun <T: Any> prepareCall(
         client: HttpClient,
         baseUrl: String,
         request: Request<T>
-    ) : HttpClientCall?
+    ) : HttpStatement?
 }

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/KtorRequestsExecutor.kt

@@ -11,8 +11,10 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.Response
 import com.github.insanusmokrassar.TelegramBotAPI.types.RetryAfterError
 import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper
 import io.ktor.client.HttpClient
-import io.ktor.client.call.HttpClientCall
 import io.ktor.client.call.receive
+import io.ktor.client.features.ClientRequestException
+import io.ktor.client.statement.HttpStatement
+import io.ktor.client.statement.readText
 import kotlinx.coroutines.delay
 import kotlinx.serialization.json.Json
 
@@ -34,40 +36,48 @@ class KtorRequestsExecutor(
 
     override suspend fun <T : Any> execute(request: Request<T>): T {
         return requestsLimiter.limit {
-            var call: HttpClientCall? = null
+            var statement: HttpStatement? = null
             for (factory in callsFactories) {
-                call = factory.prepareCall(
+                statement = factory.prepareCall(
                     client,
                     telegramAPIUrlsKeeper.commonAPIUrl,
                     request
                 )
-                if (call != null) {
+                if (statement != null) {
                     break
                 }
             }
-            if (call == null) {
-                throw IllegalArgumentException("Can't execute request: $request")
-            }
-            val content = call.response.receive<String>()
-            val responseObject = jsonFormatter.parse(Response.serializer(), content)
+            try {
+                val response = statement ?.execute() ?: throw IllegalArgumentException("Can't execute request: $request")
+                val content = response.receive<String>()
+                val responseObject = jsonFormatter.parse(Response.serializer(), content)
 
-            (responseObject.result ?.let {
-                jsonFormatter.fromJson(request.resultDeserializer, it)
-            } ?: responseObject.parameters ?.let {
-                val error = it.error
-                if (error is RetryAfterError) {
-                    delay(error.leftToRetry)
-                    execute(request)
-                } else {
-                    null
-                }
-            } ?: call.let {
+                (responseObject.result?.let {
+                    jsonFormatter.fromJson(request.resultDeserializer, it)
+                } ?: responseObject.parameters?.let {
+                    val error = it.error
+                    if (error is RetryAfterError) {
+                        delay(error.leftToRetry)
+                        execute(request)
+                    } else {
+                        null
+                    }
+                } ?: response.let {
+                    throw newRequestException(
+                        responseObject,
+                        content,
+                        "Can't get result object from $content"
+                    )
+                })
+            } catch (e: ClientRequestException) {
+                val content = e.response.readText()
+                val responseObject = jsonFormatter.parse(Response.serializer(), content)
                 throw newRequestException(
                     responseObject,
                     content,
                     "Can't get result object from $content"
                 )
-            })
+            }
         }
     }
 

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/AbstractRequestCallFactory.kt

@@ -3,10 +3,11 @@ package com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.base
 import com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorCallFactory
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
 import io.ktor.client.HttpClient
-import io.ktor.client.call.HttpClientCall
-import io.ktor.client.call.call
 import io.ktor.client.request.*
-import io.ktor.http.*
+import io.ktor.client.statement.HttpStatement
+import io.ktor.http.ContentType
+import io.ktor.http.HttpMethod
+import kotlin.collections.set
 
 abstract class AbstractRequestCallFactory : KtorCallFactory {
     private val methodsCache: MutableMap<String, String> = mutableMapOf()
@@ -14,20 +15,23 @@ abstract class AbstractRequestCallFactory : KtorCallFactory {
         client: HttpClient,
         baseUrl: String,
         request: Request<T>
-    ): HttpClientCall? {
+    ): HttpStatement? {
         val preparedBody = prepareCallBody(client, baseUrl, request) ?: return null
 
-        return client.call {
-            url(
-                methodsCache[request.method()] ?: "$baseUrl/${request.method()}".also {
-                    methodsCache[request.method()] = it
-                }
-            )
-            method = HttpMethod.Post
-            accept(ContentType.Application.Json)
+        return HttpStatement(
+            HttpRequestBuilder().apply {
+                url(
+                    methodsCache[request.method()] ?: "$baseUrl/${request.method()}".also {
+                        methodsCache[request.method()] = it
+                    }
+                )
+                method = HttpMethod.Post
+                accept(ContentType.Application.Json)
 
-            body = preparedBody
-        }
+                body = preparedBody
+            },
+            client
+        )
     }
 
     protected abstract fun <T : Any> prepareCallBody(

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/MultipartRequestCallFactory.kt

@@ -7,7 +7,6 @@ import io.ktor.client.request.forms.MultiPartFormDataContent
 import io.ktor.client.request.forms.formData
 import io.ktor.http.Headers
 import io.ktor.http.HttpHeaders
-import kotlinx.io.core.readBytes
 
 class MultipartRequestCallFactory : AbstractRequestCallFactory() {
 

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/SimpleRequestCallFactory.kt

@@ -1,7 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.base
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
-import com.github.insanusmokrassar.TelegramBotAPI.utils.toJsonWithoutNulls
 import io.ktor.client.HttpClient
 import io.ktor.http.ContentType
 import io.ktor.http.content.TextContent

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/RequestsExecutor.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.bot
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
-import kotlinx.io.core.Closeable
+import io.ktor.utils.io.core.Closeable
 
 interface RequestsExecutor : Closeable {
     /**

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/UpdatesPoller.kt

@@ -1,8 +1,8 @@
 package com.github.insanusmokrassar.TelegramBotAPI.bot
 
+import io.ktor.utils.io.core.Closeable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.io.core.Closeable
 
 interface UpdatesPoller : Closeable {
     fun start(scope: CoroutineScope = CoroutineScope(Dispatchers.Default))

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/exceptions/RequestException.kt

@@ -1,27 +1,30 @@
 package com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.Response
-import kotlinx.io.errors.IOException
+import kotlinx.io.IOException
 
 fun newRequestException(
     response: Response,
     plainAnswer: String,
     message: String? = null,
     cause: Throwable? = null
-) = when (response.description) {
-    "Bad Request: reply message not found" -> ReplyMessageNotFoundException(response, plainAnswer, message, cause)
-    "Unauthorized" -> UnauthorizedException(response, plainAnswer, message, cause)
-    else -> CommonRequestException(response, plainAnswer, message, cause)
-}
+) = response.description ?.let { description ->
+    when {
+        description == "Bad Request: reply message not found" -> ReplyMessageNotFoundException(response, plainAnswer, message, cause)
+        description == "Bad Request: message to edit not found" -> MessageToEditNotFoundException(response, plainAnswer, message, cause)
+        description.contains("Bad Request: message is not modified") -> MessageIsNotModifiedException(response, plainAnswer, message, cause)
+        description == "Unauthorized" -> UnauthorizedException(response, plainAnswer, message, cause)
+        else -> null
+    }
+} ?: CommonRequestException(response, plainAnswer, message, cause)
 
 sealed class RequestException constructor(
     val response: Response,
     val plainAnswer: String,
     message: String? = null,
-    cause: Throwable? = null
+    override val cause: Throwable? = null
 ) : IOException(
-    message ?: "Something went wrong",
-    cause
+    message ?: "Something went wrong"
 )
 
 class CommonRequestException(response: Response, plainAnswer: String, message: String?, cause: Throwable?) :
@@ -32,3 +35,9 @@ class UnauthorizedException(response: Response, plainAnswer: String, message: St
 
 class ReplyMessageNotFoundException(response: Response, plainAnswer: String, message: String?, cause: Throwable?) :
     RequestException(response, plainAnswer, message, cause)
+
+class MessageIsNotModifiedException(response: Response, plainAnswer: String, message: String?, cause: Throwable?) :
+    RequestException(response, plainAnswer, message, cause)
+
+class MessageToEditNotFoundException(response: Response, plainAnswer: String, message: String?, cause: Throwable?) :
+    RequestException(response, plainAnswer, message, cause)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/DeleteMessage.kt

@@ -1,8 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
 
@@ -20,3 +23,23 @@ data class DeleteMessage(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.deleteMessage(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier
+) = execute(
+    DeleteMessage(chatId, messageId)
+)
+
+suspend fun RequestsExecutor.deleteMessage(
+    chat: Chat,
+    messageId: MessageIdentifier
+) = deleteMessage(chat.id, messageId)
+
+suspend fun RequestsExecutor.deleteMessage(
+    message: Message
+) = deleteMessage(message.chat, message.messageId)
+
+suspend fun Message.delete(
+    requestsExecutor: RequestsExecutor
+) = requestsExecutor.deleteMessage(this)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/ForwardMessage.kt

@@ -1,12 +1,16 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
 import kotlinx.serialization.*
 
+private val AbleToBeForwardedMessageDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<PossiblyForwardedMessage>()
+
 @Serializable
 data class ForwardMessage(
     @SerialName(fromChatIdField)
@@ -17,15 +21,56 @@ data class ForwardMessage(
     override val messageId: MessageIdentifier,
     @SerialName(disableNotificationField)
     val disableNotification: Boolean = false
-): SimpleRequest<Message>, MessageAction {
-    @Transient
+): SimpleRequest<PossiblyForwardedMessage>, MessageAction {
     override val chatId: ChatIdentifier
         get() = fromChatId
 
     override fun method(): String = "forwardMessage"
 
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<PossiblyForwardedMessage>
+        get() = AbleToBeForwardedMessageDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.forwardMessage(
+    fromChatId: ChatIdentifier,
+    toChatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    disableNotification: Boolean = false
+) = execute(
+    ForwardMessage(fromChatId, toChatId, messageId, disableNotification)
+)
+
+suspend fun RequestsExecutor.forwardMessage(
+    fromChat: Chat,
+    toChatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    disableNotification: Boolean = false
+) = forwardMessage(fromChat.id, toChatId, messageId, disableNotification)
+
+suspend fun RequestsExecutor.forwardMessage(
+    fromChatId: ChatIdentifier,
+    toChat: Chat,
+    messageId: MessageIdentifier,
+    disableNotification: Boolean = false
+) = forwardMessage(fromChatId, toChat.id, messageId, disableNotification)
+
+suspend fun RequestsExecutor.forwardMessage(
+    fromChat: Chat,
+    toChat: Chat,
+    messageId: MessageIdentifier,
+    disableNotification: Boolean = false
+) = forwardMessage(fromChat.id, toChat.id, messageId, disableNotification)
+
+suspend fun RequestsExecutor.forwardMessage(
+    toChatId: ChatIdentifier,
+    message: Message,
+    disableNotification: Boolean = false
+) = forwardMessage(message.chat, toChatId, message.messageId, disableNotification)
+
+suspend fun RequestsExecutor.forwardMessage(
+    toChat: Chat,
+    message: Message,
+    disableNotification: Boolean = false
+) = forwardMessage(message.chat, toChat, message.messageId, disableNotification)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/GetMe.kt

@@ -1,14 +1,17 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.types.User
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*
 
 @Serializable
-class GetMe : SimpleRequest<User> {
+class GetMe : SimpleRequest<ExtendedBot> {
     override fun method(): String = "getMe"
-    override val resultDeserializer: DeserializationStrategy<User>
-        get() = User.serializer()
+    override val resultDeserializer: DeserializationStrategy<ExtendedBot>
+        get() = ExtendedBot.serializer()
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
-}
+}
+
+suspend fun RequestsExecutor.getMe() = execute(GetMe())

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/GetUpdates.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ALL_UPDATES_LIST
 import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier
@@ -27,3 +28,23 @@ data class GetUpdates(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.getUpdates(
+    offset: UpdateIdentifier? = null,
+    limit: Int? = null,
+    timeout: Int? = null,
+    allowed_updates: List<String>? = ALL_UPDATES_LIST
+) = execute(
+    GetUpdates(
+        offset, limit, timeout, allowed_updates
+    )
+)
+
+suspend fun RequestsExecutor.getUpdates(
+    lastUpdate: Update,
+    limit: Int? = null,
+    timeout: Int? = null,
+    allowed_updates: List<String>? = ALL_UPDATES_LIST
+) = getUpdates(
+    lastUpdate.updateId + 1, limit, timeout, allowed_updates
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/LiveLocation.kt

@@ -0,0 +1,133 @@
+package com.github.insanusmokrassar.TelegramBotAPI.requests
+
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.*
+import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendLocation
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.LocationContent
+import com.soywiz.klock.DateTime
+import com.soywiz.klock.TimeSpan
+import io.ktor.utils.io.core.Closeable
+import kotlinx.coroutines.*
+import kotlin.math.ceil
+
+private val livePeriodDelayMillis = (livePeriodLimit.last - 60L) * 1000L
+class LiveLocation internal constructor(
+    private val requestsExecutor: RequestsExecutor,
+    scope: CoroutineScope,
+    autoCloseTimeDelay: Double,
+    initMessage: ContentMessage<LocationContent>
+) : Closeable {
+    private val doWhenClose = {
+        scope.launch {
+            requestsExecutor.stopLiveLocation(message)
+        }
+    }
+    private val autoCloseTime = DateTime.now() + TimeSpan(autoCloseTimeDelay)
+    val leftUntilCloseMillis: TimeSpan
+        get() = autoCloseTime - DateTime.now()
+
+    var isClosed: Boolean = false
+        private set
+        get() = field || leftUntilCloseMillis.millisecondsLong < 0L
+
+    private var message: ContentMessage<LocationContent> = initMessage
+    val lastLocation: Location
+        get() = message.content.location
+
+    suspend fun updateLocation(
+        location: Location,
+        replyMarkup: InlineKeyboardMarkup? = null
+    ): Location {
+        if (!isClosed) {
+            message = requestsExecutor.editLiveLocation(
+                message,
+                location,
+                replyMarkup
+            )
+            return lastLocation
+        } else {
+            error("LiveLocation is closed")
+        }
+    }
+
+    override fun close() {
+        if (isClosed) {
+            return
+        }
+        isClosed = true
+        doWhenClose()
+    }
+}
+
+suspend fun RequestsExecutor.startLiveLocation(
+    scope: CoroutineScope,
+    chatId: ChatIdentifier,
+    latitude: Double,
+    longitude: Double,
+    liveTimeMillis: Long = livePeriodDelayMillis,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+): LiveLocation {
+    val liveTimeAsDouble = liveTimeMillis.toDouble()
+    val locationMessage = execute(
+        SendLocation(
+            chatId,
+            latitude,
+            longitude,
+            ceil(liveTimeAsDouble / 1000).toLong(),
+            disableNotification,
+            replyToMessageId,
+            replyMarkup
+        )
+    )
+
+    return LiveLocation(
+        this,
+        scope,
+        liveTimeAsDouble,
+        locationMessage
+    )
+}
+
+suspend fun RequestsExecutor.startLiveLocation(
+    scope: CoroutineScope,
+    chat: Chat,
+    latitude: Double,
+    longitude: Double,
+    liveTimeMillis: Long = livePeriodDelayMillis,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+): LiveLocation = startLiveLocation(
+    scope, chat.id, latitude, longitude, liveTimeMillis, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.startLiveLocation(
+    scope: CoroutineScope,
+    chatId: ChatId,
+    location: Location,
+    liveTimeMillis: Long = livePeriodDelayMillis,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+): LiveLocation = startLiveLocation(
+    scope, chatId, location.latitude, location.longitude, liveTimeMillis, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.startLiveLocation(
+    scope: CoroutineScope,
+    chat: Chat,
+    location: Location,
+    liveTimeMillis: Long = livePeriodDelayMillis,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+): LiveLocation = startLiveLocation(
+    scope, chat.id, location.latitude, location.longitude, liveTimeMillis, disableNotification, replyToMessageId, replyMarkup
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/StopPoll.kt

@@ -2,9 +2,13 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.ReplyMarkup.EditChatMessageReplyMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 import com.github.insanusmokrassar.TelegramBotAPI.types.polls.Poll
 import kotlinx.serialization.*
 
@@ -23,3 +27,29 @@ data class StopPoll(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.stopPoll(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(
+    StopPoll(chatId, messageId, replyMarkup)
+)
+
+suspend fun RequestsExecutor.stopPoll(
+    chat: Chat,
+    messageId: MessageIdentifier,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = stopPoll(chat.id, messageId, replyMarkup)
+
+suspend fun RequestsExecutor.stopPoll(
+    chatId: ChatId,
+    message: Message,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = stopPoll(chatId, message.messageId, replyMarkup)
+
+suspend fun RequestsExecutor.stopPoll(
+    chat: Chat,
+    message: Message,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = stopPoll(chat.id, message.messageId, replyMarkup)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/InputFile.kt

@@ -18,10 +18,10 @@ data class FileId(
     override val fileId: String
 ) : InputFile()
 
-fun String.toInputFile(): InputFile = FileId(this)
+fun String.toInputFile() = FileId(this)
 
 @Serializer(InputFile::class)
-object InputFileSerializer : KSerializer<InputFile> {
+internal object InputFileSerializer : KSerializer<InputFile> {
     override val descriptor: SerialDescriptor = StringDescriptor.withName(FileId::class.toString())
     override fun serialize(encoder: Encoder, obj: InputFile) = encoder.encodeString(obj.fileId)
     override fun deserialize(decoder: Decoder): FileId = FileId(decoder.decodeString())

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/Request.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts
 
-import kotlinx.serialization.*
+import kotlinx.serialization.DeserializationStrategy
 
 interface Request<T: Any> {
     fun method(): String

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerCallbackQuery.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.answers
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery.CallbackQuery
@@ -32,3 +33,19 @@ fun CallbackQuery.createAnswer(
     url: String? = null,
     cachedTimeSeconds: Int? = null
 ): AnswerCallbackQuery = AnswerCallbackQuery(id, text, showAlert, url, cachedTimeSeconds)
+
+suspend fun RequestsExecutor.answerCallbackQuery(
+    callbackQueryId: CallbackQueryIdentifier,
+    text: String? = null,
+    showAlert: Boolean? = null,
+    url: String? = null,
+    cachedTimeSeconds: Int? = null
+) = execute(AnswerCallbackQuery(callbackQueryId, text, showAlert, url, cachedTimeSeconds))
+
+suspend fun RequestsExecutor.answerCallbackQuery(
+    callbackQuery: CallbackQuery,
+    text: String? = null,
+    showAlert: Boolean? = null,
+    url: String? = null,
+    cachedTimeSeconds: Int? = null
+) = answerCallbackQuery(callbackQuery.id, text, showAlert, url, cachedTimeSeconds)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerInlineQuery.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.answers
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
@@ -51,6 +52,28 @@ fun InlineQuery.createAnswer(
     switchPmParameter
 )
 
-object InlineQueryAnswersResultsSerializer: KSerializer<List<InlineQueryResult>> by ArrayListSerializer(
+suspend fun RequestsExecutor.answerInlineQuery(
+    inlineQueryID: InlineQueryIdentifier,
+    results: List<InlineQueryResult> = emptyList(),
+    cachedTime: Int? = null,
+    isPersonal: Boolean? = null,
+    nextOffset: String? = null,
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
+) = execute(
+    AnswerInlineQuery(inlineQueryID, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
+)
+
+suspend fun RequestsExecutor.answerInlineQuery(
+    inlineQuery: InlineQuery,
+    results: List<InlineQueryResult> = emptyList(),
+    cachedTime: Int? = null,
+    isPersonal: Boolean? = null,
+    nextOffset: String? = null,
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
+) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
+
+internal object InlineQueryAnswersResultsSerializer: KSerializer<List<InlineQueryResult>> by ArrayListSerializer(
     InlineQueryResultSerializer
 )

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerPreCheckoutQuery.kt

@@ -1,8 +1,9 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.abstracts.AnswerPreCheckoutQuery
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
-import com.github.insanusmokrassar.TelegramBotAPI.types.payments.PreCheckoutQuery
+import com.github.insanusmokrassar.TelegramBotAPI.types.payments.*
 import kotlinx.serialization.*
 
 @Serializable
@@ -40,3 +41,19 @@ fun PreCheckoutQuery.createAnswerError(
     id,
     error
 )
+
+suspend fun RequestsExecutor.answerPreCheckoutQueryOk(
+    id: PreCheckoutQueryId
+) = execute(AnswerPreCheckoutQueryOk(id))
+suspend fun RequestsExecutor.answerPreCheckoutQueryOk(
+    preCheckoutQuery: PreCheckoutQuery
+) = answerPreCheckoutQueryOk(preCheckoutQuery.id)
+
+suspend fun RequestsExecutor.answerPreCheckoutQueryError(
+    id: PreCheckoutQueryId,
+    error: String
+) = execute(AnswerPreCheckoutQueryError(id, error))
+suspend fun RequestsExecutor.answerPreCheckoutQueryError(
+    preCheckoutQuery: PreCheckoutQuery,
+    error: String
+) = answerPreCheckoutQueryError(preCheckoutQuery.id, error)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerShippingQuery.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.abstracts.AnswerShippingQuery
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.payments.ShippingOption
@@ -21,7 +22,7 @@ data class AnswerShippingQueryOk(
         get() = serializer()
 }
 
-object ShippingOptionsSerializer : KSerializer<List<ShippingOption>> by ArrayListSerializer(
+internal object ShippingOptionsSerializer : KSerializer<List<ShippingOption>> by ArrayListSerializer(
     ShippingOption.serializer()
 )
 
@@ -51,3 +52,23 @@ fun ShippingQuery.createAnswerError(
     id,
     error
 )
+
+suspend fun RequestsExecutor.answerShippingQueryOk(
+    id: ShippingQueryIdentifier,
+    shippingOptions: List<ShippingOption>
+) = execute(AnswerShippingQueryOk(id, shippingOptions))
+suspend fun RequestsExecutor.answerShippingQueryOk(
+    shippingQuery: ShippingQuery,
+    shippingOptions: List<ShippingOption>
+) = answerShippingQueryOk(shippingQuery.id, shippingOptions)
+
+suspend fun RequestsExecutor.answerShippingQueryError(
+    id: ShippingQueryIdentifier,
+    error: String
+) = execute(AnswerShippingQueryError(id, error))
+suspend fun RequestsExecutor.answerShippingQueryError(
+    shippingQuery: ShippingQuery,
+    error: String
+) = answerShippingQueryError(shippingQuery.id, error)
+
+

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/abstracts/AnswerPreCheckoutQuery.kt

@@ -4,7 +4,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleReque
 import com.github.insanusmokrassar.TelegramBotAPI.types.PreCheckoutQueryId
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.internal.BooleanSerializer
-import kotlinx.serialization.serializer
 
 interface AnswerPreCheckoutQuery : SimpleRequest<Boolean> {
     override fun method(): String = "answerPreCheckoutQuery"

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/abstracts/AnswerShippingQuery.kt

@@ -2,7 +2,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.abs
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ShippingQueryIdentifier
-import kotlinx.serialization.*
+import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.internal.BooleanSerializer
 
 interface AnswerShippingQuery : SimpleRequest<Boolean> {

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/ExportChatInviteLink.kt

@@ -1,8 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringSerializer
@@ -18,3 +21,11 @@ data class ExportChatInviteLink(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.exportChatInviteLink(
+    chatId: ChatIdentifier
+) = execute(ExportChatInviteLink(chatId))
+
+suspend fun RequestsExecutor.exportChatInviteLink(
+    chat: PublicChat
+) = exportChatInviteLink(chat.id)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/LeaveChat.kt

@@ -1,8 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
@@ -18,3 +21,11 @@ data class LeaveChat(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.leaveChat(
+    chatId: ChatIdentifier
+) = execute(LeaveChat(chatId))
+
+suspend fun RequestsExecutor.leaveChat(
+    chat: PublicChat
+) = leaveChat(chat.id)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChat.kt

@@ -1,9 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ExtendedChatSerializer
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*
@@ -19,3 +21,11 @@ data class GetChat(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.getChat(
+    chatId: ChatIdentifier
+) = execute(GetChat(chatId))
+
+suspend fun RequestsExecutor.getChat(
+    chat: Chat
+) = getChat(chat.id)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatAdministrators.kt

@@ -1,26 +1,37 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
-import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMember
-import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMemberSerializerWithoutDeserialization
+import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.AdministratorChatMember
+import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.AdministratorChatMemberSerializerWithoutDeserialization
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.ArrayListSerializer
 
 private val chatMembersListSerializer = ArrayListSerializer(
-    ChatMemberSerializerWithoutDeserialization
+    AdministratorChatMemberSerializerWithoutDeserialization
 )
 
 @Serializable
 data class GetChatAdministrators(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier
-): ChatRequest, SimpleRequest<List<ChatMember>> {
+): ChatRequest, SimpleRequest<List<AdministratorChatMember>> {
     override fun method(): String = "getChatAdministrators"
-    override val resultDeserializer: DeserializationStrategy<List<ChatMember>>
+    override val resultDeserializer: DeserializationStrategy<List<AdministratorChatMember>>
         get() = chatMembersListSerializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.getChatAdministrators(
+    chatId: ChatIdentifier
+) = execute(GetChatAdministrators(chatId))
+
+suspend fun RequestsExecutor.getChatAdministrators(
+    chat: PublicChat
+) = getChatAdministrators(chat.id)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatMembersCount.kt

@@ -1,8 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.IntSerializer
@@ -18,3 +21,11 @@ data class GetChatMembersCount(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.getChatMembersCount(
+    chatId: ChatIdentifier
+) = execute(GetChatMembersCount(chatId))
+
+suspend fun RequestsExecutor.getChatMembersCount(
+    chat: PublicChat
+) = getChatMembersCount(chat.id)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/GetChatMember.kt

@@ -1,9 +1,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest
+import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get.getChatMembersCount
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMember
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMemberDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import kotlinx.serialization.*
 
 @Serializable
@@ -19,3 +23,23 @@ data class GetChatMember(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.getChatMember(
+    chatId: ChatIdentifier,
+    userId: UserId
+) = execute(GetChatMember(chatId, userId))
+
+suspend fun RequestsExecutor.getChatMember(
+    chat: PublicChat,
+    userId: UserId
+) = getChatMember(chat.id, userId)
+
+suspend fun RequestsExecutor.getChatMember(
+    chatId: ChatId,
+    user: User
+) = getChatMember(chatId, user.id)
+
+suspend fun RequestsExecutor.getChatMember(
+    chat: PublicChat,
+    user: User
+) = getChatMember(chat.id, user.id)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/KickChatMember.kt

@@ -1,8 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.UntilDate
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
 
@@ -21,3 +24,27 @@ data class KickChatMember(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.kickChatMember(
+    chatId: ChatIdentifier,
+    userId: UserId,
+    untilDate: TelegramDate? = null
+) = execute(KickChatMember(chatId, userId, untilDate))
+
+suspend fun RequestsExecutor.kickChatMember(
+    chat: PublicChat,
+    userId: UserId,
+    untilDate: TelegramDate? = null
+) = kickChatMember(chat.id, userId, untilDate)
+
+suspend fun RequestsExecutor.kickChatMember(
+    chatId: ChatId,
+    user: User,
+    untilDate: TelegramDate? = null
+) = kickChatMember(chatId, user.id, untilDate)
+
+suspend fun RequestsExecutor.kickChatMember(
+    chat: PublicChat,
+    user: User,
+    untilDate: TelegramDate? = null
+) = kickChatMember(chat.id, user.id, untilDate)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/PromoteChatMember.kt

@@ -1,8 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.UntilDate
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
 
@@ -37,3 +40,109 @@ data class PromoteChatMember(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.promoteChatMember(
+    chatId: ChatIdentifier,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    canChangeInfo: Boolean? = null,
+    canPostMessages: Boolean? = null,
+    canEditMessages: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPinMessages: Boolean? = null,
+    canPromoteMembers: Boolean? = null
+) = execute(
+    PromoteChatMember(
+        chatId,
+        userId,
+        untilDate,
+        canChangeInfo,
+        canPostMessages,
+        canEditMessages,
+        canDeleteMessages,
+        canInviteUsers,
+        canRestrictMembers,
+        canPinMessages,
+        canPromoteMembers
+    )
+)
+
+suspend fun RequestsExecutor.promoteChatMember(
+    chat: PublicChat,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    canChangeInfo: Boolean? = null,
+    canPostMessages: Boolean? = null,
+    canEditMessages: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPinMessages: Boolean? = null,
+    canPromoteMembers: Boolean? = null
+) = promoteChatMember(
+    chat.id,
+    userId,
+    untilDate,
+    canChangeInfo,
+    canPostMessages,
+    canEditMessages,
+    canDeleteMessages,
+    canInviteUsers,
+    canRestrictMembers,
+    canPinMessages,
+    canPromoteMembers
+)
+
+suspend fun RequestsExecutor.promoteChatMember(
+    chatId: ChatId,
+    user: User,
+    untilDate: TelegramDate? = null,
+    canChangeInfo: Boolean? = null,
+    canPostMessages: Boolean? = null,
+    canEditMessages: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPinMessages: Boolean? = null,
+    canPromoteMembers: Boolean? = null
+) = promoteChatMember(
+    chatId,
+    user.id,
+    untilDate,
+    canChangeInfo,
+    canPostMessages,
+    canEditMessages,
+    canDeleteMessages,
+    canInviteUsers,
+    canRestrictMembers,
+    canPinMessages,
+    canPromoteMembers
+)
+
+suspend fun RequestsExecutor.promoteChatMember(
+    chat: PublicChat,
+    user: User,
+    untilDate: TelegramDate? = null,
+    canChangeInfo: Boolean? = null,
+    canPostMessages: Boolean? = null,
+    canEditMessages: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPinMessages: Boolean? = null,
+    canPromoteMembers: Boolean? = null
+) = promoteChatMember(
+    chat.id,
+    user.id,
+    untilDate,
+    canChangeInfo,
+    canPostMessages,
+    canEditMessages,
+    canDeleteMessages,
+    canInviteUsers,
+    canRestrictMembers,
+    canPinMessages,
+    canPromoteMembers
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/RestrictChatMember.kt

@@ -1,9 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.UntilDate
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ChatPermissions
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
 
@@ -16,7 +19,7 @@ data class RestrictChatMember(
     @SerialName(untilDateField)
     override val untilDate: TelegramDate? = null,
     @SerialName(permissionsField)
-    val permissions: ChatPermissions
+    val permissions: ChatPermissions = ChatPermissions()
 ) : ChatMemberRequest<Boolean>, UntilDate {
     override fun method(): String = "restrictChatMember"
     override val resultDeserializer: DeserializationStrategy<Boolean>
@@ -24,3 +27,32 @@ data class RestrictChatMember(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.restrictChatMember(
+    chatId: ChatIdentifier,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    permissions: ChatPermissions = ChatPermissions()
+) = execute(RestrictChatMember(chatId, userId, untilDate, permissions))
+
+suspend fun RequestsExecutor.restrictChatMember(
+    chat: PublicChat,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    permissions: ChatPermissions = ChatPermissions()
+) = restrictChatMember(chat.id, userId, untilDate, permissions)
+
+suspend fun RequestsExecutor.restrictChatMember(
+    chatId: ChatId,
+    user: User,
+    untilDate: TelegramDate? = null,
+    permissions: ChatPermissions = ChatPermissions()
+) = restrictChatMember(chatId, user.id, untilDate, permissions)
+
+suspend fun RequestsExecutor.restrictChatMember(
+    chat: PublicChat,
+    user: User,
+    untilDate: TelegramDate? = null,
+    permissions: ChatPermissions = ChatPermissions()
+) = restrictChatMember(chat.id, user.id, untilDate, permissions)
+

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/SetChatAdministratorCustomTitle.kt

@@ -0,0 +1,60 @@
+package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members
+
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
+import kotlinx.serialization.*
+import kotlinx.serialization.internal.BooleanSerializer
+
+/**
+ * Representation of https://core.telegram.org/bots/api#setchatadministratorcustomtitle
+ *
+ * Please, remember about restrictions for characters in custom title
+ */
+@Serializable
+data class SetChatAdministratorCustomTitle(
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier,
+    @SerialName(userIdField)
+    override val userId: UserId,
+    @SerialName(customTitleField)
+    val customTitle: String
+) : ChatMemberRequest<Boolean> {
+    override fun method(): String = "setChatAdministratorCustomTitle"
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = RestrictChatMember.serializer()
+
+    init {
+        if (customTitle.length !in customTitleLength) {
+            throw IllegalArgumentException("Custom title length must be in range $customTitleLength, but was ${customTitle.length}")
+        }
+    }
+}
+
+suspend fun RequestsExecutor.setChatAdministratorCustomTitle(
+    chatId: ChatId,
+    userId: UserId,
+    customTitle: String
+) = execute(SetChatAdministratorCustomTitle(chatId, userId, customTitle))
+
+suspend fun RequestsExecutor.setChatAdministratorCustomTitle(
+    chat: PublicChat,
+    userId: UserId,
+    customTitle: String
+) = setChatAdministratorCustomTitle(chat.id, userId, customTitle)
+
+suspend fun RequestsExecutor.setChatAdministratorCustomTitle(
+    chatId: ChatId,
+    user: User,
+    customTitle: String
+) = setChatAdministratorCustomTitle(chatId, user.id, customTitle)
+
+suspend fun RequestsExecutor.setChatAdministratorCustomTitle(
+    chat: PublicChat,
+    user: User,
+    customTitle: String
+) = setChatAdministratorCustomTitle(chat.id, user.id, customTitle)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/UnbanChatMember.kt

@@ -1,7 +1,10 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
 
@@ -18,3 +21,24 @@ data class UnbanChatMember(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.unbanChatMember(
+    chatId: ChatIdentifier,
+    userId: UserId
+) = execute(UnbanChatMember(chatId, userId))
+
+suspend fun RequestsExecutor.unbanChatMember(
+    chat: PublicChat,
+    userId: UserId
+) = unbanChatMember(chat.id, userId)
+
+suspend fun RequestsExecutor.unbanChatMember(
+    chatId: ChatId,
+    user: User
+) = unbanChatMember(chatId, user.id)
+
+suspend fun RequestsExecutor.unbanChatMember(
+    chat: PublicChat,
+    user: User
+) = unbanChatMember(chat.id, user.id)
+

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/DeleteChatPhoto.kt

@@ -1,8 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
+import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get.GetChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
@@ -18,3 +22,11 @@ data class DeleteChatPhoto(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.deleteChatPhoto(
+    chatId: ChatIdentifier
+) = execute(DeleteChatPhoto(chatId))
+
+suspend fun RequestsExecutor.deleteChatPhoto(
+    chat: PublicChat
+) = deleteChatPhoto(chat.id)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/PinChatMessage.kt

@@ -1,8 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
 
@@ -21,3 +25,24 @@ data class PinChatMessage (
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.pinChatMessage(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    disableNotification: Boolean = false
+) = execute(PinChatMessage(chatId, messageId, disableNotification))
+
+suspend fun RequestsExecutor.pinChatMessage(
+    chat: PublicChat,
+    messageId: MessageIdentifier,
+    disableNotification: Boolean = false
+) = pinChatMessage(chat.id, messageId, disableNotification)
+
+suspend fun RequestsExecutor.pinChatMessage(
+    message: Message,
+    disableNotification: Boolean = false
+) = if (message.chat is PublicChat) {
+    pinChatMessage(message.chat.id, message.messageId, disableNotification)
+} else {
+    error("It is possible to pin messages only in non one-to-one chats")
+}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatDescription.kt

@@ -1,8 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
 
@@ -25,3 +28,13 @@ data class SetChatDescription (
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.setChatDescription(
+    chatId: ChatIdentifier,
+    description: String
+) = execute(SetChatDescription(chatId, description))
+
+suspend fun RequestsExecutor.setChatDescription(
+    chat: PublicChat,
+    description: String
+) = setChatDescription(chat.id, description)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPermissions.kt

@@ -1,9 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ChatPermissions
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
 
@@ -20,3 +22,13 @@ data class SetChatPermissions (
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.setDefaultChatMembersPermissions(
+    chatId: ChatIdentifier,
+    permissions: ChatPermissions
+) = execute(SetChatPermissions(chatId, permissions))
+
+suspend fun RequestsExecutor.setDefaultChatMembersPermissions(
+    chat: PublicChat,
+    permissions: ChatPermissions
+) = setDefaultChatMembersPermissions(chat.id, permissions)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPhoto.kt

@@ -1,9 +1,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ChatPermissions
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import com.github.insanusmokrassar.TelegramBotAPI.utils.toJson
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
@@ -21,3 +25,13 @@ data class SetChatPhoto (
     override val mediaMap: Map<String, MultipartFile> = mapOf(photoField to photo)
     override val paramsJson: JsonObject = toJson(serializer())
 }
+
+suspend fun RequestsExecutor.setChatPhoto(
+    chatId: ChatIdentifier,
+    photo: MultipartFile
+) = execute(SetChatPhoto(chatId, photo))
+
+suspend fun RequestsExecutor.setChatPhoto(
+    chat: PublicChat,
+    photo: MultipartFile
+) = setChatPhoto(chat.id, photo)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatTitle.kt

@@ -1,8 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
 
@@ -25,3 +29,13 @@ data class SetChatTitle (
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.setChatTitle(
+    chatId: ChatIdentifier,
+    title: String
+) = execute(SetChatTitle(chatId, title))
+
+suspend fun RequestsExecutor.setChatTitle(
+    chat: PublicChat,
+    title: String
+) = setChatTitle(chat.id, title)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/UnpinChatMessage.kt

@@ -1,8 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
@@ -18,3 +21,11 @@ data class UnpinChatMessage(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.unpinChatMessage(
+    chatId: ChatIdentifier
+) = execute(UnpinChatMessage(chatId))
+
+suspend fun RequestsExecutor.unpinChatMessage(
+    chat: PublicChat
+) = unpinChatMessage(chat.id)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/stickers/DeleteChatStickerSet.kt

@@ -1,8 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.stickers
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
+import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.DeleteChatPhoto
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
@@ -18,3 +21,11 @@ data class DeleteChatStickerSet(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.deleteChatStickerSet(
+    chatId: ChatIdentifier
+) = execute(DeleteChatStickerSet(chatId))
+
+suspend fun RequestsExecutor.deleteChatStickerSet(
+    chat: SupergroupChat
+) = deleteChatStickerSet(chat.id)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/stickers/SetChatStickerSet.kt

@@ -1,8 +1,10 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.stickers
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.*
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
 
@@ -19,3 +21,13 @@ data class SetChatStickerSet(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.setChatStickerSet(
+    chatId: ChatIdentifier,
+    stickerSetName: StickerSetName
+) = execute(SetChatStickerSet(chatId, stickerSetName))
+
+suspend fun RequestsExecutor.setChatStickerSet(
+    chat: SupergroupChat,
+    stickerSetName: StickerSetName
+) = setChatStickerSet(chat.id, stickerSetName)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/common/CommonMultipartFileRequest.kt

@@ -3,7 +3,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.common
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import kotlinx.serialization.json.JsonObject
 
-data class CommonMultipartFileRequest<T: Any>(
+internal data class CommonMultipartFileRequest<T: Any>(
     val data: SimpleRequest<T>,
     override val mediaMap: Map<String, MultipartFile>
 ) : MultipartRequest<T>, Request<T> by data {

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt

@@ -1,12 +1,17 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.LocationContent
 import kotlinx.serialization.*
 
+private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<LocationContent>>()
+
 @Serializable
 data class EditChatMessageLiveLocation(
     @SerialName(chatIdField)
@@ -19,10 +24,61 @@ data class EditChatMessageLiveLocation(
     override val longitude: Double,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditChatMessage, EditReplyMessage, EditLocationMessage {
+) : EditChatMessage<LocationContent>, EditReplyMessage, EditLocationMessage {
     override fun method(): String = "editMessageLiveLocation"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.editLiveLocation(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    latitude: Double,
+    longitude: Double,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(
+    EditChatMessageLiveLocation(
+        chatId, messageId, latitude, longitude, replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.editLiveLocation(
+    chat: Chat,
+    messageId: MessageIdentifier,
+    latitude: Double,
+    longitude: Double,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = editLiveLocation(chat.id, messageId, latitude, longitude, replyMarkup)
+
+suspend fun RequestsExecutor.editLiveLocation(
+    message: ContentMessage<LocationContent>,
+    latitude: Double,
+    longitude: Double,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = editLiveLocation(message.chat, message.messageId, latitude, longitude, replyMarkup)
+
+suspend fun RequestsExecutor.editLiveLocation(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    location: Location,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(
+    EditChatMessageLiveLocation(
+        chatId, messageId, location.latitude, location.longitude, replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.editLiveLocation(
+    chat: Chat,
+    messageId: MessageIdentifier,
+    location: Location,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = editLiveLocation(chat.id, messageId, location.latitude, location.longitude, replyMarkup)
+
+suspend fun RequestsExecutor.editLiveLocation(
+    message: ContentMessage<LocationContent>,
+    location: Location,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = editLiveLocation(message.chat, message.messageId, location.latitude, location.longitude, replyMarkup)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
-import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.caption.EditInlineMessageCaption
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.*
@@ -21,3 +21,19 @@ data class EditInlineMessageLiveLocation(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.editLiveLocation(
+    inlineMessageId: InlineMessageIdentifier,
+    latitude: Double,
+    longitude: Double,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(
+    EditInlineMessageLiveLocation(
+        inlineMessageId, latitude, longitude, replyMarkup
+    )
+)
+suspend fun RequestsExecutor.editLiveLocation(
+    inlineMessageId: InlineMessageIdentifier,
+    location: Location,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = editLiveLocation(inlineMessageId, location.latitude, location.longitude, replyMarkup)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt

@@ -1,13 +1,18 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditChatMessage
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.LocationContent
 import kotlinx.serialization.*
 
+private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<LocationContent>>()
+
 @Serializable
 data class StopChatMessageLiveLocation(
     @SerialName(chatIdField)
@@ -16,10 +21,32 @@ data class StopChatMessageLiveLocation(
     override val messageId: MessageIdentifier,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditChatMessage, EditReplyMessage {
+) : EditChatMessage<LocationContent>, EditReplyMessage {
     override fun method(): String = "stopMessageLiveLocation"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+
+suspend fun RequestsExecutor.stopLiveLocation(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(
+    StopChatMessageLiveLocation(
+        chatId, messageId, replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.stopLiveLocation(
+    chat: Chat,
+    messageId: MessageIdentifier,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = stopLiveLocation(chat.id, messageId, replyMarkup)
+
+suspend fun RequestsExecutor.stopLiveLocation(
+    message: ContentMessage<LocationContent>,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = stopLiveLocation(message.chat, message.messageId, replyMarkup)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditInlineMessage
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
@@ -17,3 +18,12 @@ data class StopInlineMessageLiveLocation(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.stopLiveLocation(
+    inlineMessageId: InlineMessageIdentifier,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(
+    StopInlineMessageLiveLocation(
+        inlineMessageId, replyMarkup
+    )
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt

@@ -1,15 +1,22 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.ReplyMarkup
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditChatMessage
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.EditChatMessageMedia
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent
 import kotlinx.serialization.*
 
 const val editMessageReplyMarkupMethod = "editMessageReplyMarkup"
 
+private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<MessageContent>>()
+
 @Serializable
 data class EditChatMessageReplyMarkup(
     @SerialName(chatIdField)
@@ -18,11 +25,31 @@ data class EditChatMessageReplyMarkup(
     override val messageId: MessageIdentifier,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditChatMessage, EditReplyMessage {
+) : EditChatMessage<MessageContent>, EditReplyMessage {
 
     override fun method(): String = editMessageReplyMarkupMethod
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<MessageContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.editMessageReplyMarkup(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(
+    EditChatMessageReplyMarkup(chatId, messageId, replyMarkup)
+)
+
+suspend fun RequestsExecutor.editMessageReplyMarkup(
+    chat: Chat,
+    messageId: MessageIdentifier,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = editMessageReplyMarkup(chat.id, messageId, replyMarkup)
+
+suspend fun RequestsExecutor.editMessageReplyMarkup(
+    message: Message,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = editMessageReplyMarkup(message.chat.id, message.messageId, replyMarkup)
+

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt

@@ -1,9 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.ReplyMarkup
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.EditInlineMessageLiveLocation
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditInlineMessage
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.EditInlineMessageMedia
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.*
 
@@ -18,3 +20,8 @@ data class EditInlineMessageReplyMarkup(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.editMessageReplyMarkup(
+    inlineMessageId: InlineMessageIdentifier,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(EditInlineMessageReplyMarkup(inlineMessageId, replyMarkup))

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditChatMessage.kt

@@ -2,6 +2,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent
 
-interface EditChatMessage : SimpleRequest<Message>, MessageAction
+interface EditChatMessage<MT: MessageContent> : SimpleRequest<ContentMessage<MT>>, MessageAction

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditInlineMessage.kt

@@ -2,7 +2,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier
-import kotlinx.serialization.*
+import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.internal.BooleanSerializer
 
 interface EditInlineMessage : SimpleRequest<Boolean> {

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditChatMessageCaption.kt

@@ -1,12 +1,21 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.caption
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedInput
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.MediaContentMessageResultDeserializer
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text.EditChatMessageText
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.CommonMessageImpl
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.PhotoContent
 import kotlinx.serialization.*
 
 const val editMessageCaptionMethod = "editMessageCaption"
@@ -23,11 +32,38 @@ data class EditChatMessageCaption(
     override val parseMode: ParseMode? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditChatMessage, EditTextChatMessage, EditReplyMessage {
+) : EditChatMessage<MediaContent>, EditTextChatMessage, EditReplyMessage {
 
     override fun method(): String = editMessageCaptionMethod
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<MediaContent>>
+        get() = MediaContentMessageResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.editMessageCaption(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    text: String,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(
+    EditChatMessageCaption(chatId, messageId, text, parseMode, replyMarkup)
+)
+
+suspend fun RequestsExecutor.editMessageCaption(
+    chat: Chat,
+    messageId: MessageIdentifier,
+    text: String,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = editMessageCaption(chat.id, messageId, text, parseMode, replyMarkup)
+
+suspend fun <T> RequestsExecutor.editMessageCaption(
+    message: ContentMessage<T>,
+    text: String,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+): ContentMessage<MediaContent> where T : CaptionedInput, T : MediaContent {
+    return editMessageCaption(message.chat.id, message.messageId, text, parseMode, replyMarkup)
+}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditInlineMessageCaption.kt

@@ -1,6 +1,8 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.caption
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text.EditInlineMessageText
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
@@ -22,3 +24,10 @@ data class EditInlineMessageCaption(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.editMessageCaption(
+    inlineMessageId: InlineMessageIdentifier,
+    text: String,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(EditInlineMessageCaption(inlineMessageId, text, parseMode, replyMarkup))

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditChatMessageMedia.kt

@@ -1,16 +1,26 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.caption.EditChatMessageCaption
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.CommonMessageImpl
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.TextContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.PhotoContent
 import kotlinx.serialization.*
 
 const val editMessageMediaMethod = "editMessageMedia"
 
+internal val MediaContentMessageResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<MediaContent>>()
+
 @Serializable
 data class EditChatMessageMedia(
     @SerialName(chatIdField)
@@ -21,7 +31,7 @@ data class EditChatMessageMedia(
     override val media: InputMedia,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditChatMessage, EditReplyMessage, EditMediaMessage {
+) : EditChatMessage<MediaContent>, EditReplyMessage, EditMediaMessage {
 
     init {
         if (media.file is MultipartFile) {
@@ -30,8 +40,30 @@ data class EditChatMessageMedia(
     }
 
     override fun method(): String = editMessageMediaMethod
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<MediaContent>>
+        get() = MediaContentMessageResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.editMessageMedia(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    media: InputMedia,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(
+    EditChatMessageMedia(chatId, messageId, media, replyMarkup)
+)
+
+suspend fun RequestsExecutor.editMessageMedia(
+    chat: Chat,
+    messageId: MessageIdentifier,
+    media: InputMedia,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = editMessageMedia(chat.id, messageId, media, replyMarkup)
+
+suspend fun RequestsExecutor.editMessageMedia(
+    message: ContentMessage<out MediaContent>,
+    media: InputMedia,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = editMessageMedia(message.chat.id, message.messageId, media, replyMarkup)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditInlineMessageMedia.kt

@@ -1,10 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
-import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.EditInlineMessageLiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.caption.EditInlineMessageCaption
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.*
 
@@ -28,3 +30,9 @@ data class EditInlineMessageMedia(
 
     override fun method(): String = editMessageMediaMethod
 }
+
+suspend fun RequestsExecutor.editMessageCaption(
+    inlineMessageId: InlineMessageIdentifier,
+    media: InputMedia,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(EditInlineMessageMedia(inlineMessageId, media, replyMarkup))

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditChatMessageText.kt

@@ -1,12 +1,16 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.requests.send.TextContentMessageResultDeserializer
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.TextContent
 import kotlinx.serialization.*
 
 const val editMessageTextMethod = "editMessageText"
@@ -25,11 +29,39 @@ data class EditChatMessageText(
     override val disableWebPagePreview: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditChatMessage, EditTextChatMessage, EditReplyMessage, EditDisableWebPagePreviewMessage {
+) : EditChatMessage<TextContent>, EditTextChatMessage, EditReplyMessage, EditDisableWebPagePreviewMessage {
 
     override fun method(): String = editMessageTextMethod
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<TextContent>>
+        get() = TextContentMessageResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.editMessageText(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    text: String,
+    parseMode: ParseMode? = null,
+    disableWebPagePreview: Boolean? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(
+    EditChatMessageText(chatId, messageId, text, parseMode, disableWebPagePreview, replyMarkup)
+)
+
+suspend fun RequestsExecutor.editMessageText(
+    chat: Chat,
+    messageId: MessageIdentifier,
+    text: String,
+    parseMode: ParseMode? = null,
+    disableWebPagePreview: Boolean? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = editMessageText(chat.id, messageId, text, parseMode, disableWebPagePreview, replyMarkup)
+
+suspend fun RequestsExecutor.editMessageText(
+    message: ContentMessage<TextContent>,
+    text: String,
+    parseMode: ParseMode? = null,
+    disableWebPagePreview: Boolean? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = editMessageText(message.chat.id, message.messageId, text, parseMode, disableWebPagePreview, replyMarkup)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditInlineMessageText.kt

@@ -1,12 +1,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.EditInlineMessageLiveLocation
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.editMessageMediaMethod
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import kotlinx.serialization.*
 
 @Serializable
@@ -26,3 +27,11 @@ data class EditInlineMessageText(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.editMessageText(
+    inlineMessageId: InlineMessageIdentifier,
+    text: String,
+    parseMode: ParseMode? = null,
+    disableWebPagePreview: Boolean? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(EditInlineMessageText(inlineMessageId, text, parseMode, disableWebPagePreview, replyMarkup))

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/GetGameHighScoresByChat.kt

@@ -1,8 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.games
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.GetGameHighScores
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.GameContent
 import kotlinx.serialization.*
 
 @Serializable
@@ -17,3 +21,50 @@ data class GetGameHighScoresByChat (
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+
+suspend fun RequestsExecutor.getGameScore(
+    userId: UserId,
+    chatId: ChatId,
+    messageId: MessageIdentifier
+) = execute(
+    GetGameHighScoresByChat(userId, chatId, messageId)
+)
+
+suspend fun RequestsExecutor.getGameScore(
+    user: CommonUser,
+    chatId: ChatId,
+    messageId: MessageIdentifier
+) = getGameScore(
+    user.id, chatId, messageId
+)
+
+suspend fun RequestsExecutor.getGameScore(
+    userId: UserId,
+    chat: Chat,
+    messageId: MessageIdentifier
+) = getGameScore(
+    userId, chat.id, messageId
+)
+
+suspend fun RequestsExecutor.getGameScore(
+    user: CommonUser,
+    chat: Chat,
+    messageId: MessageIdentifier
+) = getGameScore(
+    user.id, chat.id, messageId
+)
+
+suspend fun RequestsExecutor.getGameScore(
+    userId: UserId,
+    message: ContentMessage<GameContent>
+) = getGameScore(
+    userId, message.chat.id, message.messageId
+)
+
+suspend fun RequestsExecutor.getGameScore(
+    user: CommonUser,
+    message: ContentMessage<GameContent>
+) = getGameScore(
+    user.id, message.chat.id, message.messageId
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/GetGameHighScoresByInlineMessageId.kt

@@ -1,6 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.games
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.InlineMessageAction
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.GetGameHighScores
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*
@@ -15,3 +16,17 @@ data class GetGameHighScoresByInlineMessageId (
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.getGameScore(
+    userId: UserId,
+    inlineMessageId: InlineMessageIdentifier
+) = execute(
+    GetGameHighScoresByInlineMessageId(
+        userId, inlineMessageId
+    )
+)
+
+suspend fun RequestsExecutor.getGameScore(
+    user: CommonUser,
+    inlineMessageId: InlineMessageIdentifier
+) = getGameScore(user.id, inlineMessageId)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/SetGameScoreByChatId.kt

@@ -1,8 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.games
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.SetGameScore
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.GameContent
 import kotlinx.serialization.*
 
 @Serializable
@@ -23,3 +27,68 @@ data class SetGameScoreByChatId (
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+
+suspend fun RequestsExecutor.setGameScore(
+    userId: UserId,
+    score: Long,
+    chatId: ChatId,
+    messageId: MessageIdentifier,
+    force: Boolean = false,
+    disableEditMessage: Boolean = false
+) = execute(
+    SetGameScoreByChatId(userId, score, chatId, messageId, force, disableEditMessage)
+)
+
+suspend fun RequestsExecutor.setGameScore(
+    user: CommonUser,
+    score: Long,
+    chatId: ChatId,
+    messageId: MessageIdentifier,
+    force: Boolean = false,
+    disableEditMessage: Boolean = false
+) = setGameScore(
+    user.id, score, chatId, messageId, force, disableEditMessage
+)
+
+suspend fun RequestsExecutor.setGameScore(
+    userId: UserId,
+    score: Long,
+    chat: Chat,
+    messageId: MessageIdentifier,
+    force: Boolean = false,
+    disableEditMessage: Boolean = false
+) = setGameScore(
+    userId, score, chat.id, messageId, force, disableEditMessage
+)
+
+suspend fun RequestsExecutor.setGameScore(
+    user: CommonUser,
+    score: Long,
+    chat: Chat,
+    messageId: MessageIdentifier,
+    force: Boolean = false,
+    disableEditMessage: Boolean = false
+) = setGameScore(
+    user.id, score, chat.id, messageId, force, disableEditMessage
+)
+
+suspend fun RequestsExecutor.setGameScore(
+    userId: UserId,
+    score: Long,
+    message: ContentMessage<GameContent>,
+    force: Boolean = false,
+    disableEditMessage: Boolean = false
+) = setGameScore(
+    userId, score, message.chat.id, message.messageId, force, disableEditMessage
+)
+
+suspend fun RequestsExecutor.setGameScore(
+    user: CommonUser,
+    score: Long,
+    message: ContentMessage<GameContent>,
+    force: Boolean = false,
+    disableEditMessage: Boolean = false
+) = setGameScore(
+    user.id, score, message.chat.id, message.messageId, force, disableEditMessage
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/SetGameScoreByInlineMessageId.kt

@@ -1,6 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.games
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.InlineMessageAction
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.SetGameScore
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*
@@ -21,3 +22,23 @@ data class SetGameScoreByInlineMessageId (
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.setGameScore(
+    userId: UserId,
+    score: Long,
+    inlineMessageId: InlineMessageIdentifier,
+    force: Boolean = false,
+    disableEditMessage: Boolean = false
+) = execute(
+    SetGameScoreByInlineMessageId(
+        userId, score, inlineMessageId, force, disableEditMessage
+    )
+)
+
+suspend fun RequestsExecutor.setGameScore(
+    user: CommonUser,
+    score: Long,
+    inlineMessageId: InlineMessageIdentifier,
+    force: Boolean = false,
+    disableEditMessage: Boolean = false
+) = setGameScore(user.id, score, inlineMessageId, force, disableEditMessage)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/GetGameHighScores.kt

@@ -15,4 +15,4 @@ interface GetGameHighScores : SimpleRequest<List<GameHighScore>> {
         get() = GameHighScoresSerializer
 }
 
-object GameHighScoresSerializer : KSerializer<List<GameHighScore>> by ArrayListSerializer(GameHighScore.serializer())
+internal object GameHighScoresSerializer : KSerializer<List<GameHighScore>> by ArrayListSerializer(GameHighScore.serializer())

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/SetGameScore.kt

@@ -2,7 +2,8 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.UserId
-import kotlinx.serialization.*
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.serializer
 
 interface SetGameScore : SimpleRequest<Boolean> {
     val userId: UserId

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetFile.kt

@@ -1,8 +1,10 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.get
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.files.PathedFile
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.TelegramMediaFile
 import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.fileIdField
 import kotlinx.serialization.*
 
@@ -17,3 +19,13 @@ data class GetFile(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.getFileAdditionalInfo(
+    fileId: FileId
+) = execute(
+    GetFile(fileId)
+)
+
+suspend fun RequestsExecutor.getFileAdditionalInfo(
+    file: TelegramMediaFile
+) = getFileAdditionalInfo(file.fileId)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetStickerSet.kt

@@ -1,6 +1,8 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.get
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker
 import com.github.insanusmokrassar.TelegramBotAPI.types.stickerSetNameField
 import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.StickerSet
 import kotlinx.serialization.*
@@ -16,3 +18,15 @@ data class GetStickerSet(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.getStickerSet(
+    name: String
+) = execute(
+    GetStickerSet(name)
+)
+
+suspend fun RequestsExecutor.getStickerSet(
+    sticker: Sticker
+) = getStickerSet(
+    sticker.stickerSetName ?: error("Sticker must contains stickerSetName to be correctly used in getStickerSet method")
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetUserProfilePhotos.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.get
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*
@@ -28,3 +29,19 @@ data class GetUserProfilePhotos(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.getUserProfilePhotos(
+    userId: UserId,
+    offset: Int? = null,
+    limit: Int? = null
+) = execute(
+    GetUserProfilePhotos(
+        userId, offset, limit
+    )
+)
+
+suspend fun RequestsExecutor.getUserProfilePhotos(
+    user: CommonUser,
+    offset: Int? = null,
+    limit: Int? = null
+) = getUserProfilePhotos(user.id, offset, limit)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendAction.kt

@@ -1,8 +1,10 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendChatMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
-import com.github.insanusmokrassar.TelegramBotAPI.types.actions.BotAction
+import com.github.insanusmokrassar.TelegramBotAPI.types.actions.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
 
@@ -22,3 +24,99 @@ data class SendAction(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+
+suspend fun RequestsExecutor.sendBotAction(
+    chatId: ChatIdentifier,
+    action: BotAction
+) = execute(
+    SendAction(chatId, action)
+)
+
+suspend fun RequestsExecutor.sendBotAction(
+    chat: Chat,
+    action: BotAction
+) = sendBotAction(chat.id, action)
+
+
+suspend fun RequestsExecutor.sendActionTyping(
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, TypingAction)
+
+suspend fun RequestsExecutor.sendActionUploadPhoto(
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, UploadPhotoAction)
+
+suspend fun RequestsExecutor.sendActionRecordVideo(
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, RecordVideoAction)
+
+suspend fun RequestsExecutor.sendActionUploadVideo(
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, UploadVideoAction)
+
+suspend fun RequestsExecutor.sendActionRecordAudio(
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, RecordAudioAction)
+
+suspend fun RequestsExecutor.sendActionUploadAudio(
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, UploadAudioAction)
+
+suspend fun RequestsExecutor.sendActionUploadDocument(
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, UploadDocumentAction)
+
+suspend fun RequestsExecutor.sendActionFindLocation(
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, FindLocationAction)
+
+suspend fun RequestsExecutor.sendActionRecordVideoNote(
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, RecordVideoNoteAction)
+
+suspend fun RequestsExecutor.sendActionUploadVideoNote(
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, UploadVideoNoteAction)
+
+
+suspend fun RequestsExecutor.sendActionTyping(
+    chat: Chat
+) = sendBotAction(chat, TypingAction)
+
+suspend fun RequestsExecutor.sendActionUploadPhoto(
+    chat: Chat
+) = sendBotAction(chat, UploadPhotoAction)
+
+suspend fun RequestsExecutor.sendActionRecordVideo(
+    chat: Chat
+) = sendBotAction(chat, RecordVideoAction)
+
+suspend fun RequestsExecutor.sendActionUploadVideo(
+    chat: Chat
+) = sendBotAction(chat, UploadVideoAction)
+
+suspend fun RequestsExecutor.sendActionRecordAudio(
+    chat: Chat
+) = sendBotAction(chat, RecordAudioAction)
+
+suspend fun RequestsExecutor.sendActionUploadAudio(
+    chat: Chat
+) = sendBotAction(chat, UploadAudioAction)
+
+suspend fun RequestsExecutor.sendActionUploadDocument(
+    chat: Chat
+) = sendBotAction(chat, UploadDocumentAction)
+
+suspend fun RequestsExecutor.sendActionFindLocation(
+    chat: Chat
+) = sendBotAction(chat, FindLocationAction)
+
+suspend fun RequestsExecutor.sendActionRecordVideoNote(
+    chat: Chat
+) = sendBotAction(chat, RecordVideoNoteAction)
+
+suspend fun RequestsExecutor.sendActionUploadVideoNote(
+    chat: Chat
+) = sendBotAction(chat, UploadVideoNoteAction)
+

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendContact.kt

@@ -1,13 +1,19 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.ContactContent
 import kotlinx.serialization.*
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<ContactContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendContact(
     @SerialName(chatIdField)
@@ -24,8 +30,8 @@ data class SendContact(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<Message>,
-    ReplyingMarkupSendMessageRequest<Message>
+) : SendMessageRequest<ContentMessage<ContactContent>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<ContactContent>>
 {
     constructor(
         chatId: ChatIdentifier,
@@ -44,8 +50,8 @@ data class SendContact(
     )
 
     override fun method(): String = "sendContact"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<ContactContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
@@ -62,3 +68,51 @@ fun Contact.toRequest(
     replyToMessageId,
     replyMarkup
 )
+
+suspend fun RequestsExecutor.sendContact(
+    chatId: ChatIdentifier,
+    phoneNumber: String,
+    firstName: String,
+    lastName: String? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendContact(
+        chatId, phoneNumber, firstName, lastName, disableNotification, replyToMessageId, replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendContact(
+    chatId: ChatIdentifier,
+    contact: Contact,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendContact(
+        chatId, contact, disableNotification, replyToMessageId, replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendContact(
+    chat: Chat,
+    phoneNumber: String,
+    firstName: String,
+    lastName: String? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendContact(
+    chat.id, phoneNumber, firstName, lastName, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendContact(
+    chat: Chat,
+    contact: Contact,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendContact(
+    chat.id, contact, disableNotification, replyToMessageId, replyMarkup
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendLocation.kt

@@ -1,12 +1,27 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.EditChatMessageLiveLocation
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.StopChatMessageLiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.LocationContent
+import com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.executeAsync
+import com.soywiz.klock.DateTime
+import com.soywiz.klock.TimeSpan
+import io.ktor.utils.io.core.Closeable
+import kotlinx.coroutines.*
 import kotlinx.serialization.*
 
+
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 // TODO:: Add location tracker for tracking location
 @Serializable
 data class SendLocation(
@@ -24,14 +39,83 @@ data class SendLocation(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<Message>,
-    ReplyingMarkupSendMessageRequest<Message>,
-    PositionedSendMessageRequest<Message>
+) : SendMessageRequest<ContentMessage<LocationContent>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<LocationContent>>,
+    PositionedSendMessageRequest<ContentMessage<LocationContent>>
 {
-
     override fun method(): String = "sendLocation"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
+
+    init {
+        if (livePeriod != null && livePeriod !in livePeriodLimit) {
+            error("Live period for sending location must be in $livePeriodLimit, but was $livePeriod")
+        }
+    }
 }
+
+suspend fun RequestsExecutor.sendLocation(
+    chatId: ChatIdentifier,
+    latitude: Double,
+    longitude: Double,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendLocation(
+        chatId,
+        latitude,
+        longitude,
+        disableNotification = disableNotification,
+        replyToMessageId = replyToMessageId,
+        replyMarkup = replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendLocation(
+    chatId: ChatIdentifier,
+    location: Location,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendLocation(
+    chatId,
+    location.latitude,
+    location.longitude,
+    disableNotification,
+    replyToMessageId,
+    replyMarkup
+)
+
+suspend fun RequestsExecutor.sendLocation(
+    chat: Chat,
+    latitude: Double,
+    longitude: Double,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendLocation(
+    chat.id,
+    latitude,
+    longitude,
+    disableNotification,
+    replyToMessageId,
+    replyMarkup
+)
+
+suspend fun RequestsExecutor.sendLocation(
+    chat: Chat,
+    location: Location,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendLocation(
+    chat.id,
+    location.latitude,
+    location.longitude,
+    disableNotification,
+    replyToMessageId,
+    replyMarkup
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendMessage.kt

@@ -1,17 +1,23 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.DisableWebPagePreview
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.TextContent
 import kotlinx.serialization.*
 
+internal val TextContentMessageResultDeserializer: DeserializationStrategy<ContentMessage<TextContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
-data class SendMessage(
+data class SendTextMessage(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
     @SerialName(textField)
@@ -26,9 +32,9 @@ data class SendMessage(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<Message>,
-    ReplyingMarkupSendMessageRequest<Message>,
-    TextableSendMessageRequest<Message>,
+) : SendMessageRequest<ContentMessage<TextContent>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<TextContent>>,
+    TextableSendMessageRequest<ContentMessage<TextContent>>,
     DisableWebPagePreview
 {
     init {
@@ -38,8 +44,61 @@ data class SendMessage(
     }
 
     override fun method(): String = "sendMessage"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<TextContent>>
+        get() = TextContentMessageResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+@Deprecated(
+    "This declaration is deprecated due violation of common naming rules",
+    ReplaceWith(
+        "SendTextMessage"
+    )
+)
+typealias SendMessage = SendTextMessage
+
+suspend fun RequestsExecutor.sendMessage(
+    chatId: ChatIdentifier,
+    text: String,
+    parseMode: ParseMode? = null,
+    disableWebPagePreview: Boolean? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendTextMessage(chatId, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, replyMarkup)
+)
+
+suspend fun RequestsExecutor.sendTextMessage(
+    chatId: ChatIdentifier,
+    text: String,
+    parseMode: ParseMode? = null,
+    disableWebPagePreview: Boolean? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendMessage(
+    chatId, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendMessage(
+    chat: Chat,
+    text: String,
+    parseMode: ParseMode? = null,
+    disableWebPagePreview: Boolean? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendMessage(chat.id, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, replyMarkup)
+
+
+suspend fun RequestsExecutor.sendTextMessage(
+    chat: Chat,
+    text: String,
+    parseMode: ParseMode? = null,
+    disableWebPagePreview: Boolean? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendTextMessage(chat.id, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, replyMarkup)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendPoll.kt

@@ -1,47 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.requests.send
-
-import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.ReplyingMarkupSendMessageRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
-import com.github.insanusmokrassar.TelegramBotAPI.types.*
-import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
-import kotlinx.serialization.*
-
-@Serializable
-data class SendPoll(
-    @SerialName(chatIdField)
-    override val chatId: ChatIdentifier,
-    @SerialName(questionField)
-    val question: String,
-    @SerialName(optionsField)
-    val options: List<String>,
-    @SerialName(disableNotificationField)
-    override val disableNotification: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageIdentifier? = null,
-    @SerialName(replyMarkupField)
-    override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<Message>,
-    ReplyingMarkupSendMessageRequest<Message> {
-
-    init {
-        if (question.length !in pollQuestionTextLength) {
-            throw IllegalArgumentException("The length of questions for polls must be in $pollQuestionTextLength range, but was ${question.length}")
-        }
-        options.forEach {
-            if (it.length !in pollOptionTextLength) {
-                throw IllegalArgumentException("The length of question option text for polls must be in $pollOptionTextLength range, but was ${it.length}")
-            }
-        }
-        if (options.size !in pollOptionsLimit) {
-            throw IllegalArgumentException("The amount of question options for polls must be in $pollOptionsLimit range, but was ${options.size}")
-        }
-    }
-
-    override fun method(): String = "sendPoll"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendVenue.kt

@@ -1,12 +1,18 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.VenueContent
 import kotlinx.serialization.*
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<VenueContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendVenue(
     @SerialName(chatIdField)
@@ -27,10 +33,10 @@ data class SendVenue(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<Message>,
-    PositionedSendMessageRequest<Message>,
-    TitledSendMessageRequest<Message>,
-    ReplyingMarkupSendMessageRequest<Message>
+) : SendMessageRequest<ContentMessage<VenueContent>>,
+    PositionedSendMessageRequest<ContentMessage<VenueContent>>,
+    TitledSendMessageRequest<ContentMessage<VenueContent>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<VenueContent>>
 {
     constructor(
         chatId: ChatIdentifier,
@@ -51,8 +57,8 @@ data class SendVenue(
     )
 
     override fun method(): String = "sendVenue"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<VenueContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
@@ -69,3 +75,55 @@ fun Venue.toRequest(
     replyToMessageId,
     replyMarkup
 )
+
+suspend fun RequestsExecutor.sendVenue(
+    chatId: ChatIdentifier,
+    latitude: Double,
+    longitude: Double,
+    title: String,
+    address: String,
+    foursquareId: String? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendVenue(
+        chatId, latitude, longitude, title, address, foursquareId, disableNotification, replyToMessageId, replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendVenue(
+    chat: Chat,
+    latitude: Double,
+    longitude: Double,
+    title: String,
+    address: String,
+    foursquareId: String? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVenue(
+    chat.id, latitude, longitude, title, address, foursquareId, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendVenue(
+    chatId: ChatIdentifier,
+    venue: Venue,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendVenue(
+        chatId, venue, disableNotification, replyToMessageId, replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendVenue(
+    chat: Chat,
+    venue: Venue,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVenue(
+    chat.id, venue, disableNotification, replyToMessageId, replyMarkup
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/games/SendGame.kt

@@ -1,13 +1,20 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.games
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.games.Game
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.GameContent
 import kotlinx.serialization.*
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<GameContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendGame (
     @SerialName(chatIdField)
@@ -20,11 +27,53 @@ data class SendGame (
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<Message>,
+) : SendMessageRequest<ContentMessage<GameContent>>,
     ReplyMarkup {
     override fun method(): String = "sendGame"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<GameContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
-}
+}
+
+suspend fun RequestsExecutor.sendGame(
+    chatId: ChatIdentifier,
+    gameShortName: String,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendGame(
+        chatId, gameShortName, disableNotification, replyToMessageId, replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendGame(
+    chat: Chat,
+    gameShortName: String,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendGame(
+    chat.id, gameShortName, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendGame(
+    chatId: ChatIdentifier,
+    game: Game,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendGame(
+    chatId, game.title, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendGame(
+    chat: Chat,
+    game: Game,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendGame(
+    chat.id, game.title, disableNotification, replyToMessageId, replyMarkup
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAnimation.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.*
@@ -7,8 +8,11 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.AnimationFile
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.PhotoSize
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.AnimationContent
 import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull
 import kotlinx.serialization.*
 
@@ -24,7 +28,7 @@ fun SendAnimation(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<Message> {
+): Request<ContentMessage<AnimationContent>> {
     val animationAsFileId = (animation as? FileId) ?.fileId
     val animationAsFile = animation as? MultipartFile
     val thumbAsFileId = (thumb as? FileId) ?.fileId
@@ -54,6 +58,9 @@ fun SendAnimation(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<AnimationContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendAnimationData internal constructor(
     @SerialName(chatIdField)
@@ -78,13 +85,13 @@ data class SendAnimationData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<Message>,
-    SendMessageRequest<Message>,
-    ReplyingMarkupSendMessageRequest<Message>,
-    TextableSendMessageRequest<Message>,
-    ThumbedSendMessageRequest<Message>,
-    DuratedSendMessageRequest<Message>,
-    SizedSendMessageRequest<Message>
+) : DataRequest<ContentMessage<AnimationContent>>,
+    SendMessageRequest<ContentMessage<AnimationContent>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<AnimationContent>>,
+    TextableSendMessageRequest<ContentMessage<AnimationContent>>,
+    ThumbedSendMessageRequest<ContentMessage<AnimationContent>>,
+    DuratedSendMessageRequest<ContentMessage<AnimationContent>>,
+    SizedSendMessageRequest<ContentMessage<AnimationContent>>
 {
     init {
         text ?.let {
@@ -95,8 +102,8 @@ data class SendAnimationData internal constructor(
     }
 
     override fun method(): String = "sendAnimation"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<AnimationContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
@@ -108,3 +115,137 @@ data class SendAnimationFiles internal constructor(
     animationField to animation,
     thumbField to thumb
 )
+
+suspend fun RequestsExecutor.sendAnimation(
+    chatId: ChatIdentifier,
+    animation: FileId,
+    thumb: FileId? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    width: Int? = null,
+    height: Int? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendAnimationData(
+        chatId,
+        animation.fileId,
+        thumb ?.fileId,
+        text,
+        parseMode,
+        duration,
+        width,
+        height,
+        disableNotification,
+        replyToMessageId,
+        replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendAnimation(
+    chatId: ChatIdentifier,
+    animation: AnimationFile,
+    thumb: PhotoSize? = animation.thumb,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendAnimation(
+    chatId, animation.fileId, thumb ?.fileId, text, parseMode, animation.duration, animation.width, animation.height, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendAnimation(
+    chatId: ChatIdentifier,
+    animation: MultipartFile,
+    thumb: FileId? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    width: Int? = null,
+    height: Int? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendAnimationData(
+            chatId, null, thumb ?.fileId, text, parseMode, duration, width, height, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendAnimationFiles(animation)
+    )
+)
+
+suspend fun RequestsExecutor.sendAnimation(
+    chatId: ChatIdentifier,
+    animation: MultipartFile,
+    thumb: MultipartFile? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    width: Int? = null,
+    height: Int? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendAnimationData(
+            chatId, null, null, text, parseMode, duration, width, height, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendAnimationFiles(animation, thumb)
+    )
+)
+
+suspend fun RequestsExecutor.sendAnimation(
+    chatId: ChatIdentifier,
+    animation: FileId,
+    thumb: MultipartFile,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    width: Int? = null,
+    height: Int? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendAnimationData(
+            chatId, animation.fileId, null, text, parseMode, duration, width, height, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendAnimationFiles(null, thumb)
+    )
+)
+
+suspend fun RequestsExecutor.sendAnimation(
+    chatId: ChatIdentifier,
+    animation: MultipartFile,
+    thumb: PhotoSize? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    width: Int? = null,
+    height: Int? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendAnimation(
+    chatId, animation, thumb ?.fileId , text, parseMode, duration, width, height, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendAnimation(
+    chatId: ChatIdentifier,
+    animation: AnimationFile,
+    thumb: MultipartFile,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendAnimation(
+    chatId, animation.fileId, thumb, text, parseMode, animation.duration, animation.width, animation.height, disableNotification, replyToMessageId, replyMarkup
+)
+

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAudio.kt

@@ -1,6 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Performerable
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.*
@@ -8,8 +9,11 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.AudioFile
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.PhotoSize
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.AudioContent
 import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull
 import kotlinx.serialization.*
 
@@ -25,7 +29,7 @@ fun SendAudio(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<Message> {
+): Request<ContentMessage<AudioContent>> {
     val audioAsFileId = (audio as? FileId) ?.fileId
     val audioAsFile = audio as? MultipartFile
     val thumbAsFileId = (thumb as? FileId) ?.fileId
@@ -55,6 +59,9 @@ fun SendAudio(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<AudioContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendAudioData internal constructor(
     @SerialName(chatIdField)
@@ -79,13 +86,13 @@ data class SendAudioData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<Message>,
-    SendMessageRequest<Message>,
-    ReplyingMarkupSendMessageRequest<Message>,
-    TextableSendMessageRequest<Message>,
-    ThumbedSendMessageRequest<Message>,
-    TitledSendMessageRequest<Message>,
-    DuratedSendMessageRequest<Message>,
+) : DataRequest<ContentMessage<AudioContent>>,
+    SendMessageRequest<ContentMessage<AudioContent>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<AudioContent>>,
+    TextableSendMessageRequest<ContentMessage<AudioContent>>,
+    ThumbedSendMessageRequest<ContentMessage<AudioContent>>,
+    TitledSendMessageRequest<ContentMessage<AudioContent>>,
+    DuratedSendMessageRequest<ContentMessage<AudioContent>>,
     Performerable
 {
     init {
@@ -97,8 +104,8 @@ data class SendAudioData internal constructor(
     }
 
     override fun method(): String = "sendAudio"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<AudioContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
@@ -110,3 +117,138 @@ data class SendAudioFiles internal constructor(
     audioField to audio,
     thumbField to thumb
 )
+
+suspend fun RequestsExecutor.sendAudio(
+    chatId: ChatIdentifier,
+    audio: FileId,
+    thumb: FileId? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    performer: String? = null,
+    title: String? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendAudioData(
+        chatId,
+        audio.fileId,
+        thumb ?.fileId,
+        text,
+        parseMode,
+        duration,
+        performer,
+        title,
+        disableNotification,
+        replyToMessageId,
+        replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendAudio(
+    chatId: ChatIdentifier,
+    audio: AudioFile,
+    thumb: PhotoSize? = audio.thumb,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    title: String? = audio.title,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendAudio(
+    chatId, audio.fileId, thumb ?.fileId, text, parseMode, audio.duration, audio.performer, title, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendAudio(
+    chatId: ChatIdentifier,
+    audio: MultipartFile,
+    thumb: FileId? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    performer: String? = null,
+    title: String? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendAudioData(
+            chatId, null, thumb ?.fileId, text, parseMode, duration, performer, title, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendAudioFiles(audio)
+    )
+)
+
+suspend fun RequestsExecutor.sendAudio(
+    chatId: ChatIdentifier,
+    audio: MultipartFile,
+    thumb: MultipartFile? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    performer: String? = null,
+    title: String? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendAudioData(
+            chatId, null, null, text, parseMode, duration, performer, title, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendAudioFiles(audio, thumb)
+    )
+)
+
+suspend fun RequestsExecutor.sendAudio(
+    chatId: ChatIdentifier,
+    audio: FileId,
+    thumb: MultipartFile,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    performer: String? = null,
+    title: String? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendAudioData(
+            chatId, audio.fileId, null, text, parseMode, duration, performer, title, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendAudioFiles(null, thumb)
+    )
+)
+
+suspend fun RequestsExecutor.sendAudio(
+    chatId: ChatIdentifier,
+    audio: MultipartFile,
+    thumb: PhotoSize? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    performer: String? = null,
+    title: String? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendAudio(
+    chatId, audio, thumb ?.fileId , text, parseMode, duration, performer, title, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendAudio(
+    chatId: ChatIdentifier,
+    audio: AudioFile,
+    thumb: MultipartFile,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    title: String? = audio.title,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendAudio(
+    chatId, audio.fileId, thumb, text, parseMode, audio.duration, audio.performer, title, disableNotification, replyToMessageId, replyMarkup
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendDocument.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.*
@@ -7,8 +8,11 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.DocumentFile
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.PhotoSize
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.DocumentContent
 import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull
 import kotlinx.serialization.*
 
@@ -21,7 +25,7 @@ fun SendDocument(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<Message> {
+): Request<ContentMessage<DocumentContent>> {
     val documentAsFileId = (document as? FileId) ?.fileId
     val documentAsFile = document as? MultipartFile
     val thumbAsFileId = (thumb as? FileId) ?.fileId
@@ -48,6 +52,9 @@ fun SendDocument(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<DocumentContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendDocumentData internal constructor(
     @SerialName(chatIdField)
@@ -66,11 +73,11 @@ data class SendDocumentData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<Message>,
-    SendMessageRequest<Message>,
-    ReplyingMarkupSendMessageRequest<Message>,
-    TextableSendMessageRequest<Message>,
-    ThumbedSendMessageRequest<Message>
+) : DataRequest<ContentMessage<DocumentContent>>,
+    SendMessageRequest<ContentMessage<DocumentContent>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<DocumentContent>>,
+    TextableSendMessageRequest<ContentMessage<DocumentContent>>,
+    ThumbedSendMessageRequest<ContentMessage<DocumentContent>>
 {
     init {
         text ?.let {
@@ -81,8 +88,8 @@ data class SendDocumentData internal constructor(
     }
 
     override fun method(): String = "sendDocument"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<DocumentContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
@@ -94,3 +101,118 @@ data class SendDocumentFiles internal constructor(
     documentField to document,
     thumbField to thumb
 )
+
+suspend fun RequestsExecutor.sendDocument(
+    chatId: ChatIdentifier,
+    document: FileId,
+    thumb: FileId? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendDocumentData(
+        chatId,
+        document.fileId,
+        thumb ?.fileId,
+        text,
+        parseMode,
+        disableNotification,
+        replyToMessageId,
+        replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendDocument(
+    chatId: ChatIdentifier,
+    document: DocumentFile,
+    thumb: PhotoSize? = document.thumb,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendDocument(
+    chatId, document.fileId, thumb ?.fileId, text, parseMode, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendDocument(
+    chatId: ChatIdentifier,
+    document: MultipartFile,
+    thumb: FileId? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendDocumentData(
+            chatId, null, thumb ?.fileId, text, parseMode, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendDocumentFiles(document)
+    )
+)
+
+suspend fun RequestsExecutor.sendDocument(
+    chatId: ChatIdentifier,
+    document: MultipartFile,
+    thumb: MultipartFile? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendDocumentData(
+            chatId, null, null, text, parseMode, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendDocumentFiles(document, thumb)
+    )
+)
+
+suspend fun RequestsExecutor.sendDocument(
+    chatId: ChatIdentifier,
+    document: FileId,
+    thumb: MultipartFile,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendDocumentData(
+            chatId, document.fileId, null, text, parseMode, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendDocumentFiles(null, thumb)
+    )
+)
+
+suspend fun RequestsExecutor.sendDocument(
+    chatId: ChatIdentifier,
+    document: MultipartFile,
+    thumb: PhotoSize? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendDocument(
+    chatId, document, thumb ?.fileId , text, parseMode, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendDocument(
+    chatId: ChatIdentifier,
+    document: DocumentFile,
+    thumb: MultipartFile,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendDocument(
+    chatId, document.fileId, thumb, text, parseMode, disableNotification, replyToMessageId, replyMarkup
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendMediaGroup.kt

@@ -1,13 +1,15 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.*
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializerClass
 import com.github.insanusmokrassar.TelegramBotAPI.utils.toJsonWithoutNulls
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.ArrayListSerializer
@@ -20,7 +22,7 @@ fun SendMediaGroup(
     media: List<MediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null
-): Request<List<Message>> {
+): Request<List<MediaGroupMessage>> {
     if (media.size !in membersCountInMediaGroup) {
         throw IllegalArgumentException("Count of members for media group must be in $membersCountInMediaGroup range")
     }
@@ -53,7 +55,8 @@ fun SendMediaGroup(
     }
 }
 
-private val messagesListSerializer = ArrayListSerializer(TelegramBotAPIMessageDeserializeOnlySerializer)
+private val messagesListSerializer: ArrayListSerializer<MediaGroupMessage>
+    = ArrayListSerializer(TelegramBotAPIMessageDeserializeOnlySerializerClass())
 
 @Serializable
 data class SendMediaGroupData internal constructor(
@@ -64,7 +67,7 @@ data class SendMediaGroupData internal constructor(
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null
-) : DataRequest<List<Message>>, SendMessageRequest<List<Message>> {
+) : DataRequest<List<MediaGroupMessage>>, SendMessageRequest<List<MediaGroupMessage>> {
     @SerialName(mediaField)
     private val convertedMedia: String
         get() = jsonArray {
@@ -77,10 +80,30 @@ data class SendMediaGroupData internal constructor(
     override fun method(): String = "sendMediaGroup"
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
-    override val resultDeserializer: DeserializationStrategy<List<Message>>
+    override val resultDeserializer: DeserializationStrategy<List<MediaGroupMessage>>
         get() = messagesListSerializer
 }
 
 data class SendMediaGroupFiles internal constructor(
     val files: List<MultipartFile>
 ) : Files by (files.map { it.fileId to it }.toMap())
+
+suspend fun RequestsExecutor.sendMediaGroup(
+    chatId: ChatIdentifier,
+    media: List<MediaGroupMemberInputMedia>,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null
+) = execute(
+    SendMediaGroup(
+        chatId, media, disableNotification, replyToMessageId
+    )
+)
+
+suspend fun RequestsExecutor.sendMediaGroup(
+    chat: Chat,
+    media: List<MediaGroupMemberInputMedia>,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null
+) = sendMediaGroup(
+    chat.id, media, disableNotification, replyToMessageId
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendPhoto.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.*
@@ -7,8 +8,11 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.PhotoContent
 import kotlinx.serialization.*
 
 fun SendPhoto(
@@ -19,7 +23,7 @@ fun SendPhoto(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<Message> {
+): Request<ContentMessage<PhotoContent>> {
     val data = SendPhotoData(
         chatId,
         (photo as? FileId) ?.fileId,
@@ -37,6 +41,9 @@ fun SendPhoto(
     )
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<PhotoContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendPhotoData internal constructor(
     @SerialName(chatIdField)
@@ -53,10 +60,10 @@ data class SendPhotoData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<Message>,
-    SendMessageRequest<Message>,
-    ReplyingMarkupSendMessageRequest<Message>,
-    TextableSendMessageRequest<Message>
+) : DataRequest<ContentMessage<PhotoContent>>,
+    SendMessageRequest<ContentMessage<PhotoContent>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<PhotoContent>>,
+    TextableSendMessageRequest<ContentMessage<PhotoContent>>
 {
     init {
         text ?.let {
@@ -67,8 +74,8 @@ data class SendPhotoData internal constructor(
     }
 
     override fun method(): String = "sendPhoto"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<PhotoContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
@@ -78,3 +85,89 @@ data class SendPhotoFiles internal constructor(
 ) : Files by mapOf(
     photoField to photo
 )
+
+suspend fun RequestsExecutor.sendPhoto(
+    chatId: ChatIdentifier,
+    fileId: FileId,
+    caption: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendPhotoData(
+        chatId,
+        fileId.fileId,
+        caption,
+        parseMode,
+        disableNotification,
+        replyToMessageId,
+        replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendPhoto(
+    chatId: ChatIdentifier,
+    file: PhotoSize,
+    caption: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendPhoto(
+    chatId, file.fileId, caption, parseMode, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendPhoto(
+    chatId: ChatIdentifier,
+    photo: Photo,
+    caption: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendPhoto(
+    chatId, photo.biggest() ?: throw IllegalArgumentException("Photo $photo is empty"), caption, parseMode, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendPhoto(
+    chat: Chat,
+    fileId: FileId,
+    caption: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendPhoto(
+    chat.id,
+    fileId,
+    caption,
+    parseMode,
+    disableNotification,
+    replyToMessageId,
+    replyMarkup
+)
+
+suspend fun RequestsExecutor.sendPhoto(
+    chat: Chat,
+    file: PhotoSize,
+    caption: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendPhoto(
+    chat.id, file.fileId, caption, parseMode, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendPhoto(
+    chat: Chat,
+    photo: Photo,
+    caption: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendPhoto(
+    chat.id, photo.biggest() ?: throw IllegalArgumentException("Photo $photo is empty"), caption, parseMode, disableNotification, replyToMessageId, replyMarkup
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendSticker.kt

@@ -1,12 +1,17 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
+import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.MultipartRequestImpl
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.StickerContent
 import com.github.insanusmokrassar.TelegramBotAPI.utils.toJsonWithoutNulls
 import kotlinx.serialization.*
 import kotlinx.serialization.json.JsonObject
@@ -17,7 +22,7 @@ fun SendSticker(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<Message> = SendStickerByFileId(
+): Request<ContentMessage<StickerContent>> = SendStickerByFileId(
     chatId,
     sticker as? FileId,
     disableNotification,
@@ -30,6 +35,9 @@ fun SendSticker(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<StickerContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendStickerByFileId internal constructor(
     @SerialName(chatIdField)
@@ -42,10 +50,10 @@ data class SendStickerByFileId internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<Message>, ReplyingMarkupSendMessageRequest<Message> {
+) : SendMessageRequest<ContentMessage<StickerContent>>, ReplyingMarkupSendMessageRequest<ContentMessage<StickerContent>> {
     override fun method(): String = "sendSticker"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<StickerContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
@@ -54,9 +62,66 @@ data class SendStickerByFile internal constructor(
     @Transient
     private val sendStickerByFileId: SendStickerByFileId,
     val sticker: MultipartFile
-) : MultipartRequest<Message>, Request<Message> by sendStickerByFileId {
+) : MultipartRequest<ContentMessage<StickerContent>>, Request<ContentMessage<StickerContent>> by sendStickerByFileId {
     override val mediaMap: Map<String, MultipartFile> = mapOf(stickerField to sticker)
     override val paramsJson: JsonObject = sendStickerByFileId.toJsonWithoutNulls(SendStickerByFileId.serializer())
 }
 
 
+suspend fun RequestsExecutor.sendSticker(
+    chatId: ChatIdentifier,
+    sticker: FileId,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendStickerByFileId(chatId, sticker, disableNotification, replyToMessageId, replyMarkup)
+)
+
+suspend fun RequestsExecutor.sendSticker(
+    chatId: ChatIdentifier,
+    sticker: MultipartFile,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendStickerByFile(
+        SendStickerByFileId(chatId, null, disableNotification, replyToMessageId, replyMarkup),
+        sticker
+    )
+)
+
+suspend fun RequestsExecutor.sendSticker(
+    chat: Chat,
+    sticker: FileId,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendSticker(chat.id, sticker, disableNotification, replyToMessageId, replyMarkup)
+
+suspend fun RequestsExecutor.sendSticker(
+    chat: Chat,
+    sticker: MultipartFile,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendSticker(chat.id, sticker, disableNotification, replyToMessageId, replyMarkup)
+
+suspend fun RequestsExecutor.sendSticker(
+    chatId: ChatIdentifier,
+    sticker: Sticker,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendSticker(
+    chatId, sticker.fileId, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendSticker(
+    chat: Chat,
+    sticker: Sticker,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendSticker(chat.id, sticker.fileId, disableNotification, replyToMessageId, replyMarkup)
+

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideo.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.*
@@ -7,8 +8,11 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.VideoFile
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.PhotoSize
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.VideoContent
 import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull
 import kotlinx.serialization.*
 
@@ -25,7 +29,7 @@ fun SendVideo(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<Message> {
+): Request<ContentMessage<VideoContent>> {
     val videoAsFileId = (video as? FileId) ?.fileId
     val videoAsFile = video as? MultipartFile
     val thumbAsFileId = (thumb as? FileId) ?.fileId
@@ -56,6 +60,9 @@ fun SendVideo(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<VideoContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendVideoData internal constructor(
     @SerialName(chatIdField)
@@ -82,13 +89,13 @@ data class SendVideoData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<Message>,
-    SendMessageRequest<Message>,
-    ReplyingMarkupSendMessageRequest<Message>,
-    TextableSendMessageRequest<Message>,
-    ThumbedSendMessageRequest<Message>,
-    DuratedSendMessageRequest<Message>,
-    SizedSendMessageRequest<Message>
+) : DataRequest<ContentMessage<VideoContent>>,
+    SendMessageRequest<ContentMessage<VideoContent>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<VideoContent>>,
+    TextableSendMessageRequest<ContentMessage<VideoContent>>,
+    ThumbedSendMessageRequest<ContentMessage<VideoContent>>,
+    DuratedSendMessageRequest<ContentMessage<VideoContent>>,
+    SizedSendMessageRequest<ContentMessage<VideoContent>>
 {
     init {
         text ?.let {
@@ -99,8 +106,8 @@ data class SendVideoData internal constructor(
     }
 
     override fun method(): String = "sendVideo"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<VideoContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
@@ -112,3 +119,141 @@ data class SendVideoFiles internal constructor(
     videoField to video,
     thumbField to thumb
 )
+
+suspend fun RequestsExecutor.sendVideo(
+    chatId: ChatIdentifier,
+    video: FileId,
+    thumb: FileId? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    width: Int? = null,
+    height: Int? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendVideoData(
+        chatId,
+        video.fileId,
+        thumb ?.fileId,
+        text,
+        parseMode,
+        duration,
+        width,
+        height,
+        null,
+        disableNotification,
+        replyToMessageId,
+        replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendVideo(
+    chatId: ChatIdentifier,
+    video: VideoFile,
+    thumb: PhotoSize? = video.thumb,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVideo(
+    chatId, video.fileId, thumb ?.fileId, text, parseMode, video.duration, video.width, video.height, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendVideo(
+    chatId: ChatIdentifier,
+    video: MultipartFile,
+    thumb: FileId? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    width: Int? = null,
+    height: Int? = null,
+    supportStreaming: Boolean? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendVideoData(
+            chatId, null, thumb ?.fileId, text, parseMode, duration, width, height, supportStreaming, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendVideoFiles(video)
+    )
+)
+
+suspend fun RequestsExecutor.sendVideo(
+    chatId: ChatIdentifier,
+    video: MultipartFile,
+    thumb: MultipartFile? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    width: Int? = null,
+    height: Int? = null,
+    supportStreaming: Boolean? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendVideoData(
+            chatId, null, null, text, parseMode, duration, width, height, supportStreaming, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendVideoFiles(video, thumb)
+    )
+)
+
+suspend fun RequestsExecutor.sendVideo(
+    chatId: ChatIdentifier,
+    video: FileId,
+    thumb: MultipartFile,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    width: Int? = null,
+    height: Int? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendVideoData(
+            chatId, video.fileId, null, text, parseMode, duration, width, height, null, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendVideoFiles(null, thumb)
+    )
+)
+
+suspend fun RequestsExecutor.sendVideo(
+    chatId: ChatIdentifier,
+    video: MultipartFile,
+    thumb: PhotoSize? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    width: Int? = null,
+    height: Int? = null,
+    supportStreaming: Boolean? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVideo(
+    chatId, video, thumb ?.fileId , text, parseMode, duration, width, height, supportStreaming, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendVideo(
+    chatId: ChatIdentifier,
+    video: VideoFile,
+    thumb: MultipartFile,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVideo(
+    chatId, video.fileId, thumb, text, parseMode, video.duration, video.width, video.height, disableNotification, replyToMessageId, replyMarkup
+)
+

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideoNote.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.*
@@ -7,8 +8,11 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.PhotoSize
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.VideoFile
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.VideoNoteContent
 import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull
 import kotlinx.serialization.*
 
@@ -23,7 +27,7 @@ fun SendVideoNote(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<Message> {
+): Request<ContentMessage<VideoNoteContent>> {
     val videoNoteAsFileId = (videoNote as? FileId) ?.fileId
     val videoNoteAsFile = videoNote as? MultipartFile
     val thumbAsFileId = (thumb as? FileId) ?.fileId
@@ -52,6 +56,9 @@ fun SendVideoNote(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<VideoNoteContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendVideoNoteData internal constructor(
     @SerialName(chatIdField)
@@ -74,13 +81,13 @@ data class SendVideoNoteData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<Message>,
-    SendMessageRequest<Message>,
-    ReplyingMarkupSendMessageRequest<Message>,
-    TextableSendMessageRequest<Message>,
-    ThumbedSendMessageRequest<Message>,
-    DuratedSendMessageRequest<Message>,
-    SizedSendMessageRequest<Message>
+) : DataRequest<ContentMessage<VideoNoteContent>>,
+    SendMessageRequest<ContentMessage<VideoNoteContent>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<VideoNoteContent>>,
+    TextableSendMessageRequest<ContentMessage<VideoNoteContent>>,
+    ThumbedSendMessageRequest<ContentMessage<VideoNoteContent>>,
+    DuratedSendMessageRequest<ContentMessage<VideoNoteContent>>,
+    SizedSendMessageRequest<ContentMessage<VideoNoteContent>>
 {
     override val height: Int?
         get() = width
@@ -94,8 +101,8 @@ data class SendVideoNoteData internal constructor(
     }
 
     override fun method(): String = "sendVideoNote"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<VideoNoteContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
@@ -107,3 +114,130 @@ data class SendVideoNoteFiles internal constructor(
     videoNoteField to videoNote,
     thumbField to thumb
 )
+
+suspend fun RequestsExecutor.sendVideoNote(
+    chatId: ChatIdentifier,
+    videoNote: FileId,
+    thumb: FileId? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    size: Int? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendVideoNoteData(
+        chatId,
+        videoNote.fileId,
+        thumb ?.fileId,
+        text,
+        parseMode,
+        duration,
+        size,
+        disableNotification,
+        replyToMessageId,
+        replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendVideoNote(
+    chatId: ChatIdentifier,
+    videoNote: VideoFile,
+    thumb: PhotoSize? = videoNote.thumb,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVideoNote(
+    chatId, videoNote.fileId, thumb ?.fileId, text, parseMode, videoNote.duration, videoNote.width, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendVideoNote(
+    chatId: ChatIdentifier,
+    videoNote: MultipartFile,
+    thumb: FileId? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    size: Int? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendVideoNoteData(
+            chatId, null, thumb ?.fileId, text, parseMode, duration, size, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendVideoNoteFiles(videoNote)
+    )
+)
+
+suspend fun RequestsExecutor.sendVideoNote(
+    chatId: ChatIdentifier,
+    videoNote: MultipartFile,
+    thumb: MultipartFile? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    size: Int? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendVideoNoteData(
+            chatId, null, null, text, parseMode, duration, size, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendVideoNoteFiles(videoNote, thumb)
+    )
+)
+
+suspend fun RequestsExecutor.sendVideoNote(
+    chatId: ChatIdentifier,
+    videoNote: FileId,
+    thumb: MultipartFile,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    size: Int? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendVideoNoteData(
+            chatId, videoNote.fileId, null, text, parseMode, duration, size, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendVideoNoteFiles(null, thumb)
+    )
+)
+
+suspend fun RequestsExecutor.sendVideoNote(
+    chatId: ChatIdentifier,
+    videoNote: MultipartFile,
+    thumb: PhotoSize? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    size: Int? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVideoNote(
+    chatId, videoNote, thumb ?.fileId , text, parseMode, duration, size, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendVideoNote(
+    chatId: ChatIdentifier,
+    videoNote: VideoFile,
+    thumb: MultipartFile,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVideoNote(
+    chatId, videoNote.fileId, thumb, text, parseMode, videoNote.duration, videoNote.width, disableNotification, replyToMessageId, replyMarkup
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVoice.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.*
@@ -7,8 +8,11 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.AudioFile
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.PhotoSize
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.VoiceContent
 import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull
 import kotlinx.serialization.*
 
@@ -22,7 +26,7 @@ fun SendVoice(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<Message> {
+): Request<ContentMessage<VoiceContent>> {
     val voiceAsFileId = (voice as? FileId) ?.fileId
     val voiceAsFile = voice as? MultipartFile
     val thumbAsFileId = (thumb as? FileId) ?.fileId
@@ -50,6 +54,9 @@ fun SendVoice(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<VoiceContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendVoiceData internal constructor(
     @SerialName(chatIdField)
@@ -70,12 +77,12 @@ data class SendVoiceData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<Message>,
-    SendMessageRequest<Message>,
-    ReplyingMarkupSendMessageRequest<Message>,
-    TextableSendMessageRequest<Message>,
-    ThumbedSendMessageRequest<Message>,
-    DuratedSendMessageRequest<Message>
+) : DataRequest<ContentMessage<VoiceContent>>,
+    SendMessageRequest<ContentMessage<VoiceContent>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<VoiceContent>>,
+    TextableSendMessageRequest<ContentMessage<VoiceContent>>,
+    ThumbedSendMessageRequest<ContentMessage<VoiceContent>>,
+    DuratedSendMessageRequest<ContentMessage<VoiceContent>>
 {
     init {
         text ?.let {
@@ -86,8 +93,8 @@ data class SendVoiceData internal constructor(
     }
 
     override fun method(): String = "sendVoice"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<VoiceContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
@@ -99,3 +106,125 @@ data class SendVoiceFiles internal constructor(
     voiceField to voice,
     thumbField to thumb
 )
+
+suspend fun RequestsExecutor.sendVoice(
+    chatId: ChatIdentifier,
+    voice: FileId,
+    thumb: FileId? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendVoiceData(
+        chatId,
+        voice.fileId,
+        thumb ?.fileId,
+        text,
+        parseMode,
+        duration,
+        disableNotification,
+        replyToMessageId,
+        replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendVoice(
+    chatId: ChatIdentifier,
+    voice: AudioFile,
+    thumb: PhotoSize? = voice.thumb,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVoice(
+    chatId, voice.fileId, thumb ?.fileId, text, parseMode, voice.duration, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendVoice(
+    chatId: ChatIdentifier,
+    voice: MultipartFile,
+    thumb: FileId? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendVoiceData(
+            chatId, null, thumb ?.fileId, text, parseMode, duration, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendVoiceFiles(voice)
+    )
+)
+
+suspend fun RequestsExecutor.sendVoice(
+    chatId: ChatIdentifier,
+    voice: MultipartFile,
+    thumb: MultipartFile? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendVoiceData(
+            chatId, null, null, text, parseMode, duration, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendVoiceFiles(voice, thumb)
+    )
+)
+
+suspend fun RequestsExecutor.sendVoice(
+    chatId: ChatIdentifier,
+    voice: FileId,
+    thumb: MultipartFile,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    MultipartRequestImpl(
+        SendVoiceData(
+            chatId, voice.fileId, null, text, parseMode, duration, disableNotification, replyToMessageId, replyMarkup
+        ),
+        SendVoiceFiles(null, thumb)
+    )
+)
+
+suspend fun RequestsExecutor.sendVoice(
+    chatId: ChatIdentifier,
+    voice: MultipartFile,
+    thumb: PhotoSize? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    duration: Long? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVoice(
+    chatId, voice, thumb ?.fileId , text, parseMode, duration, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendVoice(
+    chatId: ChatIdentifier,
+    voice: AudioFile,
+    thumb: MultipartFile,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVoice(
+    chatId, voice.fileId, thumb, text, parseMode, voice.duration, disableNotification, replyToMessageId, replyMarkup
+)
+

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/DataRequest.kt

@@ -1,6 +1,5 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import kotlinx.serialization.*
 
 interface DataRequest<T: Any> : SimpleRequest<T>

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/MultipartRequestImpl.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
-import kotlinx.serialization.*
+import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.json.JsonObject
 
 /**

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/payments/SendInvoice.kt

@@ -1,16 +1,20 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.payments
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.payments.InvoiceContent
 import com.github.insanusmokrassar.TelegramBotAPI.types.payments.LabeledPrice
 import com.github.insanusmokrassar.TelegramBotAPI.types.payments.LabeledPricesSerializer
 import com.github.insanusmokrassar.TelegramBotAPI.types.payments.abstracts.*
 import kotlinx.serialization.*
 
+private val invoiceMessageSerializer: DeserializationStrategy<ContentMessage<InvoiceContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 /**
  * @param providerData - JSON-ENCODED FIELD
  */
@@ -61,10 +65,10 @@ data class SendInvoice(
     DisableNotification,
     ReplyMessageId,
     ReplyMarkup,
-    SendMessageRequest<Message> {
+    SendMessageRequest<ContentMessage<InvoiceContent>> {
     override fun method(): String = "sendInvoice"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<InvoiceContent>>
+        get() = invoiceMessageSerializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 
@@ -100,4 +104,50 @@ data class SendInvoice(
         photoWidth = null
         photoHeight = null
     }
-}
+}
+
+suspend fun RequestsExecutor.sendInvoice(
+    chatId: ChatId,
+    title: String,
+    description: String,
+    payload: String,
+    providerToken: String,
+    startParameter: StartParameter,
+    currency: Currency,
+    prices: List<LabeledPrice>,
+    providerData: String? = null,
+    requireName: Boolean = false,
+    requirePhoneNumber: Boolean = false,
+    requireEmail: Boolean = false,
+    requireShippingAddress: Boolean = false,
+    shouldSendPhoneNumberToProvider: Boolean = false,
+    shouldSendEmailToProvider: Boolean = false,
+    priceDependOnShipAddress: Boolean = false,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = execute(
+    SendInvoice(chatId, title, description, payload, providerToken, startParameter, currency, prices, providerData, requireName, requirePhoneNumber, requireEmail, requireShippingAddress, shouldSendPhoneNumberToProvider, shouldSendEmailToProvider, priceDependOnShipAddress, disableNotification, replyToMessageId, replyMarkup)
+)
+
+suspend fun RequestsExecutor.sendInvoice(
+    user: CommonUser,
+    title: String,
+    description: String,
+    payload: String,
+    providerToken: String,
+    startParameter: StartParameter,
+    currency: Currency,
+    prices: List<LabeledPrice>,
+    providerData: String? = null,
+    requireName: Boolean = false,
+    requirePhoneNumber: Boolean = false,
+    requireEmail: Boolean = false,
+    requireShippingAddress: Boolean = false,
+    shouldSendPhoneNumberToProvider: Boolean = false,
+    shouldSendEmailToProvider: Boolean = false,
+    priceDependOnShipAddress: Boolean = false,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = sendInvoice(user.id, title, description, payload, providerToken, startParameter, currency, prices, providerData, requireName, requirePhoneNumber, requireEmail, requireShippingAddress, shouldSendPhoneNumberToProvider, shouldSendEmailToProvider, priceDependOnShipAddress, disableNotification, replyToMessageId, replyMarkup)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/polls/SendPoll.kt

@@ -0,0 +1,312 @@
+package com.github.insanusmokrassar.TelegramBotAPI.requests.send.polls
+
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.ReplyingMarkupSendMessageRequest
+import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.PollContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.polls.*
+import kotlinx.serialization.*
+
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<PollContent>> = TelegramBotAPIMessageDeserializationStrategyClass()
+
+private fun checkPollInfo(
+    question: String,
+    options: List<String>
+) {
+    if (question.length !in pollQuestionTextLength) {
+        throw IllegalArgumentException("The length of questions for polls must be in $pollQuestionTextLength range, but was ${question.length}")
+    }
+    options.forEach {
+        if (it.length !in pollOptionTextLength) {
+            throw IllegalArgumentException("The length of question option text for polls must be in $pollOptionTextLength range, but was ${it.length}")
+        }
+    }
+    if (options.size !in pollOptionsLimit) {
+        throw IllegalArgumentException("The amount of question options for polls must be in $pollOptionsLimit range, but was ${options.size}")
+    }
+}
+
+fun SendPoll(
+    chatId: ChatIdentifier,
+    question: String,
+    options: List<String>,
+    isAnonymous: Boolean = true,
+    isClosed: Boolean = false,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = SendRegularPoll(
+    chatId,
+    question,
+    options,
+    isAnonymous,
+    isClosed,
+    disableNotification = disableNotification,
+    replyToMessageId = replyToMessageId,
+    replyMarkup = replyMarkup
+)
+
+/**
+ * @return [SendPoll] in case when all is right. It can return [SendRegularPoll] for [QuizPoll] in case if
+ * [QuizPoll.correctOptionId] equal to null
+ */
+fun Poll.createRequest(
+    chatId: ChatIdentifier,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = when (this) {
+    is RegularPoll -> SendRegularPoll(
+        chatId,
+        question,
+        options.map { it.text },
+        isAnonymous,
+        isClosed,
+        allowMultipleAnswers,
+        disableNotification,
+        replyToMessageId,
+        replyMarkup
+    )
+    is QuizPoll -> correctOptionId ?.let { correctOptionId ->
+        SendQuizPoll(
+            chatId,
+            question,
+            options.map { it.text },
+            correctOptionId,
+            isAnonymous,
+            isClosed,
+            disableNotification,
+            replyToMessageId,
+            replyMarkup
+        )
+    } ?: SendRegularPoll(
+        chatId,
+        question,
+        options.map { it.text },
+        isAnonymous,
+        isClosed,
+        false,
+        disableNotification,
+        replyToMessageId,
+        replyMarkup
+    )
+    is UnknownPollType -> SendRegularPoll(
+        chatId,
+        question,
+        options.map { it.text },
+        isAnonymous,
+        isClosed,
+        false,
+        disableNotification,
+        replyToMessageId,
+        replyMarkup
+    )
+}
+
+sealed class SendPoll : SendMessageRequest<ContentMessage<PollContent>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<PollContent>> {
+    abstract val question: String
+    abstract val options: List<String>
+    abstract val isAnonymous: Boolean
+    abstract val isClosed: Boolean
+    abstract val type: String
+
+    override fun method(): String = "sendPoll"
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<PollContent>>
+        get() = commonResultDeserializer
+}
+
+@Serializable
+data class SendRegularPoll(
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier,
+    @SerialName(questionField)
+    override val question: String,
+    @SerialName(optionsField)
+    override val options: List<String>,
+    @SerialName(isAnonymousField)
+    override val isAnonymous: Boolean = true,
+    @SerialName(isClosedField)
+    override val isClosed: Boolean = false,
+    @SerialName(allowsMultipleAnswersField)
+    val allowMultipleAnswers: Boolean = false,
+    @SerialName(disableNotificationField)
+    override val disableNotification: Boolean = false,
+    @SerialName(replyToMessageIdField)
+    override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(replyMarkupField)
+    override val replyMarkup: KeyboardMarkup? = null
+) : SendPoll() {
+    override val type: String = regularPollType
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    init {
+        checkPollInfo(question, options)
+    }
+}
+
+@Serializable
+data class SendQuizPoll(
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier,
+    @SerialName(questionField)
+    override val question: String,
+    @SerialName(optionsField)
+    override val options: List<String>,
+    @SerialName(correctOptionIdField)
+    val correctOptionId: Int,
+    @SerialName(isAnonymousField)
+    override val isAnonymous: Boolean = true,
+    @SerialName(isClosedField)
+    override val isClosed: Boolean = false,
+    @SerialName(disableNotificationField)
+    override val disableNotification: Boolean = false,
+    @SerialName(replyToMessageIdField)
+    override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(replyMarkupField)
+    override val replyMarkup: KeyboardMarkup? = null
+) : SendPoll() {
+    override val type: String = quizPollType
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    init {
+        checkPollInfo(question, options)
+        val correctOptionIdRange = 0 .. options.size
+        if (correctOptionId !in correctOptionIdRange) {
+            throw IllegalArgumentException("Correct option id must be in range of $correctOptionIdRange, but actual " +
+                "value is $correctOptionId")
+        }
+    }
+}
+
+
+suspend fun RequestsExecutor.sendRegularPoll(
+    chatId: ChatIdentifier,
+    question: String,
+    options: List<String>,
+    isAnonymous: Boolean = true,
+    isClosed: Boolean = false,
+    allowMultipleAnswers: Boolean = false,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendRegularPoll(
+        chatId, question, options, isAnonymous, isClosed, allowMultipleAnswers, disableNotification, replyToMessageId, replyMarkup
+    )
+)
+suspend fun RequestsExecutor.sendRegularPoll(
+    chatId: ChatIdentifier,
+    poll: RegularPoll,
+    isClosed: Boolean = false,
+    question: String = poll.question,
+    options: List<String> = poll.options.map { it.text },
+    isAnonymous: Boolean = poll.isAnonymous,
+    allowMultipleAnswers: Boolean = poll.allowMultipleAnswers,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendRegularPoll(
+        chatId, question, options, isAnonymous, isClosed, allowMultipleAnswers, disableNotification, replyToMessageId, replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendRegularPoll(
+    chat: Chat,
+    question: String,
+    options: List<String>,
+    isAnonymous: Boolean = true,
+    isClosed: Boolean = false,
+    allowMultipleAnswers: Boolean = false,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendRegularPoll(
+    chat.id, question, options, isAnonymous, isClosed, allowMultipleAnswers, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendRegularPoll(
+    chat: Chat,
+    poll: RegularPoll,
+    isClosed: Boolean = false,
+    question: String = poll.question,
+    options: List<String> = poll.options.map { it.text },
+    isAnonymous: Boolean = poll.isAnonymous,
+    allowMultipleAnswers: Boolean = poll.allowMultipleAnswers,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendRegularPoll(
+    chat.id, question, options, isAnonymous, isClosed, allowMultipleAnswers, disableNotification, replyToMessageId, replyMarkup
+)
+
+
+suspend fun RequestsExecutor.sendQuizPoll(
+    chatId: ChatIdentifier,
+    question: String,
+    options: List<String>,
+    correctOptionId: Int,
+    isAnonymous: Boolean = true,
+    isClosed: Boolean = false,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendQuizPoll(
+        chatId, question, options, correctOptionId, isAnonymous, isClosed, disableNotification, replyToMessageId, replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendQuizPoll(
+    chat: Chat,
+    question: String,
+    options: List<String>,
+    correctOptionId: Int,
+    isAnonymous: Boolean = true,
+    isClosed: Boolean = false,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendQuizPoll(
+    chat.id, question, options, correctOptionId, isAnonymous, isClosed, disableNotification, replyToMessageId, replyMarkup
+)
+
+suspend fun RequestsExecutor.sendQuizPoll(
+    chatId: ChatIdentifier,
+    isClosed: Boolean = false,
+    quizPoll: QuizPoll,
+    question: String = quizPoll.question,
+    options: List<String> = quizPoll.options.map { it.text },
+    correctOptionId: Int = quizPoll.correctOptionId ?: error("Correct option ID must be provided by income QuizPoll or by developer"),
+    isAnonymous: Boolean = quizPoll.isAnonymous,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendQuizPoll(
+        chatId, question, options, correctOptionId, isAnonymous, isClosed, disableNotification, replyToMessageId, replyMarkup
+    )
+)
+
+suspend fun RequestsExecutor.sendQuizPoll(
+    chat: Chat,
+    isClosed: Boolean = false,
+    quizPoll: QuizPoll,
+    question: String = quizPoll.question,
+    options: List<String> = quizPoll.options.map { it.text },
+    correctOptionId: Int = quizPoll.correctOptionId ?: error("Correct option ID must be provided by income QuizPoll or by developer"),
+    isAnonymous: Boolean = quizPoll.isAnonymous,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendQuizPoll(
+    chat.id, question, options, correctOptionId, isAnonymous, isClosed, disableNotification, replyToMessageId, replyMarkup
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddStickerToSet.kt

@@ -1,10 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.common.CommonMultipartFileRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.abstracts.StickerSetAction
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition
+import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.StickerSet
 import kotlinx.serialization.*
 
 fun AddStickerToSet(
@@ -48,3 +50,90 @@ data class AddStickerToSet internal constructor(
 
     override fun method(): String = "addStickerToSet"
 }
+
+suspend fun RequestsExecutor.addStickerToSet(
+    userId: UserId,
+    stickerSetName: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = execute(
+    AddStickerToSet(
+        userId, stickerSetName, emojis, sticker, maskPosition
+    )
+)
+
+suspend fun RequestsExecutor.addStickerToSet(
+    userId: UserId,
+    stickerSetName: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = execute(
+    CommonMultipartFileRequest(
+        AddStickerToSet(
+            userId, stickerSetName, emojis, null, maskPosition
+        ),
+        mapOf(pngStickerField to sticker)
+    )
+)
+
+suspend fun RequestsExecutor.addStickerToSet(
+    user: CommonUser,
+    stickerSetName: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addStickerToSet(
+    user.id, stickerSetName, sticker, emojis, maskPosition
+)
+
+suspend fun RequestsExecutor.addStickerToSet(
+    user: CommonUser,
+    stickerSetName: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addStickerToSet(
+    user.id, stickerSetName, sticker, emojis, maskPosition
+)
+
+suspend fun RequestsExecutor.addStickerToSet(
+    userId: UserId,
+    stickerSet: StickerSet,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addStickerToSet(
+    userId, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun RequestsExecutor.addStickerToSet(
+    userId: UserId,
+    stickerSet: StickerSet,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addStickerToSet(
+    userId, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun RequestsExecutor.addStickerToSet(
+    user: CommonUser,
+    stickerSet: StickerSet,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addStickerToSet(
+    user.id, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun RequestsExecutor.addStickerToSet(
+    user: CommonUser,
+    stickerSet: StickerSet,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addStickerToSet(
+    user.id, stickerSet.name, sticker, emojis, maskPosition
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/CreateNewStickerSet.kt

@@ -1,7 +1,9 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.common.CommonMultipartFileRequest
+import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.MultipartRequestImpl
 import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.abstracts.StickerSetAction
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition
@@ -51,3 +53,52 @@ data class CreateNewStickerSet internal constructor(
 
     override fun method(): String = "createNewStickerSet"
 }
+
+
+suspend fun RequestsExecutor.createNewStickerSet(
+    userId: UserId,
+    name: String,
+    sticker: FileId,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = execute(
+    CreateNewStickerSet(userId, name, emojis, sticker, containsMasks, maskPosition)
+)
+
+suspend fun RequestsExecutor.createNewStickerSet(
+    userId: UserId,
+    name: String,
+    sticker: MultipartFile,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = execute(
+    CommonMultipartFileRequest(
+        CreateNewStickerSet(userId, name, emojis, null, containsMasks, maskPosition),
+        mapOf(pngStickerField to sticker)
+    )
+)
+
+
+suspend fun RequestsExecutor.createNewStickerSet(
+    user: CommonUser,
+    name: String,
+    sticker: FileId,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = createNewStickerSet(
+    user.id, name, sticker, emojis, containsMasks, maskPosition
+)
+
+suspend fun RequestsExecutor.createNewStickerSet(
+    user: CommonUser,
+    name: String,
+    sticker: MultipartFile,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = createNewStickerSet(
+    user.id, name, sticker, emojis, containsMasks, maskPosition
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/DeleteStickerFromSet.kt

@@ -1,7 +1,9 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker
 import com.github.insanusmokrassar.TelegramBotAPI.types.stickerField
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
@@ -17,3 +19,19 @@ data class DeleteStickerFromSet(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+
+
+suspend fun RequestsExecutor.deleteStickerFromSet(
+    sticker: FileId
+) = execute(
+    DeleteStickerFromSet(
+        sticker
+    )
+)
+
+suspend fun RequestsExecutor.deleteStickerFromSet(
+    sticker: Sticker
+) = deleteStickerFromSet(
+    sticker.fileId
+)

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/SetStickerPositionInSet.kt

@@ -1,7 +1,9 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker
 import com.github.insanusmokrassar.TelegramBotAPI.types.positionField
 import com.github.insanusmokrassar.TelegramBotAPI.types.stickerField
 import kotlinx.serialization.*
@@ -26,3 +28,21 @@ data class SetStickerPositionInSet(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+suspend fun RequestsExecutor.setStickerPositionInSet(
+    sticker: FileId,
+    position: Int
+) = execute(
+    SetStickerPositionInSet(
+        sticker,
+        position
+    )
+)
+
+suspend fun RequestsExecutor.setStickerPositionInSet(
+    sticker: Sticker,
+    position: Int
+) = setStickerPositionInSet(
+    sticker.fileId,
+    position
+)