Added the new fields until_date, can_be_edited, can_change_info, can_post_messages, can_edit_messages, can_delete_messages, can_invite_users, can_restrict_members, can_pin_messages, can_promote_members, can_send_messages, can_send_media_messages, can_send_other_messages and can_add_web_page_previews to the ChatMember object

Author: pengrad

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

@@ -10,12 +10,27 @@ public class ChatMember implements Serializable {
     private final static long serialVersionUID = 0L;
 
     public enum Status {
-        creator, administrator, member, left, kicked;
+        creator, administrator, member, restricted, left, kicked;
     }
 
     private User user;
     private Status status;
 
+    private Integer until_date;
+    private Boolean can_be_edited;
+    private Boolean can_change_info;
+    private Boolean can_post_messages;
+    private Boolean can_edit_messages;
+    private Boolean can_delete_messages;
+    private Boolean can_invite_users;
+    private Boolean can_restrict_members;
+    private Boolean can_pin_messages;
+    private Boolean can_promote_members;
+    private Boolean can_send_messages;
+    private Boolean can_send_media_messages;
+    private Boolean can_send_other_messages;
+    private Boolean can_add_web_page_previews;
+
     public User user() {
         return user;
     }
@@ -24,6 +39,62 @@ public Status status() {
         return status;
     }
 
+    public Integer untilDate() {
+        return until_date;
+    }
+
+    public Boolean canBeEdited() {
+        return can_be_edited;
+    }
+
+    public Boolean canChangeInfo() {
+        return can_change_info;
+    }
+
+    public Boolean canPostMessages() {
+        return can_post_messages;
+    }
+
+    public Boolean canEditMessages() {
+        return can_edit_messages;
+    }
+
+    public Boolean canDeleteMessages() {
+        return can_delete_messages;
+    }
+
+    public Boolean canInviteUsers() {
+        return can_invite_users;
+    }
+
+    public Boolean canRestrictMembers() {
+        return can_restrict_members;
+    }
+
+    public Boolean canPinMessages() {
+        return can_pin_messages;
+    }
+
+    public Boolean canPromoteMembers() {
+        return can_promote_members;
+    }
+
+    public Boolean canSendMessages() {
+        return can_send_messages;
+    }
+
+    public Boolean canSendMediaMessages() {
+        return can_send_media_messages;
+    }
+
+    public Boolean canSendOtherMessages() {
+        return can_send_other_messages;
+    }
+
+    public Boolean canAddWebPagePreviews() {
+        return can_add_web_page_previews;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -32,14 +103,52 @@ public boolean equals(Object o) {
         ChatMember that = (ChatMember) o;
 
         if (user != null ? !user.equals(that.user) : that.user != null) return false;
-        return status == that.status;
-
+        if (status != that.status) return false;
+        if (until_date != null ? !until_date.equals(that.until_date) : that.until_date != null) return false;
+        if (can_be_edited != null ? !can_be_edited.equals(that.can_be_edited) : that.can_be_edited != null) return false;
+        if (can_change_info != null ? !can_change_info.equals(that.can_change_info) : that.can_change_info != null)
+            return false;
+        if (can_post_messages != null ? !can_post_messages.equals(that.can_post_messages) : that.can_post_messages != null)
+            return false;
+        if (can_edit_messages != null ? !can_edit_messages.equals(that.can_edit_messages) : that.can_edit_messages != null)
+            return false;
+        if (can_delete_messages != null ? !can_delete_messages.equals(that.can_delete_messages) : that.can_delete_messages != null)
+            return false;
+        if (can_invite_users != null ? !can_invite_users.equals(that.can_invite_users) : that.can_invite_users != null)
+            return false;
+        if (can_restrict_members != null ? !can_restrict_members.equals(that.can_restrict_members) : that.can_restrict_members != null)
+            return false;
+        if (can_pin_messages != null ? !can_pin_messages.equals(that.can_pin_messages) : that.can_pin_messages != null)
+            return false;
+        if (can_promote_members != null ? !can_promote_members.equals(that.can_promote_members) : that.can_promote_members != null)
+            return false;
+        if (can_send_messages != null ? !can_send_messages.equals(that.can_send_messages) : that.can_send_messages != null)
+            return false;
+        if (can_send_media_messages != null ? !can_send_media_messages.equals(that.can_send_media_messages) : that.can_send_media_messages != null)
+            return false;
+        if (can_send_other_messages != null ? !can_send_other_messages.equals(that.can_send_other_messages) : that.can_send_other_messages != null)
+            return false;
+        return can_add_web_page_previews != null ? can_add_web_page_previews.equals(that.can_add_web_page_previews) : that.can_add_web_page_previews == null;
     }
 
     @Override
     public int hashCode() {
         int result = user != null ? user.hashCode() : 0;
         result = 31 * result + (status != null ? status.hashCode() : 0);
+        result = 31 * result + (until_date != null ? until_date.hashCode() : 0);
+        result = 31 * result + (can_be_edited != null ? can_be_edited.hashCode() : 0);
+        result = 31 * result + (can_change_info != null ? can_change_info.hashCode() : 0);
+        result = 31 * result + (can_post_messages != null ? can_post_messages.hashCode() : 0);
+        result = 31 * result + (can_edit_messages != null ? can_edit_messages.hashCode() : 0);
+        result = 31 * result + (can_delete_messages != null ? can_delete_messages.hashCode() : 0);
+        result = 31 * result + (can_invite_users != null ? can_invite_users.hashCode() : 0);
+        result = 31 * result + (can_restrict_members != null ? can_restrict_members.hashCode() : 0);
+        result = 31 * result + (can_pin_messages != null ? can_pin_messages.hashCode() : 0);
+        result = 31 * result + (can_promote_members != null ? can_promote_members.hashCode() : 0);
+        result = 31 * result + (can_send_messages != null ? can_send_messages.hashCode() : 0);
+        result = 31 * result + (can_send_media_messages != null ? can_send_media_messages.hashCode() : 0);
+        result = 31 * result + (can_send_other_messages != null ? can_send_other_messages.hashCode() : 0);
+        result = 31 * result + (can_add_web_page_previews != null ? can_add_web_page_previews.hashCode() : 0);
         return result;
     }
 
@@ -48,6 +157,20 @@ public String toString() {
         return "ChatMember{" +
                 "user=" + user +
                 ", status=" + status +
+                ", until_date=" + until_date +
+                ", can_be_edited=" + can_be_edited +
+                ", can_change_info=" + can_change_info +
+                ", can_post_messages=" + can_post_messages +
+                ", can_edit_messages=" + can_edit_messages +
+                ", can_delete_messages=" + can_delete_messages +
+                ", can_invite_users=" + can_invite_users +
+                ", can_restrict_members=" + can_restrict_members +
+                ", can_pin_messages=" + can_pin_messages +
+                ", can_promote_members=" + can_promote_members +
+                ", can_send_messages=" + can_send_messages +
+                ", can_send_media_messages=" + can_send_media_messages +
+                ", can_send_other_messages=" + can_send_other_messages +
+                ", can_add_web_page_previews=" + can_add_web_page_previews +
                 '}';
     }
 }

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

@@ -327,7 +327,7 @@ private CallbackQuery getLastCallbackQuery() {
     public void getChat() throws MalformedURLException, URISyntaxException {
         Chat chat = bot.execute(new GetChat(groupId)).chat();
         ChatTest.checkChat(chat);
-        assertEquals(chat.type(), Chat.Type.supergroup);
+        assertEquals(Chat.Type.supergroup, chat.type());
         assertTrue(chat.title().contains("Test Bot Group"));
         assertTrue(chat.description().contains("New desc"));
         assertNotNull(new URL(chat.inviteLink()).toURI());
@@ -343,16 +343,31 @@ public void leaveChat() {
 
     @Test
     public void getChatAdministrators() {
-        GetChatAdministratorsResponse response = bot.execute(new GetChatAdministrators(channelName));
+        GetChatAdministratorsResponse response = bot.execute(new GetChatAdministrators(groupId));
         for (ChatMember chatMember : response.administrators()) {
             ChatMemberTest.check(chatMember);
+            if (chatMember.user().firstName().equals("Test Bot")) {
+                assertFalse(chatMember.canBeEdited());
+                assertTrue(chatMember.canChangeInfo());
+                assertTrue(chatMember.canDeleteMessages());
+                assertTrue(chatMember.canInviteUsers());
+                assertTrue(chatMember.canRestrictMembers());
+                assertTrue(chatMember.canPinMessages());
+                assertTrue(chatMember.canPromoteMembers());
+            }
         }
     }
 
     @Test
     public void getChatMember() {
-        GetChatMemberResponse response = bot.execute(new GetChatMember(chatId, chatId));
-        ChatMemberTest.check(response.chatMember());
+        ChatMember chatMember = bot.execute(new GetChatMember(groupId, memberBot)).chatMember();
+        ChatMemberTest.check(chatMember);
+        assertEquals(ChatMember.Status.restricted, chatMember.status());
+        assertTrue(chatMember.untilDate() == 0);
+        assertEquals(false, chatMember.canSendMessages());
+        assertEquals(false, chatMember.canSendMediaMessages());
+        assertEquals(false, chatMember.canSendOtherMessages());
+        assertEquals(false, chatMember.canAddWebPagePreviews());
     }
 
     @Test