Merge pull request #259 from mircoianese/api_5.5

BOT API v5.5

Author: pengrad

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

@@ -19,26 +19,26 @@ public enum Type {
     private Long id;
     private Type type;
 
-    //Private
-    private String first_name;
-    private String last_name;
+    //Channel and Group
+    private String title;
 
     //Private and Channel
     private String username;
 
-    //Channel and Group
-    private String title;
-
-    // TODO delete this field
-    private Boolean all_members_are_administrators;
+    //Private
+    private String first_name;
+    private String last_name;
 
     private ChatPhoto photo;
     private String bio;
+    private Boolean has_private_forwards;
     private String description;
     private String invite_link;
     private Message pinned_message;
     private ChatPermissions permissions;
     private Integer slow_mode_delay;
+    private Integer message_auto_delete_time;
+    private Boolean has_protected_content;
     private String sticker_set_name;
     private Boolean can_set_sticker_set;
     private Long linked_chat_id;
@@ -68,10 +68,6 @@ public String title() {
         return title;
     }
 
-    public Boolean allMembersAreAdministrators() {
-        return all_members_are_administrators;
-    }
-
     public ChatPhoto photo() {
         return photo;
     }
@@ -80,6 +76,10 @@ public String bio() {
         return bio;
     }
 
+    public Boolean hasPrivateForwards() {
+        return has_private_forwards;
+    }
+
     public String description() {
         return description;
     }
@@ -100,6 +100,14 @@ public Integer slowModeDelay() {
         return slow_mode_delay;
     }
 
+    public Integer messageAutoDeleteTime() {
+        return message_auto_delete_time;
+    } 
+    
+    public Boolean hasProtectedContent() {
+        return has_protected_content;
+    }
+
     public String stickerSetName() {
         return sticker_set_name;
     }
@@ -127,14 +135,16 @@ public boolean equals(Object o) {
                 Objects.equals(last_name, chat.last_name) &&
                 Objects.equals(username, chat.username) &&
                 Objects.equals(title, chat.title) &&
-                Objects.equals(all_members_are_administrators, chat.all_members_are_administrators) &&
                 Objects.equals(photo, chat.photo) &&
                 Objects.equals(bio, chat.bio) &&
+                Objects.equals(has_private_forwards, chat.has_private_forwards) &&
                 Objects.equals(description, chat.description) &&
                 Objects.equals(invite_link, chat.invite_link) &&
                 Objects.equals(pinned_message, chat.pinned_message) &&
                 Objects.equals(permissions, chat.permissions) &&
                 Objects.equals(slow_mode_delay, chat.slow_mode_delay) &&
+                Objects.equals(message_auto_delete_time, chat.message_auto_delete_time) &&
+                Objects.equals(has_protected_content, chat.has_protected_content) &&
                 Objects.equals(sticker_set_name, chat.sticker_set_name) &&
                 Objects.equals(can_set_sticker_set, chat.can_set_sticker_set) &&
                 Objects.equals(linked_chat_id, chat.linked_chat_id) &&
@@ -155,14 +165,16 @@ public String toString() {
                 ", last_name='" + last_name + '\'' +
                 ", username='" + username + '\'' +
                 ", title='" + title + '\'' +
-                ", all_members_are_administrators=" + all_members_are_administrators +
                 ", photo=" + photo +
                 ", bio='" + bio + '\'' +
+                ", has_private_forwards=" + has_private_forwards +
                 ", description='" + description + '\'' +
                 ", invite_link='" + invite_link + '\'' +
                 ", pinned_message=" + pinned_message +
                 ", permissions=" + permissions +
                 ", slow_mode_delay=" + slow_mode_delay +
+                ", message_auto_delete_time=" + message_auto_delete_time +
+                ", has_protected_content=" + has_protected_content +
                 ", sticker_set_name='" + sticker_set_name + '\'' +
                 ", can_set_sticker_set=" + can_set_sticker_set +
                 ", linked_chat_id=" + linked_chat_id +

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

@@ -25,9 +25,11 @@ public class Message implements Serializable {
     private String forward_signature;
     private String forward_sender_name;
     private Integer forward_date;
+    private Boolean is_automatic_forward;
     private Message reply_to_message;
     private User via_bot;
     private Integer edit_date;
+    private Boolean has_protected_content;
     private String media_group_id;
     private String author_signature;
     private String text;
@@ -115,6 +117,10 @@ public Integer forwardDate() {
         return forward_date;
     }
 
+    public Boolean isAutomaticForward() {
+        return is_automatic_forward;
+    }
+
     public Message replyToMessage() {
         return reply_to_message;
     }
@@ -127,6 +133,10 @@ public Integer editDate() {
         return edit_date;
     }
 
+    public Boolean hasProtectedContent() {
+        return has_protected_content;
+    }
+
     public String mediaGroupId() {
         return media_group_id;
     }
@@ -311,9 +321,11 @@ public boolean equals(Object o) {
                 Objects.equals(forward_signature, message.forward_signature) &&
                 Objects.equals(forward_sender_name, message.forward_sender_name) &&
                 Objects.equals(forward_date, message.forward_date) &&
+                Objects.equals(is_automatic_forward, message.is_automatic_forward) &&
                 Objects.equals(reply_to_message, message.reply_to_message) &&
                 Objects.equals(via_bot, message.via_bot) &&
                 Objects.equals(edit_date, message.edit_date) &&
+                Objects.equals(has_protected_content, message.has_protected_content) &&
                 Objects.equals(media_group_id, message.media_group_id) &&
                 Objects.equals(author_signature, message.author_signature) &&
                 Objects.equals(text, message.text) &&
@@ -377,9 +389,11 @@ public String toString() {
                 ", forward_signature='" + forward_signature + '\'' +
                 ", forward_sender_name='" + forward_sender_name + '\'' +
                 ", forward_date=" + forward_date +
+                ", is_automatic_forward=" + is_automatic_forward +
                 ", reply_to_message=" + reply_to_message +
                 ", via_bot=" + via_bot +
                 ", edit_date=" + edit_date +
+                ", has_protected_content=" + has_protected_content+
                 ", media_group_id='" + media_group_id + '\'' +
                 ", author_signature='" + author_signature + '\'' +
                 ", text='" + text + '\'' +

library/src/main/java/com/pengrad/telegrambot/request/BanChatSenderChat.java

@@ -0,0 +1,19 @@
+package com.pengrad.telegrambot.request;
+
+import com.pengrad.telegrambot.response.BaseResponse;
+
+/**
+ * Mirco Ianese
+ * 07 December 2021
+ */
+public class BanChatSenderChat extends BaseRequest<BanChatSenderChat, BaseResponse> {
+
+    public BanChatSenderChat(Object chatId, long sender_chat_id) {
+        super(BaseResponse.class);
+        add("chat_id", chatId).add("sender_chat_id", sender_chat_id);
+    }
+
+    public BanChatSenderChat untilDate(int untilDate) {
+        return add("until_date", untilDate);
+    }
+}

library/src/main/java/com/pengrad/telegrambot/request/UnbanChatSenderChat.java

@@ -0,0 +1,16 @@
+package com.pengrad.telegrambot.request;
+
+import com.pengrad.telegrambot.response.BaseResponse;
+
+/**
+ * Mirco Ianese
+ * 07 December 2021
+ */
+public class UnbanChatSenderChat extends BaseRequest<UnbanChatSenderChat, BaseResponse> {
+
+    public UnbanChatSenderChat(Object chatId, long sender_chat_id) {
+        super(BaseResponse.class);
+        add("chat_id", chatId).add("sender_chat_id", sender_chat_id);
+    }
+
+}

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

@@ -514,7 +514,6 @@ public void getChat() throws MalformedURLException, URISyntaxException {
         assertEquals(Integer.valueOf(10), chat.slowModeDelay());
         assertNotNull(new URL(chat.inviteLink()).toURI());
         if (chat.pinnedMessage() != null) MessageTest.checkMessage(chat.pinnedMessage());
-        assertNull(chat.allMembersAreAdministrators());
         assertNull(chat.stickerSetName());
         assertNull(chat.canSetStickerSet());
         assertEquals(channelId, chat.linkedChatId());