From e774f958af71c63e3516051b7751d410312476fd Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 17 Feb 2019 14:29:17 +0800 Subject: [PATCH] MediaGroupMessage is CommonMessage --- CHANGELOG.md | 1 + .../types/message/CommonMediaGroupMessage.kt | 5 ++++- .../TelegramBotAPI/types/message/MediaGroupMessage.kt | 5 ++++- .../TelegramBotAPI/types/message/RawMessage.kt | 10 ++++++++-- .../types/message/abstracts/MediaGroupMessage.kt | 3 +-- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b58183d6e0..f045e67d05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ * Change algorithm of `executeUnsafe`: now it use loop instead of recursive calling * Add additional `startGettingUpdates` with better management of received updates for media groups +* Now `MediaGroupMessage` is `CommonMessage` with `MediaGroupContent` content ## 0.9.0 diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMediaGroupMessage.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMediaGroupMessage.kt index d91fc439a3..878dc837c4 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMediaGroupMessage.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMediaGroupMessage.kt @@ -13,5 +13,8 @@ data class CommonMediaGroupMessage( override val chat: Chat, override val date: DateTime, override val mediaGroupId: MediaGroupIdentifier, - override val content: MediaGroupContent + override val content: MediaGroupContent, + override val editDate: DateTime?, + override val forwarded: ForwardedMessage?, + override val replyTo: Message? ) : Message, MediaGroupMessage, FromUserMessage diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/MediaGroupMessage.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/MediaGroupMessage.kt index b20c3eaf3a..904cda00d6 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/MediaGroupMessage.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/MediaGroupMessage.kt @@ -13,5 +13,8 @@ data class MediaGroupMessage( override val chat: Chat, override val date: DateTime, override val mediaGroupId: MediaGroupIdentifier, - override val content: MediaGroupContent + override val content: MediaGroupContent, + override val editDate: DateTime?, + override val forwarded: ForwardedMessage?, + override val replyTo: Message? ) : Message, MediaGroupMessage 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 1806b20c20..d42a935102 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 @@ -219,7 +219,10 @@ data class RawMessage( is PhotoContent -> content is VideoContent -> content else -> throw IllegalStateException("Unsupported content for media group") - } + }, + edit_date ?.asDate, + forwarded, + reply_to_message ?.asMessage ) else -> CommonMediaGroupMessage( messageId, @@ -231,7 +234,10 @@ data class RawMessage( is PhotoContent -> content is VideoContent -> content else -> throw IllegalStateException("Unsupported content for media group") - } + }, + edit_date ?.asDate, + forwarded, + reply_to_message ?.asMessage ) } } ?: when (chat) { diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/MediaGroupMessage.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/MediaGroupMessage.kt index 29b53ca253..56d76252b1 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/MediaGroupMessage.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/MediaGroupMessage.kt @@ -3,7 +3,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts import com.github.insanusmokrassar.TelegramBotAPI.types.MediaGroupIdentifier import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent -interface MediaGroupMessage : Message { +interface MediaGroupMessage : CommonMessage { val mediaGroupId: MediaGroupIdentifier - val content: MediaGroupContent }