add spoilered in telegrammedia

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/SpoilerableData.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.abstracts
+
+interface SpoilerableData {
+    val spoilered: Boolean
+}

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

@@ -1,5 +1,5 @@
 package dev.inmo.tgbotapi.requests.send.abstracts
 
-interface OptionallyWithSpoilerRequest {
+import dev.inmo.tgbotapi.abstracts.SpoilerableData
-    val spoilered: Boolean
+
-}
+interface OptionallyWithSpoilerRequest : SpoilerableData

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

@@ -34,11 +34,13 @@ data class VideoFile(
 @Suppress("NOTHING_TO_INLINE")
 inline fun VideoFile.toTelegramMediaVideo(
     text: String? = null,
-    parseMode: ParseMode? = null
+    parseMode: ParseMode? = null,
+    spoilered: Boolean = false
 ) = TelegramMediaVideo(
     fileId,
     text,
     parseMode,
+    spoilered,
     width,
     height,
     duration,
@@ -47,10 +49,12 @@ inline fun VideoFile.toTelegramMediaVideo(
 
 @Suppress("NOTHING_TO_INLINE")
 inline fun VideoFile.toTelegramMediaVideo(
-    textSources: TextSourcesList
+    textSources: TextSourcesList,
+    spoilered: Boolean = false
 ) = TelegramMediaVideo(
     fileId,
     textSources,
+    spoilered,
     width,
     height,
     duration,

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

@@ -20,4 +20,4 @@ sealed interface AudioMediaGroupMemberTelegramMedia: MediaGroupMemberTelegramMed
 sealed interface DocumentMediaGroupMemberTelegramMedia: MediaGroupMemberTelegramMedia
 
 @Serializable(MediaGroupMemberTelegramMediaSerializer::class)
-sealed interface VisualMediaGroupMemberTelegramMedia : MediaGroupMemberTelegramMedia
+sealed interface VisualMediaGroupMemberTelegramMedia : MediaGroupMemberTelegramMedia, SpoilerableTelegramMedia

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

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.types.media
+
+import dev.inmo.tgbotapi.abstracts.SpoilerableData
+
+sealed interface SpoilerableTelegramMedia : TelegramMedia, SpoilerableData

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

@@ -18,15 +18,17 @@ fun TelegramMediaAnimation(
     file: InputFile,
     text: String? = null,
     parseMode: ParseMode? = null,
+    spoilered: Boolean = false,
     width: Int? = null,
     height: Int? = null,
     duration: Long? = null,
     thumb: InputFile? = null
-) = TelegramMediaAnimation(file, text, parseMode, null, width, height, duration, thumb)
+) = TelegramMediaAnimation(file, text, parseMode, null, spoilered, width, height, duration, thumb)
 
 fun TelegramMediaAnimation(
     file: InputFile,
     entities: TextSourcesList,
+    spoilered: Boolean = false,
     width: Int? = null,
     height: Int? = null,
     duration: Long? = null,
@@ -36,6 +38,7 @@ fun TelegramMediaAnimation(
     entities.makeString(),
     null,
     entities.toRawMessageEntities(),
+    spoilered,
     width,
     height,
     duration,
@@ -51,11 +54,13 @@ data class TelegramMediaAnimation internal constructor(
     override val parseMode: ParseMode? = null,
     @SerialName(captionEntitiesField)
     private val rawEntities: List<RawMessageEntity>? = null,
+    @SerialName(hasSpoilerField)
+    override val spoilered: Boolean = false,
     override val width: Int? = null,
     override val height: Int? = null,
     override val duration: Long? = null,
     override val thumb: InputFile? = null
-) : TelegramMedia, SizedTelegramMedia, DuratedTelegramMedia, ThumbedTelegramMedia, TextedOutput {
+) : TelegramMedia, SizedTelegramMedia, DuratedTelegramMedia, ThumbedTelegramMedia, TextedOutput, SpoilerableTelegramMedia {
     override val type: String = "animation"
     override val textSources: TextSourcesList? by lazy {
         rawEntities ?.asTextSources(text ?: return@lazy null)

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

@@ -18,13 +18,15 @@ internal const val photoTelegramMediaType = "photo"
 fun TelegramMediaPhoto(
     file: InputFile,
     text: String? = null,
-    parseMode: ParseMode? = null
+    parseMode: ParseMode? = null,
-) = TelegramMediaPhoto(file, text, parseMode, null)
+    spoilered: Boolean = false
+) = TelegramMediaPhoto(file, text, parseMode, null, spoilered)
 
 fun TelegramMediaPhoto(
     file: InputFile,
-    entities: TextSourcesList
+    entities: TextSourcesList,
-) = TelegramMediaPhoto(file, entities.makeString(), null, entities.toRawMessageEntities())
+    spoilered: Boolean = false
+) = TelegramMediaPhoto(file, entities.makeString(), null, entities.toRawMessageEntities(), spoilered)
 
 @Serializable
 data class TelegramMediaPhoto internal constructor(
@@ -34,7 +36,9 @@ data class TelegramMediaPhoto internal constructor(
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null,
     @SerialName(captionEntitiesField)
-    private val rawEntities: List<RawMessageEntity>? = null
+    private val rawEntities: List<RawMessageEntity>? = null,
+    @SerialName(hasSpoilerField)
+    override val spoilered: Boolean = false,
 ) : TelegramMedia, VisualMediaGroupMemberTelegramMedia {
     override val type: String = photoTelegramMediaType
     override val textSources: TextSourcesList? by lazy {
@@ -50,16 +54,20 @@ data class TelegramMediaPhoto internal constructor(
 
 fun PhotoSize.toTelegramMediaPhoto(
     text: String? = null,
-    parseMode: ParseMode? = null
+    parseMode: ParseMode? = null,
+    spoilered: Boolean = false
 ): TelegramMediaPhoto = TelegramMediaPhoto(
     fileId,
     text,
-    parseMode
+    parseMode,
+    spoilered
 )
 
 fun PhotoSize.toTelegramMediaPhoto(
-    textSources: TextSourcesList = emptyList()
+    textSources: TextSourcesList = emptyList(),
+    spoilered: Boolean = false
 ): TelegramMediaPhoto = TelegramMediaPhoto(
     fileId,
-    textSources
+    textSources,
+    spoilered
 )

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

@@ -18,20 +18,22 @@ fun TelegramMediaVideo(
     file: InputFile,
     text: String? = null,
     parseMode: ParseMode? = null,
+    spoilered: Boolean = false,
     width: Int? = null,
     height: Int? = null,
     duration: Long? = null,
     thumb: InputFile? = null
-) = TelegramMediaVideo(file, text, parseMode, null, width, height, duration, thumb)
+) = TelegramMediaVideo(file, text, parseMode, null, spoilered, width, height, duration, thumb)
 
 fun TelegramMediaVideo(
     file: InputFile,
     entities: TextSourcesList,
+    spoilered: Boolean = false,
     width: Int? = null,
     height: Int? = null,
     duration: Long? = null,
     thumb: InputFile? = null
-) = TelegramMediaVideo(file, entities.makeString(), null, entities.toRawMessageEntities(), width, height, duration, thumb)
+) = TelegramMediaVideo(file, entities.makeString(), null, entities.toRawMessageEntities(), spoilered, width, height, duration, thumb)
 
 @Serializable
 data class TelegramMediaVideo internal constructor (
@@ -42,6 +44,8 @@ data class TelegramMediaVideo internal constructor (
     override val parseMode: ParseMode? = null,
     @SerialName(captionEntitiesField)
     private val rawEntities: List<RawMessageEntity>? = null,
+    @SerialName(hasSpoilerField)
+    override val spoilered: Boolean = false,
     override val width: Int? = null,
     override val height: Int? = null,
     override val duration: Long? = null,

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

@@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.types.message.content
 
+import dev.inmo.tgbotapi.abstracts.SpoilerableData
 import dev.inmo.tgbotapi.utils.internal.ClassCastsIncluded
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.ChatIdentifier
@@ -119,9 +120,7 @@ sealed interface MediaContent: MessageContent {
     fun asTelegramMedia(): TelegramMedia
 }
 
-sealed interface SpoilerableMediaContent : MediaContent {
+sealed interface SpoilerableMediaContent : MediaContent, SpoilerableData
-    val spoilered: Boolean
-}
 
 @ClassCastsIncluded
 sealed interface ResendableContent {

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

@@ -34,6 +34,7 @@ data class AnimationContent(
         media.fileId,
         media.thumb ?.fileId,
         textSources,
+        spoilered,
         media.duration,
         media.width,
         media.height,
@@ -48,6 +49,7 @@ data class AnimationContent(
     override fun asTelegramMedia(): TelegramMediaAnimation = TelegramMediaAnimation(
         media.fileId,
         textSources,
+        spoilered,
         media.width,
         media.height,
         media.duration,

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

@@ -34,6 +34,7 @@ data class PhotoContent(
         chatId,
         media.fileId,
         textSources,
+        spoilered,
         messageThreadId,
         disableNotification,
         protectContent,
@@ -44,5 +45,5 @@ data class PhotoContent(
 
     override fun toMediaGroupMemberTelegramMedia(): TelegramMediaPhoto = asTelegramMedia()
 
-    override fun asTelegramMedia(): TelegramMediaPhoto = media.toTelegramMediaPhoto(textSources)
+    override fun asTelegramMedia(): TelegramMediaPhoto = media.toTelegramMediaPhoto(textSources, spoilered)
 }