Merge pull request #303 from intellinside/master

Telegram Bot API v6.3 support added

Author: pengrad

README.md

@@ -5,7 +5,7 @@
 [![codecov](https://codecov.io/gh/pengrad/java-telegram-bot-api/branch/master/graph/badge.svg)](https://codecov.io/gh/pengrad/java-telegram-bot-api)
 
 Java library for interacting with [Telegram Bot API](https://core.telegram.org/bots/api)
-- Full support of all Bot API 6.2 methods
+- Full support of all Bot API 6.3 methods
 - Telegram [Passport](https://core.telegram.org/passport) and Decryption API
 - Bot [Payments](https://core.telegram.org/bots/payments)
 - [Gaming Platform](https://telegram.org/blog/games)
@@ -14,14 +14,14 @@ Java library for interacting with [Telegram Bot API](https://core.telegram.org/b
 
 Gradle:
 ```groovy
-implementation 'com.github.pengrad:java-telegram-bot-api:6.2.0'
+implementation 'com.github.pengrad:java-telegram-bot-api:6.3.0'
 ```
 Maven:
 ```xml
 <dependency>
   <groupId>com.github.pengrad</groupId>
   <artifactId>java-telegram-bot-api</artifactId>
-  <version>6.2.0</version>
+  <version>6.3.0</version>
 </dependency>
 ```
 [JAR with all dependencies on release page](https://github.com/pengrad/java-telegram-bot-api/releases)

README_RU.md

@@ -4,7 +4,7 @@
 [![codecov](https://codecov.io/gh/pengrad/java-telegram-bot-api/branch/master/graph/badge.svg)](https://codecov.io/gh/pengrad/java-telegram-bot-api)
 
 Java библиотека, созданная для работы с [Telegram Bot API](https://core.telegram.org/bots/api)
-- Полная поддержка всех методов BOT API 6.2
+- Полная поддержка всех методов BOT API 6.3
 - Поддержка Telegram [паспорта](https://core.telegram.org/passport) и дешифровки (Decryption API);
 - Поддержка [платежей](https://core.telegram.org/bots/payments);
 - [Игровая платформа](https://telegram.org/blog/games).
@@ -13,14 +13,14 @@ Java библиотека, созданная для работы с [Telegram B
 
 Gradle:
 ```groovy
-implementation 'com.github.pengrad:java-telegram-bot-api:6.2.0'
+implementation 'com.github.pengrad:java-telegram-bot-api:6.3.0'
 ```
 Maven:
 ```xml
 <dependency>
   <groupId>com.github.pengrad</groupId>
   <artifactId>java-telegram-bot-api</artifactId>
-  <version>6.2.0</version>
+  <version>6.3.0</version>
 </dependency>
 ```
 Также JAR со всеми зависимостями можно найти [в релизах](https://github.com/pengrad/java-telegram-bot-api/releases).

gradle.properties

@@ -1,5 +1,5 @@
 GROUP=com.github.pengrad
-VERSION_NAME=6.2.0
+VERSION_NAME=6.3.0
 
 POM_DESCRIPTION=Java API for Telegram Bot API
 POM_URL=https://github.com/pengrad/java-telegram-bot-api/

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

@@ -3,6 +3,7 @@
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Objects;
 
 /**
@@ -29,7 +30,10 @@ public enum Type {
     private String first_name;
     private String last_name;
 
+    private Boolean is_forum;
     private ChatPhoto photo;
+    private String[] active_usernames;
+    private String emoji_status_custom_emoji_id;
     private String bio;
     private Boolean has_private_forwards;
     private Boolean has_restricted_voice_and_video_messages;
@@ -67,6 +71,10 @@ public String username() {
         return username;
     }
 
+    public Boolean isForum() {
+        return is_forum != null && is_forum;
+    }
+
     public String title() {
         return title;
     }
@@ -75,6 +83,14 @@ public ChatPhoto photo() {
         return photo;
     }
 
+    public String[] getActiveUsernames() {
+        return active_usernames;
+    }
+
+    public String getEmojiStatusCustomEmojiId() {
+        return emoji_status_custom_emoji_id;
+    }
+
     public String bio() {
         return bio;
     }
@@ -148,9 +164,12 @@ public boolean equals(Object o) {
                 type == chat.type &&
                 Objects.equals(first_name, chat.first_name) &&
                 Objects.equals(last_name, chat.last_name) &&
+                Objects.equals(is_forum, chat.is_forum) &&
                 Objects.equals(username, chat.username) &&
                 Objects.equals(title, chat.title) &&
                 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(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) &&
@@ -181,9 +200,12 @@ public String toString() {
                 ", type=" + type +
                 ", first_name='" + first_name + '\'' +
                 ", last_name='" + last_name + '\'' +
+                ", is_forum=" + is_forum +
                 ", username='" + username + '\'' +
                 ", title='" + title + '\'' +
                 ", photo=" + photo +
+                ", active_usernames=" + Arrays.toString(active_usernames) +
+                ", emoji_status_custom_emoji_id='" + emoji_status_custom_emoji_id + '\'' +
                 ", 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/ChatAdministratorRights.java

@@ -22,6 +22,7 @@ public class ChatAdministratorRights implements Serializable {
     private Boolean can_post_messages;
     private Boolean can_edit_messages;
     private Boolean can_pin_messages;
+    private Boolean can_manage_topics;
 
     public Boolean isAnonymous() {
         return is_anonymous;
@@ -67,11 +68,15 @@ public Boolean canPinMessages() {
         return can_pin_messages;
     }
 
+    public Boolean canManageTopics() {
+        return can_manage_topics;
+    }
+
     public ChatAdministratorRights canManageChat(boolean canManageChat) {
         this.can_manage_chat = canManageChat;
         return this;
     }
-    
+
     public ChatAdministratorRights canDeleteMessages(boolean canDeleteMessages) {
         this.can_delete_messages = canDeleteMessages;
         return this;
@@ -117,17 +122,45 @@ public ChatAdministratorRights canPinMessages(boolean canPinMessages) {
         return this;
     }
 
+    public ChatAdministratorRights canManageTopics(boolean canManageTopics) {
+        this.can_manage_topics = canManageTopics;
+        return this;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         ChatAdministratorRights that = (ChatAdministratorRights) o;
-        return Objects.equals(is_anonymous, that.is_anonymous) && Objects.equals(can_manage_chat, that.can_manage_chat) && Objects.equals(can_delete_messages, that.can_delete_messages) && Objects.equals(can_manage_video_chats, that.can_manage_video_chats) && Objects.equals(can_restrict_members, that.can_restrict_members) && Objects.equals(can_promote_members, that.can_promote_members) && Objects.equals(can_change_info, that.can_change_info) && Objects.equals(can_invite_users, that.can_invite_users) && Objects.equals(can_post_messages, that.can_post_messages) && Objects.equals(can_edit_messages, that.can_edit_messages) && Objects.equals(can_pin_messages, that.can_pin_messages);
+
+        return Objects.equals(is_anonymous, that.is_anonymous) &&
+                Objects.equals(can_manage_chat, that.can_manage_chat) &&
+                Objects.equals(can_delete_messages, that.can_delete_messages) &&
+                Objects.equals(can_manage_video_chats, that.can_manage_video_chats) &&
+                Objects.equals(can_restrict_members, that.can_restrict_members) &&
+                Objects.equals(can_promote_members, that.can_promote_members) &&
+                Objects.equals(can_change_info, that.can_change_info) &&
+                Objects.equals(can_invite_users, that.can_invite_users) &&
+                Objects.equals(can_post_messages, that.can_post_messages) &&
+                Objects.equals(can_edit_messages, that.can_edit_messages) &&
+                Objects.equals(can_pin_messages, that.can_pin_messages) &&
+                Objects.equals(can_manage_topics, that.can_manage_topics);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(is_anonymous, can_manage_chat, can_delete_messages, can_manage_video_chats, can_restrict_members, can_promote_members, can_change_info, can_invite_users, can_post_messages, can_edit_messages, can_pin_messages);
+        return Objects.hash(is_anonymous,
+                can_manage_chat,
+                can_delete_messages,
+                can_manage_video_chats,
+                can_restrict_members,
+                can_promote_members,
+                can_change_info,
+                can_invite_users,
+                can_post_messages,
+                can_edit_messages,
+                can_pin_messages,
+                can_manage_topics);
     }
 
     @Override
@@ -144,6 +177,7 @@ public String toString() {
                 ", can_post_messages=" + can_post_messages +
                 ", can_edit_messages=" + can_edit_messages +
                 ", can_pin_messages=" + can_pin_messages +
+                ", can_manage_topics=" + can_manage_topics +
                 '}';
     }
 

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

@@ -31,6 +31,7 @@ public enum Status {
     private Boolean can_change_info;
     private Boolean can_invite_users;
     private Boolean can_pin_messages;
+    private Boolean can_manage_topics;
     private Boolean is_member;
     private Boolean can_send_messages;
     private Boolean can_send_media_messages;
@@ -109,6 +110,10 @@ public Boolean canPinMessages() {
         return can_pin_messages;
     }
 
+    public Boolean canManageTopics() {
+        return can_manage_topics;
+    }
+
     public Boolean isMember() {
         return is_member;
     }
@@ -154,6 +159,7 @@ 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(is_member, that.is_member) &&
                 Objects.equals(can_send_messages, that.can_send_messages) &&
                 Objects.equals(can_send_media_messages, that.can_send_media_messages) &&
@@ -164,7 +170,29 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(user, status, custom_title, is_anonymous, until_date, can_be_edited, can_manage_chat, can_post_messages, can_edit_messages, can_delete_messages, can_manage_video_chats, can_restrict_members, can_promote_members, can_change_info, can_invite_users, can_pin_messages, is_member, can_send_messages, can_send_media_messages, can_send_polls, can_send_other_messages, can_add_web_page_previews);
+        return Objects.hash(user,
+                status,
+                custom_title,
+                is_anonymous,
+                until_date,
+                can_be_edited,
+                can_manage_chat,
+                can_post_messages,
+                can_edit_messages,
+                can_delete_messages,
+                can_manage_video_chats,
+                can_restrict_members,
+                can_promote_members,
+                can_change_info,
+                can_invite_users,
+                can_pin_messages,
+                can_manage_topics,
+                is_member,
+                can_send_messages,
+                can_send_media_messages,
+                can_send_polls,
+                can_send_other_messages,
+                can_add_web_page_previews);
     }
 
     @Override
@@ -186,6 +214,7 @@ public String toString() {
                 ", can_change_info=" + can_change_info +
                 ", can_invite_users=" + can_invite_users +
                 ", can_pin_messages=" + can_pin_messages +
+                ", can_manage_topics=" + can_manage_topics +
                 ", is_member=" + is_member +
                 ", can_send_messages=" + can_send_messages +
                 ", can_send_media_messages=" + can_send_media_messages +

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

@@ -1,6 +1,7 @@
 package com.pengrad.telegrambot.model;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * Stas Parshin
@@ -17,6 +18,7 @@ public class ChatPermissions implements Serializable {
     private Boolean can_change_info;
     private Boolean can_invite_users;
     private Boolean can_pin_messages;
+    private Boolean can_manage_topics;
 
     public Boolean canSendMessages() {
         return can_send_messages;
@@ -50,6 +52,10 @@ public Boolean canPinMessages() {
         return can_pin_messages;
     }
 
+    public Boolean canManageTopics() {
+        return can_manage_topics;
+    }
+
     public ChatPermissions canSendMessages(boolean canSendMessages) {
         can_send_messages = canSendMessages;
         return this;
@@ -90,40 +96,40 @@ public ChatPermissions canPinMessages(boolean canPinMessages) {
         return this;
     }
 
+    public ChatPermissions canManageTopics(boolean canManageTopics) {
+        this.can_manage_topics = canManageTopics;
+        return this;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
         ChatPermissions that = (ChatPermissions) o;
 
-        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_polls != null ? !can_send_polls.equals(that.can_send_polls) : that.can_send_polls != 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;
-        if (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)
-            return false;
-        if (can_change_info != null ? !can_change_info.equals(that.can_change_info) : that.can_change_info != null)
-            return false;
-        if (can_invite_users != null ? !can_invite_users.equals(that.can_invite_users) : that.can_invite_users != null)
-            return false;
-        return can_pin_messages != null ? can_pin_messages.equals(that.can_pin_messages) : that.can_pin_messages == null;
+        return Objects.equals(can_send_messages, that.can_send_messages) &&
+                Objects.equals(can_send_media_messages, that.can_send_media_messages) &&
+                Objects.equals(can_send_polls, that.can_send_polls) &&
+                Objects.equals(can_send_other_messages, that.can_send_other_messages) &&
+                Objects.equals(can_add_web_page_previews, that.can_add_web_page_previews) &&
+                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);
     }
 
     @Override
     public int hashCode() {
-        int 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_polls != null ? can_send_polls.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);
-        result = 31 * result + (can_change_info != null ? can_change_info.hashCode() : 0);
-        result = 31 * result + (can_invite_users != null ? can_invite_users.hashCode() : 0);
-        result = 31 * result + (can_pin_messages != null ? can_pin_messages.hashCode() : 0);
-        return result;
+        return Objects.hash(can_send_messages,
+                can_send_media_messages,
+                can_send_polls,
+                can_send_other_messages,
+                can_add_web_page_previews,
+                can_change_info,
+                can_invite_users,
+                can_pin_messages,
+                can_manage_topics);
     }
 
     @Override
@@ -137,6 +143,7 @@ public String toString() {
                 ", can_change_info=" + can_change_info +
                 ", can_invite_users=" + can_invite_users +
                 ", can_pin_messages=" + can_pin_messages +
+                ", can_manage_topics=" + can_manage_topics +
                 '}';
     }
 }