add suppressing of unchecked casts

This reverts commit f974e5787f.

CHANGELOG.md

@@ -1,5 +1,318 @@
 # TelegramBotAPI changelog
 
+## 0.30.12
+
+* `Utils`:
+    * Class casts has been added. Now you can write something like `message.asGroupMessage() ?.let { ... }` instead of
+    `(message as? GroupMessage<*>) ?.let { ... }`
+
+## 0.30.11
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.4.11` -> `0.4.15`
+        * `Klock`: `2.0.1` -> `2.0.3`
+        * `Ktor`: `1.4.3` -> `1.5.0`
+* `Core`:
+    * All bot actions got functions for short calling, like `recordVideo` for `RecordVideoNote`
+    * All bot actions got class-cast shortcuts
+
+## 0.30.10
+
+* `Common`:
+    * `Version`:
+        * `Kotlin`: `1.4.20` -> `1.4.21`
+        * `Klock`: `2.0.0` -> `2.0.1`
+        * `Ktor`: `1.4.2` -> `1.4.3`
+        * `MicroUtils`: `0.4.6` -> `0.4.11`
+* `API Extensions`:
+    * New function `buildBot`
+
+## 0.30.9
+
+* `Common`:
+    * `Version`:
+        * `UUID`: `0.2.2` -> `0.2.3`
+        * `Coroutines`: `1.4.1` -> `1.4.2`
+        * `MicroUtils`: `0.4.3` -> `0.4.6`
+* `Core`:
+    * Add `BowlingDiceAnimationType`
+
+## 0.30.8
+
+* `Common`:
+    * `Version`:
+        * `Kotlin`: `1.4.10` -> `1.4.20`
+        * `Klock`: `1.12.1` -> `2.0.0`
+        * `MicroUtils`: `0.4.1` -> `0.4.3`
+
+## 0.30.7
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.4.0` -> `0.4.1`
+* `Core`:
+    * `TelegramAPIUrlsKeeper` will fix ending of host url since this version
+    * New mechanisms in`PowLimiter` and `CommonLimiter` has been added
+    * New builder `KtorRequestsExecutorBuilder`
+        * New function `telegramBot`
+* `Utils`:
+    * Simple function `telegramBot(TelegramAPIUrlsKeeper)` has been deprecated with replacement by almost the same
+    function in `Core`
+
+## 0.30.6
+
+* `Core`
+    * `TextSource` properties has been renamed:
+        * `asMarkdownSource` -> `markdown`
+        * `asMarkdownV2Source` -> `markdownV2`
+        * `asHtmlSource` -> `html`
+    * `PrivateChat` override `id` property with type `UserId`
+    * Several new extensions and functions in links creation:
+        * New function `makeUsernameLink` with parameter `String`
+            * New extension `Username#link` and function `makeLink(Username)`
+        * Function `makeLinkToMessage` now able to get any type of chat
+            * New extension `Message#link`
+        * Old functions `makeLinkToAddStickerSet...` has been deprecated:
+            * `makeLinkToAddStickerSet`
+            * `makeLinkToAddStickerSetInMarkdownV2`
+            * `makeLinkToAddStickerSetInMarkdown`
+            * `makeLinkToAddStickerSetInHtml`
+
+## 0.30.5
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.3.3` -> `0.4.0`
+* `Core`:
+    * Mechanism of `ChatMember` serialization has been changed
+        * Since this version any `ChatMember` can be serialized (even outside in case it marked by `@Serializable`)
+        * Since this version any `ChatMember` (included in this project) can be deserialized in common way
+    * `User` property `id` has changed its type: now it is `UserId` (under the hood it is the same as `ChatId`)
+
+## 0.30.4
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.3.1` -> `0.3.3`
+* `Core`:
+    * `MultilevelTextSource#textSources` has been safely renamed to `subsources`
+    * `TextContent#fullEntitiesList` has been deprecated
+    * Now `TextContent` implements `TextedInput`
+        * `TextContent#entities` has been deprecated
+    * `GroupEventMessage` now overrides `chatEvent` with type `GroupEvent`
+    * `SupergroupEventMessage` now overrides `chatEvent` with type `SupergroupEvent`
+    * Any `ChatEventMessage` now have generic type of its `chatEvent` (just like messages)
+* `Utils`:
+    * Old extensions related to chat events are deprecated:
+        * `Flow<ChatEventMessage<*>>#divideBySource`
+        * `Flow<ChatEventMessage<*>>#onlyChannelEvents`
+        * `Flow<ChatEventMessage<*>>#onlyGroupEvents`
+        * `Flow<ChatEventMessage<*>>#onlySupergroupEvents`
+    * A lot of extensions for `Flow<ChatEventMessage>` has been added:
+        * `FlowsUpdatesFilter#events`
+        * `FlowsUpdatesFilter#channelEvents`
+        * `FlowsUpdatesFilter#groupEvents`
+        * `FlowsUpdatesFilter#supergroupEvents`
+        * And a lot of other filters with specific types
+
+## 0.30.3
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.3.0` -> `0.3.1`
+* `Core`:
+    * New type of requests exceptions `TooMuchRequestsException`. In fact it will be rare case when you will get this
+    exception
+    * `EmptyLimiter` has been renamed to `ExceptionsOnlyLimiter` and currently will stop requests after
+    `TooMuchRequestsException` happen until retry time is actual
+        * Now `ExceptionsOnlyLimiter` (previously `EmptyLimiter`) is a class
+    * `AbstractRequestCallFactory` currently will not look at the response and wait if it have `RetryAfter` error. New
+    behaviour aimed on delegating of this work to `RequestsLimiter`
+
+## 0.30.2
+
+* `Common`:
+    * `Version`:
+        * `Ktor`: `1.4.1` -> `1.4.2`
+* `Core`:
+    * New sealed class `SetWebhookRequest` which can be used in `SetWebhook` requests
+* `Utils`:
+    * Extensions `setWebhookInfoAndStartListenWebhooks` has been united in one extension with `SetWebhookRequest`
+    incoming parameter
+
+## 0.30.1
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.2.7` -> `0.3.0`
+* `Utils`:
+    *  Builder-style DSL for text sources - `buildEntities` (thanks to [djaler](https://github.com/djaler))
+
+## 0.30.0 Bot API 5.0
+
+**THIS UPDATE CONTAINS A LOT OF BREAKING CHANGES. PLEASE, BE CAREFUL ON UPGRADING OF YOUR PROJECT**
+
+* `Common`:
+    * `Version`:
+        * `Coroutine`: `1.4.0` -> `1.4.1`
+        * **NEW** `MicroUtils`: `0.2.7`
+* `Core`:
+    * Support of `logOut` method (`LogOut` object as a `Request`)
+    * Support of `close` method (`Close` object as a `Request`)
+    * `SetWebhook` updates:
+        * New field `ipAddress`. It works the same as `ip_address` in [setWebhook](https://core.telegram.org/bots/api#setwebhook)
+        section
+        * New field `dropPendingUpdates`. It works the same as `drop_pending_updates` in [setWebhook](https://core.telegram.org/bots/api#setwebhook)
+        section
+    * New field `ExtendedPrivateChat#bio`
+    * New data class `ChatLocation`
+    * New field `UnbanChatMember#onlyIfBanned`
+    * New fields `ExtendedChannelChat#linkedGroupChatId` and `ExtendedSupergroupChat#linkedChannelChatId`
+    * New fields `ExtendedSupergroupChat#location`
+    * New fields `AudioFile#fileName` and `VideoFile#fileName`
+    * New fields `SendDocument#disableContentTypeDetection` and `InputMediaDocument#disableContentTypeDetection`
+    * New request `UnpinAllChatMessages`
+    * New parameter for `unpinChatMessage` method: `messageId`
+    * New dice type `FootballDiceAnimationType`
+    * Limits for dices has been changed
+    * `commonDiceResultLimit` has been deprecated
+    * New field `DiceAnimationType#valueLimits`
+    * Locations updates:
+        * New interface `Headed` with property `heading`
+        * New interface `HorizontallyAccured` with property `horizontalAccuracy`
+        * New interface `ProximityAlertable` with property `proximityAlertRadius`
+        * `Location` class has been separated:
+            * `StaticLocation` for static locations
+            * `LiveLocation` for live locations
+        * Property `Livable#livePeriod` now use typealias type `Seconds` (the same by meaning - `Int`)
+        * `EditLocationMessage` now extends `Locationed`, `HorizontallyAccured`, `ProximityAlertable` and `Headed` interfaces
+            * New properties in `EditChatMessageLiveLocation`: `horizontalAccuracy`, `heading`, `proximityAlertRadius`
+            * New properties in `EditInlineMessageLiveLocation`: `horizontalAccuracy`, `heading`, `proximityAlertRadius`
+        * Main constructor of `SendLocation` now is internal. Instead of that currently available next factories:
+            * `SendLocation` - sending of static location without live parameters
+            * `SendStaticLocation` - sending of static location without live parameters
+            * `SendLiveLocation` - sending of live location with live parameters
+        * `PositionedSendMessageRequest` now extends `Locationed`
+        * `LocationContent#createResend` now can create `LiveLocation`
+    * Support of `ProximityAlertTriggered`. It is `CommonEvent`
+    * Property `pollQuestionTextLength` now have maximum up to `300`
+    * Anonymous Admins:
+        * New field `AdministratorChatMember#isAnonymous`
+    * Several new interfaces of messages:
+        * `SignedMessage` - any message which possibly have `authorSignature`
+        * `WithSenderChatMessage` - any message which have `senderChat`. Property `senderChat` is not-nullable due to
+        separation of implementators
+        * `PublicMessage` - all channel messages have property `val chat: PublicChat` instead of common `val chat: Chat`
+            * `ChannelMessage` - all channel messages have property `val chat: ChannelChat` instead of common `val chat: Chat`
+                * Old `ChannelMessage` was safely renamed to `ChannelMessageImpl` (old name was set as typealias and deprecated)
+            * `GroupMessage` - all group messages have property `val chat: GroupChat` instead of common `val chat: Chat`
+                * `FromChannelGroupMessage` - instances should have property `val channel: ChannelChat`
+                * `AnonymousGroupMessage` - instances may have setup property `authorSignature`
+                * `CommonGroupMessage` - just common message
+            * `PrivateMessage` - works like previous `CommonMessageImpl`
+            * Previous `CommonMessageImpl` safely renamed to `PrivateMessageImpl`
+    * New property `PromoteChatMember#isAnonymous`
+    * Update all classes which must have `entities`/`caption_entities` fields
+    * New request `CopyMessage`
+    * New extension `List<TextSource>#makeString` for more comfortable work with new api with entities
+    * Support for Google Places identifiers for venues
+    * New extensions for text sources separating:
+        * `List<TextSource>#separateForMessage`
+        * `List<TextSource>#separateForCaption`
+        * `List<TextSource>#separateForText`
+    * Rewritten work with text sources and text parts:
+        * Now any `Message` type with entities will have full list of entities. That means that parts without any
+        formatter entities will use `RegularTextSource`
+        * `MultilevelTextSource#textParts` has been deprecated. Now each `MultilevelTextSource` have its own
+        `textSources` list
+    * New dsl for creating of `TextSource` lists
+    * Built-in `handleSafely` and `ExceptionHandler` is deprecated
+    * New common factories for `StorageFile`
+* `API`:
+    * Extensions `TelegramBot#pinChatMessage` now support any `Chat` and `Message`s from any `Chat`
+    * New extensions `TelegramBot#unpinAllChatMessages`
+    * Extensions `TelegramBot#promoteChatMember` got `isAnonymous` parameter
+    * All old api methods has been actualized to their analogs in `Core`
+    * All `telegramBot` with `token: String` got `apiUrl` parameter
+    * Factory `telegramBotWithCustomClientConfig` has been renamed to `telegramBot`
+
+## 0.29.4
+
+* `Core`:
+    * `diceResultLimit` now is deprecated, use `commonDiceResultLimit` instead
+    * New extension `slotMachineDiceResultLimit`
+* `Utils`:
+    * New enum `SlotMachineReelImages`
+    * New extension `Int#asSlotMachineReelImage`
+    * New data class `SlotMachineResult`
+        * New extension `Dice#calculateSlotMachineResult`
+
+## 0.29.3
+
+* `Common`:
+    * Version updates:
+        * `Serialization`: `1.0.0` -> `1.0.1`
+* `Core`:
+    * New annotation `RiskFeature`. This annotation will be applied to the things which contains unsafe types usage
+        * `SendMediaGroup` factory now marked with `RiskFeature`
+    * Media groups updates:
+        * New functions `SendPlaylist`
+        * New functions `SendDocumentsGroup`
+        * New functions `SendVisualMediaGroup`
+    * New type `VisualMediaGroupMemberInputMedia : MediaGroupMemberInputMedia`
+        * `InputMediaPhoto` now implements `VisualMediaGroupMemberInputMedia` instead of `MediaGroupMemberInputMedia`
+        * `InputMediaVideo` now implements `VisualMediaGroupMemberInputMedia` instead of `MediaGroupMemberInputMedia`
+    * New type `VisualMediaGroupContent : MediaGroupContent`
+        * `PhotoContent` now implements `VisualMediaGroupContent` instead of `MediaGroupContent`
+        * `VideoContent` now implements `VisualMediaGroupContent` instead of `MediaGroupContent`
+    * New type `AudioMediaGroupContent : MediaGroupContent`
+        * `AudioContent` now implements `AudioMediaGroupContent` instead of `MediaContent` and `CaptionedInput`
+    * New type `DocumentMediaGroupContent : MediaGroupContent`
+        * `DocumentContent` now implements `DocumentMediaGroupContent` instead of `MediaContent` and `CaptionedInput`
+    * New type `AudioMediaGroupMemberInputMedia : MediaGroupMemberInputMedia`
+        * `InputMediaAudio` now implements `AudioMediaGroupMemberInputMedia`
+    * New type `DocumentMediaGroupMemberInputMedia : MediaGroupMemberInputMedia`
+        * `InputMediaDocument` now implements `DocumentMediaGroupMemberInputMedia`
+    * New extension `AudioFile#toInputMediaAudio`
+    * `AudioContent` now implements `MediaGroupContent`
+    * New extension `DocumentFile#toInputMediaDocument`
+    * `DocumentContent` now implements `MediaGroupContent`
+    * New dice type `SlotMachineDiceAnimationType`
+    * New extension `TelegramMediaFile#asDocumentFile`
+    * New extension `VideoFile#toInputMediaVideo`
+    * New exception `WrongFileIdentifierException`
+    * Extension `String#toInputMediaFileAttachmentName` now is deprecated
+    * Property `ThumbedInputMedia#thumbMedia` now is deprecated
+* `API`:
+    * New extensions for media groups:
+        * `TelegramBot#sendPlaylist`
+        * `TelegramBot#replyWithPlaylist`
+        * `TelegramBot#sendDocumentsGroup`
+        * `TelegramBot#replyWithDocumentsGroup`
+        * `TelegramBot#sendVisualMediaGroup`
+        * `TelegramBot#replyWithVisualMediaGroup`
+* `Utils`:
+    * New extensions for `Flow`s:
+        * `Flow<SentMediaGroupUpdate>#mediaGroupVisualMessages`
+        * `Flow<SentMediaGroupUpdate>#mediaGroupAudioMessages`
+        * `Flow<SentMediaGroupUpdate>#mediaGroupDocumentMessages`
+    * New extensions for `FlowsUpdatesFilter`:
+        * `FlowsUpdatesFilter#audioMessagesWithMediaGroups`
+        * `FlowsUpdatesFilter#mediaGroupAudioMessages`
+        * `FlowsUpdatesFilter#documentMessagesWithMediaGroups`
+        * `FlowsUpdatesFilter#mediaGroupDocumentMessages`
+        * `FlowsUpdatesFilter#mediaGroupVisualMessages`
+
+## 0.29.2
+
+* `Common`:
+    * Version updates:
+        * `Coroutines`: `1.3.9` -> `1.4.0`
+    * Internal broadcast channels were replaced with `SharedFlow`
+* `TelegramBotAPI-extensions-utils`:
+    * Extension `ReceiveChannel#debounceByValue` has been deprecated
+
 ## 0.29.1
 
 * `Common`:

README.md

@@ -1,8 +1,19 @@
 # TelegramBotAPI
 
+<details>
+<summary><b>I do not wanna read a lot, just give me my bot</b></summary>
+
+You can simply use <a href="https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template">this template</a> (and button
+<a href="https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate">Use template</a>) to get your copy of bot and start to code.
+<p></p>
+<b>P.S. Do not forget to look into our <a href="https://bookstack.inmo.dev/books/telegrambotapi/">minidocs</a> and
+<a href="https://tgbotapi.inmo.dev/docs/index.html">kdocs</a></b>
+
+</details>
+
 | Common info                           | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI.svg?branch=master)](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI) [Small survey](https://forms.gle/2Hex2ynbHWHhi1KY7)|
 | -------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Useful links | [![Chat in Telegram](badges/chat.svg)](https://t.me/InMoTelegramBotAPI) [![KDocs](badges/kdocs.svg)](https://tgbotapi.inmo.dev/docs/index.html) [Examples](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/), [Mini tutorial](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
+| Useful links | [![Chat in Telegram](badges/chat.svg)](https://t.me/InMoTelegramBotAPI) [![Create bot](badges/template.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![KDocs](badges/kdocs.svg)](https://tgbotapi.inmo.dev/docs/index.html) [Examples](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/), [Mini tutorial](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
 | TelegramBotAPI Core status                 | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.core/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.core/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core) |
 | TelegramBotAPI Extensions status      | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api) |
 | TelegramBotAPI Util Extensions status | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils) |
@@ -12,6 +23,7 @@
 [kotlinx.serialization#1004](https://github.com/Kotlin/kotlinx.serialization/issues/1004). It is possible, that both JVM
 and JS version may work improperly in some cases with `kotlinx.serialization` version `1.0.0-RC`**
 
+## What is it?
 
 It is a complex of libraries for working with `TelegramBotAPI` in type-safe and strict way as much as it possible. In
 the list of this complex currently next projects:
@@ -74,7 +86,7 @@ kotlin {
 
 ![Libraries hierarchy](resources/TelegramBotAPI-libraries-hierarchy.svg)
 
-In most cases, the most simple way will be to implement [TelegramBotAPI](TelegramBotAPI/README.md) - it contains
+In most cases, the most simple way will be to implement [TelegramBotAPI](tgbotapi/README.md) - it contains
 all necessary tools for comfort usage of this library. If you want to exclude some libraries, you can implement just
 [TelegramBotAPI API Extensions](tgbotapi.extensions.api/README.md),
 [TelegramBotAPI Util Extensions](tgbotapi.extensions.utils/README.md) or even

badges/template.svg

@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="104" height="20">
+    <linearGradient id="b" x2="0" y2="100%">
+        <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+        <stop offset="1" stop-opacity=".1"/>
+    </linearGradient>
+    <clipPath id="a">
+        <rect width="104" height="20" rx="3" fill="#fff"/>
+    </clipPath>
+    <g clip-path="url(#a)">
+        <path fill="#555" d="M0 0h65v20H0z"/>
+        <path fill="#007ec6" d="M35 0h69v20H35z"/>
+        <path fill="url(#b)" d="M0 0h104v20H0z"/>
+    </g>
+    <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110">
+        <text x="175" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)">Bot</text>
+        <text x="175" y="140" transform="scale(.1)">Bot</text>
+        <text x="690" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)">Template</text>
+        <text x="690" y="140" transform="scale(.1)">Template</text>
+    </g>
+</svg>

build.gradle

@@ -9,7 +9,6 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version"
         classpath "com.github.breadmoirai:github-release:$github_release_plugin_version"
     }
 }

