Merge pull request #364 from anfanik/master

Bot API 7.1

Author: pengrad

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

@@ -54,11 +54,13 @@ public enum Type {
     private Message pinned_message;
     private ChatPermissions permissions;
     private Integer slow_mode_delay;
+    private Integer unrestrict_boost_count;
     private Integer message_auto_delete_time;
     private Boolean has_protected_content;
     private Boolean has_visible_history;
     private String sticker_set_name;
     private Boolean can_set_sticker_set;
+    private String custom_emoji_sticker_set_name;
     private Long linked_chat_id;
     private ChatLocation location;
 
@@ -190,6 +192,10 @@ public Integer slowModeDelay() {
         return slow_mode_delay;
     }
 
+    public Integer unrestrictBoostCount() {
+        return unrestrict_boost_count;
+    }
+
     public Integer messageAutoDeleteTime() {
         return message_auto_delete_time;
     }
@@ -210,6 +216,10 @@ public Boolean canSetStickerSet() {
         return can_set_sticker_set != null && can_set_sticker_set;
     }
 
+    public String customEmojiStickerSetName() {
+        return custom_emoji_sticker_set_name;
+    }
+
     public Long linkedChatId() {
         return linked_chat_id;
     }
@@ -251,11 +261,13 @@ public boolean equals(Object o) {
                 Objects.equals(pinned_message, chat.pinned_message) &&
                 Objects.equals(permissions, chat.permissions) &&
                 Objects.equals(slow_mode_delay, chat.slow_mode_delay) &&
+                Objects.equals(unrestrict_boost_count, chat.unrestrict_boost_count) &&
                 Objects.equals(message_auto_delete_time, chat.message_auto_delete_time) &&
                 Objects.equals(has_protected_content, chat.has_protected_content) &&
                 Objects.equals(has_visible_history, chat.has_visible_history) &&
                 Objects.equals(sticker_set_name, chat.sticker_set_name) &&
                 Objects.equals(can_set_sticker_set, chat.can_set_sticker_set) &&
+                Objects.equals(custom_emoji_sticker_set_name, chat.custom_emoji_sticker_set_name) &&
                 Objects.equals(linked_chat_id, chat.linked_chat_id) &&
                 Objects.equals(location, chat.location);
     }
@@ -296,11 +308,13 @@ public String toString() {
                 ", pinned_message=" + pinned_message +
                 ", permissions=" + permissions +
                 ", slow_mode_delay=" + slow_mode_delay +
+                ", unrestrict_boost_count=" + unrestrict_boost_count +
                 ", message_auto_delete_time=" + message_auto_delete_time +
                 ", has_protected_content=" + has_protected_content +
                 ", has_visible_history=" + has_visible_history +
                 ", sticker_set_name='" + sticker_set_name + '\'' +
                 ", can_set_sticker_set=" + can_set_sticker_set +
+                ", custom_emoji_sticker_set_name=" + custom_emoji_sticker_set_name +
                 ", linked_chat_id=" + linked_chat_id +
                 ", location=" + location +
                 '}';

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

@@ -27,6 +27,10 @@ public class ChatPermissions implements Serializable {
     private Boolean can_pin_messages;
     private Boolean can_manage_topics;
 
+    private Boolean can_post_stories;
+    private Boolean can_edit_stories;
+    private Boolean can_delete_stories;
+
     public Boolean canSendMessages() {
         return can_send_messages != null && can_send_messages;
     }
@@ -83,6 +87,18 @@ public Boolean canManageTopics() {
         return can_manage_topics != null && can_manage_topics;
     }
 
+    public Boolean canPostStories() {
+        return can_post_stories != null && can_post_stories;
+    }
+
+    public Boolean canEditStories() {
+        return can_edit_stories != null && can_edit_stories;
+    }
+
+    public Boolean canDeleteStories() {
+        return can_delete_stories != null && can_delete_stories;
+    }
+
     public ChatPermissions canSendMessages(boolean canSendMessages) {
         can_send_messages = canSendMessages;
         return this;
@@ -153,6 +169,21 @@ public ChatPermissions canManageTopics(boolean canManageTopics) {
         return this;
     }
 
+    public ChatPermissions canPostStories(Boolean canPostStories) {
+        this.can_post_stories = canPostStories;
+        return this;
+    }
+
+    public ChatPermissions canEditStories(Boolean canEditStories) {
+        this.can_edit_stories = canEditStories;
+        return this;
+    }
+
+    public ChatPermissions canDeleteStories(Boolean canDeleteStories) {
+        this.can_delete_stories = canDeleteStories;
+        return this;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -173,7 +204,10 @@ public boolean equals(Object o) {
                 Objects.equals(can_change_info, that.can_change_info) &&
                 Objects.equals(can_invite_users, that.can_invite_users) &&
                 Objects.equals(can_pin_messages, that.can_pin_messages) &&
-                Objects.equals(can_manage_topics, that.can_manage_topics);
+                Objects.equals(can_manage_topics, that.can_manage_topics) &&
+                Objects.equals(can_post_stories, that.can_post_stories) &&
+                Objects.equals(can_edit_stories, that.can_edit_stories) &&
+                Objects.equals(can_delete_stories, that.can_delete_stories);
     }
 
     @Override
@@ -191,7 +225,10 @@ public int hashCode() {
                 can_change_info,
                 can_invite_users,
                 can_pin_messages,
-                can_manage_topics);
+                can_manage_topics,
+                can_post_stories,
+                can_edit_stories,
+                can_delete_stories);
     }
 
     @Override
@@ -211,6 +248,9 @@ public String toString() {
                 ", can_invite_users=" + can_invite_users +
                 ", can_pin_messages=" + can_pin_messages +
                 ", can_manage_topics=" + can_manage_topics +
+                ", can_post_stories=" + can_post_stories +
+                ", can_edit_stories=" + can_edit_stories +
+                ", can_delete_stories=" + can_delete_stories +
                 '}';
     }
 }

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

@@ -1,5 +1,6 @@
 package com.pengrad.telegrambot.model;
 
+import com.pengrad.telegrambot.model.chatboost.ChatBoostAdded;
 import com.pengrad.telegrambot.model.message.MaybeInaccessibleMessage;
 import com.pengrad.telegrambot.model.message.origin.*;
 import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup;
@@ -19,12 +20,14 @@ public class Message extends MaybeInaccessibleMessage implements Serializable {
     private Integer message_thread_id;
     private User from;
     private Chat sender_chat;
+    private Integer sender_boost_count;
     private MessageOrigin forward_origin;
     private Boolean is_topic_message;
     private Boolean is_automatic_forward;
     private Message reply_to_message;
     private ExternalReplyInfo external_reply;
     private TextQuote quote;
+    private Story reply_to_story;
     private User via_bot;
     private Integer edit_date;
     private Boolean has_protected_content;
@@ -71,6 +74,7 @@ public class Message extends MaybeInaccessibleMessage implements Serializable {
     private String connected_website;
     private PassportData passport_data;
     private ProximityAlertTriggered proximity_alert_triggered;
+    private ChatBoostAdded boost_added;
     private ForumTopicCreated forum_topic_created;
     private ForumTopicEdited forum_topic_edited;
     private ForumTopicClosed forum_topic_closed;
@@ -98,6 +102,10 @@ public Chat senderChat() {
         return sender_chat;
     }
 
+    public Integer senderBoostCount() {
+        return sender_boost_count;
+    }
+
     public MessageOrigin forwardOrigin() {
         return forward_origin;
     }
@@ -195,6 +203,10 @@ public TextQuote quote() {
         return quote;
     }
 
+    public Story replyToStory() {
+        return reply_to_story;
+    }
+
     public User viaBot() {
         return via_bot;
     }
@@ -383,6 +395,10 @@ public ProximityAlertTriggered proximityAlertTriggered() {
         return proximity_alert_triggered;
     }
 
+    public ChatBoostAdded boostAdded() {
+        return boost_added;
+    }
+
     public ForumTopicCreated forumTopicCreated() {
         return forum_topic_created;
     }
@@ -465,6 +481,7 @@ public boolean equals(Object o) {
                 Objects.equals(message_thread_id , message.message_thread_id ) &&
                 Objects.equals(from, message.from) &&
                 Objects.equals(sender_chat, message.sender_chat) &&
+                Objects.equals(sender_boost_count, message.sender_boost_count) &&
                 Objects.equals(date, message.date) &&
                 Objects.equals(chat, message.chat) &&
                 Objects.equals(forward_origin, message.forward_origin) &&
@@ -473,6 +490,7 @@ public boolean equals(Object o) {
                 Objects.equals(reply_to_message, message.reply_to_message) &&
                 Objects.equals(external_reply, message.external_reply) &&
                 Objects.equals(quote, message.quote) &&
+                Objects.equals(reply_to_story, message.reply_to_story) &&
                 Objects.equals(via_bot, message.via_bot) &&
                 Objects.equals(edit_date, message.edit_date) &&
                 Objects.equals(has_protected_content, message.has_protected_content) &&
@@ -519,6 +537,7 @@ public boolean equals(Object o) {
                 Objects.equals(connected_website, message.connected_website) &&
                 Objects.equals(passport_data, message.passport_data) &&
                 Objects.equals(proximity_alert_triggered, message.proximity_alert_triggered) &&
+                Objects.equals(boost_added, message.boost_added) &&
                 Objects.equals(forum_topic_created, message.forum_topic_created) &&
                 Objects.equals(forum_topic_edited, message.forum_topic_edited) &&
                 Objects.equals(forum_topic_closed, message.forum_topic_closed) &&
@@ -546,6 +565,7 @@ public String toString() {
                 ", message_thread_id=" + message_thread_id +
                 ", from=" + from +
                 ", sender_chat=" + sender_chat +
+                ", sender_boost_count=" + sender_boost_count +
                 ", date=" + date +
                 ", chat=" + chat +
                 ", forward_origin=" + forward_origin +
@@ -554,6 +574,7 @@ public String toString() {
                 ", reply_to_message=" + reply_to_message +
                 ", external_reply=" + external_reply +
                 ", quote=" + quote +
+                ", reply_to_story=" + reply_to_story +
                 ", via_bot=" + via_bot +
                 ", edit_date=" + edit_date +
                 ", has_protected_content=" + has_protected_content+
@@ -600,6 +621,7 @@ public String toString() {
                 ", connected_website='" + connected_website + '\'' +
                 ", passport_data=" + passport_data +
                 ", proximity_alert_triggered=" + proximity_alert_triggered +
+                ", boost_added=" + boost_added +
                 ", forum_topic_created=" + forum_topic_created +
                 ", forum_topic_edited=" + forum_topic_edited +
                 ", forum_topic_closed=" + forum_topic_closed +

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

@@ -1,35 +1,47 @@
 package com.pengrad.telegrambot.model;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * 
  * 18/08/2023.
  */
 
-public class Story implements Serializable {    
+public class Story implements Serializable {
+
     private final static long serialVersionUID = 0L;
 
+    private Chat chat;
+    private Integer id;
+
+    public Chat chat() {
+        return chat;
+    }
+
+    public Integer id() {
+        return id;
+    }
 
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         Story story = (Story) o;
-        // todo: fix when fields are added
-        return true;
+        return Objects.equals(chat, story.chat)
+            && Objects.equals(id, story.id);
     }
 
     @Override
     public int hashCode() {
-        // todo: fix when fields are added
-        return 0;
+        return Objects.hash(chat, id);
     }
 
     @Override
     public String toString() {
-        // todo: fix when fields are added
-        return "Story{" + '}';
+        return "Story{" +
+            "chat=" + chat +
+            ", id=" + id +
+            '}';
     }
-
 }

library/src/main/java/com/pengrad/telegrambot/model/chatboost/ChatBoostAdded.java

@@ -0,0 +1,37 @@
+package com.pengrad.telegrambot.model.chatboost;
+
+import java.util.Objects;
+
+public class ChatBoostAdded {
+
+    private Integer boost_count;
+
+    public Integer boostCount() {
+        return boost_count;
+    }
+
+    public ChatBoostAdded boostCount(Integer boostCount) {
+        this.boost_count = boostCount;
+        return this;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ChatBoostAdded that = (ChatBoostAdded) o;
+        return Objects.equals(boost_count, that.boost_count);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(boost_count);
+    }
+
+    @Override
+    public String toString() {
+        return "ChatBoostAdded{" +
+            "boost_count=" + boost_count +
+            '}';
+    }
+}