optimize imports

0.22.1

CHANGELOG.md

@@ -1,5 +1,123 @@
 # TelegramBotAPI changelog
 
+## 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 +126,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,7 +10,7 @@ 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 [31th of December 2019 update of TelegramBotAPI (version 4.5)](https://core.telegram.org/bots/api#december-31-2019).
 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
 as soon as possible. All APIs that are not included are presented
@@ -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,9 +67,9 @@ 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
 
@@ -81,8 +96,8 @@ 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
+The result type of [GetMe](https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/GetMe.kt) request is
+[User](https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/User.kt). In fact, in this result must contain
 `isBot` equal to `true` always.
 
 
@@ -140,7 +155,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 +188,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.22.2"
 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.6
+uuid_version=0.0.7
+ktor_version=1.3.0
 
 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/ForwardMessage.kt

@@ -3,10 +3,12 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction
 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.message.abstracts.PossiblyForwardedMessage
+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 +19,14 @@ 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()
 }

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

@@ -21,7 +21,7 @@ data class FileId(
 fun String.toInputFile(): InputFile = 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/AnswerInlineQuery.kt

@@ -51,6 +51,6 @@ fun InlineQuery.createAnswer(
     switchPmParameter
 )
 
-object InlineQueryAnswersResultsSerializer: KSerializer<List<InlineQueryResult>> by ArrayListSerializer(
+internal object InlineQueryAnswersResultsSerializer: KSerializer<List<InlineQueryResult>> by ArrayListSerializer(
     InlineQueryResultSerializer
 )

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

@@ -21,7 +21,7 @@ data class AnswerShippingQueryOk(
         get() = serializer()
 }
 
-object ShippingOptionsSerializer : KSerializer<List<ShippingOption>> by ArrayListSerializer(
+internal object ShippingOptionsSerializer : KSerializer<List<ShippingOption>> by ArrayListSerializer(
     ShippingOption.serializer()
 )
 

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/get/GetChatAdministrators.kt

@@ -3,23 +3,23 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 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.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()

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

@@ -0,0 +1,33 @@
+package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members
+
+import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+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: ChatId,
+    @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}")
+        }
+    }
+}

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

@@ -3,10 +3,13 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation
 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.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 +22,10 @@ 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()
 }

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

@@ -1,7 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation
 
 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.*

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

@@ -4,10 +4,13 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditCh
 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.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 +19,10 @@ 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()
 }

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

@@ -4,12 +4,15 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditCh
 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.message.abstracts.ContentMessage
+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 +21,11 @@ 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()
 }

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

@@ -1,6 +1,5 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.ReplyMarkup
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.EditInlineMessageLiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditInlineMessage
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.*

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,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.caption
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.MediaContentMessageResultDeserializer
 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.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent
 import kotlinx.serialization.*
 
 const val editMessageCaptionMethod = "editMessageCaption"
@@ -23,11 +24,11 @@ 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()
 }

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

@@ -5,12 +5,15 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
 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.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent
 import kotlinx.serialization.*
 
 const val editMessageMediaMethod = "editMessageMedia"
 
+internal val MediaContentMessageResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<MediaContent>>()
+
 @Serializable
 data class EditChatMessageMedia(
     @SerialName(chatIdField)
@@ -21,7 +24,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 +33,8 @@ 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()
 }

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

@@ -1,7 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media
 
 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.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia

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

@@ -1,12 +1,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text
 
 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.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.TextContent
 import kotlinx.serialization.*
 
 const val editMessageTextMethod = "editMessageText"
@@ -25,11 +26,11 @@ 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()
 }

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

@@ -1,6 +1,5 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.EditInlineMessageLiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.editMessageMediaMethod
 import com.github.insanusmokrassar.TelegramBotAPI.types.*

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/send/SendContact.kt

@@ -4,10 +4,14 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.Replyi
 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.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 +28,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 +48,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()
 }

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

@@ -3,10 +3,15 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.send
 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.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: DeserializationStrategy<ContentMessage<LocationContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 // TODO:: Add location tracker for tracking location
 @Serializable
 data class SendLocation(
@@ -24,14 +29,14 @@ 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()
 }

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

@@ -6,12 +6,16 @@ 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.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 +30,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 +42,16 @@ 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

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

