diff --git a/CHANGELOG.md b/CHANGELOG.md index 6216320bc9..660e7d2e5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ * `UserForwardedMessage` -> `UserForwardInfo` * `ForwardedFromChannelMessage` -> `ForwardFromChannelInfo` * `PossiblyForwardedMessage#forwarded` field now renamed to `forwardInfo` +* All serializers in library now are `internal`. **If you have used some of them or I have marked as internal by a +mistake - don't hesitate to say this.** * Most part of requests have changed return type. They are listed below:
diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/InputFile.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/InputFile.kt index 2c5fbd5b94..6c2f6c96d9 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/InputFile.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/InputFile.kt @@ -21,7 +21,7 @@ data class FileId( fun String.toInputFile(): InputFile = FileId(this) @Serializer(InputFile::class) -object InputFileSerializer : KSerializer { +internal object InputFileSerializer : KSerializer { override val descriptor: SerialDescriptor = StringDescriptor.withName(FileId::class.toString()) override fun serialize(encoder: Encoder, obj: InputFile) = encoder.encodeString(obj.fileId) override fun deserialize(decoder: Decoder): FileId = FileId(decoder.decodeString()) diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerInlineQuery.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerInlineQuery.kt index 21fba40d00..e31f1c7eb0 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerInlineQuery.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerInlineQuery.kt @@ -51,6 +51,6 @@ fun InlineQuery.createAnswer( switchPmParameter ) -object InlineQueryAnswersResultsSerializer: KSerializer> by ArrayListSerializer( +internal object InlineQueryAnswersResultsSerializer: KSerializer> by ArrayListSerializer( InlineQueryResultSerializer ) diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerShippingQuery.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerShippingQuery.kt index 2439e5f41d..70d9d8626c 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerShippingQuery.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerShippingQuery.kt @@ -21,7 +21,7 @@ data class AnswerShippingQueryOk( get() = serializer() } -object ShippingOptionsSerializer : KSerializer> by ArrayListSerializer( +internal object ShippingOptionsSerializer : KSerializer> by ArrayListSerializer( ShippingOption.serializer() ) diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/GetGameHighScores.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/GetGameHighScores.kt index 216cdfb9e9..0915454e86 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/GetGameHighScores.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/GetGameHighScores.kt @@ -15,4 +15,4 @@ interface GetGameHighScores : SimpleRequest> { get() = GameHighScoresSerializer } -object GameHighScoresSerializer : KSerializer> by ArrayListSerializer(GameHighScore.serializer()) +internal object GameHighScoresSerializer : KSerializer> by ArrayListSerializer(GameHighScore.serializer()) diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt index 8b346927a9..e114e76a84 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt @@ -6,7 +6,7 @@ import kotlinx.serialization.* import kotlinx.serialization.internal.StringDescriptor @Serializer(InlineQueryResult::class) -object InlineQueryResultSerializer : KSerializer { +internal object InlineQueryResultSerializer : KSerializer { override val descriptor: SerialDescriptor = StringDescriptor.withName(InlineQueryResult::class.toString()) override fun serialize(encoder: Encoder, obj: InlineQueryResult) { when(obj) { diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContentSerializer.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContentSerializer.kt index 77c3fa4486..4eca591bbe 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContentSerializer.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContentSerializer.kt @@ -6,7 +6,7 @@ import kotlinx.serialization.* import kotlinx.serialization.internal.StringDescriptor @Serializer(InputMessageContent::class) -object InputMessageContentSerializer : KSerializer { +internal object InputMessageContentSerializer : KSerializer { override val descriptor: SerialDescriptor = StringDescriptor.withName(InputMessageContent::class.toString()) override fun serialize(encoder: Encoder, obj: InputMessageContent) { when (obj) { diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaSerializer.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaSerializer.kt index fd4b3f9266..72b2f98050 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaSerializer.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaSerializer.kt @@ -4,7 +4,7 @@ import kotlinx.serialization.* import kotlinx.serialization.internal.StringDescriptor @Serializer(InputMedia::class) -object InputMediaSerializer : KSerializer { +internal object InputMediaSerializer : KSerializer { override val descriptor: SerialDescriptor = StringDescriptor.withName(InputMedia::class.toString()) override fun serialize(encoder: Encoder, obj: InputMedia) { when (obj) { diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt index c435bef316..235b67e871 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt @@ -4,7 +4,7 @@ import kotlinx.serialization.* import kotlinx.serialization.internal.StringDescriptor @Serializer(MediaGroupMemberInputMedia::class) -object MediaGroupMemberInputMediaSerializer : KSerializer { +internal object MediaGroupMemberInputMediaSerializer : KSerializer { override val descriptor: SerialDescriptor = StringDescriptor.withName(MediaGroupMemberInputMedia::class.toString()) override fun serialize(encoder: Encoder, obj: MediaGroupMemberInputMedia) { when (obj) { diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/UserProfilePhotos.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/UserProfilePhotos.kt index f54cf75787..133610427b 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/UserProfilePhotos.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/UserProfilePhotos.kt @@ -13,6 +13,6 @@ data class UserProfilePhotos ( val photos: List ) -object UserProfilePhotosPhotosSerializer : KSerializer> by ArrayListSerializer( +internal object UserProfilePhotosPhotosSerializer : KSerializer> by ArrayListSerializer( PhotoSerializer ) diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt index 4ee83f2133..317cc57901 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt @@ -5,7 +5,7 @@ import kotlinx.serialization.* import kotlinx.serialization.internal.StringDescriptor import kotlinx.serialization.json.* -object InlineKeyboardButtonSerializer : KSerializer { +internal object InlineKeyboardButtonSerializer : KSerializer { override val descriptor: SerialDescriptor = StringDescriptor.withName("com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardButtons.InlineKeyboardButton") private fun resolveSerializer(json: JsonObject): KSerializer { diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardMarkupSerializer.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardMarkupSerializer.kt index d69825d7c2..aabea0e57a 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardMarkupSerializer.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardMarkupSerializer.kt @@ -4,7 +4,7 @@ import kotlinx.serialization.* import kotlinx.serialization.internal.StringDescriptor @Serializer(KeyboardMarkup::class) -object KeyboardMarkupSerializer : KSerializer { +internal object KeyboardMarkupSerializer : KSerializer { override val descriptor: SerialDescriptor = StringDescriptor.withName(KeyboardMarkup::class.toString()) override fun serialize(encoder: Encoder, obj: KeyboardMarkup) { when(obj) { diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/ChatSerializers.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/ChatSerializers.kt index 9745f0c2da..9eaa11d5d8 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/ChatSerializers.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/ChatSerializers.kt @@ -11,7 +11,7 @@ import kotlinx.serialization.json.JsonObjectSerializer private val formatter = Json.nonstrict -object PreviewChatSerializer : KSerializer { +internal object PreviewChatSerializer : KSerializer { override val descriptor: SerialDescriptor = StringDescriptor.withName("PreviewChatSerializer") override fun deserialize(decoder: Decoder): Chat { @@ -39,7 +39,7 @@ object PreviewChatSerializer : KSerializer { } } -object ExtendedChatSerializer : KSerializer { +internal object ExtendedChatSerializer : KSerializer { override val descriptor: SerialDescriptor = StringDescriptor.withName("PreviewChatSerializer") override fun deserialize(decoder: Decoder): ExtendedChat { diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/PhotoSize.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/PhotoSize.kt index d42e3c4669..93f9ae1b39 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/PhotoSize.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/PhotoSize.kt @@ -13,7 +13,7 @@ fun Photo.biggest(): PhotoSize? = maxBy { it.resolution } -object PhotoSerializer : KSerializer by ArrayListSerializer( +internal object PhotoSerializer : KSerializer by ArrayListSerializer( PhotoSize.serializer() ) diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/ShippingOption.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/ShippingOption.kt index ebdc3866db..95ab6ca48a 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/ShippingOption.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/ShippingOption.kt @@ -16,6 +16,6 @@ data class ShippingOption( override val prices: List ) : Priced -object LabeledPricesSerializer : KSerializer> by ArrayListSerializer( +internal object LabeledPricesSerializer : KSerializer> by ArrayListSerializer( LabeledPrice.serializer() ) diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/polls/PollOption.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/polls/PollOption.kt index c29522aeb5..63eef91eaf 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/polls/PollOption.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/polls/PollOption.kt @@ -19,7 +19,7 @@ data class AnonymousPollOption ( override val votes: Int ) : PollOption() -object PollOptionSerializer : KSerializer { +internal object PollOptionSerializer : KSerializer { override val descriptor: SerialDescriptor = StringDescriptor.withName(PollOption::class.simpleName ?: "PollOption") override fun deserialize(decoder: Decoder): PollOption = AnonymousPollOption.serializer().deserialize(