rework of stickers and stickersets

2024-12-23 00:57:13 +00:00 · 2022-08-13 11:58:42 +06:00 · 2022-08-13 11:58:42 +06:00 · c72dccc0f9
commit c72dccc0f9
parent 3fc1058491
3 changed files with 388 additions and 75 deletions
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt
@ -59,6 +59,8 @@ sealed interface StickerType {
    object Mask : StickerType { override val type: String = "mask" }
    @Serializable
    object CustomEmoji : StickerType { override val type: String = "custom_emoji" }
+    @Serializable
+    data class Unknown(override val type: String = "custom_emoji") : StickerType

    object Serializer : KSerializer<StickerType> {
        override val descriptor: SerialDescriptor = String.serializer().descriptor
@ -68,7 +70,7 @@ sealed interface StickerType {
                Regular.type -> Regular
                Mask.type -> Regular
                CustomEmoji.type -> Regular
-                else -> error("Unknown type of emoji $type")
+                else -> Unknown(type)
            }
        }

--- 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
@ -4,10 +4,12 @@ import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.stickers.MaskPosition
 import dev.inmo.tgbotapi.utils.RiskFeature
+import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonElement

@Serializable
@RiskFeature("This class is used for serialization/deserialization of Sticker interface")
@ -44,7 +46,8 @@ object StickerSerializer : KSerializer<Sticker> {
    override val descriptor: SerialDescriptor = StickerSurrogate.serializer().descriptor

    override fun deserialize(decoder: Decoder): Sticker {
-        val surrogate = StickerSurrogate.serializer().deserialize(decoder)
+        val json = JsonElement.serializer().deserialize(decoder)
+        val surrogate = nonstrictJsonFormat.decodeFromJsonElement(StickerSurrogate.serializer(), json)

        return when (surrogate.type) {
            StickerType.Regular -> when {
@ -82,19 +85,41 @@ object StickerSerializer : KSerializer<Sticker> {
                    surrogate.file_size
                )
            }
-            StickerType.Mask -> MaskSticker(
-                surrogate.file_id,
-                surrogate.file_unique_id,
-                surrogate.width,
-                surrogate.height,
-                surrogate.mask_position ?: error("For mask stickers field mask_position should be presented"),
-                surrogate.is_animated == true,
-                surrogate.is_video == true,
-                surrogate.thumb,
-                surrogate.emoji,
-                surrogate.set_name,
-                surrogate.file_size
-            )
+            StickerType.Mask -> when {
+                surrogate.is_animated == true -> MaskAnimatedSticker(
+                    surrogate.file_id,
+                    surrogate.file_unique_id,
+                    surrogate.width,
+                    surrogate.height,
+                    surrogate.mask_position ?: error("For mask stickers field mask_position should be presented"),
+                    surrogate.thumb,
+                    surrogate.emoji,
+                    surrogate.set_name,
+                    surrogate.file_size
+                )
+                surrogate.is_video == true -> MaskVideoSticker(
+                    surrogate.file_id,
+                    surrogate.file_unique_id,
+                    surrogate.width,
+                    surrogate.height,
+                    surrogate.mask_position ?: error("For mask stickers field mask_position should be presented"),
+                    surrogate.thumb,
+                    surrogate.emoji,
+                    surrogate.set_name,
+                    surrogate.file_size
+                )
+                else -> MaskSimpleSticker(
+                    surrogate.file_id,
+                    surrogate.file_unique_id,
+                    surrogate.width,
+                    surrogate.height,
+                    surrogate.mask_position ?: error("For mask stickers field mask_position should be presented"),
+                    surrogate.thumb,
+                    surrogate.emoji,
+                    surrogate.set_name,
+                    surrogate.file_size
+                )
+            }
            StickerType.CustomEmoji -> when {
                surrogate.is_animated == true -> CustomEmojiAnimatedSticker(
                    surrogate.file_id,
@ -130,6 +155,17 @@ object StickerSerializer : KSerializer<Sticker> {
                    surrogate.file_size
                )
            }
+            is StickerType.Unknown -> UnknownSticker(
+                surrogate.file_id,
+                surrogate.file_unique_id,
+                surrogate.width,
+                surrogate.height,
+                surrogate.thumb,
+                surrogate.emoji,
+                surrogate.set_name,
+                surrogate.file_size,
+                json
+            )
        }
    }

@ -139,48 +175,22 @@ object StickerSerializer : KSerializer<Sticker> {

 }

-@Serializable(StickerSerializer::class)
+@Serializable
 sealed interface VideoSticker : Sticker {
    override val isVideo: Boolean
        get() = true
 }
-@Serializable(StickerSerializer::class)
+@Serializable
 sealed interface AnimatedSticker : Sticker {
    override val isAnimated: Boolean
        get() = true
 }

-@Serializable(StickerSerializer::class)
+@Serializable
 sealed interface RegularSticker : Sticker {
    val premiumAnimationFile: File?
 }

-@Serializable
-data class MaskSticker(
-    @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(maskPositionField)
-    val maskPosition: MaskPosition,
-    @SerialName(isAnimatedField)
-    override val isAnimated: Boolean,
-    @SerialName(isVideoField)
-    override val isVideo: Boolean,
-    @SerialName(thumbField)
-    override val thumb: PhotoSize? = null,
-    @SerialName(emojiField)
-    override val emoji: String? = null,
-    @SerialName(stickerSetNameField)
-    override val stickerSetName: StickerSetName? = null,
-    @SerialName(fileSizeField)
-    override val fileSize: Long? = null,
-) : Sticker
-
@Serializable
 data class RegularSimpleSticker(
    @SerialName(fileIdField)
@ -247,7 +257,76 @@ data class RegularVideoSticker(
    override val fileSize: Long? = null,
 ) : RegularSticker, VideoSticker

-@Serializable(StickerSerializer::class)
+
+@Serializable
+sealed interface MaskSticker : Sticker {
+    val maskPosition: MaskPosition
+}
+@Serializable
+data class MaskSimpleSticker(
+    @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(maskPositionField)
+    override val maskPosition: MaskPosition,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null,
+    @SerialName(emojiField)
+    override val emoji: String? = null,
+    @SerialName(stickerSetNameField)
+    override val stickerSetName: StickerSetName? = null,
+    @SerialName(fileSizeField)
+    override val fileSize: Long? = null,
+) : MaskSticker
+@Serializable
+data class MaskAnimatedSticker(
+    @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(maskPositionField)
+    override val maskPosition: MaskPosition,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null,
+    @SerialName(emojiField)
+    override val emoji: String? = null,
+    @SerialName(stickerSetNameField)
+    override val stickerSetName: StickerSetName? = null,
+    @SerialName(fileSizeField)
+    override val fileSize: Long? = null,
+) : MaskSticker, AnimatedSticker
+@Serializable
+data class MaskVideoSticker(
+    @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(maskPositionField)
+    override val maskPosition: MaskPosition,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null,
+    @SerialName(emojiField)
+    override val emoji: String? = null,
+    @SerialName(stickerSetNameField)
+    override val stickerSetName: StickerSetName? = null,
+    @SerialName(fileSizeField)
+    override val fileSize: Long? = null,
+) : MaskSticker, VideoSticker
+
+@Serializable
 sealed interface CustomEmojiSticker : Sticker {
    val customEmojiId: CustomEmojiId
 }
@ -315,3 +394,24 @@ data class CustomEmojiVideoSticker(
    @SerialName(fileSizeField)
    override val fileSize: Long? = null,
 ) : CustomEmojiSticker, VideoSticker
+
+@Serializable
+data class UnknownSticker(
+    @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(fileSizeField)
+    override val fileSize: Long? = null,
+    val raw: JsonElement
+) : Sticker
--- 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,86 +2,297 @@ package dev.inmo.tgbotapi.types.stickers

 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.files.*
+import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
 import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonElement

@Serializable
+data class SurrogateStickerSet(
+    val name: String,
+    val title: String,
+    val sticker_type: StickerType,
+    val is_animated: Boolean? = false,
+    val is_video: Boolean? = false,
+    val stickers: List<@Serializable(StickerSerializer::class) Sticker> = emptyList(),
+    val thumb: PhotoSize? = null
+)
+
+@Serializable(StickerSet.Serializer::class)
 sealed interface StickerSet {
-    @SerialName(nameField)
    val name: String
-    @SerialName(titleField)
    val title: String
-    @SerialName(stickerTypeField)
    val stickerType: StickerType
-    @SerialName(stickersField)
    val stickers: List<Sticker>
-    @SerialName(isAnimatedField)
    val isAnimated: Boolean
-    @SerialName(isVideoField)
+        get() = false
    val isVideo: Boolean
-    @SerialName(containsMasksField)
+        get() = false
+    val thumb: PhotoSize?
    @Deprecated("Will be removed soon due to its redundancy")
    val containsMasks: Boolean
        get() = this is MaskStickerSet
-    @SerialName(thumbField)
-    val thumb: PhotoSize?
+
+    object Serializer : KSerializer<StickerSet> {
+        override val descriptor: SerialDescriptor = JsonElement.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): StickerSet {
+            val json = JsonElement.serializer().deserialize(decoder)
+            val surrogate = nonstrictJsonFormat.decodeFromJsonElement(SurrogateStickerSet.serializer(), json)
+
+            return when (surrogate.sticker_type) {
+                StickerType.CustomEmoji -> when {
+                    surrogate.is_animated == true -> CustomEmojiAnimatedStickerSet(
+                        surrogate.name,
+                        surrogate.title,
+                        surrogate.stickers.filterIsInstance<CustomEmojiAnimatedSticker>(),
+                        surrogate.thumb
+                    )
+                    surrogate.is_video == true -> CustomEmojiVideoStickerSet(
+                        surrogate.name,
+                        surrogate.title,
+                        surrogate.stickers.filterIsInstance<CustomEmojiVideoSticker>(),
+                        surrogate.thumb
+                    )
+                    else -> CustomEmojiSimpleStickerSet(
+                        surrogate.name,
+                        surrogate.title,
+                        surrogate.stickers.filterIsInstance<CustomEmojiSimpleSticker>(),
+                        surrogate.thumb
+                    )
+                }
+                StickerType.Mask -> when {
+                    surrogate.is_animated == true -> MaskAnimatedStickerSet(
+                        surrogate.name,
+                        surrogate.title,
+                        surrogate.stickers.filterIsInstance<MaskAnimatedSticker>(),
+                        surrogate.thumb
+                    )
+                    surrogate.is_video == true -> MaskVideoStickerSet(
+                        surrogate.name,
+                        surrogate.title,
+                        surrogate.stickers.filterIsInstance<MaskVideoSticker>(),
+                        surrogate.thumb
+                    )
+                    else -> MaskSimpleStickerSet(
+                        surrogate.name,
+                        surrogate.title,
+                        surrogate.stickers.filterIsInstance<MaskSimpleSticker>(),
+                        surrogate.thumb
+                    )
+                }
+                StickerType.Regular -> when {
+                    surrogate.is_animated == true -> RegularAnimatedStickerSet(
+                        surrogate.name,
+                        surrogate.title,
+                        surrogate.stickers.filterIsInstance<RegularAnimatedSticker>(),
+                        surrogate.thumb
+                    )
+                    surrogate.is_video == true -> RegularVideoStickerSet(
+                        surrogate.name,
+                        surrogate.title,
+                        surrogate.stickers.filterIsInstance<RegularVideoSticker>(),
+                        surrogate.thumb
+                    )
+                    else -> RegularSimpleStickerSet(
+                        surrogate.name,
+                        surrogate.title,
+                        surrogate.stickers.filterIsInstance<RegularSimpleSticker>(),
+                        surrogate.thumb
+                    )
+                }
+                is StickerType.Unknown -> UnknownStickerSet(
+                    surrogate.name,
+                    surrogate.title,
+                    surrogate.stickers.filterIsInstance<RegularSimpleSticker>(),
+                    surrogate.sticker_type,
+                    surrogate.thumb,
+                    json
+                )
+            }
+        }
+
+        override fun serialize(encoder: Encoder, value: StickerSet) {
+            TODO("Not yet implemented")
+        }
+    }
 }

@Serializable
-data class RegularStickerSet(
+sealed interface AnimatedStickerSet : StickerSet {
+    override val isAnimated: Boolean
+        get() = true
+}
+@Serializable
+sealed interface VideoStickerSet : StickerSet {
+    override val isVideo: Boolean
+        get() = true
+}
+@Serializable
+sealed interface RegularStickerSet : StickerSet
+@Serializable
+sealed interface MaskStickerSet : StickerSet
+@Serializable
+sealed interface CustomEmojiStickerSet : StickerSet
+
+@Serializable
+data class RegularSimpleStickerSet(
    @SerialName(nameField)
    override val name: String,
    @SerialName(titleField)
    override val title: String,
    @SerialName(stickersField)
-    override val stickers: List<RegularSticker>,
-    @SerialName(isAnimatedField)
-    override val isAnimated: Boolean = false,
-    @SerialName(isVideoField)
-    override val isVideo: Boolean = false,
+    override val stickers: List<RegularSimpleSticker>,
    @SerialName(thumbField)
    override val thumb: PhotoSize? = null
-) : StickerSet {
+) : RegularStickerSet {
    @SerialName(stickerTypeField)
    @EncodeDefault
    override val stickerType: StickerType = StickerType.Regular
 }

@Serializable
-data class MaskStickerSet(
+data class RegularAnimatedStickerSet(
    @SerialName(nameField)
    override val name: String,
    @SerialName(titleField)
    override val title: String,
    @SerialName(stickersField)
-    override val stickers: List<MaskSticker>,
-    @SerialName(isAnimatedField)
-    override val isAnimated: Boolean = false,
-    @SerialName(isVideoField)
-    override val isVideo: Boolean = false,
+    override val stickers: List<RegularAnimatedSticker>,
    @SerialName(thumbField)
    override val thumb: PhotoSize? = null
-) : StickerSet {
+) : RegularStickerSet, AnimatedStickerSet {
+    @SerialName(stickerTypeField)
+    @EncodeDefault
+    override val stickerType: StickerType = StickerType.Regular
+}
+
+@Serializable
+data class RegularVideoStickerSet(
+    @SerialName(nameField)
+    override val name: String,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(stickersField)
+    override val stickers: List<RegularVideoSticker>,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null
+) : RegularStickerSet, VideoStickerSet {
+    @SerialName(stickerTypeField)
+    @EncodeDefault
+    override val stickerType: StickerType = StickerType.Regular
+}
+
+@Serializable
+data class MaskSimpleStickerSet(
+    @SerialName(nameField)
+    override val name: String,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(stickersField)
+    override val stickers: List<MaskSimpleSticker>,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null
+) : MaskStickerSet {
    @SerialName(stickerTypeField)
    @EncodeDefault
    override val stickerType: StickerType = StickerType.Mask
 }

@Serializable
-data class CustomEmojiStickerSet(
+data class MaskAnimatedStickerSet(
    @SerialName(nameField)
    override val name: String,
    @SerialName(titleField)
    override val title: String,
    @SerialName(stickersField)
-    override val stickers: List<CustomEmojiSticker>,
-    @SerialName(isAnimatedField)
-    override val isAnimated: Boolean = false,
-    @SerialName(isVideoField)
-    override val isVideo: Boolean = false,
+    override val stickers: List<MaskAnimatedSticker>,
    @SerialName(thumbField)
    override val thumb: PhotoSize? = null
-) : StickerSet {
+) : MaskStickerSet, AnimatedStickerSet {
+    @SerialName(stickerTypeField)
+    @EncodeDefault
+    override val stickerType: StickerType = StickerType.Mask
+}
+
+@Serializable
+data class MaskVideoStickerSet(
+    @SerialName(nameField)
+    override val name: String,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(stickersField)
+    override val stickers: List<MaskVideoSticker>,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null
+) : MaskStickerSet, VideoStickerSet {
+    @SerialName(stickerTypeField)
+    @EncodeDefault
+    override val stickerType: StickerType = StickerType.Mask
+}
+
+@Serializable
+data class CustomEmojiSimpleStickerSet(
+    @SerialName(nameField)
+    override val name: String,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(stickersField)
+    override val stickers: List<CustomEmojiSimpleSticker>,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null
+) : CustomEmojiStickerSet {
    @SerialName(stickerTypeField)
    @EncodeDefault
    override val stickerType: StickerType = StickerType.CustomEmoji
 }
+
+@Serializable
+data class CustomEmojiAnimatedStickerSet(
+    @SerialName(nameField)
+    override val name: String,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(stickersField)
+    override val stickers: List<CustomEmojiAnimatedSticker>,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null
+) : CustomEmojiStickerSet, AnimatedStickerSet {
+    @SerialName(stickerTypeField)
+    @EncodeDefault
+    override val stickerType: StickerType = StickerType.CustomEmoji
+}
+
+@Serializable
+data class CustomEmojiVideoStickerSet(
+    @SerialName(nameField)
+    override val name: String,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(stickersField)
+    override val stickers: List<CustomEmojiVideoSticker>,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null
+) : CustomEmojiStickerSet, VideoStickerSet {
+    @SerialName(stickerTypeField)
+    @EncodeDefault
+    override val stickerType: StickerType = StickerType.CustomEmoji
+}
+
+@Serializable
+data class UnknownStickerSet(
+    @SerialName(nameField)
+    override val name: String,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(stickersField)
+    override val stickers: List<Sticker>,
+    @SerialName(stickerTypeField)
+    override val stickerType: StickerType,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null,
+    val raw: JsonElement
+) : CustomEmojiStickerSet, VideoStickerSet