docs/build.gradle

@@ -46,29 +46,17 @@ kotlin {
     }
 }
 
-private Closure includeSourcesInDokka(String... approximateNames) {
+private List<SourceDirectorySet> findSourcesWithName(String... approximateNames) {
-    return {
+    return parent.subprojects
-        parent.subprojects.forEach {
+        .findAll { it != project }
-            if (it != project) {
+        .collectMany { it.kotlin.sourceSets }
-                File srcDir = new File(it.projectDir.absolutePath, "src")
+        .findAll { sourceSet -> approximateNames.any {
-                if (srcDir.exists() && srcDir.isDirectory()) {
+            nameToFilter -> sourceSet.name.contains(nameToFilter)
-                    srcDir.eachFile { file ->
-                        if (approximateNames.any { file.name.contains(it) } && file.isDirectory()) {
-                            String pathToSrc = file.absolutePath
-                            sourceRoot {
-                                path = pathToSrc
-                            }
-                        }
-                    }
-                }
             }
-        }
+        }.collect { it.kotlin }
-    }
 }
 
-dokka {
+tasks.dokkaHtml {
-    outputFormat = 'html'
-
     switch (true) {
         case project.hasProperty("DOKKA_PATH"):
             outputDirectory = project.property("DOKKA_PATH").toString()
@@ -78,19 +66,27 @@ dokka {
             break
     }
 
-    multiplatform {
+    dokkaSourceSets {
-        global {
+        configureEach {
-            skipDeprecated = true
+            skipDeprecated.set(true)
 
             sourceLink {
-                path = "./"
+                localDirectory.set(file("./"))
-                url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/"
+                remoteUrl.set(new URL("https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/"))
-                lineSuffix = "#L"
+                remoteLineSuffix.set("#L")
             }
         }
 
-        common(includeSourcesInDokka("commonMain"))
+        named("commonMain") {
-        js(includeSourcesInDokka("jsMain"/*, "commonMain"*/))
+            sourceRoots.setFrom(findSourcesWithName("commonMain"))
-        jvm(includeSourcesInDokka("jvmMain"/*, "commonMain"*/))
+        }
+
+        named("jsMain") {
+            sourceRoots.setFrom(findSourcesWithName("jsMain", "commonMain"))
+        }
+
+        named("jvmMain") {
+            sourceRoots.setFrom(findSourcesWithName("jvmMain", "commonMain"))
+        }
     }
 }

docs/gradle.properties

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

gradle.properties

@@ -1,21 +1,22 @@
-org.gradle.jvmargs=-Xmx1024m
+org.gradle.jvmargs=-Xmx2048m
 kotlin.code.style=official
 org.gradle.parallel=true
 kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true
 
-kotlin_version=1.4.10
+kotlin_version=1.4.21
-kotlin_coroutines_version=1.3.9
+kotlin_coroutines_version=1.4.2
-kotlin_serialisation_runtime_version=1.0.0
+kotlin_serialisation_runtime_version=1.0.1
-klock_version=1.12.1
+klock_version=2.0.3
-uuid_version=0.2.2
+uuid_version=0.2.3
-ktor_version=1.4.1
+ktor_version=1.5.0
+
+micro_utils_version=0.4.15
 
 javax_activation_version=1.1.1
 
 library_group=dev.inmo
-library_version=0.29.1
+library_version=0.30.12
 
-gradle_bintray_plugin_version=1.8.5
 github_release_plugin_version=2.2.12

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

settings.gradle

@@ -1,3 +1,10 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        jcenter()
+    }
+}
+
 include ":tgbotapi.core"
 include ":tgbotapi.extensions.api"
 include ":tgbotapi.extensions.utils"

tgbotapi.core/README.md

@@ -10,7 +10,7 @@ moments are describing by official [Telegram Bot API](https://core.telegram.org/
 
 ## Compatibility
 
-This version compatible with [4th of June 2020 update of TelegramBotAPI (version 4.9)](https://core.telegram.org/bots/api#june-4-2020).
+This version compatible with [4th of November 2020 update of TelegramBotAPI (version 5.0)](https://core.telegram.org/bots/api#november-4-2020).
 There is only one exception of implemented functionality - Telegram Passport API, which was presented in
 [August 2018 update of TelegramBotAPI](https://core.telegram.org/bots/api-changelog#august-27-2018) update. It will be implemented
 as soon as possible.

tgbotapi.core/build.gradle

@@ -8,7 +8,6 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version"
     }
 }
 
@@ -47,6 +46,8 @@ kotlin {
                 api "com.soywiz.korlibs.klock:klock:$klock_version"
                 api "com.benasher44:uuid:$uuid_version"
 
+                api "dev.inmo:micro_utils.coroutines:$micro_utils_version"
+
                 api "io.ktor:ktor-client-core:$ktor_version"
             }
         }

tgbotapi.core/maven.publish.gradle

@@ -1,53 +0,0 @@
-apply plugin: 'maven-publish'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "Library for Object-Oriented and type-safe work with Telegram Bot API"
-            name = "Telegram Bot API Core"
-            url = "https://insanusmokrassar.github.io/TelegramBotAPI"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
-                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
-                    }
-                
-            }
-        }
-    }
-}

tgbotapi.core/mpp_publish_template.kpsb

@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Core","description":"Library for Object-Oriented and type-safe work with Telegram Bot API","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}
+{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Core","description":"Library for Object-Oriented and type-safe work with Telegram Bot API","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}

tgbotapi.core/publish.gradle

@@ -1,58 +1,65 @@
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven-publish'
 
-apply from: "maven.publish.gradle"
+task javadocsJar(type: Jar) {
-
+    classifier = 'javadoc'
-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(".", "/")
-    }
-    
-    publish = true
-    
-    pkg {
-        repo = "TelegramBotAPI"
-        name = "${project.name}"
-        vcsUrl = "https://github.com/InsanusMokrassar/TelegramBotAPI"
-        licenses = ["Apache-2.0"]
-        version {
-            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 {
+afterEvaluate {
-    publications = publishing.publications.collect {
+    project.publishing.publications.all {
+        // rename artifacts
+        groupId "${project.group}"
         if (it.name.contains('kotlinMultiplatform')) {
-            null
+            artifactId = "${project.name}"
         } else {
-            it.name
+            artifactId = "${project.name}-$name"
         }
-    } - null
+    }
 }
 
-bintrayUpload.dependsOn publishToMavenLocal
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "Library for Object-Oriented and type-safe work with Telegram Bot API"
+            name = "Telegram Bot API Core"
+            url = "https://insanusmokrassar.github.io/TelegramBotAPI"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
+                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
+                    }
+                
+            }
+        }
+        
+        repositories {
+            maven {
+                name = "bintray"
+                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/TelegramBotAPI/${project.name}/;publish=1;override=1")
+                credentials {
+                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                }
+            }
+        }
+        
+    }
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt

