Merge pull request #530 from InsanusMokrassar/0.38.4

0.38.4
2024-11-22 08:13:47 +00:00 · 2022-02-02 10:05:11 +06:00 · 2022-02-02 10:05:11 +06:00 · 514620b2bd
commit 514620b2bd
parent 956f02d26d 054f06e18b
28 changed files with 531 additions and 54 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,16 @@
 # TelegramBotAPI changelog

+## 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`:
--- a/README.md
+++ b/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) |
 |:---:|
--- a/gradle.properties
+++ b/gradle.properties
@ -8,11 +8,11 @@ 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.12
+klock_version=2.4.13
 uuid_version=0.4.0
 ktor_version=1.6.7

-micro_utils_version=0.9.2
+micro_utils_version=0.9.5

 javax_activation_version=1.1.1

@ -20,6 +20,6 @@ javax_activation_version=1.1.1
 dokka_version=1.6.10

 library_group=dev.inmo
-library_version=0.38.3
+library_version=0.38.4

 github_release_plugin_version=2.2.12
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetStickerSet.kt
+++ b/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
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt
@ -16,6 +16,7 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 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
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendSticker.kt
+++ b/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
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddVideoStickerToSet.kt
+++ b/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
+)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewAnimatedStickerSet.kt
+++ b/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
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewStaticStickerSet.kt
+++ b/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
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewVideoStickerSet.kt
+++ b/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
+)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/DeleteStickerFromSet.kt
+++ b/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
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerPositionInSet.kt
+++ b/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,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/AddAnimatedStickerToSet.kt
+++ b/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
    }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/AddVideoStickerToSet.kt
+++ b/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"
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/CreateNewAnimatedStickerSet.kt
+++ b/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")
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/CreateNewStaticStickerSet.kt
+++ b/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")
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/CreateNewVideoStickerSet.kt
+++ b/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"
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/abstracts/CreateStickerSetAction.kt
+++ b/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
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt
+++ b/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"

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/Sticker.kt
+++ b/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
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/sticker/Sticker.kt
+++ b/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
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt
+++ b/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.*
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/StickerContent.kt
+++ b/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
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/stickers/StickerSet.kt
+++ b/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)
--- a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt
+++ b/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)

--- a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/raw/Message.kt
+++ b/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.*
--- a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/raw/Sticker.kt
+++ b/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
--- a/tgbotapi.utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/files/PathedFileAsStream.kt
+++ b/tgbotapi.utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/files/PathedFileAsStream.kt