Update CHANGELOG.md

4.2.3

.github/workflows/greetings.yml

@@ -5,9 +5,6 @@ on: [pull_request, issues]
 jobs:
   greeting:
     runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
     steps:
     - uses: actions/first-interaction@v1
       with:

.github/workflows/kdocs.yml

@@ -10,12 +10,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 11
       - name: Build
-        run: ./gradlew dokkaHtmlMultiModule
+        run: ./gradlew dokkaHtml
       - name: Publish KDocs
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./build/dokka/htmlMultiModule
+          publish_dir: ./docs/build/dokka/html
           publish_branch: kdocs

.github/workflows/packages_publishing.yml

@@ -7,25 +7,20 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 17
-      - name: Setup LibCurl
-        run: sudo apt update && sudo apt install -y libcurl4-openssl-dev
+          java-version: 11
       - name: Rewrite version
         run: |
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
           cat gradle.properties | sed -e "s/^library_version=\([0-9\.]*\)/library_version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp
           rm gradle.properties
           mv gradle.properties.tmp gradle.properties
-      - name: KotlinSymbolProcessing execution
-        run: ./gradlew ksp
       - name: Build
         run: ./gradlew build
       - name: Publish to Gitea
         continue-on-error: true
-        run: ./gradlew publishAllPublicationsToInmoNexusRepository
+        run: ./gradlew publishAllPublicationsToGiteaRepository
         env:
-          INMONEXUS_USER: ${{ secrets.INMONEXUS_USER }}
-          INMONEXUS_PASSWORD: ${{ secrets.INMONEXUS_PASSWORD }}
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
       - name: Publish to GithubPackages
         continue-on-error: true
         run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel

CHANGELOG.md

@@ -1,336 +1,5 @@
 # TelegramBotAPI changelog
 
