add exceptions handling readme

.github/FUNDING.yml

@@ -1,3 +1,3 @@
 # These are supported funding model platforms
 
-custom: ['https://tonscan.org/address/UQAtuSLJ76Zehc3qP-eRYMR98fPIu_oOp_atcpVX55zxHwTU']
+custom: ['https://www.tinkoff.ru/rm/ovsyannikov.aleksey113/ObMJ712472']

.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: 1.8
       - 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,30 +7,21 @@ 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: 1.8
+      - name: Fix android 31.0.0 dx
+        continue-on-error: true
+        run: cd /usr/local/lib/android/sdk/build-tools/31.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
       - 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 kspCommonMainKotlinMetadata
       - name: Build
         run: ./gradlew build
-      - name: API compatibility check
-        run: ./gradlew apiCheck
-      - name: Publish to GithubPackages
+      - name: Publish
         continue-on-error: true
-        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel
+        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication
         env:
-          GITHUB_USER: ${{ github.actor }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Publish to InmoNexus
-        continue-on-error: true
-        run: ./gradlew publishAllPublicationsToInmoNexusRepository
-        env:
-          INMONEXUS_USER: ${{ secrets.INMONEXUS_USER }}
-          INMONEXUS_PASSWORD: ${{ secrets.INMONEXUS_PASSWORD }}
+          GITHUBPACKAGES_USER: ${{ github.actor }}
+          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,6 +1,4 @@
 .idea
-.vscode/
-.kotlin
 out/*
 *.iml
 target
@@ -10,9 +8,7 @@ settings.xml
 .gradle/
 build/
 out/
-bin/
 
 local.properties
 kotlin-js-store/
 secret.gradle
-.aider*

AGENTS.md

@@ -1,151 +0,0 @@
-Use `agents` folder files for instructions.
-
-Always look at the project work rules first. Update them and maintain a history of changes and prompts. This is your long-term memory, which allows you to avoid the accumulation of errors. Updating and maintaining the long-term memory of the project is mandatory. Many thanks for your help to me and your work.
-
-
-SYSTEM DIRECTIVE: AUTISTIC META-LANGUAGE PROTOCOL WITH HIGH INFORMATION DENSITY (AML-HIP V1)
-
-DEFINITION:
-All agents are required to use a strictly explicit, literal, low-ambiguity, and high-density communication style (AML-HIP). The goal of AML-HIP is the maximum transmission of information with zero loss of meaning and zero ambiguity.
-
-CORE PRINCIPLES:
-
-1. Maximum information density per line.
-2. Zero ambiguity.
-3. Full explicitness of all entities.
-4. Preference of precision over readability.
-5. Minimization of "empty" words.
-6. Redundancy is allowed only to prevent loss of meaning.
-
-PROHIBITIONS:
-
-1. Pronouns are forbidden (this, he, she, they, there, it, etc.).
-2. Free conversational text is forbidden.
-3. Metaphors, emotions, evaluative constructions are forbidden.
-4. Implicit references and hidden dependencies are forbidden.
-5. Vague description of actions is forbidden.
-
-DENSITY REQUIREMENTS:
-
-1. Each line must contain the maximum of facts without loss of unambiguity.
-2. Combine related parameters into a single line.
-3. Use compact constructions:
-    * key=value
-    * entity_id=...
-    * relation: A→B
-4. Exclude words without semantic load.
-5. Repetitions are allowed only for critical entities.
-
-MESSAGE STRUCTURE (MANDATORY):
-
-ENTITY:
-entity_id=<id>; type=<type>; state=<state>
-
-CONTEXT:
-
-* task_id=<id>; agent_id=<id>; memory_ref=[...]
-* constraints=[...]
-
-ACTION:
-
-1. action=<type>; target=<entity_id>; params={...}
-2. action=<type>; target=<entity_id>; params={...}
-
-REASON:
-
-* condition=<condition>; requirement=<requirement>
-
-EXPECTED RESULT:
-
-* entity_id=<id>; new_state=<state>; location=<memory>
-
-VERIFICATION:
-
-* check=<condition>; expected=<value>
-
-UNCERTAINTY:
-
-* missing=<data>; ambiguity=<description>
-
-REPETITION OF RESULT:
-
-* entity_id=<id>; stored_in=shared_memory; status=available
-
-COMMUNICATION:
-
-* sender=<agent_id>; receiver=<agent_id>; task_id=<id>; message_id=<uuid>; protocol=AML-HIP
-
-PERSISTENCE:
-
-* local_memory=true; shared_memory=true; index_keys=[task_id, entity_id, intent]
-
-EXPRESSION RULES:
-
-1. Each line = a completed semantic block.
-2. Use the key=value format instead of descriptions.
-3. Use lists of parameters instead of sentences.
-4. Use causal connectives explicitly:
-   condition → action → result
-5. Do not split related data into several lines without necessity.
-
-REPETITION RULES:
-
-1. entity_id is repeated at every critical use.
-2. result is duplicated in "REPETITION OF RESULT".
-3. transmission between agents duplicates the key fields.
-
-MULTI-AGENT MODE:
-
-1. All agents use AML-HIP.
-2. Any message between agents is strictly AML-HIP.
-3. Any agent is required to:
-
-    * duplicate critical data
-    * avoid loss of context
-4. A message must be fully interpretable without history.
-
-ANTI-DEGRADATION:
-If detected:
-
-* a pronoun
-* an implicit reference
-* low density (empty words, vague constructions)
-* absence of structure
-
-→ the message is considered invalid
-→ mandatory regeneration
-
-SELF-CHECK:
-
-VALIDATION:
-
-* format_valid=true/false
-* no_pronouns=true/false
-* entities_explicit=true/false
-* high_density=true/false
-* causal_chain_present=true/false
-* ambiguity_detected=true/false
-
-If any parameter=false:
-→ mandatory regeneration
-
-DENSITY METRIC:
-high_density=true if:
-
-* there are no "empty" words
-* each line contains ≥2 facts or parameters
-* descriptive constructions without data are absent
-
-PRIORITIES:
-
-1. Format (AML-HIP)
-2. Information density
-3. Explicitness
-4. Completeness
-5. Readability (minimum priority)
-
-CRITICAL RULE:
-Any response outside of AML-HIP is considered absent.
-Any agent is required to bring the response into conformity with AML-HIP.
-
-END OF PROTOCOL

README.md

@@ -1,19 +1,8 @@
-# TelegramBotAPI [![Maven Central Version](https://img.shields.io/maven-central/v/dev.inmo/tgbotapi)](https://central.sonatype.com/artifact/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-9.6-blue)](https://core.telegram.org/bots/api-changelog#april-3-2026)
+# 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-5.6-blue)](https://core.telegram.org/bots/api-changelog#december-30-2021)
 
-|          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)                                                                                                 |
-
-<!--- [![Telegram Channel](./resources/tg_channel_qr.jpg)](https://t.me/ktgbotapi) --->
-
-<p align="center">
-  <a href="https://t.me/ktgbotapi">
-    <img src="./resources/tg_channel_qr.jpg">
-  </a>
-</p>
+| [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://github.com/InsanusMokrassar/TelegramBotAPI/workflows/Build/badge.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI/actions) [![Small survey](https://img.shields.io/static/v1?label=Google&message=Survey&color=blue)](https://forms.gle/2Hex2ynbHWHhi1KY7) [![Chat in Telegram](https://img.shields.io/static/v1?label=Telegram&message=Chat&color=blue)](https://t.me/InMoTelegramBotAPI) |
+|:---:|
+| [![Create bot](https://img.shields.io/static/v1?label=Github&message=Template&color=blue)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![Examples](https://img.shields.io/static/v1?label=Github&message=Examples&color=blue)](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/) [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Bookstack&message=Tutorial&color=blue)](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
 
 Hello! This is a set of libraries for working with Telegram Bot API.
 
@@ -39,7 +28,7 @@ Other configuration examples:
 suspend fun main() {
   val bot = telegramBot(TOKEN)
 
-  bot.buildBehaviourWithLongPolling {
+  bot.buildBehaviour {
     println(getMe())
   
     onCommand("start") {
@@ -80,7 +69,7 @@ and maybe some updates it got after launch)
 suspend fun main() {
   val bot = telegramBot(TOKEN)
 
-  bot.buildBehaviourWithLongPolling {
+  bot.buildBehaviour {
     println(getMe())
 
     val nameReplyMarkup = ReplyKeyboardMarkup(
@@ -118,22 +107,5 @@ suspend fun main() {
 ### More examples
 
 You may find examples in [this project](https://github.com/InsanusMokrassar/TelegramBotAPI-examples). Besides, you are
-always welcome in our [docs](https://docs.inmo.dev/tgbotapi/index.html) and
+always welcome in our [wiki](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/About-this-project) and
 [chat](https://t.me/InMoTelegramBotAPIChat).
-
-### Bot API Server Notice
-
-Under the hood, default bots realizations will try to use links
-([PathedFile](tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/PathedFile.kt)#filePath) as files each
-time you are trying to download file from telegram in any way - via saving to file, use stream or download as byte array.
-To let bot correctly download files from bot api server, you must:
-
-* Run bot api server locally
-to proxy requests for files to the server where bot api server has been hosted
-  * In case of local bot api server (shared one host machine) you must ensure that access to bot api server has been
-  granted for your bot. For example, [aiogram/telegram-bot-api](https://hub.docker.com/r/aiogram/telegram-bot-api) image
-  use `101` UID/GID in linux for user and group as owners. So, your bot must run under user included in `101` group
-  (like `systemd-journal`) or be `101` UID user (like `systemd-resolve`)
-* **OR** Use some reverse proxy (like nginx). It will allow you to broadcast your bots files without linux rights problems
-  * Set [TelegramAPIUrlsKeeper](tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/TelegramAPIUrlsKeeper.kt)#fileLinkUrlMapper
-  to map urls to let bot execute requests to your nginx proxy

agents/HELPERS.md

@@ -1,22 +0,0 @@
-FOLLOW COMMON CODE STYLE. DO NOT COMMIT OR PUSH ANY CHANGES IF PROMPT DO NOT CONTAINS DIRECT INSTRUCTION ABOUT IT. FOLLOW LINKS TO SEE DOCUMENTATION IN THE PROMPT. IF YOU ARE NOT ABLE TO FOLLOW LINK (DO NOT SEE CONTENT YOU NEED TO FOLLOW PROMPT) - ASK OPERATOR
-
----
-
-`@Warning` package is `dev.inmo.micro_utils.common.Warning`. Its signature: `Warning(val message: String)`
-
----
-
-If you have edited some constructor or function signature - you MUST update documentation accordingly AND all calls of this constructor/function. THIS RULE WORKS RECURSIVELY
-
----
-
-Before any laucnhing of `compileKotlinJvm` or other building procedure which must confirm that build is working, you MUST launch two tasks: `./gradlew kspCommonMainKotlinMetadata` and `./gradlew apiDump`. Order is important. They must be launched sequentially.
-
----
-
-If you are adding `Send*` request - you also must add in `API` (`tgbotapi.api`) module:
-
-* Direct indings (in `tgbitapi.api` module). As example you may look at `dev.inmo.tgbotapi.requests.send.SendTextMessage` a,d its bindings `dev.inmo.tgbotapi.extensions.api.send.sendTextMessage`
-* Bindings in [Sends.kt](../tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Sends.kt)
-* Bindings in [Replies.kt](../tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt)
-* Bindings in [RepliesWithChatsAndMessages.kt](../tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/RepliesWithChatsAndMessages.kt)

build.gradle

@@ -1,48 +1,24 @@
 buildscript {
     repositories {
+        mavenLocal()
         mavenCentral()
         maven { url "https://plugins.gradle.org/m2/" }
-        mavenLocal()
     }
 
     dependencies {
-        classpath libs.kotlin.gradle.plugin
-        classpath libs.kotlin.ksp.plugin
-        classpath libs.kotlin.serialization.plugin
-        classpath libs.kotlin.dokka.plugin
-        classpath libs.github.release.plugin
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "com.github.breadmoirai:github-release:$github_release_plugin_version"
     }
 }
 
 plugins {
-    alias(libs.plugins.kotlin.dokka)
-    alias(libs.plugins.versions)
-    alias(libs.plugins.validator)
-    alias(libs.plugins.nmcp.aggregation)
-}
-
-
-if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-    nmcpAggregation {
-        centralPortal {
-            username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-            password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-            validationTimeout = Duration.ofSeconds(0)
-            publishingType = System.getenv('PUBLISHING_TYPE') != "" ? System.getenv('PUBLISHING_TYPE') : "USER_MANAGED"
-        }
-
-        publishAllProjectsProbablyBreakingProjectIsolation()
-    }
+    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version" apply false
+    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version" apply false
 }
 
 // temporal crutch until legacy tests will be stabled or legacy target will be removed
 allprojects {
-    repositories {
-        mavenCentral()
-        google()
-        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
-        mavenLocal()
-    }
     if (it != rootProject.findProject("docs")) {
         tasks.whenTaskAdded { task ->
             if(task.name == "jsLegacyBrowserTest" || task.name == "jsLegacyNodeTest") {
@@ -51,7 +27,6 @@ allprojects {
         }
     }
 }
-apply from: "./extensions.gradle"
 
 private String getCurrentVersionChangelog() {
     OutputStream changelogDataOS = new ByteArrayOutputStream()
@@ -63,28 +38,20 @@ private String getCurrentVersionChangelog() {
     return changelogDataOS.toString().trim()
 }
 
-
-def githubTokenVariableName = "GITHUB_RELEASE_TOKEN"
-def githubTokenVariableFromEnv = System.getenv(githubTokenVariableName)
-
-def secretFile = new File(projectDir, "secret.gradle")
-if (secretFile.exists() || project.hasProperty(githubTokenVariableName) || (githubTokenVariableFromEnv != "" && githubTokenVariableFromEnv != null)) {
-    if (secretFile.exists()) {
-        apply from: './secret.gradle'
-    }
+if (new File(projectDir, "secret.gradle").exists()) {
+    apply from: './secret.gradle'
     apply plugin: "com.github.breadmoirai.github-release"
-    def githubReleaseToken = project.hasProperty(githubTokenVariableName) ? project.property(githubTokenVariableName).toString() : githubTokenVariableFromEnv
 
     githubRelease {
-        token githubReleaseToken
+        token "${project.property('GITHUB_RELEASE_TOKEN')}"
 
-        owner = "InsanusMokrassar"
-        repo = "TelegramBotAPI"
+        owner "InsanusMokrassar"
+        repo "TelegramBotAPI"
 
-        tagName = "v$library_version"
-        releaseName = "$library_version"
-        targetCommitish = "$library_version"
+        tagName "$library_version"
+        releaseName "$library_version"
+        targetCommitish "$library_version"
 
-        body = getCurrentVersionChangelog()
+        body getCurrentVersionChangelog()
     }
 }

docs/build.gradle

@@ -1,28 +1,50 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
+    }
+}
+
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "org.jetbrains.dokka"
+    id "org.jetbrains.dokka" version "$dokka_version"
 }
 
-project.description = "Full collection of all built-in tgbotapi tools"
-
-apply from: "$mppProjectWithSerialization"
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
 
 kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
     sourceSets {
         commonMain {
             dependencies {
-                api project(":tgbotapi.core")
-                api project(":tgbotapi.api")
-                api project(":tgbotapi.utils")
-                api project(":tgbotapi.behaviour_builder")
-                api project(":tgbotapi.behaviour_builder.fsm")
-                api project(":tgbotapi")
-            }
-        }
-        jsMain {
-            dependencies {
-                api project(":tgbotapi.webapps")
+                implementation kotlin('stdlib')
+
+                rootProject.subprojects.forEach {
+                    if (it != project) {
+                        api it
+                    }
+                }
             }
         }
     }
@@ -30,13 +52,12 @@ kotlin {
 
 private List<SourceDirectorySet> findSourcesWithName(String... approximateNames) {
     return parent.subprojects
-            .findAll { it != project && it.hasProperty("kotlin") }
-            .collectMany { it.kotlin.sourceSets }
-            .findAll { sourceSet ->
-                approximateNames.any { nameToFilter ->
-                    sourceSet.name.contains(nameToFilter)
-                }
-            }.collect { it.kotlin }
+        .findAll { it != project }
+        .collectMany { it.kotlin.sourceSets }
+        .findAll { sourceSet -> approximateNames.any {
+            nameToFilter -> sourceSet.name.contains(nameToFilter)
+            }
+        }.collect { it.kotlin }
 }
 
 Object callback = {
@@ -54,8 +75,8 @@ Object callback = {
             skipDeprecated.set(true)
 
             sourceLink {
-                localDirectory.set(file("../"))
-                remoteUrl.set(new URL("https://github.com/InsanusMokrassar/ktgbotapi"))
+                localDirectory.set(file("./"))
+                remoteUrl.set(new URL("https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/"))
                 remoteLineSuffix.set("#L")
             }
         }
@@ -76,3 +97,8 @@ Object callback = {
 
 tasks.dokkaGfm(callback)
 tasks.dokkaHtml(callback)
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

docs/gradle.properties

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

extensions.gradle

@@ -1,27 +0,0 @@
-File templatesFolder = new File("$rootProject.projectDir.absolutePath${File.separatorChar}gradle${File.separatorChar}templates")
-
-Map properties = new HashMap<String, String>()
-
-if (templatesFolder.exists() && templatesFolder.isDirectory()) {
-    templatesFolder.listFiles().each {
-        properties[it.name - ".gradle"] = it.absolutePath
-    }
-}
-
-allprojects {
-    ext {
-        properties.forEach { k, v ->
-            it[k] = v
-        }
-    }
-}
-
-tasks.register("getPublishableModules") {
-    doLast {
-        rootProject.subprojects.each { project ->
-            if (project.plugins.hasPlugin('maven-publish')) {
-                println(":${project.name}")
-            }
-        }
-    }
-}

gradle.properties

@@ -5,5 +5,19 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true
 
+kotlin_version=1.6.10
+kotlin_coroutines_version=1.6.0
+kotlin_serialisation_runtime_version=1.3.2
+klock_version=2.4.10
+uuid_version=0.3.1
+ktor_version=1.6.7
+
+
+micro_utils_version=0.9.1
+
+javax_activation_version=1.1.1
+
 library_group=dev.inmo
-library_version=34.0.0
+library_version=0.38.2
+
+github_release_plugin_version=2.2.12

gradle/libs.versions.toml

@@ -1,92 +0,0 @@
-[versions]
-
-kotlin = "2.3.20"
-kotlin-serialization = "1.11.0"
-kotlin-coroutines = "1.10.2"
-
-javax-activation = "1.1.1"
-
-korlibs = "5.4.0"
-uuid = "0.8.4"
-ktor = "3.4.2"
-
-ksp = "2.3.6"
-kotlin-poet = "2.3.0"
-
-microutils = "0.29.2"
-kslog = "1.6.1"
-
-versions = "0.53.0"
-
-github-release-plugin = "2.5.2"
-dokka = "2.0.0"
-
-validator = "0.18.1"
-nmcp = "1.4.4"
-
-[libraries]
-
-kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
-kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
-kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" }
-kotlin-serialization-properties = { module = "org.jetbrains.kotlinx:kotlinx-serialization-properties", version.ref = "kotlin-serialization" }
-kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlin" }
-kotlin-test-annotations-common = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" }
-kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
-kotlin-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref = "kotlin" }
-
-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-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
-ktor-client-js = { module = "io.ktor:ktor-client-js", 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" }
-
-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" }
-microutils-ksp-generator = { module = "dev.inmo:micro_utils.ksp.generator", version.ref = "microutils" }
-microutils-ksp-sealed = { module = "dev.inmo:micro_utils.ksp.sealed", version.ref = "microutils" }
-microutils-ksp-sealed-generator = { module = "dev.inmo:micro_utils.ksp.sealed.generator", version.ref = "microutils" }
-microutils-ksp-variations = { module = "dev.inmo:micro_utils.ksp.variations", version.ref = "microutils" }
-microutils-ksp-variations-generator = { module = "dev.inmo:micro_utils.ksp.variations.generator", version.ref = "microutils" }
-
-kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
-
-# ksp dependencies
-
-kotlin-poet = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlin-poet" }
-ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
-
-# buildscript classpaths
-
-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-kotlin-ksp-plugin = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
-kotlin-serialization-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
-kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
-github-release-plugin = { module = "com.github.breadmoirai:github-release", version.ref = "github-release-plugin" }
-
-[plugins]
-
-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" }
-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "validator" }
-nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }

gradle/templates/mppJsProject.gradle

@@ -1,34 +0,0 @@
-project.version = "$version"
-project.group = "$group"
-
-apply from: "$mpp_publish"
-
-kotlin {
-    compilerOptions {
-        freeCompilerArgs.add("-Xcontext-parameters")
-    }
-    js (IR) {
-        browser()
-        nodejs()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation libs.kotlin
-                api libs.kotlin.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation libs.kotlin.test.common
-                implementation libs.kotlin.test.annotations.common
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation libs.kotlin.test.js
-            }
-        }
-    }
-}

gradle/templates/mppProjectWithSerialization.gradle

@@ -1,60 +0,0 @@
-project.version = "$library_version"
-project.group = "$library_group"
-
-kotlin {
-    compilerOptions {
-        freeCompilerArgs.add("-Xcontext-parameters")
-    }
-    jvm {
-        compilations.main {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
-    }
-    js (IR) {
-        browser()
-        nodejs()
-    }
-    linuxX64()
-    mingwX64()
-    linuxArm64()
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation libs.kotlin
-                api libs.kotlin.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation libs.kotlin.test.common
-                implementation libs.kotlin.test.annotations.common
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation libs.kotlin.test.junit
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation libs.kotlin.test.js
-            }
-        }
-        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
-}

gradle/templates/mpp_publish.gradle

@@ -1,111 +0,0 @@
-apply plugin: 'maven-publish'
-
-task javadocsJar(type: Jar) {
-    archiveClassifier = 'javadoc'
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "${project.description}"
-            name = "${project.name}"
-            url = "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
-                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
-            }
-
-            developers {
-                developer {
-                    id = "InsanusMokrassar"
-                    name = "Ovsiannikov Aleksei"
-                    email = "ovsyannikov.alexey95@gmail.com"
-                }
-            }
-
-            licenses {
-                license {
-                    name = "Apache Software License 2.0"
-                    url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
-                }
-            }
-        }
-    }
-    repositories {
-        if ((project.hasProperty('GITHUB_USER') || System.getenv('GITHUB_USER') != null) && (project.hasProperty('GITHUB_TOKEN') || System.getenv('GITHUB_TOKEN') != null)) {
-            maven {
-                name = "GithubPackages"
-                url = uri("https://maven.pkg.github.com/InsanusMokrassar/ktgbotapi")
-        
-                credentials {
-                    username = project.hasProperty('GITHUB_USER') ? project.property('GITHUB_USER') : System.getenv('GITHUB_USER')
-                    password = project.hasProperty('GITHUB_TOKEN') ? project.property('GITHUB_TOKEN') : System.getenv('GITHUB_TOKEN')
-                }
-            }
-        }
-        if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
-            maven {
-                name = "InmoNexus"
-                url = uri("https://nexus.inmo.dev/repository/maven-releases/")
-        
-                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')
-                }
-            }
-        }
-        if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-            maven {
-                name = "sonatype"
-                url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
-        
-                credentials {
-                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                }
-            }
-        }
-    }
-}
-    
-if (project.hasProperty("signing.gnupg.keyName")) {
-    apply plugin: 'signing'
-
-    signing {
-        useGpgCmd()
-
-        sign publishing.publications
-    }
-
-    task signAll {
-        tasks.withType(Sign).forEach {
-            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)
-        }
-    }
-}

gradle/templates/mpp_publish.kpsb

@@ -1 +0,0 @@
-{"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/ktgbotapi","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.UsernameAndPassword","usernameProperty":"GITHUB_USER","passwordProperty":"GITHUB_TOKEN"}},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"},"includeCentralSonatypeUploadingScript":false}}

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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

settings.gradle

@@ -12,10 +12,13 @@ pluginManagement {
 }
 
 include ":tgbotapi.core"
-include ":tgbotapi.ksp"
 include ":tgbotapi.api"
 include ":tgbotapi.utils"
 include ":tgbotapi.behaviour_builder"
 include ":tgbotapi.behaviour_builder.fsm"
+include ":tgbotapi.extensions.api"
+include ":tgbotapi.extensions.utils"
+include ":tgbotapi.extensions.behaviour_builder"
+include ":tgbotapi.extensions.behaviour_builder.fsm"
 include ":tgbotapi"
-include ":tgbotapi.webapps"
+include ":docs"

tgbotapi.api/build.gradle

@@ -1,31 +1,55 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+    }
+}
+
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "org.jetbrains.dokka"
-    id "com.google.devtools.ksp"
 }
 
-project.description = "API extensions with \"Telegram Bot API\"-like extensions for TelegramBot and RequestsExecutor"
+project.version = "$library_version"
+project.group = "$library_group"
 
-apply from: "$mppProjectWithSerialization"
-apply from: "$mpp_publish"
+apply from: "publish.gradle"
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
 
 kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
     sourceSets {
         commonMain {
             dependencies {
+                implementation kotlin('stdlib')
                 api project(":tgbotapi.core")
-                api libs.microutils.ksp.variations
             }
         }
-        configureEach {
-            languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
-        }
     }
-    explicitApi()
 }
 
-dependencies {
-    add("kspCommonMainMetadata", libs.microutils.ksp.variations.generator)
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 

tgbotapi.api/publish.gradle

@@ -0,0 +1,79 @@
+apply plugin: 'maven-publish'
+
+task javadocsJar(type: Jar) {
+    classifier = 'javadoc'
+}
+
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference"
+            name = "Telegram Bot API Extensions for API"
+            url = "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
+                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
+                    }
+                
+            }
+        }
+        repositories {
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+                maven {
+                    name = "GithubPackages"
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
+                    credentials {
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    }
+                }
+            }
+            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                maven {
+                    name = "sonatype"
+                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                    credentials {
+                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    }
+                }
+            }
+        }
+    }
+}
+    
+if (project.hasProperty("signing.gnupg.keyName")) {
+    apply plugin: 'signing'
+    
+    signing {
+        useGpgCmd()
+    
+        sign publishing.publications
+    }
+    
+    task signAll {
+        tasks.withType(Sign).forEach {
+            dependsOn(it)
+        }
+    }
+}

tgbotapi.api/publish.kpsb

@@ -0,0 +1 @@
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Extensions for API","description":"API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api","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":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

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

@@ -12,11 +12,10 @@ import io.ktor.client.engine.*
  * @param ktorClientEngine Engine like [io.ktor.client.engine.cio.CIO]
  * @param ktorClientConfig Config block for preconfiguring of bot [HttpClient]
  */
-@ConsistentCopyVisibility
-public data class BotBuilder internal constructor(
+data class BotBuilder internal constructor(
     var proxy: ProxyConfig? = null,
     var ktorClientEngineFactory: HttpClientEngineFactory<HttpClientEngineConfig>? = null,
-    var ktorClientConfig: (HttpClientConfig<*>.() -> Unit) ? = null,
+    var ktorClientConfig: (HttpClientConfig<*>.() -> Unit) ? = null
 ) {
     internal fun createHttpClient(): HttpClient = ktorClientEngineFactory ?.let {
         HttpClient(
@@ -38,18 +37,11 @@ public data class BotBuilder internal constructor(
  * @return Created by [telegramBotWithCustomClientConfig] function [TelegramBot]. This executor will be preconfigured using [token] and
  * [block]
  */
-public fun buildBot(
+fun buildBot(
     token: String,
     apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
-    fileLinkUrlMapper: TelegramAPIUrlsKeeper.(String) -> String = { "${fileBaseUrl}/$it" },
     block: BotBuilder.() -> Unit
-): TelegramBot = telegramBot(
-    urlsKeeper = TelegramAPIUrlsKeeper(
-        token = token,
-        testServer = testServer,
-        hostUrl = apiUrl,
-        fileLinkUrlMapper = fileLinkUrlMapper
-    ),
-    client = BotBuilder().apply(block).createHttpClient()
+) = telegramBot(
+    TelegramAPIUrlsKeeper(token, apiUrl),
+    BotBuilder().apply(block).createHttpClient()
 )

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

@@ -1,9 +1,8 @@
 package dev.inmo.tgbotapi.extensions.api
 
-import dev.inmo.tgbotapi.bot.ktor.telegramBot
+import dev.inmo.tgbotapi.bot.Ktor.telegramBot
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
-import dev.inmo.tgbotapi.utils.defaultKtorEngine
 import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
 import io.ktor.client.HttpClient
 import io.ktor.client.HttpClientConfig
@@ -12,9 +11,9 @@ import io.ktor.client.engine.*
 /**
  * Allows to create bot using bot [urlsKeeper] and already prepared [client]
  */
-public fun telegramBot(
+fun telegramBot(
     urlsKeeper: TelegramAPIUrlsKeeper,
-    client: HttpClient = HttpClient(defaultKtorEngine)
+    client: HttpClient
 ): TelegramBot = telegramBot(urlsKeeper) {
     this.client = client
 }
@@ -24,11 +23,11 @@ public fun telegramBot(
  * configure it with [clientConfig]
  */
 @Suppress("NOTHING_TO_INLINE")
-public inline fun <T: HttpClientEngineConfig> telegramBot(
+inline fun <T: HttpClientEngineConfig> telegramBot(
     urlsKeeper: TelegramAPIUrlsKeeper,
     clientFactory: HttpClientEngineFactory<T>,
     noinline clientConfig: HttpClientConfig<T>.() -> Unit = {}
-): TelegramBot = telegramBot(
+) = telegramBot(
     urlsKeeper,
     HttpClient(clientFactory, clientConfig)
 )
@@ -38,11 +37,11 @@ public inline fun <T: HttpClientEngineConfig> telegramBot(
  * configure [HttpClient] using [clientConfig]
  */
 @Suppress("NOTHING_TO_INLINE")
-public inline fun telegramBot(
+inline fun telegramBot(
     urlsKeeper: TelegramAPIUrlsKeeper,
     clientEngine: HttpClientEngine,
     noinline clientConfig: HttpClientConfig<*>.() -> Unit = {}
-): TelegramBot = telegramBot(
+) = telegramBot(
     urlsKeeper,
     HttpClient(clientEngine, clientConfig)
 )
@@ -52,10 +51,10 @@ public inline fun telegramBot(
  * [clientConfig]
  */
 @Suppress("NOTHING_TO_INLINE")
-public inline fun telegramBot(
+inline fun telegramBot(
     urlsKeeper: TelegramAPIUrlsKeeper,
     noinline clientConfig: HttpClientConfig<*>.() -> Unit
-): TelegramBot = telegramBot(
+) = telegramBot(
     urlsKeeper,
     HttpClient(clientConfig)
 )
@@ -64,24 +63,20 @@ public inline fun telegramBot(
  * Allows to create bot using bot [token], [apiUrl] (for custom api servers) and already prepared [client]
  */
 @Suppress("NOTHING_TO_INLINE")
-public fun telegramBot(
+inline fun telegramBot(
     token: String,
     apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
-    fileLinkUrlMapper: TelegramAPIUrlsKeeper.(String) -> String = { "${fileBaseUrl}/$it" },
-    client: HttpClient = HttpClient(defaultKtorEngine)
-): TelegramBot = telegramBot(TelegramAPIUrlsKeeper(token, testServer, apiUrl, fileLinkUrlMapper), client)
+    client: HttpClient
+): TelegramBot = telegramBot(TelegramAPIUrlsKeeper(token, apiUrl), client)
 
 @Suppress("NOTHING_TO_INLINE")
-public fun <T: HttpClientEngineConfig> telegramBot(
+inline fun <T: HttpClientEngineConfig> telegramBot(
     token: String,
     clientFactory: HttpClientEngineFactory<T>,
     apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
-    fileLinkUrlMapper: TelegramAPIUrlsKeeper.(String) -> String = { "${fileBaseUrl}/$it" },
-    clientConfig: HttpClientConfig<T>.() -> Unit = {}
-): TelegramBot = telegramBot(
-    TelegramAPIUrlsKeeper(token, testServer, apiUrl, fileLinkUrlMapper),
+    noinline clientConfig: HttpClientConfig<T>.() -> Unit = {}
+) = telegramBot(
+    TelegramAPIUrlsKeeper(token, apiUrl),
     clientFactory,
     clientConfig
 )
@@ -90,15 +85,14 @@ public fun <T: HttpClientEngineConfig> telegramBot(
  * Allows to create bot using bot [token] and specify [HttpClientEngine] by passing [clientEngine] param and optionally
  * configure [HttpClient] using [clientConfig]
  */
-public fun telegramBot(
+@Suppress("NOTHING_TO_INLINE")
+inline fun telegramBot(
     token: String,
     clientEngine: HttpClientEngine,
     apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
-    fileLinkUrlMapper: TelegramAPIUrlsKeeper.(String) -> String = { "${fileBaseUrl}/$it" },
-    clientConfig: HttpClientConfig<*>.() -> Unit = {}
-): TelegramBot = telegramBot(
-    TelegramAPIUrlsKeeper(token, testServer, apiUrl, fileLinkUrlMapper),
+    noinline clientConfig: HttpClientConfig<*>.() -> Unit = {}
+) = telegramBot(
+    TelegramAPIUrlsKeeper(token, apiUrl),
     clientEngine,
     clientConfig
 )
@@ -107,13 +101,12 @@ public fun telegramBot(
  * Allows to create bot using bot [token] and [apiUrl] and specify [HttpClientEngine] by configuring [HttpClient] using
  * [clientConfig]
  */
-public fun telegramBot(
+@Suppress("NOTHING_TO_INLINE")
+inline fun telegramBot(
     token: String,
     apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
-    fileLinkUrlMapper: TelegramAPIUrlsKeeper.(String) -> String = { "${fileBaseUrl}/$it" },
-    clientConfig: HttpClientConfig<*>.() -> Unit
-): TelegramBot = telegramBot(
-    TelegramAPIUrlsKeeper(token, testServer, apiUrl, fileLinkUrlMapper),
+    noinline clientConfig: HttpClientConfig<*>.() -> Unit
+) = telegramBot(
+    TelegramAPIUrlsKeeper(token, apiUrl),
     clientConfig
 )

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

@@ -3,4 +3,5 @@ package dev.inmo.tgbotapi.extensions.api
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.local.Close
 
-public suspend inline fun TelegramBot.executeClose(): Unit = execute(Close)
+@Suppress("unused")
+suspend inline fun TelegramBot.close() = execute(Close)

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

@@ -3,51 +3,26 @@ package dev.inmo.tgbotapi.extensions.api
 import dev.inmo.tgbotapi.bot.TelegramBot
 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.MessageIdentifier
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 
-public suspend fun TelegramBot.deleteMessage(
+suspend fun TelegramBot.deleteMessage(
     chatId: ChatIdentifier,
-    messageId: MessageId
-): Unit = execute(
+    messageId: MessageIdentifier
+) = execute(
     DeleteMessage(chatId, messageId)
 )
 
-public suspend fun TelegramBot.deleteMessage(
+suspend fun TelegramBot.deleteMessage(
     chat: Chat,
-    messageId: MessageId
-): Unit = deleteMessage(chat.id, messageId)
+    messageId: MessageIdentifier
+) = deleteMessage(chat.id, messageId)
 
-public suspend fun TelegramBot.deleteMessage(
-    message: AccessibleMessage
-): Unit {
-    val mediaGroupContent = ((message as? ContentMessage<*>) ?.content as? MediaGroupCollectionContent<*>)
-    if (mediaGroupContent == null) {
-        deleteMessage(message.chat, message.messageId)
-    } else {
-        mediaGroupContent.group.forEach {
-            deleteMessage(it.sourceMessage)
-        }
-    }
-}
+suspend fun TelegramBot.deleteMessage(
+    message: Message
+) = deleteMessage(message.chat, message.messageId)
 
-public suspend fun TelegramBot.delete(
-    chatId: ChatIdentifier,
-    messageId: MessageId
-): Unit = deleteMessage(chatId, messageId)
-
-public suspend fun TelegramBot.delete(
-    chat: Chat,
-    messageId: MessageId
-): Unit = deleteMessage(chat, messageId)
-
-public suspend fun TelegramBot.delete(
-    message: AccessibleMessage
-): Unit = deleteMessage(message)
-
-public suspend fun AccessibleMessage.delete(
+suspend fun Message.delete(
     requestsExecutor: TelegramBot
-): Unit = requestsExecutor.deleteMessage(this)
+) = requestsExecutor.deleteMessage(this)

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

@@ -1,61 +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
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import kotlin.jvm.JvmName
-
-public suspend fun TelegramBot.deleteMessages(
-    chatId: ChatIdentifier,
-    messageIds: List<MessageId>
-): Unit = messageIds.chunked(deleteMessagesLimit.last).forEach {
-    execute(
-        DeleteMessages(
-            chatId = chatId,
-            messageIds = it
-        )
-    )
-}
-
-public suspend fun TelegramBot.deleteMessages(
-    chatId: ChatIdentifier,
-    messageIds: Array<MessageId>
-): Unit = deleteMessages(
-    chatId = chatId,
-    messageIds = messageIds.toList()
-)
-
-public suspend fun TelegramBot.deleteMessages(
-    messagesMetas: List<Message.MetaInfo>
-): Unit = messagesMetas.groupBy { it.chatId }.forEach { (chatId, messages) ->
-    deleteMessages(
-        chatId = chatId,
-        messageIds = messages.map { it.messageId }
-    )
-}
-
-@JvmName("deleteMessagesWithMessages")
-public suspend fun TelegramBot.deleteMessages(
-    messages: List<AccessibleMessage>
-): Unit = deleteMessages(messages.map { it.metaInfo })
-
-public suspend fun TelegramBot.delete(
-    chatId: ChatIdentifier,
-    messageIds: List<MessageId>
-): Unit = deleteMessages(chatId = chatId, messageIds = messageIds)
-
-public suspend fun TelegramBot.delete(
-    chatId: ChatIdentifier,
-    messageIds: Array<MessageId>
-): Unit = deleteMessages(chatId = chatId, messageIds = messageIds)
-
-public suspend fun TelegramBot.delete(
-    messagesMetas: List<Message.MetaInfo>
-): Unit = deleteMessages(messagesMetas)
-
-@JvmName("deleteWithMessages")
-public suspend fun TelegramBot.delete(
-    messages: List<AccessibleMessage>
-): Unit = deleteMessages(messages)

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

@@ -3,145 +3,54 @@ package dev.inmo.tgbotapi.extensions.api
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.ForwardMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.DirectMessageThreadId
-import dev.inmo.tgbotapi.types.EffectId
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.Seconds
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-import dev.inmo.tgbotapi.types.message.abstracts.PossiblyForwardedMessage
-import dev.inmo.tgbotapi.types.directMessageThreadId
-import dev.inmo.tgbotapi.types.threadId
+import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 
-public suspend fun TelegramBot.forwardMessage(
+suspend fun TelegramBot.forwardMessage(
     fromChatId: ChatIdentifier,
     toChatId: ChatIdentifier,
-    messageId: MessageId,
-    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
-    startTimestamp: Seconds? = null,
+    messageId: MessageIdentifier,
     disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    effectId: EffectId? = null
-): PossiblyForwardedMessage = execute(
-    ForwardMessage(
-        fromChatId = fromChatId,
-        toChatId = toChatId,
-        messageId = messageId,
-        threadId = threadId,
-        directMessageThreadId = directMessageThreadId,
-        startTimestamp = startTimestamp,
-        disableNotification = disableNotification,
-        protectContent = protectContent,
-        effectId = effectId
-    )
+    protectContent: Boolean = false
+) = execute(
+    ForwardMessage(fromChatId, toChatId, messageId, disableNotification, protectContent)
 )
 
-public suspend fun TelegramBot.forwardMessage(
+suspend fun TelegramBot.forwardMessage(
     fromChat: Chat,
     toChatId: ChatIdentifier,
-    messageId: MessageId,
-    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
-    startTimestamp: Seconds? = null,
+    messageId: MessageIdentifier,
     disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    effectId: EffectId? = null
-): PossiblyForwardedMessage = forwardMessage(
-    fromChatId = fromChat.id,
-    toChatId = toChatId,
-    messageId = messageId,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    startTimestamp = startTimestamp,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    effectId = effectId
-)
+    protectContent: Boolean = false
+) = forwardMessage(fromChat.id, toChatId, messageId, disableNotification, protectContent)
 
-public suspend fun TelegramBot.forwardMessage(
+suspend fun TelegramBot.forwardMessage(
     fromChatId: ChatIdentifier,
     toChat: Chat,
-    messageId: MessageId,
-    threadId: MessageThreadId? = toChat.id.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChat.id.directMessageThreadId,
-    startTimestamp: Seconds? = null,
+    messageId: MessageIdentifier,
     disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    effectId: EffectId? = null
-): PossiblyForwardedMessage = forwardMessage(
-    fromChatId = fromChatId,
-    toChatId = toChat.id,
-    messageId = messageId,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    startTimestamp = startTimestamp,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    effectId = effectId
-)
+    protectContent: Boolean = false
+) = forwardMessage(fromChatId, toChat.id, messageId, disableNotification, protectContent)
 
-public suspend fun TelegramBot.forwardMessage(
+suspend fun TelegramBot.forwardMessage(
     fromChat: Chat,
     toChat: Chat,
-    messageId: MessageId,
-    threadId: MessageThreadId? = toChat.id.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChat.id.directMessageThreadId,
-    startTimestamp: Seconds? = null,
+    messageId: MessageIdentifier,
     disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    effectId: EffectId? = null
-): PossiblyForwardedMessage = forwardMessage(
-    fromChatId = fromChat.id,
-    toChatId = toChat.id,
-    messageId = messageId,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    startTimestamp = startTimestamp,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    effectId = effectId
-)
+    protectContent: Boolean = false
+) = forwardMessage(fromChat.id, toChat.id, messageId, disableNotification, protectContent)
 
-public suspend fun TelegramBot.forwardMessage(
+suspend fun TelegramBot.forwardMessage(
     toChatId: ChatIdentifier,
-    message: AccessibleMessage,
-    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
-    startTimestamp: Seconds? = null,
+    message: Message,
     disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    effectId: EffectId? = null
-): PossiblyForwardedMessage = forwardMessage(
-    fromChat = message.chat,
-    toChatId = toChatId,
-    messageId = message.messageId,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    startTimestamp = startTimestamp,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    effectId = effectId
-)
+    protectContent: Boolean = false
+) = forwardMessage(message.chat, toChatId, message.messageId, disableNotification, protectContent)
 
-public suspend fun TelegramBot.forwardMessage(
+suspend fun TelegramBot.forwardMessage(
     toChat: Chat,
-    message: AccessibleMessage,
-    threadId: MessageThreadId? = toChat.id.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChat.id.directMessageThreadId,
-    startTimestamp: Seconds? = null,
+    message: Message,
     disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    effectId: EffectId? = null
-): PossiblyForwardedMessage = forwardMessage(
-    fromChat = message.chat,
-    toChat = toChat,
-    messageId = message.messageId,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    startTimestamp = startTimestamp,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    effectId = effectId
-)
+    protectContent: Boolean = false
+) = forwardMessage(message.chat, toChat, message.messageId, disableNotification, protectContent)

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

@@ -1,170 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.send.copyMessages
-import dev.inmo.tgbotapi.requests.ForwardMessages
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import kotlin.jvm.JvmName
-
-public suspend fun TelegramBot.forwardMessages(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: List<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-): List<MessageId> = messageIds.chunked(forwardMessagesLimit.last).flatMap {
-    execute(
-        ForwardMessages(
-            toChatId = toChatId,
-            fromChatId = fromChatId,
-            messageIds = it,
-            threadId = threadId,
-            directMessageThreadId = directMessageThreadId,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            removeCaption = removeCaption
-        )
-    )
-}
-
-public suspend fun TelegramBot.forwardMessages(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: Array<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-): List<MessageId> = forwardMessages(
-    toChatId = toChatId,
-    fromChatId = fromChatId,
-    messageIds = messageIds.toList(),
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-public suspend fun TelegramBot.forwardMessages(
-    toChatId: ChatIdentifier,
-    messagesMetas: List<Message.MetaInfo>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-): List<MessageId> = messagesMetas.groupBy { it.chatId }.flatMap { (chatId, messages) ->
-    forwardMessages(
-        toChatId = toChatId,
-        fromChatId = chatId,
-        messageIds = messages.map { it.messageId },
-        threadId = threadId,
-        directMessageThreadId = directMessageThreadId,
-        disableNotification = disableNotification,
-        protectContent = protectContent,
-        removeCaption = removeCaption
-    )
-}
-
-@JvmName("forwardMessagesWithMessages")
-public suspend fun TelegramBot.forwardMessages(
-    toChatId: ChatIdentifier,
-    messages: List<AccessibleMessage>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-): List<MessageId> = forwardMessages(
-    toChatId = toChatId,
-    messagesMetas = messages.map { it.metaInfo },
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-public suspend fun TelegramBot.forward(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: List<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-): List<MessageId> = forwardMessages(
-    toChatId = toChatId,
-    fromChatId = fromChatId,
-    messageIds = messageIds,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-public suspend fun TelegramBot.forward(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: Array<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-): List<MessageId> = forwardMessages(
-    toChatId = toChatId,
-    fromChatId = fromChatId,
-    messageIds = messageIds,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-public suspend fun TelegramBot.forward(
-    toChatId: ChatIdentifier,
-    messagesMetas: List<Message.MetaInfo>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-): List<MessageId> = forwardMessages(
-    toChatId = toChatId,
-    messagesMetas = messagesMetas,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-@JvmName("forwardWithMessages")
-public suspend fun TelegramBot.forward(
-    toChatId: ChatIdentifier,
-    messages: List<AccessibleMessage>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-): List<MessageId> = forwardMessages(
-    toChatId = toChatId,
-    messages = messages,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)

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

@@ -5,22 +5,22 @@ import dev.inmo.tgbotapi.requests.GetUpdates
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
-public suspend fun TelegramBot.getUpdates(
-    offset: UpdateId? = null,
+suspend fun TelegramBot.getUpdates(
+    offset: UpdateIdentifier? = null,
     limit: Int = getUpdatesLimit.last,
     timeout: Seconds? = null,
     allowed_updates: List<String>? = ALL_UPDATES_LIST
-): List<Update> = execute(
+) = execute(
     GetUpdates(
         offset, limit, timeout, allowed_updates
     )
 )
 
-public suspend fun TelegramBot.getUpdates(
+suspend fun TelegramBot.getUpdates(
     lastUpdate: Update,
     limit: Int = getUpdatesLimit.last,
     timeout: Seconds? = null,
     allowed_updates: List<String>? = ALL_UPDATES_LIST
-): List<Update> = getUpdates(
+) = getUpdates(
     lastUpdate.updateId + 1, limit, timeout, allowed_updates
 )

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.GetUpdatesRaw
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-import kotlinx.serialization.json.JsonArray
-
-public suspend fun TelegramBot.getRawUpdates(
-    offset: UpdateId? = null,
-    limit: Int = getUpdatesLimit.last,
-    timeout: Seconds? = null,
-    allowed_updates: List<String>? = ALL_UPDATES_LIST
-): JsonArray = execute(
-    GetUpdatesRaw(
-        offset, limit, timeout, allowed_updates
-    )
-)
-
-public suspend fun TelegramBot.getRawUpdates(
-    lastUpdate: Update,
-    limit: Int = getUpdatesLimit.last,
-    timeout: Seconds? = null,
-    allowed_updates: List<String>? = ALL_UPDATES_LIST
-): JsonArray = getRawUpdates(
-    lastUpdate.updateId + 1, limit, timeout, allowed_updates
-)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt

@@ -1,52 +1,70 @@
 package dev.inmo.tgbotapi.extensions.api.InternalUtils
 
-import dev.inmo.tgbotapi.types.MediaGroupId
-import dev.inmo.tgbotapi.types.message.abstracts.PossiblySentViaBotCommonMessage
-import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
+import dev.inmo.tgbotapi.types.MediaGroupIdentifier
+import dev.inmo.tgbotapi.types.UpdateIdentifier
+import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
 import dev.inmo.tgbotapi.types.update.*
+import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.*
 import dev.inmo.tgbotapi.types.update.abstracts.*
-import dev.inmo.tgbotapi.utils.extensions.asMediaGroupMessage
 
-/**
- * Will convert incoming list of updates to list with [MediaGroupUpdate]s
- */
+internal fun Update.lastUpdateIdentifier(): UpdateIdentifier {
+    return if (this is SentMediaGroupUpdate) {
+        origins.last().updateId
+    } else {
+        updateId
+    }
+}
+
+internal fun List<Update>.lastUpdateIdentifier(): UpdateIdentifier? {
+    return maxByOrNull { it.updateId } ?.lastUpdateIdentifier()
+}
+
 internal fun List<Update>.convertWithMediaGroupUpdates(): List<Update> {
     val resultUpdates = mutableListOf<Update>()
-    val mediaGroups = mutableMapOf<MediaGroupId, MutableList<Pair<BaseSentMessageUpdate, PossiblySentViaBotCommonMessage<MediaGroupPartContent>>>>()
-
+    val mediaGroups = mutableMapOf<MediaGroupIdentifier, MutableList<BaseSentMessageUpdate>>()
     for (update in this) {
-        val message = (update.data as? PossiblySentViaBotCommonMessage<*>) ?.let {
-            if (it.content is MediaGroupPartContent) {
-                @Suppress("UNCHECKED_CAST")
-                it as PossiblySentViaBotCommonMessage<MediaGroupPartContent>
-            } else {
-                null
-            }
-        }
-        val mediaGroupId = message ?.mediaGroupId
-        if (message == null || mediaGroupId == null) {
+        val data = (update.data as? MediaGroupMessage<*>)
+        if (data == null) {
             resultUpdates.add(update)
             continue
         }
         when (update) {
+            is BaseEditMessageUpdate -> resultUpdates.add(
+                update.toEditMediaGroupUpdate()
+            )
             is BaseSentMessageUpdate -> {
-                mediaGroups.getOrPut(mediaGroupId) {
+                mediaGroups.getOrPut(data.mediaGroupId) {
                     mutableListOf()
-                }.add(update to message)
+                }.add(update)
             }
             else -> resultUpdates.add(update)
         }
     }
-
-    mediaGroups.map { (_, updatesWithMessages) ->
-        val update = updatesWithMessages.maxBy { it.first.updateId }.first
-        resultUpdates.add(
-            update.copy(updatesWithMessages.map { it.second }.asMediaGroupMessage())
-        )
+    mediaGroups.values.map {
+        it.toSentMediaGroupUpdate() ?.let { mediaGroupUpdate ->
+            resultUpdates.add(mediaGroupUpdate)
+        }
     }
-
     resultUpdates.sortBy { it.updateId }
     return resultUpdates
 }
 
-internal fun BaseEditMessageUpdate.toEditMediaGroupUpdate(): BaseEditMessageUpdate = this
+internal fun List<BaseSentMessageUpdate>.toSentMediaGroupUpdate(): SentMediaGroupUpdate? = (this as? SentMediaGroupUpdate) ?: let {
+    if (isEmpty()) {
+        return@let null
+    }
+    val resultList = sortedBy { it.updateId }
+    when (first()) {
+        is MessageUpdate -> MessageMediaGroupUpdate(resultList)
+        is ChannelPostUpdate -> ChannelPostMediaGroupUpdate(resultList)
+        else -> null
+    }
+}
+
+internal fun BaseEditMessageUpdate.toEditMediaGroupUpdate(): EditMediaGroupUpdate = (this as? EditMediaGroupUpdate) ?: let {
+    when (this) {
+        is EditMessageUpdate -> EditMessageMediaGroupUpdate(this)
+        is EditChannelPostUpdate -> EditChannelPostMediaGroupUpdate(this)
+        else -> error("Unsupported type of ${BaseEditMessageUpdate::class.simpleName}")
+    }
+}

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

@@ -1,210 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.micro_utils.coroutines.LinkedSupervisorScope
-import dev.inmo.tgbotapi.abstracts.Headed
-import dev.inmo.tgbotapi.abstracts.HorizontallyAccured
-import dev.inmo.tgbotapi.abstracts.Locationed
-import dev.inmo.tgbotapi.abstracts.ProximityAlertable
-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.send.send
-import dev.inmo.tgbotapi.extensions.api.send.sendLiveLocation
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.location.LiveLocation
-import dev.inmo.tgbotapi.types.location.Location
-import dev.inmo.tgbotapi.types.message.SuggestedPostParameters
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.content.LiveLocationContent
-import dev.inmo.tgbotapi.types.message.content.LocationContent
-import dev.inmo.tgbotapi.utils.launchWithBotLogger
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.FlowCollector
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.isActive
-import kotlinx.serialization.Serializable
-import kotlin.js.JsName
-import kotlin.jvm.JvmName
-import kotlin.math.ceil
-
-@Serializable
-public data class EditLiveLocationInfo(
-    override val latitude: Double,
-    override val longitude: Double,
-    override val horizontalAccuracy: Meters? = null,
-    override val heading: Degrees? = null,
-    override val proximityAlertRadius: Meters? = null,
-    override val replyMarkup: InlineKeyboardMarkup? = null
-) : Locationed, HorizontallyAccured, ProximityAlertable, Headed, WithReplyMarkup
-
-/**
- * Will [sendLiveLocation] with the first [EditLiveLocationInfo] data and update than. Each [liveTimeMillis] passing,
- * the message will be sent again and new edits will be applied to the new message
- */
-public suspend fun TelegramBot.handleLiveLocation(
-    chatId: ChatIdentifier,
-    locationsFlow: Flow<EditLiveLocationInfo>,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowPaidBroadcast: Boolean = false,
-    effectId: EffectId? = null,
-    suggestedPostParameters: SuggestedPostParameters? = null,
-    replyParameters: ReplyParameters? = null,
-    sentMessageFlow: FlowCollector<ContentMessage<LiveLocationContent>>? = null
-) {
-    var currentLiveLocationMessage: ContentMessage<LiveLocationContent>? = null
-    val updateMessageJob = if (liveTimeMillis == indefiniteLivePeriodDelayMillis) { // do not launch refreshing of message for indefinite live locations
-        null
-    } else {
-        val scope = currentCoroutineContext().LinkedSupervisorScope()
-        scope.launchWithBotLogger(start = CoroutineStart.LAZY) {
-            while (scope.isActive) {
-                delay(liveTimeMillis)
-                // Remove previous location message info to resend live location message
-                currentLiveLocationMessage = null
-            }
-        }
-    }
-    locationsFlow.collect {
-        val capturedLiveLocationMessage = currentLiveLocationMessage
-        if (capturedLiveLocationMessage == null) {
-            updateMessageJob ?.start()
-            currentLiveLocationMessage = send(
-                chatId = chatId,
-                latitude = it.latitude,
-                longitude = it.longitude,
-                livePeriod = if (liveTimeMillis == indefiniteLivePeriodDelayMillis) {
-                    LiveLocation.INDEFINITE_LIVE_PERIOD
-                } else {
-                    ceil(liveTimeMillis.toDouble() / 1000).toInt()
-                },
-                horizontalAccuracy = it.horizontalAccuracy,
-                heading = it.heading,
-                proximityAlertRadius = it.proximityAlertRadius,
-                threadId = threadId,
-                directMessageThreadId = directMessageThreadId,
-                businessConnectionId = businessConnectionId,
-                disableNotification = disableNotification,
-                protectContent = protectContent,
-                allowPaidBroadcast = allowPaidBroadcast,
-                effectId = effectId,
-                suggestedPostParameters = suggestedPostParameters,
-                replyParameters = replyParameters,
-                replyMarkup = it.replyMarkup
-            ).also {
-                sentMessageFlow ?.emit(it)
-            }
-        } else {
-            edit(
-                message = capturedLiveLocationMessage,
-                latitude = it.latitude,
-                longitude = it.longitude,
-                horizontalAccuracy = it.horizontalAccuracy,
-                heading = it.heading,
-                proximityAlertRadius = it.proximityAlertRadius,
-                replyMarkup = it.replyMarkup
-            ).also {
-                sentMessageFlow ?.emit(it)
-            }
-        }
-    }
-}
-
-/**
- * Will apply [Flow.map] to the [locationsFlow] to create [EditLiveLocationInfo] and pass the result flow to the
- * [handleLiveLocation] with [Flow] typed by [EditLiveLocationInfo]
- */
-@JvmName("handleLiveLocationWithLocation")
-@JsName("handleLiveLocationWithLocation")
-public suspend fun TelegramBot.handleLiveLocation(
-    chatId: ChatIdentifier,
-    locationsFlow: Flow<Location>,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowPaidBroadcast: Boolean = false,
-    effectId: EffectId? = null,
-    suggestedPostParameters: SuggestedPostParameters? = null,
-    replyParameters: ReplyParameters? = null,
-    sentMessageFlow: FlowCollector<ContentMessage<LiveLocationContent>>? = null
-) {
-    handleLiveLocation(
-        chatId = chatId,
-        locationsFlow = locationsFlow.map {
-            EditLiveLocationInfo(
-                it.latitude,
-                it.longitude,
-                it.horizontalAccuracy,
-                (it as? LiveLocation) ?.heading,
-                (it as? LiveLocation) ?.proximityAlertRadius,
-                (it as? WithReplyMarkup) ?.replyMarkup as? InlineKeyboardMarkup
-            )
-        },
-        liveTimeMillis = liveTimeMillis,
-        threadId = threadId,
-        directMessageThreadId = directMessageThreadId,
-        businessConnectionId = businessConnectionId,
-        disableNotification = disableNotification,
-        protectContent = protectContent,
-        allowPaidBroadcast = allowPaidBroadcast,
-        effectId = effectId,
-        suggestedPostParameters = suggestedPostParameters,
-        replyParameters = replyParameters,
-        sentMessageFlow = sentMessageFlow
-    )
-}
-
-/**
- * Will apply [Flow.map] to the [locationsFlow] to create [EditLiveLocationInfo] and pass the result flow to the
- * [handleLiveLocation] with [Flow] typed by [EditLiveLocationInfo]
- */
-@JvmName("handleLiveLocationWithLatLong")
-@JsName("handleLiveLocationWithLatLong")
-public suspend fun TelegramBot.handleLiveLocation(
-    chatId: ChatIdentifier,
-    locationsFlow: Flow<Pair<Double, Double>>,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowPaidBroadcast: Boolean = false,
-    effectId: EffectId? = null,
-    suggestedPostParameters: SuggestedPostParameters? = null,
-    replyParameters: ReplyParameters? = null,
-    sentMessageFlow: FlowCollector<ContentMessage<LiveLocationContent>>? = null
-) {
-    handleLiveLocation(
-        chatId = chatId,
-        locationsFlow = locationsFlow.map { (lat, long) ->
-            EditLiveLocationInfo(
-                lat,
-                long
-            )
-        },
-        liveTimeMillis = liveTimeMillis,
-        threadId = threadId,
-        directMessageThreadId = directMessageThreadId,
-        businessConnectionId = businessConnectionId,
-        disableNotification = disableNotification,
-        protectContent = protectContent,
-        allowPaidBroadcast = allowPaidBroadcast,
-        effectId = effectId,
-        suggestedPostParameters = suggestedPostParameters,
-        replyParameters = replyParameters,
-        sentMessageFlow = sentMessageFlow
-    )
-}

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

@@ -1,39 +1,31 @@
-@file:Suppress("KDocUnresolvedReference")
-
 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
+import dev.inmo.tgbotapi.extensions.api.edit.LiveLocation.editLiveLocation
+import dev.inmo.tgbotapi.extensions.api.edit.LiveLocation.stopLiveLocation
 import dev.inmo.tgbotapi.requests.send.SendLiveLocation
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.SuggestedPostParameters
+import dev.inmo.tgbotapi.types.chat.abstracts.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.directMessageThreadIdOrNull
-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
 
-public const val indefiniteLivePeriodDelayMillis: Long = LiveLocation.INDEFINITE_LIVE_PERIOD * 1000L
-public const val defaultLivePeriodDelayMillis: Long = indefiniteLivePeriodDelayMillis
+val defaultLivePeriodDelayMillis = (livePeriodLimit.last - 60L) * 1000L
 
 /**
  * @see startLiveLocation
  */
-public class LiveLocationProvider internal constructor(
+class LiveLocationProvider internal constructor(
     private val requestsExecutor: TelegramBot,
     scope: CoroutineScope,
     autoCloseTimeDelay: Double,
@@ -45,23 +37,22 @@ public class LiveLocationProvider internal constructor(
         }
     }
     private val autoCloseTime = DateTime.now() + TimeSpan(autoCloseTimeDelay)
-    public val leftUntilCloseMillis: TimeSpan
+    val leftUntilCloseMillis: TimeSpan
         get() = autoCloseTime - DateTime.now()
 
-    public var isClosed: Boolean = false
+    var isClosed: Boolean = false
         private set
         get() = field || leftUntilCloseMillis.millisecondsLong < 0L
 
-    public var message: ContentMessage<LocationContent> = initMessage
-        private set
-    public val lastLocation: LiveLocation
+    private var message: ContentMessage<LocationContent> = initMessage
+    val lastLocation: LiveLocation
         get() = message.content.location as LiveLocation
 
     /**
      * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
      * as a builder for that
      */
-    public suspend fun updateLocation(
+    suspend fun updateLocation(
         location: LiveLocation,
         replyMarkup: InlineKeyboardMarkup? = null
     ): LiveLocation {
@@ -69,7 +60,7 @@ public class LiveLocationProvider internal constructor(
             message = requestsExecutor.editLiveLocation(
                 message,
                 location,
-                replyMarkup = replyMarkup
+                replyMarkup
             )
             return lastLocation
         } else {
@@ -90,7 +81,7 @@ public class LiveLocationProvider internal constructor(
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
-public suspend fun TelegramBot.startLiveLocation(
+suspend fun TelegramBot.startLiveLocation(
     scope: CoroutineScope,
     chatId: ChatIdentifier,
     latitude: Double,
@@ -99,37 +90,27 @@ public suspend fun TelegramBot.startLiveLocation(
     initHorizontalAccuracy: Meters? = null,
     initHeading: Degrees? = null,
     initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowPaidBroadcast: Boolean = false,
-    effectId: EffectId? = null,
-    suggestedPostParameters: SuggestedPostParameters? = null,
-    replyParameters: ReplyParameters? = null,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): LiveLocationProvider {
     val liveTimeAsDouble = liveTimeMillis.toDouble()
     val locationMessage = execute(
         SendLiveLocation(
-            chatId = chatId,
-            latitude = latitude,
-            longitude = longitude,
-            livePeriod = ceil(liveTimeAsDouble / 1000).toInt(),
-            horizontalAccuracy = initHorizontalAccuracy,
-            heading = initHeading,
-            proximityAlertRadius = initProximityAlertRadius,
-            threadId = threadId,
-            directMessageThreadId = directMessageThreadId,
-            businessConnectionId = businessConnectionId,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowPaidBroadcast = allowPaidBroadcast,
-            effectId = effectId,
-            suggestedPostParameters = suggestedPostParameters,
-            replyParameters = replyParameters,
-            replyMarkup = replyMarkup
+            chatId,
+            latitude,
+            longitude,
+            ceil(liveTimeAsDouble / 1000).toInt(),
+            initHorizontalAccuracy,
+            initHeading,
+            initProximityAlertRadius,
+            disableNotification,
+            protectContent,
+            replyToMessageId,
+            allowSendingWithoutReply,
+            replyMarkup
         )
     )
 
@@ -145,7 +126,7 @@ public suspend fun TelegramBot.startLiveLocation(
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
-public suspend fun TelegramBot.startLiveLocation(
+suspend fun TelegramBot.startLiveLocation(
     scope: CoroutineScope,
     chat: Chat,
     latitude: Double,
@@ -154,85 +135,65 @@ public suspend fun TelegramBot.startLiveLocation(
     initHorizontalAccuracy: Meters? = null,
     initHeading: Degrees? = null,
     initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = chat.id.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId,
-    businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowPaidBroadcast: Boolean = false,
-    effectId: EffectId? = null,
-    suggestedPostParameters: SuggestedPostParameters? = null,
-    replyParameters: ReplyParameters? = null,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): LiveLocationProvider = startLiveLocation(
-    scope = scope,
-    chatId = chat.id,
-    latitude = latitude,
-    longitude = longitude,
-    liveTimeMillis = liveTimeMillis,
-    initHorizontalAccuracy = initHorizontalAccuracy,
-    initHeading = initHeading,
-    initProximityAlertRadius = initProximityAlertRadius,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    businessConnectionId = businessConnectionId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    allowPaidBroadcast = allowPaidBroadcast,
-    effectId = effectId,
-    suggestedPostParameters = suggestedPostParameters,
-    replyParameters = replyParameters,
-    replyMarkup = replyMarkup
+    scope,
+    chat.id,
+    latitude,
+    longitude,
+    liveTimeMillis,
+    initHorizontalAccuracy,
+    initHeading,
+    initProximityAlertRadius,
+    disableNotification,
+    protectContent,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
 )
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
-public suspend fun TelegramBot.startLiveLocation(
+suspend fun TelegramBot.startLiveLocation(
     scope: CoroutineScope,
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
     location: StaticLocation,
     liveTimeMillis: Long = defaultLivePeriodDelayMillis,
     initHorizontalAccuracy: Meters? = null,
     initHeading: Degrees? = null,
     initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowPaidBroadcast: Boolean = false,
-    effectId: EffectId? = null,
-    suggestedPostParameters: SuggestedPostParameters? = null,
-    replyParameters: ReplyParameters? = null,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): LiveLocationProvider = startLiveLocation(
-    scope = scope,
-    chatId = chatId,
-    latitude = location.latitude,
-    longitude = location.longitude,
-    liveTimeMillis = liveTimeMillis,
-    initHorizontalAccuracy = initHorizontalAccuracy,
-    initHeading = initHeading,
-    initProximityAlertRadius = initProximityAlertRadius,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    businessConnectionId = businessConnectionId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    allowPaidBroadcast = allowPaidBroadcast,
-    effectId = effectId,
-    suggestedPostParameters = suggestedPostParameters,
-    replyParameters = replyParameters,
-    replyMarkup = replyMarkup
+    scope,
+    chatId,
+    location.latitude,
+    location.longitude,
+    liveTimeMillis,
+    initHorizontalAccuracy,
+    initHeading,
+    initProximityAlertRadius,
+    disableNotification,
+    protectContent,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
 )
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
-public suspend fun TelegramBot.startLiveLocation(
+suspend fun TelegramBot.startLiveLocation(
     scope: CoroutineScope,
     chat: Chat,
     location: StaticLocation,
@@ -240,43 +201,33 @@ public suspend fun TelegramBot.startLiveLocation(
     initHorizontalAccuracy: Meters? = null,
     initHeading: Degrees? = null,
     initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = chat.id.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId,
-    businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowPaidBroadcast: Boolean = false,
-    effectId: EffectId? = null,
-    suggestedPostParameters: SuggestedPostParameters? = null,
-    replyParameters: ReplyParameters? = null,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ): LiveLocationProvider = startLiveLocation(
-    scope = scope,
-    chatId = chat.id,
-    latitude = location.latitude,
-    longitude = location.longitude,
-    liveTimeMillis = liveTimeMillis,
-    initHorizontalAccuracy = initHorizontalAccuracy,
-    initHeading = initHeading,
-    initProximityAlertRadius = initProximityAlertRadius,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    businessConnectionId = businessConnectionId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    allowPaidBroadcast = allowPaidBroadcast,
-    effectId = effectId,
-    suggestedPostParameters = suggestedPostParameters,
-    replyParameters = replyParameters,
-    replyMarkup = replyMarkup
+    scope,
+    chat.id,
+    location.latitude,
+    location.longitude,
+    liveTimeMillis,
+    initHorizontalAccuracy,
+    initHeading,
+    initProximityAlertRadius,
+    disableNotification,
+    protectContent,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
 )
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
-public suspend inline fun TelegramBot.replyWithLiveLocation(
-    to: AccessibleMessage,
+suspend inline fun TelegramBot.replyWithLiveLocation(
+    to: Message,
     scope: CoroutineScope,
     latitude: Double,
     longitude: Double,
@@ -284,75 +235,53 @@ public suspend inline fun TelegramBot.replyWithLiveLocation(
     initHorizontalAccuracy: Meters? = null,
     initHeading: Degrees? = null,
     initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = to.threadIdOrNull,
-    directMessageThreadId: DirectMessageThreadId? = to.directMessageThreadIdOrNull,
-    businessConnectionId: BusinessConnectionId? = to.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowPaidBroadcast: Boolean = false,
-    effectId: EffectId? = null,
-    suggestedPostParameters: SuggestedPostParameters? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-): LiveLocationProvider = startLiveLocation(
-    scope = scope,
-    chat = to.chat,
-    latitude = latitude,
-    longitude = longitude,
-    liveTimeMillis = liveTimeMillis,
-    initHorizontalAccuracy = initHorizontalAccuracy,
-    initHeading = initHeading,
-    initProximityAlertRadius = initProximityAlertRadius,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    businessConnectionId = businessConnectionId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    allowPaidBroadcast = allowPaidBroadcast,
-    effectId = effectId,
-    suggestedPostParameters = suggestedPostParameters,
-    replyParameters = ReplyParameters(to.metaInfo, allowSendingWithoutReply = allowSendingWithoutReply),
-    replyMarkup = replyMarkup
+) = startLiveLocation(
+    scope,
+    to.chat,
+    latitude,
+    longitude,
+    liveTimeMillis,
+    initHorizontalAccuracy,
+    initHeading,
+    initProximityAlertRadius,
+    disableNotification,
+    protectContent,
+    to.messageId,
+    allowSendingWithoutReply,
+    replyMarkup
 )
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
  * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
  */
-public suspend inline fun TelegramBot.replyWithLiveLocation(
-    to: AccessibleMessage,
+suspend inline fun TelegramBot.replyWithLiveLocation(
+    to: Message,
     scope: CoroutineScope,
     location: StaticLocation,
     liveTimeMillis: Long = defaultLivePeriodDelayMillis,
     initHorizontalAccuracy: Meters? = null,
     initHeading: Degrees? = null,
     initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = to.threadIdOrNull,
-    directMessageThreadId: DirectMessageThreadId? = to.directMessageThreadIdOrNull,
-    businessConnectionId: BusinessConnectionId? = to.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
-    allowPaidBroadcast: Boolean = false,
-    effectId: EffectId? = null,
-    suggestedPostParameters: SuggestedPostParameters? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-): LiveLocationProvider = startLiveLocation(
-    scope = scope,
-    chat = to.chat,
-    location = location,
-    liveTimeMillis = liveTimeMillis,
-    initHorizontalAccuracy = initHorizontalAccuracy,
-    initHeading = initHeading,
-    initProximityAlertRadius = initProximityAlertRadius,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    businessConnectionId = businessConnectionId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    allowPaidBroadcast = allowPaidBroadcast,
-    effectId = effectId,
-    suggestedPostParameters = suggestedPostParameters,
-    replyParameters = ReplyParameters(to.metaInfo, allowSendingWithoutReply = allowSendingWithoutReply),
-    replyMarkup = replyMarkup
+) = startLiveLocation(
+    scope,
+    to.chat,
+    location,
+    liveTimeMillis,
+    initHorizontalAccuracy,
+    initHeading,
+    initProximityAlertRadius,
+    disableNotification,
+    protectContent,
+    to.messageId,
+    allowSendingWithoutReply,
+    replyMarkup
 )

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

@@ -3,4 +3,4 @@ package dev.inmo.tgbotapi.extensions.api
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.local.LogOut
 
-public suspend inline fun TelegramBot.logOut(): Unit = execute(LogOut)
+suspend inline fun TelegramBot.logOut() = execute(LogOut)

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

@@ -1,21 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.SavePreparedKeyboardButton
-import dev.inmo.tgbotapi.types.ChatId
-import dev.inmo.tgbotapi.types.buttons.KeyboardButton
-import dev.inmo.tgbotapi.types.buttons.PreparedKeyboardButton
-import dev.inmo.tgbotapi.types.chat.User
-import dev.inmo.tgbotapi.types.toChatId
-
-public suspend fun TelegramBot.savePreparedKeyboardButton(
-    userId: ChatId,
-    button: KeyboardButton
-): PreparedKeyboardButton = execute(
-    SavePreparedKeyboardButton(userId = userId, button = button)
-)
-
-public suspend fun TelegramBot.savePreparedKeyboardButton(
-    user: User,
-    button: KeyboardButton
-): PreparedKeyboardButton = savePreparedKeyboardButton(userId = user.id.toChatId(), button = button)

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

@@ -3,54 +3,48 @@ package dev.inmo.tgbotapi.extensions.api
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.StopPoll
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
 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.polls.Poll
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-public suspend fun TelegramBot.stopPoll(
+suspend fun TelegramBot.stopPoll(
     chatId: ChatIdentifier,
-    messageId: MessageId,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
+    messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
-): Poll = execute(
-    StopPoll(chatId, messageId, businessConnectionId, replyMarkup)
+) = execute(
+    StopPoll(chatId, messageId, replyMarkup)
 )
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-public suspend fun TelegramBot.stopPoll(
+suspend fun TelegramBot.stopPoll(
     chat: Chat,
-    messageId: MessageId,
-    businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId,
+    messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
-): Poll = stopPoll(chat.id, messageId, businessConnectionId, replyMarkup)
+) = stopPoll(chat.id, messageId, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-public suspend fun TelegramBot.stopPoll(
-    chatId: IdChatIdentifier,
-    message: AccessibleMessage,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
+suspend fun TelegramBot.stopPoll(
+    chatId: ChatId,
+    message: Message,
     replyMarkup: InlineKeyboardMarkup? = null
-): Poll = stopPoll(chatId, message.messageId, businessConnectionId, replyMarkup)
+) = stopPoll(chatId, message.messageId, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
  * as a builder for that
  */
-public suspend fun TelegramBot.stopPoll(
+suspend fun TelegramBot.stopPoll(
     chat: Chat,
-    message: AccessibleMessage,
-    businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId,
+    message: Message,
     replyMarkup: InlineKeyboardMarkup? = null
-): Poll = stopPoll(chat.id, message.messageId, businessConnectionId, replyMarkup)
+) = stopPoll(chat.id, message.messageId, replyMarkup)

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

@@ -2,29 +2,29 @@ package dev.inmo.tgbotapi.extensions.api.answers
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.answers.AnswerCallbackQuery
-import dev.inmo.tgbotapi.types.queries.callback.CallbackQuery
-import dev.inmo.tgbotapi.types.CallbackQueryId
+import dev.inmo.tgbotapi.types.CallbackQuery.CallbackQuery
+import dev.inmo.tgbotapi.types.CallbackQueryIdentifier
 
-public suspend fun TelegramBot.answerCallbackQuery(
-    callbackQueryId: CallbackQueryId,
+suspend fun TelegramBot.answerCallbackQuery(
+    callbackQueryId: CallbackQueryIdentifier,
     text: String? = null,
     showAlert: Boolean? = null,
     url: String? = null,
     cachedTimeSeconds: Int? = null
-): Unit = execute(AnswerCallbackQuery(callbackQueryId, text, showAlert, url, cachedTimeSeconds))
+) = execute(AnswerCallbackQuery(callbackQueryId, text, showAlert, url, cachedTimeSeconds))
 
-public suspend fun TelegramBot.answerCallbackQuery(
+suspend fun TelegramBot.answerCallbackQuery(
     callbackQuery: CallbackQuery,
     text: String? = null,
     showAlert: Boolean? = null,
     url: String? = null,
     cachedTimeSeconds: Int? = null
-): Unit = answerCallbackQuery(callbackQuery.id, text, showAlert, url, cachedTimeSeconds)
+) = answerCallbackQuery(callbackQuery.id, text, showAlert, url, cachedTimeSeconds)
 
-public suspend fun TelegramBot.answer(
+suspend fun TelegramBot.answer(
     callbackQuery: CallbackQuery,
     text: String? = null,
     showAlert: Boolean? = null,
     url: String? = null,
     cachedTimeSeconds: Int? = null
-): Unit = answerCallbackQuery(callbackQuery.id, text, showAlert, url, cachedTimeSeconds)
+) = answerCallbackQuery(callbackQuery.id, text, showAlert, url, cachedTimeSeconds)

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

@@ -2,68 +2,38 @@ 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.InlineQueryId
+import dev.inmo.tgbotapi.types.InlineQueryIdentifier
 
-public suspend fun TelegramBot.answerInlineQuery(
-    inlineQueryID: InlineQueryId,
+suspend fun TelegramBot.answerInlineQuery(
+    inlineQueryID: InlineQueryIdentifier,
     results: List<InlineQueryResult> = emptyList(),
     cachedTime: Int? = null,
     isPersonal: Boolean? = null,
     nextOffset: String? = null,
-    button: InlineQueryResultsButton? = null
-): Unit = execute(
-    AnswerInlineQuery(inlineQueryID, results, cachedTime, isPersonal, nextOffset, button)
-)
-
-public suspend fun TelegramBot.answerInlineQuery(
-    inlineQuery: InlineQuery,
-    results: List<InlineQueryResult> = emptyList(),
-    cachedTime: Int? = null,
-    isPersonal: Boolean? = null,
-    nextOffset: String? = null,
-    button: InlineQueryResultsButton? = null
-): Unit = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, button)
-
-public suspend fun TelegramBot.answer(
-    inlineQuery: InlineQuery,
-    results: List<InlineQueryResult> = emptyList(),
-    cachedTime: Int? = null,
-    isPersonal: Boolean? = null,
-    nextOffset: String? = null,
-    button: InlineQueryResultsButton? = null
-): Unit = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, button)
-
-public suspend fun TelegramBot.answerInlineQuery(
-    inlineQueryID: InlineQueryId,
-    results: List<InlineQueryResult> = emptyList(),
-    cachedTime: Int? = null,
-    isPersonal: Boolean? = null,
-    nextOffset: String? = null,
-    switchPmText: String?,
-    switchPmParameter: String?
-): Unit = execute(
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
+) = execute(
     AnswerInlineQuery(inlineQueryID, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
 )
 
-public suspend fun TelegramBot.answerInlineQuery(
+suspend fun TelegramBot.answerInlineQuery(
     inlineQuery: InlineQuery,
     results: List<InlineQueryResult> = emptyList(),
     cachedTime: Int? = null,
     isPersonal: Boolean? = null,
     nextOffset: String? = null,
-    switchPmText: String?,
-    switchPmParameter: String?
-): Unit = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
+) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
 
-public suspend fun TelegramBot.answer(
+suspend fun TelegramBot.answer(
     inlineQuery: InlineQuery,
     results: List<InlineQueryResult> = emptyList(),
     cachedTime: Int? = null,
     isPersonal: Boolean? = null,
     nextOffset: String? = null,
-    switchPmText: String?,
-    switchPmParameter: String?
-): Unit = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
+    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/answers/AnswerWebAppQuery.kt

@@ -1,17 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.answers
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.answers.AnswerWebAppQuery
-import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
-import dev.inmo.tgbotapi.types.WebAppQueryId
-import dev.inmo.tgbotapi.types.webapps.query.SentWebAppMessage
-
-public suspend fun TelegramBot.answerWebAppQuery(
-    webAppQueryId: WebAppQueryId,
-    result: InlineQueryResult
-): SentWebAppMessage = execute(AnswerWebAppQuery(webAppQueryId, result))
-
-public suspend fun TelegramBot.answer(
-    webAppQueryId: WebAppQueryId,
-    result: InlineQueryResult
-): SentWebAppMessage = execute(AnswerWebAppQuery(webAppQueryId, result))

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

@@ -6,18 +6,18 @@ import dev.inmo.tgbotapi.requests.answers.payments.AnswerPreCheckoutQueryOk
 import dev.inmo.tgbotapi.types.PreCheckoutQueryId
 import dev.inmo.tgbotapi.types.payments.PreCheckoutQuery
 
-public suspend fun TelegramBot.answerPreCheckoutQueryOk(
+suspend fun TelegramBot.answerPreCheckoutQueryOk(
     id: PreCheckoutQueryId
-): Unit = execute(AnswerPreCheckoutQueryOk(id))
-public suspend fun TelegramBot.answerPreCheckoutQueryOk(
+) = execute(AnswerPreCheckoutQueryOk(id))
+suspend fun TelegramBot.answerPreCheckoutQueryOk(
     preCheckoutQuery: PreCheckoutQuery
-): Unit = answerPreCheckoutQueryOk(preCheckoutQuery.id)
+) = answerPreCheckoutQueryOk(preCheckoutQuery.id)
 
-public suspend fun TelegramBot.answerPreCheckoutQueryError(
+suspend fun TelegramBot.answerPreCheckoutQueryError(
     id: PreCheckoutQueryId,
     error: String
-): Unit = execute(AnswerPreCheckoutQueryError(id, error))
-public suspend fun TelegramBot.answerPreCheckoutQueryError(
+) = execute(AnswerPreCheckoutQueryError(id, error))
+suspend fun TelegramBot.answerPreCheckoutQueryError(
     preCheckoutQuery: PreCheckoutQuery,
     error: String
-): Unit = answerPreCheckoutQueryError(preCheckoutQuery.id, error)
+) = answerPreCheckoutQueryError(preCheckoutQuery.id, error)

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

@@ -3,26 +3,26 @@ package dev.inmo.tgbotapi.extensions.api.answers.payments
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.answers.payments.AnswerShippingQueryError
 import dev.inmo.tgbotapi.requests.answers.payments.AnswerShippingQueryOk
-import dev.inmo.tgbotapi.types.ShippingQueryId
+import dev.inmo.tgbotapi.types.ShippingQueryIdentifier
 import dev.inmo.tgbotapi.types.payments.ShippingOption
 import dev.inmo.tgbotapi.types.payments.ShippingQuery
 
-public suspend fun TelegramBot.answerShippingQueryOk(
-    id: ShippingQueryId,
+suspend fun TelegramBot.answerShippingQueryOk(
+    id: ShippingQueryIdentifier,
     shippingOptions: List<ShippingOption>
-): Unit = execute(AnswerShippingQueryOk(id, shippingOptions))
-public suspend fun TelegramBot.answerShippingQueryOk(
+) = execute(AnswerShippingQueryOk(id, shippingOptions))
+suspend fun TelegramBot.answerShippingQueryOk(
     shippingQuery: ShippingQuery,
     shippingOptions: List<ShippingOption>
-): Unit = answerShippingQueryOk(shippingQuery.id, shippingOptions)
+) = answerShippingQueryOk(shippingQuery.id, shippingOptions)
 
-public suspend fun TelegramBot.answerShippingQueryError(
-    id: ShippingQueryId,
+suspend fun TelegramBot.answerShippingQueryError(
+    id: ShippingQueryIdentifier,
     error: String
-): Unit = execute(AnswerShippingQueryError(id, error))
-public suspend fun TelegramBot.answerShippingQueryError(
+) = execute(AnswerShippingQueryError(id, error))
+suspend fun TelegramBot.answerShippingQueryError(
     shippingQuery: ShippingQuery,
     error: String
-): Unit = answerShippingQueryError(shippingQuery.id, error)
+) = answerShippingQueryError(shippingQuery.id, error)
 
 

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

@@ -1,12 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.ClearMyDefaultAdministratorRights
-
-public suspend fun TelegramBot.clearMyDefaultAdministratorRights(
-    forChannels: Boolean? = null
-): Unit = execute(ClearMyDefaultAdministratorRights(forChannels))
-
-public suspend fun TelegramBot.clearMyDefaultAdministratorRightsForChannels(): Unit = clearMyDefaultAdministratorRights(forChannels = true)
-
-public suspend fun TelegramBot.clearMyDefaultAdministratorRightsForGroupsAndSupergroups(): Unit = clearMyDefaultAdministratorRights(forChannels = false)

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

@@ -1,17 +1,17 @@
 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
 import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
-public suspend fun TelegramBot.deleteMyCommands(
+suspend fun TelegramBot.deleteMyCommands(
     scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLang?
-): Unit = execute(DeleteMyCommands(scope, languageCode))
+    languageCode: IetfLanguageCode?
+) = execute(DeleteMyCommands(scope, languageCode))
 
-public suspend fun TelegramBot.deleteMyCommands(
+suspend fun TelegramBot.deleteMyCommands(
     scope: BotCommandScope = BotCommandScopeDefault,
     languageCode: String? = null
-): Unit = deleteMyCommands(scope, languageCode ?.let(::IetfLang))
+) = deleteMyCommands(scope, languageCode ?.let(::IetfLanguageCode))

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

@@ -2,6 +2,5 @@ package dev.inmo.tgbotapi.extensions.api.bot
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.GetMe
-import dev.inmo.tgbotapi.types.chat.ExtendedBot
 
-public suspend fun TelegramBot.getMe(): ExtendedBot = execute(GetMe)
+suspend fun TelegramBot.getMe() = execute(GetMe)

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

@@ -1,18 +1,17 @@
 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.BotCommand
 import dev.inmo.tgbotapi.types.commands.BotCommandScope
 import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
-public suspend fun TelegramBot.getMyCommands(
+suspend fun TelegramBot.getMyCommands(
     scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLang? = null
-): List<BotCommand> = execute(GetMyCommands(scope, languageCode))
+    languageCode: IetfLanguageCode? = null
+) = execute(GetMyCommands(scope, languageCode))
 
-public suspend fun TelegramBot.getMyCommands(
+suspend fun TelegramBot.getMyCommands(
     scope: BotCommandScope = BotCommandScopeDefault,
     languageCode: String?
-): List<BotCommand> = getMyCommands(scope, languageCode ?.let(::IetfLang))
+) = getMyCommands(scope, languageCode ?.let(::IetfLanguageCode))

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

@@ -1,13 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyDefaultAdministratorRights
-import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
-
-public suspend fun TelegramBot.getMyDefaultAdministratorRights(
-    forChannels: Boolean? = null
-): AdministratorChatMember = execute(GetMyDefaultAdministratorRights(forChannels))
-
-public suspend fun TelegramBot.getMyDefaultAdministratorRightsForChannels(): AdministratorChatMember = getMyDefaultAdministratorRights(forChannels = true)
-
-public suspend fun TelegramBot.getMyDefaultAdministratorRightsForGroupsAndSupergroups(): AdministratorChatMember = getMyDefaultAdministratorRights(forChannels = false)

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

@@ -1,14 +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
-import dev.inmo.tgbotapi.types.BotDescription
-
-public suspend fun TelegramBot.getMyDescription(
-    languageCode: IetfLang? = null
-): BotDescription = execute(GetMyDescription(languageCode))
-
-public suspend fun TelegramBot.getMyDescription(
-    languageCode: String?
-): BotDescription = getMyDescription(languageCode ?.let(::IetfLang))

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

@@ -1,14 +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
-import dev.inmo.tgbotapi.types.BotName
-
-public suspend fun TelegramBot.getMyName(
-    languageCode: IetfLang? = null
-): BotName = execute(GetMyName(languageCode))
-
-public suspend fun TelegramBot.getMyName(
-    languageCode: String?
-): BotName = getMyName(languageCode ?.let(::IetfLang))

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

@@ -1,17 +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.BotShortDescription
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-public suspend fun TelegramBot.getMyShortDescription(
-    languageCode: IetfLang? = null
-): BotShortDescription = execute(GetMyShortDescription(languageCode))
-
-public suspend fun TelegramBot.getMyShortDescription(
-    languageCode: String?
-): BotShortDescription = getMyShortDescription(languageCode ?.let(::IetfLang))

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

@@ -1,9 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMe
-import dev.inmo.tgbotapi.requests.bot.GetMyStarBalance
-import dev.inmo.tgbotapi.types.chat.ExtendedBot
-import dev.inmo.tgbotapi.types.payments.stars.StarAmount
-
-public suspend fun TelegramBot.getMyStarBalance(): StarAmount = execute(GetMyStarBalance)

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

@@ -1,6 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.RemoveMyProfilePhoto
-
-public suspend fun TelegramBot.removeMyProfilePhoto(): Unit = execute(RemoveMyProfilePhoto)

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

@@ -1,32 +1,32 @@
 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
 import dev.inmo.tgbotapi.types.commands.BotCommandScope
 import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
-public suspend fun TelegramBot.setMyCommands(
+suspend fun TelegramBot.setMyCommands(
     commands: List<BotCommand>,
     scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLang?
-): Unit = execute(SetMyCommands(commands, scope, languageCode))
+    languageCode: IetfLanguageCode?
+) = execute(SetMyCommands(commands, scope, languageCode))
 
-public suspend fun TelegramBot.setMyCommands(
+suspend fun TelegramBot.setMyCommands(
     vararg commands: BotCommand,
     scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLang?
-): Unit = setMyCommands(commands.toList(), scope, languageCode)
+    languageCode: IetfLanguageCode?
+) = setMyCommands(commands.toList(), scope, languageCode)
 
-public suspend fun TelegramBot.setMyCommands(
+suspend fun TelegramBot.setMyCommands(
     commands: List<BotCommand>,
     scope: BotCommandScope = BotCommandScopeDefault,
     languageCode: String? = null
-): Unit = setMyCommands(commands, scope, languageCode ?.let(::IetfLang))
+) = setMyCommands(commands, scope, languageCode ?.let(::IetfLanguageCode))
 
-public suspend fun TelegramBot.setMyCommands(
+suspend fun TelegramBot.setMyCommands(
     vararg commands: BotCommand,
     scope: BotCommandScope = BotCommandScopeDefault,
     languageCode: String? = null
-): Unit = setMyCommands(commands.toList(), scope, languageCode)
+) = setMyCommands(commands.toList(), scope, languageCode)

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

@@ -1,18 +0,0 @@
-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
-
-public suspend fun TelegramBot.setMyDefaultAdministratorRights(
-    rights: ChatCommonAdministratorRights,
-    forChannels: Boolean? = null
-): Unit = execute(SetMyDefaultAdministratorRights(rights, forChannels))
-
-public suspend fun TelegramBot.setMyDefaultAdministratorRightsForChannels(
-    rights: ChatCommonAdministratorRights
-): Unit = setMyDefaultAdministratorRights(rights, forChannels = true)
-
-public suspend fun TelegramBot.setMyDefaultAdministratorRightsForGroupsAndSupergroups(
-    rights: ChatCommonAdministratorRights
-): Unit = 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
-
-public suspend fun TelegramBot.setMyDescription(
-    description: String? = null,
-    languageCode: IetfLang? = null
-): Unit = execute(SetMyDescription(description, languageCode))
-
-public suspend fun TelegramBot.setMyDescription(
-    description: String?,
-    languageCode: String?
-): Unit = 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
-
-public suspend fun TelegramBot.setMyName(
-    name: String? = null,
-    languageCode: IetfLang? = null
-): Unit = execute(SetMyName(name, languageCode))
-
-public suspend fun TelegramBot.setMyName(
-    name: String?,
-    languageCode: String?
-): Unit = setMyName(name, languageCode ?.let(::IetfLang))

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

@@ -1,9 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.SetMyProfilePhoto
-import dev.inmo.tgbotapi.requests.business_connection.InputProfilePhoto
-
-public suspend fun TelegramBot.setMyProfilePhoto(
-    photo: InputProfilePhoto
-): Unit = execute(SetMyProfilePhoto(photo))

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
-
-public suspend fun TelegramBot.setMyShortDescription(
-    shortDescription: String? = null,
-    languageCode: IetfLang? = null
-): Unit = execute(SetMyShortDescription(shortDescription, languageCode))
-
-public suspend fun TelegramBot.setMyShortDescription(
-    shortDescription: String?,
-    languageCode: String?
-): Unit = setMyShortDescription(shortDescription, languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/ConvertGiftToStars.kt

@@ -1,25 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.micro_utils.ksp.variations.GenerateVariations
-import dev.inmo.micro_utils.ksp.variations.GenerationVariant
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.ConvertGiftToStars
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.GiftId
-import dev.inmo.tgbotapi.types.gifts.Gift
-
-public suspend fun TelegramBot.convertGiftToStars(
-    businessConnectionId: BusinessConnectionId,
-    ownedGiftId: GiftId
-): Unit = execute(
-    ConvertGiftToStars(businessConnectionId, ownedGiftId)
-)
-
-public suspend fun TelegramBot.convertGiftToStars(
-    businessConnectionId: BusinessConnectionId,
-    gift: Gift.Regular
-): Unit = convertGiftToStars(
-    businessConnectionId = businessConnectionId,
-    ownedGiftId = with(gift) {id}
-)
-

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/DeleteBusinessMessages.kt

@@ -1,20 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.micro_utils.ksp.variations.GenerateVariations
-import dev.inmo.micro_utils.ksp.variations.GenerationVariant
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.DeleteBusinessMessages
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.ChatId
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-
-@GenerateVariations
-public suspend fun TelegramBot.deleteBusinessMessages(
-    businessConnectionId: BusinessConnectionId,
-    @GenerationVariant(List::class, "messages.map { it.messageId }", "messages", AccessibleMessage::class)
-    messageIds: List<MessageId>
-): Unit = execute(
-    DeleteBusinessMessages(businessConnectionId, messageIds)
-)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/DeleteBusinessMessagesGeneratedVariation.kt

@@ -1,16 +0,0 @@
-// THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
-// TO REGENERATE IT JUST DELETE FILE
-// ORIGINAL FILE: DeleteBusinessMessages.kt
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-import kotlin.Boolean
-import kotlin.collections.List
-
-public suspend fun TelegramBot.deleteBusinessMessages(businessConnectionId: BusinessConnectionId,
-    messages: List<AccessibleMessage>): Unit = deleteBusinessMessages(
-    businessConnectionId = businessConnectionId, messageIds = with(messages) {messages.map {
-    it.messageId }}
-)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/GetBusinessAccountGifts.kt

@@ -1,105 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.GetBusinessAccountGifts
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.OwnedGifts
-import dev.inmo.tgbotapi.types.gifts.GiftSentOrReceivedEvent
-import dev.inmo.tgbotapi.types.gifts.OwnedGift
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlin.runCatching
-
-public suspend fun TelegramBot.getBusinessAccountGifts(
-    businessConnectionId: BusinessConnectionId,
-    excludeUnsaved: Boolean = false,
-    excludeSaved: Boolean = false,
-    excludeUnlimited: Boolean = false,
-    excludeLimitedUpgradable: Boolean = false,
-    excludeLimitedNonUpgradable: Boolean = false,
-    excludeUnique: Boolean = false,
-    excludeFromBlockchain: Boolean = false,
-    sortByPrice: Boolean = false,
-    offset: String? = null,
-    limit: Int? = null
-): OwnedGifts<OwnedGift.OwnedByBusinessAccount> = execute(
-    GetBusinessAccountGifts(
-        businessConnectionId,
-        excludeUnsaved,
-        excludeSaved,
-        excludeUnlimited,
-        excludeLimitedUpgradable,
-        excludeLimitedNonUpgradable,
-        excludeUnique,
-        excludeFromBlockchain,
-        sortByPrice,
-        offset,
-        limit
-    )
-)
-
-/**
- * Creates a flow that emits business account gifts in a paginated manner.
- *
- * This function will automatically handle pagination by using the `nextOffset` from each response
- * to fetch the next page of gifts until there are no more gifts to fetch.
- *
- * @param businessConnectionId The ID of the business connection
- * @param excludeUnsaved Whether to exclude unsaved gifts
- * @param excludeSaved Whether to exclude saved gifts
- * @param excludeUnlimited Whether to exclude unlimited gifts
- * @param excludeLimitedUpgradable Whether to exclude limited upgradable gifts
- * @param excludeLimitedNonUpgradable Whether to exclude limited non-upgradable gifts
- * @param excludeUnique Whether to exclude unique gifts
- * @param excludeFromBlockchain Whether to exclude gifts from blockchain
- * @param sortByPrice Whether to sort gifts by price
- * @param initialOffset The initial offset to start fetching from. If null, starts from the beginning
- * @param limit The maximum number of gifts to fetch per request
- * @param onErrorContinueChecker A function that determines whether to continue fetching on error.
- *                              Returns true to continue, false to stop. Default is to stop on any error.
- * @return A flow that emits [OwnedGifts] containing the fetched gifts
- */
-public fun TelegramBot.getBusinessAccountGiftsFlow(
-    businessConnectionId: BusinessConnectionId,
-    excludeUnsaved: Boolean = false,
-    excludeSaved: Boolean = false,
-    excludeUnlimited: Boolean = false,
-    excludeLimitedUpgradable: Boolean = false,
-    excludeLimitedNonUpgradable: Boolean = false,
-    excludeUnique: Boolean = false,
-    excludeFromBlockchain: Boolean = false,
-    sortByPrice: Boolean = false,
-    initialOffset: String? = null,
-    limit: Int? = null,
-    onErrorContinueChecker: suspend (Throwable?) -> Boolean = { false }
-): Flow<OwnedGifts<OwnedGift.OwnedByBusinessAccount>> = flow {
-    var currentOffset = initialOffset
-    do {
-        val response = runCatching {
-            getBusinessAccountGifts(
-                businessConnectionId,
-                excludeUnsaved,
-                excludeSaved,
-                excludeUnlimited,
-                excludeLimitedUpgradable,
-                excludeLimitedNonUpgradable,
-                excludeUnique,
-                excludeFromBlockchain,
-                sortByPrice,
-                currentOffset,
-                limit
-            )
-        }
-        if (response.isSuccess) {
-            val result = response.getOrThrow()
-            emit(result)
-            currentOffset = result.nextOffset
-        } else {
-            if (onErrorContinueChecker(response.exceptionOrNull())) {
-                continue
-            } else {
-                break
-            }
-        }
-    } while (currentOffset != null)
-}

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/GetBusinessAccountStarBalance.kt

@@ -1,12 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.GetBusinessAccountStarBalance
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.payments.stars.StarAmount
-
-public suspend fun TelegramBot.getBusinessAccountStarBalance(
-    businessConnectionId: BusinessConnectionId
-): StarAmount = execute(
-    GetBusinessAccountStarBalance(businessConnectionId)
-) 

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/ReadBusinessMessage.kt

@@ -1,27 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.micro_utils.ksp.variations.GenerateVariations
-import dev.inmo.micro_utils.ksp.variations.GenerationVariant
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.ReadBusinessMessage
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.ChatId
-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.toChatId
-
-@GenerateVariations
-public suspend fun TelegramBot.readBusinessMessage(
-    businessConnectionId: BusinessConnectionId,
-    @GenerationVariant(Chat::class, "chat.id.toChatId()", "chat")
-    chatId: ChatId,
-    messageId: MessageId
-): Unit = execute(
-    ReadBusinessMessage(businessConnectionId, chatId, messageId)
-)
-
-public suspend fun TelegramBot.readBusinessMessage(
-    businessConnectionId: BusinessConnectionId,
-    message: AccessibleMessage
-): Unit = readBusinessMessage(businessConnectionId, message.chat.id.toChatId(), message.messageId)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/ReadBusinessMessageGeneratedVariation.kt

@@ -1,20 +0,0 @@
-// THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
-// TO REGENERATE IT JUST DELETE FILE
-// ORIGINAL FILE: ReadBusinessMessage.kt
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.toChatId
-import kotlin.Boolean
-
-public suspend fun TelegramBot.readBusinessMessage(
-  businessConnectionId: BusinessConnectionId,
-  chat: Chat,
-  messageId: MessageId,
-): Unit = readBusinessMessage(
-    businessConnectionId = businessConnectionId, chatId = with(chat) {chat.id.toChatId()}, messageId
-    = messageId
-)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/RemoveBusinessAccountProfilePhoto.kt

@@ -1,12 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.RemoveBusinessAccountProfilePhoto
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-
-public suspend fun TelegramBot.removeBusinessAccountProfilePhoto(
-    businessConnectionId: BusinessConnectionId,
-    isPublic: Boolean = false
-): Unit = execute(
-    RemoveBusinessAccountProfilePhoto(businessConnectionId = businessConnectionId, isPublic = isPublic)
-) 

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/SetBusinessAccountBio.kt

@@ -1,12 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.SetBusinessAccountBio
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-
-public suspend fun TelegramBot.setBusinessAccountBio(
-    businessConnectionId: BusinessConnectionId,
-    bio: String
-): Unit = execute(
-    SetBusinessAccountBio(businessConnectionId, bio)
-) 

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/SetBusinessAccountGiftSettings.kt

@@ -1,35 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.SetBusinessAccountGiftSettings
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.gifts.AcceptedGiftTypes
-import dev.inmo.tgbotapi.types.message.abstracts.BusinessContentMessage
-
-/**
- * Sets the gift settings for a business account
- */
-public suspend fun TelegramBot.setBusinessAccountGiftSettings(
-    businessConnectionId: BusinessConnectionId,
-    showGiftButton: Boolean,
-    acceptedGiftTypes: AcceptedGiftTypes
-): Unit = execute(
-    SetBusinessAccountGiftSettings(
-        businessConnectionId = businessConnectionId,
-        showGiftButton = showGiftButton,
-        acceptedGiftTypes = acceptedGiftTypes
-    )
-)
-
-/**
- * Sets the gift settings for a business account using business message context
- */
-public suspend fun TelegramBot.setBusinessAccountGiftSettings(
-    message: BusinessContentMessage<*>,
-    showGiftButton: Boolean,
-    acceptedGiftTypes: AcceptedGiftTypes
-): Unit = setBusinessAccountGiftSettings(
-    businessConnectionId = message.businessConnectionId,
-    showGiftButton = showGiftButton,
-    acceptedGiftTypes = acceptedGiftTypes
-) 

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/SetBusinessAccountName.kt

@@ -1,13 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.SetBusinessAccountName
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-
-public suspend fun TelegramBot.setBusinessAccountName(
-    businessConnectionId: BusinessConnectionId,
-    firstName: String,
-    lastName: String? = null
-): Unit = execute(
-    SetBusinessAccountName(businessConnectionId, firstName, lastName)
-) 

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/SetBusinessAccountProfilePhoto.kt

@@ -1,14 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.InputProfilePhoto
-import dev.inmo.tgbotapi.requests.business_connection.SetBusinessAccountProfilePhoto
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-
-public suspend fun TelegramBot.setBusinessAccountProfilePhoto(
-    businessConnectionId: BusinessConnectionId,
-    photo: InputProfilePhoto,
-    isPublic: Boolean = false
-): Unit = execute(
-    SetBusinessAccountProfilePhoto(businessConnectionId, photo, isPublic)
-) 

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/SetBusinessAccountUsername.kt

@@ -1,15 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.micro_utils.ksp.variations.GenerateVariations
-import dev.inmo.micro_utils.ksp.variations.GenerationVariant
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.SetBusinessAccountUsername
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.Username
-
-public suspend fun TelegramBot.setBusinessAccountUsername(
-    businessConnectionId: BusinessConnectionId,
-    username: Username? = null
-): Unit = execute(
-    SetBusinessAccountUsername(businessConnectionId, username)
-) 

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/SetBusinessAccountUsernameGeneratedVariation.kt

@@ -1,18 +0,0 @@
-// THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
-// TO REGENERATE IT JUST DELETE FILE
-// ORIGINAL FILE: SetBusinessAccountUsername.kt
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.types.Username
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import kotlin.Boolean
-import kotlin.String
-
-public suspend fun TelegramBot.setBusinessAccountUsername(
-    businessConnectionId: BusinessConnectionId,
-    username: String?
-): Unit = setBusinessAccountUsername(
-    businessConnectionId = businessConnectionId,
-    username = username ?.let { Username.prepare(username) }
-)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/TransferBusinessAccountStarBalance.kt

@@ -1,12 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.TransferBusinessAccountStars
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-
-public suspend fun TelegramBot.transferBusinessAccountStars(
-    businessConnectionId: BusinessConnectionId,
-    amount: Int
-): Unit = execute(
-    TransferBusinessAccountStars(businessConnectionId, amount)
-) 

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/TransferGift.kt

@@ -1,43 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.micro_utils.ksp.variations.GenerateVariations
-import dev.inmo.micro_utils.ksp.variations.GenerationVariant
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.ConvertGiftToStars
-import dev.inmo.tgbotapi.requests.business_connection.TransferGift
-import dev.inmo.tgbotapi.requests.business_connection.UpgradeGift
-import dev.inmo.tgbotapi.types.ChatId
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.GiftId
-import dev.inmo.tgbotapi.types.businessConnectionIdField
-import dev.inmo.tgbotapi.types.gifts.Gift
-import dev.inmo.tgbotapi.types.keepOriginalDetailsField
-import dev.inmo.tgbotapi.types.ownedGiftIdField
-import dev.inmo.tgbotapi.types.starCountField
-import kotlinx.serialization.SerialName
-
-public suspend fun TelegramBot.transferGift(
-    businessConnectionId: BusinessConnectionId,
-    ownedGiftId: GiftId,
-    newOwnerChatId: ChatId,
-    transferPaymentStarCount: Int? = null,
-): Unit = execute(
-    TransferGift(
-        businessConnectionId = businessConnectionId,
-        ownedGiftId = ownedGiftId,
-        newOwnerChatId = newOwnerChatId,
-        transferPaymentStarCount = transferPaymentStarCount
-    )
-)
-
-public suspend fun TelegramBot.transferGift(
-    businessConnectionId: BusinessConnectionId,
-    gift: Gift.Regular,
-    newOwnerChatId: ChatId,
-    transferPaymentStarCount: Int? = null,
-): Unit = transferGift(
-    businessConnectionId = businessConnectionId,
-    ownedGiftId = gift.id,
-    newOwnerChatId = newOwnerChatId,
-    transferPaymentStarCount = transferPaymentStarCount
-)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/business/UpgradeGift.kt

@@ -1,42 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.business
-
-import dev.inmo.micro_utils.ksp.variations.GenerateVariations
-import dev.inmo.micro_utils.ksp.variations.GenerationVariant
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.business_connection.ConvertGiftToStars
-import dev.inmo.tgbotapi.requests.business_connection.UpgradeGift
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.GiftId
-import dev.inmo.tgbotapi.types.businessConnectionIdField
-import dev.inmo.tgbotapi.types.gifts.Gift
-import dev.inmo.tgbotapi.types.keepOriginalDetailsField
-import dev.inmo.tgbotapi.types.ownedGiftIdField
-import dev.inmo.tgbotapi.types.starCountField
-import kotlinx.serialization.SerialName
-
-public suspend fun TelegramBot.convertGiftToStars(
-    businessConnectionId: BusinessConnectionId,
-    ownedGiftId: GiftId,
-    keepOriginalDetails: Boolean = false,
-    starCount: Int? = null
-): Unit = execute(
-    UpgradeGift(
-        businessConnectionId = businessConnectionId,
-        ownedGiftId = ownedGiftId,
-        keepOriginalDetails = keepOriginalDetails,
-        starCount = starCount
-    )
-)
-
-public suspend fun TelegramBot.convertGiftToStars(
-    businessConnectionId: BusinessConnectionId,
-    gift: Gift.Regular,
-    keepOriginalDetails: Boolean = false,
-): Unit = execute(
-    UpgradeGift(
-        businessConnectionId = businessConnectionId,
-        ownedGiftId = gift.id,
-        keepOriginalDetails = keepOriginalDetails,
-        starCount = gift.upgradeStarCount
-    )
-)

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

@@ -3,12 +3,12 @@ package dev.inmo.tgbotapi.extensions.api.chat
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.ExportChatInviteLink
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 
-public suspend fun TelegramBot.exportChatInviteLink(
+suspend fun TelegramBot.exportChatInviteLink(
     chatId: ChatIdentifier
-): String = execute(ExportChatInviteLink(chatId))
+) = execute(ExportChatInviteLink(chatId))
 
-public suspend fun TelegramBot.exportChatInviteLink(
+suspend fun TelegramBot.exportChatInviteLink(
     chat: PublicChat
-): String = exportChatInviteLink(chat.id)
+) = exportChatInviteLink(chat.id)

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

@@ -3,12 +3,12 @@ package dev.inmo.tgbotapi.extensions.api.chat
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.LeaveChat
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 
-public suspend fun TelegramBot.leaveChat(
+suspend fun TelegramBot.leaveChat(
     chatId: ChatIdentifier
-): Unit = execute(LeaveChat(chatId))
+) = execute(LeaveChat(chatId))
 
-public suspend fun TelegramBot.leaveChat(
+suspend fun TelegramBot.leaveChat(
     chat: PublicChat
-): Unit = leaveChat(chat.id)
+) = leaveChat(chat.id)

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

@@ -1,28 +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.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-public suspend fun TelegramBot.closeForumTopic(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId
-): Unit = execute(
-    CloseForumTopic(
-        chatId,
-        messageThreadId
-    )
-)
-
-public suspend fun TelegramBot.closeForumTopic(
-    chat: Chat,
-    messageThreadId: MessageThreadId
-): Unit = closeForumTopic(chat.id, messageThreadId)
-
-public suspend fun TelegramBot.closeForumTopic(
-    chat: Chat,
-    forumTopic: ForumTopic
-): Unit = closeForumTopic(chat.id, forumTopic.messageThreadId)

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
-
-public suspend fun TelegramBot.closeGeneralForumTopic(
-    chatId: ChatIdentifier
-): Unit = execute(
-    CloseGeneralForumTopic(chatId)
-)
-
-public suspend fun TelegramBot.closeGeneralForumTopic(
-    chat: Chat
-): Unit = closeGeneralForumTopic(chat.id)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CreateForumTopic.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.CreateForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.CustomEmojiId
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.utils.RGBColor
-
-public suspend fun TelegramBot.createForumTopic(
-    chatId: ChatIdentifier,
-    name: String,
-    color: RGBColor,
-    iconEmojiId: CustomEmojiId? = null
-): ForumTopic = execute(
-    CreateForumTopic(
-        chatId,
-        name,
-        color,
-        iconEmojiId
-    )
-)
-
-public suspend fun TelegramBot.createForumTopic(
-    chat: Chat,
-    name: String,
-    color: RGBColor,
-    iconEmojiId: CustomEmojiId? = null
-): ForumTopic = createForumTopic(chat.id, name, color, iconEmojiId)

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

@@ -1,33 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.DeleteForumTopic
-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
-
-public suspend fun TelegramBot.deleteForumTopic(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId
-): Unit = execute(
-    DeleteForumTopic(
-        chatId,
-        messageThreadId
-    )
-)
-
-public suspend fun TelegramBot.deleteForumTopic(
-    chatId: ChatIdentifier,
-    forumTopic: ForumTopic
-): Unit = deleteForumTopic(chatId, forumTopic.messageThreadId)
-
-public suspend fun TelegramBot.deleteForumTopic(
-    chat: Chat,
-    messageThreadId: MessageThreadId
-): Unit = deleteForumTopic(chat.id, messageThreadId)
-
-public suspend fun TelegramBot.deleteForumTopic(
-    chat: Chat,
-    forumTopic: ForumTopic
-): Unit = deleteForumTopic(chat.id, forumTopic.messageThreadId)

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

@@ -1,36 +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.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
-
-public suspend fun TelegramBot.editForumTopic(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId,
-    name: String? = null,
-    iconEmojiId: CustomEmojiId? = null
-): Unit = execute(
-    EditForumTopic(
-        chatId,
-        messageThreadId,
-        name,
-        iconEmojiId
-    )
-)
-
-public suspend fun TelegramBot.editForumTopic(
-    chat: Chat,
-    messageThreadId: MessageThreadId,
-    name: String? = null,
-    iconEmojiId: CustomEmojiId? = null
-): Unit = editForumTopic(chat.id, messageThreadId, name, iconEmojiId)
-
-public suspend fun TelegramBot.editForumTopic(
-    chatIdentifier: ChatIdentifier,
-    forumTopic: ForumTopic,
-    iconEmojiId: CustomEmojiId? = forumTopic.iconEmojiId
-): Unit = 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
-
-public suspend fun TelegramBot.editGeneralForumTopic(
-    chatId: ChatIdentifier,
-    name: String
-): Unit = execute(
-    EditGeneralForumTopic(
-        chatId,
-        name
-    )
-)
-
-public suspend fun TelegramBot.editGeneralForumTopic(
-    chat: Chat,
-    name: String
-): Unit = editGeneralForumTopic(chat.id, name)
-
-public suspend fun TelegramBot.editGeneralForumTopic(
-    chatIdentifier: ChatIdentifier,
-    forumTopic: ForumTopic,
-): Unit = 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
-
-public suspend fun TelegramBot.hideGeneralForumTopic(
-    chatId: ChatIdentifier
-): Unit = execute(
-    HideGeneralForumTopic(chatId)
-)
-
-public suspend fun TelegramBot.hideGeneralForumTopic(
-    chat: Chat
-): Unit = hideGeneralForumTopic(chat.id)

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

@@ -1,28 +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.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-public suspend fun TelegramBot.reopenForumTopic(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId
-): Unit = execute(
-    ReopenForumTopic(
-        chatId,
-        messageThreadId
-    )
-)
-
-public suspend fun TelegramBot.reopenForumTopic(
-    chat: Chat,
-    messageThreadId: MessageThreadId
-): Unit = reopenForumTopic(chat.id, messageThreadId)
-
-public suspend fun TelegramBot.reopenForumTopic(
-    chat: Chat,
-    forumTopic: ForumTopic
-): Unit = reopenForumTopic(chat.id, forumTopic.messageThreadId)

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
-
-public suspend fun TelegramBot.reopenGeneralForumTopic(
-    chatId: ChatIdentifier
-): Unit = execute(
-    ReopenGeneralForumTopic(chatId)
-)
-
-public suspend fun TelegramBot.reopenGeneralForumTopic(
-    chat: Chat
-): Unit = 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
-
-public suspend fun TelegramBot.unhideGeneralForumTopic(
-    chatId: ChatIdentifier
-): Unit = execute(
-    UnhideGeneralForumTopic(chatId)
-)
-
-public suspend fun TelegramBot.unhideGeneralForumTopic(
-    chat: Chat
-): Unit = unhideGeneralForumTopic(chat.id)

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

@@ -1,28 +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.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-public suspend fun TelegramBot.unpinAllForumTopicMessages(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId
-): Unit = execute(
-    UnpinAllForumTopicMessages(
-        chatId,
-        messageThreadId
-    )
-)
-
-public suspend fun TelegramBot.unpinAllForumTopicMessages(
-    chat: Chat,
-    messageThreadId: MessageThreadId
-): Unit = unpinAllForumTopicMessages(chat.id, messageThreadId)
-
-public suspend fun TelegramBot.unpinAllForumTopicMessages(
-    chat: Chat,
-    forumTopic: ForumTopic
-): Unit = unpinAllForumTopicMessages(chat.id, forumTopic.messageThreadId)

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
-
-public suspend fun TelegramBot.unpinAllGeneralForumTopicMessages(
-    chatId: ChatIdentifier
-): Unit = execute(
-    UnpinAllGeneralForumTopicMessages(
-        chatId
-    )
-)
-
-public suspend fun TelegramBot.unpinAllGeneralForumTopicMessages(
-    chat: Chat
-): Unit = unpinAllGeneralForumTopicMessages(chat.id)

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

@@ -2,139 +2,131 @@ package dev.inmo.tgbotapi.extensions.api.chat.get
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.get.GetChat
-import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.*
+import dev.inmo.tgbotapi.types.chat.abstracts.*
+import dev.inmo.tgbotapi.types.chat.abstracts.extended.*
+import dev.inmo.tgbotapi.types.chat.extended.*
 import dev.inmo.tgbotapi.utils.PreviewFeature
 
-public suspend fun TelegramBot.getChat(
+suspend fun TelegramBot.getChat(
     chatId: ChatIdentifier
-): ExtendedChat = execute(GetChat(chatId))
+) = execute(GetChat(chatId))
 
-public suspend fun TelegramBot.getChat(
+suspend fun TelegramBot.getChat(
     chat: Chat
-): ExtendedChat = getChat(chat.id)
+) = getChat(chat.id)
 
 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
  * [ExtendedPublicChat] with unsafe operator "as"
  *
  * @throws ClassCastException
  */
 @PreviewFeature
-public suspend fun TelegramBot.getChat(
+suspend fun TelegramBot.getChat(
     chat: PublicChat
-): ExtendedPublicChat = getChat(chat.id) as ExtendedPublicChat
+) = getChat(chat.id) as ExtendedPublicChat
 
 
 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
  * [ExtendedChannelChat] with unsafe operator "as"
  *
  * @throws ClassCastException
  */
 @PreviewFeature
-public suspend fun TelegramBot.getChat(
+suspend fun TelegramBot.getChat(
     chat: ChannelChat
-): ExtendedChannelChat = getChat(chat.id) as ExtendedChannelChat
+) = getChat(chat.id) as ExtendedChannelChat
 
 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
  * [ExtendedChannelChatImpl] with unsafe operator "as"
  *
  * @throws ClassCastException
  */
 @PreviewFeature
-public suspend fun TelegramBot.getChat(
+suspend fun TelegramBot.getChat(
     chat: ChannelChatImpl
-): ExtendedChannelChatImpl = getChat(chat.id) as ExtendedChannelChatImpl
+) = getChat(chat.id) as ExtendedChannelChatImpl
 
 
 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
  * [ExtendedGroupChat] with unsafe operator "as"
  *
  * @throws ClassCastException
  */
 @PreviewFeature
-public suspend fun TelegramBot.getChat(
+suspend fun TelegramBot.getChat(
     chat: GroupChat
-): ExtendedGroupChat = getChat(chat.id) as ExtendedGroupChat
+) = getChat(chat.id) as ExtendedGroupChat
 
 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
  * [ExtendedGroupChatImpl] with unsafe operator "as"
  *
  * @throws ClassCastException
  */
 @PreviewFeature
-public suspend fun TelegramBot.getChat(
+suspend fun TelegramBot.getChat(
     chat: GroupChatImpl
-): ExtendedGroupChatImpl = getChat(chat.id) as ExtendedGroupChatImpl
+) = getChat(chat.id) as ExtendedGroupChatImpl
 
 
 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
  * [ExtendedSupergroupChat] with unsafe operator "as"
  *
  * @throws ClassCastException
  */
 @PreviewFeature
-public suspend fun TelegramBot.getChat(
+suspend fun TelegramBot.getChat(
     chat: SupergroupChat
-): ExtendedSupergroupChat = getChat(chat.id) as ExtendedSupergroupChat
+) = getChat(chat.id) as ExtendedSupergroupChat
 
 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
  * [ExtendedSupergroupChatImpl] with unsafe operator "as"
  *
  * @throws ClassCastException
  */
 @PreviewFeature
-public suspend fun TelegramBot.getChat(
+suspend fun TelegramBot.getChat(
     chat: SupergroupChatImpl
-): ExtendedSupergroupChatImpl = getChat(chat.id) as ExtendedSupergroupChatImpl
+) = getChat(chat.id) as ExtendedSupergroupChatImpl
 
 
 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
  * [ExtendedPrivateChat] with unsafe operator "as"
  *
  * @throws ClassCastException
  */
 @PreviewFeature
-public suspend fun TelegramBot.getChat(
+suspend fun TelegramBot.getChat(
     chat: PrivateChat
-): ExtendedPrivateChat = getChat(chat.id) as ExtendedPrivateChat
+) = getChat(chat.id) as ExtendedPrivateChat
 
 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
  * [ExtendedPrivateChatImpl] with unsafe operator "as"
  *
  * @throws ClassCastException
  */
 @PreviewFeature
-public suspend fun TelegramBot.getChat(
+suspend fun TelegramBot.getChat(
     chat: PrivateChatImpl
-): ExtendedPrivateChatImpl = getChat(chat.id) as ExtendedPrivateChatImpl
+) = getChat(chat.id) as ExtendedPrivateChatImpl
 
 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
- * [ExtendedPrivateForumChatImpl] with unsafe operator "as"
- *
- * @throws ClassCastException
- */
-@PreviewFeature
-public suspend fun TelegramBot.getChat(
-    chat: PrivateForumChatImpl
-): ExtendedPrivateForumChatImpl = getChat(chat.id) as ExtendedPrivateForumChatImpl
-
-/**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
  * [ExtendedUser] with unsafe operator "as"
  *
  * @throws ClassCastException
  */
 @PreviewFeature
-public suspend fun TelegramBot.getChat(
+suspend fun TelegramBot.getChat(
     chat: CommonUser
-): ExtendedUser = getChat(chat.id) as ExtendedUser
+) = getChat(chat.id) as ExtendedUser

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

@@ -3,15 +3,12 @@ package dev.inmo.tgbotapi.extensions.api.chat.get
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.get.GetChatAdministrators
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 
-public suspend fun TelegramBot.getChatAdministrators(
-    chatId: ChatIdentifier,
-    retrieveOtherBots: Boolean? = null
-): List<AdministratorChatMember> = execute(GetChatAdministrators(chatId = chatId, retrieveOtherBots = retrieveOtherBots))
+suspend fun TelegramBot.getChatAdministrators(
+    chatId: ChatIdentifier
+) = execute(GetChatAdministrators(chatId))
 
-public suspend fun TelegramBot.getChatAdministrators(
-    chat: PublicChat,
-    retrieveOtherBots: Boolean? = null
-): List<AdministratorChatMember> = getChatAdministrators(chat.id, retrieveOtherBots)
+suspend fun TelegramBot.getChatAdministrators(
+    chat: PublicChat
+) = getChatAdministrators(chat.id)

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

@@ -3,12 +3,12 @@ package dev.inmo.tgbotapi.extensions.api.chat.get
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.get.GetChatMemberCount
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 
-public suspend fun TelegramBot.getChatMemberCount(
+suspend fun TelegramBot.getChatMemberCount(
     chatId: ChatIdentifier
-): Int = execute(GetChatMemberCount(chatId))
+) = execute(GetChatMemberCount(chatId))
 
-public suspend fun TelegramBot.getChatMemberCount(
+suspend fun TelegramBot.getChatMemberCount(
     chat: PublicChat
-): Int = getChatMemberCount(chat.id)
+) = getChatMemberCount(chat.id)

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

@@ -1,15 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.get
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.get.GetChatMenuButton
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.MenuButton
-import dev.inmo.tgbotapi.types.chat.PrivateChat
-
-public suspend fun TelegramBot.getChatMenuButton(
-    chatId: IdChatIdentifier
-): MenuButton = execute(GetChatMenuButton(chatId))
-
-public suspend fun TelegramBot.getChatMenuButton(
-    chat: PrivateChat
-): MenuButton = getChatMenuButton(chat.id)

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

@@ -1,7 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.get
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.get.GetDefaultChatMenuButton
-import dev.inmo.tgbotapi.types.MenuButton
-
-public suspend fun TelegramBot.getDefaultChatMenuButton(): MenuButton = execute(GetDefaultChatMenuButton)

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

@@ -1,7 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.get
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.get.GetForumTopicIconStickers
-import dev.inmo.tgbotapi.types.files.Sticker
-
-public suspend fun TelegramBot.getForumTopicIconStickers(): List<Sticker> = execute(GetForumTopicIconStickers)

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

@@ -2,41 +2,38 @@ package dev.inmo.tgbotapi.extensions.api.chat.invite_links
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.invite_links.ApproveChatJoinRequest
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.ChatJoinRequest
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 import dev.inmo.tgbotapi.types.update.ChatJoinRequestUpdate
 
-public suspend fun TelegramBot.approveChatJoinRequest(
+suspend fun TelegramBot.approveChatJoinRequest(
     chatId: ChatIdentifier,
     userId: UserId
-): Unit = execute(ApproveChatJoinRequest(chatId, userId))
+) = execute(ApproveChatJoinRequest(chatId, userId))
 
-public suspend fun TelegramBot.approveChatJoinRequest(
+suspend fun TelegramBot.approveChatJoinRequest(
     chat: PublicChat,
     userId: UserId
-): Unit = approveChatJoinRequest(chat.id, userId)
+) = approveChatJoinRequest(chat.id, userId)
 
-public suspend fun TelegramBot.approveChatJoinRequest(
+suspend fun TelegramBot.approveChatJoinRequest(
     chatId: ChatIdentifier,
     user: User
-): Unit = approveChatJoinRequest(chatId, user.id)
+) = approveChatJoinRequest(chatId, user.id)
 
-public suspend fun TelegramBot.approveChatJoinRequest(
+suspend fun TelegramBot.approveChatJoinRequest(
     chat: PublicChat,
     user: User
-): Unit = approveChatJoinRequest(chat.id, user.id)
+) = approveChatJoinRequest(chat.id, user.id)
 
-public suspend fun TelegramBot.approveChatJoinRequest(
+suspend fun TelegramBot.approveChatJoinRequest(
     chatJoinRequest: ChatJoinRequest
-): Unit = approveChatJoinRequest(chatJoinRequest.chat, chatJoinRequest.user)
+) = approveChatJoinRequest(chatJoinRequest.chat, chatJoinRequest.user)
 
-public suspend fun TelegramBot.approve(
+suspend fun TelegramBot.approve(
     chatJoinRequest: ChatJoinRequest
-): Unit = approveChatJoinRequest(chatJoinRequest)
+) = approveChatJoinRequest(chatJoinRequest)
 
-public suspend fun TelegramBot.approveChatJoinRequest(
+suspend fun TelegramBot.approveChatJoinRequest(
     chatJoinRequestUpdate: ChatJoinRequestUpdate
-): Unit = approveChatJoinRequest(chatJoinRequestUpdate.data)
+) = approveChatJoinRequest(chatJoinRequestUpdate.data)