From ed341c231d8120fc154641134d40efd54f612cdd Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Thu, 21 Mar 2019 08:45:51 +0800
Subject: [PATCH] media group messages refactoring

---
 CHANGELOG.md                                                  | 2 ++
 .../{MediaGroupMessage.kt => ChannelMediaGroupMessage.kt}     | 4 ++--
 .../TelegramBotAPI/types/message/CommonMediaGroupMessage.kt   | 2 +-
 .../TelegramBotAPI/types/message/RawMessage.kt                | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/{MediaGroupMessage.kt => ChannelMediaGroupMessage.kt} (93%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ce86e956b..65bdf0e602 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,8 @@ for receivers.
 
 * Refactor, optimizing and cleaning of code
 * Removed deprecated method `T#toJsonWithoutNulls()`
+* Renamed instances of `MediaGroupMessage`s and refactored their interfaces. `ChannelMediaGroupMessage`
+will not contain `user` field (but `CommonMediaGroupMessage` will have)
 
 ## 0.11.0
 
diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/MediaGroupMessage.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMediaGroupMessage.kt
similarity index 93%
rename from src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/MediaGroupMessage.kt
rename to src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMediaGroupMessage.kt
index 904cda00d6..1a10980a8c 100644
--- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/MediaGroupMessage.kt
+++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMediaGroupMessage.kt
@@ -8,7 +8,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Messag
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent
 import org.joda.time.DateTime
 
-data class MediaGroupMessage(
+data class ChannelMediaGroupMessage(
     override val messageId: MessageIdentifier,
     override val chat: Chat,
     override val date: DateTime,
@@ -17,4 +17,4 @@ data class MediaGroupMessage(
     override val editDate: DateTime?,
     override val forwarded: ForwardedMessage?,
     override val replyTo: Message?
-) : Message, MediaGroupMessage
+) : MediaGroupMessage
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 878dc837c4..9e4e35a3ac 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
@@ -17,4 +17,4 @@ data class CommonMediaGroupMessage(
     override val editDate: DateTime?,
     override val forwarded: ForwardedMessage?,
     override val replyTo: Message?
-) : Message, MediaGroupMessage, FromUserMessage
+) : MediaGroupMessage, FromUserMessage
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 d42a935102..19b54b86d2 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
@@ -210,7 +210,7 @@ data class RawMessage(
             content ->
             media_group_id ?.let {
                 when (from) {
-                    null -> MediaGroupMessage(
+                    null -> ChannelMediaGroupMessage(
                         messageId,
                         chat,
                         date.asDate,