support of Telegram Bot API 5.7

2025-09-16 13:49:26 +00:00 · 2022-02-01 16:23:26 +06:00
parent eee9fe439f
commit 0c2fe6bce7
20 changed files with 430 additions and 37 deletions
--- 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(pngStickerField 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/CreateNewVideoStickerSet.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/CreateNewVideoStickerSet.kt
@@ -0,0 +1,53 @@
+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 CreateNewVideoStickerSet(
+    userId: UserId,
+    name: String,
+    sticker: InputFile,
+    emojis: String,
+    containsMasks: Boolean? = null,
+    maskPosition: MaskPosition? = null
+): Request<Boolean> {
+    val data = CreateNewVideoStickerSet(userId, name, emojis, sticker as? FileId, containsMasks, maskPosition)
+    return when (sticker) {
+        is MultipartFile -> CommonMultipartFileRequest(
+            data,
+            mapOf(pngStickerField to sticker)
+        )
+        is FileId -> data
+    }
+}
+
+@Serializable
+data class CreateNewVideoStickerSet 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(containsMasksField)
+    val containsMasks: Boolean? = 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 = "createNewStickerSet"
+}
--- 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)