@@ -4,10 +4,14 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.Replyi
 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.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.PollContent
 import kotlinx.serialization.*
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<PollContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendPoll(
     @SerialName(chatIdField)
@@ -22,8 +26,8 @@ data class SendPoll(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<Message>,
-    ReplyingMarkupSendMessageRequest<Message> {
+) : SendMessageRequest<ContentMessage<PollContent>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<PollContent>> {
 
     init {
         if (question.length !in pollQuestionTextLength) {
@@ -40,8 +44,8 @@ data class SendPoll(
     }
 
     override fun method(): String = "sendPoll"
-    override val resultDeserializer: DeserializationStrategy<Message>
-        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<PollContent>>
+        get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }

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

@@ -3,10 +3,14 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.send
 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.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 +31,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 +55,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()
 }

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

@@ -4,10 +4,14 @@ import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMar
 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.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 +24,11 @@ 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()
 }

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

@@ -7,8 +7,9 @@ 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.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 +25,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 +55,9 @@ fun SendAnimation(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<AnimationContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendAnimationData internal constructor(
     @SerialName(chatIdField)
@@ -78,13 +82,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 +99,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()
 }

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

@@ -8,8 +8,9 @@ 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.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 +26,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 +56,9 @@ fun SendAudio(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<AudioContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendAudioData internal constructor(
     @SerialName(chatIdField)
@@ -79,13 +83,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 +101,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()
 }

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

@@ -7,8 +7,9 @@ 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.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 +22,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 +49,9 @@ fun SendDocument(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<DocumentContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendDocumentData internal constructor(
     @SerialName(chatIdField)
@@ -66,11 +70,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 +85,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()
 }

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

@@ -6,8 +6,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMe
 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.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 +20,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 +53,8 @@ fun SendMediaGroup(
     }
 }
 
-private val messagesListSerializer = ArrayListSerializer(TelegramBotAPIMessageDeserializeOnlySerializer)
+private val messagesListSerializer: ArrayListSerializer<MediaGroupMessage>
+    = ArrayListSerializer(TelegramBotAPIMessageDeserializeOnlySerializerClass())
 
 @Serializable
 data class SendMediaGroupData internal constructor(
@@ -64,7 +65,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,7 +78,7 @@ 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
 }
 

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

@@ -7,8 +7,9 @@ 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.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 +20,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 +38,9 @@ fun SendPhoto(
     )
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<PhotoContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendPhotoData internal constructor(
     @SerialName(chatIdField)
@@ -53,10 +57,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 +71,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()
 }

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

@@ -5,8 +5,9 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.Replyi
 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.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 +18,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 +31,9 @@ fun SendSticker(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<StickerContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendStickerByFileId internal constructor(
     @SerialName(chatIdField)
@@ -42,10 +46,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,7 +58,7 @@ 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())
 }

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

@@ -7,8 +7,9 @@ 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.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 +26,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 +57,9 @@ fun SendVideo(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<VideoContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendVideoData internal constructor(
     @SerialName(chatIdField)
@@ -82,13 +86,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 +103,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()
 }

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

@@ -7,8 +7,9 @@ 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.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 +24,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 +53,9 @@ fun SendVideoNote(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<VideoNoteContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendVideoNoteData internal constructor(
     @SerialName(chatIdField)
@@ -74,13 +78,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 +98,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()
 }

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

@@ -7,8 +7,9 @@ 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.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 +23,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 +51,9 @@ fun SendVoice(
     }
 }
 
+private val commonResultDeserializer: DeserializationStrategy<ContentMessage<VoiceContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 @Serializable
 data class SendVoiceData internal constructor(
     @SerialName(chatIdField)
@@ -70,12 +74,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 +90,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()
 }

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/types/CallbackQuery/CallbackQuery.kt

@@ -7,4 +7,11 @@ interface CallbackQuery {
     val id: CallbackQueryIdentifier
     val user: User
     val chatInstance: String
-}
+}
+
+data class UnknownCallbackQueryType(
+    override val id: CallbackQueryIdentifier,
+    override val user: User,
+    override val chatInstance: String,
+    val raw: String
+) : CallbackQuery

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/RawCallbackQuery.kt

@@ -3,7 +3,8 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer
-import kotlinx.serialization.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 @Serializable
 internal data class RawCallbackQuery(
@@ -21,13 +22,21 @@ internal data class RawCallbackQuery(
     @SerialName("game_short_name")
     val gameShortName: String? = null
 ) {
-    val asCallbackQuery: CallbackQuery by lazy {
-        when {
+    private var inited: CallbackQuery? = null
+    fun asCallbackQuery(raw: String): CallbackQuery {
+        return inited ?: when {
             message != null && data != null -> MessageDataCallbackQuery(id, from, chatInstance, message, data)
             message != null && gameShortName != null -> MessageGameShortNameCallbackQuery(id, from, chatInstance, message, gameShortName)
             inlineMessageId != null && data != null -> InlineMessageIdDataCallbackQuery(id, from, chatInstance, inlineMessageId, data)
             inlineMessageId != null && gameShortName != null -> InlineMessageIdGameShortNameCallbackQuery(id, from, chatInstance, inlineMessageId, gameShortName)
-            else -> throw IllegalStateException("Strange answer from server, can't create callback query")
+            else -> UnknownCallbackQueryType(
+                id,
+                from,
+                chatInstance,
+                raw
+            )
+        }.also {
+            inited = it
         }
     }
 }

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/AdministratorChatMemberImpl.kt

@@ -13,5 +13,6 @@ data class AdministratorChatMemberImpl(
     override val canInviteUsers: Boolean,
     override val canRestrictMembers: Boolean,
     override val canPinMessages: Boolean,
-    override val canPromoteMembers: Boolean
+    override val canPromoteMembers: Boolean,
+    override val customTitle: String?
 ) : AdministratorChatMember

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/CreatorChatMember.kt

@@ -3,8 +3,10 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.AdministratorChatMember
 import com.github.insanusmokrassar.TelegramBotAPI.types.User
 
-data class CreatorChatMember(override val user: User) :
-    AdministratorChatMember {
+data class CreatorChatMember(
+    override val user: User,
+    override val customTitle: String?
+) : AdministratorChatMember {
     override val canBeEdited: Boolean = true
     override val canChangeInfo: Boolean = true
     override val canPostMessages: Boolean = true

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/RawChatMember.kt

@@ -2,7 +2,8 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMember
-import kotlinx.serialization.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 @Serializable
 internal data class RawChatMember(
@@ -38,11 +39,13 @@ internal data class RawChatMember(
     @SerialName(canSendOtherMessagesField)
     private val canSendOtherMessages: Boolean = false,
     @SerialName(canAddWebPagePreviewsField)
-    private val canAddWebPagePreviews: Boolean = false
+    private val canAddWebPagePreviews: Boolean = false,
+    @SerialName(customTitleField)
+    private val customTitle: String? = null
 ) {
     val asChatMember: ChatMember by lazy {
         when (status) {
-            "creator" -> CreatorChatMember(user)
+            "creator" -> CreatorChatMember(user, customTitle)
             "administrator" -> AdministratorChatMemberImpl(
                 user,
                 canBeEdited,
@@ -53,7 +56,8 @@ internal data class RawChatMember(
                 canInviteUsers,
                 canRestrictMembers,
                 canPinMessages,
-                canPromoteMembers
+                canPromoteMembers,
+                customTitle
             )
             "member" -> MemberChatMember(user)
             "restricted" -> RestrictedChatMember(

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/AdministratorChatMember.kt

@@ -7,4 +7,5 @@ interface AdministratorChatMember : SpecialRightsChatMember {
     val canRemoveMessages: Boolean
     val canRestrictMembers: Boolean
     val canPromoteMembers: Boolean
+    val customTitle: String?
 }

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/ChatMember.kt

@@ -9,11 +9,12 @@ interface ChatMember {
     val user: User
 }
 
-internal object ChatMemberSerializerWithoutDeserialization : KSerializer<ChatMember> {
+internal object AdministratorChatMemberSerializerWithoutDeserialization : KSerializer<AdministratorChatMember> {
     override val descriptor: SerialDescriptor = StringDescriptor.withName("ChatMemberSerializerWithoutDeserialization")
 
-    override fun deserialize(decoder: Decoder): ChatMember = ChatMemberDeserializationStrategy.deserialize(decoder)
-    override fun serialize(encoder: Encoder, obj: ChatMember) = throw UnsupportedOperationException()
+    override fun deserialize(decoder: Decoder): AdministratorChatMember
+        = ChatMemberDeserializationStrategy.deserialize(decoder) as AdministratorChatMember
+    override fun serialize(encoder: Encoder, obj: AdministratorChatMember) = throw UnsupportedOperationException()
 }
 
 internal object ChatMemberDeserializationStrategy : DeserializationStrategy<ChatMember> {

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatPhoto.kt

@@ -5,8 +5,12 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class ChatPhoto(
-    @SerialName("small_file_id")
+    @SerialName(smallFileIdField)
     val smallFileId: String,
-    @SerialName("big_file_id")
-    val bigFileId: String
+    @SerialName(bigFileIdField)
+    val bigFileId: String,
+    @SerialName(smallFileUniqueIdField)
+    val smallFileUniqueId: FileUniqueId,
+    @SerialName(bigFileUniqueIdField)
+    val bigFileUniqueId: FileUniqueId
 )

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Common.kt

@@ -18,6 +18,7 @@ typealias StartParameter = String
 typealias InlineMessageIdentifier = String
 typealias PollIdentifier = String
 typealias StickerSetName = String
+typealias FileUniqueId = String
 
 val callbackQueryAnswerLength = 0 until 200
 val captionLength = 0 until 1024
@@ -40,6 +41,8 @@ val livePeriodLimit = 60 .. 86400
 
 val inlineQueryAnswerResultsLimit = 0 .. 50
 
+val customTitleLength = 0 .. 16
+
 const val chatIdField = "chat_id"
 const val messageIdField = "message_id"
 const val updateIdField = "update_id"
@@ -57,6 +60,7 @@ const val languageCodeField = "language_code"
 const val textEntitiesField = "text_entities"
 const val stickerSetNameField = "set_name"
 const val stickerSetNameFullField = "sticker_set_name"
+const val slowModeDelayField = "slow_mode_delay"
 const val maskPositionField = "mask_position"
 const val phoneNumberField = "phone_number"
 const val userIdField = "user_id"
@@ -94,6 +98,7 @@ const val switchInlineQueryField = "switch_inline_query"
 const val isAnimatedField = "is_animated"
 const val inviteLinkField = "invite_link"
 const val pinnedMessageField = "pinned_message"
+const val customTitleField = "custom_title"
 
 
 const val requestWriteAccessField = "request_write_access"
@@ -217,6 +222,14 @@ const val yShiftField = "y_shift"
 const val scaleField = "scale"
 
 
+const val smallFileIdField = "small_file_id"
+const val bigFileIdField = "big_file_id"
+const val smallFileUniqueIdField = "small_file_unique_id"
+const val bigFileUniqueIdField = "big_file_unique_id"
+
+const val fileUniqueIdField = "file_unique_id"
+
+
 const val currencyField = "currency"
 const val startParameterField = "start_parameter"
 const val totalAmountField = "total_amount"

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/ChosenInlineResult/RawChosenInlineResult.kt

@@ -2,7 +2,8 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.ChosenInl
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.ChosenInlineResult
-import kotlinx.serialization.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 @Serializable
 internal data class RawChosenInlineResult(

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt

@@ -6,7 +6,7 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 @Serializer(InlineQueryResult::class)
-object InlineQueryResultSerializer : KSerializer<InlineQueryResult> {
+internal object InlineQueryResultSerializer : KSerializer<InlineQueryResult> {
     override val descriptor: SerialDescriptor = StringDescriptor.withName(InlineQueryResult::class.toString())
     override fun serialize(encoder: Encoder, obj: InlineQueryResult) {
         when(obj) {

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContentSerializer.kt

@@ -6,7 +6,7 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 @Serializer(InputMessageContent::class)
-object InputMessageContentSerializer : KSerializer<InputMessageContent> {
+internal object InputMessageContentSerializer : KSerializer<InputMessageContent> {
     override val descriptor: SerialDescriptor = StringDescriptor.withName(InputMessageContent::class.toString())
     override fun serialize(encoder: Encoder, obj: InputMessageContent) {
         when (obj) {

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/query/RawInlineQuery.kt

@@ -1,7 +1,8 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.query
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
-import kotlinx.serialization.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 @Serializable
 internal data class RawInlineQuery(

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMedia.kt

@@ -3,7 +3,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.InputFile
 import kotlinx.serialization.Serializable
 
-const val inputMediaFileAttachmentNameTemplate = "attach://%s"
+fun String.toInputMediaFileAttachmentName() = "attach://$this"
 
 @Serializable(InputMediaSerializer::class)
 interface InputMedia {

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAnimation.kt

@@ -5,7 +5,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.mediaField
-import com.github.insanusmokrassar.TelegramBotAPI.utils.format
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -27,7 +26,7 @@ data class InputMediaAnimation(
         get() = file.let {
             when (it) {
                 is FileId -> it.fileId
-                is MultipartFile -> inputMediaFileAttachmentNameTemplate.format(it.fileId)
+                is MultipartFile -> it.fileId.toInputMediaFileAttachmentName()
             }
         }
 }

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAudio.kt

@@ -6,7 +6,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.mediaField
-import com.github.insanusmokrassar.TelegramBotAPI.utils.format
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -28,7 +27,7 @@ data class InputMediaAudio(
         get() = file.let {
             when (it) {
                 is FileId -> it.fileId
-                is MultipartFile -> inputMediaFileAttachmentNameTemplate.format(it.fileId)
+                is MultipartFile -> it.fileId.toInputMediaFileAttachmentName()
             }
         }
 }

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaDocument.kt

@@ -5,7 +5,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.mediaField
-import com.github.insanusmokrassar.TelegramBotAPI.utils.format
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -24,7 +23,7 @@ data class InputMediaDocument(
         get() = file.let {
             when (it) {
                 is FileId -> it.fileId
-                is MultipartFile -> inputMediaFileAttachmentNameTemplate.format(it.fileId)
+                is MultipartFile -> it.fileId.toInputMediaFileAttachmentName()
             }
         }
 }

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaPhoto.kt

@@ -5,7 +5,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.files.PhotoSize
 import com.github.insanusmokrassar.TelegramBotAPI.types.mediaField
-import com.github.insanusmokrassar.TelegramBotAPI.utils.format
 import kotlinx.serialization.*
 
 @Serializable
@@ -22,7 +21,7 @@ data class InputMediaPhoto(
     @SerialName(mediaField)
     val media: String = when (file) {
         is FileId -> file.fileId
-        is MultipartFile -> inputMediaFileAttachmentNameTemplate.format(file.fileId)
+        is MultipartFile -> file.fileId.toInputMediaFileAttachmentName()
     }
 
     @Transient

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaSerializer.kt

@@ -4,7 +4,7 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 @Serializer(InputMedia::class)
-object InputMediaSerializer : KSerializer<InputMedia> {
+internal object InputMediaSerializer : KSerializer<InputMedia> {
     override val descriptor: SerialDescriptor = StringDescriptor.withName(InputMedia::class.toString())
     override fun serialize(encoder: Encoder, obj: InputMedia) {
         when (obj) {

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaVideo.kt

@@ -4,7 +4,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.mediaField
-import com.github.insanusmokrassar.TelegramBotAPI.utils.format
 import kotlinx.serialization.*
 
 @Serializable
@@ -25,7 +24,7 @@ data class InputMediaVideo(
     @SerialName(mediaField)
     val media: String = when (file) {
         is FileId -> file.fileId
-        is MultipartFile -> inputMediaFileAttachmentNameTemplate.format(file.fileId)
+        is MultipartFile -> file.fileId.toInputMediaFileAttachmentName()
     }
 
     @Transient

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt

@@ -4,7 +4,7 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 @Serializer(MediaGroupMemberInputMedia::class)
-object MediaGroupMemberInputMediaSerializer : KSerializer<MediaGroupMemberInputMedia> {
+internal object MediaGroupMemberInputMediaSerializer : KSerializer<MediaGroupMemberInputMedia> {
     override val descriptor: SerialDescriptor = StringDescriptor.withName(MediaGroupMemberInputMedia::class.toString())
     override fun serialize(encoder: Encoder, obj: MediaGroupMemberInputMedia) {
         when (obj) {

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/ThumbedInputMedia.kt

@@ -2,7 +2,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.thumbField
-import com.github.insanusmokrassar.TelegramBotAPI.utils.format
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -15,7 +14,7 @@ interface ThumbedInputMedia : InputMedia {
         get() = thumb ?.let {
             when (it) {
                 is FileId -> it.fileId
-                is MultipartFile -> inputMediaFileAttachmentNameTemplate.format(it.fileId)
+                is MultipartFile -> it.fileId.toInputMediaFileAttachmentName()
             }
         }
 }

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/BoldTextMessageEntity.kt

@@ -1,13 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-import com.github.insanusmokrassar.TelegramBotAPI.utils.boldHTML
-import com.github.insanusmokrassar.TelegramBotAPI.utils.boldMarkdown
-
-data class BoldTextMessageEntity(
-    override val offset: Int,
-    override val length: Int,
-    override val sourceString: String
-) : MessageEntity {
-    override val asMarkdownSource: String = sourceString.boldMarkdown()
-    override val asHtmlSource: String = sourceString.boldHTML()
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/BotCommandMessageEntity.kt

@@ -1,19 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-import com.github.insanusmokrassar.TelegramBotAPI.utils.commandHTML
-import com.github.insanusmokrassar.TelegramBotAPI.utils.commandMarkdown
-
-private val commandRegex = Regex("[/!][^@\\s]*")
-
-data class BotCommandMessageEntity(
-    override val offset: Int,
-    override val length: Int,
-    override val sourceString: String
-) : MessageEntity {
-    override val asMarkdownSource: String = sourceString.commandMarkdown()
-    override val asHtmlSource: String = sourceString.commandHTML()
-
-    val command: String by lazy {
-        commandRegex.find(sourceString) ?.value ?.substring(1) ?: sourceString.substring(1)// skip first symbol like "/" or "!"
-    }
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/CodeTextMessageEntity.kt

@@ -1,13 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-import com.github.insanusmokrassar.TelegramBotAPI.utils.codeHTML
-import com.github.insanusmokrassar.TelegramBotAPI.utils.codeMarkdown
-
-data class CodeTextMessageEntity(
-    override val offset: Int,
-    override val length: Int,
-    override val sourceString: String
-) : MessageEntity {
-    override val asMarkdownSource: String = sourceString.codeMarkdown()
-    override val asHtmlSource: String = sourceString.codeHTML()
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/EMailMessageEntity.kt

@@ -1,13 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-import com.github.insanusmokrassar.TelegramBotAPI.utils.emailHTML
-import com.github.insanusmokrassar.TelegramBotAPI.utils.emailMarkdown
-
-class EMailMessageEntity(
-    override val offset: Int,
-    override val length: Int,
-    override val sourceString: String
-) : MessageEntity {
-    override val asMarkdownSource: String = sourceString.emailMarkdown()
-    override val asHtmlSource: String = sourceString.emailHTML()
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/HashTagMessageEntity.kt

@@ -1,13 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-import com.github.insanusmokrassar.TelegramBotAPI.utils.hashTagHTML
-import com.github.insanusmokrassar.TelegramBotAPI.utils.hashTagMarkdown
-
-data class HashTagMessageEntity(
-    override val offset: Int,
-    override val length: Int,
-    override val sourceString: String
-) : MessageEntity {
-    override val asMarkdownSource: String = sourceString.hashTagMarkdown()
-    override val asHtmlSource: String = sourceString.hashTagHTML()
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/ItalicTextMessageEntity.kt

@@ -1,13 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-import com.github.insanusmokrassar.TelegramBotAPI.utils.italicHTML
-import com.github.insanusmokrassar.TelegramBotAPI.utils.italicMarkdown
-
-data class ItalicTextMessageEntity(
-    override val offset: Int,
-    override val length: Int,
-    override val sourceString: String
-) : MessageEntity {
-    override val asMarkdownSource: String = sourceString.italicMarkdown()
-    override val asHtmlSource: String = sourceString.italicHTML()
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/MentionMessageEntity.kt

@@ -1,13 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-import com.github.insanusmokrassar.TelegramBotAPI.utils.mentionHTML
-import com.github.insanusmokrassar.TelegramBotAPI.utils.mentionMarkdown
-
-class MentionMessageEntity(
-    override val offset: Int,
-    override val length: Int,
-    override val sourceString: String
-) : MessageEntity {
-    override val asMarkdownSource: String = sourceString.mentionMarkdown()
-    override val asHtmlSource: String = sourceString.mentionHTML()
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/MessageEntity.kt

@@ -1,10 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-interface MessageEntity {
-    val offset: Int
-    val length: Int
-    val sourceString: String
-    
-    val asMarkdownSource: String
-    val asHtmlSource: String
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/PhoneNumberMessageEntity.kt

@@ -1,13 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-import com.github.insanusmokrassar.TelegramBotAPI.utils.phoneHTML
-import com.github.insanusmokrassar.TelegramBotAPI.utils.phoneMarkdown
-
-data class PhoneNumberMessageEntity(
-    override val offset: Int,
-    override val length: Int,
-    override val sourceString: String
-) : MessageEntity {
-    override val asMarkdownSource: String = sourceString.phoneMarkdown()
-    override val asHtmlSource: String = sourceString.phoneHTML()
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/PreTextMessageEntity.kt

@@ -1,13 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-import com.github.insanusmokrassar.TelegramBotAPI.utils.preHTML
-import com.github.insanusmokrassar.TelegramBotAPI.utils.preMarkdown
-
-data class PreTextMessageEntity(
-    override val offset: Int,
-    override val length: Int,
-    override val sourceString: String
-) : MessageEntity {
-    override val asMarkdownSource: String = sourceString.preMarkdown()
-    override val asHtmlSource: String = sourceString.preHTML()
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/RawMessageEntity.kt

@@ -1,9 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart
+import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.User
-import kotlinx.serialization.KSerializer
+import com.github.insanusmokrassar.TelegramBotAPI.utils.shiftSourcesToTheLeft
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.internal.ArrayListSerializer
 
 @Serializable
 internal data class RawMessageEntity(
@@ -12,30 +14,74 @@ internal data class RawMessageEntity(
     val length: Int,
     val url: String? = null,
     val user: User? = null
-) {
-    fun asMessageEntity(source: String): MessageEntity {
-        val sourceSubstring = source.substring(offset, offset + length)
-        return when (type) {
-            "mention" -> MentionMessageEntity(offset, length, sourceSubstring)
-            "hashtag" -> HashTagMessageEntity(offset, length, sourceSubstring)
-            "cashtag" -> TODO()
-            "bot_command" -> BotCommandMessageEntity(offset, length, sourceSubstring)
-            "url" -> URLMessageEntity(offset, length, sourceSubstring)
-            "email" -> EMailMessageEntity(offset, length, sourceSubstring)
-            "phone_number" -> PhoneNumberMessageEntity(offset, length, sourceSubstring)
-            "bold" -> BoldTextMessageEntity(offset, length, sourceSubstring)
-            "italic" -> ItalicTextMessageEntity(offset, length, sourceSubstring)
-            "code" -> CodeTextMessageEntity(offset, length, sourceSubstring)
-            "pre" -> PreTextMessageEntity(offset, length, sourceSubstring)
-            "text_link" -> TextLinkMessageEntity(offset, length, sourceSubstring, url ?: throw IllegalStateException("URL must not be null for text link"))
-            "text_mention" -> TextMentionMessageEntity(offset, length, sourceSubstring, user ?: throw IllegalStateException("User must not be null for text mention"))
-            else -> throw IllegalArgumentException("Unknown type of message entity")
+)
+
+internal fun RawMessageEntity.asTextParts(source: String, subParts: List<TextPart>): List<TextPart> {
+    val sourceSubstring = source.substring(offset, offset + length)
+    val range = offset until (offset + length)
+    val shiftedSubParts = subParts.shiftSourcesToTheLeft(offset)
+    return when (type) {
+        "mention" -> MentionTextSource(sourceSubstring, shiftedSubParts)
+        "hashtag" -> HashTagTextSource(sourceSubstring, shiftedSubParts)
+        "cashtag" -> CashTagTextSource(sourceSubstring, shiftedSubParts)
+        "bot_command" -> BotCommandTextSource(sourceSubstring, shiftedSubParts)
+        "url" -> URLTextSource(sourceSubstring)
+        "email" -> EMailTextSource(sourceSubstring, shiftedSubParts)
+        "phone_number" -> PhoneNumberTextSource(sourceSubstring, shiftedSubParts)
+        "bold" -> BoldTextSource(sourceSubstring, shiftedSubParts)
+        "italic" -> ItalicTextSource(sourceSubstring, shiftedSubParts)
+        "code" -> CodeTextSource(sourceSubstring)
+        "pre" -> PreTextSource(sourceSubstring)
+        "text_link" -> TextLinkTextSource(sourceSubstring, url ?: throw IllegalStateException("URL must not be null for text link"))
+        "text_mention" -> TextMentionTextSource(sourceSubstring, user ?: throw IllegalStateException("User must not be null for text mention"), shiftedSubParts)
+        "underline" -> UnderlineTextSource(sourceSubstring, shiftedSubParts)
+        "strikethrough" -> StrikethroughTextSource(sourceSubstring, shiftedSubParts)
+        else -> RegularTextSource(sourceSubstring)
+    }.let {
+        val part = TextPart(range, it)
+        if (it !is MultilevelTextSource && subParts.isNotEmpty()) {
+            (subParts + part).sortedBy { currentPart -> currentPart.range.first }
+        } else {
+            listOf(part)
         }
     }
 }
 
-internal typealias RawMessageEntities = List<RawMessageEntity>
+internal fun createTextPart(from: String, entities: RawMessageEntities): List<TextPart> {
+    val mutableEntities = entities.toMutableList()
+    mutableEntities.sortBy { it.offset }
+    val resultList = mutableListOf<TextPart>()
 
-internal object RawMessageEntitiesSerializer : KSerializer<List<RawMessageEntity>> by ArrayListSerializer(
-    RawMessageEntity.serializer()
-)
+    while (mutableEntities.isNotEmpty()) {
+        val currentFirst = mutableEntities.removeAt(0)
+        val subEntities = if (mutableEntities.isNotEmpty()) {
+            val lastIndex = currentFirst.offset + currentFirst.length
+            val subEntities = mutableListOf<RawMessageEntity>()
+            while (mutableEntities.isNotEmpty()) {
+                val currentPossibleSubEntity = mutableEntities.first()
+                if (currentPossibleSubEntity.offset < lastIndex) {
+                    subEntities.add(currentPossibleSubEntity)
+                    mutableEntities.removeAt(0)
+                } else {
+                    break
+                }
+            }
+            subEntities
+        } else {
+            emptyList<RawMessageEntity>()
+        }
+
+        resultList.addAll(
+            currentFirst.asTextParts(
+                from,
+                createTextPart(from, subEntities)
+            )
+        )
+    }
+
+    return resultList
+}
+
+internal fun RawMessageEntities.asTextParts(sourceString: String): List<TextPart> = createTextPart(sourceString, this)
+
+internal typealias RawMessageEntities = List<RawMessageEntity>

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/RegularTextMessageEntity.kt

@@ -1,13 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-import com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.toHtml
-import com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.toMarkdown
-
-data class RegularTextMessageEntity(
-    override val offset: Int,
-    override val length: Int,
-    override val sourceString: String
-) : MessageEntity {
-    override val asMarkdownSource: String = sourceString.toMarkdown()
-    override val asHtmlSource: String = sourceString.toHtml()
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/TextLinkMessageEntity.kt

@@ -1,14 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-import com.github.insanusmokrassar.TelegramBotAPI.utils.linkHTML
-import com.github.insanusmokrassar.TelegramBotAPI.utils.linkMarkdown
-
-data class TextLinkMessageEntity(
-    override val offset: Int,
-    override val length: Int,
-    override val sourceString: String,
-    val url: String
-) : MessageEntity {
-    override val asMarkdownSource: String = sourceString.linkMarkdown(url)
-    override val asHtmlSource: String = sourceString.linkHTML(url)
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/TextMentionMessageEntity.kt

@@ -1,14 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-import com.github.insanusmokrassar.TelegramBotAPI.types.User
-import com.github.insanusmokrassar.TelegramBotAPI.utils.mentionMarkdown
-
-class TextMentionMessageEntity(
-    override val offset: Int,
-    override val length: Int,
-    override val sourceString: String,
-    val user: User
-) : MessageEntity {
-    override val asMarkdownSource: String = sourceString.mentionMarkdown(user.id)
-    override val asHtmlSource: String = sourceString.mentionMarkdown(user.id)
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/URLMessageEntity.kt

@@ -1,15 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity
-
-import com.github.insanusmokrassar.TelegramBotAPI.utils.linkHTML
-import com.github.insanusmokrassar.TelegramBotAPI.utils.linkMarkdown
-
-data class URLMessageEntity(
-    override val offset: Int,
-    override val length: Int,
-    override val sourceString: String
-) : MessageEntity{
-    val url: String = sourceString
-
-    override val asMarkdownSource: String = sourceString.linkMarkdown(url)
-    override val asHtmlSource: String = sourceString.linkHTML(url)
-}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/BoldTextSource.kt

@@ -0,0 +1,15 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources
+
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart
+import com.github.insanusmokrassar.TelegramBotAPI.utils.*
+
+class BoldTextSource(
+    source: String,
+    textParts: List<TextPart>
+) : MultilevelTextSource {
+    override val textParts: List<TextPart> by lazy { source.fullListOfSubSource(textParts) }
+    override val asMarkdownSource: String by lazy { source.boldMarkdown() }
+    override val asMarkdownV2Source: String by lazy { boldMarkdownV2() }
+    override val asHtmlSource: String by lazy { boldHTML() }
+}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/BotCommandTextSource.kt

@@ -0,0 +1,25 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources
+
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart
+import com.github.insanusmokrassar.TelegramBotAPI.utils.*
+
+private val commandRegex = Regex("[/!][^@\\s]*")
+
+class BotCommandTextSource(
+    source: String,
+    textParts: List<TextPart>
+) : MultilevelTextSource {
+    val command: String by lazy {
+        commandRegex.find(source) ?.value ?.substring(1) ?: source.substring(1)// skip first symbol like "/" or "!"
+    }
+
+    override val textParts: List<TextPart> by lazy {
+        command.fullListOfSubSource(
+            textParts.shiftSourcesToTheLeft(1)
+        )
+    }
+    override val asMarkdownSource: String by lazy { source.commandMarkdown() }
+    override val asMarkdownV2Source: String by lazy { commandMarkdownV2() }
+    override val asHtmlSource: String by lazy { commandHTML() }
+}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/CashTagTextSource.kt

@@ -0,0 +1,15 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources
+
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart
+import com.github.insanusmokrassar.TelegramBotAPI.utils.*
+
+class CashTagTextSource(
+    source: String,
+    textParts: List<TextPart>
+) : MultilevelTextSource {
+    override val textParts: List<TextPart> by lazy { source.fullListOfSubSource(textParts) }
+    override val asMarkdownSource: String by lazy { source.cashTagMarkdown() }
+    override val asMarkdownV2Source: String by lazy { cashTagMarkdownV2() }
+    override val asHtmlSource: String by lazy { cashTagHTML() }
+}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/CodeTextSource.kt

@@ -0,0 +1,12 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources
+
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource
+import com.github.insanusmokrassar.TelegramBotAPI.utils.*
+
+class CodeTextSource(
+    source: String
+) : TextSource {
+    override val asMarkdownSource: String by lazy { source.codeMarkdown() }
+    override val asMarkdownV2Source: String by lazy { source.codeMarkdownV2() }
+    override val asHtmlSource: String by lazy { source.codeHTML() }
+}

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/EMailTextSource.kt

@@ -0,0 +1,15 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources
+
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart
+import com.github.insanusmokrassar.TelegramBotAPI.utils.*
+
+class EMailTextSource(
+    source: String,
+    textParts: List<TextPart>
+) : MultilevelTextSource {
+    override val textParts: List<TextPart> by lazy { source.fullListOfSubSource(textParts) }
+    override val asMarkdownSource: String by lazy { source.emailMarkdown() }
+    override val asMarkdownV2Source: String by lazy { emailMarkdownV2(source) }
+    override val asHtmlSource: String by lazy { emailHTML(source) }
+}