fill changelog

0.38.8

CHANGELOG.md

@@ -1,5 +1,81 @@
 # TelegramBotAPI changelog
 
+## 0.38.9
+
+* `Core`:
+    * New function `MessageContent.Companion#serializationModule`
+    * Now it is possible to create `TelegramBot` (`RequestsExecutor`) with several bots under the hood and opportunity
+      for bots requests load balancing or fault-fix via sending of the requests via another bot
+* `API`:
+    * Add replies which will use another message as a source for reply (`copyMessage`)
+
+## 0.38.8
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.12` -> `0.9.16`
+        * `Klock`: `2.6.2` -> `2.6.3`
+        * `Ktor`: `1.6.7` -> `1.6.8`
+* `BehaviourBuilder`:
+    * Fixes in `onMediaGroup` and dependent functions
+    * Add several new extensions for `SimpleFilter`:
+        * `SimpleFilter#listAll`
+        * `SimpleFilter#listAny`
+        * `SimpleFilter#listNone`
+
+## 0.38.7
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.9` -> `0.9.12`
+        * `Klock`: `2.5.2` -> `2.6.2`
+* `Core`:
+    * `SimplePollOption#votes` now is `0` by default
+    * New function `PollOption.Companion#simple`
+
+## 0.38.6
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.6` -> `0.9.9`
+        * `Klock`: `2.4.13` -> `2.5.2`
+* `Core`:
+    * New member of `MentionTextSource` - `username`
+
+## 0.38.5
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.5` -> `0.9.6`
+* `Core`:
+    * `Username` got new property `usernameWithoutAt` which will return `username` without leading `@`
+* `Utils`:
+    * Several new functions for working with deep links:
+        * `makeUsernameDeepLinkPrefix`
+        * `makeTelegramDeepLink`
+        * `makeDeepLink`
+
+## 0.38.4
+
+__This update contains including of [Telegram Bot API 5.7](https://core.telegram.org/bots/api-changelog#january-31-2022)__
+
+* `Core`:
+    * Support of new fields `Sticker`
+    * Support of new fields `StickerSet`
+    * Support of new fields in creating of sticker set and sticker
+* `Utils`:
+    * Rename `PathedFile` to avoid clash with core file (fix of [#529](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/529))
+
+## 0.38.3
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.1` -> `0.9.2`
+        * `Klock`: `2.4.10` -> `2.4.12`
+        * `UUID`: `0.3.1` -> `0.4.0`
+* `API`
+    * New extensions `TelegramBot#send*` for media groups with contents
+
 ## 0.38.2
 
 * `Common`:

README.md

@@ -1,4 +1,4 @@
-# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-5.6-blue)](https://core.telegram.org/bots/api-changelog#december-30-2021)
+# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-5.7-blue)](https://core.telegram.org/bots/api-changelog#january-31-2022)
 
 | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://github.com/InsanusMokrassar/TelegramBotAPI/workflows/Build/badge.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI/actions) [![Small survey](https://img.shields.io/static/v1?label=Google&message=Survey&color=blue)](https://forms.gle/2Hex2ynbHWHhi1KY7) [![Chat in Telegram](https://img.shields.io/static/v1?label=Telegram&message=Chat&color=blue)](https://t.me/InMoTelegramBotAPI) |
 |:---:|
@@ -28,7 +28,7 @@ Other configuration examples:
 suspend fun main() {
   val bot = telegramBot(TOKEN)
 
-  bot.buildBehaviour {
+  bot.buildBehaviourWithLongPolling {
     println(getMe())
   
     onCommand("start") {
@@ -69,7 +69,7 @@ and maybe some updates it got after launch)
 suspend fun main() {
   val bot = telegramBot(TOKEN)
 
-  bot.buildBehaviour {
+  bot.buildBehaviourWithLongPolling {
     println(getMe())
 
     val nameReplyMarkup = ReplyKeyboardMarkup(

docs/gradle.properties

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

gradle.properties

@@ -8,16 +8,18 @@ kotlin.incremental.js=true
 kotlin_version=1.6.10
 kotlin_coroutines_version=1.6.0
 kotlin_serialisation_runtime_version=1.3.2
-klock_version=2.4.10
-uuid_version=0.3.1
-ktor_version=1.6.7
+klock_version=2.6.3
+uuid_version=0.4.0
+ktor_version=1.6.8
 
-
-micro_utils_version=0.9.1
+micro_utils_version=0.9.16
 
 javax_activation_version=1.1.1
 
+
+dokka_version=1.6.10
+
 library_group=dev.inmo
-library_version=0.38.2
+library_version=0.38.9
 
 github_release_plugin_version=2.2.12

gradle/wrapper/gradle-wrapper.properties

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

publish.gradle

@@ -9,8 +9,8 @@ publishing {
         artifact javadocsJar
 
         pom {
-            description = "This project just include all subproject of TelegramBotAPI"
-            name = "Telegram Bot API"
+            description = "${project.description}"
+            name = "${project.name}"
             url = "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI"
 
             scm {

publish.kpsb

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

tgbotapi.api/build.gradle

@@ -17,8 +17,9 @@ plugins {
 
 project.version = "$library_version"
 project.group = "$library_group"
+project.description = "API extensions with \"Telegram Bot API\"-like extensions for TelegramBot and RequestsExecutor"
 
-apply from: "publish.gradle"
+apply from: "../publish.gradle"
 
 repositories {
     mavenLocal()

tgbotapi.api/publish.gradle

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

tgbotapi.api/publish.kpsb

@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Extensions for API","description":"API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

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

@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.extensions.api.get
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.get.GetStickerSet
-import dev.inmo.tgbotapi.types.files.Sticker
+import dev.inmo.tgbotapi.types.files.sticker.Sticker
 
 suspend fun TelegramBot.getStickerSet(
     name: String

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

@@ -14,8 +14,10 @@ import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.dice.DiceAnimationType
 import dev.inmo.tgbotapi.types.files.*
+import dev.inmo.tgbotapi.types.files.sticker.Sticker
 import dev.inmo.tgbotapi.types.games.Game
 import dev.inmo.tgbotapi.types.location.StaticLocation
 import dev.inmo.tgbotapi.types.message.abstracts.Message
@@ -863,3 +865,38 @@ suspend inline fun TelegramBot.reply(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendQuizPoll(to.chat, isClosed, quizPoll, question, options, correctOptionId, isAnonymous, entities, closeInfo, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+
+suspend inline fun TelegramBot.reply(
+    to: Message,
+    fromChatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = copyMessage(fromChatId, to.chat.id, messageId, text, parseMode, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+
+suspend inline fun TelegramBot.reply(
+    to: Message,
+    fromChat: Chat,
+    messageId: MessageIdentifier,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = reply(to, fromChat.id, messageId, text, parseMode, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
+
+suspend inline fun TelegramBot.reply(
+    to: Message,
+    copy: Message,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = reply(to, copy.chat.id, copy.messageId, text, parseMode, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)

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

@@ -7,7 +7,11 @@ import dev.inmo.tgbotapi.types.InputMedia.*
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
+import dev.inmo.tgbotapi.types.message.content.abstracts.VisualMediaGroupContent
+import dev.inmo.tgbotapi.types.message.content.media.AudioContent
+import dev.inmo.tgbotapi.types.message.content.media.DocumentContent
 import dev.inmo.tgbotapi.utils.RiskFeature
+import kotlin.jvm.JvmName
 
 /**
  * @see SendMediaGroup
@@ -41,6 +45,38 @@ suspend fun TelegramBot.sendMediaGroup(
     chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
 )
 
+/**
+ * @see SendMediaGroup
+ */
+@RiskFeature(rawSendingMediaGroupsWarning)
+@JvmName("sendMedaGroupByContent")
+suspend fun TelegramBot.sendMediaGroup(
+    chatId: ChatIdentifier,
+    media: List<MediaGroupContent>,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) = sendMediaGroup(
+    chatId, media.map { it.toMediaGroupMemberInputMedia() }, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
+)
+
+/**
+ * @see SendMediaGroup
+ */
+@RiskFeature(rawSendingMediaGroupsWarning)
+@JvmName("sendMedaGroupByContent")
+suspend fun TelegramBot.sendMediaGroup(
+    chat: Chat,
+    media: List<MediaGroupContent>,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) = sendMediaGroup(
+    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
+)
+
 /**
  * @see SendPlaylist
  */
@@ -71,6 +107,36 @@ suspend fun TelegramBot.sendPlaylist(
     chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
 )
 
+/**
+ * @see SendPlaylist
+ */
+@JvmName("sendPlaylistByContent")
+suspend fun TelegramBot.sendPlaylist(
+    chatId: ChatIdentifier,
+    media: List<AudioContent>,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) = sendPlaylist(
+    chatId, media.map { it.toMediaGroupMemberInputMedia() }, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
+)
+
+/**
+ * @see SendPlaylist
+ */
+@JvmName("sendPlaylistByContent")
+suspend fun TelegramBot.sendPlaylist(
+    chat: Chat,
+    media: List<AudioContent>,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) = sendPlaylist(
+    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
+)
+
 /**
  * @see SendDocumentsGroup
  */
@@ -101,6 +167,36 @@ suspend fun TelegramBot.sendDocumentsGroup(
     chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
 )
 
+/**
+ * @see SendDocumentsGroup
+ */
+@JvmName("sendDocumentsByContent")
+suspend fun TelegramBot.sendDocumentsGroup(
+    chatId: ChatIdentifier,
+    media: List<DocumentContent>,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) = sendDocumentsGroup(
+    chatId, media.map { it.toMediaGroupMemberInputMedia() }, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
+)
+
+/**
+ * @see SendDocumentsGroup
+ */
+@JvmName("sendDocumentsByContent")
+suspend fun TelegramBot.sendDocumentsGroup(
+    chat: Chat,
+    media: List<DocumentContent>,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) = sendDocumentsGroup(
+    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
+)
+
 /**
  * @see SendVisualMediaGroup
  */
@@ -130,3 +226,33 @@ suspend fun TelegramBot.sendVisualMediaGroup(
 ) = sendVisualMediaGroup(
     chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
 )
+
+/**
+ * @see SendVisualMediaGroup
+ */
+@JvmName("sendVisualMediaGroupByContent")
+suspend fun TelegramBot.sendVisualMediaGroup(
+    chatId: ChatIdentifier,
+    media: List<VisualMediaGroupContent>,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) = sendVisualMediaGroup(
+    chatId, media.map { it.toMediaGroupMemberInputMedia() }, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
+)
+
+/**
+ * @see SendVisualMediaGroup
+ */
+@JvmName("sendVisualMediaGroupByContent")
+suspend fun TelegramBot.sendVisualMediaGroup(
+    chat: Chat,
+    media: List<VisualMediaGroupContent>,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) = sendVisualMediaGroup(
+    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
+)

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

@@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.files.Sticker
+import dev.inmo.tgbotapi.types.files.sticker.Sticker
 
 /**
  * @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/stickers/AddVideoStickerToSet.kt

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

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

@@ -11,44 +11,48 @@ import dev.inmo.tgbotapi.types.stickers.MaskPosition
 suspend fun TelegramBot.createNewAnimatedStickerSet(
     userId: UserId,
     name: String,
+    title: String,
     sticker: FileId,
     emojis: String,
     containsMasks: Boolean? = null,
     maskPosition: MaskPosition? = null
 ) = execute(
-    CreateNewAnimatedStickerSet(userId, name, sticker, emojis, containsMasks, maskPosition)
+    CreateNewAnimatedStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
 )
 
 suspend fun TelegramBot.createNewAnimatedStickerSet(
     userId: UserId,
     name: String,
+    title: String,
     sticker: MultipartFile,
     emojis: String,
     containsMasks: Boolean? = null,
     maskPosition: MaskPosition? = null
 ) = execute(
-    CreateNewAnimatedStickerSet(userId, name, sticker, emojis, containsMasks, maskPosition)
+    CreateNewAnimatedStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
 )
 
 
 suspend fun TelegramBot.createNewAnimatedStickerSet(
     user: CommonUser,
     name: String,
+    title: String,
     sticker: FileId,
     emojis: String,
     containsMasks: Boolean? = null,
     maskPosition: MaskPosition? = null
 ) = createNewAnimatedStickerSet(
-    user.id, name, sticker, emojis, containsMasks, maskPosition
+    user.id, name, title, sticker, emojis, containsMasks, maskPosition
 )
 
 suspend fun TelegramBot.createNewAnimatedStickerSet(
     user: CommonUser,
     name: String,
+    title: String,
     sticker: MultipartFile,
     emojis: String,
     containsMasks: Boolean? = null,
     maskPosition: MaskPosition? = null
 ) = createNewAnimatedStickerSet(
-    user.id, name, sticker, emojis, containsMasks, maskPosition
+    user.id, name, title, sticker, emojis, containsMasks, maskPosition
 )

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

@@ -11,44 +11,48 @@ import dev.inmo.tgbotapi.types.stickers.MaskPosition
 suspend fun TelegramBot.createNewStaticStickerSet(
     userId: UserId,
     name: String,
+    title: String,
     sticker: FileId,
     emojis: String,
     containsMasks: Boolean? = null,
     maskPosition: MaskPosition? = null
 ) = execute(
-    CreateNewStaticStickerSet(userId, name, sticker, emojis, containsMasks, maskPosition)
+    CreateNewStaticStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
 )
 
 suspend fun TelegramBot.createNewStaticStickerSet(
     userId: UserId,
     name: String,
+    title: String,
     sticker: MultipartFile,
     emojis: String,
     containsMasks: Boolean? = null,
     maskPosition: MaskPosition? = null
 ) = execute(
-    CreateNewStaticStickerSet(userId, name, sticker, emojis, containsMasks, maskPosition)
+    CreateNewStaticStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
 )
 
 
 suspend fun TelegramBot.createNewStaticStickerSet(
     user: CommonUser,
     name: String,
+    title: String,
     sticker: FileId,
     emojis: String,
     containsMasks: Boolean? = null,
     maskPosition: MaskPosition? = null
 ) = createNewStaticStickerSet(
-    user.id, name, sticker, emojis, containsMasks, maskPosition
+    user.id, name, title, sticker, emojis, containsMasks, maskPosition
 )
 
 suspend fun TelegramBot.createNewStaticStickerSet(
     user: CommonUser,
     name: String,
+    title: String,
     sticker: MultipartFile,
     emojis: String,
     containsMasks: Boolean? = null,
     maskPosition: MaskPosition? = null
 ) = createNewStaticStickerSet(
-    user.id, name, sticker, emojis, containsMasks, maskPosition
+    user.id, name, title, sticker, emojis, containsMasks, maskPosition
 )

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

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

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

@@ -3,7 +3,7 @@ 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.types.files.Sticker
+import dev.inmo.tgbotapi.types.files.sticker.Sticker
 
 suspend fun TelegramBot.deleteStickerFromSet(
     sticker: FileId

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

@@ -3,7 +3,7 @@ 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.SetStickerPositionInSet
-import dev.inmo.tgbotapi.types.files.Sticker
+import dev.inmo.tgbotapi.types.files.sticker.Sticker
 
 suspend fun TelegramBot.setStickerPositionInSet(
     sticker: FileId,

tgbotapi.behaviour_builder.fsm/build.gradle

@@ -17,8 +17,9 @@ plugins {
 
 project.version = "$library_version"
 project.group = "$library_group"
+project.description = "Behaviour Builder extension with built-in FSM"
 
-apply from: "publish.gradle"
+apply from: "../publish.gradle"
 
 repositories {
     mavenLocal()

tgbotapi.behaviour_builder.fsm/publish.gradle

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

tgbotapi.behaviour_builder.fsm/publish.kpsb

@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot Behaviour Builder FSM Extensions","description":"FSM extension for dev.inmo:tgbotapi.extensions.behaviour_builder.fsm","url":"https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.behaviour_builder","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

tgbotapi.behaviour_builder/build.gradle

@@ -17,8 +17,9 @@ plugins {
 
 project.version = "$library_version"
 project.group = "$library_group"
+project.description = "Behaviour Builder DSL"
 
-apply from: "publish.gradle"
+apply from: "../publish.gradle"
 
 repositories {
     mavenLocal()

tgbotapi.behaviour_builder/mpp_publish_template.kpsb

@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Steps Extensions","description":"This extensions project contains tools for simple interaction with chats","url":"https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.steps","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}

tgbotapi.behaviour_builder/publish.gradle

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

tgbotapi.behaviour_builder/publish.kpsb

@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Steps Extensions","description":"This extensions project contains tools for simple interaction with chats","url":"https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.steps","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

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

@@ -22,7 +22,11 @@ internal suspend inline fun <BC : BehaviourContext, reified T : MediaGroupConten
     markerFactory: MarkerFactory<in List<MediaGroupMessage<T>>, Any> = ByChatMediaGroupMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, List<MediaGroupMessage<T>>>
 ) = on(markerFactory, initialFilter, subcontextUpdatesFilter, scenarioReceiver) {
-    (it.asSentMediaGroupUpdate() ?.data ?.takeIf { it.all { it is T } } as? List<MediaGroupMessage<T>>) ?.let(::listOfNotNull)
+    (it.asSentMediaGroupUpdate() ?.data ?.takeIf { messages ->
+        messages.all { message ->
+            message.content is T
+        }
+    } as? List<MediaGroupMessage<T>>) ?.let(::listOfNotNull)
 }
 
 /**

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/SimpleFilter.kt

@@ -4,6 +4,27 @@ typealias SimpleFilter<T> = suspend (T) -> Boolean
 
 inline fun <T> SimpleFilter(noinline block: SimpleFilter<T>) = block
 
+/**
+ * @return [SimpleFilter] which will return true in case when all the items in incoming data passed [this] filter
+ */
+fun <T> SimpleFilter<T>.listAll() = SimpleFilter<Iterable<T>> {
+    it.all { this@listAll(it) }
+}
+
+/**
+ * @return [SimpleFilter] which will return true in case when there is any item in incoming data passed [this] filter
+ */
+fun <T> SimpleFilter<T>.listAny() = SimpleFilter<Iterable<T>> {
+    it.any { this@listAny(it) }
+}
+
+/**
+ * @return [SimpleFilter] which will return true in case when there is no any item in incoming data passed [this] filter
+ */
+fun <T> SimpleFilter<T>.listNone() = SimpleFilter<Iterable<T>> {
+    it.none { this@listNone(it) }
+}
+
 /**
  * Makes an AND (&&) operation between [this] and [other]
  */

tgbotapi.core/build.gradle

@@ -17,8 +17,9 @@ plugins {
 
 project.version = "$library_version"
 project.group = "$library_group"
+project.description = "Core part of tgbotapi with all (and only) required functionality for working with Telegram Bot API"
 
-apply from: "publish.gradle"
+apply from: "../publish.gradle"
 
 repositories {
     mavenLocal()

tgbotapi.core/publish.gradle

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

tgbotapi.core/publish.kpsb

@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Core","description":"Library for Object-Oriented and type-safe work with Telegram Bot API","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/multiserver/SimpleMultiServerRequestsExecutor.kt

@@ -0,0 +1,224 @@
+package dev.inmo.tgbotapi.bot.multiserver
+
+import dev.inmo.tgbotapi.bot.Ktor.KtorRequestsExecutorBuilder
+import dev.inmo.tgbotapi.bot.Ktor.telegramBot
+import dev.inmo.tgbotapi.bot.RequestsExecutor
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
+import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
+import kotlinx.coroutines.*
+import kotlin.js.JsName
+import kotlin.jvm.JvmName
+
+/**
+ * This type of [RequestsExecutor] (aka [TelegramBot]) has been created to aggregate several bots under the hood and make
+ * requests, for example, with changing of api url
+ *
+ * @param bots Bots which will be used to [execute] [Request]s
+ * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
+ * when request execution just started and this call is first in context of one [execute]. By default, will select next
+ * [TelegramBot] when called (or first when current index is last or -1)
+ * @param onClose This method will be called inside of [close] method. By default, will close all [bots]
+ */
+class SimpleMultiServerRequestsExecutor(
+    private val bots: List<TelegramBot>,
+    private val botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
+        getOrElse(i + 1) { first() }
+    },
+    private val onClose: () -> Unit = {
+        bots.forEach(TelegramBot::close)
+    }
+) : RequestsExecutor {
+    override suspend fun <T : Any> execute(request: Request<T>): T {
+        var currentBot = bots.botSelector(-1, null)
+        while (currentCoroutineContext().isActive) {
+            val i = bots.indexOf(currentBot)
+            runCatching {
+                currentBot.execute(request)
+            }.onSuccess {
+                return it
+            }.onFailure {
+                currentBot = bots.botSelector(i, it)
+            }
+        }
+        error("Coroutine has been terminated")
+    }
+
+    override fun close() {
+        onClose()
+    }
+
+    companion object {
+        /**
+         * @param keepers Will be used to create result [bots]
+         * @param builder Will be called with each item from [keepers] in process of bots creation
+         * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
+         * when request execution just started and this call is first in context of one [execute]. By default, will select next
+         * [TelegramBot] when called (or first when current index is last or -1)
+         * @param onClose This method will be called inside of [close] method. By default, will close all [bots]
+         */
+        @JvmName("createByUrlsKeepers")
+        @JsName("createByUrlsKeepers")
+        inline operator fun invoke(
+            keepers: Iterable<TelegramAPIUrlsKeeper>,
+            crossinline builder: KtorRequestsExecutorBuilder.(TelegramAPIUrlsKeeper) -> Unit = {},
+            noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
+                getOrElse(i + 1) { first() }
+            },
+            noinline onClose: ((List<TelegramBot>) -> Unit)? = null
+        ): SimpleMultiServerRequestsExecutor {
+            val bots = keepers.map { telegramBot(it) { builder(it) } }
+            return if (onClose == null) {
+                SimpleMultiServerRequestsExecutor(bots, botSelector)
+            } else {
+                SimpleMultiServerRequestsExecutor(bots, botSelector) {
+                    onClose(bots)
+                }
+            }
+        }
+
+        /**
+         * @param tokens Will be used to create result [bots]
+         * @param builder Will be called with each item from [tokens] in process of bots creation
+         * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
+         * when request execution just started and this call is first in context of one [execute]. By default, will select next
+         * [TelegramBot] when called (or first when current index is last or -1)
+         * @param onClose This method will be called inside of [close] method. By default, will close all [bots]
+         */
+        @JvmName("createByTokens")
+        @JsName("createByTokens")
+        inline operator fun invoke(
+            tokens: Iterable<String>,
+            crossinline builder: KtorRequestsExecutorBuilder.(String) -> Unit = {},
+            noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
+                getOrElse(i + 1) { first() }
+            },
+            noinline onClose: ((List<TelegramBot>) -> Unit)? = null
+        ): SimpleMultiServerRequestsExecutor {
+            val bots = tokens.map { telegramBot(it) { builder(it) } }
+            return if (onClose == null) {
+                SimpleMultiServerRequestsExecutor(bots, botSelector)
+            } else {
+                SimpleMultiServerRequestsExecutor(bots, botSelector) {
+                    onClose(bots)
+                }
+            }
+        }
+
+        /**
+         * @param tokens [Pair]s with first parameter as a token and second parameter api url. Will be used to create
+         * result [bots]
+         * @param builder Will be called with each item from [tokens] in process of bots creation
+         * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
+         * when request execution just started and this call is first in context of one [execute]. By default, will select next
+         * [TelegramBot] when called (or first when current index is last or -1)
+         * @param onClose This method will be called inside of [close] method. By default, will close all [bots]
+         */
+        @JvmName("createByTokensAndApiUrls")
+        @JsName("createByTokensAndApiUrls")
+        inline operator fun invoke(
+            tokens: Iterable<Pair<String, String>>,
+            crossinline builder: KtorRequestsExecutorBuilder.(Pair<String, String>) -> Unit = {},
+            noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
+                getOrElse(i + 1) { first() }
+            },
+            noinline onClose: ((List<TelegramBot>) -> Unit)? = null
+        ): SimpleMultiServerRequestsExecutor {
+            val bots = tokens.map { telegramBot(it.first, it.second) { builder(it) } }
+            return if (onClose == null) {
+                SimpleMultiServerRequestsExecutor(bots, botSelector)
+            } else {
+                SimpleMultiServerRequestsExecutor(bots, botSelector) {
+                    onClose(bots)
+                }
+            }
+        }
+    }
+}
+
+
+/**
+ * Creates [SimpleMultiServerRequestsExecutor]
+ *
+ * @param bots Bots which will be used to [SimpleMultiServerRequestsExecutor.execute] [Request]s
+ * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
+ * when request execution just started and this call is first in context of one
+ * [SimpleMultiServerRequestsExecutor.execute]. By default, will select next [TelegramBot] when called (or first when
+ * current index is last or -1)
+ * @param onClose This method will be called inside of [SimpleMultiServerRequestsExecutor.close] method. By default, will close all [bots]
+ */
+@Suppress("NOTHING_TO_INLINE")
+inline fun telegramBot(
+    bots: List<TelegramBot>,
+    noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
+        getOrElse(i + 1) { first() }
+    },
+    noinline onClose: () -> Unit = {
+        bots.forEach(TelegramBot::close)
+    }
+): TelegramBot = SimpleMultiServerRequestsExecutor(bots, botSelector, onClose)
+
+/**
+ * @param keepers Will be used to create result [SimpleMultiServerRequestsExecutor.bots]
+ * @param builder Will be called with each item from [keepers] in process of bots creation
+ * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
+ * when request execution just started and this call is first in context of one
+ * [SimpleMultiServerRequestsExecutor.execute]. By default, will select next [TelegramBot] when called (or first when
+ * current index is last or -1)
+ * @param onClose This method will be called inside of [SimpleMultiServerRequestsExecutor.close] method. By default,
+ * will close all [SimpleMultiServerRequestsExecutor.bots]
+ */
+@JvmName("telegramBotByApiUrlsKeepers")
+@JsName("telegramBotByApiUrlsKeepers")
+inline fun telegramBot(
+    keepers: Iterable<TelegramAPIUrlsKeeper>,
+    crossinline builder: KtorRequestsExecutorBuilder.(TelegramAPIUrlsKeeper) -> Unit = {},
+    noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
+        getOrElse(i + 1) { first() }
+    },
+    noinline onClose: ((List<TelegramBot>) -> Unit)? = null
+): TelegramBot = SimpleMultiServerRequestsExecutor(keepers, builder, botSelector, onClose)
+
+/**
+ * @param tokens Will be used to create result [SimpleMultiServerRequestsExecutor.bots]
+ * @param builder Will be called with each item from [tokens] in process of bots creation
+ * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
+ * when request execution just started and this call is first in context of one
+ * [SimpleMultiServerRequestsExecutor.execute]. By default, will select next [TelegramBot] when called (or first when
+ * current index is last or -1)
+ * @param onClose This method will be called inside of [SimpleMultiServerRequestsExecutor.close] method. By default,
+ * will close all [SimpleMultiServerRequestsExecutor.bots]
+ */
+@JvmName("telegramBotByTokens")
+@JsName("telegramBotByTokens")
+inline fun telegramBot(
+    tokens: Iterable<String>,
+    crossinline builder: KtorRequestsExecutorBuilder.(String) -> Unit = {},
+    noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
+        getOrElse(i + 1) { first() }
+    },
+    noinline onClose: ((List<TelegramBot>) -> Unit)? = null
+): TelegramBot = SimpleMultiServerRequestsExecutor(tokens, builder, botSelector, onClose)
+
+/**
+ * @param tokens [Pair]s with first parameter as a token and second parameter api url. Will be used to create
+ * result [SimpleMultiServerRequestsExecutor.bots]
+ * @param builder Will be called with each item from [tokens] in process of bots creation
+ * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
+ * when request execution just started and this call is first in context of one
+ * [SimpleMultiServerRequestsExecutor.execute]. By default, will select next
+ * [TelegramBot] when called (or first when current index is last or -1)
+ * @param onClose This method will be called inside of [SimpleMultiServerRequestsExecutor.close] method. By default,
+ * will close all [SimpleMultiServerRequestsExecutor.bots]
+ */
+@JvmName("telegramBotByTokensAndApiUrls")
+@JsName("telegramBotByTokensAndApiUrls")
+inline fun telegramBot(
+    tokens: Iterable<Pair<String, String>>,
+    crossinline builder: KtorRequestsExecutorBuilder.(Pair<String, String>) -> Unit = {},
+    noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
+        getOrElse(i + 1) { first() }
+    },
+    noinline onClose: ((List<TelegramBot>) -> Unit)? = null
+): TelegramBot = SimpleMultiServerRequestsExecutor(tokens, builder, botSelector, onClose)

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

@@ -18,7 +18,7 @@ fun AddAnimatedStickerToSet(
     return when (sticker) {
         is MultipartFile -> CommonMultipartFileRequest(
             data,
-            mapOf(pngStickerField to sticker)
+            mapOf(tgsStickerField to sticker)
         )
         is FileId -> data
     }

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

@@ -0,0 +1,50 @@
+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.StandardStickerSetAction
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+import kotlinx.serialization.*
+
+fun AddVideoStickerToSet(
+    userId: UserId,
+    stickerSetName: String,
+    sticker: InputFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+): Request<Boolean> {
+    val data = AddVideoStickerToSet(userId, stickerSetName, emojis, sticker as? FileId, maskPosition)
+    return when (sticker) {
+        is MultipartFile -> CommonMultipartFileRequest(
+            data,
+            mapOf(webmStickerField to sticker)
+        )
+        is FileId -> data
+    }
+}
+
+@Serializable
+data class AddVideoStickerToSet internal constructor(
+    @SerialName(userIdField)
+    override val userId: UserId,
+    @SerialName(nameField)
+    override val name: String,
+    @SerialName(emojisField)
+    override val emojis: String,
+    @SerialName(webmStickerField)
+    val sticker: FileId? = null,
+    @SerialName(maskPositionField)
+    override val maskPosition: MaskPosition? = null
+) : StandardStickerSetAction {
+    init {
+        if(emojis.isEmpty()) {
+            throw IllegalArgumentException("Emojis must not be empty")
+        }
+    }
+
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "addStickerToSet"
+}

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

@@ -2,6 +2,7 @@ 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.CreateStickerSetAction
 import dev.inmo.tgbotapi.requests.stickers.abstracts.StandardStickerSetAction
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.stickers.MaskPosition
@@ -10,16 +11,17 @@ import kotlinx.serialization.*
 fun CreateNewAnimatedStickerSet(
     userId: UserId,
     name: String,
+    title: String,
     sticker: InputFile,
     emojis: String,
     containsMasks: Boolean? = null,
     maskPosition: MaskPosition? = null
 ): Request<Boolean> {
-    val data = CreateNewAnimatedStickerSet(userId, name, emojis, sticker as? FileId, containsMasks, maskPosition)
+    val data = CreateNewAnimatedStickerSet(userId, name, title, emojis, sticker as? FileId, containsMasks, maskPosition)
     return when (sticker) {
         is MultipartFile -> CommonMultipartFileRequest(
             data,
-            mapOf(pngStickerField to sticker)
+            mapOf(tgsStickerField to sticker)
         )
         is FileId -> data
     }
@@ -31,6 +33,8 @@ data class CreateNewAnimatedStickerSet internal constructor(
     override val userId: UserId,
     @SerialName(nameField)
     override val name: String,
+    @SerialName(titleField)
+    override val title: String,
     @SerialName(emojisField)
     override val emojis: String,
     @SerialName(tgsStickerField)
@@ -39,7 +43,7 @@ data class CreateNewAnimatedStickerSet internal constructor(
     val containsMasks: Boolean? = null,
     @SerialName(maskPositionField)
     override val maskPosition: MaskPosition? = null
-) : StandardStickerSetAction {
+) : CreateStickerSetAction {
     init {
         if(emojis.isEmpty()) {
             throw IllegalArgumentException("Emojis must not be empty")

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

@@ -2,6 +2,7 @@ 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.CreateStickerSetAction
 import dev.inmo.tgbotapi.requests.stickers.abstracts.StandardStickerSetAction
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.stickers.MaskPosition
@@ -10,12 +11,13 @@ import kotlinx.serialization.*
 fun CreateNewStaticStickerSet(
     userId: UserId,
     name: String,
+    title: String,
     sticker: InputFile,
     emojis: String,
     containsMasks: Boolean? = null,
     maskPosition: MaskPosition? = null
 ): Request<Boolean> {
-    val data = CreateNewStaticStickerSet(userId, name, emojis, sticker as? FileId, containsMasks, maskPosition)
+    val data = CreateNewStaticStickerSet(userId, name, title, emojis, sticker as? FileId, containsMasks, maskPosition)
     return when (sticker) {
         is MultipartFile -> CommonMultipartFileRequest(
             data,
@@ -28,11 +30,12 @@ fun CreateNewStaticStickerSet(
 fun CreateNewStickerSet(
     userId: UserId,
     name: String,
+    title: String,
     sticker: InputFile,
     emojis: String,
     containsMasks: Boolean? = null,
     maskPosition: MaskPosition? = null
-): Request<Boolean> = CreateNewStaticStickerSet(userId, name, sticker, emojis, containsMasks, maskPosition)
+): Request<Boolean> = CreateNewStaticStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
 
 @Serializable
 data class CreateNewStaticStickerSet internal constructor(
@@ -40,6 +43,8 @@ data class CreateNewStaticStickerSet internal constructor(
     override val userId: UserId,
     @SerialName(nameField)
     override val name: String,
+    @SerialName(titleField)
+    override val title: String,
     @SerialName(emojisField)
     override val emojis: String,
     @SerialName(pngStickerField)
@@ -48,7 +53,7 @@ data class CreateNewStaticStickerSet internal constructor(
     val containsMasks: Boolean? = null,
     @SerialName(maskPositionField)
     override val maskPosition: MaskPosition? = null
-) : StandardStickerSetAction {
+) : CreateStickerSetAction {
     init {
         if(emojis.isEmpty()) {
             throw IllegalArgumentException("Emojis must not be empty")

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

@@ -0,0 +1,57 @@
+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.CreateStickerSetAction
+import dev.inmo.tgbotapi.requests.stickers.abstracts.StandardStickerSetAction
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+import kotlinx.serialization.*
+
+fun CreateNewVideoStickerSet(
+    userId: UserId,
+    linkName: String,
+    title: String,
+    sticker: InputFile,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+): Request<Boolean> {
+    val data = CreateNewVideoStickerSet(userId, linkName, title, emojis, sticker as? FileId, containsMasks, maskPosition)
+    return when (sticker) {
+        is MultipartFile -> CommonMultipartFileRequest(
+            data,
+            mapOf(webmStickerField to sticker)
+        )
+        is FileId -> data
+    }
+}
+
+@Serializable
+data class CreateNewVideoStickerSet internal constructor(
+    @SerialName(userIdField)
+    override val userId: UserId,
+    @SerialName(nameField)
+    override val name: String,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(emojisField)
+    override val emojis: String,
+    @SerialName(webmStickerField)
+    val sticker: FileId? = null,
+    @SerialName(containsMasksField)
+    val containsMasks: Boolean? = null,
+    @SerialName(maskPositionField)
+    override val maskPosition: MaskPosition? = null
+) : CreateStickerSetAction {
+    init {
+        if(emojis.isEmpty()) {
+            throw IllegalArgumentException("Emojis must not be empty")
+        }
+    }
+
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "createNewStickerSet"
+}

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

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.requests.stickers.abstracts
+
+interface CreateStickerSetAction : StandardStickerSetAction {
+    val title: String
+}

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

@@ -46,6 +46,9 @@ fun Byte.toChatId(): ChatId = toLong().toChatId()
 data class Username(
     val username: String
 ) : ChatIdentifier() {
+    val usernameWithoutAt
+        get() = username.dropWhile { it == '@' }
+
     init {
         if (!username.startsWith("@")) {
             throw IllegalArgumentException("Username must starts with `@`")

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

@@ -168,6 +168,7 @@ const val botUsernameField = "bot_username"
 const val switchInlineQueryCurrentChatField = "switch_inline_query_current_chat"
 const val switchInlineQueryField = "switch_inline_query"
 const val isAnimatedField = "is_animated"
+const val isVideoField = "is_video"
 const val inviteLinkField = "invite_link"
 const val pinnedMessageField = "pinned_message"
 const val customTitleField = "custom_title"
@@ -265,6 +266,7 @@ const val canManageVoiceChatsField = "can_manage_voice_chats"
 const val canManageChatField = "can_manage_chat"
 const val pngStickerField = "png_sticker"
 const val tgsStickerField = "tgs_sticker"
+const val webmStickerField = "webm_sticker"
 const val oldChatMemberField = "old_chat_member"
 const val newChatMemberField = "new_chat_member"
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt

@@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
+import dev.inmo.tgbotapi.types.Username
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.extensions.makeString
 import dev.inmo.tgbotapi.utils.internal.*
@@ -23,6 +24,7 @@ data class MentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
     override val markdown: String by lazy { source.mentionMarkdown() }
     override val markdownV2: String by lazy { mentionMarkdownV2() }
     override val html: String by lazy { mentionHTML() }
+    val username: Username = Username(source)
 
     init {
         if (!source.startsWith("@")) {
@@ -42,3 +44,6 @@ inline fun mention(vararg parts: TextSource) = mention(parts.toList())
 @Suppress("NOTHING_TO_INLINE")
 inline fun mention(whoToMention: String) = mention(regular(whoToMention))
 
+@Suppress("NOTHING_TO_INLINE")
+inline fun mention(whoToMention: Username) = mention(whoToMention.username.dropWhile { it == '@' })
+

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

@@ -1,32 +1,6 @@
 package dev.inmo.tgbotapi.types.files
 
-import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.files.abstracts.*
-import dev.inmo.tgbotapi.types.stickers.MaskPosition
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import dev.inmo.tgbotapi.types.files.sticker.Sticker
 
-@Serializable
-data class Sticker(
-    @SerialName(fileIdField)
-    override val fileId: FileId,
-    @SerialName(fileUniqueIdField)
-    override val fileUniqueId: FileUniqueId,
-    @SerialName(widthField)
-    override val width: Int,
-    @SerialName(heightField)
-    override val height: Int,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null,
-    @SerialName(emojiField)
-    val emoji: String? = null,
-    @SerialName(stickerSetNameField)
-    val stickerSetName: StickerSetName? = null,
-    @SerialName(isAnimatedField)
-    val isAnimated: Boolean = false,
-    @SerialName(maskPositionField)
-    val maskPosition: MaskPosition? = null,
-    @SerialName(fileSizeField)
-    override val fileSize: Long? = null
-) : TelegramMediaFile, SizedMediaFile, ThumbedMediaFile
+@Deprecated("Replaced", ReplaceWith("Sticker", "dev.inmo.tgbotapi.types.files.sticker.Sticker"))
+typealias Sticker = Sticker

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

@@ -0,0 +1,158 @@
+package dev.inmo.tgbotapi.types.files.sticker
+
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.files.PhotoSize
+import dev.inmo.tgbotapi.types.files.abstracts.*
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+import dev.inmo.tgbotapi.utils.RiskFeature
+import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+@Serializable
+@RiskFeature("This class is used for serialization/deserialization of Sticker interface")
+data class StickerSurrogate(
+    val file_id: FileId,
+    val file_unique_id: FileUniqueId,
+    val width: Int,
+    val height: Int,
+    val is_animated: Boolean? = null,
+    val is_video: Boolean? = null,
+    val thumb: PhotoSize? = null,
+    val emoji: String? = null,
+    val set_name: StickerSetName? = null,
+    val mask_position: MaskPosition? = null,
+    val file_size: Long? = null
+)
+
+// TODO:: Serializer
+@Serializable(StickerSerializer::class)
+sealed interface Sticker : TelegramMediaFile, SizedMediaFile, ThumbedMediaFile {
+    val emoji: String?
+    val maskPosition: MaskPosition?
+    val stickerSetName: StickerSetName?
+
+    val isAnimated
+        get() = this is AnimatedSticker
+    val isVideo
+        get() = this is VideoSticker
+
+    companion object {
+        fun serializer(): KSerializer<Sticker> = StickerSerializer
+    }
+}
+
+object StickerSerializer : KSerializer<Sticker> {
+    override val descriptor: SerialDescriptor = StickerSurrogate.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): Sticker {
+        val surrogate = StickerSurrogate.serializer().deserialize(decoder)
+
+        return when {
+            surrogate.is_animated == true -> AnimatedSticker(
+                surrogate.file_id,
+                surrogate.file_unique_id,
+                surrogate.width,
+                surrogate.height,
+                surrogate.thumb,
+                surrogate.emoji,
+                surrogate.set_name,
+                surrogate.mask_position,
+                surrogate.file_size
+            )
+            surrogate.is_video == true -> VideoSticker(
+                surrogate.file_id,
+                surrogate.file_unique_id,
+                surrogate.width,
+                surrogate.height,
+                surrogate.thumb,
+                surrogate.emoji,
+                surrogate.set_name,
+                surrogate.mask_position,
+                surrogate.file_size
+            )
+            else -> SimpleSticker(
+                surrogate.file_id,
+                surrogate.file_unique_id,
+                surrogate.width,
+                surrogate.height,
+                surrogate.thumb,
+                surrogate.emoji,
+                surrogate.set_name,
+                surrogate.mask_position,
+                surrogate.file_size
+            )
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: Sticker) {
+        TODO("Not yet implemented")
+    }
+
+}
+
+@Serializable
+data class SimpleSticker(
+    @SerialName(fileIdField)
+    override val fileId: FileId,
+    @SerialName(fileUniqueIdField)
+    override val fileUniqueId: FileUniqueId,
+    @SerialName(widthField)
+    override val width: Int,
+    @SerialName(heightField)
+    override val height: Int,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null,
+    @SerialName(emojiField)
+    override val emoji: String? = null,
+    @SerialName(stickerSetNameField)
+    override val stickerSetName: StickerSetName? = null,
+    @SerialName(maskPositionField)
+    override val maskPosition: MaskPosition? = null,
+    @SerialName(fileSizeField)
+    override val fileSize: Long? = null,
+) : Sticker
+@Serializable
+data class AnimatedSticker(
+    @SerialName(fileIdField)
+    override val fileId: FileId,
+    @SerialName(fileUniqueIdField)
+    override val fileUniqueId: FileUniqueId,
+    @SerialName(widthField)
+    override val width: Int,
+    @SerialName(heightField)
+    override val height: Int,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null,
+    @SerialName(emojiField)
+    override val emoji: String? = null,
+    @SerialName(stickerSetNameField)
+    override val stickerSetName: StickerSetName? = null,
+    @SerialName(maskPositionField)
+    override val maskPosition: MaskPosition? = null,
+    @SerialName(fileSizeField)
+    override val fileSize: Long? = null,
+) : Sticker
+@Serializable
+data class VideoSticker(
+    @SerialName(fileIdField)
+    override val fileId: FileId,
+    @SerialName(fileUniqueIdField)
+    override val fileUniqueId: FileUniqueId,
+    @SerialName(widthField)
+    override val width: Int,
+    @SerialName(heightField)
+    override val height: Int,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null,
+    @SerialName(emojiField)
+    override val emoji: String? = null,
+    @SerialName(stickerSetNameField)
+    override val stickerSetName: StickerSetName? = null,
+    @SerialName(maskPositionField)
+    override val maskPosition: MaskPosition? = null,
+    @SerialName(fileSizeField)
+    override val fileSize: Long? = null,
+) : Sticker

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

@@ -7,6 +7,7 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.*
 import dev.inmo.tgbotapi.types.dice.Dice
 import dev.inmo.tgbotapi.types.files.*
+import dev.inmo.tgbotapi.types.files.sticker.Sticker
 import dev.inmo.tgbotapi.types.games.RawGame
 import dev.inmo.tgbotapi.types.location.Location
 import dev.inmo.tgbotapi.types.message.ChatEvents.*

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

@@ -1,3 +1,41 @@
 package dev.inmo.tgbotapi.types.message.content.abstracts
 
-interface MessageContent: ResendableContent
+import dev.inmo.tgbotapi.types.message.content.*
+import dev.inmo.tgbotapi.types.message.content.media.*
+import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
+import dev.inmo.tgbotapi.utils.RiskFeature
+import kotlinx.serialization.modules.*
+
+interface MessageContent: ResendableContent {
+    companion object {
+        @RiskFeature("This serialization module can be changed in near releases")
+        fun serializationModule(
+            additionalBuilder: PolymorphicModuleBuilder<MessageContent>.() -> Unit = {}
+        ) = SerializersModule {
+            polymorphic(MessageContent::class) {
+
+                subclass(ContactContent::class)
+                subclass(VenueContent::class)
+                subclass(PollContent::class)
+                subclass(DiceContent::class)
+                subclass(TextContent::class)
+
+                subclass(LiveLocationContent::class)
+                subclass(StaticLocationContent::class)
+
+                subclass(PhotoContent::class)
+                subclass(VideoContent::class)
+                subclass(AudioContent::class)
+                subclass(DocumentContent::class)
+
+                subclass(VoiceContent::class)
+                subclass(VideoNoteContent::class)
+                subclass(AnimationContent::class)
+                subclass(StickerContent::class)
+                subclass(InvoiceContent::class)
+
+                additionalBuilder()
+            }
+        }
+    }
+}

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

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.InputMedia.InputMediaDocument
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.files.Sticker
+import dev.inmo.tgbotapi.types.files.sticker.Sticker
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
 import kotlinx.serialization.Serializable

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/PollOption.kt

@@ -12,6 +12,13 @@ import kotlinx.serialization.encoding.Encoder
 sealed class PollOption {
     abstract val text: String
     abstract val votes: Int
+
+    companion object {
+        fun simple(
+            text: String,
+            votes: Int = 0
+        ) = SimplePollOption(text, votes)
+    }
 }
 
 @Serializable
@@ -19,7 +26,7 @@ data class SimplePollOption (
     @SerialName(textField)
     override val text: String,
     @SerialName(votesCountField)
-    override val votes: Int
+    override val votes: Int = 0
 ) : PollOption()
 
 @RiskFeature

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/stickers/StickerSet.kt

@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.types.stickers
 
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.files.PhotoSize
-import dev.inmo.tgbotapi.types.files.Sticker
+import dev.inmo.tgbotapi.types.files.sticker.Sticker
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -16,6 +16,8 @@ data class StickerSet(
     val stickers: List<Sticker>,
     @SerialName(isAnimatedField)
     val isAnimated: Boolean = false,
+    @SerialName(isVideoField)
+    val isVideo: Boolean = false,
     @SerialName(containsMasksField)
     val containsMasks: Boolean = false,
     @SerialName(thumbField)

tgbotapi.extensions.api/build.gradle

@@ -17,8 +17,9 @@ plugins {
 
 project.version = "$library_version"
 project.group = "$library_group"
+project.description = "DEPRECATED, use tgbotapi.api"
 
-apply from: "publish.gradle"
+apply from: "../publish.gradle"
 
 repositories {
     mavenLocal()

tgbotapi.extensions.api/mpp_publish_template.kpsb

@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API API Extensions for tgbotapi.api","description":"","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-behaviour_builder-fsm","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}

tgbotapi.extensions.api/publish.gradle

@@ -1,69 +0,0 @@
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "${project.name}"
-            name = "Telegram Bot API API Extensions for tgbotapi.api"
-            url = "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-behaviour_builder-fsm"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
-                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
-                    }
-                
-            }
-        }
-        repositories {
-            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
-                maven {
-                    name = "GithubPackages"
-                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
-                    credentials {
-                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
-                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
-                    }
-                }
-            }
-            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                maven {
-                    name = "sonatype"
-                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                    credentials {
-                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                    }
-                }
-            }
-        }
-    }
-}
-
-signing {
-    useGpgCmd()
-    sign publishing.publications
-}

tgbotapi.extensions.behaviour_builder.fsm/build.gradle

@@ -17,8 +17,9 @@ plugins {
 
 project.version = "$library_version"
 project.group = "$library_group"
+project.description = "DEPRECATED, use tgbotapi.behaviour_builder.fsm"
 
-apply from: "publish.gradle"
+apply from: "../publish.gradle"
 
 repositories {
     mavenLocal()

tgbotapi.extensions.behaviour_builder.fsm/mpp_publish_template.kpsb

@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API BehaviourBuilder FSM Extensions for tgbotapi.behaviour_builder.fsm","description":"","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-behaviour_builder-fsm","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}

tgbotapi.extensions.behaviour_builder.fsm/publish.gradle

@@ -1,69 +0,0 @@
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "${project.name}"
-            name = "Telegram Bot API BehaviourBuilder FSM Extensions for tgbotapi.behaviour_builder.fsm"
-            url = "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-behaviour_builder-fsm"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
-                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
-                    }
-                
-            }
-        }
-        repositories {
-            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
-                maven {
-                    name = "GithubPackages"
-                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
-                    credentials {
-                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
-                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
-                    }
-                }
-            }
-            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                maven {
-                    name = "sonatype"
-                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                    credentials {
-                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                    }
-                }
-            }
-        }
-    }
-}
-
-signing {
-    useGpgCmd()
-    sign publishing.publications
-}

tgbotapi.extensions.behaviour_builder/build.gradle

@@ -17,8 +17,9 @@ plugins {
 
 project.version = "$library_version"
 project.group = "$library_group"
+project.description = "DEPRECATED, use tgbotapi.behaviour_builder"
 
-apply from: "publish.gradle"
+apply from: "../publish.gradle"
 
 repositories {
     mavenLocal()

tgbotapi.extensions.behaviour_builder/mpp_publish_template.kpsb

@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API BehaviourBuilder Extensions for tgbotapi.behaviour_builder","description":"","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-behaviour_builder-fsm","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}

tgbotapi.extensions.behaviour_builder/publish.gradle

@@ -1,69 +0,0 @@
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "${project.name}"
-            name = "Telegram Bot API BehaviourBuilder Extensions for tgbotapi.behaviour_builder"
-            url = "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-behaviour_builder-fsm"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
-                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
-                    }
-                
-            }
-        }
-        repositories {
-            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
-                maven {
-                    name = "GithubPackages"
-                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
-                    credentials {
-                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
-                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
-                    }
-                }
-            }
-            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                maven {
-                    name = "sonatype"
-                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                    credentials {
-                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                    }
-                }
-            }
-        }
-    }
-}
-
-signing {
-    useGpgCmd()
-    sign publishing.publications
-}

tgbotapi.extensions.utils/build.gradle

@@ -17,8 +17,9 @@ plugins {
 
 project.version = "$library_version"
 project.group = "$library_group"
+project.description = "DEPRECATED, use tgbotapi.utils"
 
-apply from: "publish.gradle"
+apply from: "../publish.gradle"
 
 repositories {
     mavenLocal()

tgbotapi.extensions.utils/mpp_publish_template.kpsb

@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Utils Extensions for tgbotapi.utils","description":"","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-behaviour_builder-fsm","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}

tgbotapi.extensions.utils/publish.gradle

@@ -1,69 +0,0 @@
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "${project.name}"
-            name = "Telegram Bot API Utils Extensions for tgbotapi.utils"
-            url = "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-behaviour_builder-fsm"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
-                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
-                    }
-                
-            }
-        }
-        repositories {
-            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
-                maven {
-                    name = "GithubPackages"
-                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
-                    credentials {
-                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
-                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
-                    }
-                }
-            }
-            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                maven {
-                    name = "sonatype"
-                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                    credentials {
-                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                    }
-                }
-            }
-        }
-    }
-}
-
-signing {
-    useGpgCmd()
-    sign publishing.publications
-}

tgbotapi.utils/build.gradle

@@ -17,8 +17,9 @@ plugins {
 
 project.version = "$library_version"
 project.group = "$library_group"
+project.description = "Additional extensions for core part of tgbotapi"
 
-apply from: "publish.gradle"
+apply from: "../publish.gradle"
 
 repositories {
     mavenLocal()

tgbotapi.utils/publish.gradle

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

tgbotapi.utils/publish.kpsb

@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Utility Extensions","description":"Util extensions for more useful work with updates and other things","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-utils","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt

@@ -31,6 +31,8 @@ import dev.inmo.tgbotapi.types.chat.abstracts.extended.*
 import dev.inmo.tgbotapi.types.dice.*
 import dev.inmo.tgbotapi.types.files.*
 import dev.inmo.tgbotapi.types.files.abstracts.*
+import dev.inmo.tgbotapi.types.files.sticker.*
+import dev.inmo.tgbotapi.types.files.sticker.Sticker
 import dev.inmo.tgbotapi.types.location.*
 import dev.inmo.tgbotapi.types.message.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.*
@@ -2309,6 +2311,33 @@ inline fun TelegramMediaFile.asSticker(): Sticker? = this as? Sticker
 @PreviewFeature
 inline fun TelegramMediaFile.requireSticker(): Sticker = this as Sticker
 
+@PreviewFeature
+inline fun <T> TelegramMediaFile.whenSimpleSticker(block: (SimpleSticker) -> T) = asSimpleSticker() ?.let(block)
+
+@PreviewFeature
+inline fun TelegramMediaFile.asSimpleSticker(): SimpleSticker? = this as? SimpleSticker
+
+@PreviewFeature
+inline fun TelegramMediaFile.requireSimpleSticker(): SimpleSticker = this as SimpleSticker
+
+@PreviewFeature
+inline fun <T> TelegramMediaFile.whenAnimatedSticker(block: (AnimatedSticker) -> T) = asAnimatedSticker() ?.let(block)
+
+@PreviewFeature
+inline fun TelegramMediaFile.asAnimatedSticker(): AnimatedSticker? = this as? AnimatedSticker
+
+@PreviewFeature
+inline fun TelegramMediaFile.requireAnimatedSticker(): AnimatedSticker = this as AnimatedSticker
+
+@PreviewFeature
+inline fun <T> TelegramMediaFile.whenVideoSticker(block: (VideoSticker) -> T) = asVideoSticker() ?.let(block)
+
+@PreviewFeature
+inline fun TelegramMediaFile.asVideoSticker(): VideoSticker? = this as? VideoSticker
+
+@PreviewFeature
+inline fun TelegramMediaFile.requireVideoSticker(): VideoSticker = this as VideoSticker
+
 @PreviewFeature
 inline fun <T> TelegramMediaFile.whenVideoFile(block: (VideoFile) -> T) = asVideoFile() ?.let(block)
 

tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/raw/Message.kt

@@ -8,6 +8,7 @@ import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 import dev.inmo.tgbotapi.types.dice.Dice
 import dev.inmo.tgbotapi.types.files.*
+import dev.inmo.tgbotapi.types.files.sticker.Sticker
 import dev.inmo.tgbotapi.types.games.Game
 import dev.inmo.tgbotapi.types.location.Location
 import dev.inmo.tgbotapi.types.message.ChatEvents.*

tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/raw/Sticker.kt

@@ -0,0 +1,21 @@
+package dev.inmo.tgbotapi.extensions.utils.extensions.raw
+
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.files.sticker.*
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+
+inline val Sticker.file_id: FileId
+    get() = fileId
+inline val Sticker.file_unique_id: FileUniqueId
+    get() = fileUniqueId
+inline val Sticker.is_animated: Boolean
+    get() = this is AnimatedSticker
+inline val Sticker.is_video: Boolean
+    get() = this is VideoSticker
+inline val Sticker.set_name: StickerSetName?
+    get() = stickerSetName
+inline val Sticker.mask_position: MaskPosition?
+    get() = maskPosition
+inline val Sticker.file_size: Long?
+    get() = fileSize

tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt

@@ -9,9 +9,15 @@ import dev.inmo.tgbotapi.types.message.abstracts.Message
 private const val internalLinkBeginning = "https://t.me"
 
 fun makeUsernameLink(username: String) = "$internalLinkBeginning/$username"
+fun makeUsernameDeepLinkPrefix(username: String) = "${makeUsernameLink(username)}?start="
 inline val Username.link
-    get() = makeUsernameLink(username)
+    get() = makeUsernameLink(usernameWithoutAt)
+inline val Username.deepLinkPrefix
+    get() = makeUsernameDeepLinkPrefix(usernameWithoutAt)
 inline fun makeLink(username: Username) = username.link
+inline fun makeTelegramDeepLink(username: String, startParameter: String) = "${makeUsernameDeepLinkPrefix(username)}$startParameter"
+inline fun makeDeepLink(username: Username, startParameter: String) = "${username.deepLinkPrefix}$startParameter"
+inline fun makeTelegramDeepLink(username: Username, startParameter: String) = makeDeepLink(username, startParameter)
 
 fun makeLinkToMessage(
     username: String,

tgbotapi/build.gradle

@@ -17,8 +17,9 @@ plugins {
 
 project.version = "$library_version"
 project.group = "$library_group"
+project.description = "Full collection of all built-in tgbotapi tools"
 
-apply from: "publish.gradle"
+apply from: "../publish.gradle"
 
 repositories {
     mavenLocal()

tgbotapi/publish.kpsb

@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API","description":"This project just include all subproject of TelegramBotAPI","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}