InsanusMokrassar
/
tgbotapi
mirror of https://github.com/InsanusMokrassar/TelegramBotAPI.git
1
0
Fork 0
Code Releases Activity

rename thumb field

This commit is contained in:
InsanusMokrassar 2023-03-10 12:01:08 +06:00
parent d8c659f866
commit e30361ad1e
30 changed files with 97 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAnimation.kt
View File

@ -73,7 +73,7 @@ suspend fun TelegramBot.sendAnimation(
allowSendingWithoutReply: Boolean? = null,
replyMarkup: KeyboardMarkup? = null
) = sendAnimation(
chatId, animation.fileId, animation.thumb ?.fileId, text, parseMode, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
chatId, animation.fileId, animation.thumbnail ?.fileId, text, parseMode, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
)
/**
@ -177,7 +177,7 @@ suspend fun TelegramBot.sendAnimation(
allowSendingWithoutReply: Boolean? = null,
replyMarkup: KeyboardMarkup? = null
) = sendAnimation(
chatId, animation.fileId, animation.thumb ?.fileId, entities, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
chatId, animation.fileId, animation.thumbnail ?.fileId, entities, spoilered, duration, width, height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
)
/**

4
tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAudio.kt
View File

@ -88,7 +88,7 @@ suspend fun TelegramBot.sendAudio(
replyToMessageId: MessageId? = null,
allowSendingWithoutReply: Boolean? = null,
replyMarkup: KeyboardMarkup? = null
) = sendAudio(chatId, audio.fileId, audio.thumb ?.fileId, text, parseMode, audio.duration, audio.performer, title, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
) = sendAudio(chatId, audio.fileId, audio.thumbnail ?.fileId, text, parseMode, audio.duration, audio.performer, title, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
/**
* @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@ -180,7 +180,7 @@ suspend inline fun TelegramBot.sendAudio(
replyToMessageId: MessageId? = null,
allowSendingWithoutReply: Boolean? = null,
replyMarkup: KeyboardMarkup? = null
) = sendAudio(chatId, audio.fileId, audio.thumb ?.fileId, entities, audio.duration, audio.performer, title, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
) = sendAudio(chatId, audio.fileId, audio.thumbnail ?.fileId, entities, audio.duration, audio.performer, title, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
/**
* @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or

4
tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendDocument.kt
View File

@ -83,7 +83,7 @@ suspend fun TelegramBot.sendDocument(
replyMarkup: KeyboardMarkup? = null,
disableContentTypeDetection: Boolean? = null
) = sendDocument(
chatId, document.fileId, document.thumb ?.fileId, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection
chatId, document.fileId, document.thumbnail ?.fileId, text, parseMode, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection
)
/**
@ -170,7 +170,7 @@ suspend inline fun TelegramBot.sendDocument(
replyMarkup: KeyboardMarkup? = null,
disableContentTypeDetection: Boolean? = null
) = sendDocument(
chatId, document.fileId, document.thumb ?.fileId, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection
chatId, document.fileId, document.thumbnail ?.fileId, entities, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup, disableContentTypeDetection
)
/**

4
tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideo.kt
View File

@ -70,7 +70,7 @@ suspend fun TelegramBot.sendVideo(
replyToMessageId: MessageId? = null,
allowSendingWithoutReply: Boolean? = null,
replyMarkup: KeyboardMarkup? = null
) = sendVideo(chatId, video.fileId, video.thumb ?.fileId, text, parseMode, spoilered, video.duration, video.width, video.height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
) = sendVideo(chatId, video.fileId, video.thumbnail ?.fileId, text, parseMode, spoilered, video.duration, video.width, video.height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
/**
* @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@ -167,7 +167,7 @@ suspend inline fun TelegramBot.sendVideo(
replyToMessageId: MessageId? = null,
allowSendingWithoutReply: Boolean? = null,
replyMarkup: KeyboardMarkup? = null
) = sendVideo(chatId, video.fileId, video.thumb ?.fileId, entities, spoilered, video.duration, video.width, video.height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
) = sendVideo(chatId, video.fileId, video.thumbnail ?.fileId, entities, spoilered, video.duration, video.width, video.height, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
/**
* @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or

2
tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideoNote.kt
View File

@ -57,7 +57,7 @@ suspend fun TelegramBot.sendVideoNote(
allowSendingWithoutReply: Boolean? = null,
replyMarkup: KeyboardMarkup? = null
) = sendVideoNote(
chatId, videoNote.fileId, videoNote.thumb ?.fileId, videoNote.duration, videoNote.width, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
chatId, videoNote.fileId, videoNote.thumbnail ?.fileId, videoNote.duration, videoNote.width, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
)
/**

6
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/ThumbedSendMessageRequest.kt
View File

@ -1,5 +1,9 @@
package dev.inmo.tgbotapi.requests.send.abstracts
interface ThumbedSendMessageRequest<T: Any>: SendMessageRequest<T> {
val thumbnail: String?
@Deprecated("Renamed in telegram bot api", ReplaceWith("thumbnail"))
val thumb: String?
}
get() = thumbnail
}

8
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAnimation.kt
View File

@ -129,8 +129,8 @@ data class SendAnimationData internal constructor(
override val chatId: ChatIdentifier,
@SerialName(animationField)
val animation: String? = null,
@SerialName(thumbField)
override val thumb: String? = null,
@SerialName(thumbnailField)
override val thumbnail: String? = null,
@SerialName(captionField)
override val text: String? = null,
@SerialName(parseModeField)
@ -187,8 +187,8 @@ data class SendAnimationData internal constructor(
data class SendAnimationFiles internal constructor(
val animation: MultipartFile? = null,
val thumb: MultipartFile? = null
val thumbnail: MultipartFile? = null
) : Files by mapOfNotNull(
animationField to animation,
thumbField to thumb
thumbnailField to thumbnail
)

8
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAudio.kt
View File

@ -126,8 +126,8 @@ data class SendAudioData internal constructor(
override val chatId: ChatIdentifier,
@SerialName(audioField)
val audio: String? = null,
@SerialName(thumbField)
override val thumb: String? = null,
@SerialName(thumbnailField)
override val thumbnail: String? = null,
@SerialName(captionField)
override val text: String? = null,
@SerialName(parseModeField)
@ -182,8 +182,8 @@ data class SendAudioData internal constructor(
data class SendAudioFiles internal constructor(
val audio: MultipartFile? = null,
val thumb: MultipartFile? = null
val thumbnail: MultipartFile? = null
) : Files by mapOfNotNull(
audioField to audio,
thumbField to thumb
thumbnailField to thumbnail
)

8
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendDocument.kt
View File

@ -144,8 +144,8 @@ data class SendDocumentData internal constructor(
override val chatId: ChatIdentifier,
@SerialName(documentField)
val document: String? = null,
@SerialName(thumbField)
override val thumb: String? = null,
@SerialName(thumbnailField)
override val thumbnail: String? = null,
@SerialName(captionField)
override val text: String? = null,
@SerialName(parseModeField)
@ -193,8 +193,8 @@ data class SendDocumentData internal constructor(
data class SendDocumentFiles internal constructor(
val document: MultipartFile? = null,
val thumb: MultipartFile? = null
val thumbnail: MultipartFile? = null
) : Files by mapOfNotNull(
documentField to document,
thumbField to thumb
thumbnailField to thumbnail
)

8
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideo.kt
View File

@ -133,8 +133,8 @@ data class SendVideoData internal constructor(
override val chatId: ChatIdentifier,
@SerialName(videoField)
val video: String? = null,
@SerialName(thumbField)
override val thumb: String? = null,
@SerialName(thumbnailField)
override val thumbnail: String? = null,
@SerialName(captionField)
override val text: String? = null,
@SerialName(parseModeField)
@ -193,8 +193,8 @@ data class SendVideoData internal constructor(
data class SendVideoFiles internal constructor(
val video: MultipartFile? = null,
val thumb: MultipartFile? = null
val thumbnail: MultipartFile? = null
) : Files by mapOfNotNull(
videoField to video,
thumbField to thumb
thumbnailField to thumbnail
)

8
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideoNote.kt
View File

@ -62,8 +62,8 @@ data class SendVideoNoteData internal constructor(
override val chatId: ChatIdentifier,
@SerialName(videoNoteField)
val videoNote: String? = null,
@SerialName(thumbField)
override val thumb: String? = null,
@SerialName(thumbnailField)
override val thumbnail: String? = null,
@SerialName(durationField)
override val duration: Long? = null,
@SerialName(lengthField)
@ -99,8 +99,8 @@ data class SendVideoNoteData internal constructor(
data class SendVideoNoteFiles internal constructor(
val videoNote: MultipartFile? = null,
val thumb: MultipartFile? = null
val thumbnail: MultipartFile? = null
) : Files by mapOfNotNull(
videoNoteField to videoNote,
thumbField to thumb
thumbnailField to thumbnail
)

4
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVoice.kt
View File

@ -156,8 +156,8 @@ data class SendVoiceData internal constructor(
data class SendVoiceFiles internal constructor(
val voice: MultipartFile? = null,
val thumb: MultipartFile? = null
val thumbnail: MultipartFile? = null
) : Files by mapOfNotNull(
voiceField to voice,
thumbField to thumb
thumbnailField to thumbnail
)

7
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/SetStickerSetThumb.kt
View File

@ -3,18 +3,17 @@ 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.OwnerStickerSetAction
import dev.inmo.tgbotapi.requests.stickers.abstracts.StickerSetAction
import dev.inmo.tgbotapi.types.*
import kotlinx.serialization.*
fun SetStickerSetThumb(
userId: UserId,
stickerSetName: String,
thumb: MultipartFile
thumbnail: MultipartFile
): Request<Boolean> {
return CommonMultipartFileRequest(
SetStickerSetThumb(userId, stickerSetName),
mapOf(thumbField to thumb)
mapOf(thumbnailField to thumbnail)
)
}
@ -24,7 +23,7 @@ data class SetStickerSetThumb (
override val userId: UserId,
@SerialName(nameField)
override val name: StickerSetName,
@SerialName(thumbField)
@SerialName(thumbnailField)
val thumb: FileId? = null
) : OwnerStickerSetAction {
override val requestSerializer: SerializationStrategy<*>

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

@ -387,6 +387,8 @@ const val explanationField = "explanation"
const val idField = "id"
const val pollIdField = "poll_id"
const val textField = "text"
const val thumbnailField = "thumbnail"
@Deprecated("Renamed (in telegram bot api)", ReplaceWith("thumbnailField", "dev.inmo.tgbotapi.types.thumbnailField"))
const val thumbField = "thumb"
const val emojiField = "emoji"
const val emojisField = "emojis"

2
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/AnimationFile.kt
View File

@ -16,7 +16,7 @@ data class AnimationFile(
override val width: Int,
override val height: Int,
override val duration: Long? = null,
override val thumb: PhotoSize? = null,
override val thumbnail: PhotoSize? = null,
@SerialName(fileNameField)
override val fileName: String? = null,
@SerialName(mimeTypeField)

4
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/AudioFile.kt
View File

@ -25,8 +25,8 @@ data class AudioFile(
override val mimeType: MimeType? = null,
@SerialName(fileSizeField)
override val fileSize: Long? = null,
@SerialName(thumbField)
override val thumb: PhotoSize? = null
@SerialName(thumbnailField)
override val thumbnail: PhotoSize? = null
) : TelegramMediaFile, CustomNamedMediaFile, MimedMediaFile, ThumbedMediaFile, PlayableMediaFile, TitledMediaFile,
Performerable

4
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/DocumentFile.kt
View File

@ -15,7 +15,7 @@ data class DocumentFile(
override val fileUniqueId: FileUniqueId,
@SerialName(fileSizeField)
override val fileSize: Long? = null,
override val thumb: PhotoSize? = null,
override val thumbnail: PhotoSize? = null,
@SerialName(mimeTypeField)
override val mimeType: MimeType? = null,
@SerialName(fileNameField)
@ -30,7 +30,7 @@ inline fun TelegramMediaFile.asDocumentFile() = if (this is DocumentFile) {
fileId,
fileUniqueId,
fileSize,
(this as? ThumbedMediaFile) ?.thumb,
(this as? ThumbedMediaFile) ?.thumbnail,
(this as? MimedMediaFile) ?.mimeType,
(this as? CustomNamedMediaFile) ?.fileName
)

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

@ -202,8 +202,8 @@ data class RegularSimpleSticker(
override val width: Int,
@SerialName(heightField)
override val height: Int,
@SerialName(thumbField)
override val thumb: PhotoSize? = null,
@SerialName(thumbnailField)
override val thumbnail: PhotoSize? = null,
@SerialName(emojiField)
override val emoji: String? = null,
@SerialName(stickerSetNameField)
@ -225,8 +225,8 @@ data class RegularAnimatedSticker(
override val width: Int,
@SerialName(heightField)
override val height: Int,
@SerialName(thumbField)
override val thumb: PhotoSize? = null,
@SerialName(thumbnailField)
override val thumbnail: PhotoSize? = null,
@SerialName(emojiField)
override val emoji: String? = null,
@SerialName(stickerSetNameField)
@ -246,8 +246,8 @@ data class RegularVideoSticker(
override val width: Int,
@SerialName(heightField)
override val height: Int,
@SerialName(thumbField)
override val thumb: PhotoSize? = null,
@SerialName(thumbnailField)
override val thumbnail: PhotoSize? = null,
@SerialName(emojiField)
override val emoji: String? = null,
@SerialName(stickerSetNameField)
@ -275,8 +275,8 @@ data class MaskSimpleSticker(
override val height: Int,
@SerialName(maskPositionField)
override val maskPosition: MaskPosition,
@SerialName(thumbField)
override val thumb: PhotoSize? = null,
@SerialName(thumbnailField)
override val thumbnail: PhotoSize? = null,
@SerialName(emojiField)
override val emoji: String? = null,
@SerialName(stickerSetNameField)
@ -296,8 +296,8 @@ data class MaskAnimatedSticker(
override val height: Int,
@SerialName(maskPositionField)
override val maskPosition: MaskPosition,
@SerialName(thumbField)
override val thumb: PhotoSize? = null,
@SerialName(thumbnailField)
override val thumbnail: PhotoSize? = null,
@SerialName(emojiField)
override val emoji: String? = null,
@SerialName(stickerSetNameField)
@ -317,8 +317,8 @@ data class MaskVideoSticker(
override val height: Int,
@SerialName(maskPositionField)
override val maskPosition: MaskPosition,
@SerialName(thumbField)
override val thumb: PhotoSize? = null,
@SerialName(thumbnailField)
override val thumbnail: PhotoSize? = null,
@SerialName(emojiField)
override val emoji: String? = null,
@SerialName(stickerSetNameField)
@ -344,8 +344,8 @@ data class CustomEmojiSimpleSticker(
override val height: Int,
@SerialName(customEmojiIdField)
override val customEmojiId: CustomEmojiId,
@SerialName(thumbField)
override val thumb: PhotoSize? = null,
@SerialName(thumbnailField)
override val thumbnail: PhotoSize? = null,
@SerialName(emojiField)
override val emoji: String? = null,
@SerialName(stickerSetNameField)
@ -365,8 +365,8 @@ data class CustomEmojiAnimatedSticker(
override val height: Int,
@SerialName(customEmojiIdField)
override val customEmojiId: CustomEmojiId,
@SerialName(thumbField)
override val thumb: PhotoSize? = null,
@SerialName(thumbnailField)
override val thumbnail: PhotoSize? = null,
@SerialName(emojiField)
override val emoji: String? = null,
@SerialName(stickerSetNameField)
@ -386,8 +386,8 @@ data class CustomEmojiVideoSticker(
override val height: Int,
@SerialName(customEmojiIdField)
override val customEmojiId: CustomEmojiId,
@SerialName(thumbField)
override val thumb: PhotoSize? = null,
@SerialName(thumbnailField)
override val thumbnail: PhotoSize? = null,
@SerialName(emojiField)
override val emoji: String? = null,
@SerialName(stickerSetNameField)
@ -406,8 +406,8 @@ data class UnknownSticker(
override val width: Int,
@SerialName(heightField)
override val height: Int,
@SerialName(thumbField)
override val thumb: PhotoSize? = null,
@SerialName(thumbnailField)
override val thumbnail: PhotoSize? = null,
@SerialName(emojiField)
override val emoji: String? = null,
@SerialName(stickerSetNameField)

7
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/ThumbedMediaFile.kt
View File

@ -1,8 +1,9 @@
package dev.inmo.tgbotapi.types.files
import dev.inmo.tgbotapi.types.files.PhotoSize
import dev.inmo.tgbotapi.types.files.TelegramMediaFile
sealed interface ThumbedMediaFile : TelegramMediaFile {
val thumbnail: PhotoSize?
@Deprecated("Renamed (in telegram bot api)", ReplaceWith("thumbnail"))
val thumb: PhotoSize?
get() = thumbnail
}

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

@ -21,8 +21,8 @@ data class VideoFile(
override val height: Int,
@SerialName(durationField)
override val duration: Long? = null,
@SerialName(thumbField)
override val thumb: PhotoSize? = null,
@SerialName(thumbnailField)
override val thumbnail: PhotoSize? = null,
@SerialName(fileNameField)
override val fileName: String? = null,
@SerialName(mimeTypeField)
@ -44,7 +44,7 @@ inline fun VideoFile.toTelegramMediaVideo(
width,
height,
duration,
thumb ?.fileId
thumbnail ?.fileId
)
@Suppress("NOTHING_TO_INLINE")
@ -58,5 +58,5 @@ inline fun VideoFile.toTelegramMediaVideo(
width,
height,
duration,
thumb ?.fileId
thumbnail ?.fileId
)

2
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoNoteFile.kt
View File

@ -15,7 +15,7 @@ data class VideoNoteFile(
@SerialName("length")
override val width: Int,
override val duration: Long? = null,
override val thumb: PhotoSize? = null,
override val thumbnail: PhotoSize? = null,
@SerialName(fileSizeField)
override val fileSize: Long? = null
) : TelegramMediaFile, ThumbedMediaFile, PlayableMediaFile, SizedMediaFile {

4
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/media/TelegramMediaAudio.kt
View File

@ -77,7 +77,7 @@ fun AudioFile.toTelegramMediaAudio(
duration,
performer,
title,
thumb ?.fileId
thumbnail ?.fileId
)
fun AudioFile.toTelegramMediaAudio(
@ -89,5 +89,5 @@ fun AudioFile.toTelegramMediaAudio(
duration,
performer,
title,
thumb ?.fileId
thumbnail ?.fileId
)

4
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/media/TelegramMediaDocument.kt
View File

@ -78,7 +78,7 @@ fun DocumentFile.toTelegramMediaDocument(
fileId,
text,
parseMode,
thumb ?.fileId
thumbnail ?.fileId
)
fun DocumentFile.toTelegramMediaDocument(
@ -86,5 +86,5 @@ fun DocumentFile.toTelegramMediaDocument(
) = TelegramMediaDocument(
fileId,
textSources,
thumb ?.fileId
thumbnail ?.fileId
)

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

@ -32,7 +32,7 @@ data class AnimationContent(
): Request<ContentMessage<AnimationContent>> = SendAnimation(
chatId,
media.fileId,
media.thumb ?.fileId,
media.thumbnail ?.fileId,
textSources,
spoilered,
media.duration,
@ -53,6 +53,6 @@ data class AnimationContent(
media.width,
media.height,
media.duration,
media.thumb ?.fileId
media.thumbnail ?.fileId
)
}

2
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/AudioContent.kt
View File

@ -30,7 +30,7 @@ data class AudioContent(
): Request<ContentMessage<AudioContent>> = SendAudio(
chatId,
media.fileId,
media.thumb ?.fileId,
media.thumbnail ?.fileId,
textSources,
media.duration,
media.performer,

2
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/DocumentContent.kt
View File

@ -32,7 +32,7 @@ data class DocumentContent(
): Request<ContentMessage<DocumentContent>> = SendDocument(
chatId,
media.fileId,
media.thumb ?.fileId,
media.thumbnail ?.fileId,
textSources,
messageThreadId,
disableNotification,

2
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/StickerContent.kt
View File

@ -37,6 +37,6 @@ data class StickerContent(
override fun asTelegramMedia(): TelegramMediaDocument = TelegramMediaDocument(
media.fileId,
null,
thumb = media.thumb ?.fileId
thumb = media.thumbnail ?.fileId
)
}

2
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VideoContent.kt
View File

@ -31,7 +31,7 @@ data class VideoContent(
): Request<ContentMessage<VideoContent>> = SendVideo(
chatId,
media.fileId,
media.thumb ?.fileId,
media.thumbnail ?.fileId,
textSources,
spoilered,
media.duration,

4
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VideoNoteContent.kt
View File

@ -26,7 +26,7 @@ data class VideoNoteContent(
): Request<ContentMessage<VideoNoteContent>> = SendVideoNote(
chatId,
media.fileId,
media.thumb ?.fileId,
media.thumbnail ?.fileId,
media.duration,
media.width,
messageThreadId,
@ -42,6 +42,6 @@ data class VideoNoteContent(
width = media.width,
height = media.height,
duration = media.duration,
thumb = media.thumb ?.fileId
thumb = media.thumbnail ?.fileId
)
}

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

@ -7,7 +7,6 @@ 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
@ -146,7 +145,7 @@ data class RegularSimpleStickerSet(
override val title: String,
@SerialName(stickersField)
override val stickers: List<RegularSimpleSticker>,
@SerialName(thumbField)
@SerialName(thumbnailField)
override val thumb: PhotoSize? = null
) : RegularStickerSet {
@SerialName(stickerTypeField)
@ -162,7 +161,7 @@ data class RegularAnimatedStickerSet(
override val title: String,
@SerialName(stickersField)
override val stickers: List<RegularAnimatedSticker>,
@SerialName(thumbField)
@SerialName(thumbnailField)
override val thumb: PhotoSize? = null
) : RegularStickerSet, AnimatedStickerSet {
@SerialName(stickerTypeField)
@ -178,7 +177,7 @@ data class RegularVideoStickerSet(
override val title: String,
@SerialName(stickersField)
override val stickers: List<RegularVideoSticker>,
@SerialName(thumbField)
@SerialName(thumbnailField)
override val thumb: PhotoSize? = null
) : RegularStickerSet, VideoStickerSet {
@SerialName(stickerTypeField)
@ -194,7 +193,7 @@ data class MaskSimpleStickerSet(
override val title: String,
@SerialName(stickersField)
override val stickers: List<MaskSimpleSticker>,
@SerialName(thumbField)
@SerialName(thumbnailField)
override val thumb: PhotoSize? = null
) : MaskStickerSet {
@SerialName(stickerTypeField)
@ -210,7 +209,7 @@ data class MaskAnimatedStickerSet(
override val title: String,
@SerialName(stickersField)
override val stickers: List<MaskAnimatedSticker>,
@SerialName(thumbField)
@SerialName(thumbnailField)
override val thumb: PhotoSize? = null
) : MaskStickerSet, AnimatedStickerSet {
@SerialName(stickerTypeField)
@ -226,7 +225,7 @@ data class MaskVideoStickerSet(
override val title: String,
@SerialName(stickersField)
override val stickers: List<MaskVideoSticker>,
@SerialName(thumbField)
@SerialName(thumbnailField)
override val thumb: PhotoSize? = null
) : MaskStickerSet, VideoStickerSet {
@SerialName(stickerTypeField)
@ -242,7 +241,7 @@ data class CustomEmojiSimpleStickerSet(
override val title: String,
@SerialName(stickersField)
override val stickers: List<CustomEmojiSimpleSticker>,
@SerialName(thumbField)
@SerialName(thumbnailField)
override val thumb: PhotoSize? = null
) : CustomEmojiStickerSet {
@SerialName(stickerTypeField)
@ -258,7 +257,7 @@ data class CustomEmojiAnimatedStickerSet(
override val title: String,
@SerialName(stickersField)
override val stickers: List<CustomEmojiAnimatedSticker>,
@SerialName(thumbField)
@SerialName(thumbnailField)
override val thumb: PhotoSize? = null
) : CustomEmojiStickerSet, AnimatedStickerSet {
@SerialName(stickerTypeField)
@ -274,7 +273,7 @@ data class CustomEmojiVideoStickerSet(
override val title: String,
@SerialName(stickersField)
override val stickers: List<CustomEmojiVideoSticker>,
@SerialName(thumbField)
@SerialName(thumbnailField)
override val thumb: PhotoSize? = null
) : CustomEmojiStickerSet, VideoStickerSet {
@SerialName(stickerTypeField)
@ -292,7 +291,7 @@ data class UnknownStickerSet(
override val stickers: List<Sticker>,
@SerialName(stickerTypeField)
override val stickerType: StickerType,
@SerialName(thumbField)
@SerialName(thumbnailField)
override val thumb: PhotoSize? = null,
val raw: JsonElement
) : CustomEmojiStickerSet, VideoStickerSet