Add media_group_id to Message

Author: pengrad

library/src/main/java/com/pengrad/telegrambot/model/Message.java

@@ -21,6 +21,7 @@ public class Message implements Serializable {
     private Integer forward_date;
     private Message reply_to_message;
     private Integer edit_date;
+    private String media_group_id;
     private String author_signature;
     private String text;
     private MessageEntity[] entities;
@@ -33,12 +34,12 @@ public class Message implements Serializable {
     private Video video;
     private Voice voice;
     private VideoNote video_note;
-    private User[] new_chat_members;
     private String caption;
     private Contact contact;
     private Location location;
     private Venue venue;
     private User new_chat_member;
+    private User[] new_chat_members;
     private User left_chat_member;
     private String new_chat_title;
     private PhotoSize[] new_chat_photo;
@@ -96,6 +97,10 @@ public Integer editDate() {
         return edit_date;
     }
 
+    public String mediaGroupId() {
+        return media_group_id;
+    }
+
     public String authorSignature() {
         return author_signature;
     }
@@ -144,10 +149,6 @@ public VideoNote videoNote() {
         return video_note;
     }
 
-    public User[] newChatMembers() {
-        return new_chat_members;
-    }
-
     public String caption() {
         return caption;
     }
@@ -172,6 +173,10 @@ public User newChatMember() {
         return new_chat_member;
     }
 
+    public User[] newChatMembers() {
+        return new_chat_members;
+    }
+
     public User leftChatMember() {
         return left_chat_member;
     }
@@ -242,6 +247,8 @@ public boolean equals(Object o) {
         if (reply_to_message != null ? !reply_to_message.equals(message.reply_to_message) : message.reply_to_message != null)
             return false;
         if (edit_date != null ? !edit_date.equals(message.edit_date) : message.edit_date != null) return false;
+        if (media_group_id != null ? !media_group_id.equals(message.media_group_id) : message.media_group_id != null)
+            return false;
         if (author_signature != null ? !author_signature.equals(message.author_signature) : message.author_signature != null)
             return false;
         if (text != null ? !text.equals(message.text) : message.text != null) return false;
@@ -258,14 +265,14 @@ public boolean equals(Object o) {
         if (video != null ? !video.equals(message.video) : message.video != null) return false;
         if (voice != null ? !voice.equals(message.voice) : message.voice != null) return false;
         if (video_note != null ? !video_note.equals(message.video_note) : message.video_note != null) return false;
-        // Probably incorrect - comparing Object[] arrays with Arrays.equals
-        if (!Arrays.equals(new_chat_members, message.new_chat_members)) return false;
         if (caption != null ? !caption.equals(message.caption) : message.caption != null) return false;
         if (contact != null ? !contact.equals(message.contact) : message.contact != null) return false;
         if (location != null ? !location.equals(message.location) : message.location != null) return false;
         if (venue != null ? !venue.equals(message.venue) : message.venue != null) return false;
         if (new_chat_member != null ? !new_chat_member.equals(message.new_chat_member) : message.new_chat_member != null)
             return false;
+        // Probably incorrect - comparing Object[] arrays with Arrays.equals
+        if (!Arrays.equals(new_chat_members, message.new_chat_members)) return false;
         if (left_chat_member != null ? !left_chat_member.equals(message.left_chat_member) : message.left_chat_member != null)
             return false;
         if (new_chat_title != null ? !new_chat_title.equals(message.new_chat_title) : message.new_chat_title != null)
@@ -309,6 +316,7 @@ public String toString() {
                 ", forward_date=" + forward_date +
                 ", reply_to_message=" + reply_to_message +
                 ", edit_date=" + edit_date +
+                ", media_group_id='" + media_group_id + '\'' +
                 ", author_signature='" + author_signature + '\'' +
                 ", text='" + text + '\'' +
                 ", entities=" + Arrays.toString(entities) +
@@ -321,12 +329,12 @@ public String toString() {
                 ", video=" + video +
                 ", voice=" + voice +
                 ", video_note=" + video_note +
-                ", new_chat_members=" + Arrays.toString(new_chat_members) +
                 ", caption='" + caption + '\'' +
                 ", contact=" + contact +
                 ", location=" + location +
                 ", venue=" + venue +
                 ", new_chat_member=" + new_chat_member +
+                ", new_chat_members=" + Arrays.toString(new_chat_members) +
                 ", left_chat_member=" + left_chat_member +
                 ", new_chat_title='" + new_chat_title + '\'' +
                 ", new_chat_photo=" + Arrays.toString(new_chat_photo) +

library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java

@@ -1037,8 +1037,13 @@ public void sendMediaGroup() {
         ));
         assertTrue(response.isOk());
         assertEquals(6, response.messages().length);
+
+        String mediaGroupId = response.messages()[0].mediaGroupId();
+        assertNotNull(mediaGroupId);
+
         int messagesWithCaption = 0;
         for (Message message : response.messages()) {
+            assertEquals(mediaGroupId, message.mediaGroupId());
             if (message.caption() != null) {
                 assertEquals(MessageEntity.Type.bold, message.captionEntities()[0].type());
                 messagesWithCaption++;