@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.utils.fullListOfSubSource
+import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource
 
 interface Captioned {
     val caption: String?
@@ -19,8 +19,16 @@ interface CaptionedInput : Captioned {
     val captionEntities: List<TextPart>
 }
 
+/**
+ * @see CaptionedInput.captionEntities
+ * @see justTextSources
+ */
+val CaptionedInput.textSources
+    get() = captionEntities.justTextSources()
+
 /**
  * Convert its [CaptionedInput.captionEntities] to list of [dev.inmo.tgbotapi.CommonAbstracts.TextSource]
  * with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
  */
-fun CaptionedInput.fullEntitiesList(): FullTextSourcesList = caption ?.fullListOfSubSource(captionEntities) ?.map { it.source } ?: emptyList()
+@Deprecated("Currently list of entities already full. This method is redundant")
+fun CaptionedInput.fullEntitiesList(): TextSourcesList = caption ?.fullListOfSubSource(captionEntities) ?.map { it.source } ?: emptyList()

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/CommonVenueData.kt

@@ -1,8 +1,12 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
+import dev.inmo.tgbotapi.types.*
+
 interface CommonVenueData : Titled {
     override val title: String
     val address: String
-    val foursquareId: String?
+    val foursquareId: FoursquareId?
-    val foursquareType: String? // TODO:: Rewrite with enum or interface
+    val foursquareType: FoursquareType? // TODO:: Rewrite with enum or interface
+    val googlePlaceId: GooglePlaceId?
+    val googlePlaceType: GooglePlaceType?
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt

@@ -1,16 +1,22 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.utils.fullListOfSubSource
+import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource
 
 interface Explained {
     val explanation: String?
 }
 
-interface ExplainedOutput : Explained {
+interface ParsableExplainedOutput : Explained {
     val parseMode: ParseMode?
 }
 
+interface EntitiesExplainedOutput : Explained {
+    val entities: List<TextSource>?
+}
+
+interface ExplainedOutput : ParsableExplainedOutput, EntitiesExplainedOutput
+
 interface ExplainedInput : Explained {
     /**
      * Not full list of entities. This list WILL NOT contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
@@ -19,8 +25,16 @@ interface ExplainedInput : Explained {
     val explanationEntities: List<TextPart>
 }
 
+/**
+ * @see ExplainedInput.explanationEntities
+ * @see justTextSources
+ */
+val ExplainedInput.textSources
+    get() = explanationEntities.justTextSources()
+
 /**
  * Convert its [ExplainedInput.explanationEntities] to list of [dev.inmo.tgbotapi.CommonAbstracts.TextSource]
  * with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
  */
-fun ExplainedInput.fullEntitiesList(): FullTextSourcesList = explanation ?.fullListOfSubSource(explanationEntities) ?.map { it.source } ?: emptyList()
+@Deprecated("Currently list of entities already full. This method is redundant")
+fun ExplainedInput.fullEntitiesList(): TextSourcesList = explanation ?.fullListOfSubSource(explanationEntities) ?.map { it.source } ?: emptyList()

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Headed.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.CommonAbstracts
+
+import dev.inmo.tgbotapi.types.Degrees
+
+interface Headed {
+    val heading: Degrees?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/HorizontallyAccured.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.CommonAbstracts
+
+import dev.inmo.tgbotapi.types.Meters
+
+interface HorizontallyAccured {
+    val horizontalAccuracy: Meters?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Livable.kt

@@ -1,8 +1,10 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
+import dev.inmo.tgbotapi.types.Seconds
+
 interface Livable {
     /**
-     * Period in SECONDS
+     * Period in [Seconds]
      */
-    val livePeriod: Int?
+    val livePeriod: Seconds?
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/ProximityAlertable.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.CommonAbstracts
+
+import dev.inmo.tgbotapi.types.Meters
+
+interface ProximityAlertable {
+    val proximityAlertRadius: Meters?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt

@@ -1,18 +1,55 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.regular
+import dev.inmo.tgbotapi.types.MessageEntity.toTextParts
+import dev.inmo.tgbotapi.types.captionLength
+import dev.inmo.tgbotapi.types.textLength
+
+const val DirectInvocationOfTextSourceConstructor = "It is strongly not recommended to use constructors directly instead of factory methods"
+
+typealias TextSourcesList = List<TextSource>
+@Deprecated("All lists of TextSource in public API now are full. So, this typealias is redundant")
 typealias FullTextSourcesList = List<TextSource>
+@Deprecated("All lists of TextPart in public API now are full. So, this typealias is redundant")
 typealias FullTextPartsList = List<TextPart>
 
 interface TextSource {
-    val asMarkdownSource: String
+    val markdown: String
-    val asMarkdownV2Source: String
+    val markdownV2: String
-    val asHtmlSource: String
+    val html: String
     val source: String
+
+    val asText: String
+        get() = source
+
+    @Deprecated("Rename", ReplaceWith("markdown"))
+    val asMarkdownSource: String
+        get() = markdown
+    @Deprecated("Rename", ReplaceWith("markdownV2"))
+    val asMarkdownV2Source: String
+        get() = markdownV2
+    @Deprecated("Rename", ReplaceWith("html"))
+    val asHtmlSource: String
+        get() = html
 }
 
+@Suppress("NOTHING_TO_INLINE")
+inline operator fun TextSource.plus(other: TextSource) = listOf(this, other)
+@Suppress("NOTHING_TO_INLINE")
+inline operator fun TextSource.plus(other: List<TextSource>) = listOf(this) + other
+@Suppress("NOTHING_TO_INLINE")
+inline operator fun TextSource.plus(text: String) = listOf(this, regular(text))
+@Suppress("NOTHING_TO_INLINE")
+inline operator fun List<TextSource>.plus(text: String) = this + regular(text)
 
 interface MultilevelTextSource : TextSource {
+    @Deprecated("Will be removed in near major release")
     val textParts: List<TextPart>
+        get() = textParts(0)
+    val subsources: List<TextSource>
+    @Deprecated("Will be removed in near major release", ReplaceWith("subsources"))
+    val textSources: List<TextSource>
+        get() = subsources
 }
 
 data class TextPart(
@@ -21,3 +58,49 @@ data class TextPart(
 )
 
 fun List<TextPart>.justTextSources() = map { it.source }
+fun List<TextSource>.makeString() = joinToString("") { it.source }
+internal fun MultilevelTextSource.textParts(offset: Int): List<TextPart> = subsources.toTextParts(offset)
+fun List<TextSource>.separateForMessage(limit: IntRange, numberOfParts: Int? = null): List<List<TextSource>> {
+    if (isEmpty()) {
+        return emptyList()
+    }
+
+    val resultList = mutableListOf<MutableList<TextSource>>(mutableListOf())
+    var currentPartLength = 0
+    val maxSize = limit.last + 1
+
+    for (current in this) {
+        if (current.source.length > maxSize) {
+            error("Currently unsupported parts with size more than target one-message parts (${current.source.length} > ${maxSize})")
+        }
+
+        if (currentPartLength + current.source.length > maxSize) {
+            if (numberOfParts == null || numberOfParts < resultList.size) {
+                resultList.add(mutableListOf())
+                currentPartLength = 0
+            } else {
+                break
+            }
+        }
+
+        resultList.last().add(current)
+        currentPartLength += current.source.length
+    }
+
+    return resultList
+}
+
+/**
+ * This method will prepare [TextSource]s list for messages. Remember, that first part will be separated with
+ * [captionLength] and all others with
+ */
+fun List<TextSource>.separateForCaption(): List<List<TextSource>> {
+    val captionPart = separateForMessage(captionLength, 1).first()
+    return listOf(captionPart) + minus(captionPart).separateForMessage(textLength)
+}
+
+/**
+ * This method will prepare [TextSource]s list for messages with [textLength]
+ */
+@Suppress("NOTHING_TO_INLINE")
+inline fun List<TextSource>.separateForText(): List<List<TextSource>> = separateForMessage(textLength)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Texted.kt

@@ -0,0 +1,40 @@
+package dev.inmo.tgbotapi.CommonAbstracts
+
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
+import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource
+
+interface Texted {
+    val text: String?
+}
+
+interface ParsableOutput : Texted {
+    val parseMode: ParseMode?
+}
+
+interface EntitiesOutput : Texted {
+    val entities: List<TextSource>?
+}
+
+interface TextedOutput : ParsableOutput, EntitiesOutput
+
+interface TextedInput : Texted {
+    /**
+     * Not full list of entities. This list WILL NOT contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
+     * @see [CaptionedInput.fullEntitiesList]
+     */
+    val textEntities: List<TextPart>
+}
+
+/**
+ * @see TextedInput.textEntities
+ * @see justTextSources
+ */
+val TextedInput.textSources
+    get() = textEntities.justTextSources()
+
+/**
+ * Convert its [TextedInput.textEntities] to list of [dev.inmo.tgbotapi.CommonAbstracts.TextSource]
+ * with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
+ */
+@Deprecated("Currently list of entities already full. This method is redundant")
+fun TextedInput.fullEntitiesList(): TextSourcesList = text ?.fullListOfSubSource(textEntities) ?.map { it.source } ?: emptyList()

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ReplyMessageId.kt

@@ -4,4 +4,5 @@ import dev.inmo.tgbotapi.types.MessageIdentifier
 
 interface ReplyMessageId {
     val replyToMessageId: MessageIdentifier?
+    val allowSendingWithoutReply: Boolean?
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorRequestsExecutor.kt

@@ -1,25 +1,52 @@
 package dev.inmo.tgbotapi.bot.Ktor
 
+import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.BaseRequestsExecutor
 import dev.inmo.tgbotapi.bot.Ktor.base.*
+import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.bot.exceptions.newRequestException
-import dev.inmo.tgbotapi.bot.settings.limiters.EmptyLimiter
+import dev.inmo.tgbotapi.bot.settings.limiters.*
-import dev.inmo.tgbotapi.bot.settings.limiters.RequestLimiter
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.Response
 import dev.inmo.tgbotapi.utils.*
 import io.ktor.client.HttpClient
 import io.ktor.client.features.*
-import io.ktor.client.statement.HttpStatement
 import io.ktor.client.statement.readText
 import kotlinx.serialization.json.Json
 
+class KtorRequestsExecutorBuilder(
+    var telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper
+) {
+    var client: HttpClient = HttpClient()
+    var callsFactories: List<KtorCallFactory> = emptyList()
+    var excludeDefaultFactories: Boolean = false
+    var requestsLimiter: RequestLimiter = ExceptionsOnlyLimiter()
+    var jsonFormatter: Json = nonstrictJsonFormat
+
+    fun build() = KtorRequestsExecutor(telegramAPIUrlsKeeper, client, callsFactories, excludeDefaultFactories, requestsLimiter, jsonFormatter)
+}
+
+inline fun telegramBot(
+    telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper,
+    crossinline builder: KtorRequestsExecutorBuilder.() -> Unit = {}
+): TelegramBot = KtorRequestsExecutorBuilder(telegramAPIUrlsKeeper).apply(builder).build()
+
+/**
+ * Shortcut for [telegramBot]
+ */
+@Suppress("NOTHING_TO_INLINE")
+inline fun telegramBot(
+    token: String,
+    apiUrl: String = telegramBotAPIDefaultUrl,
+    crossinline builder: KtorRequestsExecutorBuilder.() -> Unit = {}
+): TelegramBot = telegramBot(TelegramAPIUrlsKeeper(token, apiUrl), builder)
+
 class KtorRequestsExecutor(
     telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper,
     client: HttpClient = HttpClient(),
     callsFactories: List<KtorCallFactory> = emptyList(),
     excludeDefaultFactories: Boolean = false,
-    private val requestsLimiter: RequestLimiter = EmptyLimiter,
+    private val requestsLimiter: RequestLimiter = ExceptionsOnlyLimiter(),
     private val jsonFormatter: Json = nonstrictJsonFormat
 ) : BaseRequestsExecutor(telegramAPIUrlsKeeper) {
     private val callsFactories: List<KtorCallFactory> = callsFactories.run {
@@ -37,7 +64,7 @@ class KtorRequestsExecutor(
     }
 
     override suspend fun <T : Any> execute(request: Request<T>): T {
-        return handleSafely(
+        return safely(
             { e ->
                 throw if (e is ClientRequestException) {
                     val content = e.response ?.readText() ?: throw e

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/AbstractRequestCallFactory.kt

@@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.bot.Ktor.base
 
+import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.Ktor.KtorCallFactory
 import dev.inmo.tgbotapi.bot.exceptions.newRequestException
 import dev.inmo.tgbotapi.requests.GetUpdates
@@ -51,23 +52,17 @@ abstract class AbstractRequestCallFactory : KtorCallFactory {
             val content = response.receive<String>()
             val responseObject = jsonFormatter.decodeFromString(Response.serializer(), content)
 
-            return (responseObject.result?.let {
+            return safely {
-                jsonFormatter.decodeFromJsonElement(request.resultDeserializer, it)
+                (responseObject.result?.let {
-            } ?: responseObject.parameters?.let {
+                    jsonFormatter.decodeFromJsonElement(request.resultDeserializer, it)
-                val error = it.error
+                } ?: response.let {
-                if (error is RetryAfterError) {
+                    throw newRequestException(
-                    delay(error.leftToRetry)
+                        responseObject,
-                    makeCall(client, urlsKeeper, request, jsonFormatter)
+                        content,
-                } else {
+                        "Can't get result object from $content"
-                    null
+                    )
-                }
+                })
-            } ?: response.let {
+            }
-                throw newRequestException(
-                    responseObject,
-                    content,
-                    "Can't get result object from $content"
-                )
-            })
         }
     }
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/DownloadFileRequestCallFactory.kt

@@ -1,15 +1,12 @@
 package dev.inmo.tgbotapi.bot.Ktor.base
 
+import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.Ktor.KtorCallFactory
-import dev.inmo.tgbotapi.bot.RequestsExecutor
 import dev.inmo.tgbotapi.requests.DownloadFile
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
-import dev.inmo.tgbotapi.utils.handleSafely
 import io.ktor.client.HttpClient
-import io.ktor.client.request.*
+import io.ktor.client.request.get
-import io.ktor.client.statement.*
-import io.ktor.http.HttpMethod
 import kotlinx.serialization.json.Json
 
 object DownloadFileRequestCallFactory : KtorCallFactory {
@@ -21,7 +18,7 @@ object DownloadFileRequestCallFactory : KtorCallFactory {
     ): T? = (request as? DownloadFile) ?.let {
         val fullUrl = "${urlsKeeper.fileBaseUrl}/${it.filePath}"
 
-        return handleSafely {
+        return safely {
             @Suppress("UNCHECKED_CAST")
             client.get<ByteArray>(fullUrl) as T // always ByteArray
         }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/exceptions/RequestException.kt

@@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.bot.exceptions
 
-import dev.inmo.tgbotapi.types.Response
+import com.soywiz.klock.DateTime
+import dev.inmo.tgbotapi.types.*
 import io.ktor.utils.io.errors.IOException
 
 fun newRequestException(
@@ -15,6 +16,14 @@ fun newRequestException(
         description.contains("Bad Request: message is not modified") -> MessageIsNotModifiedException(response, plainAnswer, message, cause)
         description == "Unauthorized" -> UnauthorizedException(response, plainAnswer, message, cause)
         description.contains("PHOTO_INVALID_DIMENSIONS") -> InvalidPhotoDimensionsException(response, plainAnswer, message, cause)
+        description.contains("wrong file identifier") -> WrongFileIdentifierException(response, plainAnswer, message, cause)
+        description.contains("Too Many Requests") -> TooMuchRequestsException(
+            (response.parameters ?.error as? RetryAfterError) ?: RetryAfterError(60, DateTime.now().unixMillisLong),
+            response,
+            plainAnswer,
+            message,
+            cause
+        )
         else -> null
     }
 } ?: CommonRequestException(response, plainAnswer, message, cause)
@@ -45,3 +54,9 @@ class MessageToEditNotFoundException(response: Response, plainAnswer: String, me
 
 class InvalidPhotoDimensionsException(response: Response, plainAnswer: String, message: String?, cause: Throwable?) :
     RequestException(response, plainAnswer, message, cause)
+
+class WrongFileIdentifierException(response: Response, plainAnswer: String, message: String?, cause: Throwable?) :
+    RequestException(response, plainAnswer, message, cause)
+
+class TooMuchRequestsException(val retryAfter: RetryAfterError, response: Response, plainAnswer: String, message: String?, cause: Throwable?) :
+    RequestException(response, plainAnswer, message, cause)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/CommonLimiter.kt

@@ -1,67 +1,43 @@
 package dev.inmo.tgbotapi.bot.settings.limiters
 
 import com.soywiz.klock.DateTime
+import dev.inmo.micro_utils.coroutines.*
+import dev.inmo.tgbotapi.types.MilliSeconds
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import kotlin.coroutines.Continuation
+import kotlin.math.roundToLong
 
 private fun now(): Long = DateTime.nowUnixLong()
 
+@Serializable
 class CommonLimiter(
     private val lockCount: Int = 10,
-    private val regenTime: Long = 20 * 1000L // 20 seconds for full regen of opportunity to send message
+    private val regenTime: MilliSeconds = 15 * 1000, // 15 seconds for full regen of opportunity to send message
+    @Transient
+    private val scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
 ) : RequestLimiter {
-    private var doLimit: Boolean = false
+    private val quotaSemaphore = Semaphore(lockCount)
-
+    private val counterRegeneratorJob = scope.launch {
-    private val counterChannel = Channel<Unit>(Channel.UNLIMITED)
+        val regenDelay: MilliSeconds = (regenTime.toDouble() / lockCount).roundToLong()
-    private val scope = CoroutineScope(Dispatchers.Default)
+        while (isActive) {
-    private val counterJob = scope.launch {
+            delay(regenDelay)
-        var wasLastSecond = 0
+            if (quotaSemaphore.availablePermits < lockCount) {
-        var lastCountTime = now()
+                try {
-        var limitManagementJob: Job? = null
+                    quotaSemaphore.release()
-        var removeLimitTime: Long = lastCountTime
+                } catch (_: IllegalStateException) {
-        for (counter in counterChannel) {
+                    // Skip IllegalStateException due to the fact that this exception may happens in release method
-            val now = now()
-            if (now - lastCountTime > 1000) {
-                lastCountTime = now
-                wasLastSecond = 1
-            } else {
-                wasLastSecond++
-            }
-            if (wasLastSecond >= lockCount) {
-                removeLimitTime = now + regenTime
-                if (limitManagementJob == null) {
-                    limitManagementJob = launch {
-                        doLimit = true
-                        var internalNow = now()
-                        while (internalNow < removeLimitTime) {
-                            delay(removeLimitTime - internalNow)
-                            internalNow = now()
-                        }
-                        doLimit = false
-                    }
                 }
             }
-            if (now > removeLimitTime) {
-                limitManagementJob = null
-            }
-        }
-    }
-
-    private val quoterChannel = Channel<Unit>(Channel.CONFLATED)
-    private val tickerJob = scope.launch {
-        while (isActive) {
-            quoterChannel.send(Unit)
-            delay(1000L)
         }
     }
 
     override suspend fun <T> limit(block: suspend () -> T): T {
-        counterChannel.send(Unit)
+        quotaSemaphore.acquire()
-        return if (!doLimit) {
+        return block()
-            block()
-        } else {
-            quoterChannel.receive()
-            block()
-        }
     }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/EmptyLimiter.kt

@@ -1,5 +0,0 @@
-package dev.inmo.tgbotapi.bot.settings.limiters
-
-object EmptyLimiter : RequestLimiter {
-    override suspend fun <T> limit(block: suspend () -> T): T = block()
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/ExceptionsOnlyLimiter.kt

@@ -0,0 +1,65 @@
+package dev.inmo.tgbotapi.bot.settings.limiters
+
+import dev.inmo.micro_utils.coroutines.safely
+import dev.inmo.tgbotapi.bot.exceptions.TooMuchRequestsException
+import dev.inmo.tgbotapi.types.*
+import io.ktor.client.features.ClientRequestException
+import io.ktor.http.HttpStatusCode
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.*
+
+/**
+ * This limiter will limit requests only after getting a [RetryAfterError] or [ClientRequestException] with
+ * [HttpStatusCode.TooManyRequests] status code. Important thing is that in case if some of block has been blocked, all
+ * the others will wait until it will be possible to be called
+ *
+ * @param defaultTooManyRequestsDelay This parameter will be used in case of getting [ClientRequestException] with
+ * [HttpStatusCode.TooManyRequests] as a parameter for delay like it would be [TooMuchRequestsException]. The reason of
+ * it is that in [ClientRequestException] there is no information about required delay between requests
+ */
+class ExceptionsOnlyLimiter(
+    private val defaultTooManyRequestsDelay: MilliSeconds = 1000L
+) : RequestLimiter {
+    private val lockState = MutableStateFlow(false)
+    private suspend fun lock(timeMillis: MilliSeconds) {
+        try {
+            safely {
+                lockState.emit(true)
+                delay(timeMillis)
+            }
+        } finally {
+            lockState.emit(false)
+        }
+    }
+
+    override suspend fun <T> limit(block: suspend () -> T): T {
+        while (true) {
+            lockState.first { !it }
+            val result = safely({
+                when (it) {
+                    is TooMuchRequestsException -> {
+                        lock(it.retryAfter.leftToRetry)
+                        Result.failure(it)
+                    }
+                    is ClientRequestException -> {
+                        if (it.response.status == HttpStatusCode.TooManyRequests) {
+                            lock(defaultTooManyRequestsDelay)
+                        } else {
+                            throw it
+                        }
+                        Result.failure(it)
+                    }
+                    else -> throw it
+                }
+            }) {
+                Result.success(block())
+            }
+            if (result.isSuccess) {
+                return result.getOrNull()!!
+            }
+        }
+    }
+}
+
+@Deprecated("Renamed", ReplaceWith("ExceptionsOnlyLimiter", "dev.inmo.tgbotapi.bot.settings.limiters.ExceptionsOnlyLimiter"))
+typealias EmptyLimiter = ExceptionsOnlyLimiter

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/PowLimiter.kt

@@ -1,5 +1,7 @@
 package dev.inmo.tgbotapi.bot.settings.limiters
 
+import dev.inmo.micro_utils.coroutines.*
+import dev.inmo.tgbotapi.types.MilliSeconds
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.serialization.Serializable
@@ -9,62 +11,60 @@ import kotlin.math.pow
 
 private sealed class RequestEvent
 private class AddRequest(
-    val continuation: Continuation<Long>
+    val continuation: Continuation<MilliSeconds>
 ) : RequestEvent()
 private object CompleteRequest : RequestEvent()
 
 @Serializable
 data class PowLimiter(
-    private val minAwaitTime: Long = 0L,
+    private val minAwaitTime: MilliSeconds = 0L,
-    private val maxAwaitTime: Long = 10000L,
+    private val maxAwaitTime: MilliSeconds = 10000L,
     private val powValue: Double = 4.0,
-    private val powK: Double = 0.0016
+    private val powK: Double = 1.6,
+    @Transient
+    private val scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
 ) : RequestLimiter {
-    @Transient
-    private val scope = CoroutineScope(Dispatchers.Default)
-    @Transient
-    private val eventsChannel = Channel<RequestEvent>(Channel.UNLIMITED)
     @Transient
     private val awaitTimeRange = minAwaitTime .. maxAwaitTime
+    @Transient
+    private val eventsChannel = let {
+        var requestsInWork = 0.0
+        scope.actor<RequestEvent> {
+            when (it) {
+                is AddRequest -> {
+                    val awaitTime = (requestsInWork.pow(powValue) * powK).toLong()
+                    requestsInWork++
 
-    init {
+                    it.continuation.resume(
-        scope.launch {
+                        when {
-            var requestsInWork: Double = 0.0
+                            awaitTime in awaitTimeRange -> awaitTime
-            for (event in eventsChannel) {
+                            awaitTime < awaitTimeRange.first -> awaitTimeRange.first
-                when (event) {
+                            else -> awaitTimeRange.last
-                    is AddRequest -> {
+                        }
-                        val awaitTime = (((requestsInWork.pow(powValue) * powK) * 1000L).toLong())
+                    )
-                        requestsInWork++
-
-                        event.continuation.resume(
-                            if (awaitTime in awaitTimeRange) {
-                                awaitTime
-                            } else {
-                                if (awaitTime < minAwaitTime) {
-                                    minAwaitTime
-                                } else {
-                                    maxAwaitTime
-                                }
-                            }
-                        )
-                    }
-                    is CompleteRequest -> requestsInWork--
                 }
+                is CompleteRequest -> requestsInWork--
             }
         }
     }
 
-    override suspend fun <T> limit(
+    private suspend inline fun <T> withDelay(
-        block: suspend () -> T
+        crossinline block: suspend () -> T
     ): T {
         val delayMillis = suspendCoroutine<Long> {
             scope.launch { eventsChannel.send(AddRequest(it)) }
         }
         delay(delayMillis)
         return try {
-            block()
+            safely { block() }
         } finally {
             eventsChannel.send(CompleteRequest)
         }
     }
+
+    override suspend fun <T> limit(
+        block: suspend () -> T
+    ): T {
+        return withDelay(block)
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFile.kt

@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.requests.abstracts
 
-import dev.inmo.tgbotapi.types.InputMedia.toInputMediaFileAttachmentName
 import dev.inmo.tgbotapi.utils.StorageFile
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.*
@@ -12,6 +11,14 @@ sealed class InputFile {
     abstract val fileId: String
 }
 
+internal inline val InputFile.attachFileId
+    get() = "attach://$fileId"
+internal inline val InputFile.fileIdToSend
+    get() = when (this) {
+        is FileId -> fileId
+        is MultipartFile -> attachFileId
+    }
+
 // TODO:: add checks for file url/file id regex
 /**
  * Contains file id or file url
@@ -30,12 +37,6 @@ internal object InputFileSerializer : KSerializer<InputFile> {
     override fun deserialize(decoder: Decoder): FileId = FileId(decoder.decodeString())
 }
 
-internal val InputFile.asMediaData: String
-    get() = when (this) {
-        is FileId -> fileId
-        is MultipartFile -> fileId.toInputMediaFileAttachmentName()
-    }
-
 // TODO:: add checks for files size
 /**
  * Contains info about file for sending

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatAdministrators.kt

@@ -4,13 +4,13 @@ import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
-import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMemberSerializerWithoutDeserialization
+import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMemberSerializer
 import dev.inmo.tgbotapi.types.chatIdField
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer
 
 private val chatMembersListSerializer = ListSerializer(
-    AdministratorChatMemberSerializerWithoutDeserialization
+    AdministratorChatMemberSerializer
 )
 
 @Serializable

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/GetChatMember.kt

@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.requests.chat.members
 import dev.inmo.tgbotapi.requests.chat.abstracts.ChatMemberRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember
-import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMemberDeserializationStrategy
+import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMemberSerializer
 import kotlinx.serialization.*
 
 @Serializable
@@ -15,7 +15,7 @@ data class GetChatMember(
 ) : ChatMemberRequest<ChatMember> {
     override fun method(): String = "getChatMember"
     override val resultDeserializer: DeserializationStrategy<ChatMember>
-        get() = ChatMemberDeserializationStrategy
+        get() = ChatMemberSerializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/PromoteChatMember.kt

@@ -14,6 +14,8 @@ data class PromoteChatMember(
     override val userId: UserId,
     @SerialName(untilDateField)
     override val untilDate: TelegramDate? = null,
+    @SerialName(isAnonymousField)
+    private val isAnonymous: Boolean? = null,
     @SerialName(canChangeInfoField)
     private val canChangeInfo: Boolean? = null,
     @SerialName(canPostMessagesField)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/UnbanChatMember.kt

@@ -10,7 +10,9 @@ data class UnbanChatMember(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
     @SerialName(userIdField)
-    override val userId: UserId
+    override val userId: UserId,
+    @SerialName(onlyIfBannedField)
+    val onlyIfBanned: Boolean? = null
 ) : ChatMemberRequest<Boolean> {
     override fun method(): String = "unbanChatMember"
     override val resultDeserializer: DeserializationStrategy<Boolean>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/PinChatMessage.kt

@@ -6,6 +6,11 @@ import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 
+/**
+ * Use this method to add a message to the list of pinned messages in a chat. If the chat is not a private chat, the bot
+ * must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in a
+ * supergroup or 'can_edit_messages' admin right in a channel.
+ */
 @Serializable
 data class PinChatMessage (
     @SerialName(chatIdField)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/UnpinAllChatMessages.kt

@@ -0,0 +1,28 @@
+package dev.inmo.tgbotapi.requests.chat.modify
+
+import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.chatIdField
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+/**
+ * Use this method to clear the list of pinned messages in a chat. If the chat is not a private chat, the bot must be an
+ * administrator in the chat for this to work and must have the 'can_pin_messages' admin right in a supergroup or
+ * 'can_edit_messages' admin right in a channel.
+ *
+ * @see PinChatMessage
+ * @see UnpinChatMessage
+ */
+@Serializable
+data class UnpinAllChatMessages(
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier
+): ChatRequest, SimpleRequest<Boolean> {
+    override fun method(): String = "unpinAllChatMessages"
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/UnpinChatMessage.kt

@@ -3,14 +3,18 @@ package dev.inmo.tgbotapi.requests.chat.modify
 import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.chatIdField
+import dev.inmo.tgbotapi.types.messageIdField
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 
 @Serializable
 data class UnpinChatMessage(
     @SerialName(chatIdField)
-    override val chatId: ChatIdentifier
+    override val chatId: ChatIdentifier,
+    @SerialName(messageIdField)
+    val messageId: MessageIdentifier? = null
 ): ChatRequest, SimpleRequest<Boolean> {
     override fun method(): String = "unpinChatMessage"
     override val resultDeserializer: DeserializationStrategy<Boolean>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt

@@ -6,6 +6,7 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
 import dev.inmo.tgbotapi.types.message.content.LocationContent
+import dev.inmo.tgbotapi.utils.throwRangeError
 import kotlinx.serialization.*
 
 private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<LocationContent>>()
@@ -20,6 +21,12 @@ data class EditChatMessageLiveLocation(
     override val latitude: Double,
     @SerialName(longitudeField)
     override val longitude: Double,
+    @SerialName(horizontalAccuracyField)
+    override val horizontalAccuracy: Meters? = null,
+    @SerialName(headingField)
+    override val heading: Degrees? = null,
+    @SerialName(proximityAlertRadiusField)
+    override val proximityAlertRadius: Meters? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditChatMessage<LocationContent>, EditReplyMessage, EditLocationMessage {
@@ -28,4 +35,10 @@ data class EditChatMessageLiveLocation(
         get() = commonResultDeserializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
+
+    init {
+        if (horizontalAccuracy != null && horizontalAccuracy !in horizontalAccuracyLimit) {
+            throwRangeError("horizontalAccuracy", horizontalAccuracyLimit, horizontalAccuracy)
+        }
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt

@@ -3,6 +3,7 @@ package dev.inmo.tgbotapi.requests.edit.LiveLocation
 import dev.inmo.tgbotapi.requests.edit.abstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
+import dev.inmo.tgbotapi.utils.throwRangeError
 import kotlinx.serialization.*
 
 @Serializable
@@ -13,10 +14,22 @@ data class EditInlineMessageLiveLocation(
     override val latitude: Double,
     @SerialName(longitudeField)
     override val longitude: Double,
+    @SerialName(horizontalAccuracyField)
+    override val horizontalAccuracy: Meters? = null,
+    @SerialName(headingField)
+    override val heading: Degrees? = null,
+    @SerialName(proximityAlertRadiusField)
+    override val proximityAlertRadius: Meters? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditReplyMessage, EditLocationMessage {
     override fun method(): String = "editMessageLiveLocation"
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
+
+    init {
+        if (horizontalAccuracy != null && horizontalAccuracy !in horizontalAccuracyLimit) {
+            throwRangeError("horizontalAccuracy", horizontalAccuracyLimit, horizontalAccuracy)
+        }
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditLocationMessage.kt

@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.requests.edit.abstracts
 
-interface EditLocationMessage {
+import dev.inmo.tgbotapi.CommonAbstracts.*
-    val latitude: Double
+
-    val longitude: Double
+interface EditLocationMessage : Locationed, HorizontallyAccured, ProximityAlertable, Headed
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditTextChatMessage.kt

@@ -1,8 +1,7 @@
 package dev.inmo.tgbotapi.requests.edit.abstracts
 
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
+import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 
-interface EditTextChatMessage {
+interface EditTextChatMessage : TextedOutput {
-    val text: String
+    override val text: String
-    val parseMode: ParseMode?
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditChatMessageCaption.kt

@@ -1,8 +1,10 @@
 package dev.inmo.tgbotapi.requests.edit.caption
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.edit.abstracts.*
 import dev.inmo.tgbotapi.requests.edit.media.MediaContentMessageResultDeserializer
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@@ -12,8 +14,37 @@ import kotlinx.serialization.*
 
 const val editMessageCaptionMethod = "editMessageCaption"
 
+fun EditChatMessageCaption(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    text: String,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = EditChatMessageCaption(
+    chatId,
+    messageId,
+    text,
+    parseMode,
+    null,
+    replyMarkup
+)
+
+fun EditChatMessageCaption(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    entities: List<TextSource>,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = EditChatMessageCaption(
+    chatId,
+    messageId,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup
+)
+
 @Serializable
-data class EditChatMessageCaption(
+data class EditChatMessageCaption internal constructor(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
     @SerialName(messageIdField)
@@ -22,9 +53,14 @@ data class EditChatMessageCaption(
     override val text: String,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditChatMessage<MediaContent>, EditTextChatMessage, EditReplyMessage {
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text) ?.justTextSources()
+    }
 
     override fun method(): String = editMessageCaptionMethod
     override val resultDeserializer: DeserializationStrategy<ContentMessage<MediaContent>>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditInlineMessageCaption.kt

@@ -1,23 +1,56 @@
 package dev.inmo.tgbotapi.requests.edit.caption
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.edit.abstracts.*
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.*
 
+fun EditInlineMessageCaption(
+    inlineMessageId: InlineMessageIdentifier,
+    text: String,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = EditInlineMessageCaption(
+    inlineMessageId,
+    text,
+    parseMode,
+    null,
+    replyMarkup
+)
+
+fun EditInlineMessageCaption(
+    inlineMessageId: InlineMessageIdentifier,
+    entities: List<TextSource>,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = EditInlineMessageCaption(
+    inlineMessageId,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup
+)
+
 @Serializable
-data class EditInlineMessageCaption(
+data class EditInlineMessageCaption internal constructor(
     @SerialName(inlineMessageIdField)
     override val inlineMessageId: InlineMessageIdentifier,
     @SerialName(captionField)
     override val text: String,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditTextChatMessage, EditReplyMessage {
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text) ?.justTextSources()
+    }
+
     override fun method(): String = editMessageCaptionMethod
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditChatMessageText.kt

@@ -1,8 +1,10 @@
 package dev.inmo.tgbotapi.requests.edit.text
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.edit.abstracts.*
 import dev.inmo.tgbotapi.requests.send.TextContentMessageResultDeserializer
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@@ -12,8 +14,41 @@ import kotlinx.serialization.*
 
 const val editMessageTextMethod = "editMessageText"
 
+fun EditChatMessageText(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    text: String,
+    parseMode: ParseMode? = null,
+    disableWebPagePreview: Boolean? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = EditChatMessageText(
+    chatId,
+    messageId,
+    text,
+    parseMode,
+    null,
+    disableWebPagePreview,
+    replyMarkup
+)
+
+fun EditChatMessageText(
+    chatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    entities: List<TextSource>,
+    disableWebPagePreview: Boolean? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = EditChatMessageText(
+    chatId,
+    messageId,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    disableWebPagePreview,
+    replyMarkup
+)
+
 @Serializable
-data class EditChatMessageText(
+data class EditChatMessageText internal constructor(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
     @SerialName(messageIdField)
@@ -22,11 +57,16 @@ data class EditChatMessageText(
     override val text: String,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(entitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(disableWebPagePreviewField)
     override val disableWebPagePreview: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditChatMessage<TextContent>, EditTextChatMessage, EditReplyMessage, EditDisableWebPagePreviewMessage {
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text) ?.justTextSources()
+    }
 
     override fun method(): String = editMessageTextMethod
     override val resultDeserializer: DeserializationStrategy<ContentMessage<TextContent>>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt

@@ -1,26 +1,63 @@
 package dev.inmo.tgbotapi.requests.edit.text
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.edit.abstracts.*
 import dev.inmo.tgbotapi.requests.edit.media.editMessageMediaMethod
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.*
 
+fun EditInlineMessageText(
+    inlineMessageId: InlineMessageIdentifier,
+    text: String,
+    parseMode: ParseMode? = null,
+    disableWebPagePreview: Boolean? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = EditInlineMessageText(
+    inlineMessageId,
+    text,
+    parseMode,
+    null,
+    disableWebPagePreview,
+    replyMarkup
+)
+
+fun EditInlineMessageText(
+    inlineMessageId: InlineMessageIdentifier,
+    entities: List<TextSource>,
+    disableWebPagePreview: Boolean? = null,
+    replyMarkup: InlineKeyboardMarkup? = null
+) = EditInlineMessageText(
+    inlineMessageId,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    disableWebPagePreview,
+    replyMarkup
+)
+
 @Serializable
-data class EditInlineMessageText(
+data class EditInlineMessageText internal constructor(
     @SerialName(inlineMessageIdField)
     override val inlineMessageId: InlineMessageIdentifier,
     @SerialName(textField)
     override val text: String,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(entitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(disableWebPagePreviewField)
     override val disableWebPagePreview: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditTextChatMessage, EditReplyMessage, EditDisableWebPagePreviewMessage {
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
+
     override fun method(): String = editMessageMediaMethod
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/local/Close.kt

@@ -0,0 +1,23 @@
+package dev.inmo.tgbotapi.requests.local
+
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+/**
+ * Use this method to close the bot instance before moving it from one local server to another. You need to delete the
+ * webhook before calling this method to ensure that the bot isn't launched again after server restart. The method will
+ * return error 429 in the first 10 minutes after the bot is launched.
+ *
+ * @see io.ktor.client.features.ClientRequestException
+ */
+@Serializable
+object Close : SimpleRequest<Boolean> {
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "close"
+
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/local/LogOut.kt

@@ -0,0 +1,21 @@
+package dev.inmo.tgbotapi.requests.local
+
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+/**
+ * Use this method to log out from the cloud Bot API server before launching the bot locally. You **must** log out the bot
+ * before running it locally, otherwise there is no guarantee that the bot will receive updates. After a successful
+ * call, you will not be able to log in again using the same token for 10 minutes
+ */
+@Serializable
+object LogOut : SimpleRequest<Boolean> {
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "logOut"
+
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessage.kt

@@ -0,0 +1,77 @@
+package dev.inmo.tgbotapi.requests.send
+
+import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
+import dev.inmo.tgbotapi.types.ParseMode.parseModeField
+import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
+import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
+import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import kotlinx.serialization.*
+
+fun CopyMessage(
+    fromChatId: ChatIdentifier,
+    toChatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = CopyMessage(fromChatId, toChatId, messageId, text, parseMode, null, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+
+fun CopyMessage(
+    fromChatId: ChatIdentifier,
+    toChatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    entities: List<TextSource>,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = CopyMessage(fromChatId, toChatId, messageId, entities.makeString(), null, entities.toRawMessageEntities(), disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+
+@Serializable
+data class CopyMessage internal constructor(
+    @SerialName(fromChatIdField)
+    val fromChatId: ChatIdentifier,
+    @SerialName(chatIdField)
+    val toChatId: ChatIdentifier,
+    @SerialName(messageIdField)
+    override val messageId: MessageIdentifier,
+    @SerialName(captionField)
+    override val text: String? = null,
+    @SerialName(parseModeField)
+    override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
+    @SerialName(disableNotificationField)
+    override val disableNotification: Boolean = false,
+    @SerialName(replyToMessageIdField)
+    override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyMarkupField)
+    override val replyMarkup: KeyboardMarkup? = null
+): SimpleRequest<MessageIdentifier>,
+    ReplyingMarkupSendMessageRequest<MessageIdentifier>,
+    MessageAction,
+    TextedOutput {
+    override val chatId: ChatIdentifier
+        get() = fromChatId
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
+
+    override fun method(): String = "copyMessage"
+
+    override val resultDeserializer: DeserializationStrategy<MessageIdentifier>
+        get() = MessageIdSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendContact.kt

@@ -26,6 +26,8 @@ data class SendContact(
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : SendMessageRequest<ContentMessage<ContactContent>>,
@@ -36,6 +38,7 @@ data class SendContact(
         contact: Contact,
         disableNotification: Boolean = false,
         replyToMessageId: MessageIdentifier? = null,
+        allowSendingWithoutReply: Boolean? = null,
         replyMarkup: KeyboardMarkup? = null
     ): this(
         chatId,
@@ -44,6 +47,7 @@ data class SendContact(
         contact.lastName,
         disableNotification,
         replyToMessageId,
+        allowSendingWithoutReply,
         replyMarkup
     )
 
@@ -58,11 +62,13 @@ fun Contact.toRequest(
     chatId: ChatIdentifier,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): SendContact = SendContact(
     chatId,
     this,
     disableNotification,
     replyToMessageId,
+    allowSendingWithoutReply,
     replyMarkup
 )

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendDice.kt

@@ -24,6 +24,8 @@ data class SendDice(
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : ReplyingMarkupSendMessageRequest<ContentMessage<DiceContent>>, ReplyMessageId, DisableNotification {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendLocation.kt

@@ -1,19 +1,79 @@
 package dev.inmo.tgbotapi.requests.send
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
 import dev.inmo.tgbotapi.types.message.content.LocationContent
+import dev.inmo.tgbotapi.utils.throwRangeError
 import kotlinx.serialization.*
 
 
 private val commonResultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
     = TelegramBotAPIMessageDeserializationStrategyClass()
 
+fun SendLocation(
+    chatId: ChatIdentifier,
+    latitude: Double,
+    longitude: Double,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = SendLocation(
+    chatId,
+    latitude,
+    longitude,
+    null,
+    null,
+    null,
+    null,
+    disableNotification,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
+fun SendStaticLocation(
+    chatId: ChatIdentifier,
+    latitude: Double,
+    longitude: Double,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = SendLocation(chatId, latitude, longitude, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+
+fun SendLiveLocation(
+    chatId: ChatIdentifier,
+    latitude: Double,
+    longitude: Double,
+    livePeriod: Seconds,
+    horizontalAccuracy: Meters? = null,
+    heading: Degrees? = null,
+    proximityAlertRadius: Meters? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = SendLocation(
+    chatId,
+    latitude,
+    longitude,
+    livePeriod,
+    horizontalAccuracy,
+    heading,
+    proximityAlertRadius,
+    disableNotification,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
 @Serializable
-data class SendLocation(
+data class SendLocation internal constructor(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
     @SerialName(latitudeField)
@@ -21,16 +81,28 @@ data class SendLocation(
     @SerialName(longitudeField)
     override val longitude: Double,
     @SerialName(livePeriodField)
-    val livePeriod: Long? = null,
+    override val livePeriod: Seconds? = null,
+    @SerialName(horizontalAccuracyField)
+    override val horizontalAccuracy: Meters? = null,
+    @SerialName(headingField)
+    override val heading: Degrees? = null,
+    @SerialName(proximityAlertRadiusField)
+    override val proximityAlertRadius: Meters? = null,
     @SerialName(disableNotificationField)
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : SendMessageRequest<ContentMessage<LocationContent>>,
     ReplyingMarkupSendMessageRequest<ContentMessage<LocationContent>>,
-    PositionedSendMessageRequest<ContentMessage<LocationContent>>
+    PositionedSendMessageRequest<ContentMessage<LocationContent>>,
+    HorizontallyAccured,
+    Livable,
+    ProximityAlertable,
+    Headed
 {
     override fun method(): String = "sendLocation"
     override val resultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
@@ -42,5 +114,8 @@ data class SendLocation(
         if (livePeriod != null && livePeriod !in livePeriodLimit) {
             error("Live period for sending location must be in $livePeriodLimit, but was $livePeriod")
         }
+        if (horizontalAccuracy != null && horizontalAccuracy !in horizontalAccuracyLimit) {
+            throwRangeError("horizontalAccuracy", horizontalAccuracyLimit, horizontalAccuracy)
+        }
     }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendMessage.kt

@@ -1,8 +1,10 @@
 package dev.inmo.tgbotapi.requests.send
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.CommonAbstracts.types.DisableWebPagePreview
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@@ -15,20 +17,65 @@ import kotlinx.serialization.*
 internal val TextContentMessageResultDeserializer: DeserializationStrategy<ContentMessage<TextContent>>
     = TelegramBotAPIMessageDeserializationStrategyClass()
 
+fun SendTextMessage(
+    chatId: ChatIdentifier,
+    text: String,
+    parseMode: ParseMode? = null,
+    disableWebPagePreview: Boolean? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = SendTextMessage(
+    chatId,
+    text,
+    parseMode,
+    null,
+    disableWebPagePreview,
+    disableNotification,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
+fun SendTextMessage(
+    chatId: ChatIdentifier,
+    entities: List<TextSource>,
+    disableWebPagePreview: Boolean? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = SendTextMessage(
+    chatId,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    disableWebPagePreview,
+    disableNotification,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
 @Serializable
-data class SendTextMessage(
+data class SendTextMessage internal constructor(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
     @SerialName(textField)
     override val text: String,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(entitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(disableWebPagePreviewField)
     override val disableWebPagePreview: Boolean? = null,
     @SerialName(disableNotificationField)
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : SendMessageRequest<ContentMessage<TextContent>>,
@@ -36,6 +83,10 @@ data class SendTextMessage(
     TextableSendMessageRequest<ContentMessage<TextContent>>,
     DisableWebPagePreview
 {
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text) ?.justTextSources()
+    }
+
     init {
         if (text.length !in textLength) {
             throwRangeError("Text length", textLength, text.length)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendVenue.kt

@@ -25,11 +25,19 @@ data class SendVenue(
     @SerialName(addressField)
     val address: String,
     @SerialName(foursquareIdField)
-    val foursquareId: String? = null,
+    val foursquareId: FoursquareId? = null,
+    @SerialName(foursquareTypeField)
+    val foursquareType: FoursquareType? = null,
+    @SerialName(googlePlaceIdField)
+    val googlePlaceId: GooglePlaceId? = null,
+    @SerialName(googlePlaceTypeField)
+    val googlePlaceType: GooglePlaceType? = null,
     @SerialName(disableNotificationField)
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : SendMessageRequest<ContentMessage<VenueContent>>,
@@ -42,17 +50,22 @@ data class SendVenue(
         venue: Venue,
         disableNotification: Boolean = false,
         replyToMessageId: MessageIdentifier? = null,
+        allowSendingWithoutReply: Boolean? = null,
         replyMarkup: KeyboardMarkup? = null
     ): this(
-        chatId,
+        chatId = chatId,
-        venue.location.latitude,
+        latitude = venue.location.latitude,
-        venue.location.longitude,
+        longitude = venue.location.longitude,
-        venue.title,
+        title = venue.title,
-        venue.address,
+        address = venue.address,
-        venue.foursquareId,
+        foursquareId = venue.foursquareId,
-        disableNotification,
+        foursquareType = venue.foursquareType,
-        replyToMessageId,
+        googlePlaceId = venue.googlePlaceId,
-        replyMarkup
+        googlePlaceType = venue.googlePlaceType,
+        disableNotification = disableNotification,
+        replyToMessageId = replyToMessageId,
+        allowSendingWithoutReply = allowSendingWithoutReply,
+        replyMarkup = replyMarkup
     )
 
     override fun method(): String = "sendVenue"
@@ -66,11 +79,13 @@ fun Venue.toRequest(
     chatId: ChatIdentifier,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): SendVenue = SendVenue(
     chatId,
     this,
     disableNotification,
     replyToMessageId,
+    allowSendingWithoutReply,
     replyMarkup
 )

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/PositionedSendMessageRequest.kt

@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.requests.send.abstracts
 
-interface PositionedSendMessageRequest<T: Any>: SendMessageRequest<T> {
+import dev.inmo.tgbotapi.CommonAbstracts.Locationed
-    val latitude: Double
+
-    val longitude: Double
+interface PositionedSendMessageRequest<T: Any>: SendMessageRequest<T>, Locationed
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/TextableSendMessageRequest.kt

@@ -1,8 +1,5 @@
 package dev.inmo.tgbotapi.requests.send.abstracts
 
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
+import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 
-interface TextableSendMessageRequest<T: Any>: SendMessageRequest<T> {
+interface TextableSendMessageRequest<T: Any>: SendMessageRequest<T>, TextedOutput
-    val text: String?
-    val parseMode: ParseMode?
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/games/SendGame.kt

@@ -22,6 +22,8 @@ data class SendGame (
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : SendMessageRequest<ContentMessage<GameContent>>,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAnimation.kt

@@ -1,9 +1,11 @@
 package dev.inmo.tgbotapi.requests.send.media
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@@ -25,6 +27,7 @@ fun SendAnimation(
     height: Int? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<AnimationContent>> {
     val animationAsFileId = (animation as? FileId) ?.fileId
@@ -38,11 +41,57 @@ fun SendAnimation(
         thumbAsFileId,
         caption,
         parseMode,
+        null,
         duration,
         width,
         height,
         disableNotification,
         replyToMessageId,
+        allowSendingWithoutReply,
+        replyMarkup
+    )
+
+    return if (animationAsFile == null && thumbAsFile == null) {
+        data
+    } else {
+        MultipartRequestImpl(
+            data,
+            SendAnimationFiles(animationAsFile, thumbAsFile)
+        )
+    }
+}
+
+fun SendAnimation(
+    chatId: ChatIdentifier,
+    animation: InputFile,
+    thumb: InputFile? = null,
+    entities: List<TextSource>,
+    duration: Long? = null,
+    width: Int? = null,
+    height: Int? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+): Request<ContentMessage<AnimationContent>> {
+    val animationAsFileId = (animation as? FileId) ?.fileId
+    val animationAsFile = animation as? MultipartFile
+    val thumbAsFileId = (thumb as? FileId) ?.fileId
+    val thumbAsFile = thumb as? MultipartFile
+
+    val data = SendAnimationData(
+        chatId,
+        animationAsFileId,
+        thumbAsFileId,
+        entities.makeString(),
+        null,
+        entities.toRawMessageEntities(),
+        duration,
+        width,
+        height,
+        disableNotification,
+        replyToMessageId,
+        allowSendingWithoutReply,
         replyMarkup
     )
 
@@ -71,6 +120,8 @@ data class SendAnimationData internal constructor(
     override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(durationField)
     override val duration: Long? = null,
     @SerialName(widthField)
@@ -81,6 +132,8 @@ data class SendAnimationData internal constructor(
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : DataRequest<ContentMessage<AnimationContent>>,
@@ -91,6 +144,10 @@ data class SendAnimationData internal constructor(
     DuratedSendMessageRequest<ContentMessage<AnimationContent>>,
     SizedSendMessageRequest<ContentMessage<AnimationContent>>
 {
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
+
     init {
         text ?.let {
             if (it.length !in captionLength) {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAudio.kt

@@ -1,10 +1,11 @@
 package dev.inmo.tgbotapi.requests.send.media
 
-import dev.inmo.tgbotapi.CommonAbstracts.Performerable
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@@ -26,6 +27,7 @@ fun SendAudio(
     title: String? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<AudioContent>> {
     val audioAsFileId = (audio as? FileId) ?.fileId
@@ -39,11 +41,57 @@ fun SendAudio(
         thumbAsFileId,
         caption,
         parseMode,
+        null,
         duration,
         performer,
         title,
         disableNotification,
         replyToMessageId,
+        allowSendingWithoutReply,
+        replyMarkup
+    )
+
+    return if (audioAsFile == null && thumbAsFile == null) {
+        data
+    } else {
+        MultipartRequestImpl(
+            data,
+            SendAudioFiles(audioAsFile, thumbAsFile)
+        )
+    }
+}
+
+fun SendAudio(
+    chatId: ChatIdentifier,
+    audio: InputFile,
+    thumb: InputFile? = null,
+    entities: List<TextSource>,
+    duration: Long? = null,
+    performer: String? = null,
+    title: String? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+): Request<ContentMessage<AudioContent>> {
+    val audioAsFileId = (audio as? FileId) ?.fileId
+    val audioAsFile = audio as? MultipartFile
+    val thumbAsFileId = (thumb as? FileId) ?.fileId
+    val thumbAsFile = thumb as? MultipartFile
+
+    val data = SendAudioData(
+        chatId,
+        audioAsFileId,
+        thumbAsFileId,
+        entities.makeString(),
+        null,
+        entities.toRawMessageEntities(),
+        duration,
+        performer,
+        title,
+        disableNotification,
+        replyToMessageId,
+        allowSendingWithoutReply,
         replyMarkup
     )
 
@@ -72,6 +120,8 @@ data class SendAudioData internal constructor(
     override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(durationField)
     override val duration: Long? = null,
     @SerialName(performerField)
@@ -82,6 +132,8 @@ data class SendAudioData internal constructor(
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : DataRequest<ContentMessage<AudioContent>>,
@@ -93,6 +145,10 @@ data class SendAudioData internal constructor(
     DuratedSendMessageRequest<ContentMessage<AudioContent>>,
     Performerable
 {
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
+
     init {
         text ?.let {
             if (it.length !in captionLength) {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendDocument.kt

@@ -1,9 +1,11 @@
 package dev.inmo.tgbotapi.requests.send.media
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@@ -14,6 +16,15 @@ import dev.inmo.tgbotapi.utils.mapOfNotNull
 import dev.inmo.tgbotapi.utils.throwRangeError
 import kotlinx.serialization.*
 
+/**
+ * Use this method to send general files. On success, the sent [ContentMessage] with [DocumentContent] is returned.
+ * Bots can currently send files of any type of up to 50 MB in size, this limit may be changed in the future.
+ *
+ * @param disableContentTypeDetection Disables automatic server-side content type detection for [document] [MultipartFile]
+ *
+ * @see ContentMessage
+ * @see DocumentContent
+ */
 fun SendDocument(
     chatId: ChatIdentifier,
     document: InputFile,
@@ -22,7 +33,9 @@ fun SendDocument(
     parseMode: ParseMode? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
-    replyMarkup: KeyboardMarkup? = null
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null,
+    disableContentTypeDetection: Boolean? = null
 ): Request<ContentMessage<DocumentContent>> {
     val documentAsFileId = (document as? FileId) ?.fileId
     val documentAsFile = document as? MultipartFile
@@ -35,9 +48,61 @@ fun SendDocument(
         thumbAsFileId,
         caption,
         parseMode,
+        null,
         disableNotification,
         replyToMessageId,
-        replyMarkup
+        allowSendingWithoutReply,
+        replyMarkup,
+        disableContentTypeDetection
+    )
+
+    return if (documentAsFile == null && thumbAsFile == null) {
+        data
+    } else {
+        MultipartRequestImpl(
+            data,
+            SendDocumentFiles(documentAsFile, thumbAsFile)
+        )
+    }
+}
+
+/**
+ * Use this method to send general files. On success, the sent [ContentMessage] with [DocumentContent] is returned.
+ * Bots can currently send files of any type of up to 50 MB in size, this limit may be changed in the future.
+ *
+ * @param disableContentTypeDetection Disables automatic server-side content type detection for [document] [MultipartFile]
+ *
+ * @see ContentMessage
+ * @see DocumentContent
+ */
+fun SendDocument(
+    chatId: ChatIdentifier,
+    document: InputFile,
+    thumb: InputFile? = null,
+    entities: List<TextSource>,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null,
+    disableContentTypeDetection: Boolean? = null
+): Request<ContentMessage<DocumentContent>> {
+    val documentAsFileId = (document as? FileId) ?.fileId
+    val documentAsFile = document as? MultipartFile
+    val thumbAsFileId = (thumb as? FileId) ?.fileId
+    val thumbAsFile = thumb as? MultipartFile
+
+    val data = SendDocumentData(
+        chatId,
+        documentAsFileId,
+        thumbAsFileId,
+        entities.makeString(),
+        null,
+        entities.toRawMessageEntities(),
+        disableNotification,
+        replyToMessageId,
+        allowSendingWithoutReply,
+        replyMarkup,
+        disableContentTypeDetection
     )
 
     return if (documentAsFile == null && thumbAsFile == null) {
@@ -53,6 +118,15 @@ fun SendDocument(
 private val commonResultDeserializer: DeserializationStrategy<ContentMessage<DocumentContent>>
     = TelegramBotAPIMessageDeserializationStrategyClass()
 
+/**
+ * Use this method to send general files. On success, the sent [ContentMessage] with [DocumentContent] is returned.
+ * Bots can currently send files of any type of up to 50 MB in size, this limit may be changed in the future.
+ *
+ * @param disableContentTypeDetection Disables automatic server-side content type detection for [document] [MultipartFile]
+ *
+ * @see ContentMessage
+ * @see DocumentContent
+ */
 @Serializable
 data class SendDocumentData internal constructor(
     @SerialName(chatIdField)
@@ -65,18 +139,28 @@ data class SendDocumentData internal constructor(
     override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(disableNotificationField)
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
-    override val replyMarkup: KeyboardMarkup? = null
+    override val replyMarkup: KeyboardMarkup? = null,
+    @SerialName(disableContentTypeDetectionField)
+    val disableContentTypeDetection: Boolean? = null
 ) : DataRequest<ContentMessage<DocumentContent>>,
     SendMessageRequest<ContentMessage<DocumentContent>>,
     ReplyingMarkupSendMessageRequest<ContentMessage<DocumentContent>>,
     TextableSendMessageRequest<ContentMessage<DocumentContent>>,
     ThumbedSendMessageRequest<ContentMessage<DocumentContent>>
 {
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
+
     init {
         text ?.let {
             if (it.length !in captionLength) {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendMediaGroup.kt

@@ -8,17 +8,21 @@ import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InputMedia.*
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
 import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializerClass
-import dev.inmo.tgbotapi.utils.throwRangeError
+import dev.inmo.tgbotapi.utils.*
-import dev.inmo.tgbotapi.utils.toJsonWithoutNulls
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.buildJsonArray
 
+const val rawSendingMediaGroupsWarning = "Media groups contains restrictions related to combinations of media" +
+    " types. Currently it is possible to combine photo + video OR audio OR documents"
+
+@RiskFeature(rawSendingMediaGroupsWarning)
 fun SendMediaGroup(
     chatId: ChatIdentifier,
     media: List<MediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
 ): Request<List<MediaGroupMessage>> {
     if (media.size !in mediaCountInMediaGroup) {
         throwRangeError("Count of members in media group", mediaCountInMediaGroup, media.size)
@@ -39,7 +43,8 @@ fun SendMediaGroup(
         chatId,
         media,
         disableNotification,
-        replyToMessageId
+        replyToMessageId,
+        allowSendingWithoutReply
     )
 
     return if (files.isEmpty()) {
@@ -52,6 +57,49 @@ fun SendMediaGroup(
     }
 }
 
+/**
+ * Use this method to be sure that you are correctly sending playlist with audios
+ *
+ * @see InputMediaAudio
+ */
+@Suppress("NOTHING_TO_INLINE")
+inline fun SendPlaylist(
+    chatId: ChatIdentifier,
+    media: List<AudioMediaGroupMemberInputMedia>,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) = SendMediaGroup(chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply)
+
+/**
+ * Use this method to be sure that you are correctly sending documents media group
+ *
+ * @see InputMediaDocument
+ */
+@Suppress("NOTHING_TO_INLINE")
+inline fun SendDocumentsGroup(
+    chatId: ChatIdentifier,
+    media: List<DocumentMediaGroupMemberInputMedia>,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) = SendMediaGroup(chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply)
+
+/**
+ * Use this method to be sure that you are correctly sending visual media group
+ *
+ * @see InputMediaPhoto
+ * @see InputMediaVideo
+ */
+@Suppress("NOTHING_TO_INLINE")
+inline fun SendVisualMediaGroup(
+    chatId: ChatIdentifier,
+    media: List<VisualMediaGroupMemberInputMedia>,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) = SendMediaGroup(chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply)
+
 private val messagesListSerializer: KSerializer<List<MediaGroupMessage>>
     = ListSerializer(TelegramBotAPIMessageDeserializeOnlySerializerClass())
 
@@ -63,7 +111,9 @@ data class SendMediaGroupData internal constructor(
     @SerialName(disableNotificationField)
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageIdentifier? = null
+    override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null
 ) : DataRequest<List<MediaGroupMessage>>, SendMessageRequest<List<MediaGroupMessage>> {
     @SerialName(mediaField)
     private val convertedMedia: String

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendPhoto.kt

@@ -1,9 +1,11 @@
 package dev.inmo.tgbotapi.requests.send.media
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@@ -20,6 +22,7 @@ fun SendPhoto(
     parseMode: ParseMode? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<PhotoContent>> {
     val data = SendPhotoData(
@@ -27,8 +30,38 @@ fun SendPhoto(
         (photo as? FileId) ?.fileId,
         caption,
         parseMode,
+        null,
         disableNotification,
         replyToMessageId,
+        allowSendingWithoutReply,
+        replyMarkup
+    )
+    return data.photo ?.let {
+        data
+    } ?:  MultipartRequestImpl(
+        data,
+        SendPhotoFiles(photo as MultipartFile)
+    )
+}
+
+fun SendPhoto(
+    chatId: ChatIdentifier,
+    photo: InputFile,
+    entities: List<TextSource>,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+): Request<ContentMessage<PhotoContent>> {
+    val data = SendPhotoData(
+        chatId,
+        (photo as? FileId) ?.fileId,
+        entities.makeString(),
+        null,
+        entities.toRawMessageEntities(),
+        disableNotification,
+        replyToMessageId,
+        allowSendingWithoutReply,
         replyMarkup
     )
     return data.photo ?.let {
@@ -52,10 +85,14 @@ data class SendPhotoData internal constructor(
     override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(disableNotificationField)
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : DataRequest<ContentMessage<PhotoContent>>,
@@ -63,6 +100,10 @@ data class SendPhotoData internal constructor(
     ReplyingMarkupSendMessageRequest<ContentMessage<PhotoContent>>,
     TextableSendMessageRequest<ContentMessage<PhotoContent>>
 {
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
+
     init {
         text ?.let {
             if (it.length !in captionLength) {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendSticker.kt

@@ -17,12 +17,14 @@ fun SendSticker(
     sticker: InputFile,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<StickerContent>> = SendStickerByFileId(
     chatId,
     sticker as? FileId,
     disableNotification,
     replyToMessageId,
+    allowSendingWithoutReply,
     replyMarkup
 ).let {
     when (sticker) {
@@ -44,6 +46,8 @@ data class SendStickerByFileId internal constructor(
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : SendMessageRequest<ContentMessage<StickerContent>>, ReplyingMarkupSendMessageRequest<ContentMessage<StickerContent>> {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideo.kt

@@ -1,9 +1,11 @@
 package dev.inmo.tgbotapi.requests.send.media
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@@ -26,6 +28,7 @@ fun SendVideo(
     supportStreaming: Boolean? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<VideoContent>> {
     val videoAsFileId = (video as? FileId) ?.fileId
@@ -39,12 +42,60 @@ fun SendVideo(
         thumbAsFileId,
         caption,
         parseMode,
+        null,
         duration,
         width,
         height,
         supportStreaming,
         disableNotification,
         replyToMessageId,
+        allowSendingWithoutReply,
+        replyMarkup
+    )
+
+    return if (videoAsFile == null && thumbAsFile == null) {
+        data
+    } else {
+        MultipartRequestImpl(
+            data,
+            SendVideoFiles(videoAsFile, thumbAsFile)
+        )
+    }
+}
+
+fun SendVideo(
+    chatId: ChatIdentifier,
+    video: InputFile,
+    thumb: InputFile? = null,
+    entities: List<TextSource>,
+    duration: Long? = null,
+    width: Int? = null,
+    height: Int? = null,
+    supportStreaming: Boolean? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+): Request<ContentMessage<VideoContent>> {
+    val videoAsFileId = (video as? FileId) ?.fileId
+    val videoAsFile = video as? MultipartFile
+    val thumbAsFileId = (thumb as? FileId) ?.fileId
+    val thumbAsFile = thumb as? MultipartFile
+
+    val data = SendVideoData(
+        chatId,
+        videoAsFileId,
+        thumbAsFileId,
+        entities.makeString(),
+        null,
+        entities.toRawMessageEntities(),
+        duration,
+        width,
+        height,
+        supportStreaming,
+        disableNotification,
+        replyToMessageId,
+        allowSendingWithoutReply,
         replyMarkup
     )
 
@@ -73,6 +124,8 @@ data class SendVideoData internal constructor(
     override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(durationField)
     override val duration: Long? = null,
     @SerialName(widthField)
@@ -85,6 +138,8 @@ data class SendVideoData internal constructor(
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : DataRequest<ContentMessage<VideoContent>>,
@@ -95,6 +150,10 @@ data class SendVideoData internal constructor(
     DuratedSendMessageRequest<ContentMessage<VideoContent>>,
     SizedSendMessageRequest<ContentMessage<VideoContent>>
 {
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
+
     init {
         text ?.let {
             if (it.length !in captionLength) {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideoNote.kt

@@ -4,26 +4,22 @@ import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
 import dev.inmo.tgbotapi.types.message.content.media.VideoNoteContent
 import dev.inmo.tgbotapi.utils.mapOfNotNull
-import dev.inmo.tgbotapi.utils.throwRangeError
 import kotlinx.serialization.*
 
 fun SendVideoNote(
     chatId: ChatIdentifier,
     videoNote: InputFile,
     thumb: InputFile? = null,
-    caption: String? = null,
-    parseMode: ParseMode? = null,
     duration: Long? = null,
     size: Int? = null, // in documentation - length (size of video side)
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<VideoNoteContent>> {
     val videoNoteAsFileId = (videoNote as? FileId) ?.fileId
@@ -35,12 +31,11 @@ fun SendVideoNote(
         chatId,
         videoNoteAsFileId,
         thumbAsFileId,
-        caption,
-        parseMode,
         duration,
         size,
         disableNotification,
         replyToMessageId,
+        allowSendingWithoutReply,
         replyMarkup
     )
 
@@ -65,10 +60,6 @@ data class SendVideoNoteData internal constructor(
     val videoNote: String? = null,
     @SerialName(thumbField)
     override val thumb: String? = null,
-    @SerialName(captionField)
-    override val text: String? = null,
-    @SerialName(parseModeField)
-    override val parseMode: ParseMode? = null,
     @SerialName(durationField)
     override val duration: Long? = null,
     @SerialName(lengthField)
@@ -77,12 +68,13 @@ data class SendVideoNoteData internal constructor(
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : DataRequest<ContentMessage<VideoNoteContent>>,
     SendMessageRequest<ContentMessage<VideoNoteContent>>,
     ReplyingMarkupSendMessageRequest<ContentMessage<VideoNoteContent>>,
-    TextableSendMessageRequest<ContentMessage<VideoNoteContent>>,
     ThumbedSendMessageRequest<ContentMessage<VideoNoteContent>>,
     DuratedSendMessageRequest<ContentMessage<VideoNoteContent>>,
     SizedSendMessageRequest<ContentMessage<VideoNoteContent>>
@@ -90,14 +82,6 @@ data class SendVideoNoteData internal constructor(
     override val height: Int?
         get() = width
 
-    init {
-        text ?.let {
-            if (it.length !in captionLength) {
-                throwRangeError("Caption length", captionLength, it.length)
-            }
-        }
-    }
-
     override fun method(): String = "sendVideoNote"
     override val resultDeserializer: DeserializationStrategy<ContentMessage<VideoNoteContent>>
         get() = commonResultDeserializer

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVoice.kt

@@ -1,9 +1,11 @@
 package dev.inmo.tgbotapi.requests.send.media
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@@ -22,6 +24,7 @@ fun SendVoice(
     duration: Long? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<VoiceContent>> {
     val voiceAsFileId = (voice as? FileId) ?.fileId
@@ -32,9 +35,47 @@ fun SendVoice(
         voiceAsFileId,
         caption,
         parseMode,
+        null,
         duration,
         disableNotification,
         replyToMessageId,
+        allowSendingWithoutReply,
+        replyMarkup
+    )
+
+    return if (voiceAsFile == null) {
+        data
+    } else {
+        MultipartRequestImpl(
+            data,
+            SendVoiceFiles(voiceAsFile)
+        )
+    }
+}
+
+fun SendVoice(
+    chatId: ChatIdentifier,
+    voice: InputFile,
+    entities: List<TextSource>,
+    duration: Long? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+): Request<ContentMessage<VoiceContent>> {
+    val voiceAsFileId = (voice as? FileId) ?.fileId
+    val voiceAsFile = voice as? MultipartFile
+
+    val data = SendVoiceData(
+        chatId,
+        voiceAsFileId,
+        entities.makeString(),
+        null,
+        entities.toRawMessageEntities(),
+        duration,
+        disableNotification,
+        replyToMessageId,
+        allowSendingWithoutReply,
         replyMarkup
     )
 
@@ -61,12 +102,16 @@ data class SendVoiceData internal constructor(
     override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(durationField)
     override val duration: Long? = null,
     @SerialName(disableNotificationField)
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : DataRequest<ContentMessage<VoiceContent>>,
@@ -75,6 +120,10 @@ data class SendVoiceData internal constructor(
     TextableSendMessageRequest<ContentMessage<VoiceContent>>,
     DuratedSendMessageRequest<ContentMessage<VoiceContent>>
 {
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
+
     init {
         text ?.let {
             if (it.length !in captionLength) {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt

@@ -57,6 +57,8 @@ data class SendInvoice(
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : Currencied,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt

@@ -1,19 +1,17 @@
 package dev.inmo.tgbotapi.requests.send.polls
 
+import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
 import dev.inmo.tgbotapi.types.message.content.PollContent
 import dev.inmo.tgbotapi.types.polls.*
-import dev.inmo.tgbotapi.utils.fullListOfSubSource
-import dev.inmo.tgbotapi.utils.toMarkdownV2Captions
-import com.soywiz.klock.DateTime
 import kotlinx.serialization.*
 
 private val commonResultDeserializer: DeserializationStrategy<ContentMessage<PollContent>> = TelegramBotAPIMessageDeserializationStrategyClass()
@@ -43,6 +41,7 @@ fun SendPoll(
     isClosed: Boolean = false,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = SendRegularPoll(
     chatId,
@@ -50,6 +49,7 @@ fun SendPoll(
     options,
     isAnonymous,
     isClosed,
+    allowSendingWithoutReply = allowSendingWithoutReply,
     disableNotification = disableNotification,
     replyToMessageId = replyToMessageId,
     replyMarkup = replyMarkup
@@ -63,6 +63,7 @@ fun Poll.createRequest(
     chatId: ChatIdentifier,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = when (this) {
     is RegularPoll -> SendRegularPoll(
@@ -75,6 +76,7 @@ fun Poll.createRequest(
         scheduledCloseInfo,
         disableNotification,
         replyToMessageId,
+        allowSendingWithoutReply,
         replyMarkup
     )
     is QuizPoll -> correctOptionId ?.let { correctOptionId ->
@@ -85,11 +87,11 @@ fun Poll.createRequest(
             correctOptionId,
             isAnonymous,
             isClosed,
-            explanation ?.fullListOfSubSource(explanationEntities) ?.justTextSources() ?.toMarkdownV2Captions() ?.firstOrNull(),
+            fullEntitiesList(),
-            MarkdownV2,
             scheduledCloseInfo,
             disableNotification,
             replyToMessageId,
+            allowSendingWithoutReply,
             replyMarkup
         )
     } ?: SendRegularPoll(
@@ -102,6 +104,7 @@ fun Poll.createRequest(
         scheduledCloseInfo,
         disableNotification,
         replyToMessageId,
+        allowSendingWithoutReply,
         replyMarkup
     )
     is UnknownPollType -> SendRegularPoll(
@@ -114,6 +117,7 @@ fun Poll.createRequest(
         scheduledCloseInfo,
         disableNotification,
         replyToMessageId,
+        allowSendingWithoutReply,
         replyMarkup
     )
 }
@@ -165,6 +169,8 @@ data class SendRegularPoll(
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : SendPoll() {
@@ -186,8 +192,69 @@ data class SendRegularPoll(
     }
 }
 
+fun SendQuizPoll(
+    chatId: ChatIdentifier,
+    question: String,
+    options: List<String>,
+    correctOptionId: Int,
+    isAnonymous: Boolean = true,
+    isClosed: Boolean = false,
+    explanation: String? = null,
+    parseMode: ParseMode? = null,
+    closeInfo: ScheduledCloseInfo? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = SendQuizPoll(
+    chatId,
+    question,
+    options,
+    correctOptionId,
+    isAnonymous,
+    isClosed,
+    explanation,
+    parseMode,
+    null,
+    closeInfo,
+    disableNotification,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
+fun SendQuizPoll(
+    chatId: ChatIdentifier,
+    question: String,
+    options: List<String>,
+    correctOptionId: Int,
+    isAnonymous: Boolean = true,
+    isClosed: Boolean = false,
+    entities: List<TextSource>,
+    closeInfo: ScheduledCloseInfo? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = SendQuizPoll(
+    chatId,
+    question,
+    options,
+    correctOptionId,
+    isAnonymous,
+    isClosed,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    closeInfo,
+    disableNotification,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
 @Serializable
-data class SendQuizPoll(
+data class SendQuizPoll internal constructor(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
     @SerialName(questionField)
@@ -204,18 +271,25 @@ data class SendQuizPoll(
     override val explanation: String? = null,
     @SerialName(explanationParseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(explanationEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @Transient
     override val closeInfo: ScheduledCloseInfo? = null,
     @SerialName(disableNotificationField)
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
+    @SerialName(allowSendingWithoutReplyField)
+    override val allowSendingWithoutReply: Boolean? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : SendPoll(), ExplainedOutput {
     override val type: String = quizPollType
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(explanation ?: return@lazy null) ?.justTextSources()
+    }
 
     @SerialName(openPeriodField)
     override val openPeriod: LongSeconds?

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/SetWebhook.kt

@@ -1,8 +1,7 @@
 package dev.inmo.tgbotapi.requests.webhook
 
 import dev.inmo.tgbotapi.requests.abstracts.*
-import dev.inmo.tgbotapi.requests.send.media.base.DataRequest
+import dev.inmo.tgbotapi.requests.send.media.base.*
-import dev.inmo.tgbotapi.requests.send.media.base.MultipartRequestImpl
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
@@ -13,66 +12,123 @@ private fun correctWebhookUrl(sourceUrl: String) = if (sourceUrl.contains("://")
     "https://$sourceUrl"
 }
 
-fun SetWebhook(
+sealed class SetWebhookRequest : Request<Boolean>
+class MultipartSetWebhookRequest(
     url: String,
     certificate: MultipartFile,
+    ipAddress: String? = null,
     maxAllowedConnections: Int? = null,
-    allowedUpdates: List<String>? = null
+    allowedUpdates: List<String>? = null,
-): MultipartRequestImpl<SetWebhook, Map<String, MultipartFile>, Boolean> = MultipartRequestImpl(
+    dropPendingUpdates: Boolean? = null
+) : SetWebhookRequest(), MultipartRequest<Boolean> by MultipartRequestImpl(
     SetWebhook(
         correctWebhookUrl(url),
-        null,
+        null as String?,
+        ipAddress,
         maxAllowedConnections,
-        allowedUpdates
+        allowedUpdates,
+        dropPendingUpdates
     ),
     mapOf(certificateField to certificate)
 )
 
 fun SetWebhook(
     url: String,
-    certificate: FileId,
+    certificate: MultipartFile,
+    ipAddress: String? = null,
     maxAllowedConnections: Int? = null,
-    allowedUpdates: List<String>? = null
+    allowedUpdates: List<String>? = null,
+    dropPendingUpdates: Boolean? = null
+): MultipartSetWebhookRequest = MultipartSetWebhookRequest(
+    correctWebhookUrl(url),
+    certificate,
+    ipAddress,
+    maxAllowedConnections,
+    allowedUpdates,
+    dropPendingUpdates
+)
+
+fun SetWebhook(
+    url: String,
+    certificate: FileId,
+    ipAddress: String? = null,
+    maxAllowedConnections: Int? = null,
+    allowedUpdates: List<String>? = null,
+    dropPendingUpdates: Boolean? = null
 ): SetWebhook = SetWebhook(
     correctWebhookUrl(url),
     certificate.fileId,
+    ipAddress,
     maxAllowedConnections,
-    allowedUpdates
+    allowedUpdates,
+    dropPendingUpdates
 )
 
+/**
+ * Use this method to specify a url and receive incoming updates via an outgoing webhook. Whenever there is an update
+ * for the bot, we will send an HTTPS POST request to the specified url, containing a JSON-serialized Update.
+ *
+ * If you'd like to make sure that the Webhook request comes from Telegram, we recommend using a secret path in the [url],
+ * e.g. https://www.example.com/<token>. Since nobody else knows your bot's token, you can be pretty sure it's us.
+ */
 @Suppress("USELESS_CAST")
 fun SetWebhook(
     url: String,
     certificate: InputFile,
+    ipAddress: String? = null,
     maxAllowedConnections: Int? = null,
-    allowedUpdates: List<String>? = null
+    allowedUpdates: List<String>? = null,
-): Request<Boolean> = when (certificate) {
+    dropPendingUpdates: Boolean? = null
-    is MultipartFile -> SetWebhook(correctWebhookUrl(url), certificate as MultipartFile, maxAllowedConnections, allowedUpdates)
+) = when (certificate) {
-    is FileId -> SetWebhook(correctWebhookUrl(url), certificate as FileId, maxAllowedConnections, allowedUpdates)
+    is MultipartFile -> SetWebhook(correctWebhookUrl(url), certificate as MultipartFile, ipAddress, maxAllowedConnections, allowedUpdates, dropPendingUpdates)
+    is FileId -> SetWebhook(correctWebhookUrl(url), certificate as FileId, ipAddress, maxAllowedConnections, allowedUpdates, dropPendingUpdates)
 }
 
+/**
+ * Use this method to specify a url and receive incoming updates via an outgoing webhook. Whenever there is an update
+ * for the bot, we will send an HTTPS POST request to the specified url, containing a JSON-serialized Update.
+ *
+ * If you'd like to make sure that the Webhook request comes from Telegram, we recommend using a secret path in the [url],
+ * e.g. https://www.example.com/<token>. Since nobody else knows your bot's token, you can be pretty sure it's us.
+ */
+@Suppress("USELESS_CAST")
 fun SetWebhook(
     url: String,
+    ipAddress: String? = null,
     maxAllowedConnections: Int? = null,
-    allowedUpdates: List<String>? = null
+    allowedUpdates: List<String>? = null,
+    dropPendingUpdates: Boolean? = null
 ) = SetWebhook(
     correctWebhookUrl(url),
     null,
+    ipAddress,
     maxAllowedConnections,
-    allowedUpdates
+    allowedUpdates,
+    dropPendingUpdates
 )
 
+/**
+ * Use this method to specify a url and receive incoming updates via an outgoing webhook. Whenever there is an update
+ * for the bot, we will send an HTTPS POST request to the specified url, containing a JSON-serialized Update.
+ *
+ * If you'd like to make sure that the Webhook request comes from Telegram, we recommend using a secret path in the [url],
+ * e.g. https://www.example.com/<token>. Since nobody else knows your bot's token, you can be pretty sure it's us.
+ */
 @Serializable
 data class SetWebhook internal constructor(
     @SerialName(urlField)
     val url: String,
     @SerialName(certificateField)
     val certificateFile: String? = null,
+    @SerialName(ipAddressField)
+    val ipAddress: String? = null,
     @SerialName(maxAllowedConnectionsField)
     val maxAllowedConnections: Int? = null,
     @SerialName(allowedUpdatesField)
-    val allowedUpdates: List<String>? = null
+    val allowedUpdates: List<String>? = null,
-) : DataRequest<Boolean> {
+    @SerialName(dropPendingUpdatesField)
+    val dropPendingUpdates: Boolean? = null
+) : SetWebhookRequest(), DataRequest<Boolean> {
     override fun method(): String = "setWebhook"
     override val resultDeserializer: DeserializationStrategy<Boolean>
         get() = Boolean.serializer()

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt

@@ -3,7 +3,8 @@ package dev.inmo.tgbotapi.types
 import kotlinx.serialization.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.*
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.longOrNull
 
 @Serializable(ChatIdentifierSerializer::class)
 sealed class ChatIdentifier

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatLocation.kt

@@ -0,0 +1,19 @@
+package dev.inmo.tgbotapi.types
+
+import dev.inmo.tgbotapi.types.location.StaticLocation
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/**
+ * Represents a location to which a chat is connected.
+ *
+ * @see dev.inmo.tgbotapi.requests.chat.get.GetChat
+ * @see dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedSupergroupChat
+ */
+@Serializable
+data class ChatLocation(
+    @SerialName(locationField)
+    val location: StaticLocation,
+    @SerialName(addressField)
+    val address: String
+)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/AdministratorChatMemberImpl.kt

@@ -1,18 +1,37 @@
 package dev.inmo.tgbotapi.types.ChatMember
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
-import dev.inmo.tgbotapi.types.User
+import kotlinx.serialization.*
 
+@Serializable
 data class AdministratorChatMemberImpl(
+    @SerialName(userField)
     override val user: User,
-    override val canBeEdited: Boolean,
+    @SerialName(canBeEditedField)
-    override val canChangeInfo: Boolean,
+    override val canBeEdited: Boolean = false,
-    override val canPostMessages: Boolean,
+    @SerialName(canChangeInfoField)
-    override val canEditMessages: Boolean,
+    override val canChangeInfo: Boolean = false,
-    override val canRemoveMessages: Boolean,
+    @SerialName(canPostMessagesField)
-    override val canInviteUsers: Boolean,
+    override val canPostMessages: Boolean = false,
-    override val canRestrictMembers: Boolean,
+    @SerialName(canEditMessagesField)
-    override val canPinMessages: Boolean,
+    override val canEditMessages: Boolean = false,
-    override val canPromoteMembers: Boolean,
+    @SerialName(canDeleteMessagesField)
-    override val customTitle: String?
+    override val canRemoveMessages: Boolean = false,
-) : AdministratorChatMember
+    @SerialName(canInviteUsersField)
+    override val canInviteUsers: Boolean = false,
+    @SerialName(canRestrictMembersField)
+    override val canRestrictMembers: Boolean = false,
+    @SerialName(canPinMessagesField)
+    override val canPinMessages: Boolean = false,
+    @SerialName(canPromoteMembersField)
+    override val canPromoteMembers: Boolean = false,
+    @SerialName(isAnonymousField)
+    override val isAnonymous: Boolean = false,
+    @SerialName(customTitleField)
+    override val customTitle: String? = null
+) : AdministratorChatMember {
+    @SerialName(statusField)
+    @Required
+    private val type: String = "administrator"
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/CreatorChatMember.kt

@@ -1,19 +1,36 @@
 package dev.inmo.tgbotapi.types.ChatMember
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
-import dev.inmo.tgbotapi.types.User
+import kotlinx.serialization.*
 
+@Serializable
 data class CreatorChatMember(
     override val user: User,
-    override val customTitle: String?
+    @SerialName(isAnonymousField)
+    override val isAnonymous: Boolean = false,
+    @SerialName(customTitleField)
+    override val customTitle: String? = null
 ) : AdministratorChatMember {
+    @Transient
     override val canBeEdited: Boolean = true
+    @Transient
     override val canChangeInfo: Boolean = true
+    @Transient
     override val canPostMessages: Boolean = true
+    @Transient
     override val canEditMessages: Boolean = true
+    @Transient
     override val canRemoveMessages: Boolean = true
+    @Transient
     override val canInviteUsers: Boolean = true
+    @Transient
     override val canRestrictMembers: Boolean = true
+    @Transient
     override val canPinMessages: Boolean = true
+    @Transient
     override val canPromoteMembers: Boolean = true
+    @SerialName(statusField)
+    @Required
+    private val type: String = "creator"
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/KickedChatMember.kt

@@ -1,10 +1,17 @@
 package dev.inmo.tgbotapi.types.ChatMember
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.BannedChatMember
-import dev.inmo.tgbotapi.types.TelegramDate
+import kotlinx.serialization.*
-import dev.inmo.tgbotapi.types.User
 
+@Serializable
 data class KickedChatMember(
+    @SerialName(userField)
     override val user: User,
-    override val untilDate: TelegramDate?
+    @SerialName(untilDateField)
-) : BannedChatMember
+    override val untilDate: TelegramDate? = null
+) : BannedChatMember {
+    @SerialName(statusField)
+    @Required
+    private val type: String = "kicked"
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/LeftChatMember.kt

@@ -1,7 +1,12 @@
 package dev.inmo.tgbotapi.types.ChatMember
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember
-import dev.inmo.tgbotapi.types.User
+import kotlinx.serialization.*
 
-data class LeftChatMember(override val user: User) :
+@Serializable
-    ChatMember
+data class LeftChatMember(@SerialName(userField) override val user: User) : ChatMember {
+    @SerialName(statusField)
+    @Required
+    private val type: String = "left"
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/MemberChatMember.kt

@@ -1,7 +1,12 @@
 package dev.inmo.tgbotapi.types.ChatMember
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember
-import dev.inmo.tgbotapi.types.User
+import kotlinx.serialization.*
 
-data class MemberChatMember(override val user: User) :
+@Serializable
-    ChatMember
+data class MemberChatMember(@SerialName(userField) override val user: User) : ChatMember {
+    @SerialName(statusField)
+    @Required
+    private val type: String = "member"
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/RawChatMember.kt

@@ -1,84 +0,0 @@
-package dev.inmo.tgbotapi.types.ChatMember
-
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-internal data class RawChatMember(
-    val user: User,
-    private val status: String,
-    private val until_date: TelegramDate? = null,
-    @SerialName(canBeEditedField)
-    private val canBeEdited: Boolean = false,
-    @SerialName(canChangeInfoField)
-    private val canChangeInfo: Boolean = false,
-    @SerialName(canPostMessagesField)
-    private val canPostMessages: Boolean = false,
-    @SerialName(canEditMessagesField)
-    private val canEditMessages: Boolean = false,
-    @SerialName(canDeleteMessagesField)
-    private val canDeleteMessages: Boolean = false,
-    @SerialName(canInviteUsersField)
-    private val canInviteUsers: Boolean = false,
-    @SerialName(canRestrictMembersField)
-    private val canRestrictMembers: Boolean = false,
-    @SerialName(canPinMessagesField)
-    private val canPinMessages: Boolean = false,
-    @SerialName(canPromoteMembersField)
-    private val canPromoteMembers: Boolean = false,
-    @SerialName(isMemberField)
-    private val isMember: Boolean = false,
-    @SerialName(canSendMessagesField)
-    private val canSendMessages: Boolean = false,
-    @SerialName(canSendMediaMessagesField)
-    private val canSendMediaMessages: Boolean = false,
-    @SerialName(canSendPollsField)
-    private val canSendPolls: Boolean = false,
-    @SerialName(canSendOtherMessagesField)
-    private val canSendOtherMessages: Boolean = false,
-    @SerialName(canAddWebPagePreviewsField)
-    private val canAddWebPagePreviews: Boolean = false,
-    @SerialName(customTitleField)
-    private val customTitle: String? = null
-) {
-    val asChatMember: ChatMember by lazy {
-        when (status) {
-            "creator" -> CreatorChatMember(user, customTitle)
-            "administrator" -> AdministratorChatMemberImpl(
-                user,
-                canBeEdited,
-                canChangeInfo,
-                canPostMessages,
-                canEditMessages,
-                canDeleteMessages,
-                canInviteUsers,
-                canRestrictMembers,
-                canPinMessages,
-                canPromoteMembers,
-                customTitle
-            )
-            "member" -> MemberChatMember(user)
-            "restricted" -> RestrictedChatMember(
-                user,
-                until_date,
-                isMember,
-                canSendMessages,
-                canSendMediaMessages,
-                canSendPolls,
-                canSendOtherMessages,
-                canAddWebPagePreviews,
-                canChangeInfo,
-                canInviteUsers,
-                canPinMessages
-            )
-            "left" -> LeftChatMember(user)
-            "kicked" -> KickedChatMember(
-                user,
-                until_date
-            )
-            else -> throw IllegalStateException("Can't understand type of user: $status")
-        }
-    }
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/RestrictedChatMember.kt

@@ -1,20 +1,36 @@
 package dev.inmo.tgbotapi.types.ChatMember
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.BannedChatMember
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.SpecialRightsChatMember
-import dev.inmo.tgbotapi.types.TelegramDate
+import kotlinx.serialization.*
-import dev.inmo.tgbotapi.types.User
 
+@Serializable
 data class RestrictedChatMember(
+    @SerialName(userField)
     override val user: User,
-    override val untilDate: TelegramDate?,
+    @SerialName(untilDateField)
-    val isMember: Boolean,
+    override val untilDate: TelegramDate? = null,
-    val canSendMessages: Boolean,
+    @SerialName(isMemberField)
-    val canSendMediaMessages: Boolean,
+    val isMember: Boolean = false,
-    val canSendPolls: Boolean,
+    @SerialName(canSendMessagesField)
-    val canSendOtherMessages: Boolean,
+    val canSendMessages: Boolean = false,
-    val canAddWebpagePreviews: Boolean,
+    @SerialName(canSendMediaMessagesField)
-    override val canChangeInfo: Boolean,
+    val canSendMediaMessages: Boolean = false,
-    override val canInviteUsers: Boolean,
+    @SerialName(canSendPollsField)
-    override val canPinMessages: Boolean
+    val canSendPolls: Boolean = false,
-) : BannedChatMember, SpecialRightsChatMember
+    @SerialName(canSendOtherMessagesField)
+    val canSendOtherMessages: Boolean = false,
+    @SerialName(canAddWebPagePreviewsField)
+    val canAddWebpagePreviews: Boolean = false,
+    @SerialName(canChangeInfoField)
+    override val canChangeInfo: Boolean = false,
+    @SerialName(canInviteUsersField)
+    override val canInviteUsers: Boolean = false,
+    @SerialName(canPinMessagesField)
+    override val canPinMessages: Boolean = false
+) : BannedChatMember, SpecialRightsChatMember {
+    @SerialName(statusField)
+    @Required
+    private val type: String = "restricted"
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/AdministratorChatMember.kt

@@ -1,5 +1,11 @@
 package dev.inmo.tgbotapi.types.ChatMember.abstracts
 
+import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+@Serializable(AdministratorChatMemberSerializer::class)
 interface AdministratorChatMember : SpecialRightsChatMember {
     val canBeEdited: Boolean
     val canPostMessages: Boolean
@@ -7,5 +13,14 @@ interface AdministratorChatMember : SpecialRightsChatMember {
     val canRemoveMessages: Boolean
     val canRestrictMembers: Boolean
     val canPromoteMembers: Boolean
+    val isAnonymous: Boolean
     val customTitle: String?
 }
+
+@Serializer(AdministratorChatMember::class)
+internal object AdministratorChatMemberSerializer : KSerializer<AdministratorChatMember> {
+    override val descriptor: SerialDescriptor = ChatMemberSerializer.descriptor
+
+    override fun deserialize(decoder: Decoder): AdministratorChatMember = ChatMemberSerializer.deserialize(decoder) as AdministratorChatMember
+    override fun serialize(encoder: Encoder, value: AdministratorChatMember) = ChatMemberSerializer.serialize(encoder, value)
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/BannedChatMember.kt

@@ -1,5 +1,7 @@
 package dev.inmo.tgbotapi.types.ChatMember.abstracts
 
 import dev.inmo.tgbotapi.CommonAbstracts.types.UntilDate
+import kotlinx.serialization.Serializable
 
+@Serializable(ChatMemberSerializer::class)
 interface BannedChatMember : ChatMember, UntilDate

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/ChatMember.kt

@@ -1,26 +1,46 @@
 package dev.inmo.tgbotapi.types.ChatMember.abstracts
 
-import dev.inmo.tgbotapi.types.ChatMember.RawChatMember
+import dev.inmo.tgbotapi.types.ChatMember.*
 import dev.inmo.tgbotapi.types.User
+import dev.inmo.tgbotapi.types.statusField
+import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.jsonPrimitive
 
+@Serializable(ChatMemberSerializer::class)
 interface ChatMember {
     val user: User
 }
 
-internal object AdministratorChatMemberSerializerWithoutDeserialization : KSerializer<AdministratorChatMember> {
+@Serializer(ChatMember::class)
-    override val descriptor: SerialDescriptor = ChatMemberDeserializationStrategy.descriptor
+internal object ChatMemberSerializer : KSerializer<ChatMember> {
+    override val descriptor: SerialDescriptor = JsonObject.serializer().descriptor
 
-    override fun deserialize(decoder: Decoder): AdministratorChatMember
+    override fun deserialize(decoder: Decoder): ChatMember {
-        = ChatMemberDeserializationStrategy.deserialize(decoder) as AdministratorChatMember
+        val json = JsonObject.serializer().deserialize(decoder)
-    override fun serialize(encoder: Encoder, value: AdministratorChatMember) = throw UnsupportedOperationException()
+        return when (json[statusField] ?.jsonPrimitive ?.content ?: error("Status field of chat member must be specified, but incoming json contains next: $json")) {
-}
+            "creator" -> nonstrictJsonFormat.decodeFromJsonElement(CreatorChatMember.serializer(), json)
-
+            "administrator" -> nonstrictJsonFormat.decodeFromJsonElement(AdministratorChatMemberImpl.serializer(), json)
-internal object ChatMemberDeserializationStrategy : DeserializationStrategy<ChatMember> {
+            "member" -> nonstrictJsonFormat.decodeFromJsonElement(MemberChatMember.serializer(), json)
-    override val descriptor: SerialDescriptor = RawChatMember.serializer().descriptor
+            "restricted" -> nonstrictJsonFormat.decodeFromJsonElement(RestrictedChatMember.serializer(), json)
-
+            "left" -> nonstrictJsonFormat.decodeFromJsonElement(LeftChatMember.serializer(), json)
-    override fun deserialize(decoder: Decoder): ChatMember = RawChatMember.serializer().deserialize(decoder).asChatMember
+            "kicked" -> nonstrictJsonFormat.decodeFromJsonElement(KickedChatMember.serializer(), json)
+            else -> error("Unknown type of chat member in json: $json")
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: ChatMember) {
+        when (value) {
+            is CreatorChatMember -> CreatorChatMember.serializer()
+            is AdministratorChatMemberImpl -> AdministratorChatMemberImpl.serializer()
+            is MemberChatMember -> MemberChatMember.serializer()
+            is RestrictedChatMember -> RestrictedChatMember.serializer()
+            is LeftChatMember -> LeftChatMember.serializer()
+            is KickedChatMember -> KickedChatMember.serializer()
+        }
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/SpecialRightsChatMember.kt

@@ -1,5 +1,8 @@
 package dev.inmo.tgbotapi.types.ChatMember.abstracts
 
+import kotlinx.serialization.Serializable
+
+@Serializable(ChatMemberSerializer::class)
 interface SpecialRightsChatMember : ChatMember {
     val canChangeInfo: Boolean
     val canInviteUsers: Boolean

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt

@@ -24,10 +24,19 @@ typealias FileUniqueId = String
 typealias DiceResult = Int
 typealias FoursquareId = String
 typealias FoursquareType = String
+typealias GooglePlaceId = String
+typealias GooglePlaceType = String
 
 typealias Seconds = Int
+typealias MilliSeconds = Long
 typealias LongSeconds = Long
 
+typealias Meters = Float
+typealias Degrees = Int
+
+val degreesLimit = 1 .. 360
+val horizontalAccuracyLimit = 0F .. 1500F
+
 val getUpdatesLimit = 1 .. 100
 val callbackQueryAnswerLength = 0 until 200
 val captionLength = 0 .. 1024
@@ -43,7 +52,7 @@ val invoiceDescriptionLimit = 1 until 256
 val invoicePayloadBytesLimit = 1 until 128
 
 val pollOptionTextLength = 1 .. 100
-val pollQuestionTextLength = 1 until 256
+val pollQuestionTextLength = 1 .. 300
 val pollOptionsLimit = 2 .. 10
 
 val livePeriodLimit = 60 .. 86400
@@ -52,7 +61,15 @@ val inlineQueryAnswerResultsLimit = 0 .. 50
 
 val customTitleLength = 0 .. 16
 
-val diceResultLimit = 1 .. 6
+val dartsCubeAndBowlingDiceResultLimit = 1 .. 6
+@Deprecated("Renamed", ReplaceWith("dartsCubeAndBowlingDiceResultLimit", "dev.inmo.tgbotapi.types.dartsCubeAndBowlingDiceResultLimit"))
+val dartsAndCubeDiceResultLimit
+    get() = dartsCubeAndBowlingDiceResultLimit
+@Deprecated("Renamed", ReplaceWith("dartsCubeAndBowlingDiceResultLimit", "dev.inmo.tgbotapi.types.dartsCubeAndBowlingDiceResultLimit"))
+val diceResultLimit
+    get() = dartsCubeAndBowlingDiceResultLimit
+val basketballAndFootballDiceResultLimit = 1 .. 5
+val slotMachineDiceResultLimit = 1 .. 64
 
 val botCommandLengthLimit = 1 .. 32
 val botCommandLimit = botCommandLengthLimit
@@ -81,9 +98,12 @@ const val fromChatIdField = "from_chat_id"
 const val disableWebPagePreviewField = "disable_web_page_preview"
 const val disableNotificationField = "disable_notification"
 const val replyToMessageIdField = "reply_to_message_id"
+const val allowSendingWithoutReplyField = "allow_sending_without_reply"
 const val replyMarkupField = "reply_markup"
+const val disableContentTypeDetectionField = "disable_content_type_detection"
 const val supportStreamingField = "support_streaming"
 const val livePeriodField = "live_period"
+const val proximityAlertRadiusField = "proximity_alert_radius"
 const val isBotField = "is_bot"
 const val firstNameField = "first_name"
 const val lastNameField = "last_name"
@@ -92,12 +112,14 @@ const val canJoinGroupsField = "can_join_groups"
 const val canReadAllGroupMessagesField = "can_read_all_group_messages"
 const val supportInlineQueriesField = "supports_inline_queries"
 const val textEntitiesField = "text_entities"
+const val entitiesField = "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"
+const val onlyIfBannedField = "only_if_banned"
 const val containsMasksField = "contains_masks"
 const val resultIdField = "result_id"
 const val inlineMessageIdField = "inline_message_id"
@@ -110,6 +132,8 @@ const val showAlertField = "show_alert"
 const val cachedTimeField = "cached_time"
 const val foursquareIdField = "foursquare_id"
 const val foursquareTypeField = "foursquare_type"
+const val googlePlaceIdField = "google_place_id"
+const val googlePlaceTypeField = "google_place_type"
 const val untilDateField = "until_date"
 const val errorMessageField = "error_message"
 const val messageTextField = "message_text"
@@ -119,6 +143,7 @@ const val switchPmTextField = "switch_pm_text"
 const val switchPmParameterField = "switch_pm_parameter"
 const val maxAllowedConnectionsField = "max_connections"
 const val allowedUpdatesField = "allowed_updates"
+const val dropPendingUpdatesField = "drop_pending_updates"
 const val hasCustomCertificateField = "has_custom_certificate"
 const val pendingUpdateCountField = "pending_update_count"
 const val lastErrorDateField = "last_error_date"
@@ -129,6 +154,7 @@ const val totalVoterCountField = "total_voter_count"
 const val correctOptionIdField = "correct_option_id"
 const val allowsMultipleAnswersField = "allows_multiple_answers"
 const val isAnonymousField = "is_anonymous"
+const val captionEntitiesField = "caption_entities"
 const val loginUrlField = "login_url"
 const val forwardTextField = "forward_text"
 const val botUsernameField = "bot_username"
@@ -139,6 +165,9 @@ const val inviteLinkField = "invite_link"
 const val pinnedMessageField = "pinned_message"
 const val customTitleField = "custom_title"
 const val optionIdsField = "option_ids"
+const val ipAddressField = "ip_address"
+const val linkedChatIdField = "linked_chat_id"
+const val horizontalAccuracyField = "horizontal_accuracy"
 
 const val requestContactField = "request_contact"
 const val requestLocationField = "request_location"
@@ -206,6 +235,7 @@ const val canSendPollsField = "can_send_polls"
 const val canAddWebPagePreviewsField = "can_add_web_page_previews"
 const val canSetStickerSetField = "can_set_sticker_set"
 
+const val statusField = "status"
 const val canBeEditedField = "can_be_edited"
 const val canChangeInfoField = "can_change_info"
 const val canPostMessagesField = "can_post_messages"
@@ -236,11 +266,13 @@ const val heightField = "height"
 const val lengthField = "length"
 const val latitudeField = "latitude"
 const val longitudeField = "longitude"
+const val headingField = "heading"
 const val fromField = "from"
 const val userField = "user"
 const val dateField = "date"
 const val chatField = "chat"
 const val usernameField = "username"
+const val bioField = "bio"
 const val nameField = "name"
 const val emailField = "email"
 const val locationField = "location"

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/LocationChosenInlineResult.kt

@@ -2,11 +2,12 @@ package dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult
 
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.ChosenInlineResult
+import dev.inmo.tgbotapi.types.location.StaticLocation
 
 data class LocationChosenInlineResult(
     override val resultId: InlineQueryIdentifier,
     override val user: User,
-    val location: Location,
+    val location: StaticLocation,
     override val inlineMessageId: InlineMessageIdentifier?,
     override val query: String
 ) : ChosenInlineResult

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/RawChosenInlineResult.kt

@@ -2,6 +2,7 @@ package dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult
 
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.ChosenInlineResult
+import dev.inmo.tgbotapi.types.location.StaticLocation
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -14,7 +15,7 @@ internal data class RawChosenInlineResult(
     @SerialName(queryField)
     val query: String,
     @SerialName(locationField)
-    val location: Location? = null,
+    val location: StaticLocation? = null,
     @SerialName(inlineMessageIdField)
     val inlineMessageId: InlineMessageIdentifier? = null
 ) {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioCachedImpl.kt

@@ -1,30 +1,54 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio.InlineQueryResultAudioCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio.inlineQueryResultAudioType
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+fun InlineQueryResultAudioCachedImpl(
+    id: InlineQueryIdentifier,
+    fileId: FileId,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultAudioCachedImpl(id, fileId, text, parseMode, null, replyMarkup, inputMessageContent)
+
+fun InlineQueryResultAudioCachedImpl(
+    id: InlineQueryIdentifier,
+    fileId: FileId,
+    entities: List<TextSource>,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultAudioCachedImpl(id, fileId, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+
 @Serializable
-data class InlineQueryResultAudioCachedImpl(
+data class InlineQueryResultAudioCachedImpl internal constructor(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(audioFileIdField)
     override val fileId: FileId,
     @SerialName(captionField)
-    override val caption: String? = null,
+    override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)
     override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultAudioCached {
     override val type: String = inlineQueryResultAudioType
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioImpl.kt

@@ -1,17 +1,42 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio.InlineQueryResultAudio
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio.inlineQueryResultAudioType
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+fun InlineQueryResultAudioImpl(
+    id: InlineQueryIdentifier,
+    url: String,
+    title: String,
+    performer: String? = null,
+    duration: Int? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultAudioImpl(id, url, title, performer, duration, text, parseMode, null, replyMarkup, inputMessageContent)
+
+fun InlineQueryResultAudioImpl(
+    id: InlineQueryIdentifier,
+    url: String,
+    title: String,
+    performer: String? = null,
+    duration: Int? = null,
+    entities: List<TextSource>,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultAudioImpl(id, url, title, performer, duration, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+
 @Serializable
-data class InlineQueryResultAudioImpl(
+data class InlineQueryResultAudioImpl internal constructor(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(audioUrlField)
@@ -23,13 +48,18 @@ data class InlineQueryResultAudioImpl(
     @SerialName(audioDurationField)
     override val duration: Int? = null,
     @SerialName(captionField)
-    override val caption: String? = null,
+    override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)
     override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultAudio {
     override val type: String = inlineQueryResultAudioType
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentCachedImpl.kt

@@ -1,18 +1,41 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document.InlineQueryResultDocumentCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document.inlineQueryResultDocumentType
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+fun InlineQueryResultDocumentCachedImpl(
+    id: InlineQueryIdentifier,
+    fileId: FileId,
+    title: String,
+    description: String? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultDocumentCachedImpl(id, fileId, title, description, text, parseMode, null, replyMarkup, inputMessageContent)
+
+fun InlineQueryResultDocumentCachedImpl(
+    id: InlineQueryIdentifier,
+    fileId: FileId,
+    title: String,
+    description: String? = null,
+    entities: List<TextSource>,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultDocumentCachedImpl(id, fileId, title, description, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+
 @Serializable
-data class InlineQueryResultDocumentCachedImpl(
+data class InlineQueryResultDocumentCachedImpl internal constructor(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(documentFileIdField)
@@ -22,13 +45,18 @@ data class InlineQueryResultDocumentCachedImpl(
     @SerialName(descriptionField)
     override val description: String? = null,
     @SerialName(captionField)
-    override val caption: String? = null,
+    override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)
     override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultDocumentCached {
     override val type: String = inlineQueryResultDocumentType
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentImpl.kt

@@ -1,9 +1,11 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document.InlineQueryResultDocument
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document.inlineQueryResultDocumentType
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@@ -12,8 +14,37 @@ import dev.inmo.tgbotapi.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+fun InlineQueryResultDocumentImpl(
+    id: InlineQueryIdentifier,
+    url: String,
+    title: String,
+    mimeType: MimeType,
+    thumbUrl: String? = null,
+    thumbWidth: Int? = null,
+    thumbHeight: Int? = null,
+    description: String? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultDocumentImpl(id, url, title, mimeType, thumbUrl, thumbWidth, thumbHeight, description, text, parseMode, null, replyMarkup, inputMessageContent)
+
+fun InlineQueryResultDocumentImpl(
+    id: InlineQueryIdentifier,
+    url: String,
+    title: String,
+    mimeType: MimeType,
+    thumbUrl: String? = null,
+    thumbWidth: Int? = null,
+    thumbHeight: Int? = null,
+    description: String? = null,
+    entities: List<TextSource>,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultDocumentImpl(id, url, title, mimeType, thumbUrl, thumbWidth, thumbHeight, description, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+
 @Serializable
-data class InlineQueryResultDocumentImpl(
+data class InlineQueryResultDocumentImpl internal constructor(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(documentUrlField)
@@ -31,13 +62,18 @@ data class InlineQueryResultDocumentImpl(
     @SerialName(descriptionField)
     override val description: String? = null,
     @SerialName(captionField)
-    override val caption: String? = null,
+    override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)
     override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultDocument {
     override val type: String = inlineQueryResultDocumentType
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGifCachedImpl.kt

@@ -1,18 +1,39 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif.InlineQueryResultGifCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif.inlineQueryResultGifType
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+fun InlineQueryResultGifCachedImpl(
+    id: InlineQueryIdentifier,
+    fileId: FileId,
+    title: String? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultGifCachedImpl(id, fileId, title, text, parseMode, null, replyMarkup, inputMessageContent)
+
+fun InlineQueryResultGifCachedImpl(
+    id: InlineQueryIdentifier,
+    fileId: FileId,
+    title: String? = null,
+    entities: List<TextSource>,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultGifCachedImpl(id, fileId, title, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+
 @Serializable
-data class InlineQueryResultGifCachedImpl(
+data class InlineQueryResultGifCachedImpl internal constructor(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(gifFileIdField)
@@ -20,13 +41,18 @@ data class InlineQueryResultGifCachedImpl(
     @SerialName(titleField)
     override val title: String? = null,
     @SerialName(captionField)
-    override val caption: String? = null,
+    override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)
     override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultGifCached {
     override val type: String = inlineQueryResultGifType
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGifImpl.kt

@@ -1,9 +1,11 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif.InlineQueryResultGif
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif.inlineQueryResultGifType
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@@ -11,8 +13,37 @@ import dev.inmo.tgbotapi.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+fun InlineQueryResultGifImpl(
+    id: InlineQueryIdentifier,
+    url: String,
+    thumbUrl: String,
+    thumbMimeType: MimeType? = null,
+    width: Int? = null,
+    height: Int? = null,
+    duration: Int? = null,
+    title: String? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultGifImpl(id, url, thumbUrl, thumbMimeType, width, height, duration, title, text, parseMode, null, replyMarkup, inputMessageContent)
+
+fun InlineQueryResultGifImpl(
+    id: InlineQueryIdentifier,
+    url: String,
+    thumbUrl: String,
+    thumbMimeType: MimeType? = null,
+    width: Int? = null,
+    height: Int? = null,
+    duration: Int? = null,
+    title: String? = null,
+    entities: List<TextSource>,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultGifImpl(id, url, thumbUrl, thumbMimeType, width, height, duration, title, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+
 @Serializable
-data class InlineQueryResultGifImpl(
+data class InlineQueryResultGifImpl internal constructor(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(gifUrlField)
@@ -30,15 +61,20 @@ data class InlineQueryResultGifImpl(
     @SerialName(titleField)
     override val title: String? = null,
     @SerialName(captionField)
-    override val caption: String? = null,
+    override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)
     override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultGif {
     override val type: String = inlineQueryResultGifType
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
 
     init {
         if (thumbMimeType != null && thumbMimeType !in telegramInlineModeGifPermittedMimeTypes) {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultLocation.kt

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 
-import dev.inmo.tgbotapi.CommonAbstracts.Livable
+import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.CommonAbstracts.Locationed
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
@@ -17,10 +16,16 @@ data class InlineQueryResultLocation(
     override val latitude: Double,
     @SerialName(longitudeField)
     override val longitude: Double,
+    @SerialName(horizontalAccuracyField)
+    override val horizontalAccuracy: Meters? = null,
     @SerialName(titleField)
     override val title: String,
     @SerialName(livePeriodField)
-    override val livePeriod: Int? = null,
+    override val livePeriod: Seconds? = null,
+    @SerialName(headingField)
+    override val heading: Degrees? = null,
+    @SerialName(proximityAlertRadiusField)
+    override val proximityAlertRadius: Meters? = null,
     @SerialName(thumbUrlField)
     override val thumbUrl: String? = null,
     @SerialName(thumbWidthField)
@@ -33,7 +38,10 @@ data class InlineQueryResultLocation(
     override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResult,
     Locationed,
+    HorizontallyAccured,
     Livable,
+    ProximityAlertable,
+    Headed,
     TitledInlineQueryResult,
     WithInputMessageContentInlineQueryResult,
     ThumbedInlineQueryResult,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifCachedImpl.kt

@@ -1,18 +1,39 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.InlineQueryResultMpeg4GifCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.inlineQueryResultMpeg4GifType
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+fun InlineQueryResultMpeg4GifCachedImpl(
+    id: InlineQueryIdentifier,
+    fileId: FileId,
+    title: String? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultMpeg4GifCachedImpl(id, fileId, title, text, parseMode, null, replyMarkup, inputMessageContent)
+
+fun InlineQueryResultMpeg4GifCachedImpl(
+    id: InlineQueryIdentifier,
+    fileId: FileId,
+    title: String? = null,
+    entities: List<TextSource>,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultMpeg4GifCachedImpl(id, fileId, title, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+
 @Serializable
-data class InlineQueryResultMpeg4GifCachedImpl(
+data class InlineQueryResultMpeg4GifCachedImpl internal constructor(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(mpeg4GifFileIdField)
@@ -20,13 +41,18 @@ data class InlineQueryResultMpeg4GifCachedImpl(
     @SerialName(titleField)
     override val title: String? = null,
     @SerialName(captionField)
-    override val caption: String? = null,
+    override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)
     override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultMpeg4GifCached {
     override val type: String = inlineQueryResultMpeg4GifType
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifImpl.kt

@@ -1,9 +1,11 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.InlineQueryResultMpeg4Gif
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.inlineQueryResultMpeg4GifType
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@@ -11,8 +13,37 @@ import dev.inmo.tgbotapi.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+fun InlineQueryResultMpeg4GifImpl(
+    id: InlineQueryIdentifier,
+    url: String,
+    thumbUrl: String,
+    thumbMimeType: MimeType? = null,
+    width: Int? = null,
+    height: Int? = null,
+    duration: Int? = null,
+    title: String? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultMpeg4GifImpl(id, url, thumbUrl, thumbMimeType, width, height, duration, title, text, parseMode, null, replyMarkup, inputMessageContent)
+
+fun InlineQueryResultMpeg4GifImpl(
+    id: InlineQueryIdentifier,
+    url: String,
+    thumbUrl: String,
+    thumbMimeType: MimeType? = null,
+    width: Int? = null,
+    height: Int? = null,
+    duration: Int? = null,
+    title: String? = null,
+    entities: List<TextSource>,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultMpeg4GifImpl(id, url, thumbUrl, thumbMimeType, width, height, duration, title, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+
 @Serializable
-data class InlineQueryResultMpeg4GifImpl(
+data class InlineQueryResultMpeg4GifImpl internal constructor(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(mpeg4GifUrlField)
@@ -30,15 +61,20 @@ data class InlineQueryResultMpeg4GifImpl(
     @SerialName(titleField)
     override val title: String? = null,
     @SerialName(captionField)
-    override val caption: String? = null,
+    override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)
     override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultMpeg4Gif {
     override val type: String = inlineQueryResultMpeg4GifType
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
 
     init {
         if (thumbMimeType != null && thumbMimeType !in telegramInlineModeGifPermittedMimeTypes) {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoCachedImpl.kt

@@ -1,18 +1,41 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo.InlineQueryResultPhotoCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo.inlineQueryResultPhotoType
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+fun InlineQueryResultPhotoCachedImpl(
+    id: InlineQueryIdentifier,
+    fileId: FileId,
+    title: String? = null,
+    description: String? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultPhotoCachedImpl(id, fileId, title, description, text, parseMode, null, replyMarkup, inputMessageContent)
+
+fun InlineQueryResultPhotoCachedImpl(
+    id: InlineQueryIdentifier,
+    fileId: FileId,
+    title: String? = null,
+    description: String? = null,
+    entities: List<TextSource>,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultPhotoCachedImpl(id, fileId, title, description, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+
 @Serializable
-data class InlineQueryResultPhotoCachedImpl(
+data class InlineQueryResultPhotoCachedImpl internal constructor(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(photoFileIdField)
@@ -22,13 +45,18 @@ data class InlineQueryResultPhotoCachedImpl(
     @SerialName(descriptionField)
     override val description: String? = null,
     @SerialName(captionField)
-    override val caption: String? = null,
+    override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)
     override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultPhotoCached {
     override val type: String = inlineQueryResultPhotoType
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoImpl.kt

@@ -1,17 +1,46 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo.InlineQueryResultPhoto
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo.inlineQueryResultPhotoType
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+fun InlineQueryResultPhotoImpl(
+    id: InlineQueryIdentifier,
+    url: String,
+    thumbUrl: String,
+    width: Int? = null,
+    height: Int? = null,
+    title: String? = null,
+    description: String? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultPhotoImpl(id, url, thumbUrl, width, height, title, description, text, parseMode, null, replyMarkup, inputMessageContent)
+
+fun InlineQueryResultPhotoImpl(
+    id: InlineQueryIdentifier,
+    url: String,
+    thumbUrl: String,
+    width: Int? = null,
+    height: Int? = null,
+    title: String? = null,
+    description: String? = null,
+    entities: List<TextSource>,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultPhotoImpl(id, url, thumbUrl, width, height, title, description, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+
 @Serializable
-data class InlineQueryResultPhotoImpl(
+data class InlineQueryResultPhotoImpl internal constructor(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(photoUrlField)
@@ -27,13 +56,18 @@ data class InlineQueryResultPhotoImpl(
     @SerialName(descriptionField)
     override val description: String? = null,
     @SerialName(captionField)
-    override val caption: String? = null,
+    override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)
     override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultPhoto {
     override val type: String = inlineQueryResultPhotoType
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVenue.kt

@@ -22,9 +22,13 @@ data class InlineQueryResultVenue(
     @SerialName(addressField)
     override val address: String,
     @SerialName(foursquareIdField)
-    override val foursquareId: String? = null,
+    override val foursquareId: FoursquareId? = null,
     @SerialName(foursquareTypeField)
-    override val foursquareType: String? = null,
+    override val foursquareType: FoursquareType? = null,
+    @SerialName(googlePlaceIdField)
+    override val googlePlaceId: GooglePlaceId? = null,
+    @SerialName(googlePlaceTypeField)
+    override val googlePlaceType: GooglePlaceType? = null,
     @SerialName(thumbUrlField)
     override val thumbUrl: String? = null,
     @SerialName(thumbWidthField)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoCachedImpl.kt

@@ -1,18 +1,41 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video.InlineQueryResultVideoCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video.inlineQueryResultVideoType
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+fun InlineQueryResultVideoCachedImpl(
+    id: InlineQueryIdentifier,
+    fileId: FileId,
+    title: String,
+    description: String? = null,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultVideoCachedImpl(id, fileId, title, description, text, parseMode, null, replyMarkup, inputMessageContent)
+
+fun InlineQueryResultVideoCachedImpl(
+    id: InlineQueryIdentifier,
+    fileId: FileId,
+    title: String,
+    description: String? = null,
+    entities: List<TextSource>,
+    replyMarkup: InlineKeyboardMarkup? = null,
+    inputMessageContent: InputMessageContent? = null
+) = InlineQueryResultVideoCachedImpl(id, fileId, title, description, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+
 @Serializable
-data class InlineQueryResultVideoCachedImpl(
+data class InlineQueryResultVideoCachedImpl internal constructor(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(videoFileIdField)
@@ -22,13 +45,18 @@ data class InlineQueryResultVideoCachedImpl(
     @SerialName(descriptionField)
     override val description: String? = null,
     @SerialName(captionField)
-    override val caption: String? = null,
+    override val text: String? = null,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
+    @SerialName(captionEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)
     override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultVideoCached {
     override val type: String = inlineQueryResultVideoType
+    override val entities: List<TextSource>? by lazy {
+        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+    }
 }