add opportunity to send emoji with sticker

6.1.0

.github/workflows/kdocs.yml

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

CHANGELOG.md

@@ -1,9 +1,63 @@
 # TelegramBotAPI changelog
 
+## 6.2.0
+
+## 6.1.0
+
+* `Versions`:
+  * `MicroUtils`: `0.17.2` -> `0.17.3`
+* `API`:
+    * Fix of [#732](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/732)
+
+## 6.0.3
+
+* `Versions`:
+    * `MicroUtils`: `0.17.1` -> `0.17.2`
+* `Core`:
+    * `User` in `CallbackQuery` now is `CommonUser` as well as in `from`
+    * `User` in `InlineQuery` now is `CommonUser` as well as in `from`
+* `BehaviourBuilder`:
+    * Fixes in `DeepLink` triggers and waiters
+
+## 6.0.2
+
+* `Core`:
+    * Long polling now uses media groups debounce as in webhooks
+
+## 6.0.1
+
+* `Versions`:
+    * `Ktor`: `2.2.3` -> `2.2.4`
+    * `MicroUtils`: `0.17.0` -> `0.17.1`
+
+## 6.0.0
+
+* `Versions`:
+    * `Kotlin`: `1.7.22` -> `1.8.10`
+    * `MicroUtils`: `0.16.10` -> `0.17.0`
+    * `Serialization`: `1.4.1` -> `1.5.0`
+    * `uuid`: `0.6.0` -> `0.7.0`
+* `Core`:
+    * `*.link` extensions have been deprecated with renaming to avoid collisions with `link` methods
+* `API`:
+    * Add `TelegramBot.resend` methods
+* `BehaviourBuilder`:
+    * Add triggers and waiters for `VisualMediaGroupPartContent`
+* `Utils`:
+    * `*.link` extensions have been deprecated with renaming to avoid collisions with `link` methods
+
+## 5.2.1
+
+* `Core`:
+    * All the `CallbackQuery`es now will receive `CommonUser` instead of `User` due inability of bots to trigger any
+      inline interaction with others bots
+* `API`:
+    * Now `sentMessageFlow` will take each sent message in `handleLiveLocation`
+
 ## 5.2.0
 
 * `Versions`:
-  * `MicroUtils`: `0.16.8` -> `0.16.10`
+    * `MicroUtils`: `0.16.8` -> `0.16.10`
 
 ## 5.1.1
 

README.md

@@ -5,10 +5,10 @@
 | Useful repos | [![Create bot](https://img.shields.io/static/v1?label=Github&message=Template&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![Examples](https://img.shields.io/static/v1?label=Github&message=Examples&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/) |
 | Misc | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Small survey](https://img.shields.io/static/v1?label=Google&message=Survey&color=blue&logo=google-sheets)](https://docs.google.com/forms/d/e/1FAIpQLSctdJHT_aEniyYT0-IUAEfo1hsIlezX2owlkEAYX4KPl2V2_A/viewform?usp=sf_link) |
 
-<!--- [![Telegram Channel](./resources/tg_channel_qr.jpg)](https://t.me/InMoTelegramBotAPI) --->
+<!--- [![Telegram Channel](./resources/tg_channel_qr.jpg)](https://t.me/ktgbotapi) --->
 
 <p align="center">
-  <a href="https://t.me/InMoTelegramBotAPI">
+  <a href="https://t.me/ktgbotapi">
     <img src="./resources/tg_channel_qr.jpg">
   </a>
 </p>

build.gradle

@@ -14,6 +14,10 @@ buildscript {
     }
 }
 
+plugins {
+    alias(libs.plugins.kotlin.dokka)
+}
+
 // temporal crutch until legacy tests will be stabled or legacy target will be removed
 allprojects {
     repositories {

gradle.properties

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

gradle/libs.versions.toml

@@ -1,22 +1,22 @@
 [versions]
 
-kotlin = "1.7.22"
-kotlin-serialization = "1.4.1"
+kotlin = "1.8.10"
+kotlin-serialization = "1.5.0"
 kotlin-coroutines = "1.6.4"
 
 javax-activation = "1.1.1"
 
 korlibs = "3.4.0"
-uuid = "0.6.0"
-ktor = "2.2.3"
+uuid = "0.7.0"
+ktor = "2.2.4"
 
-ksp = "1.7.22-1.0.8"
+ksp = "1.8.10-1.0.9"
 kotlin-poet = "1.12.0"
 
-microutils = "0.16.10"
+microutils = "0.17.3"
 
 github-release-plugin = "2.4.1"
-dokka = "1.7.20"
+dokka = "1.8.10"
 
 [libraries]
 
@@ -67,3 +67,4 @@ github-release-plugin = { module = "com.github.breadmoirai:github-release", vers
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }

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

publish.gradle

@@ -1,7 +1,8 @@
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier.convention("javadoc")
+    archiveClassifier.set("javadoc")
 }
 
 publishing {
@@ -19,22 +20,22 @@ publishing {
             }
 
             developers {
-                
+
                     developer {
                         id = "InsanusMokrassar"
                         name = "Ovsiannikov Aleksei"
                         email = "ovsyannikov.alexey95@gmail.com"
                     }
-                
+
             }
 
             licenses {
-                
+
                     license {
                         name = "Apache Software License 2.0"
                         url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
                     }
-                
+
             }
         }
         repositories {
@@ -42,55 +43,55 @@ publishing {
                 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('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
                 maven {
                     name = "Gitea"
                     url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
-            
+
                     credentials(HttpHeaderCredentials) {
                         name = "Authorization"
                         value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
                     }
-            
+
                     authentication {
                         header(HttpHeaderAuthentication)
                     }
-            
+
                 }
             }
             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)

settings.gradle

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

tgbotapi.api/build.gradle

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

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

@@ -5,7 +5,10 @@ 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.Message
+import dev.inmo.tgbotapi.types.message.content.MediaGroupCollectionContent
+import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
 
 suspend fun TelegramBot.deleteMessage(
     chatId: ChatIdentifier,
@@ -21,7 +24,16 @@ suspend fun TelegramBot.deleteMessage(
 
 suspend fun TelegramBot.deleteMessage(
     message: Message
-) = deleteMessage(message.chat, message.messageId)
+): Boolean {
+    val mediaGroupContent = ((message as? ContentMessage<*>) ?.content as? MediaGroupCollectionContent<*>)
+    if (mediaGroupContent == null) {
+        return deleteMessage(message.chat, message.messageId)
+    } else {
+        return mediaGroupContent.group.map {
+            deleteMessage(it.sourceMessage)
+        }.all { it }
+    }
+}
 
 suspend fun TelegramBot.delete(
     chatId: ChatIdentifier,

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

@@ -86,7 +86,9 @@ suspend fun TelegramBot.handleLiveLocation(
                 it.heading,
                 it.proximityAlertRadius,
                 it.replyMarkup
-            )
+            ).also {
+                sentMessageFlow ?.emit(it)
+            }
         }
     }
 }

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

@@ -0,0 +1,16 @@
+package dev.inmo.tgbotapi.extensions.api.bot
+
+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.requests.bot.GetMyDescription
+import dev.inmo.tgbotapi.types.commands.BotCommandScope
+import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
+
+suspend fun TelegramBot.getMyDescription(
+    languageCode: IetfLanguageCode? = null
+) = execute(GetMyDescription(languageCode))
+
+suspend fun TelegramBot.getMyDescription(
+    languageCode: String?
+) = getMyDescription(languageCode ?.let(::IetfLanguageCode))

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

@@ -0,0 +1,16 @@
+package dev.inmo.tgbotapi.extensions.api.bot
+
+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.requests.bot.GetMyShortDescription
+import dev.inmo.tgbotapi.types.commands.BotCommandScope
+import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
+
+suspend fun TelegramBot.getMyShortDescription(
+    languageCode: IetfLanguageCode? = null
+) = execute(GetMyShortDescription(languageCode))
+
+suspend fun TelegramBot.getMyShortDescription(
+    languageCode: String?
+) = getMyShortDescription(languageCode ?.let(::IetfLanguageCode))

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

@@ -0,0 +1,19 @@
+package dev.inmo.tgbotapi.extensions.api.bot
+
+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.requests.bot.GetMyDescription
+import dev.inmo.tgbotapi.requests.bot.SetMyDescription
+import dev.inmo.tgbotapi.types.commands.BotCommandScope
+import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
+
+suspend fun TelegramBot.setMyDescription(
+    description: String? = null,
+    languageCode: IetfLanguageCode? = null
+) = execute(SetMyDescription(description, languageCode))
+
+suspend fun TelegramBot.setMyDescription(
+    description: String?,
+    languageCode: String?
+) = setMyDescription(description, languageCode ?.let(::IetfLanguageCode))

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

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

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

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

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

@@ -73,7 +73,7 @@ suspend fun TelegramBot.sendAnimation(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendAnimation(
-    chatId, animation.fileId, animation.thumb ?.fileId, text, parseMode, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
+    chatId, animation.fileId, animation.thumbnail ?.fileId, text, parseMode, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
 )
 
 /**
@@ -177,7 +177,7 @@ suspend fun TelegramBot.sendAnimation(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendAnimation(
-    chatId, animation.fileId, animation.thumb ?.fileId, entities, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
+    chatId, animation.fileId, animation.thumbnail ?.fileId, entities, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
 )
 
 /**

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

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

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

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

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

@@ -70,7 +70,7 @@ suspend fun TelegramBot.sendVideo(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chatId, video.fileId, video.thumb ?.fileId, text, parseMode, spoilered, video.duration, video.width, video.height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(chatId, video.fileId, video.thumbnail ?.fileId, text, parseMode, spoilered, video.duration, video.width, video.height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -167,7 +167,7 @@ suspend inline fun TelegramBot.sendVideo(
     replyToMessageId: MessageId? = null,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendVideo(chatId, video.fileId, video.thumb ?.fileId, entities, spoilered, video.duration, video.width, video.height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = sendVideo(chatId, video.fileId, video.thumbnail ?.fileId, entities, spoilered, video.duration, video.width, video.height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or

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

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

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

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

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

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

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

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

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

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

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

@@ -3,27 +3,95 @@ package dev.inmo.tgbotapi.extensions.api.thumbs
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
-import dev.inmo.tgbotapi.requests.stickers.SetStickerSetThumb
+import dev.inmo.tgbotapi.requests.stickers.SetStickerSetThumbnail
+import dev.inmo.tgbotapi.types.StickerSetName
 import dev.inmo.tgbotapi.types.chat.CommonUser
 import dev.inmo.tgbotapi.types.UserId
 import dev.inmo.tgbotapi.types.stickers.StickerSet
 
+suspend fun TelegramBot.setStickerSetThumbnail(
+    userId: UserId,
+    stickerSetName: StickerSetName,
+    thumbnail: FileId
+) = execute(
+    SetStickerSetThumbnail(userId, stickerSetName, thumbnail)
+)
+
+suspend fun TelegramBot.setStickerSetThumbnail(
+    userId: UserId,
+    stickerSetName: StickerSetName,
+    thumbnail: MultipartFile
+) = execute(
+    SetStickerSetThumbnail(userId, stickerSetName, thumbnail)
+)
+
+suspend fun TelegramBot.setStickerSetThumbnail(
+    user: CommonUser,
+    stickerSetName: StickerSetName,
+    thumbnail: FileId
+) = setStickerSetThumbnail(
+    user.id, stickerSetName, thumbnail
+)
+
+suspend fun TelegramBot.setStickerSetThumbnail(
+    user: CommonUser,
+    stickerSetName: StickerSetName,
+    thumbnail: MultipartFile
+) = setStickerSetThumbnail(
+    user.id, stickerSetName, thumbnail
+)
+
+suspend fun TelegramBot.setStickerSetThumbnail(
+    userId: UserId,
+    stickerSet: StickerSet,
+    thumbnail: FileId
+) = setStickerSetThumbnail(
+    userId, stickerSet.name, thumbnail
+)
+
+suspend fun TelegramBot.setStickerSetThumbnail(
+    userId: UserId,
+    stickerSet: StickerSet,
+    thumbnail: MultipartFile
+) = setStickerSetThumbnail(
+    userId, stickerSet.name, thumbnail
+)
+
+suspend fun TelegramBot.setStickerSetThumbnail(
+    user: CommonUser,
+    stickerSet: StickerSet,
+    thumbnail: FileId
+) = setStickerSetThumbnail(
+    user.id, stickerSet.name, thumbnail
+)
+
+suspend fun TelegramBot.setStickerSetThumbnail(
+    user: CommonUser,
+    stickerSet: StickerSet,
+    thumbnail: MultipartFile
+) = setStickerSetThumbnail(
+    user.id, stickerSet.name, thumbnail
+)
+
+@Deprecated("Renamed in telegram bot api", ReplaceWith("setStickerSetThumbnail(userId, thumbSetName, thumb)", "dev.inmo.tgbotapi.extensions.api.thumbs.setStickerSetThumbnail"))
 suspend fun TelegramBot.setStickerSetThumb(
     userId: UserId,
     thumbSetName: String,
     thumb: FileId
 ) = execute(
-    SetStickerSetThumb(userId, thumbSetName, thumb)
+    SetStickerSetThumbnail(userId, thumbSetName, thumb)
 )
 
+@Deprecated("Renamed in telegram bot api", ReplaceWith("setStickerSetThumbnail(userId, thumbSetName, thumb)", "dev.inmo.tgbotapi.extensions.api.thumbs.setStickerSetThumbnail"))
 suspend fun TelegramBot.setStickerSetThumb(
     userId: UserId,
     thumbSetName: String,
     thumb: MultipartFile
 ) = execute(
-    SetStickerSetThumb(userId, thumbSetName, thumb)
+    SetStickerSetThumbnail(userId, thumbSetName, thumb)
 )
 
+@Deprecated("Renamed in telegram bot api", ReplaceWith("setStickerSetThumbnail(user, thumbSetName, thumb)", "dev.inmo.tgbotapi.extensions.api.thumbs.setStickerSetThumbnail"))
 suspend fun TelegramBot.setStickerSetThumb(
     user: CommonUser,
     thumbSetName: String,
@@ -32,6 +100,7 @@ suspend fun TelegramBot.setStickerSetThumb(
     user.id, thumbSetName, thumb
 )
 
+@Deprecated("Renamed in telegram bot api", ReplaceWith("setStickerSetThumbnail(user, thumbSetName, thumb)", "dev.inmo.tgbotapi.extensions.api.thumbs.setStickerSetThumbnail"))
 suspend fun TelegramBot.setStickerSetThumb(
     user: CommonUser,
     thumbSetName: String,
@@ -40,6 +109,7 @@ suspend fun TelegramBot.setStickerSetThumb(
     user.id, thumbSetName, thumb
 )
 
+@Deprecated("Renamed in telegram bot api", ReplaceWith("setStickerSetThumbnail(userId, thumbSet, thumb)", "dev.inmo.tgbotapi.extensions.api.thumbs.setStickerSetThumbnail"))
 suspend fun TelegramBot.setStickerSetThumb(
     userId: UserId,
     thumbSet: StickerSet,
@@ -48,6 +118,7 @@ suspend fun TelegramBot.setStickerSetThumb(
     userId, thumbSet.name, thumb
 )
 
+@Deprecated("Renamed in telegram bot api", ReplaceWith("setStickerSetThumbnail(userId, thumbSet, thumb)", "dev.inmo.tgbotapi.extensions.api.thumbs.setStickerSetThumbnail"))
 suspend fun TelegramBot.setStickerSetThumb(
     userId: UserId,
     thumbSet: StickerSet,
@@ -56,6 +127,7 @@ suspend fun TelegramBot.setStickerSetThumb(
     userId, thumbSet.name, thumb
 )
 
+@Deprecated("Renamed in telegram bot api", ReplaceWith("setStickerSetThumbnail(user, thumbSet, thumb)", "dev.inmo.tgbotapi.extensions.api.thumbs.setStickerSetThumbnail"))
 suspend fun TelegramBot.setStickerSetThumb(
     user: CommonUser,
     thumbSet: StickerSet,
@@ -64,6 +136,7 @@ suspend fun TelegramBot.setStickerSetThumb(
     user.id, thumbSet.name, thumb
 )
 
+@Deprecated("Renamed in telegram bot api", ReplaceWith("setStickerSetThumbnail(user, thumbSet, thumb)", "dev.inmo.tgbotapi.extensions.api.thumbs.setStickerSetThumbnail"))
 suspend fun TelegramBot.setStickerSetThumb(
     user: CommonUser,
     thumbSet: StickerSet,

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

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

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/utils/UpdatesHandling.kt

@@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.extensions.api.utils
 
+import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.api.InternalUtils.convertWithMediaGroupUpdates
-import dev.inmo.tgbotapi.types.message.abstracts.PossiblySentViaBotCommonMessage
+import dev.inmo.tgbotapi.types.message.abstracts.PossiblyMediaGroupMessage
 import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.updateshandlers.UpdateReceiver
@@ -28,26 +29,18 @@ fun CoroutineScope.updateHandlerWithMediaGroupsAdaptation(
     )
 
     launch {
-        launch {
+        launchSafelyWithoutExceptions {
             for (update in updatesChannel) {
-                val dataAsPossiblySentViaBotCommonMessage = update.data as? PossiblySentViaBotCommonMessage<*>
-
-                if (dataAsPossiblySentViaBotCommonMessage == null) {
-                    output(update)
-                    continue
+                val data = update.data
+                when {
+                    data is PossiblyMediaGroupMessage<*> && data.mediaGroupId != null -> {
+                        mediaGroupChannel.send("${data.mediaGroupId}${update::class.simpleName}" to update as BaseMessageUpdate)
+                    }
+                    else -> output(update)
                 }
-
-                val mediaGroupId = dataAsPossiblySentViaBotCommonMessage.mediaGroupId
-
-                if (mediaGroupId == null) {
-                    output(update)
-                    continue
-                }
-
-                mediaGroupChannel.send("${mediaGroupId}${update::class.simpleName}" to update as BaseMessageUpdate)
             }
         }
-        launch {
+        launchSafelyWithoutExceptions {
             for ((_, mediaGroup) in mediaGroupAccumulatedChannel) {
                 mediaGroup.convertWithMediaGroupUpdates().forEach {
                     output(it)

tgbotapi.behaviour_builder.fsm/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
+    id "org.jetbrains.dokka"
 }
 
 project.description = "Behaviour Builder DSL"

tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSMBuilder.kt

@@ -8,6 +8,7 @@ import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler
 import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling
+import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.updateHandlerWithMediaGroupsAdaptation
 import dev.inmo.tgbotapi.types.Seconds
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
@@ -47,6 +48,10 @@ suspend fun <T : State> TelegramBot.buildBehaviourWithFSM(
  * Use [buildBehaviourWithFSM] to create [BehaviourContextWithFSM] and launch getting of updates
  * using [longPolling]. For [longPolling] will be used result [BehaviourContextWithFSM] for both parameters
  * flowsUpdatesFilter and scope
+ *
+ * @param mediaGroupsDebounceTimeMillis Will be used for calling of [updateHandlerWithMediaGroupsAdaptation]. Pass null
+ * in case you wish to enable classic way of updates handling, but in that mode some media group messages can be
+ * retrieved in different updates
  */
 suspend fun <T : State> TelegramBot.buildBehaviourWithFSMAndStartLongPolling(
     upstreamUpdatesFlow: Flow<Update>? = null,
@@ -58,6 +63,7 @@ suspend fun <T : State> TelegramBot.buildBehaviourWithFSMAndStartLongPolling(
     timeoutSeconds: Seconds = 30,
     autoDisableWebhooks: Boolean = true,
     autoSkipTimeoutExceptions: Boolean = true,
+    mediaGroupsDebounceTimeMillis: Long? = 1000L,
     block: CustomBehaviourContextReceiver<DefaultBehaviourContextWithFSM<T>, Unit>
 ): Pair<DefaultBehaviourContextWithFSM<T>, Job> = buildBehaviourWithFSM(
     upstreamUpdatesFlow,
@@ -70,7 +76,7 @@ suspend fun <T : State> TelegramBot.buildBehaviourWithFSMAndStartLongPolling(
 ).run {
     this to scope.launch {
         start()
-        longPolling(flowsUpdatesFilter, timeoutSeconds, scope, autoDisableWebhooks, autoSkipTimeoutExceptions, defaultExceptionsHandler)
+        longPolling(flowsUpdatesFilter, timeoutSeconds, scope, autoDisableWebhooks, autoSkipTimeoutExceptions, mediaGroupsDebounceTimeMillis, defaultExceptionsHandler)
     }
 }
 
@@ -116,6 +122,10 @@ suspend fun <T : State> TelegramBot.buildBehaviourWithFSM(
  * using [longPolling]. For [longPolling] will be used result [BehaviourContextWithFSM] for both parameters
  * flowsUpdatesFilter and scope
  *
+ * @param mediaGroupsDebounceTimeMillis Will be used for calling of [updateHandlerWithMediaGroupsAdaptation]. Pass null
+ * in case you wish to enable classic way of updates handling, but in that mode some media group messages can be
+ * retrieved in different updates
+ *
  * @see buildBehaviourWithFSMAndStartLongPolling
  * @see BehaviourContext
  * @see longPolling
@@ -131,6 +141,7 @@ suspend fun <T : State> TelegramBot.buildBehaviourWithFSMAndStartLongPolling(
     timeoutSeconds: Seconds = 30,
     autoDisableWebhooks: Boolean = true,
     autoSkipTimeoutExceptions: Boolean = true,
+    mediaGroupsDebounceTimeMillis: Long? = 1000L,
     block: CustomBehaviourContextReceiver<DefaultBehaviourContextWithFSM<T>, Unit>
 ) = FlowsUpdatesFilter().let {
     buildBehaviourWithFSM(
@@ -149,6 +160,7 @@ suspend fun <T : State> TelegramBot.buildBehaviourWithFSMAndStartLongPolling(
             scope,
             autoDisableWebhooks,
             autoSkipTimeoutExceptions,
+            mediaGroupsDebounceTimeMillis,
             defaultExceptionsHandler
         )
     }

tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/TelegramBotWithFSM.kt

@@ -11,6 +11,7 @@ import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutorBuilder
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingOfUpdatesByLongPolling
+import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.updateHandlerWithMediaGroupsAdaptation
 import dev.inmo.tgbotapi.types.Seconds
 import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
 import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
@@ -26,6 +27,10 @@ import kotlin.coroutines.coroutineContext
  * **WARNING** This method WILL NOT launch any listening of updates. Use something like
  * [startGettingOfUpdatesByLongPolling] or tools for work with webhooks
  *
+ * @param mediaGroupsDebounceTimeMillis Will be used for calling of [updateHandlerWithMediaGroupsAdaptation]. Pass null
+ * in case you wish to enable classic way of updates handling, but in that mode some media group messages can be
+ * retrieved in different updates
+ *
  * @return Created bot which has been used to create [BehaviourContext] via [buildBehaviourWithFSM]
  *
  * @see [BehaviourContext]
@@ -46,6 +51,7 @@ suspend fun <T : State> telegramBotWithBehaviourAndFSM(
     timeoutSeconds: Seconds = 30,
     autoDisableWebhooks: Boolean = true,
     autoSkipTimeoutExceptions: Boolean = true,
+    mediaGroupsDebounceTimeMillis: Long? = 1000L,
     block: CustomBehaviourContextReceiver<DefaultBehaviourContextWithFSM<T>, Unit>
 ): TelegramBot = telegramBot(
     token,
@@ -63,6 +69,7 @@ suspend fun <T : State> telegramBotWithBehaviourAndFSM(
         timeoutSeconds,
         autoDisableWebhooks,
         autoSkipTimeoutExceptions,
+        mediaGroupsDebounceTimeMillis,
         block
     )
 }
@@ -71,6 +78,10 @@ suspend fun <T : State> telegramBotWithBehaviourAndFSM(
  * Create bot using [telegramBot] and start listening for updates using [buildBehaviourWithFSMAndStartLongPolling]. This
  * method will launch updates retrieving via long polling inside of [buildBehaviourWithFSMAndStartLongPolling]
  *
+ * @param mediaGroupsDebounceTimeMillis Will be used for calling of [updateHandlerWithMediaGroupsAdaptation]. Pass null
+ * in case you wish to enable classic way of updates handling, but in that mode some media group messages can be
+ * retrieved in different updates
+ *
  * @return Pair of [TelegramBot] and [Job]. This [Job] can be used to stop listening updates in your [block] you passed
  * here
  *
@@ -91,6 +102,7 @@ suspend fun <T : State> telegramBotWithBehaviourAndFSMAndStartLongPolling(
     timeoutSeconds: Seconds = 30,
     autoDisableWebhooks: Boolean = true,
     autoSkipTimeoutExceptions: Boolean = true,
+    mediaGroupsDebounceTimeMillis: Long? = 1000L,
     block: CustomBehaviourContextReceiver<DefaultBehaviourContextWithFSM<T>, Unit>
 ): Pair<TelegramBot, Job> {
     return telegramBot(
@@ -108,6 +120,7 @@ suspend fun <T : State> telegramBotWithBehaviourAndFSMAndStartLongPolling(
             timeoutSeconds,
             autoDisableWebhooks,
             autoSkipTimeoutExceptions,
+            mediaGroupsDebounceTimeMillis,
             block
         )
     }

tgbotapi.behaviour_builder/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
+    id "org.jetbrains.dokka"
 }
 
 project.description = "Behaviour Builder DSL"

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourBuilders.kt

@@ -5,6 +5,7 @@ import dev.inmo.micro_utils.coroutines.ExceptionHandler
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling
 import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingOfUpdatesByLongPolling
+import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.updateHandlerWithMediaGroupsAdaptation
 import dev.inmo.tgbotapi.types.Seconds
 import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
 import kotlinx.coroutines.*
@@ -47,6 +48,10 @@ suspend fun TelegramBot.buildBehaviour(
  * Use this method to build bot behaviour and run it via long polling. In case you wish to get [FlowsUpdatesFilter] for
  * additional manipulations, you must provide external [FlowsUpdatesFilter] in other [buildBehaviour] function.
  *
+ * @param mediaGroupsDebounceTimeMillis Will be used for calling of [updateHandlerWithMediaGroupsAdaptation]. Pass null
+ * in case you wish to enable classic way of updates handling, but in that mode some media group messages can be
+ * retrieved in different updates
+ *
  * @see buildBehaviour
  * @see BehaviourContext
  * @see startGettingOfUpdatesByLongPolling
@@ -57,6 +62,7 @@ suspend fun TelegramBot.buildBehaviourWithLongPolling(
     timeoutSeconds: Seconds = 30,
     autoDisableWebhooks: Boolean = true,
     autoSkipTimeoutExceptions: Boolean = true,
+    mediaGroupsDebounceTimeMillis: Long? = 1000L,
     block: BehaviourContextReceiver<Unit>
 ): Job {
     val behaviourContext = buildBehaviour(
@@ -69,6 +75,7 @@ suspend fun TelegramBot.buildBehaviourWithLongPolling(
         scope = behaviourContext,
         timeoutSeconds = timeoutSeconds,
         autoDisableWebhooks = autoDisableWebhooks,
-        autoSkipTimeoutExceptions = autoSkipTimeoutExceptions
+        autoSkipTimeoutExceptions = autoSkipTimeoutExceptions,
+        mediaGroupsDebounceTimeMillis = mediaGroupsDebounceTimeMillis
     )
 }

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/TelegramBot.kt

@@ -5,6 +5,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutorBuilder
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingOfUpdatesByLongPolling
+import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.updateHandlerWithMediaGroupsAdaptation
 import dev.inmo.tgbotapi.types.Seconds
 import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
 import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
@@ -53,6 +54,10 @@ suspend fun telegramBotWithBehaviour(
  *
  * **WARNING** This method WILL launch updates listening inside of calling [buildBehaviourWithLongPolling]
  *
+ * @param mediaGroupsDebounceTimeMillis Will be used for calling of [updateHandlerWithMediaGroupsAdaptation]. Pass null
+ * in case you wish to enable classic way of updates handling, but in that mode some media group messages can be
+ * retrieved in different updates
+ *
  * @return Pair of [TelegramBot] and [Job]. This [Job] can be used to stop listening updates in your [block] you passed
  * here
  *
@@ -70,6 +75,7 @@ suspend fun telegramBotWithBehaviourAndLongPolling(
     timeoutSeconds: Seconds = 30,
     autoDisableWebhooks: Boolean = true,
     autoSkipTimeoutExceptions: Boolean = true,
+    mediaGroupsDebounceTimeMillis: Long? = 1000L,
     block: BehaviourContextReceiver<Unit>
 ): Pair<TelegramBot, Job> {
     return telegramBot(
@@ -84,6 +90,7 @@ suspend fun telegramBotWithBehaviourAndLongPolling(
             timeoutSeconds,
             autoDisableWebhooks,
             autoSkipTimeoutExceptions,
+            mediaGroupsDebounceTimeMillis,
             block
         )
     }

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt

@@ -189,3 +189,7 @@ suspend fun BehaviourContext.waitInvoice(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent<InvoiceContent>(initRequest, errorFactory)
+suspend fun BehaviourContext.waitVisualContent(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null }
+) = waitContent<VisualMediaGroupPartContent>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContentMessage.kt

@@ -216,3 +216,8 @@ suspend fun BehaviourContext.waitInvoiceMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage<InvoiceContent>(initRequest, errorFactory)
+
+suspend fun BehaviourContext.waitVisualContentMessage(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null }
+) = waitContentMessage<VisualMediaGroupPartContent>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ContentTriggers.kt

@@ -607,3 +607,27 @@ suspend fun <BC : BehaviourContext> BC.onInvoice(
     markerFactory,
     scenarioReceiver
 )
+
+/**
+ * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
+ * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
+ * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
+ * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
+ * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
+ * to combinate several filters
+ * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
+ * in one "stream". Output of [markerFactory] will be used as a key for "stream"
+ * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
+ * data
+ */
+suspend fun <BC : BehaviourContext> BC.onVisualContent(
+    initialFilter: CommonMessageFilter<VisualMediaGroupPartContent>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VisualMediaGroupMessage, Update> = MessageFilterByChat,
+    markerFactory: MarkerFactory<in VisualMediaGroupMessage, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, VisualMediaGroupMessage>
+) = onContentMessageWithType(
+    initialFilter,
+    subcontextUpdatesFilter,
+    markerFactory,
+    scenarioReceiver
+)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/DeepLinkHandling.kt

@@ -38,7 +38,7 @@ suspend fun <BC : BehaviourContext> BC.onDeepLink(
     scenarioReceiver,
 ) {
     (it.messageUpdateOrNull()) ?.data ?.commonMessageOrNull() ?.withContentOrNull<TextContent>() ?.let { message ->
-        message to message.content.textSources[1].source.removePrefix(" ").decodeURLQueryComponent()
+        message to (message.content.textSources.getOrNull(1) ?.source ?.removePrefix(" ") ?.decodeURLQueryComponent() ?: return@let null)
     } ?.let(::listOfNotNull)
 }.also {
     triggersHolder.handleableCommandsHolder.registerHandleable(startRegex)

tgbotapi.core/build.gradle

@@ -2,6 +2,7 @@ plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
     id "com.google.devtools.ksp"
+    id "org.jetbrains.dokka"
 }
 
 project.description = "Core part of tgbotapi with all (and only) required functionality for working with Telegram Bot API"

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyDescription.kt

@@ -0,0 +1,23 @@
+package dev.inmo.tgbotapi.requests.bot
+
+import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.abstracts.WithOptionalLanguageCode
+import dev.inmo.tgbotapi.types.commands.*
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+class GetMyDescription(
+    @SerialName(languageCodeField)
+    @Serializable(IetfLanguageCodeSerializer::class)
+    override val ietfLanguageCode: IetfLanguageCode? = null
+) : SimpleRequest<BotDescription>, WithOptionalLanguageCode {
+    override fun method(): String = "getMyDescription"
+    override val resultDeserializer: DeserializationStrategy<BotDescription>
+        get() = BotDescription.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyShortDescription.kt

@@ -0,0 +1,23 @@
+package dev.inmo.tgbotapi.requests.bot
+
+import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.abstracts.WithOptionalLanguageCode
+import dev.inmo.tgbotapi.types.commands.*
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+class GetMyShortDescription(
+    @SerialName(languageCodeField)
+    @Serializable(IetfLanguageCodeSerializer::class)
+    override val ietfLanguageCode: IetfLanguageCode? = null
+) : SimpleRequest<BotShortDescription>, WithOptionalLanguageCode {
+    override fun method(): String = "getMyShortDescription"
+    override val resultDeserializer: DeserializationStrategy<BotShortDescription>
+        get() = BotShortDescription.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyDescription.kt

@@ -0,0 +1,25 @@
+package dev.inmo.tgbotapi.requests.bot
+
+import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.abstracts.WithOptionalLanguageCode
+import dev.inmo.tgbotapi.types.commands.*
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+class SetMyDescription(
+    @SerialName(descriptionField)
+    val description: String? = null,
+    @SerialName(languageCodeField)
+    @Serializable(IetfLanguageCodeSerializer::class)
+    override val ietfLanguageCode: IetfLanguageCode? = null
+) : SimpleRequest<Boolean>, WithOptionalLanguageCode {
+    override fun method(): String = "setMyDescription"
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyShortDescription.kt

@@ -0,0 +1,25 @@
+package dev.inmo.tgbotapi.requests.bot
+
+import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.abstracts.WithOptionalLanguageCode
+import dev.inmo.tgbotapi.types.commands.*
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+class SetMyShortDescription(
+    @SerialName(shortDescriptionField)
+    val shortDescription: String? = null,
+    @SerialName(languageCodeField)
+    @Serializable(IetfLanguageCodeSerializer::class)
+    override val ietfLanguageCode: IetfLanguageCode? = null
+) : SimpleRequest<Boolean>, WithOptionalLanguageCode {
+    override fun method(): String = "setMyShortDescription"
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

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

@@ -1,5 +1,9 @@
 package dev.inmo.tgbotapi.requests.send.abstracts
 
 interface ThumbedSendMessageRequest<T: Any>: SendMessageRequest<T> {
+    val thumbnail: String?
+
+    @Deprecated("Renamed in telegram bot api", ReplaceWith("thumbnail"))
     val thumb: String?
-}
+        get() = thumbnail
+}

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

@@ -129,8 +129,8 @@ data class SendAnimationData internal constructor(
     override val chatId: ChatIdentifier,
     @SerialName(animationField)
     val animation: String? = null,
-    @SerialName(thumbField)
-    override val thumb: String? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: String? = null,
     @SerialName(captionField)
     override val text: String? = null,
     @SerialName(parseModeField)
@@ -187,8 +187,8 @@ data class SendAnimationData internal constructor(
 
 data class SendAnimationFiles internal constructor(
     val animation: MultipartFile? = null,
-    val thumb: MultipartFile? = null
+    val thumbnail: MultipartFile? = null
 ) : Files by mapOfNotNull(
     animationField to animation,
-    thumbField to thumb
+    thumbnailField to thumbnail
 )

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

@@ -126,8 +126,8 @@ data class SendAudioData internal constructor(
     override val chatId: ChatIdentifier,
     @SerialName(audioField)
     val audio: String? = null,
-    @SerialName(thumbField)
-    override val thumb: String? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: String? = null,
     @SerialName(captionField)
     override val text: String? = null,
     @SerialName(parseModeField)
@@ -182,8 +182,8 @@ data class SendAudioData internal constructor(
 
 data class SendAudioFiles internal constructor(
     val audio: MultipartFile? = null,
-    val thumb: MultipartFile? = null
+    val thumbnail: MultipartFile? = null
 ) : Files by mapOfNotNull(
     audioField to audio,
-    thumbField to thumb
+    thumbnailField to thumbnail
 )

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

@@ -144,8 +144,8 @@ data class SendDocumentData internal constructor(
     override val chatId: ChatIdentifier,
     @SerialName(documentField)
     val document: String? = null,
-    @SerialName(thumbField)
-    override val thumb: String? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: String? = null,
     @SerialName(captionField)
     override val text: String? = null,
     @SerialName(parseModeField)
@@ -193,8 +193,8 @@ data class SendDocumentData internal constructor(
 
 data class SendDocumentFiles internal constructor(
     val document: MultipartFile? = null,
-    val thumb: MultipartFile? = null
+    val thumbnail: MultipartFile? = null
 ) : Files by mapOfNotNull(
     documentField to document,
-    thumbField to thumb
+    thumbnailField to thumbnail
 )

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

@@ -8,14 +8,19 @@ import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
 import dev.inmo.tgbotapi.types.message.content.StickerContent
+import dev.inmo.tgbotapi.utils.mapOfNotNull
 import dev.inmo.tgbotapi.utils.toJsonWithoutNulls
 import kotlinx.serialization.*
 import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
 
 fun SendSticker(
     chatId: ChatIdentifier,
     sticker: InputFile,
     threadId: MessageThreadId? = chatId.threadId,
+    emoji: String? = null,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     replyToMessageId: MessageId? = null,
@@ -32,7 +37,7 @@ fun SendSticker(
     replyMarkup
 ).let {
     when (sticker) {
-        is MultipartFile -> SendStickerByFile(it, sticker)
+        is MultipartFile -> SendStickerByFile(it, sticker, emoji)
         is FileId -> it
     }
 }
@@ -69,8 +74,16 @@ data class SendStickerByFileId internal constructor(
 data class SendStickerByFile internal constructor(
     @Transient
     private val sendStickerByFileId: SendStickerByFileId,
-    val sticker: MultipartFile
+    val sticker: MultipartFile,
+    val emoji: String?
 ) : MultipartRequest<ContentMessage<StickerContent>>, Request<ContentMessage<StickerContent>> by sendStickerByFileId {
     override val mediaMap: Map<String, MultipartFile> = mapOf(stickerField to sticker)
-    override val paramsJson: JsonObject = sendStickerByFileId.toJsonWithoutNulls(SendStickerByFileId.serializer())
+    override val paramsJson: JsonObject
+        get() {
+            return JsonObject(
+                mapOfNotNull(
+                    emojiField to emoji ?.let { JsonPrimitive(it) }
+                ) + sendStickerByFileId.toJsonWithoutNulls(SendStickerByFileId.serializer())
+            )
+        }
 }

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

@@ -133,8 +133,8 @@ data class SendVideoData internal constructor(
     override val chatId: ChatIdentifier,
     @SerialName(videoField)
     val video: String? = null,
-    @SerialName(thumbField)
-    override val thumb: String? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: String? = null,
     @SerialName(captionField)
     override val text: String? = null,
     @SerialName(parseModeField)
@@ -193,8 +193,8 @@ data class SendVideoData internal constructor(
 
 data class SendVideoFiles internal constructor(
     val video: MultipartFile? = null,
-    val thumb: MultipartFile? = null
+    val thumbnail: MultipartFile? = null
 ) : Files by mapOfNotNull(
     videoField to video,
-    thumbField to thumb
+    thumbnailField to thumbnail
 )

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

@@ -62,8 +62,8 @@ data class SendVideoNoteData internal constructor(
     override val chatId: ChatIdentifier,
     @SerialName(videoNoteField)
     val videoNote: String? = null,
-    @SerialName(thumbField)
-    override val thumb: String? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: String? = null,
     @SerialName(durationField)
     override val duration: Long? = null,
     @SerialName(lengthField)
@@ -99,8 +99,8 @@ data class SendVideoNoteData internal constructor(
 
 data class SendVideoNoteFiles internal constructor(
     val videoNote: MultipartFile? = null,
-    val thumb: MultipartFile? = null
+    val thumbnail: MultipartFile? = null
 ) : Files by mapOfNotNull(
     videoNoteField to videoNote,
-    thumbField to thumb
+    thumbnailField to thumbnail
 )

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

@@ -156,8 +156,8 @@ data class SendVoiceData internal constructor(
 
 data class SendVoiceFiles internal constructor(
     val voice: MultipartFile? = null,
-    val thumb: MultipartFile? = null
+    val thumbnail: MultipartFile? = null
 ) : Files by mapOfNotNull(
     voiceField to voice,
-    thumbField to thumb
+    thumbnailField to thumbnail
 )

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/DeleteStickerFromSet.kt

@@ -2,6 +2,7 @@ package dev.inmo.tgbotapi.requests.stickers
 
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.requests.stickers.abstracts.StickerAction
 import dev.inmo.tgbotapi.types.stickerField
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
@@ -9,8 +10,8 @@ import kotlinx.serialization.builtins.serializer
 @Serializable
 data class DeleteStickerFromSet(
     @SerialName(stickerField)
-    val sticker: FileId
-) : SimpleRequest<Boolean> {
+    override val sticker: FileId
+) : StickerAction<Boolean> {
     override fun method(): String = "deleteStickerFromSet"
     override val resultDeserializer: DeserializationStrategy<Boolean>
         get() = Boolean.serializer()

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/DeleteStickerSet.kt

@@ -0,0 +1,21 @@
+package dev.inmo.tgbotapi.requests.stickers
+
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.StickerSetName
+import dev.inmo.tgbotapi.types.nameField
+import dev.inmo.tgbotapi.types.stickerField
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+data class DeleteStickerSet(
+    @SerialName(nameField)
+    val name: StickerSetName
+) : SimpleRequest<Boolean> {
+    override fun method(): String = "deleteStickerSet"
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/SetStickerEmojiList.kt

@@ -0,0 +1,33 @@
+package dev.inmo.tgbotapi.requests.stickers
+
+import dev.inmo.tgbotapi.requests.abstracts.*
+import dev.inmo.tgbotapi.requests.common.CommonMultipartFileRequest
+import dev.inmo.tgbotapi.requests.stickers.abstracts.OwnerStickerSetAction
+import dev.inmo.tgbotapi.requests.stickers.abstracts.StickerAction
+import dev.inmo.tgbotapi.requests.stickers.abstracts.StickerSetAction
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+data class SetStickerEmojiList (
+    @SerialName(stickerField)
+    override val sticker: FileId,
+    @SerialName(emojiListField)
+    val emojis: List<String>
+) : StickerAction<Boolean> {
+    constructor(sticker: FileId, vararg emojis: String) : this(sticker, emojis.toList())
+
+    init {
+        require(emojis.size !in emojisInStickerLimit) {
+            "Emojis size should be in range $emojisInStickerLimit, but was ${emojis.size}"
+        }
+    }
+
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "setStickerEmojiList"
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/SetStickerKeywords.kt

@@ -0,0 +1,38 @@
+package dev.inmo.tgbotapi.requests.stickers
+
+import dev.inmo.tgbotapi.requests.abstracts.*
+import dev.inmo.tgbotapi.requests.common.CommonMultipartFileRequest
+import dev.inmo.tgbotapi.requests.stickers.abstracts.OwnerStickerSetAction
+import dev.inmo.tgbotapi.requests.stickers.abstracts.StickerAction
+import dev.inmo.tgbotapi.requests.stickers.abstracts.StickerSetAction
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+data class SetStickerKeywords (
+    @SerialName(stickerField)
+    override val sticker: FileId,
+    @SerialName(keywordsField)
+    val keywords: List<String>
+) : StickerAction<Boolean> {
+    constructor(sticker: FileId, vararg keywords: String) : this(sticker, keywords.toList())
+
+    init {
+        require(keywords.size !in keywordsInStickerLimit) {
+            "Keywords list size should be in range $keywordsInStickerLimit, but was ${keywords.size}"
+        }
+        keywords.forEach {
+            require(it.length in stickerKeywordLengthLimit) {
+                "Keyword length should be in range $stickerKeywordLengthLimit, but was ${it.length} (word \"$it\")"
+            }
+        }
+    }
+
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "setStickerKeywords"
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/SetStickerMaskPosition.kt

@@ -0,0 +1,26 @@
+package dev.inmo.tgbotapi.requests.stickers
+
+import dev.inmo.tgbotapi.requests.abstracts.*
+import dev.inmo.tgbotapi.requests.common.CommonMultipartFileRequest
+import dev.inmo.tgbotapi.requests.stickers.abstracts.OwnerStickerSetAction
+import dev.inmo.tgbotapi.requests.stickers.abstracts.StickerAction
+import dev.inmo.tgbotapi.requests.stickers.abstracts.StickerSetAction
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+data class SetStickerMaskPosition (
+    @SerialName(stickerField)
+    override val sticker: FileId,
+    @SerialName(maskPositionField)
+    val maskPosition: MaskPosition
+) : StickerAction<Boolean> {
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "setStickerMaskPosition"
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/SetStickerPositionInSet.kt

@@ -2,6 +2,7 @@ package dev.inmo.tgbotapi.requests.stickers
 
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.requests.stickers.abstracts.StickerAction
 import dev.inmo.tgbotapi.types.positionField
 import dev.inmo.tgbotapi.types.stickerField
 import kotlinx.serialization.*
@@ -10,10 +11,10 @@ import kotlinx.serialization.builtins.serializer
 @Serializable
 data class SetStickerPositionInSet(
     @SerialName(stickerField)
-    val sticker: FileId,
+    override val sticker: FileId,
     @SerialName(positionField)
     val position: Int
-) : SimpleRequest<Boolean> {
+) : StickerAction<Boolean> {
     init {
         if (position < 0) {
             throw IllegalArgumentException("Position must be positive or 0")

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/SetStickerSetThumbnail.kt

@@ -0,0 +1,47 @@
+package dev.inmo.tgbotapi.requests.stickers
+
+import dev.inmo.tgbotapi.requests.abstracts.*
+import dev.inmo.tgbotapi.requests.common.CommonMultipartFileRequest
+import dev.inmo.tgbotapi.requests.stickers.abstracts.OwnerStickerSetAction
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.*
+
+fun SetStickerSetThumbnail(
+    userId: UserId,
+    stickerSetName: String,
+    thumbnail: MultipartFile
+): Request<Boolean> {
+    return CommonMultipartFileRequest(
+        SetStickerSetThumbnail(userId, stickerSetName),
+        mapOf(thumbnailField to thumbnail)
+    )
+}
+
+@Deprecated("Renamed", ReplaceWith("SetStickerSetThumbnail(userId, stickerSetName, thumbnail)", "dev.inmo.tgbotapi.requests.stickers.SetStickerSetThumbnail"))
+fun SetStickerSetThumb(
+    userId: UserId,
+    stickerSetName: String,
+    thumbnail: MultipartFile
+): Request<Boolean> = SetStickerSetThumbnail(userId, stickerSetName, thumbnail)
+
+@Serializable
+data class SetStickerSetThumbnail (
+    @SerialName(userIdField)
+    override val userId: UserId,
+    @SerialName(nameField)
+    override val name: StickerSetName,
+    @SerialName(thumbnailField)
+    val thumbnail: FileId? = null
+) : OwnerStickerSetAction {
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "setStickerSetThumbnail"
+}
+
+@Deprecated("Renamed", ReplaceWith("SetStickerSetThumbnail(userId, name, thumbnail)", "dev.inmo.tgbotapi.requests.stickers.SetStickerSetThumbnail"))
+fun SetStickerSetThumb(
+    userId: UserId,
+    name: StickerSetName,
+    thumbnail: FileId? = null
+) = SetStickerSetThumbnail(userId, name, thumbnail)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/SetStickerSetTitle.kt

@@ -6,28 +6,15 @@ import dev.inmo.tgbotapi.requests.stickers.abstracts.StickerSetAction
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*
 
-fun SetStickerSetThumb(
-    userId: UserId,
-    stickerSetName: String,
-    thumb: MultipartFile
-): Request<Boolean> {
-    return CommonMultipartFileRequest(
-        SetStickerSetThumb(userId, stickerSetName),
-        mapOf(thumbField to thumb)
-    )
-}
-
 @Serializable
-data class SetStickerSetThumb (
-    @SerialName(userIdField)
-    override val userId: UserId,
+data class SetStickerSetTitle (
     @SerialName(nameField)
     override val name: StickerSetName,
-    @SerialName(thumbField)
-    val thumb: FileId? = null
+    @SerialName(titleField)
+    val title: String
 ) : StickerSetAction {
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 
-    override fun method(): String = "setStickerSetThumb"
+    override fun method(): String = "setStickerSetTitle"
 }

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

@@ -0,0 +1,11 @@
+package dev.inmo.tgbotapi.requests.stickers.abstracts
+
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.StickerSetName
+import dev.inmo.tgbotapi.types.UserId
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.builtins.serializer
+
+interface OwnerStickerSetAction : StickerSetAction {
+    val userId: UserId
+}

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

@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.requests.stickers.abstracts
 
 import dev.inmo.tgbotapi.types.stickers.MaskPosition
 
-interface StandardStickerSetAction : StickerSetAction {
+interface StandardStickerSetAction : OwnerStickerSetAction {
     val emojis: String // must be more than one
     val maskPosition: MaskPosition?
-}
+}

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

@@ -0,0 +1,8 @@
+package dev.inmo.tgbotapi.requests.stickers.abstracts
+
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+
+interface StickerAction<T : Any> : SimpleRequest<T> {
+    val sticker: FileId
+}

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

@@ -1,14 +1,14 @@
 package dev.inmo.tgbotapi.requests.stickers.abstracts
 
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.StickerSetName
 import dev.inmo.tgbotapi.types.UserId
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer
 
 interface StickerSetAction : SimpleRequest<Boolean> {
-    val userId: UserId
-    val name: String
+    val name: StickerSetName
 
     override val resultDeserializer: KSerializer<Boolean>
         get() = Boolean.serializer()
-}
+}

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

@@ -0,0 +1,10 @@
+package dev.inmo.tgbotapi.types
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BotDescription(
+    @SerialName(descriptionField)
+    val description: String
+)

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

@@ -0,0 +1,10 @@
+package dev.inmo.tgbotapi.types
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BotShortDescription(
+    @SerialName(shortDescriptionField)
+    val shortDescription: String
+)

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

@@ -74,8 +74,11 @@ val Identifier.userLink: String
 @Warning("This API have restrictions in Telegram System")
 val UserId.userLink: String
     get() = chatId.userLink
-val User.link: String
+val User.userLink: String
     get() = id.userLink
+@Deprecated("Deprecated due to the conflicts in name", ReplaceWith("this.userLink", "dev.inmo.tgbotapi.types.userLink"))
+val User.link: String
+    get() = userLink
 
 typealias UserId = ChatId
 

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

@@ -134,6 +134,12 @@ val suggestedTipAmountsLimit = 1 .. 4
 
 val inputFieldPlaceholderLimit = 1 .. 64
 
+val emojisInStickerLimit = 1 .. 20
+
+val keywordsInStickerLimit = 0 .. 20
+
+val stickerKeywordLengthLimit = 0 .. 64
+
 const val botActionActualityTime: Seconds = 5
 
 // Made as lazy for correct work in K/JS
@@ -257,6 +263,7 @@ const val createsJoinRequestField = "creates_join_request"
 const val pendingJoinRequestCountField = "pending_join_request_count"
 const val memberLimitField = "member_limit"
 const val iconColorField = "icon_color"
+const val emojiListField = "emoji_list"
 
 const val requestContactField = "request_contact"
 const val requestLocationField = "request_location"
@@ -325,9 +332,17 @@ const val stickerFileIdField = "sticker_file_id"
 
 const val gameShortNameField = "game_short_name"
 
+const val thumbnailUrlField = "thumbnail_url"
+@Deprecated("Renamed in telegram bot api", ReplaceWith("thumbnailUrlField", "dev.inmo.tgbotapi.types.thumbnailUrlField"))
 const val thumbUrlField = "thumb_url"
+const val thumbnailMimeTypeField = "thumbnail_mime_type"
+@Deprecated("Renamed in telegram bot api", ReplaceWith("thumbnailMimeTypeField", "dev.inmo.tgbotapi.types.thumbnailMimeTypeField"))
 const val thumbMimeTypeField = "thumb_mime_type"
+const val thumbnailWidthField = "thumbnail_width"
+@Deprecated("Renamed in telegram bot api", ReplaceWith("thumbnailWidthField", "dev.inmo.tgbotapi.types.thumbnailWidthField"))
 const val thumbWidthField = "thumb_width"
+const val thumbnailHeightField = "thumbnail_height"
+@Deprecated("Renamed in telegram bot api", ReplaceWith("thumbnailHeightField", "dev.inmo.tgbotapi.types.thumbnailHeightField"))
 const val thumbHeightField = "thumb_height"
 
 const val inputMessageContentField = "input_message_content"
@@ -380,11 +395,14 @@ const val explanationField = "explanation"
 const val idField = "id"
 const val pollIdField = "poll_id"
 const val textField = "text"
+const val thumbnailField = "thumbnail"
+@Deprecated("Renamed (in telegram bot api)", ReplaceWith("thumbnailField", "dev.inmo.tgbotapi.types.thumbnailField"))
 const val thumbField = "thumb"
 const val emojiField = "emoji"
 const val emojisField = "emojis"
 const val titleField = "title"
 const val descriptionField = "description"
+const val shortDescriptionField = "short_description"
 const val performerField = "performer"
 const val durationField = "duration"
 const val widthField = "width"
@@ -408,6 +426,7 @@ const val offsetField = "offset"
 const val limitField = "limit"
 const val stickersField = "stickers"
 const val stickerField = "sticker"
+const val keywordsField = "keywords"
 const val urlField = "url"
 const val addressField = "address"
 const val actionField = "action"

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

@@ -23,12 +23,12 @@ class InlineQueryResultArticle(
     val hideUrl: Boolean? = null,
     @SerialName(descriptionField)
     override val description: String? = null,
-    @SerialName(thumbUrlField)
-    override val thumbUrl: String? = null,
-    @SerialName(thumbWidthField)
-    override val thumbWidth: Int? = null,
-    @SerialName(thumbHeightField)
-    override val thumbHeight: Int? = null
+    @SerialName(thumbnailUrlField)
+    override val thumbnailUrl: String? = null,
+    @SerialName(thumbnailWidthField)
+    override val thumbnailWidth: Int? = null,
+    @SerialName(thumbnailHeightField)
+    override val thumbnailHeight: Int? = null
 ) : InlineQueryResult,
     ThumbSizedInlineQueryResult,
     TitledInlineQueryResult,

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

@@ -20,12 +20,12 @@ data class InlineQueryResultContact(
     override val lastName: String? = null,
     @SerialName(vcardField)
     override val vcard: String? = null,
-    @SerialName(thumbUrlField)
-    override val thumbUrl: String? = null,
-    @SerialName(thumbWidthField)
-    override val thumbWidth: Int? = null,
-    @SerialName(thumbHeightField)
-    override val thumbHeight: Int? = null,
+    @SerialName(thumbnailUrlField)
+    override val thumbnailUrl: String? = null,
+    @SerialName(thumbnailWidthField)
+    override val thumbnailWidth: Int? = null,
+    @SerialName(thumbnailHeightField)
+    override val thumbnailHeight: Int? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)

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

@@ -21,24 +21,24 @@ fun InlineQueryResultDocumentImpl(
     url: String,
     title: String,
     mimeType: MimeType,
-    thumbUrl: String? = null,
-    thumbWidth: Int? = null,
-    thumbHeight: Int? = null,
+    thumbnailUrl: String? = null,
+    thumbnailWidth: Int? = null,
+    thumbnailHeight: Int? = null,
     description: String? = null,
     text: String? = null,
     parseMode: ParseMode? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultDocumentImpl(id, url, title, mimeType, thumbUrl, thumbWidth, thumbHeight, description, text, parseMode, null, replyMarkup, inputMessageContent)
+) = InlineQueryResultDocumentImpl(id, url, title, mimeType, thumbnailUrl, thumbnailWidth, thumbnailHeight, description, text, parseMode, null, replyMarkup, inputMessageContent)
 
 fun InlineQueryResultDocumentImpl(
     id: InlineQueryIdentifier,
     url: String,
     title: String,
     mimeType: MimeType,
-    thumbUrl: String? = null,
-    thumbWidth: Int? = null,
-    thumbHeight: Int? = null,
+    thumbnailUrl: String? = null,
+    thumbnailWidth: Int? = null,
+    thumbnailHeight: Int? = null,
     description: String? = null,
     entities: TextSourcesList,
     replyMarkup: InlineKeyboardMarkup? = null,
@@ -48,9 +48,9 @@ fun InlineQueryResultDocumentImpl(
     url,
     title,
     mimeType,
-    thumbUrl,
-    thumbWidth,
-    thumbHeight,
+    thumbnailUrl,
+    thumbnailWidth,
+    thumbnailHeight,
     description,
     entities.makeString(),
     null,
@@ -69,12 +69,12 @@ data class InlineQueryResultDocumentImpl internal constructor(
     override val title: String,
     @SerialName(mimeTypeField)
     override val mimeType: MimeType,
-    @SerialName(thumbUrlField)
-    override val thumbUrl: String? = null,
-    @SerialName(thumbWidthField)
-    override val thumbWidth: Int? = null,
-    @SerialName(thumbHeightField)
-    override val thumbHeight: Int? = null,
+    @SerialName(thumbnailUrlField)
+    override val thumbnailUrl: String? = null,
+    @SerialName(thumbnailWidthField)
+    override val thumbnailWidth: Int? = null,
+    @SerialName(thumbnailHeightField)
+    override val thumbnailHeight: Int? = null,
     @SerialName(descriptionField)
     override val description: String? = null,
     @SerialName(captionField)

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

@@ -20,8 +20,8 @@ import kotlinx.serialization.Serializable
 fun InlineQueryResultGifImpl(
     id: InlineQueryIdentifier,
     url: String,
-    thumbUrl: String,
-    thumbMimeType: MimeType? = null,
+    thumbnailUrl: String,
+    thumbnailMimeType: MimeType? = null,
     width: Int? = null,
     height: Int? = null,
     duration: Int? = null,
@@ -30,13 +30,13 @@ fun InlineQueryResultGifImpl(
     parseMode: ParseMode? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultGifImpl(id, url, thumbUrl, thumbMimeType, width, height, duration, title, text, parseMode, null, replyMarkup, inputMessageContent)
+) = InlineQueryResultGifImpl(id, url, thumbnailUrl, thumbnailMimeType, width, height, duration, title, text, parseMode, null, replyMarkup, inputMessageContent)
 
 fun InlineQueryResultGifImpl(
     id: InlineQueryIdentifier,
     url: String,
-    thumbUrl: String,
-    thumbMimeType: MimeType? = null,
+    thumbnailUrl: String,
+    thumbnailMimeType: MimeType? = null,
     width: Int? = null,
     height: Int? = null,
     duration: Int? = null,
@@ -47,8 +47,8 @@ fun InlineQueryResultGifImpl(
 ) = InlineQueryResultGifImpl(
     id,
     url,
-    thumbUrl,
-    thumbMimeType,
+    thumbnailUrl,
+    thumbnailMimeType,
     width,
     height,
     duration,
@@ -63,8 +63,8 @@ fun InlineQueryResultGifImpl(
 fun InlineQueryResultGifImpl(
     id: InlineQueryIdentifier,
     gifFile: FileId,
-    thumbUrl: String,
-    thumbMimeType: MimeType? = null,
+    thumbnailUrl: String,
+    thumbnailMimeType: MimeType? = null,
     width: Int? = null,
     height: Int? = null,
     duration: Int? = null,
@@ -73,13 +73,13 @@ fun InlineQueryResultGifImpl(
     parseMode: ParseMode? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultGifImpl(id, gifFile.fileId, thumbUrl, thumbMimeType, width, height, duration, title, text, parseMode, replyMarkup, inputMessageContent)
+) = InlineQueryResultGifImpl(id, gifFile.fileId, thumbnailUrl, thumbnailMimeType, width, height, duration, title, text, parseMode, replyMarkup, inputMessageContent)
 
 fun InlineQueryResultGifImpl(
     id: InlineQueryIdentifier,
     gifFile: FileId,
-    thumbUrl: String,
-    thumbMimeType: MimeType? = null,
+    thumbnailUrl: String,
+    thumbnailMimeType: MimeType? = null,
     width: Int? = null,
     height: Int? = null,
     duration: Int? = null,
@@ -88,7 +88,7 @@ fun InlineQueryResultGifImpl(
     replyMarkup: InlineKeyboardMarkup? = null,
     inputMessageContent: InputMessageContent? = null
 ) = InlineQueryResultGifImpl(
-    id, gifFile.fileId, thumbUrl, thumbMimeType, width, height, duration, title, entities, replyMarkup, inputMessageContent
+    id, gifFile.fileId, thumbnailUrl, thumbnailMimeType, width, height, duration, title, entities, replyMarkup, inputMessageContent
 )
 
 @Serializable
@@ -97,10 +97,10 @@ data class InlineQueryResultGifImpl internal constructor(
     override val id: InlineQueryIdentifier,
     @SerialName(gifUrlField)
     override val url: String,
-    @SerialName(thumbUrlField)
-    override val thumbUrl: String,
-    @SerialName(thumbMimeTypeField)
-    override val thumbMimeType: MimeType? = null,
+    @SerialName(thumbnailUrlField)
+    override val thumbnailUrl: String,
+    @SerialName(thumbnailMimeTypeField)
+    override val thumbnailMimeType: MimeType? = null,
     @SerialName(gifWidthField)
     override val width: Int? = null,
     @SerialName(gifHeightField)
@@ -126,8 +126,8 @@ data class InlineQueryResultGifImpl internal constructor(
     }
 
     init {
-        if (thumbMimeType != null && thumbMimeType !in telegramInlineModeGifPermittedMimeTypes) {
-            error("Passed thumb mime type is not permitted in Telegram Bot API. Passed $thumbMimeType, but permitted $telegramInlineModeGifPermittedMimeTypes")
+        if (thumbnailMimeType != null && thumbnailMimeType !in telegramInlineModeGifPermittedMimeTypes) {
+            error("Passed thumb mime type is not permitted in Telegram Bot API. Passed $thumbnailMimeType, but permitted $telegramInlineModeGifPermittedMimeTypes")
         }
     }
 }

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

@@ -26,12 +26,12 @@ data class InlineQueryResultLocation(
     override val heading: Degrees? = null,
     @SerialName(proximityAlertRadiusField)
     override val proximityAlertRadius: Meters? = null,
-    @SerialName(thumbUrlField)
-    override val thumbUrl: String? = null,
-    @SerialName(thumbWidthField)
-    override val thumbWidth: Int? = null,
-    @SerialName(thumbHeightField)
-    override val thumbHeight: Int? = null,
+    @SerialName(thumbnailUrlField)
+    override val thumbnailUrl: String? = null,
+    @SerialName(thumbnailWidthField)
+    override val thumbnailWidth: Int? = null,
+    @SerialName(thumbnailHeightField)
+    override val thumbnailHeight: Int? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)

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

@@ -19,8 +19,8 @@ import kotlinx.serialization.Serializable
 fun InlineQueryResultMpeg4GifImpl(
     id: InlineQueryIdentifier,
     url: String,
-    thumbUrl: String,
-    thumbMimeType: MimeType? = null,
+    thumbnailUrl: String,
+    thumbnailMimeType: MimeType? = null,
     width: Int? = null,
     height: Int? = null,
     duration: Int? = null,
@@ -29,13 +29,13 @@ fun InlineQueryResultMpeg4GifImpl(
     parseMode: ParseMode? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultMpeg4GifImpl(id, url, thumbUrl, thumbMimeType, width, height, duration, title, text, parseMode, null, replyMarkup, inputMessageContent)
+) = InlineQueryResultMpeg4GifImpl(id, url, thumbnailUrl, thumbnailMimeType, width, height, duration, title, text, parseMode, null, replyMarkup, inputMessageContent)
 
 fun InlineQueryResultMpeg4GifImpl(
     id: InlineQueryIdentifier,
     url: String,
-    thumbUrl: String,
-    thumbMimeType: MimeType? = null,
+    thumbnailUrl: String,
+    thumbnailMimeType: MimeType? = null,
     width: Int? = null,
     height: Int? = null,
     duration: Int? = null,
@@ -46,8 +46,8 @@ fun InlineQueryResultMpeg4GifImpl(
 ) = InlineQueryResultMpeg4GifImpl(
     id,
     url,
-    thumbUrl,
-    thumbMimeType,
+    thumbnailUrl,
+    thumbnailMimeType,
     width,
     height,
     duration,
@@ -65,10 +65,10 @@ data class InlineQueryResultMpeg4GifImpl internal constructor(
     override val id: InlineQueryIdentifier,
     @SerialName(mpeg4GifUrlField)
     override val url: String,
-    @SerialName(thumbUrlField)
-    override val thumbUrl: String,
-    @SerialName(thumbMimeTypeField)
-    override val thumbMimeType: MimeType? = null,
+    @SerialName(thumbnailUrlField)
+    override val thumbnailUrl: String,
+    @SerialName(thumbnailMimeTypeField)
+    override val thumbnailMimeType: MimeType? = null,
     @SerialName(mpeg4GifWidthField)
     override val width: Int? = null,
     @SerialName(mpeg4GifHeightField)
@@ -94,8 +94,8 @@ data class InlineQueryResultMpeg4GifImpl internal constructor(
     }
 
     init {
-        if (thumbMimeType != null && thumbMimeType !in telegramInlineModeGifPermittedMimeTypes) {
-            error("Passed thumb mime type is not permitted in Telegram Bot API. Passed $thumbMimeType, but permitted $telegramInlineModeGifPermittedMimeTypes")
+        if (thumbnailMimeType != null && thumbnailMimeType !in telegramInlineModeGifPermittedMimeTypes) {
+            error("Passed thumb mime type is not permitted in Telegram Bot API. Passed $thumbnailMimeType, but permitted $telegramInlineModeGifPermittedMimeTypes")
         }
     }
 }

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

@@ -18,7 +18,7 @@ import kotlinx.serialization.Serializable
 fun InlineQueryResultPhotoImpl(
     id: InlineQueryIdentifier,
     url: String,
-    thumbUrl: String,
+    thumbnailUrl: String,
     width: Int? = null,
     height: Int? = null,
     title: String? = null,
@@ -27,12 +27,12 @@ fun InlineQueryResultPhotoImpl(
     parseMode: ParseMode? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultPhotoImpl(id, url, thumbUrl, width, height, title, description, text, parseMode, null, replyMarkup, inputMessageContent)
+) = InlineQueryResultPhotoImpl(id, url, thumbnailUrl, width, height, title, description, text, parseMode, null, replyMarkup, inputMessageContent)
 
 fun InlineQueryResultPhotoImpl(
     id: InlineQueryIdentifier,
     url: String,
-    thumbUrl: String,
+    thumbnailUrl: String,
     width: Int? = null,
     height: Int? = null,
     title: String? = null,
@@ -43,7 +43,7 @@ fun InlineQueryResultPhotoImpl(
 ) = InlineQueryResultPhotoImpl(
     id,
     url,
-    thumbUrl,
+    thumbnailUrl,
     width,
     height,
     title,
@@ -61,8 +61,8 @@ data class InlineQueryResultPhotoImpl internal constructor(
     override val id: InlineQueryIdentifier,
     @SerialName(photoUrlField)
     override val url: String,
-    @SerialName(thumbUrlField)
-    override val thumbUrl: String,
+    @SerialName(thumbnailUrlField)
+    override val thumbnailUrl: String,
     @SerialName(photoWidthField)
     override val width: Int? = null,
     @SerialName(photoHeightField)

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

@@ -29,12 +29,12 @@ data class InlineQueryResultVenue(
     override val googlePlaceId: GooglePlaceId? = null,
     @SerialName(googlePlaceTypeField)
     override val googlePlaceType: GooglePlaceType? = null,
-    @SerialName(thumbUrlField)
-    override val thumbUrl: String? = null,
-    @SerialName(thumbWidthField)
-    override val thumbWidth: Int? = null,
-    @SerialName(thumbHeightField)
-    override val thumbHeight: Int? = null,
+    @SerialName(thumbnailUrlField)
+    override val thumbnailUrl: String? = null,
+    @SerialName(thumbnailWidthField)
+    override val thumbnailWidth: Int? = null,
+    @SerialName(thumbnailHeightField)
+    override val thumbnailHeight: Int? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(inputMessageContentField)

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

@@ -19,7 +19,7 @@ import kotlinx.serialization.Serializable
 fun InlineQueryResultVideoImpl(
     id: InlineQueryIdentifier,
     url: String,
-    thumbUrl: String,
+    thumbnailUrl: String,
     mimeType: MimeType,
     title: String,
     width: Int? = null,
@@ -30,12 +30,12 @@ fun InlineQueryResultVideoImpl(
     parseMode: ParseMode? = null,
     replyMarkup: InlineKeyboardMarkup? = null,
     inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultVideoImpl(id, url, thumbUrl, mimeType, title, width, height, duration, description, text, parseMode, null, replyMarkup, inputMessageContent)
+) = InlineQueryResultVideoImpl(id, url, thumbnailUrl, mimeType, title, width, height, duration, description, text, parseMode, null, replyMarkup, inputMessageContent)
 
 fun InlineQueryResultVideoImpl(
     id: InlineQueryIdentifier,
     url: String,
-    thumbUrl: String,
+    thumbnailUrl: String,
     mimeType: MimeType,
     title: String,
     width: Int? = null,
@@ -48,7 +48,7 @@ fun InlineQueryResultVideoImpl(
 ) = InlineQueryResultVideoImpl(
     id,
     url,
-    thumbUrl,
+    thumbnailUrl,
     mimeType,
     title,
     width,
@@ -68,8 +68,8 @@ data class InlineQueryResultVideoImpl internal constructor(
     override val id: InlineQueryIdentifier,
     @SerialName(videoUrlField)
     override val url: String,
-    @SerialName(thumbUrlField)
-    override val thumbUrl: String,
+    @SerialName(thumbnailUrlField)
+    override val thumbnailUrl: String,
     @SerialName(mimeTypeField)
     override val mimeType: MimeType,
     @SerialName(titleField)

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

@@ -1,6 +1,12 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts
 
 interface ThumbSizedInlineQueryResult : InlineQueryResult, ThumbedInlineQueryResult {
+    val thumbnailWidth: Int?
+    @Deprecated("Renamed in telegram bot api", ReplaceWith("thumbnailWidth"))
     val thumbWidth: Int?
+        get() = thumbnailWidth
+    val thumbnailHeight: Int?
+    @Deprecated("Renamed in telegram bot api", ReplaceWith("thumbnailHeight"))
     val thumbHeight: Int?
-}
+        get() = thumbnailHeight
+}

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

@@ -3,9 +3,15 @@ package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts
 import dev.inmo.tgbotapi.utils.MimeType
 
 interface ThumbedInlineQueryResult : InlineQueryResult {
+    val thumbnailUrl: String?
+    @Deprecated("Renamed in telegram bot api", ReplaceWith("thumbnailUrl"))
     val thumbUrl: String?
+        get() = thumbnailUrl
 }
 
 interface ThumbedWithMimeTypeInlineQueryResult : ThumbedInlineQueryResult {
+    val thumbnailMimeType: MimeType?
+    @Deprecated("Renamed in telegram bot api", ReplaceWith("thumbnailMimeType"))
     val thumbMimeType: MimeType?
-}
+        get() = thumbnailMimeType
+}

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

@@ -3,10 +3,11 @@ package dev.inmo.tgbotapi.types.InlineQueries.query
 import dev.inmo.tgbotapi.types.InlineQueryIdentifier
 import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.types.chat.ChatType
+import dev.inmo.tgbotapi.types.chat.CommonUser
 
 data class BaseInlineQuery(
     override val id: InlineQueryIdentifier,
-    override val from: User,
+    override val from: CommonUser,
     override val query: String,
     override val offset: String,
     override val chatType: ChatType?

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

@@ -3,10 +3,16 @@ package dev.inmo.tgbotapi.types.InlineQueries.query
 import dev.inmo.tgbotapi.abstracts.FromUser
 import dev.inmo.tgbotapi.types.InlineQueryIdentifier
 import dev.inmo.tgbotapi.types.chat.ChatType
+import dev.inmo.tgbotapi.types.chat.CommonUser
+import dev.inmo.tgbotapi.types.chat.User
 
 sealed interface InlineQuery : FromUser {
     val id: InlineQueryIdentifier
     val query: String
     val offset: String
     val chatType: ChatType?
+
+    override val from: CommonUser
+    override val user: CommonUser
+        get() = from
 }

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

@@ -3,11 +3,12 @@ package dev.inmo.tgbotapi.types.InlineQueries.query
 import dev.inmo.tgbotapi.types.InlineQueryIdentifier
 import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.types.chat.ChatType
+import dev.inmo.tgbotapi.types.chat.CommonUser
 import dev.inmo.tgbotapi.types.location.Location
 
 data class LocationInlineQuery(
     override val id: InlineQueryIdentifier,
-    override val from: User,
+    override val from: CommonUser,
     override val query: String,
     override val offset: String,
     override val chatType: ChatType?,

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

@@ -12,7 +12,7 @@ internal data class RawInlineQuery(
     @SerialName(idField)
     val id: InlineQueryIdentifier,
     @SerialName(fromField)
-    val from: User,
+    val from: CommonUser,
     @SerialName(queryField)
     val query: String,
     @SerialName(offsetField)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/AnimationFile.kt

@@ -16,7 +16,7 @@ data class AnimationFile(
     override val width: Int,
     override val height: Int,
     override val duration: Long? = null,
-    override val thumb: PhotoSize? = null,
+    override val thumbnail: PhotoSize? = null,
     @SerialName(fileNameField)
     override val fileName: String? = null,
     @SerialName(mimeTypeField)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/AudioFile.kt

@@ -25,8 +25,8 @@ data class AudioFile(
     override val mimeType: MimeType? = null,
     @SerialName(fileSizeField)
     override val fileSize: Long? = null,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null
+    @SerialName(thumbnailField)
+    override val thumbnail: PhotoSize? = null
 ) : TelegramMediaFile, CustomNamedMediaFile, MimedMediaFile, ThumbedMediaFile, PlayableMediaFile, TitledMediaFile,
     Performerable
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/DocumentFile.kt

@@ -15,7 +15,7 @@ data class DocumentFile(
     override val fileUniqueId: FileUniqueId,
     @SerialName(fileSizeField)
     override val fileSize: Long? = null,
-    override val thumb: PhotoSize? = null,
+    override val thumbnail: PhotoSize? = null,
     @SerialName(mimeTypeField)
     override val mimeType: MimeType? = null,
     @SerialName(fileNameField)
@@ -30,7 +30,7 @@ inline fun TelegramMediaFile.asDocumentFile() = if (this is DocumentFile) {
         fileId,
         fileUniqueId,
         fileSize,
-        (this as? ThumbedMediaFile) ?.thumb,
+        (this as? ThumbedMediaFile) ?.thumbnail,
         (this as? MimedMediaFile) ?.mimeType,
         (this as? CustomNamedMediaFile) ?.fileName
     )

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/Sticker.kt

@@ -202,8 +202,8 @@ data class RegularSimpleSticker(
     override val width: Int,
     @SerialName(heightField)
     override val height: Int,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: PhotoSize? = null,
     @SerialName(emojiField)
     override val emoji: String? = null,
     @SerialName(stickerSetNameField)
@@ -225,8 +225,8 @@ data class RegularAnimatedSticker(
     override val width: Int,
     @SerialName(heightField)
     override val height: Int,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: PhotoSize? = null,
     @SerialName(emojiField)
     override val emoji: String? = null,
     @SerialName(stickerSetNameField)
@@ -246,8 +246,8 @@ data class RegularVideoSticker(
     override val width: Int,
     @SerialName(heightField)
     override val height: Int,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: PhotoSize? = null,
     @SerialName(emojiField)
     override val emoji: String? = null,
     @SerialName(stickerSetNameField)
@@ -275,8 +275,8 @@ data class MaskSimpleSticker(
     override val height: Int,
     @SerialName(maskPositionField)
     override val maskPosition: MaskPosition,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: PhotoSize? = null,
     @SerialName(emojiField)
     override val emoji: String? = null,
     @SerialName(stickerSetNameField)
@@ -296,8 +296,8 @@ data class MaskAnimatedSticker(
     override val height: Int,
     @SerialName(maskPositionField)
     override val maskPosition: MaskPosition,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: PhotoSize? = null,
     @SerialName(emojiField)
     override val emoji: String? = null,
     @SerialName(stickerSetNameField)
@@ -317,8 +317,8 @@ data class MaskVideoSticker(
     override val height: Int,
     @SerialName(maskPositionField)
     override val maskPosition: MaskPosition,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: PhotoSize? = null,
     @SerialName(emojiField)
     override val emoji: String? = null,
     @SerialName(stickerSetNameField)
@@ -344,8 +344,8 @@ data class CustomEmojiSimpleSticker(
     override val height: Int,
     @SerialName(customEmojiIdField)
     override val customEmojiId: CustomEmojiId,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: PhotoSize? = null,
     @SerialName(emojiField)
     override val emoji: String? = null,
     @SerialName(stickerSetNameField)
@@ -365,8 +365,8 @@ data class CustomEmojiAnimatedSticker(
     override val height: Int,
     @SerialName(customEmojiIdField)
     override val customEmojiId: CustomEmojiId,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: PhotoSize? = null,
     @SerialName(emojiField)
     override val emoji: String? = null,
     @SerialName(stickerSetNameField)
@@ -386,8 +386,8 @@ data class CustomEmojiVideoSticker(
     override val height: Int,
     @SerialName(customEmojiIdField)
     override val customEmojiId: CustomEmojiId,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: PhotoSize? = null,
     @SerialName(emojiField)
     override val emoji: String? = null,
     @SerialName(stickerSetNameField)
@@ -406,8 +406,8 @@ data class UnknownSticker(
     override val width: Int,
     @SerialName(heightField)
     override val height: Int,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: PhotoSize? = null,
     @SerialName(emojiField)
     override val emoji: String? = null,
     @SerialName(stickerSetNameField)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/ThumbedMediaFile.kt

@@ -1,8 +1,9 @@
 package dev.inmo.tgbotapi.types.files
 
-import dev.inmo.tgbotapi.types.files.PhotoSize
-import dev.inmo.tgbotapi.types.files.TelegramMediaFile
-
 sealed interface ThumbedMediaFile : TelegramMediaFile {
+    val thumbnail: PhotoSize?
+
+    @Deprecated("Renamed (in telegram bot api)", ReplaceWith("thumbnail"))
     val thumb: PhotoSize?
+        get() = thumbnail
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoFile.kt

@@ -21,8 +21,8 @@ data class VideoFile(
     override val height: Int,
     @SerialName(durationField)
     override val duration: Long? = null,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null,
+    @SerialName(thumbnailField)
+    override val thumbnail: PhotoSize? = null,
     @SerialName(fileNameField)
     override val fileName: String? = null,
     @SerialName(mimeTypeField)
@@ -44,7 +44,7 @@ inline fun VideoFile.toTelegramMediaVideo(
     width,
     height,
     duration,
-    thumb ?.fileId
+    thumbnail ?.fileId
 )
 
 @Suppress("NOTHING_TO_INLINE")
@@ -58,5 +58,5 @@ inline fun VideoFile.toTelegramMediaVideo(
     width,
     height,
     duration,
-    thumb ?.fileId
+    thumbnail ?.fileId
 )

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoNoteFile.kt

@@ -15,7 +15,7 @@ data class VideoNoteFile(
     @SerialName("length")
     override val width: Int,
     override val duration: Long? = null,
-    override val thumb: PhotoSize? = null,
+    override val thumbnail: PhotoSize? = null,
     @SerialName(fileSizeField)
     override val fileSize: Long? = null
 ) : TelegramMediaFile, ThumbedMediaFile, PlayableMediaFile, SizedMediaFile {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/media/TelegramMediaAudio.kt

@@ -77,7 +77,7 @@ fun AudioFile.toTelegramMediaAudio(
     duration,
     performer,
     title,
-    thumb ?.fileId
+    thumbnail ?.fileId
 )
 
 fun AudioFile.toTelegramMediaAudio(
@@ -89,5 +89,5 @@ fun AudioFile.toTelegramMediaAudio(
     duration,
     performer,
     title,
-    thumb ?.fileId
+    thumbnail ?.fileId
 )

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/media/TelegramMediaDocument.kt

@@ -78,7 +78,7 @@ fun DocumentFile.toTelegramMediaDocument(
     fileId,
     text,
     parseMode,
-    thumb ?.fileId
+    thumbnail ?.fileId
 )
 
 fun DocumentFile.toTelegramMediaDocument(
@@ -86,5 +86,5 @@ fun DocumentFile.toTelegramMediaDocument(
 ) = TelegramMediaDocument(
     fileId,
     textSources,
-    thumb ?.fileId
+    thumbnail ?.fileId
 )

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/AnimationContent.kt

@@ -32,7 +32,7 @@ data class AnimationContent(
     ): Request<ContentMessage<AnimationContent>> = SendAnimation(
         chatId,
         media.fileId,
-        media.thumb ?.fileId,
+        media.thumbnail ?.fileId,
         textSources,
         spoilered,
         media.duration,
@@ -53,6 +53,6 @@ data class AnimationContent(
         media.width,
         media.height,
         media.duration,
-        media.thumb ?.fileId
+        media.thumbnail ?.fileId
     )
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/AudioContent.kt

@@ -30,7 +30,7 @@ data class AudioContent(
     ): Request<ContentMessage<AudioContent>> = SendAudio(
         chatId,
         media.fileId,
-        media.thumb ?.fileId,
+        media.thumbnail ?.fileId,
         textSources,
         media.duration,
         media.performer,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/DocumentContent.kt

@@ -32,7 +32,7 @@ data class DocumentContent(
     ): Request<ContentMessage<DocumentContent>> = SendDocument(
         chatId,
         media.fileId,
-        media.thumb ?.fileId,
+        media.thumbnail ?.fileId,
         textSources,
         messageThreadId,
         disableNotification,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/StickerContent.kt

@@ -37,6 +37,6 @@ data class StickerContent(
     override fun asTelegramMedia(): TelegramMediaDocument = TelegramMediaDocument(
         media.fileId,
         null,
-        thumb = media.thumb ?.fileId
+        thumb = media.thumbnail ?.fileId
     )
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VideoContent.kt

@@ -31,7 +31,7 @@ data class VideoContent(
     ): Request<ContentMessage<VideoContent>> = SendVideo(
         chatId,
         media.fileId,
-        media.thumb ?.fileId,
+        media.thumbnail ?.fileId,
         textSources,
         spoilered,
         media.duration,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VideoNoteContent.kt

@@ -26,7 +26,7 @@ data class VideoNoteContent(
     ): Request<ContentMessage<VideoNoteContent>> = SendVideoNote(
         chatId,
         media.fileId,
-        media.thumb ?.fileId,
+        media.thumbnail ?.fileId,
         media.duration,
         media.width,
         messageThreadId,
@@ -42,6 +42,6 @@ data class VideoNoteContent(
         width = media.width,
         height = media.height,
         duration = media.duration,
-        thumb = media.thumb ?.fileId
+        thumb = media.thumbnail ?.fileId
     )
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/CallbackQuery.kt

@@ -2,16 +2,20 @@ package dev.inmo.tgbotapi.types.queries.callback
 
 import dev.inmo.tgbotapi.abstracts.FromUser
 import dev.inmo.tgbotapi.types.CallbackQueryIdentifier
+import dev.inmo.tgbotapi.types.chat.CommonUser
 import dev.inmo.tgbotapi.types.chat.User
 
 sealed interface CallbackQuery : FromUser {
     val id: CallbackQueryIdentifier
     val chatInstance: String
+    override val from: CommonUser
+    override val user: CommonUser
+        get() = from
 }
 
 data class UnknownCallbackQueryType(
     override val id: CallbackQueryIdentifier,
-    override val from: User,
+    override val from: CommonUser,
     override val chatInstance: String,
     val raw: String
 ) : CallbackQuery