Bot API 9.6

  - Added support for managed bots with getManagedBotToken and replaceManagedBotToken methods
  - Added the classes ManagedBotCreated and ManagedBotUpdated
  - Added the field managed_bot to Update
  - Added the field managed_bot_created to Message
  - Added the class KeyboardButtonRequestManagedBot and the field request_managed_bot to KeyboardButton
  - Added the class PreparedKeyboardButton and the method savePreparedKeyboardButton
  - Added the field can_manage_bots to User
  - Changed the field correct_option_id to correct_option_ids (array) in Poll
  - Added the fields allows_revoting, description and description_entities to Poll
  - Added the fields persistent_id, added_by_user, added_by_chat and addition_date to PollOption
  - Added the field option_persistent_ids to PollAnswer
  - Added the classes PollOptionAdded and PollOptionDeleted
  - Added the fields poll_option_added, poll_option_deleted and reply_to_poll_option_id to Message
  - Added the field poll_option_id to ReplyParameters
  - Added parameters allowsRevoting, shuffleOptions, allowAddingOptions, hideResultsUntilCloses, description, descriptionParseMode and descriptionEntities to SendPoll

Author: pengrad

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

@@ -0,0 +1,34 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class ManagedBotCreated implements Serializable {
+    private final static long serialVersionUID = 0L;
+
+    private User bot;
+
+    public User bot() {
+        return bot;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ManagedBotCreated that = (ManagedBotCreated) o;
+        return Objects.equals(bot, that.bot);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(bot);
+    }
+
+    @Override
+    public String toString() {
+        return "ManagedBotCreated{" +
+                "bot=" + bot +
+                '}';
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class ManagedBotUpdated implements Serializable {
+    private final static long serialVersionUID = 0L;
+
+    private User user;
+    private User bot;
+
+    public User user() {
+        return user;
+    }
+
+    public User bot() {
+        return bot;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ManagedBotUpdated that = (ManagedBotUpdated) o;
+        return Objects.equals(user, that.user) &&
+                Objects.equals(bot, that.bot);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(user, bot);
+    }
+
+    @Override
+    public String toString() {
+        return "ManagedBotUpdated{" +
+                "user=" + user +
+                ", bot=" + bot +
+                '}';
+    }
+}

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

@@ -136,6 +136,10 @@ public class Message extends MaybeInaccessibleMessage implements Serializable {
     private Integer paid_star_count;
     private ChatOwnerLeft chat_owner_left;
     private ChatOwnerChanged chat_owner_changed;
+    private ManagedBotCreated managed_bot_created;
+    private PollOptionAdded poll_option_added;
+    private PollOptionDeleted poll_option_deleted;
+    private String reply_to_poll_option_id;
 
     public Long messageThreadId() {
         return message_thread_id;
@@ -550,6 +554,22 @@ public ChatOwnerChanged chatOwnerChanged() {
         return chat_owner_changed;
     }
 
+    public ManagedBotCreated managedBotCreated() {
+        return managed_bot_created;
+    }
+
+    public PollOptionAdded pollOptionAdded() {
+        return poll_option_added;
+    }
+
+    public PollOptionDeleted pollOptionDeleted() {
+        return poll_option_deleted;
+    }
+
+    public String replyToPollOptionId() {
+        return reply_to_poll_option_id;
+    }
+
     /**
      * Only for backwards-compatibility with MaybeInaccessibleMessage
      */
@@ -681,7 +701,11 @@ public boolean equals(Object o) {
                 Objects.equals(direct_message_price_changed, message.direct_message_price_changed) &&
                 Objects.equals(paid_star_count, message.paid_star_count) &&
                 Objects.equals(chat_owner_left, message.chat_owner_left) &&
-                Objects.equals(chat_owner_changed, message.chat_owner_changed);
+                Objects.equals(chat_owner_changed, message.chat_owner_changed) &&
+                Objects.equals(managed_bot_created, message.managed_bot_created) &&
+                Objects.equals(poll_option_added, message.poll_option_added) &&
+                Objects.equals(poll_option_deleted, message.poll_option_deleted) &&
+                Objects.equals(reply_to_poll_option_id, message.reply_to_poll_option_id);
     }
 
     @Override
@@ -798,6 +822,10 @@ public String toString() {
                 ", paid_star_count=" + paid_star_count +
                 ", chat_owner_left=" + chat_owner_left +
                 ", chat_owner_changed=" + chat_owner_changed +
+                ", managed_bot_created=" + managed_bot_created +
+                ", poll_option_added=" + poll_option_added +
+                ", poll_option_deleted=" + poll_option_deleted +
+                ", reply_to_poll_option_id='" + reply_to_poll_option_id + '\'' +
                 '}';
     }
 }

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

@@ -23,11 +23,14 @@ public enum Type {
     private Boolean is_anonymous;
     private Type type;
     private Boolean allows_multiple_answers;
-    private Integer correct_option_id;
+    private Integer[] correct_option_ids;
+    private Boolean allows_revoting;
     private String explanation;
     private MessageEntity[] explanation_entities;
     private Integer open_period;
     private Integer close_date;
+    private String description;
+    private MessageEntity[] description_entities;
 
     public String id() {
         return id;
@@ -66,7 +69,15 @@ public Boolean allowsMultipleAnswers() {
     }
 
     public Integer correctOptionId() {
-        return correct_option_id;
+        return correct_option_ids != null && correct_option_ids.length > 0 ? correct_option_ids[0] : null;
+    }
+
+    public Integer[] correctOptionIds() {
+        return correct_option_ids;
+    }
+
+    public Boolean allowsRevoting() {
+        return allows_revoting;
     }
 
     public String explanation() {
@@ -85,6 +96,14 @@ public Integer closeDate() {
         return close_date;
     }
 
+    public String description() {
+        return description;
+    }
+
+    public MessageEntity[] descriptionEntities() {
+        return description_entities;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -103,12 +122,15 @@ public boolean equals(Object o) {
         if (type != poll.type) return false;
         if (allows_multiple_answers != null ? !allows_multiple_answers.equals(poll.allows_multiple_answers) : poll.allows_multiple_answers != null)
             return false;
-        if (correct_option_id != null ? !correct_option_id.equals(poll.correct_option_id) : poll.correct_option_id != null)
+        if (!Arrays.equals(correct_option_ids, poll.correct_option_ids)) return false;
+        if (allows_revoting != null ? !allows_revoting.equals(poll.allows_revoting) : poll.allows_revoting != null)
             return false;
         if (explanation != null ? !explanation.equals(poll.explanation) : poll.explanation != null) return false;
         if (!Arrays.equals(explanation_entities, poll.explanation_entities)) return false;
         if (open_period != null ? !open_period.equals(poll.open_period) : poll.open_period != null) return false;
-        return close_date != null ? close_date.equals(poll.close_date) : poll.close_date == null;
+        if (close_date != null ? !close_date.equals(poll.close_date) : poll.close_date != null) return false;
+        if (description != null ? !description.equals(poll.description) : poll.description != null) return false;
+        return Arrays.equals(description_entities, poll.description_entities);
     }
 
     @Override
@@ -128,11 +150,14 @@ public String toString() {
                 ", is_anonymous=" + is_anonymous +
                 ", type=" + type +
                 ", allows_multiple_answers=" + allows_multiple_answers +
-                ", correct_option_id=" + correct_option_id +
+                ", correct_option_ids=" + Arrays.toString(correct_option_ids) +
+                ", allows_revoting=" + allows_revoting +
                 ", explanation='" + explanation + '\'' +
                 ", explanation_entities=" + Arrays.toString(explanation_entities) +
                 ", open_period=" + open_period +
                 ", close_date=" + close_date +
+                ", description='" + description + '\'' +
+                ", description_entities=" + Arrays.toString(description_entities) +
                 '}';
     }
 }

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

@@ -15,6 +15,7 @@ public class PollAnswer implements Serializable {
     private Chat voter_chat;
     private User user;
     private Integer[] option_ids;
+    private String[] option_persistent_ids;
 
     public String pollId() {
         return poll_id;
@@ -32,6 +33,10 @@ public Integer[] optionIds() {
         return option_ids;
     }
 
+    public String[] optionPersistentIds() {
+        return option_persistent_ids;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -40,18 +45,20 @@ public boolean equals(Object o) {
         return Objects.equals(poll_id, that.poll_id) &&
                 Objects.equals(voter_chat, that.voter_chat) &&
                 Objects.equals(user, that.user) &&
-                Arrays.equals(option_ids, that.option_ids);
+                Arrays.equals(option_ids, that.option_ids) &&
+                Arrays.equals(option_persistent_ids, that.option_persistent_ids);
     }
 
     @Override
     public int hashCode() {
         int result = Objects.hash(poll_id, voter_chat, user);
         result = 31 * result + Arrays.hashCode(option_ids);
+        result = 31 * result + Arrays.hashCode(option_persistent_ids);
         return result;
     }
 
     @Override
     public String toString() {
-        return "PollAnswer{" + "poll_id='" + poll_id + '\'' + ", voter_chat=" + voter_chat + ", user=" + user + ", option_ids=" + Arrays.toString(option_ids) + '}';
+        return "PollAnswer{" + "poll_id='" + poll_id + '\'' + ", voter_chat=" + voter_chat + ", user=" + user + ", option_ids=" + Arrays.toString(option_ids) + ", option_persistent_ids=" + Arrays.toString(option_persistent_ids) + '}';
     }
 }

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

@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * Stas Parshin
@@ -10,9 +11,17 @@
 public class PollOption implements Serializable {
     private final static long serialVersionUID = 0L;
 
+    private String persistent_id;
     private String text;
     private Integer voter_count;
     private MessageEntity[] text_entities;
+    private User added_by_user;
+    private Chat added_by_chat;
+    private Integer addition_date;
+
+    public String persistentId() {
+        return persistent_id;
+    }
 
     public String text() {
         return text;
@@ -26,6 +35,18 @@ public MessageEntity[] textEntities() {
         return text_entities;
     }
 
+    public User addedByUser() {
+        return added_by_user;
+    }
+
+    public Chat addedByChat() {
+        return added_by_chat;
+    }
+
+    public Integer additionDate() {
+        return addition_date;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -35,23 +56,35 @@ public boolean equals(Object o) {
 
         if (!Arrays.equals(text_entities, that.text_entities)) return false;
 
+        if (!Objects.equals(persistent_id, that.persistent_id)) return false;
         if (text != null ? !text.equals(that.text) : that.text != null) return false;
-        return voter_count != null ? voter_count.equals(that.voter_count) : that.voter_count == null;
+        if (voter_count != null ? !voter_count.equals(that.voter_count) : that.voter_count != null) return false;
+        if (!Objects.equals(added_by_user, that.added_by_user)) return false;
+        if (!Objects.equals(added_by_chat, that.added_by_chat)) return false;
+        return Objects.equals(addition_date, that.addition_date);
     }
 
     @Override
     public int hashCode() {
-        int result = text != null ? text.hashCode() : 0;
+        int result = persistent_id != null ? persistent_id.hashCode() : 0;
+        result = 31 * result + (text != null ? text.hashCode() : 0);
         result = 31 * result + (voter_count != null ? voter_count.hashCode() : 0);
+        result = 31 * result + (added_by_user != null ? added_by_user.hashCode() : 0);
+        result = 31 * result + (added_by_chat != null ? added_by_chat.hashCode() : 0);
+        result = 31 * result + (addition_date != null ? addition_date.hashCode() : 0);
         return result;
     }
 
     @Override
     public String toString() {
         return "PollOption{" +
-                "text='" + text + '\'' +
+                "persistent_id='" + persistent_id + '\'' +
+                ", text='" + text + '\'' +
                 ", voter_count=" + voter_count +
                 ", text_entities=" + Arrays.toString(text_entities) +
+                ", added_by_user=" + added_by_user +
+                ", added_by_chat=" + added_by_chat +
+                ", addition_date=" + addition_date +
                 '}';
     }
 }