From 7d7fb4efbc5f2fff6513346c27b1675795939241 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 13 Apr 2019 10:16:40 +0800 Subject: [PATCH] one more optional remove commit --- .../TelegramBotAPI/types/chat/RawChat.kt | 22 ++--- .../types/message/RawMessage.kt | 80 +++++++++---------- .../TelegramBotAPI/types/update/RawUpdate.kt | 18 ++--- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/RawChat.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/RawChat.kt index f10eaf9957..bf4e56434d 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/RawChat.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/RawChat.kt @@ -8,18 +8,18 @@ import kotlinx.serialization.* data class RawChat( override val id: ChatId, private val type: String, - @Optional private val title: String? = null, - @Optional private val username: Username? = null, - @Optional private val first_name: String? = null, - @Optional private val last_name: String? = null, - @Optional private val all_members_are_administrators: Boolean? = null, - @Optional private val description: String? = null, - @Optional private val invite_link: String? = null, - @Optional private val pinned_message: RawMessage? = null, - @Optional private val sticker_set_name: String? = null, - @Optional private val can_set_sticker_set: Boolean? = null, + private val title: String? = null, + private val username: Username? = null, + private val first_name: String? = null, + private val last_name: String? = null, + private val all_members_are_administrators: Boolean? = null, + private val description: String? = null, + private val invite_link: String? = null, + private val pinned_message: RawMessage? = null, + private val sticker_set_name: String? = null, + private val can_set_sticker_set: Boolean? = null, @SerialName("photo") - @Optional override val chatPhoto: ChatPhoto? = null + override val chatPhoto: ChatPhoto? = null ) : Chat { fun extractChat(): Chat { return when (type) { diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt index 6627cb30b1..a7b1e01d17 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt @@ -31,54 +31,54 @@ data class RawMessage( private val chat: RawChat, @SerialName(fromField) private val from: User? = null, - @Optional private val forward_from: User? = null, - @Optional private val forward_from_chat: RawChat? = null, - @Optional private val forward_from_message_id: MessageIdentifier? = null, - @Optional private val forward_signature: ForwardSignature? = null, - @Optional private val forward_date: TelegramDate? = null, - @Optional private val reply_to_message: RawMessage? = null, - @Optional private val edit_date: TelegramDate? = null, - @Optional private val media_group_id: MediaGroupIdentifier? = null, - @Optional private val author_signature: AuthorSignature? = null, - @Optional private val text: String? = null, + private val forward_from: User? = null, + private val forward_from_chat: RawChat? = null, + private val forward_from_message_id: MessageIdentifier? = null, + private val forward_signature: ForwardSignature? = null, + private val forward_date: TelegramDate? = null, + private val reply_to_message: RawMessage? = null, + private val edit_date: TelegramDate? = null, + private val media_group_id: MediaGroupIdentifier? = null, + private val author_signature: AuthorSignature? = null, + private val text: String? = null, @Serializable(RawMessageEntitiesSerializer::class) - @Optional private val entities: RawMessageEntities? = null, - @Optional private val caption: String? = null, + private val entities: RawMessageEntities? = null, + private val caption: String? = null, @Serializable(RawMessageEntitiesSerializer::class) - @Optional private val caption_entities: RawMessageEntities? = null, - @Optional private val audio: AudioFile? = null, - @Optional private val document: DocumentFile? = null, - @Optional private val animation: AnimationFile? = null, - @Optional private val game: Game? = null, + private val caption_entities: RawMessageEntities? = null, + private val audio: AudioFile? = null, + private val document: DocumentFile? = null, + private val animation: AnimationFile? = null, + private val game: Game? = null, @Serializable(PhotoSerializer::class) - @Optional private val photo: Photo? = null, - @Optional private val sticker: Sticker? = null, - @Optional private val video: VideoFile? = null, - @Optional private val voice: VoiceFile? = null, - @Optional private val video_note: VideoNoteFile? = null, - @Optional private val contact: Contact? = null, - @Optional private val location: Location? = null, - @Optional private val venue: Venue? = null, - @Optional private val new_chat_members: Array? = null, - @Optional private val left_chat_member: User? = null, - @Optional private val new_chat_title: String? = null, + private val photo: Photo? = null, + private val sticker: Sticker? = null, + private val video: VideoFile? = null, + private val voice: VoiceFile? = null, + private val video_note: VideoNoteFile? = null, + private val contact: Contact? = null, + private val location: Location? = null, + private val venue: Venue? = null, + private val new_chat_members: Array? = null, + private val left_chat_member: User? = null, + private val new_chat_title: String? = null, @Serializable(PhotoSerializer::class) - @Optional private val new_chat_photo: Photo? = null, - @Optional private val delete_chat_photo: Boolean = false, - @Optional private val group_chat_created: Boolean = false, - @Optional private val supergroup_chat_created: Boolean = false, - @Optional private val channel_chat_created: Boolean = false, - @Optional private val migrate_to_chat_id: ChatIdentifier? = null, - @Optional private val migrate_from_chat_id: ChatIdentifier? = null, - @Optional private val pinned_message: RawMessage? = null, - @Optional private val invoice: Invoice? = null, - @Optional private val successful_payment: SuccessfulPayment? = null, + private val new_chat_photo: Photo? = null, + private val delete_chat_photo: Boolean = false, + private val group_chat_created: Boolean = false, + private val supergroup_chat_created: Boolean = false, + private val channel_chat_created: Boolean = false, + private val migrate_to_chat_id: ChatIdentifier? = null, + private val migrate_from_chat_id: ChatIdentifier? = null, + private val pinned_message: RawMessage? = null, + private val invoice: Invoice? = null, + private val successful_payment: SuccessfulPayment? = null, // login property - @Optional private val connected_website: String? = null, + private val connected_website: String? = null, // passport property - @Optional private val passport_data: Unit? = null + private val passport_data: Unit? = null ) { @Transient private val content: MessageContent? by lazy { diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/RawUpdate.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/RawUpdate.kt index 4c5e8699e1..097a200071 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/RawUpdate.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/RawUpdate.kt @@ -17,15 +17,15 @@ import kotlinx.serialization.* data class RawUpdate constructor( @SerialName(updateIdField) val updateId: UpdateIdentifier, - @Optional private val message: RawMessage? = null, - @Optional private val edited_message: RawMessage? = null, - @Optional private val channel_post: RawMessage? = null, - @Optional private val edited_channel_post: RawMessage? = null, - @Optional private val inline_query: RawInlineQuery? = null, - @Optional private val chosen_inline_result: RawChosenInlineResult? = null, - @Optional private val callback_query: RawCallbackQuery? = null, - @Optional private val shipping_query: ShippingQuery? = null, - @Optional private val pre_checkout_query: PreCheckoutQuery? = null + private val message: RawMessage? = null, + private val edited_message: RawMessage? = null, + private val channel_post: RawMessage? = null, + private val edited_channel_post: RawMessage? = null, + private val inline_query: RawInlineQuery? = null, + private val chosen_inline_result: RawChosenInlineResult? = null, + private val callback_query: RawCallbackQuery? = null, + private val shipping_query: ShippingQuery? = null, + private val pre_checkout_query: PreCheckoutQuery? = null ) { @Transient val asUpdate: Update by lazy {