-## 10.0.0
-
-**IN THIS UPDATE KLOCK DEPENDENCY CHANGED TO `com.soywiz.korge:korlibs-time` UP TO 5.3.0 VERSION**
-
-**IN THIS UPDATE KRYPTO DEPENDENCY CHANGED TO `com.soywiz.korge:korlibs-crypto` UP TO 5.3.0 VERSION**
-
-## 9.4.3
-
-**IetfLanguageCode has been renamed to IetfLang in MicroUtils**
-
-* `Version`:
-  * `Kotlin`: `1.9.21` -> `1.9.22`
-  * `MicroUtils`: `0.20.19` -> `0.20.23`
-
-## 9.4.2
-
-* `Version`:
-  * `Serialization`: `1.6.1` -> `1.6.2`
-  * `Ktor`: `2.3.6` -> `2.3.7`
-  * `MicroUtils`: `0.20.15` -> `0.20.19`
-  * `UUID`: `0.8.1` -> `0.8.2`
-
-## 9.4.1
-
-* Replace warning about two bots from `LongPolling` to `DefaultKtorRequestsExecutor`
-
-## 9.4.0
-
-* `Version`:
-  * `Kotlin`: `1.9.20` -> `1.9.21`
-  * `Serialization`: `1.6.0` -> `1.6.1`
-  * `Ktor`: `2.3.5` -> `2.3.6`
-  * `MicroUtils`: `0.20.12` -> `0.20.15`
-
-## 9.3.0
-
-This release become possible thanks to [Anton Lakotka](https://youtrack.jetbrains.com/users/anton.lakotka)
-
-**THIS RELEASE CONTAINS UPDATES UP TO RELEASE CANDIDATES VERSIONS**
-
-**UPDATE MAY HAVE BREAKING CHANGES**
-
-**SINCE THIS UPDATE IT WILL BE REQUIRED TO USE JDK 17+ FOR DEVELOPMENT**
-
-* `Version`:
-  * `Kotlin`: `1.8.22` -> `1.9.20`
-  * `Serialization`: `1.5.1` -> `1.6.0`
-  * `KorLibs`: `4.0.3` -> `4.0.10`
-  * `UUID`: `0.7.1` -> `0.8.1`
-  * `Ktor`: `2.3.4` -> `2.3.5`
-  * `MicroUtils`: `0.19.9` -> `0.20.12`
-
-## 9.2.4
-
-* `Utils`:
-  * New extensions `*.parseCommandsWithNamedArgs`
-* `BehaviourBuilder`:
-  * In expectaters and triggers of `commands` add `*WithNamedArgs` variants
-  * In expectaters and triggers of `commands` add opportunity to use custom separator
-
-## 9.2.3
-
-* `Core`:
-  * Fix in `VoiceContent#createResend`
-
-## 9.2.2
-
-* `Core`:
-  * Fix of [#793](https://github.com/InsanusMokrassar/ktgbotapi/issues/793): Add `PreviewChat`
-
-## 9.2.1
-
-* `Version`:
-  * `Ktor`: `2.3.3` -> `2.3.4`
-* `Core`:
-  * All `ChatMember` inheritors have fixes `status` field
-
-## 9.2.0
-
-**Add support of [Telegram Bots API 6.9](https://core.telegram.org/bots/api-changelog#september-22-2023)**
-
-* Rename `ChatAdministratorRightsImpl` -> `ChatCommonAdministratorRights`
-* All the request chat keyboards has changed their parameters `ChatAdministratorRights` to `ChatCommonAdministratorRights`
-
-## 9.1.2
-
-* `Core`:
-  * Fix of `MessageContent` serialization
-
-## 9.1.1
-
-* `Core`:
-  * Potential fix of incorrect parsing in `RawMessageEntity`
-
-## 9.1.0
-
-**This update contains adding of [Telegram Bot API 6.8](https://core.telegram.org/bots/api-changelog#august-18-2023) support**
-
-* `Version`:
-  * `Coroutines`: `1.7.2` -> `1.7.3`
-  * `Ktor`: `2.3.2` -> `2.3.3`
-  * `MicroUtils`: `0.19.7` -> `0.19.9`
-
-## 9.0.0
-
-**THIS UPDATE CONTAINS BREAKING CHANGES: USERNAMES OF BOTS NOW BECAME NULLABLE**
-
-* `Version`:
-  * `Coroutines`: `1.6.4` -> `1.7.1`
-  * `Ktor`: `2.3.1` -> `2.3.2`
-  * `MicroUtils`: `0.19.4` -> `0.19.7`
-* `Core`:
-    * **All bots now have nullable usernames just like common users ([#772](https://github.com/InsanusMokrassar/ktgbotapi/issues/772))**
-    * Decrease possible errors in updates handling by additional handling of update deserialization wrapping ([#773](https://github.com/InsanusMokrassar/ktgbotapi/issues/773))
-    * New interface `GetUpdatesRequest`. You may implement it to show default telegram bot ktor executor that this
-      request is an updates request and should be handled in a different way
-        * Now it is possible to get raw updates with `GetUpdatesRaw` request
-* `Utils`:
-    * Improve extension `Update.sourceChat` to add opportunity to select some chats by logic different with the default
-
-## 8.1.0
-
-**PARTIALLY BREAKING CHANGES: Exclude `.*Impl` classcasts from `ClassCastsNew`**
-
-* `Version`:
-  * `MicroUtils`: `0.19.2` -> `0.19.4`
-* `Utils`:
-    * Add deep links formatting for internal `tg://` prefix (thanks to [@klimatov](https://github.com/klimatov))
-    * Exclude `.*Impl` classcasts from `ClassCastsNew`
-
-## 8.0.1
-
-* `Version`:
-    * `UUID`: `0.7.0` -> `0.7.1`
-    * `Ktor`: `2.3.0` -> `2.3.1`
-    * `MicroUtils`: `0.19.1` -> `0.19.2`
-
-## 8.0.0
-
-**THIS UPDATE CONTAINS BREAKING CHANGES**
-
-**ALL PROJECT DEPRECATIONS HAVE BEEN REMOVED**
-
-**IN THIS UPDATE KORLIBS HAVE BEEN UPDATED TO VERSION `4.0.2`. SINCE THAT VERSION A LOT OF PACKAGES HAVE BEEN RENAMED.
-MIGRATIONS USED IN THIS LIB:**
-
-* `com.soywiz.klock` -> `korlibs.time`
-* `com.soywiz.krypto` -> `korlibs.crypto`
-
-* `Versions`:
-    * `Korlibs`: `3.4.0` -> `4.0.3`
-    * `MicroUtils`: `0.18.4` -> `0.19.1`
-
-## 7.1.3
-
-* `Versions`:
-    * `Serialization`: `1.5.0` -> `1.5.1`
-    * `MicroUtils`: `0.18.1` -> `0.18.4`
-* `Core`:
-    * Actualize kdocs in `InputFile`
-* `BehaviourBuilder`:
-    * Now it is possible to use `waitMediaContent`/`waitMediaContentMessage`/`onMediaContent`
-    * Add `onMention`/`waitMention` functionality
-    * Add opportunity to map content with extensions to `Flow`
-
-## 7.1.2
-
-* `Versions`:
-  * `MicroUtils`: `0.18.0` -> `0.18.1`
-* `Core`:
-    * Now it is possible to serialize `Sticker`s
-
-## 7.1.1
-
-* `Versions`:
-  * `Kotlin`: `1.8.20` -> `1.8.21`
-  * `MicroUtils`: `0.17.8` -> `0.18.0`
-* `Utils`:
-    * Fixes in `makeLinkToMessage`
-
-## 7.1.0
-
-**This update contains changes according to the [Telegram Bot API 6.7](https://core.telegram.org/bots/api-changelog#april-21-2023)**
-
-* `API`:
-    * Rename `editMessageCaption` to `editMessageMedia` due to wrong old naming
-    * Add `edit` extensions for `InlineMessageIdentifier`s
-* `BehaviourBuilder`:
-    * `BehaviourContext` extensions `onDeepLink` and `waitDeepLinks` now can be used with `Regex` or `String` as first parameters
-
-## 7.0.2
-
-_This update brings experimental support of `linuxX64` and `mingwX64` platforms_
-
-* `Versions`:
-    * `Kotlin`: `1.8.10` -> `1.8.20`
-    * `MicroUtils`: `0.17.5` -> `0.17.8`
-    * `Ktor`: `2.2.4` -> `2.3.0`
-* `Core`:
-    * New `RequestsExecutor` - `MultipleClientKtorRequestsExecutor`
-    * Old `KtorRequestsExecutor` has been renamed to `DefaultKtorRequestsExecutor`
-    * `KtorRequestsExecutor` now is `expect class`
-        * On `JS`, `JVM` and `MinGWX64` platforms it is `DefaultKtorRequestsExecutor`
-        * On `LinuxX64` platform it is `MultipleClientKtorRequestsExecutor`
-
-## 7.0.1
-
-* `Core`:
-    * New interface `WithChat` which contains `chat` field
-        * `Message` now inherits `WithChat`
-        * `ChatMemberUpdated` now inherits `WithChat`
-* `Utils`:
-    * Improvements in `same`-notations
-
-## 7.0.0
-
-This update contains support of [Telegram Bot API 6.6](https://core.telegram.org/bots/api-changelog#march-9-2023)
-
-**THIS VERSION CONTAINS BREAKING CHANGES**:
-
-* All previous deprecations have been removed
-* Fully reworked mechanism of stickers creating and adding
-    * All separations of stickers types like `Animeted` have been replaces with type `StickerFormat`
-    * New `InputSticker` type (and all subtypes) as replacements for old raw fields in methods
-* Reworked mechanism of files uploading
-
-Other changes
-
-* `Versions`:
-  * `MicroUtils`: `0.17.3` -> `0.17.5`
-
-## 6.1.0
-
-* `Versions`:
-  * `MicroUtils`: `0.17.2` -> `0.17.3`
-* `API`:
-    * Fix of [#732](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/732)
-
-## 6.0.3
-
-* `Versions`:
-    * `MicroUtils`: `0.17.1` -> `0.17.2`
-* `Core`:
-    * `User` in `CallbackQuery` now is `CommonUser` as well as in `from`
-    * `User` in `InlineQuery` now is `CommonUser` as well as in `from`
-* `BehaviourBuilder`:
-    * Fixes in `DeepLink` triggers and waiters
-
-## 6.0.2
-
-* `Core`:
-    * Long polling now uses media groups debounce as in webhooks
-
-## 6.0.1
-
-* `Versions`:
-    * `Ktor`: `2.2.3` -> `2.2.4`
-    * `MicroUtils`: `0.17.0` -> `0.17.1`
-
-## 6.0.0
-
-* `Versions`:
-    * `Kotlin`: `1.7.22` -> `1.8.10`
-    * `MicroUtils`: `0.16.10` -> `0.17.0`
-    * `Serialization`: `1.4.1` -> `1.5.0`
-    * `uuid`: `0.6.0` -> `0.7.0`
-* `Core`:
-    * `*.link` extensions have been deprecated with renaming to avoid collisions with `link` methods
-* `API`:
-    * Add `TelegramBot.resend` methods
-* `BehaviourBuilder`:
-    * Add triggers and waiters for `VisualMediaGroupPartContent`
-* `Utils`:
-    * `*.link` extensions have been deprecated with renaming to avoid collisions with `link` methods
-
-## 5.2.1
-
-* `Core`:
-    * All the `CallbackQuery`es now will receive `CommonUser` instead of `User` due inability of bots to trigger any
-      inline interaction with others bots
-* `API`:
-    * Now `sentMessageFlow` will take each sent message in `handleLiveLocation`
-
-## 5.2.0
-
-* `Versions`:
-    * `MicroUtils`: `0.16.8` -> `0.16.10`
-
-## 5.1.1
-
-* `Core`:
-    * Add opportunity to get user link with `makeUserLink`
-* `BehaviourBuilder`:
-    * Fixes in content waiting expectators
-
-## 5.1.0
-
-[Bot API 6.5](https://core.telegram.org/bots/api-changelog#february-3-2023) support
-
-* `Core`:
-    * `ChatPermissions` now is interface and have two main realizations: `ChatPermissions.Granular` and
-      `ChatPermissions.Common`
-    * `RestrictedChatMember` now implements `ChatPermissions` too
-* `API`:
-    * Now it is possible to pass all long polling parameters in all places used it
-* `Issues`:
-    * Fix of [#697](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/697)
-
-## 5.0.2
-
-* `Versions`:
-    * `MicroUtils`: `0.16.6` -> `0.16.8`
-    * `Ktor`: `2.2.2` -> `2.2.3`
-* `BehaviourBuilder`:
-    * Fixes in `BehaviourContext.onEditedContentMessage` - now it will trigger callback on channel post edits too
-
-## 5.0.1
-
-* `Versions`:
-    * `MicroUtils`: `0.16.4` -> `0.16.6`
-    * `Ktor`: `2.2.1` -> `2.2.2`
-* `Core`:
-    * Fixes in `SendMediaGroup` request
-    * Fixes in `SetChatAdministratorCustomTitle` request (thanks to [@madhead](https://github.com/madhead))
-
-## 5.0.0
-
-[Bot API 6.4](https://core.telegram.org/bots/api-changelog#december-30-2022) support!
-
-* Long-polling improvements
-
 ## 4.2.4
 
 * `Core`:

README.md

@@ -1,16 +1,14 @@
-# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-6.9-blue)](https://core.telegram.org/bots/api-changelog#september-22-2023)
+# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-6.3-blue)](https://core.telegram.org/bots/api-changelog#november-5-2022)
 
-|          Docs          |                                   [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue&logo=kotlin)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Mk&message=Docs&color=blue&logo=mkdocs)](https://docs.inmo.dev/tgbotapi/index.html)                                    |
-|:----------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
-|      Useful repos      |                           [![Create bot](https://img.shields.io/static/v1?label=Github&message=Template&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![Examples](https://img.shields.io/static/v1?label=Github&message=Examples&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/)                           |
-|          Misc          |                              [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Small survey](https://img.shields.io/static/v1?label=Google&message=Survey&color=blue&logo=google-sheets)](https://docs.google.com/forms/d/e/1FAIpQLSctdJHT_aEniyYT0-IUAEfo1hsIlezX2owlkEAYX4KPl2V2_A/viewform?usp=sf_link)                               |
-|       Platforms        |                                                                                                      ![JVM](https://img.shields.io/badge/JVM-red?style=plastic&logo=openjdk&logoColor=white) ![Js](https://img.shields.io/badge/JavaScript-323330?style=plastic&logo=javascript&logoColor=F7DF1E)                                                                                                       |
-| Experimental Platforms |                                                                                                [![Linux x64](https://img.shields.io/badge/LinuxX64-FCC624?style=plastic&logo=linux&logoColor=black)](https://kotlinlang.org/docs/native-target-support.html#tier-1) [![MinGW x64](https://img.shields.io/badge/MinGWX64-black?style=plastic&logo=windows&logoColor=green)](https://kotlinlang.org/docs/native-target-support.html#tier-1)                                                                                                 |
+| Docs | [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue&logo=kotlin)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Bookstack&message=Tutorial&color=blue&logo=bookstack)](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
+|:---:|:---:|
+| Useful repos | [![Create bot](https://img.shields.io/static/v1?label=Github&message=Template&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![Examples](https://img.shields.io/static/v1?label=Github&message=Examples&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/) |
+| Misc | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Small survey](https://img.shields.io/static/v1?label=Google&message=Survey&color=blue&logo=google-sheets)](https://docs.google.com/forms/d/e/1FAIpQLSctdJHT_aEniyYT0-IUAEfo1hsIlezX2owlkEAYX4KPl2V2_A/viewform?usp=sf_link) |
 
-<!--- [![Telegram Channel](./resources/tg_channel_qr.jpg)](https://t.me/ktgbotapi) --->
+<!--- [![Telegram Channel](./resources/tg_channel_qr.jpg)](https://t.me/InMoTelegramBotAPI) --->
 
 <p align="center">
-  <a href="https://t.me/ktgbotapi">
+  <a href="https://t.me/InMoTelegramBotAPI">
     <img src="./resources/tg_channel_qr.jpg">
   </a>
 </p>

build.gradle

@@ -14,18 +14,13 @@ buildscript {
     }
 }
 
-plugins {
-    alias(libs.plugins.kotlin.dokka)
-    alias(libs.plugins.versions)
-}
-
 // temporal crutch until legacy tests will be stabled or legacy target will be removed
 allprojects {
     repositories {
         mavenLocal()
         mavenCentral()
         google()
-        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
+        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
     }
     if (it != rootProject.findProject("docs")) {
         tasks.whenTaskAdded { task ->

docs/build.gradle

@@ -54,8 +54,8 @@ Object callback = {
             skipDeprecated.set(true)
 
             sourceLink {
-                localDirectory.set(file("../"))
-                remoteUrl.set(new URL("https://github.com/InsanusMokrassar/ktgbotapi/tree/master"))
+                localDirectory.set(file("./"))
+                remoteUrl.set(new URL("https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/"))
                 remoteLineSuffix.set("#L")
             }
         }

gradle.properties

@@ -6,4 +6,4 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 library_group=dev.inmo
-library_version=10.0.0
+library_version=4.2.4

gradle/libs.versions.toml

@@ -1,25 +1,22 @@
 [versions]
 
-kotlin = "1.9.22"
-kotlin-serialization = "1.6.2"
-kotlin-coroutines = "1.7.3"
+kotlin = "1.7.22"
+kotlin-serialization = "1.4.1"
+kotlin-coroutines = "1.6.4"
 
 javax-activation = "1.1.1"
 
-korlibs = "5.3.0"
-uuid = "0.8.2"
-ktor = "2.3.7"
+korlibs = "3.4.0"
+uuid = "0.6.0"
+ktor = "2.2.1"
 
-ksp = "1.9.22-1.0.16"
-kotlin-poet = "1.15.3"
+ksp = "1.7.22-1.0.8"
+kotlin-poet = "1.12.0"
 
-microutils = "0.20.25"
-kslog = "1.3.1"
-
-versions = "0.50.0"
+microutils = "0.16.4"
 
 github-release-plugin = "2.4.1"
-dokka = "1.9.10"
+dokka = "1.7.20"
 
 [libraries]
 
@@ -34,30 +31,24 @@ kotlin-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref =
 
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
-ktor-client-curl = { module = "io.ktor:ktor-client-curl", version.ref = "ktor" }
-ktor-client-winhttp = { module = "io.ktor:ktor-client-winhttp", version.ref = "ktor" }
 ktor-server = { module = "io.ktor:ktor-server", version.ref = "ktor" }
 ktor-server-host-common = { module = "io.ktor:ktor-server-host-common", version.ref = "ktor" }
 
 javax-activation = { module = "javax.activation:activation", version.ref = "javax-activation" }
 
-korlibs-klock =  { module = "com.soywiz.korge:korlibs-time", version.ref = "korlibs" }
-korlibs-krypto =  { module = "com.soywiz.korge:korlibs-crypto", version.ref = "korlibs" }
+korlibs-klock =  { module = "com.soywiz.korlibs.klock:klock", version.ref = "korlibs" }
+korlibs-krypto =  { module = "com.soywiz.korlibs.krypto:krypto", version.ref = "korlibs" }
 
 uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
 
-microutils-colors-common = { module = "dev.inmo:micro_utils.colors.common", version.ref = "microutils" }
 microutils-coroutines = { module = "dev.inmo:micro_utils.coroutines", version.ref = "microutils" }
 microutils-serialization-base64 = { module = "dev.inmo:micro_utils.serialization.base64", version.ref = "microutils" }
 microutils-serialization-encapsulator = { module = "dev.inmo:micro_utils.serialization.encapsulator", version.ref = "microutils" }
 microutils-serialization-typedSerializer = { module = "dev.inmo:micro_utils.serialization.typed_serializer", version.ref = "microutils" }
-microutils-serialization-mapper = { module = "dev.inmo:micro_utils.serialization.mapper", version.ref = "microutils" }
 microutils-languageCodes = { module = "dev.inmo:micro_utils.language_codes", version.ref = "microutils" }
 microutils-ktor-common = { module = "dev.inmo:micro_utils.ktor.common", version.ref = "microutils" }
 microutils-fsm-common = { module = "dev.inmo:micro_utils.fsm.common", version.ref = "microutils" }
 
-kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
-
 # ksp dependencies
 
 kotlin-poet = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlin-poet" }
@@ -76,5 +67,3 @@ github-release-plugin = { module = "com.github.breadmoirai:github-release", vers
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
-versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }

gradle/wrapper/gradle-wrapper.properties

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

mppProjectWithSerialization.gradle

@@ -5,7 +5,7 @@ kotlin {
     jvm {
         compilations.main {
             kotlinOptions {
-                jvmTarget = "17"
+                jvmTarget = "1.8"
             }
         }
     }
@@ -13,9 +13,6 @@ kotlin {
         browser()
         nodejs()
     }
-    linuxX64()
-    mingwX64()
-    linuxArm64()
 
     sourceSets {
         commonMain {
@@ -41,18 +38,10 @@ kotlin {
                 implementation libs.kotlin.test.junit
             }
         }
-        all {
-            languageSettings {
-                optIn('dev.inmo.tgbotapi.utils.RiskFeature')
-                optIn('dev.inmo.tgbotapi.utils.PreviewFeature')
-                optIn('dev.inmo.micro_utils.common.Warning')
-                optIn('dev.inmo.micro_utils.common.PreviewFeature')
-            }
-        }
     }
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }

publish.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
-    archiveClassifier = 'javadoc'
+    classifier = 'javadoc'
 }
 
 publishing {
@@ -50,14 +50,18 @@ publishing {
             
                 }
             }
-            if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
+            if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
                 maven {
-                    name = "InmoNexus"
-                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+                    name = "Gitea"
+                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
             
-                    credentials {
-                        username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
-                        password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
+                    credentials(HttpHeaderCredentials) {
+                        name = "Authorization"
+                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
+                    }
+            
+                    authentication {
+                        header(HttpHeaderAuthentication)
                     }
             
                 }
@@ -92,27 +96,4 @@ if (project.hasProperty("signing.gnupg.keyName")) {
             dependsOn(it)
         }
     }
-
-    // Workaround to make android sign operations depend on signing tasks
-    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
-        def signingTasks = project.getTasks().withType(Sign.class)
-        mustRunAfter(signingTasks)
-    }
-    // Workaround to make test tasks use sign
-    project.getTasks().withType(Sign.class).configureEach { signTask ->
-        def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
-        def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
-        // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
-
-        // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
-        def debugTestTask = tasks.findByName("linkDebugTest$pubName")
-        if (debugTestTask != null) {
-            signTask.mustRunAfter(debugTestTask)
-        }
-        // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
-        def testTask = tasks.findByName("compileTestKotlin$pubName")
-        if (testTask != null) {
-            signTask.mustRunAfter(testTask)
-        }
-    }
 }

publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

settings.gradle

@@ -19,3 +19,4 @@ include ":tgbotapi.behaviour_builder"
 include ":tgbotapi.behaviour_builder.fsm"
 include ":tgbotapi"
 include ":tgbotapi.webapps"
+include ":docs"

tgbotapi.api/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "org.jetbrains.dokka"
 }
 
 project.description = "API extensions with \"Telegram Bot API\"-like extensions for TelegramBot and RequestsExecutor"

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

@@ -5,9 +5,7 @@ import dev.inmo.tgbotapi.requests.DeleteMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-import dev.inmo.tgbotapi.types.message.content.MediaGroupCollectionContent
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 suspend fun TelegramBot.deleteMessage(
     chatId: ChatIdentifier,
@@ -22,17 +20,8 @@ suspend fun TelegramBot.deleteMessage(
 ) = deleteMessage(chat.id, messageId)
 
 suspend fun TelegramBot.deleteMessage(
-    message: AccessibleMessage
-): Boolean {
-    val mediaGroupContent = ((message as? ContentMessage<*>) ?.content as? MediaGroupCollectionContent<*>)
-    if (mediaGroupContent == null) {
-        return deleteMessage(message.chat, message.messageId)
-    } else {
-        return mediaGroupContent.group.map {
-            deleteMessage(it.sourceMessage)
-        }.all { it }
-    }
-}
+    message: Message
+) = deleteMessage(message.chat, message.messageId)
 
 suspend fun TelegramBot.delete(
     chatId: ChatIdentifier,
@@ -45,9 +34,9 @@ suspend fun TelegramBot.delete(
 ) = deleteMessage(chat, messageId)
 
 suspend fun TelegramBot.delete(
-    message: AccessibleMessage
+    message: Message
 ) = deleteMessage(message)
 
-suspend fun AccessibleMessage.delete(
+suspend fun Message.delete(
     requestsExecutor: TelegramBot
 ) = requestsExecutor.deleteMessage(this)

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

@@ -1,65 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.DeleteMessages
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-
-suspend fun TelegramBot.deleteMessages(
-    chatId: ChatIdentifier,
-    messageIds: List<MessageId>
-) = messageIds.chunked(deleteMessagesLimit.last).map {
-    execute(
-        DeleteMessages(
-            chatId = chatId,
-            messageIds = it
-        )
-    )
-}.all { it }
-
-suspend fun TelegramBot.deleteMessages(
-    chatId: ChatIdentifier,
-    messageIds: Array<MessageId>
-) = deleteMessages(
-    chatId = chatId,
-    messageIds = messageIds.toList()
-)
-
-suspend fun TelegramBot.deleteMessages(
-    chatId: ChatIdentifier,
-    firstMessageId: MessageId,
-    vararg messageIds: MessageId
-) = deleteMessages(
-    chatId = chatId,
-    messageIds = (listOf(firstMessageId) + messageIds.toList())
-)
-
-suspend fun TelegramBot.deleteMessages(
-    messages: List<AccessibleMessage>
-) = messages.groupBy { it.chat }.map { (chat, messages) ->
-    deleteMessages(
-        chatId = chat.id,
-        messageIds = messages.map { it.messageId }
-    )
-}.all { it }
-
-suspend fun TelegramBot.delete(
-    chatId: ChatIdentifier,
-    messageIds: List<MessageId>
-) = deleteMessages(chatId = chatId, messageIds = messageIds)
-
-suspend fun TelegramBot.delete(
-    chatId: ChatIdentifier,
-    messageIds: Array<MessageId>
-) = deleteMessages(chatId = chatId, messageIds = messageIds)
-
-suspend fun TelegramBot.delete(
-    chatId: ChatIdentifier,
-    firstMessageId: MessageId,
-    secondMessageId: MessageId,
-    vararg messageIds: MessageId
-) = deleteMessages(chatId = chatId, messageIds = (listOf(firstMessageId, secondMessageId) + messageIds.toList()))
-
-suspend fun TelegramBot.delete(
-    messages: List<AccessibleMessage>
-) = deleteMessages(messages)

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

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.MessageThreadId
 import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.threadId
 
 suspend fun TelegramBot.forwardMessage(
@@ -49,7 +49,7 @@ suspend fun TelegramBot.forwardMessage(
 
 suspend fun TelegramBot.forwardMessage(
     toChatId: ChatIdentifier,
-    message: AccessibleMessage,
+    message: Message,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false
@@ -57,7 +57,7 @@ suspend fun TelegramBot.forwardMessage(
 
 suspend fun TelegramBot.forwardMessage(
     toChat: Chat,
-    message: AccessibleMessage,
+    message: Message,
     threadId: MessageThreadId? = toChat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false

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

@@ -1,156 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.ForwardMessages
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-
-suspend fun TelegramBot.forwardMessages(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: List<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = messageIds.chunked(forwardMessagesLimit.last).flatMap {
-    execute(
-        ForwardMessages(
-            toChatId = toChatId,
-            fromChatId = fromChatId,
-            messageIds = it,
-            threadId = threadId,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            removeCaption = removeCaption
-        )
-    )
-}
-
-suspend fun TelegramBot.forwardMessages(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: Array<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = forwardMessages(
-    toChatId = toChatId,
-    fromChatId = fromChatId,
-    messageIds = messageIds.toList(),
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-suspend fun TelegramBot.forwardMessages(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    firstMessageId: MessageId,
-    vararg messageIds: MessageId,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = forwardMessages(
-    toChatId = toChatId,
-    fromChatId = fromChatId,
-    messageIds = (listOf(firstMessageId) + messageIds.toList()),
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-suspend fun TelegramBot.forwardMessages(
-    toChatId: ChatIdentifier,
-    messages: List<AccessibleMessage>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = messages.groupBy { it.chat }.flatMap { (chat, messages) ->
-    forwardMessages(
-        toChatId = toChatId,
-        fromChatId = chat.id,
-        messageIds = messages.map { it.messageId },
-        threadId = threadId,
-        disableNotification = disableNotification,
-        protectContent = protectContent,
-        removeCaption = removeCaption
-    )
-}
-
-suspend fun TelegramBot.forward(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: List<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = forwardMessages(
-    toChatId = toChatId,
-    fromChatId = fromChatId,
-    messageIds = messageIds,
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-suspend fun TelegramBot.forward(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: Array<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = forwardMessages(
-    toChatId = toChatId,
-    fromChatId = fromChatId,
-    messageIds = messageIds,
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-suspend fun TelegramBot.forward(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    firstMessageId: MessageId,
-    vararg messageIds: MessageId,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = forwardMessages(
-    toChatId = toChatId,
-    fromChatId = fromChatId,
-    firstMessageId = firstMessageId,
-    messageIds = *messageIds,
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-suspend fun TelegramBot.forward(
-    toChatId: ChatIdentifier,
-    messages: List<AccessibleMessage>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = forwardMessages(
-    toChatId = toChatId,
-    messages = messages,
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)

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

@@ -1,27 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.GetUpdates
-import dev.inmo.tgbotapi.requests.GetUpdatesRaw
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-
-suspend fun TelegramBot.getRawUpdates(
-    offset: UpdateIdentifier? = null,
-    limit: Int = getUpdatesLimit.last,
-    timeout: Seconds? = null,
-    allowed_updates: List<String>? = ALL_UPDATES_LIST
-) = execute(
-    GetUpdatesRaw(
-        offset, limit, timeout, allowed_updates
-    )
-)
-
-suspend fun TelegramBot.getRawUpdates(
-    lastUpdate: Update,
-    limit: Int = getUpdatesLimit.last,
-    timeout: Seconds? = null,
-    allowed_updates: List<String>? = ALL_UPDATES_LIST
-) = getRawUpdates(
-    lastUpdate.updateId + 1, limit, timeout, allowed_updates
-)

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

@@ -6,6 +6,7 @@ import dev.inmo.tgbotapi.abstracts.*
 import dev.inmo.tgbotapi.abstracts.types.WithReplyMarkup
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.edit.edit
+import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
 import dev.inmo.tgbotapi.extensions.api.send.send
 import dev.inmo.tgbotapi.extensions.api.send.sendLiveLocation
 import dev.inmo.tgbotapi.types.*
@@ -16,7 +17,6 @@ import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.LocationContent
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.map
 import kotlinx.serialization.Serializable
 import kotlin.js.JsName
@@ -45,8 +45,7 @@ suspend fun TelegramBot.handleLiveLocation(
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    sentMessageFlow: FlowCollector<ContentMessage<LocationContent>>? = null
+    allowSendingWithoutReply: Boolean? = null
 ) {
     var currentLiveLocationMessage: ContentMessage<LocationContent>? = null
     val updateMessageJob = CoroutineScope(currentCoroutineContext().LinkedSupervisorJob()).launchSafelyWithoutExceptions(start = CoroutineStart.LAZY) {
@@ -74,9 +73,7 @@ suspend fun TelegramBot.handleLiveLocation(
                 replyToMessageId,
                 allowSendingWithoutReply,
                 it.replyMarkup
-            ).also {
-                sentMessageFlow ?.emit(it)
-            }
+            )
         } else {
             edit(
                 capturedLiveLocationMessage,
@@ -86,9 +83,7 @@ suspend fun TelegramBot.handleLiveLocation(
                 it.heading,
                 it.proximityAlertRadius,
                 it.replyMarkup
-            ).also {
-                sentMessageFlow ?.emit(it)
-            }
+            )
         }
     }
 }
@@ -107,8 +102,7 @@ suspend fun TelegramBot.handleLiveLocation(
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    sentMessageFlow: FlowCollector<ContentMessage<LocationContent>>? = null
+    allowSendingWithoutReply: Boolean? = null
 ) {
     handleLiveLocation(
         chatId,
@@ -127,8 +121,7 @@ suspend fun TelegramBot.handleLiveLocation(
         disableNotification,
         protectContent,
         replyToMessageId,
-        allowSendingWithoutReply,
-        sentMessageFlow
+        allowSendingWithoutReply
     )
 }
 
@@ -146,8 +139,7 @@ suspend fun TelegramBot.handleLiveLocation(
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    sentMessageFlow: FlowCollector<ContentMessage<LocationContent>>? = null
+    allowSendingWithoutReply: Boolean? = null
 ) {
     handleLiveLocation(
         chatId,
@@ -162,7 +154,6 @@ suspend fun TelegramBot.handleLiveLocation(
         disableNotification,
         protectContent,
         replyToMessageId,
-        allowSendingWithoutReply,
-        sentMessageFlow
+        allowSendingWithoutReply
     )
 }

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

@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.extensions.api
 
-import korlibs.time.DateTime
-import korlibs.time.TimeSpan
+import com.soywiz.klock.DateTime
+import com.soywiz.klock.TimeSpan
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
 import dev.inmo.tgbotapi.extensions.api.edit.location.live.stopLiveLocation
@@ -13,11 +13,10 @@ import dev.inmo.tgbotapi.types.chat.Chat
 import dev.inmo.tgbotapi.types.location.LiveLocation
 import dev.inmo.tgbotapi.types.location.StaticLocation
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.content.LocationContent
 import dev.inmo.tgbotapi.utils.extensions.threadIdOrNull
 import io.ktor.utils.io.core.Closeable
-import korlibs.time.millisecondsLong
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlin.math.ceil
@@ -46,8 +45,7 @@ class LiveLocationProvider internal constructor(
         private set
         get() = field || leftUntilCloseMillis.millisecondsLong < 0L
 
-    var message: ContentMessage<LocationContent> = initMessage
-        private set
+    private var message: ContentMessage<LocationContent> = initMessage
     val lastLocation: LiveLocation
         get() = message.content.location as LiveLocation
 
@@ -238,7 +236,7 @@ suspend fun TelegramBot.startLiveLocation(
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
 suspend inline fun TelegramBot.replyWithLiveLocation(
-    to: AccessibleMessage,
+    to: Message,
     scope: CoroutineScope,
     latitude: Double,
     longitude: Double,
@@ -273,7 +271,7 @@ suspend inline fun TelegramBot.replyWithLiveLocation(
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
 suspend inline fun TelegramBot.replyWithLiveLocation(
-    to: AccessibleMessage,
+    to: Message,
     scope: CoroutineScope,
     location: StaticLocation,
     liveTimeMillis: Long = defaultLivePeriodDelayMillis,

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

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.requests.StopPoll
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -35,7 +35,7 @@ suspend fun TelegramBot.stopPoll(
  */
 suspend fun TelegramBot.stopPoll(
     chatId: IdChatIdentifier,
-    message: AccessibleMessage,
+    message: Message,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = stopPoll(chatId, message.messageId, replyMarkup)
 
@@ -45,6 +45,6 @@ suspend fun TelegramBot.stopPoll(
  */
 suspend fun TelegramBot.stopPoll(
     chat: Chat,
-    message: AccessibleMessage,
+    message: Message,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = stopPoll(chat.id, message.messageId, replyMarkup)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerInlineQuery.kt

@@ -2,7 +2,6 @@ package dev.inmo.tgbotapi.extensions.api.answers
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.answers.AnswerInlineQuery
-import dev.inmo.tgbotapi.requests.answers.InlineQueryResultsButton
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
 import dev.inmo.tgbotapi.types.InlineQueries.query.InlineQuery
 import dev.inmo.tgbotapi.types.InlineQueryIdentifier
@@ -13,37 +12,8 @@ suspend fun TelegramBot.answerInlineQuery(
     cachedTime: Int? = null,
     isPersonal: Boolean? = null,
     nextOffset: String? = null,
-    button: InlineQueryResultsButton? = null
-) = execute(
-    AnswerInlineQuery(inlineQueryID, results, cachedTime, isPersonal, nextOffset, button)
-)
-
-suspend fun TelegramBot.answerInlineQuery(
-    inlineQuery: InlineQuery,
-    results: List<InlineQueryResult> = emptyList(),
-    cachedTime: Int? = null,
-    isPersonal: Boolean? = null,
-    nextOffset: String? = null,
-    button: InlineQueryResultsButton? = null
-) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, button)
-
-suspend fun TelegramBot.answer(
-    inlineQuery: InlineQuery,
-    results: List<InlineQueryResult> = emptyList(),
-    cachedTime: Int? = null,
-    isPersonal: Boolean? = null,
-    nextOffset: String? = null,
-    button: InlineQueryResultsButton? = null
-) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, button)
-
-suspend fun TelegramBot.answerInlineQuery(
-    inlineQueryID: InlineQueryIdentifier,
-    results: List<InlineQueryResult> = emptyList(),
-    cachedTime: Int? = null,
-    isPersonal: Boolean? = null,
-    nextOffset: String? = null,
-    switchPmText: String?,
-    switchPmParameter: String?
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
 ) = execute(
     AnswerInlineQuery(inlineQueryID, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
 )
@@ -54,8 +24,8 @@ suspend fun TelegramBot.answerInlineQuery(
     cachedTime: Int? = null,
     isPersonal: Boolean? = null,
     nextOffset: String? = null,
-    switchPmText: String?,
-    switchPmParameter: String?
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
 ) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
 
 suspend fun TelegramBot.answer(
@@ -64,6 +34,6 @@ suspend fun TelegramBot.answer(
     cachedTime: Int? = null,
     isPersonal: Boolean? = null,
     nextOffset: String? = null,
-    switchPmText: String?,
-    switchPmParameter: String?
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
 ) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/DeleteMyCommands.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.bot
 
-import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLanguageCode
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.DeleteMyCommands
 import dev.inmo.tgbotapi.types.commands.BotCommandScope
@@ -8,10 +8,10 @@ import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
 suspend fun TelegramBot.deleteMyCommands(
     scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLang?
+    languageCode: IetfLanguageCode?
 ) = execute(DeleteMyCommands(scope, languageCode))
 
 suspend fun TelegramBot.deleteMyCommands(
     scope: BotCommandScope = BotCommandScopeDefault,
     languageCode: String? = null
-) = deleteMyCommands(scope, languageCode ?.let(::IetfLang))
+) = deleteMyCommands(scope, languageCode ?.let(::IetfLanguageCode))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.bot
 
-import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLanguageCode
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.GetMyCommands
 import dev.inmo.tgbotapi.types.commands.BotCommandScope
@@ -8,10 +8,10 @@ import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
 suspend fun TelegramBot.getMyCommands(
     scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLang? = null
+    languageCode: IetfLanguageCode? = null
 ) = execute(GetMyCommands(scope, languageCode))
 
 suspend fun TelegramBot.getMyCommands(
     scope: BotCommandScope = BotCommandScopeDefault,
     languageCode: String?
-) = getMyCommands(scope, languageCode ?.let(::IetfLang))
+) = getMyCommands(scope, languageCode ?.let(::IetfLanguageCode))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyDescription.kt

@@ -1,13 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLang
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyDescription
-
-suspend fun TelegramBot.getMyDescription(
-    languageCode: IetfLang? = null
-) = execute(GetMyDescription(languageCode))
-
-suspend fun TelegramBot.getMyDescription(
-    languageCode: String?
-) = getMyDescription(languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyName.kt

@@ -1,13 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLang
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyName
-
-suspend fun TelegramBot.getMyName(
-    languageCode: IetfLang? = null
-) = execute(GetMyName(languageCode))
-
-suspend fun TelegramBot.getMyName(
-    languageCode: String?
-) = getMyName(languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyShortDescription.kt

@@ -1,16 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLang
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
-import dev.inmo.tgbotapi.requests.bot.GetMyShortDescription
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.getMyShortDescription(
-    languageCode: IetfLang? = null
-) = execute(GetMyShortDescription(languageCode))
-
-suspend fun TelegramBot.getMyShortDescription(
-    languageCode: String?
-) = getMyShortDescription(languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.bot
 
-import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLanguageCode
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.SetMyCommands
 import dev.inmo.tgbotapi.types.BotCommand
@@ -10,20 +10,20 @@ import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 suspend fun TelegramBot.setMyCommands(
     commands: List<BotCommand>,
     scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLang?
+    languageCode: IetfLanguageCode?
 ) = execute(SetMyCommands(commands, scope, languageCode))
 
 suspend fun TelegramBot.setMyCommands(
     vararg commands: BotCommand,
     scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLang?
+    languageCode: IetfLanguageCode?
 ) = setMyCommands(commands.toList(), scope, languageCode)
 
 suspend fun TelegramBot.setMyCommands(
     commands: List<BotCommand>,
     scope: BotCommandScope = BotCommandScopeDefault,
     languageCode: String? = null
-) = setMyCommands(commands, scope, languageCode ?.let(::IetfLang))
+) = setMyCommands(commands, scope, languageCode ?.let(::IetfLanguageCode))
 
 suspend fun TelegramBot.setMyCommands(
     vararg commands: BotCommand,

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDefaultAdministratorRights.kt

@@ -2,17 +2,17 @@ package dev.inmo.tgbotapi.extensions.api.bot
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.SetMyDefaultAdministratorRights
-import dev.inmo.tgbotapi.types.chat.member.ChatCommonAdministratorRights
+import dev.inmo.tgbotapi.types.chat.member.ChatAdministratorRightsImpl
 
 suspend fun TelegramBot.setMyDefaultAdministratorRights(
-    rights: ChatCommonAdministratorRights,
+    rights: ChatAdministratorRightsImpl,
     forChannels: Boolean? = null
 ) = execute(SetMyDefaultAdministratorRights(rights, forChannels))
 
 suspend fun TelegramBot.setMyDefaultAdministratorRightsForChannels(
-    rights: ChatCommonAdministratorRights
+    rights: ChatAdministratorRightsImpl
 ) = setMyDefaultAdministratorRights(rights, forChannels = true)
 
 suspend fun TelegramBot.setMyDefaultAdministratorRightsForGroupsAndSupergroups(
-    rights: ChatCommonAdministratorRights
+    rights: ChatAdministratorRightsImpl
 ) = setMyDefaultAdministratorRights(rights, forChannels = false)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDescription.kt

@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLang
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
-import dev.inmo.tgbotapi.requests.bot.GetMyDescription
-import dev.inmo.tgbotapi.requests.bot.SetMyDescription
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.setMyDescription(
-    description: String? = null,
-    languageCode: IetfLang? = null
-) = execute(SetMyDescription(description, languageCode))
-
-suspend fun TelegramBot.setMyDescription(
-    description: String?,
-    languageCode: String?
-) = setMyDescription(description, languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyName.kt

@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLang
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
-import dev.inmo.tgbotapi.requests.bot.GetMyName
-import dev.inmo.tgbotapi.requests.bot.SetMyName
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.setMyName(
-    name: String? = null,
-    languageCode: IetfLang? = null
-) = execute(SetMyName(name, languageCode))
-
-suspend fun TelegramBot.setMyName(
-    name: String?,
-    languageCode: String?
-) = setMyName(name, languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyShortDescription.kt

@@ -1,15 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLang
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.SetMyShortDescription
-
-suspend fun TelegramBot.setMyShortDescription(
-    shortDescription: String? = null,
-    languageCode: IetfLang? = null
-) = execute(SetMyShortDescription(shortDescription, languageCode))
-
-suspend fun TelegramBot.setMyShortDescription(
-    shortDescription: String?,
-    languageCode: String?
-) = setMyShortDescription(shortDescription, languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CloseGeneralForumTopic.kt

@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.CloseForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.CloseGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.closeGeneralForumTopic(
-    chatId: ChatIdentifier
-) = execute(
-    CloseGeneralForumTopic(chatId)
-)
-
-suspend fun TelegramBot.closeGeneralForumTopic(
-    chat: Chat
-) = closeGeneralForumTopic(chat.id)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/EditForumTopic.kt

@@ -11,8 +11,8 @@ import dev.inmo.tgbotapi.types.chat.Chat
 suspend fun TelegramBot.editForumTopic(
     chatId: ChatIdentifier,
     messageThreadId: MessageThreadId,
-    name: String? = null,
-    iconEmojiId: CustomEmojiId? = null
+    name: String,
+    iconEmojiId: CustomEmojiId
 ) = execute(
     EditForumTopic(
         chatId,
@@ -25,12 +25,12 @@ suspend fun TelegramBot.editForumTopic(
 suspend fun TelegramBot.editForumTopic(
     chat: Chat,
     messageThreadId: MessageThreadId,
-    name: String? = null,
-    iconEmojiId: CustomEmojiId? = null
+    name: String,
+    iconEmojiId: CustomEmojiId
 ) = editForumTopic(chat.id, messageThreadId, name, iconEmojiId)
 
 suspend fun TelegramBot.editForumTopic(
     chatIdentifier: ChatIdentifier,
     forumTopic: ForumTopic,
-    iconEmojiId: CustomEmojiId? = forumTopic.iconEmojiId
+    iconEmojiId: CustomEmojiId = forumTopic.iconEmojiId ?: error("Icon emoji id in forum topic should be presented when edit forum topic basing on other forum topic object")
 ) = editForumTopic(chatIdentifier, forumTopic.messageThreadId, forumTopic.name, iconEmojiId)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/EditGeneralForumTopic.kt

@@ -1,30 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.EditForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.EditGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.CustomEmojiId
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.editGeneralForumTopic(
-    chatId: ChatIdentifier,
-    name: String
-) = execute(
-    EditGeneralForumTopic(
-        chatId,
-        name
-    )
-)
-
-suspend fun TelegramBot.editGeneralForumTopic(
-    chat: Chat,
-    name: String
-) = editGeneralForumTopic(chat.id, name)
-
-suspend fun TelegramBot.editGeneralForumTopic(
-    chatIdentifier: ChatIdentifier,
-    forumTopic: ForumTopic,
-) = editGeneralForumTopic(chatIdentifier, forumTopic.name)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/HideGeneralForumTopic.kt

@@ -1,20 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.CloseForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.CloseGeneralForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.HideGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.hideGeneralForumTopic(
-    chatId: ChatIdentifier
-) = execute(
-    HideGeneralForumTopic(chatId)
-)
-
-suspend fun TelegramBot.hideGeneralForumTopic(
-    chat: Chat
-) = hideGeneralForumTopic(chat.id)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/ReopenGeneralForumTopic.kt

@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.ReopenForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.ReopenGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.reopenGeneralForumTopic(
-    chatId: ChatIdentifier
-) = execute(
-    ReopenGeneralForumTopic(chatId)
-)
-
-suspend fun TelegramBot.reopenGeneralForumTopic(
-    chat: Chat
-) = reopenGeneralForumTopic(chat.id)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/UnhideGeneralForumTopic.kt

@@ -1,21 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.CloseForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.CloseGeneralForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.HideGeneralForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.UnhideGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.unhideGeneralForumTopic(
-    chatId: ChatIdentifier
-) = execute(
-    UnhideGeneralForumTopic(chatId)
-)
-
-suspend fun TelegramBot.unhideGeneralForumTopic(
-    chat: Chat
-) = unhideGeneralForumTopic(chat.id)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/UnpinAllGeneralForumTopicMessages.kt

@@ -1,21 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.UnpinAllForumTopicMessages
-import dev.inmo.tgbotapi.requests.chat.forum.UnpinAllGeneralForumTopicMessages
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.unpinAllGeneralForumTopicMessages(
-    chatId: ChatIdentifier
-) = execute(
-    UnpinAllGeneralForumTopicMessages(
-        chatId
-    )
-)
-
-suspend fun TelegramBot.unpinAllGeneralForumTopicMessages(
-    chat: Chat
-) = unpinAllGeneralForumTopicMessages(chat.id)

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

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.chat.invite_links
 
-import korlibs.time.DateTime
+import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.invite_links.CreateChatInviteLink
 import dev.inmo.tgbotapi.types.ChatIdentifier

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

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.chat.invite_links
 
-import korlibs.time.DateTime
+import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.invite_links.EditChatInviteLink
 import dev.inmo.tgbotapi.types.ChatIdentifier

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

@@ -1,157 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.members
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.members.PromoteChannelAdministrator
-import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
-
-suspend fun TelegramBot.promoteChannelAdministrator(
-    chatId: ChatIdentifier,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canPostMessages: Boolean? = null,
-    canEditMessages: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
-) = execute(
-    PromoteChannelAdministrator(
-        chatId = chatId,
-        userId = userId,
-        untilDate = untilDate,
-        isAnonymous = isAnonymous,
-        canChangeInfo = canChangeInfo,
-        canPostMessages = canPostMessages,
-        canEditMessages = canEditMessages,
-        canDeleteMessages = canDeleteMessages,
-        canInviteUsers = canInviteUsers,
-        canRestrictMembers = canRestrictMembers,
-        canPromoteMembers = canPromoteMembers,
-        canManageVideoChats = canManageVideoChats,
-        canManageChat = canManageChat,
-        canPostStories = canPostStories,
-        canEditStories = canEditStories,
-        canDeleteStories = canDeleteStories
-    )
-)
-
-suspend fun TelegramBot.promoteChannelAdministrator(
-    chat: PublicChat,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canPostMessages: Boolean? = null,
-    canEditMessages: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
-) = promoteChannelAdministrator(
-    chat.id,
-    userId,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canPostMessages = canPostMessages,
-    canEditMessages = canEditMessages,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canPostStories = canPostStories,
-    canEditStories = canEditStories,
-    canDeleteStories = canDeleteStories
-)
-
-suspend fun TelegramBot.promoteChannelAdministrator(
-    chatId: IdChatIdentifier,
-    user: User,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canPostMessages: Boolean? = null,
-    canEditMessages: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
-) = promoteChannelAdministrator(
-    chatId,
-    user.id,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canPostMessages = canPostMessages,
-    canEditMessages = canEditMessages,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canPostStories = canPostStories,
-    canEditStories = canEditStories,
-    canDeleteStories = canDeleteStories
-)
-
-suspend fun TelegramBot.promoteChannelAdministrator(
-    chat: PublicChat,
-    user: User,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canPostMessages: Boolean? = null,
-    canEditMessages: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
-) = promoteChannelAdministrator(
-    chat.id,
-    user.id,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canPostMessages = canPostMessages,
-    canEditMessages = canEditMessages,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canPostStories = canPostStories,
-    canEditStories = canEditStories,
-    canDeleteStories = canDeleteStories
-)

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

@@ -1,116 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.members
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
-
-suspend fun TelegramBot.promoteChatAdministrator(
-    chatId: ChatIdentifier,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-) = execute(
-    PromoteChatMember(
-        chatId,
-        userId,
-        untilDate,
-        isAnonymous,
-        canChangeInfo,
-        canDeleteMessages,
-        canInviteUsers,
-        canRestrictMembers,
-        canPromoteMembers,
-        canManageVideoChats,
-        canManageChat
-    )
-)
-
-suspend fun TelegramBot.promoteChatAdministrator(
-    chat: PublicChat,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-) = promoteChatAdministrator(
-    chat.id,
-    userId,
-    untilDate,
-    isAnonymous,
-    canChangeInfo,
-    canDeleteMessages,
-    canInviteUsers,
-    canRestrictMembers,
-    canPromoteMembers,
-    canManageVideoChats,
-    canManageChat
-)
-
-suspend fun TelegramBot.promoteChatAdministrator(
-    chatId: IdChatIdentifier,
-    user: User,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-) = promoteChatAdministrator(
-    chatId,
-    user.id,
-    untilDate,
-    isAnonymous,
-    canChangeInfo,
-    canDeleteMessages,
-    canInviteUsers,
-    canRestrictMembers,
-    canPromoteMembers,
-    canManageVideoChats,
-    canManageChat
-)
-
-suspend fun TelegramBot.promoteChatAdministrator(
-    chat: PublicChat,
-    user: User,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-) = promoteChatAdministrator(
-    chat.id,
-    user.id,
-    untilDate,
-    isAnonymous,
-    canChangeInfo,
-    canDeleteMessages,
-    canInviteUsers,
-    canRestrictMembers,
-    canPromoteMembers,
-    canManageVideoChats,
-    canManageChat
-)

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

@@ -1,13 +1,14 @@
 package dev.inmo.tgbotapi.extensions.api.chat.members
 
-import dev.inmo.micro_utils.common.Warning
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember
-import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.IdChatIdentifier
+import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.TelegramDate
+import dev.inmo.tgbotapi.types.UserId
 import dev.inmo.tgbotapi.types.chat.PublicChat
 import dev.inmo.tgbotapi.types.chat.User
 
-@Warning("This method is too common. Use it with caution")
 suspend fun TelegramBot.promoteChatMember(
     chatId: ChatIdentifier,
     userId: UserId,
@@ -23,34 +24,27 @@ suspend fun TelegramBot.promoteChatMember(
     canPromoteMembers: Boolean? = null,
     canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
+    canManageTopics: Boolean? = null
 ) = execute(
     PromoteChatMember(
-        chatId = chatId,
-        userId = userId,
-        untilDate = untilDate,
-        isAnonymous = isAnonymous,
-        canChangeInfo = canChangeInfo,
-        canPostMessages = canPostMessages,
-        canEditMessages = canEditMessages,
-        canDeleteMessages = canDeleteMessages,
-        canInviteUsers = canInviteUsers,
-        canRestrictMembers = canRestrictMembers,
-        canPinMessages = canPinMessages,
-        canPromoteMembers = canPromoteMembers,
-        canManageVideoChats = canManageVideoChats,
-        canManageChat = canManageChat,
-        canManageTopics = canManageTopics,
-        canPostStories = canPostStories,
-        canEditStories = canEditStories,
-        canDeleteStories = canDeleteStories
+        chatId,
+        userId,
+        untilDate,
+        isAnonymous,
+        canChangeInfo,
+        canPostMessages,
+        canEditMessages,
+        canDeleteMessages,
+        canInviteUsers,
+        canRestrictMembers,
+        canPinMessages,
+        canPromoteMembers,
+        canManageVideoChats,
+        canManageChat,
+        canManageTopics
     )
 )
 
-@Warning("This method is too common. Use it with caution")
 suspend fun TelegramBot.promoteChatMember(
     chat: PublicChat,
     userId: UserId,
@@ -66,32 +60,25 @@ suspend fun TelegramBot.promoteChatMember(
     canPromoteMembers: Boolean? = null,
     canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
+    canManageTopics: Boolean? = null
 ) = promoteChatMember(
     chat.id,
     userId,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canPostMessages = canPostMessages,
-    canEditMessages = canEditMessages,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPinMessages = canPinMessages,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canManageTopics = canManageTopics,
-    canPostStories = canPostStories,
-    canEditStories = canEditStories,
-    canDeleteStories = canDeleteStories
+    untilDate,
+    isAnonymous,
+    canChangeInfo,
+    canPostMessages,
+    canEditMessages,
+    canDeleteMessages,
+    canInviteUsers,
+    canRestrictMembers,
+    canPinMessages,
+    canPromoteMembers,
+    canManageVideoChats,
+    canManageChat,
+    canManageTopics
 )
 
-@Warning("This method is too common. Use it with caution")
 suspend fun TelegramBot.promoteChatMember(
     chatId: IdChatIdentifier,
     user: User,
@@ -107,32 +94,25 @@ suspend fun TelegramBot.promoteChatMember(
     canPromoteMembers: Boolean? = null,
     canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
+    canManageTopics: Boolean? = null
 ) = promoteChatMember(
     chatId,
     user.id,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canPostMessages = canPostMessages,
-    canEditMessages = canEditMessages,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPinMessages = canPinMessages,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canManageTopics = canManageTopics,
-    canPostStories = canPostStories,
-    canEditStories = canEditStories,
-    canDeleteStories = canDeleteStories
+    untilDate,
+    isAnonymous,
+    canChangeInfo,
+    canPostMessages,
+    canEditMessages,
+    canDeleteMessages,
+    canInviteUsers,
+    canRestrictMembers,
+    canPinMessages,
+    canPromoteMembers,
+    canManageVideoChats,
+    canManageChat,
+    canManageTopics
 )
 
-@Warning("This method is too common. Use it with caution")
 suspend fun TelegramBot.promoteChatMember(
     chat: PublicChat,
     user: User,
@@ -148,27 +128,21 @@ suspend fun TelegramBot.promoteChatMember(
     canPromoteMembers: Boolean? = null,
     canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
+    canManageTopics: Boolean? = null
 ) = promoteChatMember(
     chat.id,
     user.id,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canPostMessages = canPostMessages,
-    canEditMessages = canEditMessages,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPinMessages = canPinMessages,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canManageTopics = canManageTopics,
-    canPostStories = canPostStories,
-    canEditStories = canEditStories,
-    canDeleteStories = canDeleteStories
+    untilDate,
+    isAnonymous,
+    canChangeInfo,
+    canPostMessages,
+    canEditMessages,
+    canDeleteMessages,
+    canInviteUsers,
+    canRestrictMembers,
+    canPinMessages,
+    canPromoteMembers,
+    canManageVideoChats,
+    canManageChat,
+    canManageTopics
 )

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

@@ -1,133 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.members
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember
-import dev.inmo.tgbotapi.requests.chat.members.PromoteSupergroupAdministrator
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
-
-suspend fun TelegramBot.promoteSupergroupAdministrator(
-    chatId: ChatIdentifier,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPinMessages: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-) = execute(
-    PromoteSupergroupAdministrator(
-        chatId = chatId,
-        userId = userId,
-        untilDate = untilDate,
-        isAnonymous = isAnonymous,
-        canChangeInfo = canChangeInfo,
-        canDeleteMessages = canDeleteMessages,
-        canInviteUsers = canInviteUsers,
-        canRestrictMembers = canRestrictMembers,
-        canPinMessages = canPinMessages,
-        canPromoteMembers = canPromoteMembers,
-        canManageVideoChats = canManageVideoChats,
-        canManageChat = canManageChat,
-        canManageTopics = canManageTopics
-    )
-)
-
-suspend fun TelegramBot.promoteSupergroupAdministrator(
-    chat: PublicChat,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPinMessages: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-) = promoteSupergroupAdministrator(
-    chat.id,
-    userId,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPinMessages = canPinMessages,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canManageTopics = canManageTopics
-)
-
-suspend fun TelegramBot.promoteSupergroupAdministrator(
-    chatId: IdChatIdentifier,
-    user: User,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPinMessages: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-) = promoteSupergroupAdministrator(
-    chatId,
-    user.id,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPinMessages = canPinMessages,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canManageTopics = canManageTopics
-)
-
-suspend fun TelegramBot.promoteSupergroupAdministrator(
-    chat: PublicChat,
-    user: User,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPinMessages: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-) = promoteSupergroupAdministrator(
-    chat.id,
-    user.id,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPinMessages = canPinMessages,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canManageTopics = canManageTopics
-)

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

@@ -14,31 +14,27 @@ suspend fun TelegramBot.restrictChatMember(
     chatId: ChatIdentifier,
     userId: UserId,
     untilDate: TelegramDate? = null,
-    permissions: ChatPermissions = ChatPermissions(),
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = execute(RestrictChatMember(chatId, userId, untilDate, permissions, useIndependentChatPermissions))
+    permissions: ChatPermissions = ChatPermissions()
+) = execute(RestrictChatMember(chatId, userId, untilDate, permissions))
 
 suspend fun TelegramBot.restrictChatMember(
     chat: PublicChat,
     userId: UserId,
     untilDate: TelegramDate? = null,
-    permissions: ChatPermissions = ChatPermissions(),
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = restrictChatMember(chat.id, userId, untilDate, permissions, useIndependentChatPermissions)
+    permissions: ChatPermissions = ChatPermissions()
+) = restrictChatMember(chat.id, userId, untilDate, permissions)
 
 suspend fun TelegramBot.restrictChatMember(
     chatId: IdChatIdentifier,
     user: User,
     untilDate: TelegramDate? = null,
-    permissions: ChatPermissions = ChatPermissions(),
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = restrictChatMember(chatId, user.id, untilDate, permissions, useIndependentChatPermissions)
+    permissions: ChatPermissions = ChatPermissions()
+) = restrictChatMember(chatId, user.id, untilDate, permissions)
 
 suspend fun TelegramBot.restrictChatMember(
     chat: PublicChat,
     user: User,
     untilDate: TelegramDate? = null,
-    permissions: ChatPermissions = ChatPermissions(),
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = restrictChatMember(chat.id, user.id, untilDate, permissions, useIndependentChatPermissions)
+    permissions: ChatPermissions = ChatPermissions()
+) = restrictChatMember(chat.id, user.id, untilDate, permissions)
 

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

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.requests.chat.modify.PinChatMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 suspend fun TelegramBot.pinChatMessage(
     chatId: ChatIdentifier,
@@ -20,6 +20,6 @@ suspend fun TelegramBot.pinChatMessage(
 ) = pinChatMessage(chat.id, messageId, disableNotification)
 
 suspend fun TelegramBot.pinChatMessage(
-    message: AccessibleMessage,
+    message: Message,
     disableNotification: Boolean = false
 ) = pinChatMessage(message.chat.id, message.messageId, disableNotification)

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

@@ -8,12 +8,10 @@ import dev.inmo.tgbotapi.types.chat.PublicChat
 
 suspend fun TelegramBot.setDefaultChatMembersPermissions(
     chatId: ChatIdentifier,
-    permissions: ChatPermissions,
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = execute(SetChatPermissions(chatId, permissions, useIndependentChatPermissions))
+    permissions: ChatPermissions
+) = execute(SetChatPermissions(chatId, permissions))
 
 suspend fun TelegramBot.setDefaultChatMembersPermissions(
     chat: PublicChat,
-    permissions: ChatPermissions,
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = setDefaultChatMembersPermissions(chat.id, permissions, useIndependentChatPermissions)
+    permissions: ChatPermissions
+) = setDefaultChatMembersPermissions(chat.id, permissions)

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

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.requests.chat.modify.UnpinChatMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 suspend fun TelegramBot.unpinChatMessage(
     chatId: ChatIdentifier,
@@ -18,5 +18,5 @@ suspend fun TelegramBot.unpinChatMessage(
 ) = unpinChatMessage(chat.id, messageId)
 
 suspend fun TelegramBot.unpinChatMessage(
-    message: AccessibleMessage
+    message: Message
 ) = unpinChatMessage(message.chat.id, message.messageId)

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

@@ -14,7 +14,7 @@ import dev.inmo.tgbotapi.types.location.LiveLocation
 import dev.inmo.tgbotapi.types.media.TelegramMedia
 import dev.inmo.tgbotapi.types.message.ParseMode
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.message.textsources.TextSource
 import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
@@ -181,7 +181,7 @@ suspend fun TelegramBot.edit(
  * as a builder for that
  */
 suspend fun TelegramBot.edit(
-    message: AccessibleMessage,
+    message: Message,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageReplyMarkup(message, replyMarkup)
 
@@ -194,9 +194,9 @@ suspend fun TelegramBot.edit(
     messageId: MessageId,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(chatId, messageId, text, parseMode, linkPreviewOptions, replyMarkup)
+) = editMessageText(chatId, messageId, text, parseMode, disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -206,9 +206,9 @@ suspend fun TelegramBot.edit(
     chatId: ChatIdentifier,
     messageId: MessageId,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(chatId, messageId, entities, linkPreviewOptions, replyMarkup)
+) = editMessageText(chatId, messageId, entities, disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -218,10 +218,10 @@ suspend fun TelegramBot.edit(
     chatId: ChatIdentifier,
     messageId: MessageId,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = edit(chatId, messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = edit(chatId, messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -231,10 +231,10 @@ suspend fun TelegramBot.edit(
     chatId: ChatIdentifier,
     messageId: MessageId,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = edit(chatId, messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = edit(chatId, messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -244,9 +244,9 @@ suspend fun TelegramBot.edit(
     message: ContentMessage<TextContent>,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = edit(message.chat.id, message.messageId, text, parseMode, linkPreviewOptions, replyMarkup)
+) = edit(message.chat.id, message.messageId, text, parseMode, disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -255,9 +255,9 @@ suspend fun TelegramBot.edit(
 suspend fun TelegramBot.edit(
     message: ContentMessage<TextContent>,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = edit(message.chat.id, message.messageId, entities, linkPreviewOptions, replyMarkup)
+) = edit(message.chat.id, message.messageId, entities, disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -266,10 +266,10 @@ suspend fun TelegramBot.edit(
 suspend fun TelegramBot.edit(
     message: ContentMessage<TextContent>,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = edit(message, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = edit(message, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -278,10 +278,10 @@ suspend fun TelegramBot.edit(
 suspend fun TelegramBot.edit(
     message: ContentMessage<TextContent>,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = edit(message, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = edit(message, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -290,10 +290,10 @@ suspend fun TelegramBot.edit(
 suspend fun TelegramBot.editMessageText(
     message: ContentMessage<TextContent>,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = edit(message, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = edit(message, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -302,7 +302,7 @@ suspend fun TelegramBot.editMessageText(
 suspend fun TelegramBot.editMessageText(
     message: ContentMessage<TextContent>,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = edit(message, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = edit(message, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)

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

@@ -1,114 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit
-
-import dev.inmo.tgbotapi.abstracts.TextedWithTextSources
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.caption.editMessageCaption
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
-import dev.inmo.tgbotapi.extensions.api.edit.media.editMessageMedia
-import dev.inmo.tgbotapi.extensions.api.edit.reply_markup.editMessageReplyMarkup
-import dev.inmo.tgbotapi.extensions.api.edit.text.editMessageText
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.location.LiveLocation
-import dev.inmo.tgbotapi.types.media.TelegramMedia
-import dev.inmo.tgbotapi.types.message.ParseMode
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.message.content.*
-import dev.inmo.tgbotapi.types.message.textsources.TextSource
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.utils.EntitiesBuilderBody
-import dev.inmo.tgbotapi.utils.buildEntities
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(
-    messageId, location, replyMarkup
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
-    media: TelegramMedia,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageMedia(messageId, media, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(messageId, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
-    text: String,
-    parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(messageId, text, parseMode, linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
-    entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(messageId, entities, linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
-    separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
-    separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)

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

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.types.message.ParseMode
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.content.MediaContent
 import dev.inmo.tgbotapi.utils.RiskFeature
 
@@ -98,7 +98,7 @@ suspend fun <T> TelegramBot.editMessageCaption(
  */
 @RiskFeature("This method is unsafe due to absence of any guaranties about the type of message. In case if message is not media message this method will throw an exception")
 suspend fun <T> TelegramBot.editMessageCaption(
-    message: AccessibleMessage,
+    message: Message,
     entities: List<TextSource>,
     replyMarkup: InlineKeyboardMarkup? = null
 ): ContentMessage<MediaContent> where T : TextedWithTextSources, T : MediaContent {

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

@@ -10,7 +10,7 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-suspend fun TelegramBot.editMessageMedia(
+suspend fun TelegramBot.editMessageCaption(
     inlineMessageId: InlineMessageIdentifier,
     media: TelegramMedia,
     replyMarkup: InlineKeyboardMarkup? = null

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

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -35,7 +35,7 @@ suspend fun TelegramBot.editMessageReplyMarkup(
  * as a builder for that
  */
 suspend fun TelegramBot.editMessageReplyMarkup(
-    message: AccessibleMessage,
+    message: Message,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageReplyMarkup(message.chat.id, message.messageId, replyMarkup)
 

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

@@ -3,14 +3,13 @@ package dev.inmo.tgbotapi.extensions.api.edit.text
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.edit.text.EditChatMessageText
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.LinkPreviewOptions
 import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.message.ParseMode
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.content.TextContent
 import dev.inmo.tgbotapi.types.message.textsources.TextSource
 import dev.inmo.tgbotapi.utils.*
@@ -24,10 +23,10 @@ suspend fun TelegramBot.editMessageText(
     messageId: MessageId,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(
-    EditChatMessageText(chatId, messageId, text, parseMode, linkPreviewOptions, replyMarkup)
+    EditChatMessageText(chatId, messageId, text, parseMode, disableWebPagePreview, replyMarkup)
 )
 
 /**
@@ -39,9 +38,9 @@ suspend fun TelegramBot.editMessageText(
     messageId: MessageId,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(chat.id, messageId, text, parseMode, linkPreviewOptions, replyMarkup)
+) = editMessageText(chat.id, messageId, text, parseMode, disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -51,9 +50,9 @@ suspend fun TelegramBot.editMessageText(
     message: ContentMessage<TextContent>,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(message.chat.id, message.messageId, text, parseMode, linkPreviewOptions, replyMarkup)
+) = editMessageText(message.chat.id, message.messageId, text, parseMode, disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -63,10 +62,10 @@ suspend fun TelegramBot.editMessageText(
     chatId: ChatIdentifier,
     messageId: MessageId,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(
-    EditChatMessageText(chatId, messageId, entities, linkPreviewOptions, replyMarkup)
+    EditChatMessageText(chatId, messageId, entities, disableWebPagePreview, replyMarkup)
 )
 
 /**
@@ -77,10 +76,10 @@ suspend fun TelegramBot.editMessageText(
     chatId: ChatIdentifier,
     messageId: MessageId,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = editMessageText(chatId, messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = editMessageText(chatId, messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -90,10 +89,10 @@ suspend fun TelegramBot.editMessageText(
     chatId: ChatIdentifier,
     messageId: MessageId,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = editMessageText(chatId, messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = editMessageText(chatId, messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -103,9 +102,9 @@ suspend fun TelegramBot.editMessageText(
     chat: Chat,
     messageId: MessageId,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(chat.id, messageId, entities, linkPreviewOptions, replyMarkup)
+) = editMessageText(chat.id, messageId, entities, disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -115,10 +114,10 @@ suspend fun TelegramBot.editMessageText(
     chat: Chat,
     messageId: MessageId,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = editMessageText(chat.id, messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = editMessageText(chat.id, messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -128,10 +127,10 @@ suspend fun TelegramBot.editMessageText(
     chat: Chat,
     messageId: MessageId,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = editMessageText(chat.id, messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = editMessageText(chat.id, messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -140,9 +139,9 @@ suspend fun TelegramBot.editMessageText(
 suspend fun TelegramBot.editMessageText(
     message: ContentMessage<TextContent>,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(message.chat.id, message.messageId, entities, linkPreviewOptions, replyMarkup)
+) = editMessageText(message.chat.id, message.messageId, entities, disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -151,10 +150,10 @@ suspend fun TelegramBot.editMessageText(
 suspend fun TelegramBot.editMessageText(
     message: ContentMessage<TextContent>,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = editMessageText(message.chat.id, message.messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = editMessageText(message.chat.id, message.messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -163,10 +162,10 @@ suspend fun TelegramBot.editMessageText(
 suspend fun TelegramBot.editMessageText(
     message: ContentMessage<TextContent>,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = editMessageText(message.chat.id, message.messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = editMessageText(message.chat.id, message.messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -174,11 +173,11 @@ suspend fun TelegramBot.editMessageText(
  */
 @RiskFeature("This method is unsafe due to absence of any guaranties about the type of message. In case if message is not text message this method will throw an exception")
 suspend fun TelegramBot.editMessageText(
-    message: AccessibleMessage,
+    message: Message,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(message.chat.id, message.messageId, entities, linkPreviewOptions, replyMarkup)
+) = editMessageText(message.chat.id, message.messageId, entities, disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -186,12 +185,12 @@ suspend fun TelegramBot.editMessageText(
  */
 @RiskFeature("This method is unsafe due to absence of any guaranties about the type of message. In case if message is not text message this method will throw an exception")
 suspend fun TelegramBot.editMessageText(
-    message: AccessibleMessage,
+    message: Message,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = editMessageText(message.chat.id, message.messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = editMessageText(message.chat.id, message.messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -199,9 +198,9 @@ suspend fun TelegramBot.editMessageText(
  */
 @RiskFeature("This method is unsafe due to absence of any guaranties about the type of message. In case if message is not text message this method will throw an exception")
 suspend fun TelegramBot.editMessageText(
-    message: AccessibleMessage,
+    message: Message,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = editMessageText(message.chat.id, message.messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = editMessageText(message.chat.id, message.messageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)

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

@@ -3,7 +3,6 @@ package dev.inmo.tgbotapi.extensions.api.edit.text
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.edit.text.EditInlineMessageText
 import dev.inmo.tgbotapi.types.InlineMessageIdentifier
-import dev.inmo.tgbotapi.types.LinkPreviewOptions
 import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.message.ParseMode
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@@ -19,9 +18,9 @@ suspend fun TelegramBot.editMessageText(
     inlineMessageId: InlineMessageIdentifier,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = execute(EditInlineMessageText(inlineMessageId, text, parseMode, linkPreviewOptions, replyMarkup))
+) = execute(EditInlineMessageText(inlineMessageId, text, parseMode, disableWebPagePreview, replyMarkup))
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -30,9 +29,9 @@ suspend fun TelegramBot.editMessageText(
 suspend fun TelegramBot.editMessageText(
     inlineMessageId: InlineMessageIdentifier,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = execute(EditInlineMessageText(inlineMessageId, entities, linkPreviewOptions, replyMarkup))
+) = execute(EditInlineMessageText(inlineMessageId, entities, disableWebPagePreview, replyMarkup))
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -41,10 +40,10 @@ suspend fun TelegramBot.editMessageText(
 suspend fun TelegramBot.editMessageText(
     inlineMessageId: InlineMessageIdentifier,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = editMessageText(inlineMessageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = editMessageText(inlineMessageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -53,7 +52,7 @@ suspend fun TelegramBot.editMessageText(
 suspend fun TelegramBot.editMessageText(
     inlineMessageId: InlineMessageIdentifier,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = editMessageText(inlineMessageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+) = editMessageText(inlineMessageId, buildEntities(separator, builderBody), disableWebPagePreview, replyMarkup)

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

@@ -10,6 +10,13 @@ suspend fun TelegramBot.getStickerSet(
     GetStickerSet(name)
 )
 
+@Deprecated("Renamed", ReplaceWith("getStickerSetOrThrow(sticker)", "dev.inmo.tgbotapi.extensions.api.get.getStickerSetOrThrow"))
+suspend fun TelegramBot.getStickerSet(
+    sticker: Sticker
+) = getStickerSet(
+    sticker.stickerSetName ?: error("Sticker must contains stickerSetName to be correctly used in getStickerSet method")
+)
+
 suspend fun TelegramBot.getStickerSetOrNull(
     sticker: Sticker
 ) = sticker.stickerSetName ?.let {

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

@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.get
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.get.GetUserChatBoosts
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.getUserChatBoosts(
-    chatId: ChatIdentifier,
-    userId: UserId
-) = execute(
-    GetUserChatBoosts(chatId = chatId, userId = userId)
-)
-
-suspend fun TelegramBot.getUserChatBoosts(
-    chat: Chat,
-    userId: UserId
-) = getUserChatBoosts(chatId = chat.id, userId = userId)

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

@@ -9,7 +9,7 @@ import dev.inmo.tgbotapi.types.MessageThreadId
 import dev.inmo.tgbotapi.types.message.ParseMode
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.threadId
 
 /**
@@ -186,7 +186,7 @@ suspend inline fun TelegramBot.copyMessage(
  */
 suspend inline fun TelegramBot.copyMessage(
     toChatId: ChatIdentifier,
-    message: AccessibleMessage,
+    message: Message,
     text: String? = null,
     parseMode: ParseMode? = null,
     threadId: MessageThreadId? = toChatId.threadId,
@@ -203,7 +203,7 @@ suspend inline fun TelegramBot.copyMessage(
  */
 suspend inline fun TelegramBot.copyMessage(
     toChat: Chat,
-    message: AccessibleMessage,
+    message: Message,
     text: String? = null,
     parseMode: ParseMode? = null,
     threadId: MessageThreadId? = toChat.id.threadId,
@@ -220,7 +220,7 @@ suspend inline fun TelegramBot.copyMessage(
  */
 suspend inline fun TelegramBot.copyMessage(
     toChatId: ChatIdentifier,
-    message: AccessibleMessage,
+    message: Message,
     entities: TextSourcesList,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
@@ -236,7 +236,7 @@ suspend inline fun TelegramBot.copyMessage(
  */
 suspend inline fun TelegramBot.copyMessage(
     toChat: Chat,
-    message: AccessibleMessage,
+    message: Message,
     entities: TextSourcesList,
     threadId: MessageThreadId? = toChat.id.threadId,
     disableNotification: Boolean = false,

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

@@ -1,84 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.send.CopyMessages
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-
-suspend fun TelegramBot.copyMessages(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: List<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = messageIds.chunked(copyMessagesLimit.last).flatMap {
-    execute(
-        CopyMessages(
-            toChatId = toChatId,
-            fromChatId = fromChatId,
-            messageIds = it,
-            threadId = threadId,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            removeCaption = removeCaption
-        )
-    )
-}
-
-suspend fun TelegramBot.copyMessages(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: Array<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = copyMessages(
-    toChatId = toChatId,
-    fromChatId = fromChatId,
-    messageIds = messageIds.toList(),
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-suspend fun TelegramBot.copyMessages(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    firstMessageId: MessageId,
-    vararg messageIds: MessageId,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = copyMessages(
-    toChatId = toChatId,
-    fromChatId = fromChatId,
-    messageIds = (listOf(firstMessageId) + messageIds.toList()),
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-suspend fun TelegramBot.copyMessages(
-    toChatId: ChatIdentifier,
-    messages: List<AccessibleMessage>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = messages.groupBy { it.chat }.flatMap { (chat, messages) ->
-    copyMessages(
-        toChatId = toChatId,
-        fromChatId = chat.id,
-        messageIds = messages.map { it.messageId },
-        threadId = threadId,
-        disableNotification = disableNotification,
-        protectContent = protectContent,
-        removeCaption = removeCaption
-    )
-}

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

@@ -22,7 +22,8 @@ import dev.inmo.tgbotapi.types.files.TelegramMediaFile
 import dev.inmo.tgbotapi.types.files.Sticker
 import dev.inmo.tgbotapi.types.games.Game
 import dev.inmo.tgbotapi.types.location.*
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
+import dev.inmo.tgbotapi.types.message.abstracts.PossiblyTopicMessage
 import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.message.textsources.TextSource
 import dev.inmo.tgbotapi.types.payments.LabeledPrice
@@ -43,7 +44,7 @@ import kotlin.jvm.JvmName
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     phoneNumber: String,
     firstName: String,
     lastName: String? = null,
@@ -69,7 +70,7 @@ suspend inline fun TelegramBot.reply(
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     contact: Contact,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -94,7 +95,7 @@ suspend inline fun TelegramBot.reply(
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
 suspend inline fun TelegramBot.replyWithDice(
-    to: AccessibleMessage,
+    to: Message,
     animationType: DiceAnimationType? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -107,7 +108,7 @@ suspend inline fun TelegramBot.replyWithDice(
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     animationType: DiceAnimationType,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -123,7 +124,7 @@ suspend inline fun TelegramBot.reply(
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     latitude: Double,
     longitude: Double,
     disableNotification: Boolean = false,
@@ -147,7 +148,7 @@ suspend inline fun TelegramBot.reply(
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     location: StaticLocation,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -172,10 +173,10 @@ suspend inline fun TelegramBot.reply(
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
@@ -184,7 +185,7 @@ suspend inline fun TelegramBot.reply(
     to.chat,
     text,
     parseMode,
-    linkPreviewOptions,
+    disableWebPagePreview,
     to.threadIdOrNull,
     disableNotification,
     protectContent,
@@ -198,9 +199,9 @@ suspend inline fun TelegramBot.reply(
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
@@ -208,7 +209,7 @@ suspend inline fun TelegramBot.reply(
 ) = sendTextMessage(
     to.chat,
     entities,
-    linkPreviewOptions,
+    disableWebPagePreview,
     to.threadIdOrNull,
     disableNotification,
     protectContent,
@@ -222,30 +223,30 @@ suspend inline fun TelegramBot.reply(
  * as a builder for that
  */
 suspend fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = reply(to, buildEntities(separator, builderBody), linkPreviewOptions, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
+) = reply(to, buildEntities(separator, builderBody), disableWebPagePreview, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
 suspend fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = reply(to, buildEntities(separator, builderBody), linkPreviewOptions, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
+) = reply(to, buildEntities(separator, builderBody), disableWebPagePreview, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
 
 
 // Venue
@@ -255,7 +256,7 @@ suspend fun TelegramBot.reply(
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     latitude: Double,
     longitude: Double,
     title: String,
@@ -287,7 +288,7 @@ suspend inline fun TelegramBot.reply(
 )
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     location: StaticLocation,
     title: String,
     address: String,
@@ -318,7 +319,7 @@ suspend inline fun TelegramBot.reply(
 )
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     venue: Venue,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -339,7 +340,7 @@ suspend inline fun TelegramBot.reply(
 // Game
 
 suspend inline fun TelegramBot.replyWithGame(
-    to: AccessibleMessage,
+    to: Message,
     gameShortName: String,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -350,7 +351,7 @@ suspend inline fun TelegramBot.replyWithGame(
 )
 
 suspend inline fun TelegramBot.replyWithGame(
-    to: AccessibleMessage,
+    to: Message,
     game: Game,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -361,7 +362,7 @@ suspend inline fun TelegramBot.replyWithGame(
 )
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     game: Game,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -373,12 +374,11 @@ suspend inline fun TelegramBot.reply(
 // Animation
 
 suspend inline fun TelegramBot.replyWithAnimation(
-    to: AccessibleMessage,
+    to: Message,
     animation: InputFile,
     thumb: InputFile? = null,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -392,7 +392,6 @@ suspend inline fun TelegramBot.replyWithAnimation(
     thumb,
     text,
     parseMode,
-    spoilered,
     duration,
     width,
     height,
@@ -405,11 +404,10 @@ suspend inline fun TelegramBot.replyWithAnimation(
 )
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     animation: AnimationFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -417,13 +415,12 @@ suspend inline fun TelegramBot.reply(
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(to.chat, animation, text, parseMode, spoilered, duration, width, height, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendAnimation(to.chat, animation, text, parseMode, duration, width, height, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.replyWithAnimation(
-    to: AccessibleMessage,
+    to: Message,
     animation: InputFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     thumb: InputFile? = null,
     duration: Long? = null,
     width: Int? = null,
@@ -437,7 +434,6 @@ suspend inline fun TelegramBot.replyWithAnimation(
     animation,
     thumb,
     entities,
-    spoilered,
     duration,
     width,
     height,
@@ -450,10 +446,9 @@ suspend inline fun TelegramBot.replyWithAnimation(
 )
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     animation: AnimationFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -461,13 +456,13 @@ suspend inline fun TelegramBot.reply(
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(to.chat, animation, entities, spoilered, duration, width, height, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendAnimation(to.chat, animation, entities, duration, width, height, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 
 // Audio
 
 suspend inline fun TelegramBot.replyWithAudio(
-    to: AccessibleMessage,
+    to: Message,
     audio: InputFile,
     thumb: InputFile? = null,
     text: String? = null,
@@ -482,7 +477,7 @@ suspend inline fun TelegramBot.replyWithAudio(
 ) = sendAudio(to.chat, audio, thumb, text, parseMode, duration, performer, title, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     audio: AudioFile,
     text: String? = null,
     parseMode: ParseMode? = null,
@@ -494,7 +489,7 @@ suspend inline fun TelegramBot.reply(
 ) = sendAudio(to.chat, audio, text, parseMode, title, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.replyWithAudio(
-    to: AccessibleMessage,
+    to: Message,
     audio: InputFile,
     thumb: InputFile? = null,
     entities: TextSourcesList,
@@ -508,7 +503,7 @@ suspend inline fun TelegramBot.replyWithAudio(
 ) = sendAudio(to.chat, audio, thumb, entities, duration, performer, title, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     audio: AudioFile,
     entities: TextSourcesList,
     title: String? = null,
@@ -522,7 +517,7 @@ suspend inline fun TelegramBot.reply(
 // Documents
 
 suspend inline fun TelegramBot.replyWithDocument(
-    to: AccessibleMessage,
+    to: Message,
     document: InputFile,
     thumb: InputFile? = null,
     text: String? = null,
@@ -535,7 +530,7 @@ suspend inline fun TelegramBot.replyWithDocument(
 ) = sendDocument(to.chat, document, thumb, text, parseMode, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     document: DocumentFile,
     text: String? = null,
     parseMode: ParseMode? = null,
@@ -547,7 +542,7 @@ suspend inline fun TelegramBot.reply(
 ) = sendDocument(to.chat, document, text, parseMode, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection)
 
 suspend inline fun TelegramBot.replyWithDocument(
-    to: AccessibleMessage,
+    to: Message,
     document: InputFile,
     thumb: InputFile? = null,
     entities: TextSourcesList,
@@ -559,7 +554,7 @@ suspend inline fun TelegramBot.replyWithDocument(
 ) = sendDocument(to.chat, document, thumb, entities, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     document: DocumentFile,
     entities: TextSourcesList,
     disableNotification: Boolean = false,
@@ -574,7 +569,7 @@ suspend inline fun TelegramBot.reply(
 
 @RiskFeature(rawSendingMediaGroupsWarning)
 suspend inline fun TelegramBot.replyWithMediaGroup(
-    to: AccessibleMessage,
+    to: Message,
     media: List<MediaGroupMemberTelegramMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -582,7 +577,7 @@ suspend inline fun TelegramBot.replyWithMediaGroup(
 ) = sendMediaGroup(to.chat, media, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply)
 
 suspend inline fun TelegramBot.replyWithPlaylist(
-    to: AccessibleMessage,
+    to: Message,
     media: List<AudioMediaGroupMemberTelegramMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -590,7 +585,7 @@ suspend inline fun TelegramBot.replyWithPlaylist(
 ) = sendPlaylist(to.chat, media, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply)
 
 suspend inline fun TelegramBot.replyWithDocuments(
-    to: AccessibleMessage,
+    to: Message,
     media: List<DocumentMediaGroupMemberTelegramMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -598,7 +593,7 @@ suspend inline fun TelegramBot.replyWithDocuments(
 ) = sendDocumentsGroup(to.chat, media, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply)
 
 suspend inline fun TelegramBot.replyWithGallery(
-    to: AccessibleMessage,
+    to: Message,
     media: List<VisualMediaGroupMemberTelegramMedia>,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -609,108 +604,99 @@ suspend inline fun TelegramBot.replyWithGallery(
 // Photo
 
 suspend inline fun TelegramBot.replyWithPhoto(
-    to: AccessibleMessage,
+    to: Message,
     fileId: InputFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, fileId, text, parseMode, spoilered, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(to.chat, fileId, text, parseMode, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     photo: Photo,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, photo, text, parseMode, spoilered, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(to.chat, photo, text, parseMode, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     photoSize: PhotoSize,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, photoSize, text, parseMode, spoilered, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(to.chat, photoSize, text, parseMode, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 
 suspend inline fun TelegramBot.replyWithPhoto(
-    to: AccessibleMessage,
+    to: Message,
     fileId: InputFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, fileId, entities, spoilered, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(to.chat, fileId, entities, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     photo: Photo,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, photo, entities, spoilered, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(to.chat, photo, entities, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     photoSize: PhotoSize,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, photoSize, entities, spoilered, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(to.chat, photoSize, entities, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 
 // Sticker
 
 suspend inline fun TelegramBot.replyWithSticker(
-    to: AccessibleMessage,
+    to: Message,
     sticker: InputFile,
-    emoji: String? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendSticker(to.chat, sticker, to.threadIdOrNull, emoji, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendSticker(to.chat, sticker, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     sticker: Sticker,
-    emoji: String? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendSticker(to.chat, sticker, to.threadIdOrNull, emoji, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendSticker(to.chat, sticker, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 
 // Videos
 
 suspend inline fun TelegramBot.replyWithVideo(
-    to: AccessibleMessage,
+    to: Message,
     video: InputFile,
     thumb: InputFile? = null,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -718,26 +704,24 @@ suspend inline fun TelegramBot.replyWithVideo(
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(to.chat, video, thumb, text, parseMode, spoilered, duration, width, height, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(to.chat, video, thumb, text, parseMode, duration, width, height, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     video: VideoFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(to.chat, video, text, parseMode, spoilered, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(to.chat, video, text, parseMode, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.replyWithVideo(
-    to: AccessibleMessage,
+    to: Message,
     video: InputFile,
     thumb: InputFile? = null,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -745,24 +729,23 @@ suspend inline fun TelegramBot.replyWithVideo(
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(to.chat, video, thumb, entities, spoilered, duration, width, height, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(to.chat, video, thumb, entities, duration, width, height, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     video: VideoFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(to.chat, video, entities, spoilered, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(to.chat, video, entities, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 
 // VideoNotes
 
 suspend inline fun TelegramBot.replyWithVideoNote(
-    to: AccessibleMessage,
+    to: Message,
     videoNote: InputFile,
     thumb: InputFile? = null,
     duration: Long? = null,
@@ -774,7 +757,7 @@ suspend inline fun TelegramBot.replyWithVideoNote(
 ) = sendVideoNote(to.chat, videoNote, thumb, duration, size, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     videoNote: VideoNoteFile,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -786,7 +769,7 @@ suspend inline fun TelegramBot.reply(
 // Voice
 
 suspend inline fun TelegramBot.replyWithVoice(
-    to: AccessibleMessage,
+    to: Message,
     voice: InputFile,
     text: String? = null,
     parseMode: ParseMode? = null,
@@ -798,7 +781,7 @@ suspend inline fun TelegramBot.replyWithVoice(
 ) = sendVoice(to.chat, voice, text, parseMode, duration, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     voice: VoiceFile,
     text: String? = null,
     parseMode: ParseMode? = null,
@@ -810,7 +793,7 @@ suspend inline fun TelegramBot.reply(
 
 
 suspend inline fun TelegramBot.replyWithVoice(
-    to: AccessibleMessage,
+    to: Message,
     voice: InputFile,
     entities: TextSourcesList,
     duration: Long? = null,
@@ -821,7 +804,7 @@ suspend inline fun TelegramBot.replyWithVoice(
 ) = sendVoice(to.chat, voice, entities, duration, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     voice: VoiceFile,
     entities: TextSourcesList,
     disableNotification: Boolean = false,
@@ -838,7 +821,7 @@ suspend inline fun TelegramBot.reply(
  * as a builder for that
  */
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     title: String,
     description: String,
     payload: String,
@@ -866,7 +849,7 @@ suspend inline fun TelegramBot.reply(
 // Polls
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     question: String,
     options: List<String>,
     isAnonymous: Boolean = true,
@@ -880,7 +863,7 @@ suspend inline fun TelegramBot.reply(
 ) = sendRegularPoll(to.chat, question, options, isAnonymous, isClosed, allowMultipleAnswers, closeInfo, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     poll: RegularPoll,
     isClosed: Boolean = false,
     question: String = poll.question,
@@ -895,7 +878,7 @@ suspend inline fun TelegramBot.reply(
 ) = sendRegularPoll(to.chat, poll, isClosed, question, options, isAnonymous, allowMultipleAnswers, closeInfo, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     question: String,
     options: List<String>,
     correctOptionId: Int,
@@ -911,7 +894,7 @@ suspend inline fun TelegramBot.reply(
 ) = sendQuizPoll(to.chat, question, options, correctOptionId, isAnonymous, isClosed, explanation, parseMode, closeInfo, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     quizPoll: QuizPoll,
     isClosed: Boolean = false,
     question: String = quizPoll.question,
@@ -928,7 +911,7 @@ suspend inline fun TelegramBot.reply(
 ) = sendQuizPoll(to.chat, isClosed, quizPoll, question, options, correctOptionId, isAnonymous, explanation, parseMode, closeInfo, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     question: String,
     options: List<String>,
     correctOptionId: Int,
@@ -943,7 +926,7 @@ suspend inline fun TelegramBot.reply(
 ) = sendQuizPoll(to.chat, question, options, correctOptionId, isAnonymous, isClosed, entities, closeInfo, to.threadIdOrNull, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     quizPoll: QuizPoll,
     entities: TextSourcesList,
     isClosed: Boolean = false,
@@ -960,7 +943,7 @@ suspend inline fun TelegramBot.reply(
 
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     poll: Poll,
     isClosed: Boolean = false,
     question: String = poll.question,
@@ -1005,7 +988,7 @@ suspend inline fun TelegramBot.reply(
 
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     fromChatId: ChatIdentifier,
     messageId: MessageId,
     text: String? = null,
@@ -1029,7 +1012,7 @@ suspend inline fun TelegramBot.reply(
 )
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     fromChat: Chat,
     messageId: MessageId,
     text: String? = null,
@@ -1041,8 +1024,8 @@ suspend inline fun TelegramBot.reply(
 ) = reply(to, fromChat.id, messageId, text, parseMode, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
-    to: AccessibleMessage,
-    copy: AccessibleMessage,
+    to: Message,
+    copy: Message,
     text: String? = null,
     parseMode: ParseMode? = null,
     disableNotification: Boolean = false,
@@ -1052,13 +1035,13 @@ suspend inline fun TelegramBot.reply(
 ) = reply(to, copy.chat.id, copy.messageId, text, parseMode, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
 
 suspend fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     content: MessageContent,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-): AccessibleMessage = execute(
+): Message = execute(
     content.createResend(
         to.chat.id,
         to.threadIdOrNull,
@@ -1076,7 +1059,7 @@ suspend fun TelegramBot.reply(
  * @see handleLiveLocation
  */
 suspend fun TelegramBot.reply(
-    message: AccessibleMessage,
+    message: Message,
     locationsFlow: Flow<EditLiveLocationInfo>,
     liveTimeMillis: Long = defaultLivePeriodDelayMillis,
     disableNotification: Boolean = false,
@@ -1101,7 +1084,7 @@ suspend fun TelegramBot.reply(
 @JvmName("replyLiveLocationWithLocation")
 @JsName("replyLiveLocationWithLocation")
 suspend fun TelegramBot.reply(
-    message: AccessibleMessage,
+    message: Message,
     locationsFlow: Flow<Location>,
     liveTimeMillis: Long = defaultLivePeriodDelayMillis,
     disableNotification: Boolean = false,
@@ -1128,7 +1111,7 @@ suspend fun TelegramBot.reply(
 @JvmName("replyLiveLocationWithLatLong")
 @JsName("replyLiveLocationWithLatLong")
 suspend fun TelegramBot.reply(
-    message: AccessibleMessage,
+    message: Message,
     locationsFlow: Flow<Pair<Double, Double>>,
     liveTimeMillis: Long = defaultLivePeriodDelayMillis,
     disableNotification: Boolean = false,
@@ -1148,7 +1131,7 @@ suspend fun TelegramBot.reply(
 }
 
 suspend fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     mediaFile: TelegramMediaFile,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -1232,7 +1215,7 @@ suspend fun TelegramBot.reply(
 }
 
 suspend fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     content: TextedMediaContent,
     text: String?,
     parseMode: ParseMode? = null,
@@ -1306,7 +1289,7 @@ suspend fun TelegramBot.reply(
 }
 
 suspend fun TelegramBot.reply(
-    to: AccessibleMessage,
+    to: Message,
     content: TextedMediaContent,
     entities: TextSourcesList,
     disableNotification: Boolean = false,

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

@@ -23,7 +23,7 @@ import dev.inmo.tgbotapi.types.files.TelegramMediaFile
 import dev.inmo.tgbotapi.types.files.Sticker
 import dev.inmo.tgbotapi.types.games.Game
 import dev.inmo.tgbotapi.types.location.*
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.payments.LabeledPrice
 import dev.inmo.tgbotapi.types.payments.abstracts.Currency
@@ -187,7 +187,7 @@ suspend inline fun TelegramBot.reply(
     toMessageId: MessageId,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -197,7 +197,7 @@ suspend inline fun TelegramBot.reply(
     toChatId,
     text,
     parseMode,
-    linkPreviewOptions,
+    disableWebPagePreview,
     threadId,
     disableNotification,
     protectContent,
@@ -214,7 +214,7 @@ suspend inline fun TelegramBot.reply(
     toChatId: IdChatIdentifier,
     toMessageId: MessageId,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -223,7 +223,7 @@ suspend inline fun TelegramBot.reply(
 ) = sendTextMessage(
     toChatId,
     entities,
-    linkPreviewOptions,
+    disableWebPagePreview,
     threadId,
     disableNotification,
     protectContent,
@@ -240,14 +240,14 @@ suspend fun TelegramBot.reply(
     toChatId: IdChatIdentifier,
     toMessageId: MessageId,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = reply(toChatId, toMessageId, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
+) = reply(toChatId, toMessageId, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -257,14 +257,14 @@ suspend fun TelegramBot.reply(
     toChatId: IdChatIdentifier,
     toMessageId: MessageId,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = reply(toChatId, toMessageId, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
+) = reply(toChatId, toMessageId, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
 
 
 // Venue
@@ -410,7 +410,6 @@ suspend inline fun TelegramBot.replyWithAnimation(
     thumb: InputFile? = null,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -425,7 +424,6 @@ suspend inline fun TelegramBot.replyWithAnimation(
     thumb,
     text,
     parseMode,
-    spoilered,
     duration,
     width,
     height,
@@ -443,7 +441,6 @@ suspend inline fun TelegramBot.reply(
     animation: AnimationFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -452,14 +449,13 @@ suspend inline fun TelegramBot.reply(
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(toChatId, animation, text, parseMode, spoilered, duration, width, height, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendAnimation(toChatId, animation, text, parseMode, duration, width, height, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.replyWithAnimation(
     toChatId: IdChatIdentifier,
     toMessageId: MessageId,
     animation: InputFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     thumb: InputFile? = null,
     duration: Long? = null,
     width: Int? = null,
@@ -474,7 +470,6 @@ suspend inline fun TelegramBot.replyWithAnimation(
     animation,
     thumb,
     entities,
-    spoilered,
     duration,
     width,
     height,
@@ -491,7 +486,6 @@ suspend inline fun TelegramBot.reply(
     toMessageId: MessageId,
     animation: AnimationFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -500,7 +494,7 @@ suspend inline fun TelegramBot.reply(
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(toChatId, animation, entities, spoilered, duration, width, height, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendAnimation(toChatId, animation, entities, duration, width, height, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 // Audio
@@ -677,13 +671,12 @@ suspend inline fun TelegramBot.replyWithPhoto(
     fileId: InputFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(toChatId, fileId, text, parseMode, spoilered, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(toChatId, fileId, text, parseMode, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
     toChatId: IdChatIdentifier,
@@ -691,13 +684,12 @@ suspend inline fun TelegramBot.reply(
     photo: Photo,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(toChatId, photo, text, parseMode, spoilered, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(toChatId, photo, text, parseMode, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
     toChatId: IdChatIdentifier,
@@ -705,13 +697,12 @@ suspend inline fun TelegramBot.reply(
     photoSize: PhotoSize,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(toChatId, photoSize, text, parseMode, spoilered, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(toChatId, photoSize, text, parseMode, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 suspend inline fun TelegramBot.replyWithPhoto(
@@ -719,39 +710,36 @@ suspend inline fun TelegramBot.replyWithPhoto(
     toMessageId: MessageId,
     fileId: InputFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(toChatId, fileId, entities, spoilered, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(toChatId, fileId, entities, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
     toChatId: IdChatIdentifier,
     toMessageId: MessageId,
     photo: Photo,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(toChatId, photo, entities, spoilered, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(toChatId, photo, entities, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
     toChatId: IdChatIdentifier,
     toMessageId: MessageId,
     photoSize: PhotoSize,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(toChatId, photoSize, entities, spoilered, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(toChatId, photoSize, entities, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 // Sticker
@@ -761,24 +749,22 @@ suspend inline fun TelegramBot.replyWithSticker(
     toMessageId: MessageId,
     sticker: InputFile,
     threadId: MessageThreadId? = toChatId.threadId,
-    emoji: String? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendSticker(toChatId, sticker, threadId, emoji, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendSticker(toChatId, sticker, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
     toChatId: IdChatIdentifier,
     toMessageId: MessageId,
     sticker: Sticker,
     threadId: MessageThreadId? = toChatId.threadId,
-    emoji: String? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendSticker(toChatId, sticker, threadId, emoji, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendSticker(toChatId, sticker, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 // Videos
@@ -790,7 +776,6 @@ suspend inline fun TelegramBot.replyWithVideo(
     thumb: InputFile? = null,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -799,7 +784,7 @@ suspend inline fun TelegramBot.replyWithVideo(
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(toChatId, video, thumb, text, parseMode, spoilered, duration, width, height, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(toChatId, video, thumb, text, parseMode, duration, width, height, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
     toChatId: IdChatIdentifier,
@@ -807,13 +792,12 @@ suspend inline fun TelegramBot.reply(
     video: VideoFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(toChatId, video, text, parseMode, spoilered, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(toChatId, video, text, parseMode, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.replyWithVideo(
     toChatId: IdChatIdentifier,
@@ -821,7 +805,6 @@ suspend inline fun TelegramBot.replyWithVideo(
     video: InputFile,
     thumb: InputFile? = null,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -830,20 +813,19 @@ suspend inline fun TelegramBot.replyWithVideo(
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(toChatId, video, thumb, entities, spoilered, duration, width, height, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(toChatId, video, thumb, entities, duration, width, height, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 suspend inline fun TelegramBot.reply(
     toChatId: IdChatIdentifier,
     toMessageId: MessageId,
     video: VideoFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = toChatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(toChatId, video, entities, spoilered, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(toChatId, video, entities, threadId, disableNotification, protectContent, toMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 // VideoNotes
@@ -1166,7 +1148,7 @@ suspend inline fun TelegramBot.reply(
 suspend inline fun TelegramBot.reply(
     toChatId: IdChatIdentifier,
     toMessageId: MessageId,
-    copy: AccessibleMessage,
+    copy: Message,
     text: String? = null,
     parseMode: ParseMode? = null,
     threadId: MessageThreadId? = toChatId.threadId,

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

@@ -1,108 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.content.MessageContent
-import dev.inmo.tgbotapi.types.threadId
-
-/**
- * This method will send [content] to the [chatId] as is
- */
-suspend inline fun <T : MessageContent> TelegramBot.resend(
-    chatId: ChatIdentifier,
-    content: T,
-    messageThreadId: MessageThreadId? = chatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    content.createResend(
-        chatId = chatId,
-        messageThreadId = messageThreadId,
-        disableNotification = disableNotification,
-        protectContent = protectContent,
-        replyToMessageId = replyToMessageId,
-        allowSendingWithoutReply = allowSendingWithoutReply,
-        replyMarkup = replyMarkup
-    )
-) as ContentMessage<T>
-
-/**
- * This method will send [content] to the [chatId] as is
- */
-suspend inline fun <T : MessageContent> TelegramBot.resend(
-    chat: Chat,
-    content: T,
-    messageThreadId: MessageThreadId? = chat.id.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = resend(
-    chatId = chat.id,
-    content = content,
-    messageThreadId = messageThreadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    replyToMessageId = replyToMessageId,
-    allowSendingWithoutReply = allowSendingWithoutReply,
-    replyMarkup = replyMarkup
-)
-
-/**
- * This method will send [message] content to the [chatId]. In difference with [copyMessage], this method will use
- * native methods for data sending (like [dev.inmo.tgbotapi.extensions.api.send.media.sendPhoto] if inoming content is
- * [dev.inmo.tgbotapi.types.message.content.PhotoContent])
- */
-suspend inline fun <T : MessageContent> TelegramBot.resend(
-    chatId: ChatIdentifier,
-    message: ContentMessage<T>,
-    messageThreadId: MessageThreadId? = chatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = resend(
-    chatId = chatId,
-    content = message.content,
-    messageThreadId = messageThreadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    replyToMessageId = replyToMessageId,
-    allowSendingWithoutReply = allowSendingWithoutReply,
-    replyMarkup = replyMarkup
-)
-
-/**
- * This method will send [message] content to the [chat]. In difference with [copyMessage], this method will use
- * native methods for data sending (like [dev.inmo.tgbotapi.extensions.api.send.media.sendPhoto] if inoming content is
- * [dev.inmo.tgbotapi.types.message.content.PhotoContent])
- */
-suspend inline fun <T : MessageContent> TelegramBot.resend(
-    chat: Chat,
-    message: ContentMessage<T>,
-    messageThreadId: MessageThreadId? = chat.id.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = resend(
-    chatId = chat.id,
-    message = message,
-    messageThreadId = messageThreadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    replyToMessageId = replyToMessageId,
-    allowSendingWithoutReply = allowSendingWithoutReply,
-    replyMarkup = replyMarkup
-)

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

@@ -3,129 +3,104 @@ package dev.inmo.tgbotapi.extensions.api.send
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.send.SendAction
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageThreadId
 import dev.inmo.tgbotapi.types.actions.*
 import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.threadId
 
 suspend fun TelegramBot.sendBotAction(
     chatId: ChatIdentifier,
-    action: BotAction,
-    threadId: MessageThreadId? = chatId.threadId
+    action: BotAction
 ) = execute(
-    SendAction(chatId, action, threadId)
+    SendAction(chatId, action)
 )
 
 suspend fun TelegramBot.sendBotAction(
     chat: Chat,
-    action: BotAction,
-    threadId: MessageThreadId? = chat.id.threadId
-) = sendBotAction(chat.id, action, threadId)
+    action: BotAction
+) = sendBotAction(chat.id, action)
 
 
 suspend fun TelegramBot.sendActionTyping(
-    chatId: ChatIdentifier,
-    threadId: MessageThreadId? = chatId.threadId
-) = sendBotAction(chatId, TypingAction, threadId)
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, TypingAction)
 
 suspend fun TelegramBot.sendActionUploadPhoto(
-    chatId: ChatIdentifier,
-    threadId: MessageThreadId? = chatId.threadId
-) = sendBotAction(chatId, UploadPhotoAction, threadId)
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, UploadPhotoAction)
 
 suspend fun TelegramBot.sendActionRecordVideo(
-    chatId: ChatIdentifier,
-    threadId: MessageThreadId? = chatId.threadId
-) = sendBotAction(chatId, RecordVideoAction, threadId)
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, RecordVideoAction)
 
 suspend fun TelegramBot.sendActionUploadVideo(
-    chatId: ChatIdentifier,
-    threadId: MessageThreadId? = chatId.threadId
-) = sendBotAction(chatId, UploadVideoAction, threadId)
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, UploadVideoAction)
 
 suspend fun TelegramBot.sendActionRecordVoice(
-    chatId: ChatIdentifier,
-    threadId: MessageThreadId? = chatId.threadId
-) = sendBotAction(chatId, RecordVoiceAction, threadId)
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, RecordVoiceAction)
 
 suspend fun TelegramBot.sendActionUploadVoice(
-    chatId: ChatIdentifier,
-    threadId: MessageThreadId? = chatId.threadId
-) = sendBotAction(chatId, UploadVoiceAction, threadId)
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, UploadVoiceAction)
 
 suspend fun TelegramBot.sendActionUploadDocument(
-    chatId: ChatIdentifier,
-    threadId: MessageThreadId? = chatId.threadId
-) = sendBotAction(chatId, UploadDocumentAction, threadId)
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, UploadDocumentAction)
 
 suspend fun TelegramBot.sendActionFindLocation(
-    chatId: ChatIdentifier,
-    threadId: MessageThreadId? = chatId.threadId
-) = sendBotAction(chatId, FindLocationAction, threadId)
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, FindLocationAction)
 
 suspend fun TelegramBot.sendActionRecordVideoNote(
-    chatId: ChatIdentifier,
-    threadId: MessageThreadId? = chatId.threadId
-) = sendBotAction(chatId, RecordVideoNoteAction, threadId)
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, RecordVideoNoteAction)
 
 suspend fun TelegramBot.sendActionUploadVideoNote(
-    chatId: ChatIdentifier,
-    threadId: MessageThreadId? = chatId.threadId
-) = sendBotAction(chatId, UploadVideoNoteAction, threadId)
+    chatId: ChatIdentifier
+) = sendBotAction(chatId, UploadVideoNoteAction)
 
 
 suspend fun TelegramBot.sendActionTyping(
-    chat: Chat,
-    threadId: MessageThreadId? = chat.id.threadId
-) = sendBotAction(chat, TypingAction, threadId)
+    chat: Chat
+) = sendBotAction(chat, TypingAction)
 
 suspend fun TelegramBot.sendActionUploadPhoto(
-    chat: Chat,
-    threadId: MessageThreadId? = chat.id.threadId
-) = sendBotAction(chat, UploadPhotoAction, threadId)
+    chat: Chat
+) = sendBotAction(chat, UploadPhotoAction)
 
 suspend fun TelegramBot.sendActionRecordVideo(
-    chat: Chat,
-    threadId: MessageThreadId? = chat.id.threadId
-) = sendBotAction(chat, RecordVideoAction, threadId)
+    chat: Chat
+) = sendBotAction(chat, RecordVideoAction)
 
 suspend fun TelegramBot.sendActionUploadVideo(
-    chat: Chat,
-    threadId: MessageThreadId? = chat.id.threadId
-) = sendBotAction(chat, UploadVideoAction, threadId)
+    chat: Chat
+) = sendBotAction(chat, UploadVideoAction)
 
 suspend fun TelegramBot.sendActionRecordVoice(
-    chat: Chat,
-    threadId: MessageThreadId? = chat.id.threadId
-) = sendBotAction(chat, RecordVoiceAction, threadId)
+    chat: Chat
+) = sendBotAction(chat, RecordVoiceAction)
 
 suspend fun TelegramBot.sendActionUploadVoice(
-    chat: Chat,
-    threadId: MessageThreadId? = chat.id.threadId
-) = sendBotAction(chat, UploadVoiceAction, threadId)
+    chat: Chat
+) = sendBotAction(chat, UploadVoiceAction)
 
 suspend fun TelegramBot.sendActionUploadDocument(
-    chat: Chat,
-    threadId: MessageThreadId? = chat.id.threadId
-) = sendBotAction(chat, UploadDocumentAction, threadId)
+    chat: Chat
+) = sendBotAction(chat, UploadDocumentAction)
 
 suspend fun TelegramBot.sendActionFindLocation(
-    chat: Chat,
-    threadId: MessageThreadId? = chat.id.threadId
-) = sendBotAction(chat, FindLocationAction, threadId)
+    chat: Chat
+) = sendBotAction(chat, FindLocationAction)
 
 suspend fun TelegramBot.sendActionRecordVideoNote(
-    chat: Chat,
-    threadId: MessageThreadId? = chat.id.threadId
-) = sendBotAction(chat, RecordVideoNoteAction, threadId)
+    chat: Chat
+) = sendBotAction(chat, RecordVideoNoteAction)
 
 suspend fun TelegramBot.sendActionUploadVideoNote(
-    chat: Chat,
-    threadId: MessageThreadId? = chat.id.threadId
-) = sendBotAction(chat, UploadVideoNoteAction, threadId)
+    chat: Chat
+) = sendBotAction(chat, UploadVideoNoteAction)
 
 suspend fun TelegramBot.sendActionChooseStickerAction(
-    chat: Chat,
-    threadId: MessageThreadId? = chat.id.threadId
-) = sendBotAction(chat, ChooseStickerAction, threadId)
+    chat: Chat
+) = sendBotAction(chat, ChooseStickerAction)
 

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

@@ -38,14 +38,13 @@ suspend fun <T> TelegramBot.withAction(
 suspend fun <T> TelegramBot.withAction(
     chatId: IdChatIdentifier,
     action: BotAction,
-    threadId: MessageThreadId? = chatId.threadId,
     block: TelegramBotActionCallback<T>
 ): T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
     return withAction(
-        SendAction(chatId, action, threadId),
+        SendAction(chatId, action),
         block
     )
 }
@@ -54,7 +53,6 @@ suspend fun <T> TelegramBot.withAction(
 suspend fun <T> TelegramBot.withAction(
     chat: Chat,
     action: BotAction,
-    threadId: MessageThreadId? = chat.id.threadId,
     block: TelegramBotActionCallback<T>
 ): T {
     contract {
@@ -63,164 +61,163 @@ suspend fun <T> TelegramBot.withAction(
     return withAction(
         chat.id,
         action,
-        threadId,
         block
     )
 }
 
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withTypingAction(chatId: IdChatIdentifier, threadId: MessageThreadId? = chatId.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withTypingAction(chatId: IdChatIdentifier, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chatId, TypingAction, threadId, block)
+    return withAction(chatId, TypingAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadPhotoAction(chatId: IdChatIdentifier, threadId: MessageThreadId? = chatId.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withUploadPhotoAction(chatId: IdChatIdentifier, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chatId, UploadPhotoAction, threadId, block)
+    return withAction(chatId, UploadPhotoAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVideoAction(chatId: IdChatIdentifier, threadId: MessageThreadId? = chatId.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withRecordVideoAction(chatId: IdChatIdentifier, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chatId, RecordVideoAction, threadId, block)
+    return withAction(chatId, RecordVideoAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVideoAction(chatId: IdChatIdentifier, threadId: MessageThreadId? = chatId.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withUploadVideoAction(chatId: IdChatIdentifier, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chatId, UploadVideoAction, threadId, block)
+    return withAction(chatId, UploadVideoAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVoiceAction(chatId: IdChatIdentifier, threadId: MessageThreadId? = chatId.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withRecordVoiceAction(chatId: IdChatIdentifier, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chatId, RecordVoiceAction, threadId, block)
+    return withAction(chatId, RecordVoiceAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVoiceAction(chatId: IdChatIdentifier, threadId: MessageThreadId? = chatId.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withUploadVoiceAction(chatId: IdChatIdentifier, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chatId, UploadVoiceAction, threadId, block)
+    return withAction(chatId, UploadVoiceAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadDocumentAction(chatId: IdChatIdentifier, threadId: MessageThreadId? = chatId.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withUploadDocumentAction(chatId: IdChatIdentifier, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chatId, UploadDocumentAction, threadId, block)
+    return withAction(chatId, UploadDocumentAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withFindLocationAction(chatId: IdChatIdentifier, threadId: MessageThreadId? = chatId.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withFindLocationAction(chatId: IdChatIdentifier, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chatId, FindLocationAction, threadId, block)
+    return withAction(chatId, FindLocationAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVideoNoteAction(chatId: IdChatIdentifier, threadId: MessageThreadId? = chatId.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withRecordVideoNoteAction(chatId: IdChatIdentifier, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chatId, RecordVideoNoteAction, threadId, block)
+    return withAction(chatId, RecordVideoNoteAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVideoNoteAction(chatId: IdChatIdentifier, threadId: MessageThreadId? = chatId.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withUploadVideoNoteAction(chatId: IdChatIdentifier, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chatId, UploadVideoNoteAction, threadId, block)
+    return withAction(chatId, UploadVideoNoteAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withChooseStickerAction(chatId: IdChatIdentifier, threadId: MessageThreadId? = chatId.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withChooseStickerAction(chatId: IdChatIdentifier, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chatId, ChooseStickerAction, threadId, block)
+    return withAction(chatId, ChooseStickerAction, block)
 }
 
 
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withTypingAction(chat: Chat, threadId: MessageThreadId? = chat.id.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withTypingAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chat, TypingAction, threadId, block)
+    return withAction(chat, TypingAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadPhotoAction(chat: Chat, threadId: MessageThreadId? = chat.id.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withUploadPhotoAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chat, UploadPhotoAction, threadId, block)
+    return withAction(chat, UploadPhotoAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVideoAction(chat: Chat, threadId: MessageThreadId? = chat.id.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withRecordVideoAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chat, RecordVideoAction, threadId, block)
+    return withAction(chat, RecordVideoAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVideoAction(chat: Chat, threadId: MessageThreadId? = chat.id.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withUploadVideoAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chat, UploadVideoAction, threadId, block)
+    return withAction(chat, UploadVideoAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVoiceAction(chat: Chat, threadId: MessageThreadId? = chat.id.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withRecordVoiceAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chat, RecordVoiceAction, threadId, block)
+    return withAction(chat, RecordVoiceAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVoiceAction(chat: Chat, threadId: MessageThreadId? = chat.id.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withUploadVoiceAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chat, UploadVoiceAction, threadId, block)
+    return withAction(chat, UploadVoiceAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadDocumentAction(chat: Chat, threadId: MessageThreadId? = chat.id.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withUploadDocumentAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chat, UploadDocumentAction, threadId, block)
+    return withAction(chat, UploadDocumentAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withFindLocationAction(chat: Chat, threadId: MessageThreadId? = chat.id.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withFindLocationAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chat, FindLocationAction, threadId, block)
+    return withAction(chat, FindLocationAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVideoNoteAction(chat: Chat, threadId: MessageThreadId? = chat.id.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withRecordVideoNoteAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chat, RecordVideoNoteAction, threadId, block)
+    return withAction(chat, RecordVideoNoteAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVideoNoteAction(chat: Chat, threadId: MessageThreadId? = chat.id.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withUploadVideoNoteAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chat, UploadVideoNoteAction, threadId, block)
+    return withAction(chat, UploadVideoNoteAction, block)
 }
 @OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withChooseStickerAction(chat: Chat, threadId: MessageThreadId? = chat.id.threadId,block: TelegramBotActionCallback<T>) : T {
+suspend fun <T> TelegramBot.withChooseStickerAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
     contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
-    return withAction(chat, ChooseStickerAction, threadId, block)
+    return withAction(chat, ChooseStickerAction, block)
 }

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

@@ -19,7 +19,7 @@ suspend fun TelegramBot.sendMessage(
     chatId: ChatIdentifier,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -31,7 +31,7 @@ suspend fun TelegramBot.sendMessage(
         chatId,
         text,
         parseMode,
-        linkPreviewOptions,
+        disableWebPagePreview,
         threadId,
         disableNotification,
         protectContent,
@@ -49,7 +49,7 @@ suspend fun TelegramBot.sendTextMessage(
     chatId: ChatIdentifier,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -57,7 +57,7 @@ suspend fun TelegramBot.sendTextMessage(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendMessage(
-    chatId, text, parseMode, linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
+    chatId, text, parseMode, disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
 )
 
 /**
@@ -68,14 +68,14 @@ suspend fun TelegramBot.sendTextMessage(
     chat: Chat,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendTextMessage(chat.id, text, parseMode, linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendTextMessage(chat.id, text, parseMode, disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -86,14 +86,14 @@ suspend fun TelegramBot.sendMessage(
     chat: Chat,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendMessage(chat.id, text, parseMode, linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendMessage(chat.id, text, parseMode, disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -102,7 +102,7 @@ suspend fun TelegramBot.sendMessage(
 suspend fun TelegramBot.sendMessage(
     chatId: ChatIdentifier,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -110,7 +110,7 @@ suspend fun TelegramBot.sendMessage(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = execute(
-    SendTextMessage(chatId, entities, linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+    SendTextMessage(chatId, entities, disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 )
 
 /**
@@ -120,7 +120,7 @@ suspend fun TelegramBot.sendMessage(
 suspend fun TelegramBot.sendMessage(
     chatId: ChatIdentifier,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -128,7 +128,7 @@ suspend fun TelegramBot.sendMessage(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = sendMessage(chatId, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendMessage(chatId, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -138,7 +138,7 @@ suspend fun TelegramBot.sendMessage(
 suspend fun TelegramBot.sendMessage(
     chatId: ChatIdentifier,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -146,7 +146,7 @@ suspend fun TelegramBot.sendMessage(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = sendMessage(chatId, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendMessage(chatId, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -155,7 +155,7 @@ suspend fun TelegramBot.sendMessage(
 suspend fun TelegramBot.sendTextMessage(
     chatId: ChatIdentifier,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -163,7 +163,7 @@ suspend fun TelegramBot.sendTextMessage(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendMessage(
-    chatId, entities, linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
+    chatId, entities, disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
 )
 
 /**
@@ -173,7 +173,7 @@ suspend fun TelegramBot.sendTextMessage(
 suspend fun TelegramBot.sendTextMessage(
     chatId: ChatIdentifier,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -181,7 +181,7 @@ suspend fun TelegramBot.sendTextMessage(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = sendTextMessage(chatId, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendTextMessage(chatId, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -191,7 +191,7 @@ suspend fun TelegramBot.sendTextMessage(
 suspend fun TelegramBot.sendTextMessage(
     chatId: ChatIdentifier,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -199,7 +199,7 @@ suspend fun TelegramBot.sendTextMessage(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = sendTextMessage(chatId, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendTextMessage(chatId, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -208,14 +208,14 @@ suspend fun TelegramBot.sendTextMessage(
 suspend fun TelegramBot.sendMessage(
     chat: Chat,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendMessage(chat.id, entities, linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendMessage(chat.id, entities, disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -224,7 +224,7 @@ suspend fun TelegramBot.sendMessage(
 suspend fun TelegramBot.sendMessage(
     chat: Chat,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -232,7 +232,7 @@ suspend fun TelegramBot.sendMessage(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = sendMessage(chat, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendMessage(chat, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -242,7 +242,7 @@ suspend fun TelegramBot.sendMessage(
 suspend fun TelegramBot.sendMessage(
     chat: Chat,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -250,7 +250,7 @@ suspend fun TelegramBot.sendMessage(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = sendMessage(chat, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendMessage(chat, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -260,14 +260,14 @@ suspend fun TelegramBot.sendMessage(
 suspend fun TelegramBot.sendTextMessage(
     chat: Chat,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendTextMessage(chat.id, entities, linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendTextMessage(chat.id, entities, disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -276,7 +276,7 @@ suspend fun TelegramBot.sendTextMessage(
 suspend fun TelegramBot.sendTextMessage(
     chat: Chat,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -284,7 +284,7 @@ suspend fun TelegramBot.sendTextMessage(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = sendTextMessage(chat, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendTextMessage(chat, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -294,7 +294,7 @@ suspend fun TelegramBot.sendTextMessage(
 suspend fun TelegramBot.sendTextMessage(
     chat: Chat,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -302,4 +302,4 @@ suspend fun TelegramBot.sendTextMessage(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = sendTextMessage(chat, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendTextMessage(chat, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)

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

@@ -56,7 +56,6 @@ suspend fun TelegramBot.send(
     animation: AnimationFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -66,7 +65,7 @@ suspend fun TelegramBot.send(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(chatId, animation, text, parseMode, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendAnimation(chatId, animation, text, parseMode, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendAnimation] request
@@ -78,7 +77,6 @@ suspend fun TelegramBot.send(
     animation: AnimationFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -88,7 +86,7 @@ suspend fun TelegramBot.send(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(chat, animation, text, parseMode, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendAnimation(chat, animation, text, parseMode, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendAnimation] request
@@ -99,7 +97,6 @@ suspend fun TelegramBot.send(
     chatId: ChatIdentifier,
     animation: AnimationFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -109,7 +106,7 @@ suspend fun TelegramBot.send(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(chatId, animation, entities, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendAnimation(chatId, animation, entities, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendAnimation] request
@@ -120,7 +117,6 @@ suspend fun TelegramBot.send(
     chat: Chat,
     animation: AnimationFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -130,7 +126,7 @@ suspend fun TelegramBot.send(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(chat, animation, entities, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendAnimation(chat, animation, entities, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendAudio] request
@@ -550,14 +546,14 @@ suspend fun TelegramBot.send(
     chatId: ChatIdentifier,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendTextMessage(chatId, text, parseMode, linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendTextMessage(chatId, text, parseMode, disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendTextMessage] request
@@ -568,14 +564,14 @@ suspend fun TelegramBot.send(
     chat: Chat,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendTextMessage(chat, text, parseMode, linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendTextMessage(chat, text, parseMode, disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendTextMessage] request
@@ -585,14 +581,14 @@ suspend fun TelegramBot.send(
 suspend fun TelegramBot.send(
     chatId: ChatIdentifier,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendTextMessage(chatId, entities, linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendTextMessage(chatId, entities, disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -601,7 +597,7 @@ suspend fun TelegramBot.send(
 suspend fun TelegramBot.send(
     chatId: ChatIdentifier,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -609,7 +605,7 @@ suspend fun TelegramBot.send(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = send(chatId, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = send(chatId, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -619,7 +615,7 @@ suspend fun TelegramBot.send(
 suspend fun TelegramBot.send(
     chatId: ChatIdentifier,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -627,7 +623,7 @@ suspend fun TelegramBot.send(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = send(chatId, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = send(chatId, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -638,14 +634,14 @@ suspend fun TelegramBot.send(
 suspend fun TelegramBot.send(
     chat: Chat,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendTextMessage(chat, entities, linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendTextMessage(chat, entities, disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -654,7 +650,7 @@ suspend fun TelegramBot.send(
 suspend fun TelegramBot.send(
     chat: Chat,
     separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -662,7 +658,7 @@ suspend fun TelegramBot.send(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = send(chat, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = send(chat, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -672,7 +668,7 @@ suspend fun TelegramBot.send(
 suspend fun TelegramBot.send(
     chat: Chat,
     separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
+    disableWebPagePreview: Boolean? = null,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -680,7 +676,7 @@ suspend fun TelegramBot.send(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null,
     builderBody: EntitiesBuilderBody
-) = send(chat, buildEntities(separator, builderBody), linkPreviewOptions, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = send(chat, buildEntities(separator, builderBody), disableWebPagePreview, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendPhoto] request
@@ -692,14 +688,13 @@ suspend fun TelegramBot.send(
     photo: Photo,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chatId, photo, text, parseMode, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chatId, photo, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendPhoto] request
@@ -711,14 +706,13 @@ suspend fun TelegramBot.send(
     photo: Photo,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat, photo, text, parseMode, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chat, photo, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendPhoto] request
@@ -730,14 +724,13 @@ suspend fun TelegramBot.send(
     photoSize: PhotoSize,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chatId, photoSize, text, parseMode, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chatId, photoSize, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendPhoto] request
@@ -749,14 +742,13 @@ suspend fun TelegramBot.send(
     photoSize: PhotoSize,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat, photoSize, text, parseMode, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chat, photoSize, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendPhoto] request
@@ -767,14 +759,13 @@ suspend inline fun TelegramBot.send(
     chatId: ChatIdentifier,
     photo: Photo,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chatId, photo, entities, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chatId, photo, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendPhoto] request
@@ -785,14 +776,13 @@ suspend inline fun TelegramBot.send(
     chat: Chat,
     photo: Photo,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat, photo, entities, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chat, photo, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendPhoto] request
@@ -803,14 +793,13 @@ suspend inline fun TelegramBot.send(
     chatId: ChatIdentifier,
     photoSize: PhotoSize,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chatId, photoSize, entities, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chatId, photoSize, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendPhoto] request
@@ -821,14 +810,13 @@ suspend inline fun TelegramBot.send(
     chat: Chat,
     photoSize: PhotoSize,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat, photoSize, entities, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chat, photoSize, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendRegularPoll] request
@@ -1111,13 +1099,12 @@ suspend fun TelegramBot.send(
     chatId: ChatIdentifier,
     sticker: Sticker,
     threadId: MessageThreadId? = chatId.threadId,
-    emoji: String? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendSticker(chatId, sticker, threadId, emoji, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendSticker(chatId, sticker, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendSticker] request
@@ -1128,13 +1115,12 @@ suspend fun TelegramBot.send(
     chat: Chat,
     sticker: Sticker,
     threadId: MessageThreadId? = chat.id.threadId,
-    emoji: String? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendSticker(chat, sticker, threadId, emoji, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendSticker(chat, sticker, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -1371,14 +1357,13 @@ suspend fun TelegramBot.send(
     video: VideoFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chatId, video, text, parseMode, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(chatId, video, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendVideo] request
@@ -1390,14 +1375,13 @@ suspend fun TelegramBot.send(
     video: VideoFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chat, video, text, parseMode, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(chat, video, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendVideo] request
@@ -1408,14 +1392,13 @@ suspend inline fun TelegramBot.send(
     chatId: ChatIdentifier,
     video: VideoFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chatId, video, entities, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(chatId, video, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendVideo] request
@@ -1426,14 +1409,13 @@ suspend inline fun TelegramBot.send(
     chat: Chat,
     video: VideoFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chat, video, entities, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(chat, video, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * Will execute [sendVideoNote] request

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

@@ -1,51 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.send.SetMessageReactions
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-import dev.inmo.tgbotapi.types.reactions.Reaction
-
-suspend fun TelegramBot.setMessageReactions(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    reactions: List<Reaction>,
-    big: Boolean = false
-) = execute(
-    SetMessageReactions(chatId, messageId, reactions, big)
-)
-
-suspend fun TelegramBot.setMessageReaction(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    reaction: Reaction?,
-    big: Boolean = false
-) = setMessageReactions(chatId, messageId, listOfNotNull(reaction), big)
-
-suspend fun TelegramBot.setMessageReactions(
-    chat: Chat,
-    messageId: MessageId,
-    reactions: List<Reaction>,
-    big: Boolean = false
-) = setMessageReactions(chat.id, messageId, reactions, big)
-
-suspend fun TelegramBot.setMessageReaction(
-    chat: Chat,
-    messageId: MessageId,
-    reaction: Reaction?,
-    big: Boolean = false
-) = setMessageReaction(chat.id, messageId, reaction, big)
-
-suspend fun TelegramBot.setMessageReactions(
-    message: AccessibleMessage,
-    reactions: List<Reaction>,
-    big: Boolean = false
-) = setMessageReactions(message.chat, message.messageId, reactions, big)
-
-suspend fun TelegramBot.setMessageReaction(
-    message: AccessibleMessage,
-    reaction: Reaction?,
-    big: Boolean = false
-) = setMessageReaction(message.chat, message.messageId, reaction, big)

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

@@ -23,7 +23,6 @@ suspend fun TelegramBot.sendAnimation(
     thumb: InputFile? = null,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -40,7 +39,6 @@ suspend fun TelegramBot.sendAnimation(
         thumb,
         text,
         parseMode,
-        spoilered,
         duration,
         width,
         height,
@@ -62,7 +60,6 @@ suspend fun TelegramBot.sendAnimation(
     animation: AnimationFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -73,7 +70,7 @@ suspend fun TelegramBot.sendAnimation(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendAnimation(
-    chatId, animation.fileId, animation.thumbnail ?.fileId, text, parseMode, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
+    chatId, animation.fileId, animation.thumb ?.fileId, text, parseMode, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
 )
 
 /**
@@ -86,7 +83,6 @@ suspend fun TelegramBot.sendAnimation(
     thumb: InputFile? = null,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -96,7 +92,7 @@ suspend fun TelegramBot.sendAnimation(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(chat.id, animation, thumb, text, parseMode, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendAnimation(chat.id, animation, thumb, text, parseMode, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -107,7 +103,6 @@ suspend fun TelegramBot.sendAnimation(
     animation: AnimationFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -117,7 +112,7 @@ suspend fun TelegramBot.sendAnimation(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(chat.id, animation, text, parseMode, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendAnimation(chat.id, animation, text, parseMode, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -129,7 +124,6 @@ suspend fun TelegramBot.sendAnimation(
     animation: InputFile,
     thumb: InputFile? = null,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -145,7 +139,6 @@ suspend fun TelegramBot.sendAnimation(
         animation,
         thumb,
         entities,
-        spoilered,
         duration,
         width,
         height,
@@ -166,7 +159,6 @@ suspend fun TelegramBot.sendAnimation(
     chatId: ChatIdentifier,
     animation: AnimationFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -177,7 +169,7 @@ suspend fun TelegramBot.sendAnimation(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendAnimation(
-    chatId, animation.fileId, animation.thumbnail ?.fileId, entities, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
+    chatId, animation.fileId, animation.thumb ?.fileId, entities, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
 )
 
 /**
@@ -189,7 +181,6 @@ suspend fun TelegramBot.sendAnimation(
     animation: InputFile,
     thumb: InputFile? = null,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -199,7 +190,7 @@ suspend fun TelegramBot.sendAnimation(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(chat.id, animation, thumb, entities, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendAnimation(chat.id, animation, thumb, entities, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -209,7 +200,6 @@ suspend fun TelegramBot.sendAnimation(
     chat: Chat,
     animation: AnimationFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -219,4 +209,4 @@ suspend fun TelegramBot.sendAnimation(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAnimation(chat.id, animation, entities, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendAnimation(chat.id, animation, entities, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)

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

@@ -88,7 +88,7 @@ suspend fun TelegramBot.sendAudio(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAudio(chatId, audio.fileId, audio.thumbnail ?.fileId, text, parseMode, audio.duration, audio.performer, title, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendAudio(chatId, audio.fileId, audio.thumb ?.fileId, text, parseMode, audio.duration, audio.performer, title, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -180,7 +180,7 @@ suspend inline fun TelegramBot.sendAudio(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendAudio(chatId, audio.fileId, audio.thumbnail ?.fileId, entities, audio.duration, audio.performer, title, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendAudio(chatId, audio.fileId, audio.thumb ?.fileId, entities, audio.duration, audio.performer, title, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or

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

@@ -83,7 +83,7 @@ suspend fun TelegramBot.sendDocument(
     replyMarkup: KeyboardMarkup? = null,
     disableContentTypeDetection: Boolean? = null
 ) = sendDocument(
-    chatId, document.fileId, document.thumbnail ?.fileId, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection
+    chatId, document.fileId, document.thumb ?.fileId, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection
 )
 
 /**
@@ -170,7 +170,7 @@ suspend inline fun TelegramBot.sendDocument(
     replyMarkup: KeyboardMarkup? = null,
     disableContentTypeDetection: Boolean? = null
 ) = sendDocument(
-    chatId, document.fileId, document.thumbnail ?.fileId, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection
+    chatId, document.fileId, document.thumb ?.fileId, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection
 )
 
 /**

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

@@ -22,7 +22,6 @@ suspend fun TelegramBot.sendPhoto(
     fileId: InputFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -35,7 +34,6 @@ suspend fun TelegramBot.sendPhoto(
         fileId,
         text,
         parseMode,
-        spoilered,
         threadId,
         disableNotification,
         protectContent,
@@ -54,14 +52,13 @@ suspend fun TelegramBot.sendPhoto(
     fileId: InputFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat.id, fileId, text, parseMode, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chat.id, fileId, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -72,14 +69,13 @@ suspend fun TelegramBot.sendPhoto(
     photo: Photo,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chatId, photo.biggest() ?.fileId ?: error("Photo content must not be empty"), text, parseMode, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chatId, photo.biggest() ?.fileId ?: error("Photo content must not be empty"), text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -90,14 +86,13 @@ suspend fun TelegramBot.sendPhoto(
     photo: Photo,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat.id, photo, text, parseMode, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chat.id, photo, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -108,14 +103,13 @@ suspend fun TelegramBot.sendPhoto(
     photoSize: PhotoSize,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chatId, photoSize.fileId, text, parseMode, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chatId, photoSize.fileId, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -126,14 +120,13 @@ suspend fun TelegramBot.sendPhoto(
     photoSize: PhotoSize,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat.id, photoSize, text, parseMode, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chat.id, photoSize, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -144,7 +137,6 @@ suspend inline fun TelegramBot.sendPhoto(
     chatId: ChatIdentifier,
     fileId: InputFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -156,7 +148,6 @@ suspend inline fun TelegramBot.sendPhoto(
         chatId,
         fileId,
         entities,
-        spoilered,
         threadId,
         disableNotification,
         protectContent,
@@ -174,14 +165,13 @@ suspend inline fun TelegramBot.sendPhoto(
     chat: Chat,
     fileId: InputFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat.id, fileId, entities, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chat.id, fileId, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -191,14 +181,13 @@ suspend inline fun TelegramBot.sendPhoto(
     chatId: ChatIdentifier,
     photo: Photo,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chatId, photo.biggest() ?.fileId ?: error("Photo content must not be empty"), entities, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chatId, photo.biggest() ?.fileId ?: error("Photo content must not be empty"), entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -208,14 +197,13 @@ suspend inline fun TelegramBot.sendPhoto(
     chat: Chat,
     photo: Photo,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat.id, photo, entities, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chat.id, photo, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -225,14 +213,13 @@ suspend inline fun TelegramBot.sendPhoto(
     chatId: ChatIdentifier,
     photoSize: PhotoSize,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chatId, photoSize.fileId, entities, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chatId, photoSize.fileId, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -242,11 +229,10 @@ suspend inline fun TelegramBot.sendPhoto(
     chat: Chat,
     photoSize: PhotoSize,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat.id, photoSize, entities, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendPhoto(chat.id, photoSize, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)

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

@@ -19,14 +19,13 @@ suspend fun TelegramBot.sendSticker(
     chatId: ChatIdentifier,
     sticker: InputFile,
     threadId: MessageThreadId? = chatId.threadId,
-    emoji: String? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = execute(
-    SendSticker(chatId, sticker, threadId, emoji, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+    SendSticker(chatId, sticker, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 )
 
 /**
@@ -37,13 +36,12 @@ suspend fun TelegramBot.sendSticker(
     chat: Chat,
     sticker: InputFile,
     threadId: MessageThreadId? = chat.id.threadId,
-    emoji: String? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendSticker(chat.id, sticker, threadId, emoji, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendSticker(chat.id, sticker, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -53,13 +51,12 @@ suspend fun TelegramBot.sendSticker(
     chatId: ChatIdentifier,
     sticker: Sticker,
     threadId: MessageThreadId? = chatId.threadId,
-    emoji: String? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendSticker(chatId, sticker.fileId, threadId, emoji, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendSticker(chatId, sticker.fileId, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -69,10 +66,9 @@ suspend fun TelegramBot.sendSticker(
     chat: Chat,
     sticker: Sticker,
     threadId: MessageThreadId? = chat.id.threadId,
-    emoji: String? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendSticker(chat, sticker.fileId, threadId, emoji, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendSticker(chat, sticker.fileId, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)

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

@@ -23,7 +23,6 @@ suspend fun TelegramBot.sendVideo(
     thumb: InputFile? = null,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -40,7 +39,6 @@ suspend fun TelegramBot.sendVideo(
         thumb,
         text,
         parseMode,
-        spoilered,
         duration,
         width,
         height,
@@ -63,14 +61,13 @@ suspend fun TelegramBot.sendVideo(
     video: VideoFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chatId, video.fileId, video.thumbnail ?.fileId, text, parseMode, spoilered, video.duration, video.width, video.height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(chatId, video.fileId, video.thumb ?.fileId, text, parseMode, video.duration, video.width, video.height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -82,7 +79,6 @@ suspend fun TelegramBot.sendVideo(
     thumb: InputFile? = null,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -92,7 +88,7 @@ suspend fun TelegramBot.sendVideo(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chat.id, video, thumb, text, parseMode, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(chat.id, video, thumb, text, parseMode, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -104,14 +100,13 @@ suspend fun TelegramBot.sendVideo(
     video: VideoFile,
     text: String? = null,
     parseMode: ParseMode? = null,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chat.id, video, text, parseMode, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(chat.id, video, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -122,7 +117,6 @@ suspend inline fun TelegramBot.sendVideo(
     video: InputFile,
     thumb: InputFile? = null,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -138,7 +132,6 @@ suspend inline fun TelegramBot.sendVideo(
         video,
         thumb,
         entities,
-        spoilered,
         duration,
         width,
         height,
@@ -160,14 +153,13 @@ suspend inline fun TelegramBot.sendVideo(
     chatId: ChatIdentifier,
     video: VideoFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chatId, video.fileId, video.thumbnail ?.fileId, entities, spoilered, video.duration, video.width, video.height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(chatId, video.fileId, video.thumb ?.fileId, entities, video.duration, video.width, video.height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -178,7 +170,6 @@ suspend inline fun TelegramBot.sendVideo(
     video: InputFile,
     thumb: InputFile? = null,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     duration: Long? = null,
     width: Int? = null,
     height: Int? = null,
@@ -188,7 +179,7 @@ suspend inline fun TelegramBot.sendVideo(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chat.id, video, thumb, entities, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(chat.id, video, thumb, entities, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 
 /**
@@ -199,11 +190,10 @@ suspend inline fun TelegramBot.sendVideo(
     chat: Chat,
     video: VideoFile,
     entities: TextSourcesList,
-    spoilered: Boolean = false,
     threadId: MessageThreadId? = chat.id.threadId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chat.id, video, entities, spoilered, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(chat.id, video, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)

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

@@ -57,7 +57,7 @@ suspend fun TelegramBot.sendVideoNote(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendVideoNote(
-    chatId, videoNote.fileId, videoNote.thumbnail ?.fileId, videoNote.duration, videoNote.width, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
+    chatId, videoNote.fileId, videoNote.thumb ?.fileId, videoNote.duration, videoNote.width, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
 )
 
 /**

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddAnimatedStickerToSet.kt

@@ -0,0 +1,90 @@
+package dev.inmo.tgbotapi.extensions.api.stickers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.stickers.AddAnimatedStickerToSet
+import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+import dev.inmo.tgbotapi.types.stickers.StickerSet
+
+suspend fun TelegramBot.addAnimatedStickerToSet(
+    userId: UserId,
+    stickerSetName: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = execute(
+    AddAnimatedStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
+)
+
+suspend fun TelegramBot.addAnimatedStickerToSet(
+    userId: UserId,
+    stickerSetName: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = execute(
+    AddAnimatedStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
+)
+
+suspend fun TelegramBot.addAnimatedStickerToSet(
+    user: CommonUser,
+    stickerSetName: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addAnimatedStickerToSet(
+    user.id, stickerSetName, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addAnimatedStickerToSet(
+    user: CommonUser,
+    stickerSetName: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addAnimatedStickerToSet(
+    user.id, stickerSetName, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addAnimatedStickerToSet(
+    userId: UserId,
+    stickerSet: StickerSet,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addAnimatedStickerToSet(
+    userId, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addAnimatedStickerToSet(
+    userId: UserId,
+    stickerSet: StickerSet,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addAnimatedStickerToSet(
+    userId, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addAnimatedStickerToSet(
+    user: CommonUser,
+    stickerSet: StickerSet,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addAnimatedStickerToSet(
+    user.id, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addAnimatedStickerToSet(
+    user: CommonUser,
+    stickerSet: StickerSet,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addAnimatedStickerToSet(
+    user.id, stickerSet.name, sticker, emojis, maskPosition
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddStaticStickerToSet.kt

@@ -0,0 +1,90 @@
+package dev.inmo.tgbotapi.extensions.api.stickers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.stickers.AddStaticStickerToSet
+import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+import dev.inmo.tgbotapi.types.stickers.StickerSet
+
+suspend fun TelegramBot.addStaticStickerToSet(
+    userId: UserId,
+    stickerSetName: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = execute(
+    AddStaticStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
+)
+
+suspend fun TelegramBot.addStaticStickerToSet(
+    userId: UserId,
+    stickerSetName: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = execute(
+    AddStaticStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
+)
+
+suspend fun TelegramBot.addStaticStickerToSet(
+    user: CommonUser,
+    stickerSetName: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addStaticStickerToSet(
+    user.id, stickerSetName, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addStaticStickerToSet(
+    user: CommonUser,
+    stickerSetName: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addStaticStickerToSet(
+    user.id, stickerSetName, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addStaticStickerToSet(
+    userId: UserId,
+    stickerSet: StickerSet,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addStaticStickerToSet(
+    userId, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addStaticStickerToSet(
+    userId: UserId,
+    stickerSet: StickerSet,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addStaticStickerToSet(
+    userId, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addStaticStickerToSet(
+    user: CommonUser,
+    stickerSet: StickerSet,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addStaticStickerToSet(
+    user.id, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addStaticStickerToSet(
+    user: CommonUser,
+    stickerSet: StickerSet,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addStaticStickerToSet(
+    user.id, stickerSet.name, sticker, emojis, maskPosition
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddStickerToSet.kt

@@ -1,116 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.stickers
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.InputFile
-import dev.inmo.tgbotapi.requests.stickers.AddStickerToSet
-import dev.inmo.tgbotapi.requests.stickers.InputSticker
-import dev.inmo.tgbotapi.types.StickerType
-import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.stickers.MaskPosition
-import dev.inmo.tgbotapi.types.stickers.StickerSet
-
-suspend fun TelegramBot.addStickerToSet(
-    userId: UserId,
-    stickerSetName: String,
-    inputSticker: InputSticker
-) = execute(
-    AddStickerToSet(userId, stickerSetName, inputSticker)
-)
-
-suspend fun TelegramBot.addStickerToSet(
-    userId: UserId,
-    stickerSet: StickerSet,
-    sticker: InputSticker
-) = addStickerToSet(
-    userId,
-    stickerSet.name,
-    sticker
-)
-
-suspend fun TelegramBot.addStickerToSet(
-    userId: UserId,
-    stickerSet: StickerSet,
-    sticker: InputFile,
-    emojis: List<String>,
-    keywords: List<String> = emptyList()
-) = addStickerToSet(
-    userId,
-    stickerSet,
-    when (stickerSet.stickerType) {
-        StickerType.CustomEmoji -> InputSticker.WithKeywords.CustomEmoji(
-            sticker,
-            emojis,
-            keywords
-        )
-        StickerType.Mask -> InputSticker.Mask(
-            sticker,
-            emojis
-        )
-        StickerType.Regular -> InputSticker.WithKeywords.Regular(
-            sticker,
-            emojis,
-            keywords
-        )
-        is StickerType.Unknown -> error("Unable to create sticker to the set with type ${stickerSet.stickerType}")
-    }
-)
-
-suspend fun TelegramBot.addStickerToSet(
-    userId: UserId,
-    stickerSet: StickerSet,
-    sticker: InputFile,
-    emojis: List<String>,
-    maskPosition: MaskPosition? = null
-) = addStickerToSet(
-    userId,
-    stickerSet.name,
-    when (stickerSet.stickerType) {
-        StickerType.CustomEmoji -> InputSticker.WithKeywords.CustomEmoji(
-            sticker,
-            emojis,
-            emptyList()
-        )
-        StickerType.Mask -> InputSticker.Mask(
-            sticker,
-            emojis,
-            maskPosition
-        )
-        StickerType.Regular -> InputSticker.WithKeywords.Regular(
-            sticker,
-            emojis,
-            emptyList()
-        )
-        is StickerType.Unknown -> error("Unable to create sticker to the set with type ${stickerSet.stickerType}")
-    }
-)
-
-suspend fun TelegramBot.addStickerToSet(
-    user: CommonUser,
-    stickerSet: StickerSet,
-    sticker: InputSticker
-) = addStickerToSet(
-    user.id,
-    stickerSet.name,
-    sticker
-)
-
-suspend fun TelegramBot.addStickerToSet(
-    user: CommonUser,
-    stickerSet: StickerSet,
-    sticker: InputFile,
-    emojis: List<String>,
-    keywords: List<String> = emptyList()
-) = addStickerToSet(
-    user.id, stickerSet, sticker, emojis, keywords
-)
-
-suspend fun TelegramBot.addStickerToSet(
-    user: CommonUser,
-    stickerSet: StickerSet,
-    sticker: InputFile,
-    emojis: List<String>,
-    maskPosition: MaskPosition? = null
-) = addStickerToSet(
-    user.id, stickerSet, sticker, emojis, maskPosition
-)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddVideoStickerToSet.kt

@@ -0,0 +1,90 @@
+package dev.inmo.tgbotapi.extensions.api.stickers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.stickers.AddVideoStickerToSet
+import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+import dev.inmo.tgbotapi.types.stickers.StickerSet
+
+suspend fun TelegramBot.addVideoStickerToSet(
+    userId: UserId,
+    stickerSetName: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = execute(
+    AddVideoStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
+)
+
+suspend fun TelegramBot.addVideoStickerToSet(
+    userId: UserId,
+    stickerSetName: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = execute(
+    AddVideoStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
+)
+
+suspend fun TelegramBot.addVideoStickerToSet(
+    user: CommonUser,
+    stickerSetName: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addVideoStickerToSet(
+    user.id, stickerSetName, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addVideoStickerToSet(
+    user: CommonUser,
+    stickerSetName: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addVideoStickerToSet(
+    user.id, stickerSetName, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addVideoStickerToSet(
+    userId: UserId,
+    stickerSet: StickerSet,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addVideoStickerToSet(
+    userId, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addVideoStickerToSet(
+    userId: UserId,
+    stickerSet: StickerSet,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addVideoStickerToSet(
+    userId, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addVideoStickerToSet(
+    user: CommonUser,
+    stickerSet: StickerSet,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addVideoStickerToSet(
+    user.id, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.addVideoStickerToSet(
+    user: CommonUser,
+    stickerSet: StickerSet,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addVideoStickerToSet(
+    user.id, stickerSet.name, sticker, emojis, maskPosition
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewAnimatedStickerSet.kt

@@ -0,0 +1,58 @@
+package dev.inmo.tgbotapi.extensions.api.stickers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.stickers.CreateNewAnimatedStickerSet
+import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+
+suspend fun TelegramBot.createNewAnimatedStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = execute(
+    CreateNewAnimatedStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
+)
+
+suspend fun TelegramBot.createNewAnimatedStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = execute(
+    CreateNewAnimatedStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
+)
+
+
+suspend fun TelegramBot.createNewAnimatedStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = createNewAnimatedStickerSet(
+    user.id, name, title, sticker, emojis, containsMasks, maskPosition
+)
+
+suspend fun TelegramBot.createNewAnimatedStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = createNewAnimatedStickerSet(
+    user.id, name, title, sticker, emojis, containsMasks, maskPosition
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewMaskAnimatedStickerSet.kt

@@ -0,0 +1,54 @@
+package dev.inmo.tgbotapi.extensions.api.stickers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.stickers.*
+import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+
+suspend fun TelegramBot.createNewMaskAnimatedStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition
+) = execute(
+    CreateNewMaskAnimatedStickerSet(userId, name, title, sticker, emojis, maskPosition)
+)
+
+suspend fun TelegramBot.createNewMaskAnimatedStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition
+) = execute(
+    CreateNewMaskAnimatedStickerSet(userId, name, title, sticker, emojis, maskPosition)
+)
+
+
+suspend fun TelegramBot.createNewMaskAnimatedStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition
+) = createNewMaskAnimatedStickerSet(
+    user.id, name, title, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.createNewMaskAnimatedStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition
+) = createNewMaskAnimatedStickerSet(
+    user.id, name, title, sticker, emojis, maskPosition
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewMaskStickerSet.kt

@@ -0,0 +1,54 @@
+package dev.inmo.tgbotapi.extensions.api.stickers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.stickers.*
+import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+
+suspend fun TelegramBot.createNewMaskStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition
+) = execute(
+    CreateNewMaskStickerSet(userId, name, title, sticker, emojis, maskPosition)
+)
+
+suspend fun TelegramBot.createNewMaskStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition
+) = execute(
+    CreateNewMaskStickerSet(userId, name, title, sticker, emojis, maskPosition)
+)
+
+
+suspend fun TelegramBot.createNewMaskStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition
+) = createNewMaskStickerSet(
+    user.id, name, title, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.createNewMaskStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition
+) = createNewMaskStickerSet(
+    user.id, name, title, sticker, emojis, maskPosition
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewMaskVideoStickerSet.kt

@@ -0,0 +1,54 @@
+package dev.inmo.tgbotapi.extensions.api.stickers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.stickers.*
+import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+
+suspend fun TelegramBot.createNewMaskVideoStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition
+) = execute(
+    CreateNewMaskVideoStickerSet(userId, name, title, sticker, emojis, maskPosition)
+)
+
+suspend fun TelegramBot.createNewMaskVideoStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition
+) = execute(
+    CreateNewMaskVideoStickerSet(userId, name, title, sticker, emojis, maskPosition)
+)
+
+
+suspend fun TelegramBot.createNewMaskVideoStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition
+) = createNewMaskVideoStickerSet(
+    user.id, name, title, sticker, emojis, maskPosition
+)
+
+suspend fun TelegramBot.createNewMaskVideoStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition
+) = createNewMaskVideoStickerSet(
+    user.id, name, title, sticker, emojis, maskPosition
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewRegularAnimatedStickerSet.kt

@@ -0,0 +1,50 @@
+package dev.inmo.tgbotapi.extensions.api.stickers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.stickers.*
+import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+
+suspend fun TelegramBot.createNewRegularAnimatedStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String
+) = execute(
+    CreateNewRegularAnimatedStickerSet(userId, name, title, sticker, emojis)
+)
+
+suspend fun TelegramBot.createNewRegularAnimatedStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String
+) = execute(
+    CreateNewRegularAnimatedStickerSet(userId, name, title, sticker, emojis)
+)
+
+
+suspend fun TelegramBot.createNewRegularAnimatedStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String
+) = createNewRegularAnimatedStickerSet(
+    user.id, name, title, sticker, emojis
+)
+
+suspend fun TelegramBot.createNewRegularAnimatedStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String
+) = createNewRegularAnimatedStickerSet(
+    user.id, name, title, sticker, emojis
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewRegularStickerSet.kt

@@ -0,0 +1,50 @@
+package dev.inmo.tgbotapi.extensions.api.stickers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.stickers.*
+import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+
+suspend fun TelegramBot.createNewRegularStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String
+) = execute(
+    CreateNewRegularStickerSet(userId, name, title, sticker, emojis)
+)
+
+suspend fun TelegramBot.createNewRegularStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String
+) = execute(
+    CreateNewRegularStickerSet(userId, name, title, sticker, emojis)
+)
+
+
+suspend fun TelegramBot.createNewRegularStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String
+) = createNewRegularStickerSet(
+    user.id, name, title, sticker, emojis
+)
+
+suspend fun TelegramBot.createNewRegularStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String
+) = createNewRegularStickerSet(
+    user.id, name, title, sticker, emojis
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewRegularVideoStickerSet.kt

@@ -0,0 +1,50 @@
+package dev.inmo.tgbotapi.extensions.api.stickers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.stickers.*
+import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+
+suspend fun TelegramBot.createNewRegularVideoStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String
+) = execute(
+    CreateNewRegularVideoStickerSet(userId, name, title, sticker, emojis)
+)
+
+suspend fun TelegramBot.createNewRegularVideoStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String
+) = execute(
+    CreateNewRegularVideoStickerSet(userId, name, title, sticker, emojis)
+)
+
+
+suspend fun TelegramBot.createNewRegularVideoStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String
+) = createNewRegularVideoStickerSet(
+    user.id, name, title, sticker, emojis
+)
+
+suspend fun TelegramBot.createNewRegularVideoStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String
+) = createNewRegularVideoStickerSet(
+    user.id, name, title, sticker, emojis
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewStaticStickerSet.kt

@@ -0,0 +1,58 @@
+package dev.inmo.tgbotapi.extensions.api.stickers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.stickers.CreateNewStaticStickerSet
+import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+
+suspend fun TelegramBot.createNewStaticStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = execute(
+    CreateNewStaticStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
+)
+
+suspend fun TelegramBot.createNewStaticStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = execute(
+    CreateNewStaticStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
+)
+
+
+suspend fun TelegramBot.createNewStaticStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = createNewStaticStickerSet(
+    user.id, name, title, sticker, emojis, containsMasks, maskPosition
+)
+
+suspend fun TelegramBot.createNewStaticStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = createNewStaticStickerSet(
+    user.id, name, title, sticker, emojis, containsMasks, maskPosition
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewStickerSet.kt

@@ -1,31 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.stickers
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.stickers.CreateNewStickerSet
-import dev.inmo.tgbotapi.requests.stickers.InputSticker
-import dev.inmo.tgbotapi.types.StickerFormat
-import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.UserId
-
-suspend fun TelegramBot.createNewStickerSet(
-    userId: UserId,
-    name: String,
-    title: String,
-    stickersFormat: StickerFormat,
-    stickers: List<InputSticker>,
-    needsRepainting: Boolean = false
-) = execute(
-    CreateNewStickerSet(userId, name, title, stickersFormat, stickers, needsRepainting)
-)
-
-
-suspend fun TelegramBot.createNewStickerSet(
-    user: CommonUser,
-    name: String,
-    title: String,
-    stickersFormat: StickerFormat,
-    stickers: List<InputSticker>,
-    needsRepainting: Boolean = false,
-) = createNewStickerSet(
-    user.id, name, title, stickersFormat, stickers, needsRepainting
-)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewVideoStickerSet.kt

@@ -0,0 +1,58 @@
+package dev.inmo.tgbotapi.extensions.api.stickers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.stickers.CreateNewVideoStickerSet
+import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+
+suspend fun TelegramBot.createNewVideoStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = execute(
+    CreateNewVideoStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
+)
+
+suspend fun TelegramBot.createNewVideoStickerSet(
+    userId: UserId,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = execute(
+    CreateNewVideoStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
+)
+
+
+suspend fun TelegramBot.createNewVideoStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: FileId,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = createNewVideoStickerSet(
+    user.id, name, title, sticker, emojis, containsMasks, maskPosition
+)
+
+suspend fun TelegramBot.createNewVideoStickerSet(
+    user: CommonUser,
+    name: String,
+    title: String,
+    sticker: MultipartFile,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+) = createNewVideoStickerSet(
+    user.id, name, title, sticker, emojis, containsMasks, maskPosition
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/DeleteStickerSet.kt

@@ -1,25 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.stickers
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.requests.stickers.DeleteStickerFromSet
-import dev.inmo.tgbotapi.requests.stickers.DeleteStickerSet
-import dev.inmo.tgbotapi.types.StickerSetName
-import dev.inmo.tgbotapi.types.files.Sticker
-import dev.inmo.tgbotapi.types.stickers.StickerSet
-
-suspend fun TelegramBot.deleteStickerSet(
-    name: StickerSetName
-) = execute(
-    DeleteStickerSet(name)
-)
-
-suspend fun TelegramBot.deleteStickerSet(
-    sticker: Sticker
-) = deleteStickerSet(
-    sticker.stickerSetName ?: error("Unable to take name of sticker set from sticker $sticker")
-)
-
-suspend fun TelegramBot.deleteStickerSet(
-    stickerSet: StickerSet,
-) = deleteStickerSet(stickerSet.name)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetCustomEmojiStickerSetThumb.kt

@@ -1,26 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.thumbs
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
-import dev.inmo.tgbotapi.requests.stickers.SetCustomEmojiStickerSetThumbnail
-import dev.inmo.tgbotapi.requests.stickers.SetStickerSetThumbnail
-import dev.inmo.tgbotapi.types.CustomEmojiId
-import dev.inmo.tgbotapi.types.StickerSetName
-import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.stickers.StickerSet
-
-suspend fun TelegramBot.setCustomEmojiStickerSetThumbnail(
-    stickerSetName: StickerSetName,
-    customEmojiId: CustomEmojiId
-) = execute(
-    SetCustomEmojiStickerSetThumbnail(stickerSetName, customEmojiId)
-)
-
-suspend fun TelegramBot.setCustomEmojiStickerSetThumbnail(
-    stickerSet: StickerSet,
-    customEmojiId: CustomEmojiId
-) = setCustomEmojiStickerSetThumbnail(
-    stickerSet.name, customEmojiId
-)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerEmojiList.kt

@@ -1,25 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.stickers
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.requests.stickers.SetStickerEmojiList
-import dev.inmo.tgbotapi.requests.stickers.SetStickerPositionInSet
-import dev.inmo.tgbotapi.types.files.Sticker
-
-suspend fun TelegramBot.setStickerEmojiList(
-    sticker: FileId,
-    emojis: List<String>
-) = execute(
-    SetStickerEmojiList(
-        sticker,
-        emojis
-    )
-)
-
-suspend fun TelegramBot.setStickerEmojiList(
-    sticker: Sticker,
-    vararg emojis: String
-) = setStickerEmojiList(
-    sticker.fileId,
-    emojis.toList()
-)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerKeywords.kt

@@ -1,26 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.stickers
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.requests.stickers.SetStickerEmojiList
-import dev.inmo.tgbotapi.requests.stickers.SetStickerKeywords
-import dev.inmo.tgbotapi.requests.stickers.SetStickerPositionInSet
-import dev.inmo.tgbotapi.types.files.Sticker
-
-suspend fun TelegramBot.setStickerKeywords(
-    sticker: FileId,
-    keywords: List<String>
-) = execute(
-    SetStickerKeywords(
-        sticker,
-        keywords
-    )
-)
-
-suspend fun TelegramBot.setStickerKeywords(
-    sticker: Sticker,
-    vararg keywords: String
-) = setStickerKeywords(
-    sticker.fileId,
-    keywords.toList()
-)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerMaskPosition.kt

@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.stickers
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.requests.stickers.SetStickerEmojiList
-import dev.inmo.tgbotapi.requests.stickers.SetStickerMaskPosition
-import dev.inmo.tgbotapi.requests.stickers.SetStickerPositionInSet
-import dev.inmo.tgbotapi.types.files.Sticker
-import dev.inmo.tgbotapi.types.stickers.MaskPosition
-
-suspend fun TelegramBot.setStickerMaskPosition(
-    sticker: FileId,
-    maskPosition: MaskPosition
-) = execute(
-    SetStickerMaskPosition(
-        sticker,
-        maskPosition
-    )
-)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerSetThumb.kt

@@ -3,72 +3,72 @@ package dev.inmo.tgbotapi.extensions.api.thumbs
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
-import dev.inmo.tgbotapi.requests.stickers.SetStickerSetThumbnail
-import dev.inmo.tgbotapi.types.StickerSetName
+import dev.inmo.tgbotapi.requests.stickers.SetStickerSetThumb
 import dev.inmo.tgbotapi.types.chat.CommonUser
 import dev.inmo.tgbotapi.types.UserId
 import dev.inmo.tgbotapi.types.stickers.StickerSet
 
-suspend fun TelegramBot.setStickerSetThumbnail(
+suspend fun TelegramBot.setStickerSetThumb(
     userId: UserId,
-    stickerSetName: StickerSetName,
-    thumbnail: FileId
+    thumbSetName: String,
+    thumb: FileId
 ) = execute(
-    SetStickerSetThumbnail(userId, stickerSetName, thumbnail)
+    SetStickerSetThumb(userId, thumbSetName, thumb)
 )
 
-suspend fun TelegramBot.setStickerSetThumbnail(
+suspend fun TelegramBot.setStickerSetThumb(
     userId: UserId,
-    stickerSetName: StickerSetName,
-    thumbnail: MultipartFile
+    thumbSetName: String,
+    thumb: MultipartFile
 ) = execute(
-    SetStickerSetThumbnail(userId, stickerSetName, thumbnail)
+    SetStickerSetThumb(userId, thumbSetName, thumb)
 )
 
-suspend fun TelegramBot.setStickerSetThumbnail(
+suspend fun TelegramBot.setStickerSetThumb(
     user: CommonUser,
-    stickerSetName: StickerSetName,
-    thumbnail: FileId
-) = setStickerSetThumbnail(
-    user.id, stickerSetName, thumbnail
+    thumbSetName: String,
+    thumb: FileId
+) = setStickerSetThumb(
+    user.id, thumbSetName, thumb
 )
 
-suspend fun TelegramBot.setStickerSetThumbnail(
+suspend fun TelegramBot.setStickerSetThumb(
     user: CommonUser,
-    stickerSetName: StickerSetName,
-    thumbnail: MultipartFile
-) = setStickerSetThumbnail(
-    user.id, stickerSetName, thumbnail
+    thumbSetName: String,
+    thumb: MultipartFile
+) = setStickerSetThumb(
+    user.id, thumbSetName, thumb
 )
 
-suspend fun TelegramBot.setStickerSetThumbnail(
+suspend fun TelegramBot.setStickerSetThumb(
     userId: UserId,
-    stickerSet: StickerSet,
-    thumbnail: FileId
-) = setStickerSetThumbnail(
-    userId, stickerSet.name, thumbnail
+    thumbSet: StickerSet,
+    thumb: FileId
+) = setStickerSetThumb(
+    userId, thumbSet.name, thumb
 )
 
-suspend fun TelegramBot.setStickerSetThumbnail(
+suspend fun TelegramBot.setStickerSetThumb(
     userId: UserId,
-    stickerSet: StickerSet,
-    thumbnail: MultipartFile
-) = setStickerSetThumbnail(
-    userId, stickerSet.name, thumbnail
+    thumbSet: StickerSet,
+    thumb: MultipartFile
+) = setStickerSetThumb(
+    userId, thumbSet.name, thumb
 )
 
-suspend fun TelegramBot.setStickerSetThumbnail(
+suspend fun TelegramBot.setStickerSetThumb(
     user: CommonUser,
-    stickerSet: StickerSet,
-    thumbnail: FileId
-) = setStickerSetThumbnail(
-    user.id, stickerSet.name, thumbnail
+    thumbSet: StickerSet,
+    thumb: FileId
+) = setStickerSetThumb(
+    user.id, thumbSet.name, thumb
 )
 
-suspend fun TelegramBot.setStickerSetThumbnail(
+suspend fun TelegramBot.setStickerSetThumb(
     user: CommonUser,
-    stickerSet: StickerSet,
-    thumbnail: MultipartFile
-) = setStickerSetThumbnail(
-    user.id, stickerSet.name, thumbnail
+    thumbSet: StickerSet,
+    thumb: MultipartFile
+) = setStickerSetThumb(
+    user.id, thumbSet.name, thumb
 )
+

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerSetTitle.kt

@@ -1,22 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.stickers
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.stickers.SetStickerSetTitle
-import dev.inmo.tgbotapi.types.StickerSetName
-import dev.inmo.tgbotapi.types.files.Sticker
-import dev.inmo.tgbotapi.types.stickers.StickerSet
-
-suspend fun TelegramBot.setStickerSetTitle(
-    name: StickerSetName,
-    title: String
-) = execute(SetStickerSetTitle(name, title))
-
-suspend fun TelegramBot.setStickerSetTitle(
-    sticker: Sticker,
-    title: String
-) = setStickerSetTitle(sticker.stickerSetName ?: error("Unable to take name of sticker set from sticker $sticker"), title)
-
-suspend fun TelegramBot.setStickerSetTitle(
-    stickerSet: StickerSet,
-    title: String
-) = setStickerSetTitle(stickerSet.name, title)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/UploadStickerFile.kt

@@ -3,22 +3,19 @@ package dev.inmo.tgbotapi.extensions.api.stickers
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
 import dev.inmo.tgbotapi.requests.stickers.UploadStickerFile
-import dev.inmo.tgbotapi.types.StickerFormat
 import dev.inmo.tgbotapi.types.chat.CommonUser
 import dev.inmo.tgbotapi.types.UserId
 
 suspend fun TelegramBot.uploadStickerFile(
     userId: UserId,
-    sticker: MultipartFile,
-    stickerFormat: StickerFormat
+    sticker: MultipartFile
 ) = execute(
-    UploadStickerFile(userId, sticker, stickerFormat)
+    UploadStickerFile(userId, sticker)
 )
 
 suspend fun TelegramBot.uploadStickerFile(
     user: CommonUser,
-    sticker: MultipartFile,
-    stickerFormat: StickerFormat
+    sticker: MultipartFile
 ) = execute(
-    UploadStickerFile(user.id, sticker, stickerFormat)
+    UploadStickerFile(user.id, sticker)
 )