add travis dokka step

CHANGELOG.md

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

@@ -2,7 +2,7 @@
 
 | 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) [![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) |
+| 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) |
 | 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) |
@@ -74,7 +74,7 @@ kotlin {
 
 ![Libraries hierarchy](resources/TelegramBotAPI-libraries-hierarchy.svg)
 
-In most cases, the most simple way will be to implement [TelegramBotAPI](tgbotapi/README.md) - it contains
+In most cases, the most simple way will be to implement [TelegramBotAPI](TelegramBotAPI/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

@@ -1,20 +0,0 @@
-<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>

docs/build.gradle

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

gradle.properties

@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx1024m
 kotlin.code.style=official
 org.gradle.parallel=true
 kotlin.js.generate.externals=true
@@ -6,18 +6,16 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 kotlin_version=1.4.10
-kotlin_coroutines_version=1.4.1
+kotlin_coroutines_version=1.3.9
-kotlin_serialisation_runtime_version=1.0.1
+kotlin_serialisation_runtime_version=1.0.0
 klock_version=1.12.1
 uuid_version=0.2.2
-ktor_version=1.4.2
+ktor_version=1.4.1
-
-micro_utils_version=0.3.0
 
 javax_activation_version=1.1.1
 
 library_group=dev.inmo
-library_version=0.30.2
+library_version=0.29.1
 
 gradle_bintray_plugin_version=1.8.5
 github_release_plugin_version=2.2.12

settings.gradle

@@ -1,10 +1,3 @@
-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 November 2020 update of TelegramBotAPI (version 5.0)](https://core.telegram.org/bots/api#november-4-2020).
+This version compatible with [4th of June 2020 update of TelegramBotAPI (version 4.9)](https://core.telegram.org/bots/api#june-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

@@ -47,8 +47,6 @@ 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/mpp_publish_template.kpsb

@@ -1 +1 @@
-{"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"}]}}
+{"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"}

tgbotapi.core/publish.gradle

@@ -27,7 +27,6 @@ bintray {
     }
     
     publish = true
-    override = true
     
     pkg {
         repo = "TelegramBotAPI"

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.internal.fullListOfSubSource
+import dev.inmo.tgbotapi.utils.fullListOfSubSource
 
 interface Captioned {
     val caption: String?
@@ -19,16 +19,8 @@ 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]
  */
-@Deprecated("Currently list of entities already full. This method is redundant")
+fun CaptionedInput.fullEntitiesList(): FullTextSourcesList = caption ?.fullListOfSubSource(captionEntities) ?.map { it.source } ?: emptyList()
-fun CaptionedInput.fullEntitiesList(): TextSourcesList = caption ?.fullListOfSubSource(captionEntities) ?.map { it.source } ?: emptyList()

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

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

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

@@ -1,22 +1,16 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource
+import dev.inmo.tgbotapi.utils.fullListOfSubSource
 
 interface Explained {
     val explanation: String?
 }
 
-interface ParsableExplainedOutput : Explained {
+interface ExplainedOutput : 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]
@@ -25,16 +19,8 @@ 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]
  */
-@Deprecated("Currently list of entities already full. This method is redundant")
+fun ExplainedInput.fullEntitiesList(): FullTextSourcesList = explanation ?.fullListOfSubSource(explanationEntities) ?.map { it.source } ?: emptyList()
-fun ExplainedInput.fullEntitiesList(): TextSourcesList = explanation ?.fullListOfSubSource(explanationEntities) ?.map { it.source } ?: emptyList()

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

@@ -1,7 +0,0 @@
-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

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

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

