Merge pull request #341 from mircoianese/api_v6.8

BOT Api v6.8

Author: pengrad

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

@@ -34,6 +34,7 @@ public enum Type {
     private ChatPhoto photo;
     private String[] active_usernames;
     private String emoji_status_custom_emoji_id;
+    private Integer emoji_status_expiration_date;
     private String bio;
     private Boolean has_private_forwards;
     private Boolean has_restricted_voice_and_video_messages;
@@ -85,14 +86,34 @@ public ChatPhoto photo() {
         return photo;
     }
 
+    /**
+     * @deprecated Use activeUsernames() instead
+     */
+    @Deprecated 
     public String[] getActiveUsernames() {
         return active_usernames;
     }
 
+    public String[] activeUsernames() {
+        return active_usernames;
+    }
+
+    /**
+     * @deprecated Use emojiStatusCustomEmojiId() instead
+     */
+    @Deprecated 
     public String getEmojiStatusCustomEmojiId() {
         return emoji_status_custom_emoji_id;
     }
 
+    public String emojiStatusCustomEmojiId() {
+        return emoji_status_custom_emoji_id;
+    }
+
+    public Integer emojiStatusExpirationDate() {
+        return emoji_status_expiration_date;
+    }
+
     public String bio() {
         return bio;
     }
@@ -180,6 +201,7 @@ public boolean equals(Object o) {
                 Objects.equals(photo, chat.photo) &&
                 Arrays.equals(active_usernames, chat.active_usernames) &&
                 Objects.equals(emoji_status_custom_emoji_id, chat.emoji_status_custom_emoji_id) &&
+                Objects.equals(emoji_status_expiration_date, chat.emoji_status_expiration_date) &&
                 Objects.equals(bio, chat.bio) &&
                 Objects.equals(has_private_forwards, chat.has_private_forwards) &&
                 Objects.equals(has_restricted_voice_and_video_messages, chat.has_restricted_voice_and_video_messages) &&
@@ -218,6 +240,7 @@ public String toString() {
                 ", photo=" + photo +
                 ", active_usernames=" + Arrays.toString(active_usernames) +
                 ", emoji_status_custom_emoji_id='" + emoji_status_custom_emoji_id + '\'' +
+                ", emoji_status_expiration_date='" + emoji_status_expiration_date + '\'' +
                 ", bio='" + bio + '\'' +
                 ", has_private_forwards=" + has_private_forwards +
                 ", has_restricted_voice_and_video_messages=" + has_restricted_voice_and_video_messages +

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

@@ -67,6 +67,7 @@ public class Message implements Serializable {
     private Message pinned_message;
     private Invoice invoice;
     private SuccessfulPayment successful_payment;
+    private Story story;
     private UserShared user_shared;
     private ChatShared chat_shared;
     private String connected_website;
@@ -300,6 +301,10 @@ public SuccessfulPayment successfulPayment() {
         return successful_payment;
     }
 
+    public Story story() {
+        return story;
+    }
+
     public UserShared userShared() {
         return user_shared;
     }
@@ -430,6 +435,7 @@ public boolean equals(Object o) {
                 Objects.equals(pinned_message, message.pinned_message) &&
                 Objects.equals(invoice, message.invoice) &&
                 Objects.equals(successful_payment, message.successful_payment) &&
+                Objects.equals(story, message.story) &&
                 Objects.equals(user_shared, message.user_shared) &&
                 Objects.equals(chat_shared, message.chat_shared) &&
                 Objects.equals(connected_website, message.connected_website) &&
@@ -511,6 +517,7 @@ public String toString() {
                 ", pinned_message=" + pinned_message +
                 ", invoice=" + invoice +
                 ", successful_payment=" + successful_payment +
+                ", story=" + story +
                 ", user_shared=" + user_shared +
                 ", chat_shared=" + chat_shared +
                 ", connected_website='" + connected_website + '\'' +

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

@@ -11,13 +11,18 @@ public class PollAnswer implements Serializable {
     private final static long serialVersionUID = 0L;
 
     private String poll_id;
+    private Chat voter_chat;
     private User user;
     private Integer[] option_ids;
 
     public String pollId() {
         return poll_id;
     }
 
+    public Chat voterChat() {
+        return voter_chat;
+    }
+
     public User user() {
         return user;
     }
@@ -34,6 +39,7 @@ public boolean equals(Object o) {
         PollAnswer that = (PollAnswer) o;
 
         if (poll_id != null ? !poll_id.equals(that.poll_id) : that.poll_id != null) return false;
+        if (voter_chat != null ? !voter_chat.equals(that.voter_chat) : that.voter_chat != null) return false;
         if (user != null ? !user.equals(that.user) : that.user != null) return false;
         // Probably incorrect - comparing Object[] arrays with Arrays.equals
         return Arrays.equals(option_ids, that.option_ids);
@@ -42,6 +48,7 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
         int result = poll_id != null ? poll_id.hashCode() : 0;
+        result = 31 * result + (voter_chat != null ? voter_chat.hashCode() : 0);
         result = 31 * result + (user != null ? user.hashCode() : 0);
         result = 31 * result + Arrays.hashCode(option_ids);
         return result;
@@ -51,6 +58,7 @@ public int hashCode() {
     public String toString() {
         return "PollAnswer{" +
                 "poll_id='" + poll_id + '\'' +
+                ", voter_chat=" + voter_chat +
                 ", user=" + user +
                 ", option_ids=" + Arrays.toString(option_ids) +
                 '}';

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

@@ -0,0 +1,35 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * 18/08/2023.
+ */
+
+public class Story implements Serializable {    
+    private final static long serialVersionUID = 0L;
+
+
+    @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;
+    }
+
+    @Override
+    public int hashCode() {
+        // todo: fix when fields are added
+        return 0;
+    }
+
+    @Override
+    public String toString() {
+        // todo: fix when fields are added
+        return "Story{" + '}';
+    }
+
+}

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

@@ -0,0 +1,19 @@
+package com.pengrad.telegrambot.request;
+
+import com.pengrad.telegrambot.response.BaseResponse;
+
+/**
+ * 22 August 2023
+ */
+public class UnpinAllGeneralForumTopicMessages extends BaseRequest<UnpinAllGeneralForumTopicMessages, BaseResponse> {
+
+    public UnpinAllGeneralForumTopicMessages(Long chatId) {
+        this(chatId.toString());
+    }
+
+    public UnpinAllGeneralForumTopicMessages(String chatId) {
+        super(BaseResponse.class);
+        add("chat_id", chatId);
+    }
+
+}