@@ -1,7 +0,0 @@
-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,16 +1,6 @@
 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 {
@@ -18,25 +8,11 @@ interface TextSource {
     val asMarkdownV2Source: String
     val asHtmlSource: String
     val source: String
-
-    val asText: String
-        get() = source
 }
 
-@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 textSources: List<TextSource>
 }
 
 data class TextPart(
@@ -45,49 +21,3 @@ 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> = textSources.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

@@ -1,40 +0,0 @@
-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,5 +4,4 @@ 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,6 +1,5 @@
 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.exceptions.newRequestException
@@ -11,6 +10,7 @@ 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
 
@@ -37,7 +37,7 @@ class KtorRequestsExecutor(
     }
 
     override suspend fun <T : Any> execute(request: Request<T>): T {
-        return safely(
+        return handleSafely(
             { e ->
                 throw if (e is ClientRequestException) {
                     val content = e.response ?.readText() ?: throw e

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

@@ -1,12 +1,15 @@
 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.get
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.ktor.http.HttpMethod
 import kotlinx.serialization.json.Json
 
 object DownloadFileRequestCallFactory : KtorCallFactory {
@@ -18,7 +21,7 @@ object DownloadFileRequestCallFactory : KtorCallFactory {
     ): T? = (request as? DownloadFile) ?.let {
         val fullUrl = "${urlsKeeper.fileBaseUrl}/${it.filePath}"
 
-        return safely {
+        return handleSafely {
             @Suppress("UNCHECKED_CAST")
             client.get<ByteArray>(fullUrl) as T // always ByteArray
         }

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

@@ -15,7 +15,6 @@ 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)
         else -> null
     }
 } ?: CommonRequestException(response, plainAnswer, message, cause)
@@ -46,6 +45,3 @@ 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)

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

@@ -1,5 +1,6 @@
 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.*
@@ -11,14 +12,6 @@ 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
@@ -37,6 +30,12 @@ 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/members/PromoteChatMember.kt

@@ -14,8 +14,6 @@ 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,9 +10,7 @@ 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,11 +6,6 @@ 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

@@ -1,28 +0,0 @@
-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,18 +3,14 @@ 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,7 +6,6 @@ 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>>()
@@ -21,12 +20,6 @@ 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 {
@@ -35,10 +28,4 @@ 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,7 +3,6 @@ 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
@@ -14,22 +13,10 @@ 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,5 +1,6 @@
 package dev.inmo.tgbotapi.requests.edit.abstracts
 
-import dev.inmo.tgbotapi.CommonAbstracts.*
+interface EditLocationMessage {
-
+    val latitude: Double
-interface EditLocationMessage : Locationed, HorizontallyAccured, ProximityAlertable, Headed
+    val longitude: Double
+}

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

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

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

@@ -1,10 +1,8 @@
 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
@@ -14,37 +12,8 @@ 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 internal constructor(
+data class EditChatMessageCaption(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
     @SerialName(messageIdField)
@@ -53,14 +22,9 @@ data class EditChatMessageCaption internal constructor(
     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,56 +1,23 @@
 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 internal constructor(
+data class EditInlineMessageCaption(
     @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,10 +1,8 @@
 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
@@ -14,41 +12,8 @@ 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 internal constructor(
+data class EditChatMessageText(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
     @SerialName(messageIdField)
@@ -57,16 +22,11 @@ data class EditChatMessageText internal constructor(
     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,63 +1,26 @@
 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 internal constructor(
+data class EditInlineMessageText(
     @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

@@ -1,23 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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

@@ -1,77 +0,0 @@
-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,8 +26,6 @@ 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>>,
@@ -38,7 +36,6 @@ data class SendContact(
         contact: Contact,
         disableNotification: Boolean = false,
         replyToMessageId: MessageIdentifier? = null,
-        allowSendingWithoutReply: Boolean? = null,
         replyMarkup: KeyboardMarkup? = null
     ): this(
         chatId,
@@ -47,7 +44,6 @@ data class SendContact(
         contact.lastName,
         disableNotification,
         replyToMessageId,
-        allowSendingWithoutReply,
         replyMarkup
     )
 
@@ -62,13 +58,11 @@ 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,8 +24,6 @@ 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,79 +1,19 @@
 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 internal constructor(
+data class SendLocation(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
     @SerialName(latitudeField)
@@ -81,28 +21,16 @@ data class SendLocation internal constructor(
     @SerialName(longitudeField)
     override val longitude: Double,
     @SerialName(livePeriodField)
-    override val livePeriod: Seconds? = null,
+    val livePeriod: Long? = 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>>
@@ -114,8 +42,5 @@ data class SendLocation internal constructor(
         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,10 +1,8 @@
 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
@@ -17,65 +15,20 @@ 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 internal constructor(
+data class SendTextMessage(
     @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>>,
@@ -83,10 +36,6 @@ data class SendTextMessage internal constructor(
     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,19 +25,11 @@ data class SendVenue(
     @SerialName(addressField)
     val address: String,
     @SerialName(foursquareIdField)
-    val foursquareId: FoursquareId? = null,
+    val foursquareId: String? = 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>>,
@@ -50,22 +42,17 @@ data class SendVenue(
         venue: Venue,
         disableNotification: Boolean = false,
         replyToMessageId: MessageIdentifier? = null,
-        allowSendingWithoutReply: Boolean? = null,
         replyMarkup: KeyboardMarkup? = null
     ): this(
-        chatId = chatId,
+        chatId,
-        latitude = venue.location.latitude,
+        venue.location.latitude,
-        longitude = venue.location.longitude,
+        venue.location.longitude,
-        title = venue.title,
+        venue.title,
-        address = venue.address,
+        venue.address,
-        foursquareId = venue.foursquareId,
+        venue.foursquareId,
-        foursquareType = venue.foursquareType,
+        disableNotification,
-        googlePlaceId = venue.googlePlaceId,
+        replyToMessageId,
-        googlePlaceType = venue.googlePlaceType,
+        replyMarkup
-        disableNotification = disableNotification,
-        replyToMessageId = replyToMessageId,
-        allowSendingWithoutReply = allowSendingWithoutReply,
-        replyMarkup = replyMarkup
     )
 
     override fun method(): String = "sendVenue"
@@ -79,13 +66,11 @@ 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,5 +1,6 @@
 package dev.inmo.tgbotapi.requests.send.abstracts
 
-import dev.inmo.tgbotapi.CommonAbstracts.Locationed
+interface PositionedSendMessageRequest<T: Any>: SendMessageRequest<T> {
-
+    val latitude: Double
-interface PositionedSendMessageRequest<T: Any>: SendMessageRequest<T>, Locationed
+    val longitude: Double
+}

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

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

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

@@ -22,8 +22,6 @@ 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,11 +1,9 @@
 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
@@ -27,7 +25,6 @@ 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
@@ -41,57 +38,11 @@ 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
     )
 
@@ -120,8 +71,6 @@ 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)
@@ -132,8 +81,6 @@ 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>>,
@@ -144,10 +91,6 @@ 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,11 +1,10 @@
 package dev.inmo.tgbotapi.requests.send.media
 
-import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.CommonAbstracts.Performerable
 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
@@ -27,7 +26,6 @@ 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
@@ -41,57 +39,11 @@ 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
     )
 
@@ -120,8 +72,6 @@ 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)
@@ -132,8 +82,6 @@ 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>>,
@@ -145,10 +93,6 @@ 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,11 +1,9 @@
 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
@@ -16,15 +14,6 @@ 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,
@@ -33,9 +22,7 @@ fun SendDocument(
     parseMode: ParseMode? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
-    replyMarkup: KeyboardMarkup? = null,
-    disableContentTypeDetection: Boolean? = null
 ): Request<ContentMessage<DocumentContent>> {
     val documentAsFileId = (document as? FileId) ?.fileId
     val documentAsFile = document as? MultipartFile
@@ -48,61 +35,9 @@ fun SendDocument(
         thumbAsFileId,
         caption,
         parseMode,
-        null,
         disableNotification,
         replyToMessageId,
-        allowSendingWithoutReply,
+        replyMarkup
-        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) {
@@ -118,15 +53,6 @@ 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)
@@ -139,28 +65,18 @@ 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,21 +8,17 @@ 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.*
+import dev.inmo.tgbotapi.utils.throwRangeError
+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)
@@ -43,8 +39,7 @@ fun SendMediaGroup(
         chatId,
         media,
         disableNotification,
-        replyToMessageId,
+        replyToMessageId
-        allowSendingWithoutReply
     )
 
     return if (files.isEmpty()) {
@@ -57,49 +52,6 @@ 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())
 
@@ -111,9 +63,7 @@ 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,11 +1,9 @@
 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,7 +20,6 @@ fun SendPhoto(
     parseMode: ParseMode? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<PhotoContent>> {
     val data = SendPhotoData(
@@ -30,38 +27,8 @@ 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 {
@@ -85,14 +52,10 @@ 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>>,
@@ -100,10 +63,6 @@ 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,14 +17,12 @@ 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) {
@@ -46,8 +44,6 @@ 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,11 +1,9 @@
 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
@@ -28,7 +26,6 @@ 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
@@ -42,60 +39,12 @@ 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
     )
 
@@ -124,8 +73,6 @@ 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)
@@ -138,8 +85,6 @@ 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>>,
@@ -150,10 +95,6 @@ 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,22 +4,26 @@ 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
@@ -31,11 +35,12 @@ fun SendVideoNote(
         chatId,
         videoNoteAsFileId,
         thumbAsFileId,
+        caption,
+        parseMode,
         duration,
         size,
         disableNotification,
         replyToMessageId,
-        allowSendingWithoutReply,
         replyMarkup
     )
 
@@ -60,6 +65,10 @@ 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)
@@ -68,13 +77,12 @@ 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>>
@@ -82,6 +90,14 @@ 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,11 +1,9 @@
 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
@@ -24,7 +22,6 @@ 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
@@ -35,47 +32,9 @@ 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
     )
 
@@ -102,16 +61,12 @@ 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>>,
@@ -120,10 +75,6 @@ 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,8 +57,6 @@ 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,17 +1,19 @@
 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.MessageEntity.*
+import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2
 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()
@@ -41,7 +43,6 @@ fun SendPoll(
     isClosed: Boolean = false,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = SendRegularPoll(
     chatId,
@@ -49,7 +50,6 @@ fun SendPoll(
     options,
     isAnonymous,
     isClosed,
-    allowSendingWithoutReply = allowSendingWithoutReply,
     disableNotification = disableNotification,
     replyToMessageId = replyToMessageId,
     replyMarkup = replyMarkup
@@ -63,7 +63,6 @@ fun Poll.createRequest(
     chatId: ChatIdentifier,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = when (this) {
     is RegularPoll -> SendRegularPoll(
@@ -76,7 +75,6 @@ fun Poll.createRequest(
         scheduledCloseInfo,
         disableNotification,
         replyToMessageId,
-        allowSendingWithoutReply,
         replyMarkup
     )
     is QuizPoll -> correctOptionId ?.let { correctOptionId ->
@@ -87,11 +85,11 @@ fun Poll.createRequest(
             correctOptionId,
             isAnonymous,
             isClosed,
-            fullEntitiesList(),
+            explanation ?.fullListOfSubSource(explanationEntities) ?.justTextSources() ?.toMarkdownV2Captions() ?.firstOrNull(),
+            MarkdownV2,
             scheduledCloseInfo,
             disableNotification,
             replyToMessageId,
-            allowSendingWithoutReply,
             replyMarkup
         )
     } ?: SendRegularPoll(
@@ -104,7 +102,6 @@ fun Poll.createRequest(
         scheduledCloseInfo,
         disableNotification,
         replyToMessageId,
-        allowSendingWithoutReply,
         replyMarkup
     )
     is UnknownPollType -> SendRegularPoll(
@@ -117,7 +114,6 @@ fun Poll.createRequest(
         scheduledCloseInfo,
         disableNotification,
         replyToMessageId,
-        allowSendingWithoutReply,
         replyMarkup
     )
 }
@@ -169,8 +165,6 @@ 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() {
@@ -192,69 +186,8 @@ 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 internal constructor(
+data class SendQuizPoll(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
     @SerialName(questionField)
@@ -271,25 +204,18 @@ data class SendQuizPoll internal constructor(
     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,7 +1,8 @@
 package dev.inmo.tgbotapi.requests.webhook
 
 import dev.inmo.tgbotapi.requests.abstracts.*
-import dev.inmo.tgbotapi.requests.send.media.base.*
+import dev.inmo.tgbotapi.requests.send.media.base.DataRequest
+import dev.inmo.tgbotapi.requests.send.media.base.MultipartRequestImpl
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
@@ -12,123 +13,66 @@ private fun correctWebhookUrl(sourceUrl: String) = if (sourceUrl.contains("://")
     "https://$sourceUrl"
 }
 
-sealed class SetWebhookRequest : Request<Boolean>
+fun SetWebhook(
-class MultipartSetWebhookRequest(
     url: String,
     certificate: MultipartFile,
-    ipAddress: String? = null,
     maxAllowedConnections: Int? = null,
-    allowedUpdates: List<String>? = null,
+    allowedUpdates: List<String>? = null
-    dropPendingUpdates: Boolean? = null
+): MultipartRequestImpl<SetWebhook, Map<String, MultipartFile>, Boolean> = MultipartRequestImpl(
-) : SetWebhookRequest(), MultipartRequest<Boolean> by MultipartRequestImpl(
     SetWebhook(
         correctWebhookUrl(url),
-        null as String?,
+        null,
-        ipAddress,
         maxAllowedConnections,
-        allowedUpdates,
+        allowedUpdates
-        dropPendingUpdates
     ),
     mapOf(certificateField to certificate)
 )
 
-fun SetWebhook(
-    url: String,
-    certificate: MultipartFile,
-    ipAddress: String? = null,
-    maxAllowedConnections: Int? = 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,
+    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
-    dropPendingUpdates: Boolean? = null
+): Request<Boolean> = when (certificate) {
-) = when (certificate) {
+    is MultipartFile -> SetWebhook(correctWebhookUrl(url), certificate as MultipartFile, maxAllowedConnections, allowedUpdates)
-    is MultipartFile -> SetWebhook(correctWebhookUrl(url), certificate as MultipartFile, ipAddress, maxAllowedConnections, allowedUpdates, dropPendingUpdates)
+    is FileId -> SetWebhook(correctWebhookUrl(url), certificate as FileId, maxAllowedConnections, allowedUpdates)
-    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
-    @SerialName(dropPendingUpdatesField)
+) : DataRequest<Boolean> {
-    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,8 +3,7 @@ package dev.inmo.tgbotapi.types
 import kotlinx.serialization.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.*
-import kotlinx.serialization.json.longOrNull
 
 @Serializable(ChatIdentifierSerializer::class)
 sealed class ChatIdentifier

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

@@ -1,19 +0,0 @@
-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

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

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

@@ -5,7 +5,6 @@ import dev.inmo.tgbotapi.types.User
 
 data class CreatorChatMember(
     override val user: User,
-    override val isAnonymous: Boolean,
     override val customTitle: String?
 ) : AdministratorChatMember {
     override val canBeEdited: Boolean = true

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

@@ -40,14 +40,12 @@ internal data class RawChatMember(
     private val canSendOtherMessages: Boolean = false,
     @SerialName(canAddWebPagePreviewsField)
     private val canAddWebPagePreviews: Boolean = false,
-    @SerialName(isAnonymousField)
-    private val isAnonymous: Boolean = false,
     @SerialName(customTitleField)
     private val customTitle: String? = null
 ) {
     val asChatMember: ChatMember by lazy {
         when (status) {
-            "creator" -> CreatorChatMember(user, isAnonymous, customTitle)
+            "creator" -> CreatorChatMember(user, customTitle)
             "administrator" -> AdministratorChatMemberImpl(
                 user,
                 canBeEdited,
@@ -59,7 +57,6 @@ internal data class RawChatMember(
                 canRestrictMembers,
                 canPinMessages,
                 canPromoteMembers,
-                isAnonymous,
                 customTitle
             )
             "member" -> MemberChatMember(user)

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

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

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

@@ -2,8 +2,7 @@ package dev.inmo.tgbotapi.types.ChatMember.abstracts
 
 import dev.inmo.tgbotapi.types.ChatMember.RawChatMember
 import dev.inmo.tgbotapi.types.User
-import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.*
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder

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

@@ -24,18 +24,10 @@ typealias FileUniqueId = String
 typealias DiceResult = Int
 typealias FoursquareId = String
 typealias FoursquareType = String
-typealias GooglePlaceId = String
-typealias GooglePlaceType = String
 
 typealias Seconds = Int
 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
@@ -51,7 +43,7 @@ val invoiceDescriptionLimit = 1 until 256
 val invoicePayloadBytesLimit = 1 until 128
 
 val pollOptionTextLength = 1 .. 100
-val pollQuestionTextLength = 1 .. 300
+val pollQuestionTextLength = 1 until 256
 val pollOptionsLimit = 2 .. 10
 
 val livePeriodLimit = 60 .. 86400
@@ -60,12 +52,7 @@ val inlineQueryAnswerResultsLimit = 0 .. 50
 
 val customTitleLength = 0 .. 16
 
-val dartsAndCubeDiceResultLimit = 1 .. 6
+val diceResultLimit = 1 .. 6
-@Deprecated("Renamed", ReplaceWith("dartsAndCubeDiceResultLimit", "dev.inmo.tgbotapi.types.dartsAndCubeDiceResultLimit"))
-val diceResultLimit
-    get() = dartsAndCubeDiceResultLimit
-val basketballAndFootballDiceResultLimit = 1 .. 5
-val slotMachineDiceResultLimit = 1 .. 64
 
 val botCommandLengthLimit = 1 .. 32
 val botCommandLimit = botCommandLengthLimit
@@ -94,12 +81,9 @@ 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"
@@ -108,14 +92,12 @@ 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"
@@ -128,8 +110,6 @@ 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"
@@ -139,7 +119,6 @@ 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"
@@ -150,7 +129,6 @@ 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"
@@ -161,9 +139,6 @@ 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"
@@ -261,13 +236,11 @@ 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,12 +2,11 @@ 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: StaticLocation,
+    val location: Location,
     override val inlineMessageId: InlineMessageIdentifier?,
     override val query: String
 ) : ChosenInlineResult

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

@@ -2,7 +2,6 @@ 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
 
@@ -15,7 +14,7 @@ internal data class RawChosenInlineResult(
     @SerialName(queryField)
     val query: String,
     @SerialName(locationField)
-    val location: StaticLocation? = null,
+    val location: Location? = null,
     @SerialName(inlineMessageIdField)
     val inlineMessageId: InlineMessageIdentifier? = null
 ) {

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

@@ -1,54 +1,30 @@
 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 internal constructor(
+data class InlineQueryResultAudioCachedImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(audioFileIdField)
     override val fileId: FileId,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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,42 +1,17 @@
 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 internal constructor(
+data class InlineQueryResultAudioImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(audioUrlField)
@@ -48,18 +23,13 @@ data class InlineQueryResultAudioImpl internal constructor(
     @SerialName(audioDurationField)
     override val duration: Int? = null,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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,41 +1,18 @@
 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 internal constructor(
+data class InlineQueryResultDocumentCachedImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(documentFileIdField)
@@ -45,18 +22,13 @@ data class InlineQueryResultDocumentCachedImpl internal constructor(
     @SerialName(descriptionField)
     override val description: String? = null,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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,11 +1,9 @@
 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
@@ -14,37 +12,8 @@ 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 internal constructor(
+data class InlineQueryResultDocumentImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(documentUrlField)
@@ -62,18 +31,13 @@ data class InlineQueryResultDocumentImpl internal constructor(
     @SerialName(descriptionField)
     override val description: String? = null,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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,39 +1,18 @@
 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 internal constructor(
+data class InlineQueryResultGifCachedImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(gifFileIdField)
@@ -41,18 +20,13 @@ data class InlineQueryResultGifCachedImpl internal constructor(
     @SerialName(titleField)
     override val title: String? = null,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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,11 +1,9 @@
 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
@@ -13,37 +11,8 @@ 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 internal constructor(
+data class InlineQueryResultGifImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(gifUrlField)
@@ -61,20 +30,15 @@ data class InlineQueryResultGifImpl internal constructor(
     @SerialName(titleField)
     override val title: String? = null,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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,6 +1,7 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 
-import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.CommonAbstracts.Livable
+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
@@ -16,16 +17,10 @@ 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: Seconds? = null,
+    override val livePeriod: Int? = null,
-    @SerialName(headingField)
-    override val heading: Degrees? = null,
-    @SerialName(proximityAlertRadiusField)
-    override val proximityAlertRadius: Meters? = null,
     @SerialName(thumbUrlField)
     override val thumbUrl: String? = null,
     @SerialName(thumbWidthField)
@@ -38,10 +33,7 @@ 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,39 +1,18 @@
 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 internal constructor(
+data class InlineQueryResultMpeg4GifCachedImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(mpeg4GifFileIdField)
@@ -41,18 +20,13 @@ data class InlineQueryResultMpeg4GifCachedImpl internal constructor(
     @SerialName(titleField)
     override val title: String? = null,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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,11 +1,9 @@
 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
@@ -13,37 +11,8 @@ 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 internal constructor(
+data class InlineQueryResultMpeg4GifImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(mpeg4GifUrlField)
@@ -61,20 +30,15 @@ data class InlineQueryResultMpeg4GifImpl internal constructor(
     @SerialName(titleField)
     override val title: String? = null,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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,41 +1,18 @@
 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 internal constructor(
+data class InlineQueryResultPhotoCachedImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(photoFileIdField)
@@ -45,18 +22,13 @@ data class InlineQueryResultPhotoCachedImpl internal constructor(
     @SerialName(descriptionField)
     override val description: String? = null,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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,46 +1,17 @@
 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 internal constructor(
+data class InlineQueryResultPhotoImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(photoUrlField)
@@ -56,18 +27,13 @@ data class InlineQueryResultPhotoImpl internal constructor(
     @SerialName(descriptionField)
     override val description: String? = null,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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,13 +22,9 @@ data class InlineQueryResultVenue(
     @SerialName(addressField)
     override val address: String,
     @SerialName(foursquareIdField)
-    override val foursquareId: FoursquareId? = null,
+    override val foursquareId: String? = null,
     @SerialName(foursquareTypeField)
-    override val foursquareType: FoursquareType? = null,
+    override val foursquareType: String? = 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,41 +1,18 @@
 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 internal constructor(
+data class InlineQueryResultVideoCachedImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(videoFileIdField)
@@ -45,18 +22,13 @@ data class InlineQueryResultVideoCachedImpl internal constructor(
     @SerialName(descriptionField)
     override val description: String? = null,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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()
-    }
 }

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

@@ -1,11 +1,9 @@
 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.video.InlineQueryResultVideo
 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
@@ -14,39 +12,8 @@ import dev.inmo.tgbotapi.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-fun InlineQueryResultVideoImpl(
-    id: InlineQueryIdentifier,
-    url: String,
-    thumbUrl: String,
-    mimeType: MimeType,
-    title: String,
-    width: Int? = null,
-    height: Int? = null,
-    duration: Int? = null,
-    description: String? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultVideoImpl(id, url, thumbUrl, mimeType, title, width, height, duration, description, text, parseMode, null, replyMarkup, inputMessageContent)
-
-fun InlineQueryResultVideoImpl(
-    id: InlineQueryIdentifier,
-    url: String,
-    thumbUrl: String,
-    mimeType: MimeType,
-    title: String,
-    width: Int? = null,
-    height: Int? = null,
-    duration: Int? = null,
-    description: String? = null,
-    entities: List<TextSource>,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultVideoImpl(id, url, thumbUrl, mimeType, title, width, height, duration, description, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
-
 @Serializable
-data class InlineQueryResultVideoImpl internal constructor(
+data class InlineQueryResultVideoImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(videoUrlField)
@@ -66,18 +33,13 @@ data class InlineQueryResultVideoImpl internal constructor(
     @SerialName(descriptionField)
     override val description: String? = null,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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
 ) : InlineQueryResultVideo {
     override val type: String = inlineQueryResultVideoType
-    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/InlineQueryResultVoiceCachedImpl.kt

@@ -1,39 +1,18 @@
 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.voice.InlineQueryResultVoiceCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice.inlineQueryResultVoiceType
 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 InlineQueryResultVoiceCachedImpl(
-    id: InlineQueryIdentifier,
-    fileId: FileId,
-    title: String,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultVoiceCachedImpl(id, fileId, title, text, parseMode, null, replyMarkup, inputMessageContent)
-
-fun InlineQueryResultVoiceCachedImpl(
-    id: InlineQueryIdentifier,
-    fileId: FileId,
-    title: String,
-    entities: List<TextSource>,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultVoiceCachedImpl(id, fileId, title, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
-
 @Serializable
-data class InlineQueryResultVoiceCachedImpl internal constructor(
+data class InlineQueryResultVoiceCachedImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(voiceFileIdField)
@@ -41,18 +20,13 @@ data class InlineQueryResultVoiceCachedImpl internal constructor(
     @SerialName(titleField)
     override val title: String,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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
 ) : InlineQueryResultVoiceCached {
     override val type: String = inlineQueryResultVoiceType
-    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/InlineQueryResultVoiceImpl.kt

@@ -1,50 +1,17 @@
 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.voice.InlineQueryResultVoice
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice.inlineQueryResultVoiceType
 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 InlineQueryResultVoiceImpl(
-    id: InlineQueryIdentifier,
-    url: String,
-    title: String,
-    duration: Int? = null,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultVoiceImpl(
-    id,
-    url,
-    title,
-    duration,
-    text,
-    parseMode,
-    null,
-    replyMarkup,
-    inputMessageContent
-)
-
-fun InlineQueryResultVoiceImpl(
-    id: InlineQueryIdentifier,
-    url: String,
-    title: String,
-    duration: Int? = null,
-    entities: List<TextSource>,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultVoiceImpl(id, url, title, duration, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
-
 @Serializable
-data class InlineQueryResultVoiceImpl internal constructor(
+data class InlineQueryResultVoiceImpl(
     @SerialName(idField)
     override val id: InlineQueryIdentifier,
     @SerialName(voiceUrlField)
@@ -54,18 +21,13 @@ data class InlineQueryResultVoiceImpl internal constructor(
     @SerialName(voiceDurationField)
     override val duration: Int? = null,
     @SerialName(captionField)
-    override val text: String? = null,
+    override val caption: 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
 ) : InlineQueryResultVoice {
     override val type: String = inlineQueryResultVoiceType
-    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/abstracts/results/audio/InlineQueryResultAudioCommon.kt

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio
 
 import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
-import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.WithInputMessageContentInlineQueryResult
 
@@ -9,9 +8,4 @@ const val inlineQueryResultAudioType = "audio"
 
 interface InlineQueryResultAudioCommon : InlineQueryResult,
     CaptionedOutput,
-    TextedOutput,
+    WithInputMessageContentInlineQueryResult
-    WithInputMessageContentInlineQueryResult {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCommon.kt

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document
 
 import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
-import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
 
 const val inlineQueryResultDocumentType = "document"
@@ -10,9 +9,4 @@ interface InlineQueryResultDocumentCommon : InlineQueryResult,
     TitledInlineQueryResult,
     DescribedInlineQueryResult,
     CaptionedOutput,
-    TextedOutput,
+    WithInputMessageContentInlineQueryResult
-    WithInputMessageContentInlineQueryResult {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCommon.kt

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif
 
 import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
-import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
 
 const val inlineQueryResultGifType = "gif"
@@ -9,9 +8,4 @@ const val inlineQueryResultGifType = "gif"
 interface InlineQueryResultGifCommon : InlineQueryResult,
     OptionallyTitledInlineQueryResult,
     CaptionedOutput,
-    TextedOutput,
+    WithInputMessageContentInlineQueryResult
-    WithInputMessageContentInlineQueryResult {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCommon.kt

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif
 
 import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
-import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
 
 const val inlineQueryResultMpeg4GifType = "mpeg4_gif"
@@ -9,9 +8,4 @@ const val inlineQueryResultMpeg4GifType = "mpeg4_gif"
 interface InlineQueryResultMpeg4GifCommon : InlineQueryResult,
     OptionallyTitledInlineQueryResult,
     CaptionedOutput,
-    TextedOutput,
+    WithInputMessageContentInlineQueryResult
-    WithInputMessageContentInlineQueryResult {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCommon.kt

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo
 
 import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
-import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
 
 const val inlineQueryResultPhotoType = "photo"
@@ -10,9 +9,4 @@ interface InlineQueryResultPhotoCommon : InlineQueryResult,
     OptionallyTitledInlineQueryResult,
     DescribedInlineQueryResult,
     CaptionedOutput,
-    TextedOutput,
+    WithInputMessageContentInlineQueryResult
-    WithInputMessageContentInlineQueryResult {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCommon.kt

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video
 
 import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
-import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
 
 const val inlineQueryResultVideoType = "video"
@@ -10,9 +9,4 @@ interface InlineQueryResultVideoCommon : InlineQueryResult,
     TitledInlineQueryResult,
     DescribedInlineQueryResult,
     CaptionedOutput,
-    TextedOutput,
+    WithInputMessageContentInlineQueryResult
-    WithInputMessageContentInlineQueryResult {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCommon.kt

@@ -1,17 +1,11 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice
 
 import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
-import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
 
 const val inlineQueryResultVoiceType = "voice"
 
 interface InlineQueryResultVoiceCommon : InlineQueryResult,
     CaptionedOutput,
-    TextedOutput,
     WithInputMessageContentInlineQueryResult,
-    TitledInlineQueryResult {
+    TitledInlineQueryResult
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputLocationMessageContent.kt

@@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent
 
-import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.CommonAbstracts.Livable
+import dev.inmo.tgbotapi.CommonAbstracts.Locationed
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
 import kotlinx.serialization.SerialName
@@ -12,12 +13,6 @@ data class InputLocationMessageContent(
     override val latitude: Double,
     @SerialName(longitudeField)
     override val longitude: Double,
-    @SerialName(horizontalAccuracyField)
-    override val horizontalAccuracy: Meters? = null,
     @SerialName(livePeriodField)
-    override val livePeriod: Seconds? = null,
+    override val livePeriod: Int? = null
-    @SerialName(headingField)
+) : Locationed, Livable, InputMessageContent
-    override val heading: Degrees? = null,
-    @SerialName(proximityAlertRadiusField)
-    override val proximityAlertRadius: Meters? = null
-) : Locationed, HorizontallyAccured, ProximityAlertable, Livable, Headed, InputMessageContent

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputTextMessageContent.kt

@@ -1,47 +1,21 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent
 
-import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
 import dev.inmo.tgbotapi.CommonAbstracts.types.DisableWebPagePreview
-import dev.inmo.tgbotapi.types.*
 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.disableWebPagePreviewField
+import dev.inmo.tgbotapi.types.messageTextField
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-/**
- * Represents the [InputMessageContent] of a text message to be sent as the result of an inline query.
- */
-fun InputTextMessageContent(
-    text: String,
-    parseMode: ParseMode? = null,
-    disableWebPagePreview: Boolean? = null
-) = InputTextMessageContent(text, parseMode, null, disableWebPagePreview)
-
-/**
- * Represents the [InputMessageContent] of a text message to be sent as the result of an inline query.
- */
-fun InputTextMessageContent(
-    entities: List<TextSource>,
-    disableWebPagePreview: Boolean? = null
-) = InputTextMessageContent(entities.makeString(), null, entities.toRawMessageEntities(), disableWebPagePreview)
-
 @Serializable
-data class InputTextMessageContent internal constructor(
+data class InputTextMessageContent(
     @SerialName(messageTextField)
-    override val text: String,
+    override val caption: String,
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
-    @SerialName(entitiesField)
-    private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(disableWebPagePreviewField)
     override val disableWebPagePreview: Boolean? = null
-) : CaptionedOutput, TextedOutput, DisableWebPagePreview, InputMessageContent {
+) : CaptionedOutput, DisableWebPagePreview, InputMessageContent
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-    override val entities: List<TextSource>? by lazy {
-        rawEntities ?.asTextParts(text) ?.justTextSources()
-    }
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputVenueMessageContent.kt

@@ -18,11 +18,7 @@ data class InputVenueMessageContent(
     @SerialName(addressField)
     override val address: String,
     @SerialName(foursquareIdField)
-    override val foursquareId: FoursquareId? = null,
+    override val foursquareId: String? = null,
     @SerialName(foursquareTypeField)
-    override val foursquareType: FoursquareType? = null,
+    override val foursquareType: String? = null
-    @SerialName(googlePlaceIdField)
-    override val googlePlaceId: GooglePlaceId? = null,
-    @SerialName(googlePlaceTypeField)
-    override val googlePlaceType: GooglePlaceType? = null
 ) : Locationed, CommonVenueData, InputMessageContent

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/LocationInlineQuery.kt

@@ -1,9 +1,7 @@
 package dev.inmo.tgbotapi.types.InlineQueries.query
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery
-import dev.inmo.tgbotapi.types.InlineQueryIdentifier
-import dev.inmo.tgbotapi.types.User
-import dev.inmo.tgbotapi.types.location.Location
 
 data class LocationInlineQuery(
     override val id: InlineQueryIdentifier,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/RawInlineQuery.kt

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.query
 
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.location.Location
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

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

@@ -3,7 +3,6 @@ package dev.inmo.tgbotapi.types.InputMedia
 import dev.inmo.tgbotapi.requests.abstracts.InputFile
 import kotlinx.serialization.Serializable
 
-@Deprecated("Will be removed due to redundancy for end-side users")
 fun String.toInputMediaFileAttachmentName() = "attach://$this"
 
 @Serializable(InputMediaSerializer::class)