Merge pull request #431 from mircoianese/master

BOT API v9.4

Author: pengrad

README.md

@@ -13,14 +13,14 @@ Java library for interacting with [Telegram Bot API](https://core.telegram.org/b
 
 Gradle:
 ```groovy
-implementation 'com.github.pengrad:java-telegram-bot-api:9.3.0'
+implementation 'com.github.pengrad:java-telegram-bot-api:9.4.0'
 ```
 Maven:
 ```xml
 <dependency>
   <groupId>com.github.pengrad</groupId>
   <artifactId>java-telegram-bot-api</artifactId>
-  <version>9.3.0</version>
+  <version>9.4.0</version>
 </dependency>
 ```
 [JAR with all dependencies on release page](https://github.com/pengrad/java-telegram-bot-api/releases)

README_RU.md

@@ -13,14 +13,14 @@ Java библиотека, созданная для работы с [Telegram B
 
 Gradle:
 ```groovy
-implementation 'com.github.pengrad:java-telegram-bot-api:9.3.0'
+implementation 'com.github.pengrad:java-telegram-bot-api:9.4.0'
 ```
 Maven:
 ```xml
 <dependency>
   <groupId>com.github.pengrad</groupId>
   <artifactId>java-telegram-bot-api</artifactId>
-  <version>9.3.0</version>
+  <version>9.4.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=9.3.0
+VERSION_NAME=9.4.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/ChatFullInfo.java

@@ -78,6 +78,7 @@ public enum Type {
     private UserRating rating;
     private Integer paid_message_star_count;
     private UniqueGiftColors unique_gift_colors;
+    private Audio first_profile_audio;
 
     public Long id() {
         return id;
@@ -278,6 +279,10 @@ public UniqueGiftColors uniqueGiftColors() {
         return unique_gift_colors;
     }
 
+    public Audio firstProfileAudio() {
+        return first_profile_audio;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -332,7 +337,8 @@ public boolean equals(Object o) {
                 Objects.equals(accepted_gift_types, chat.accepted_gift_types) &&
                 Objects.equals(rating, chat.rating) &&
                 Objects.equals(paid_message_star_count, chat.paid_message_star_count) &&
-                Objects.equals(unique_gift_colors, chat.unique_gift_colors);
+                Objects.equals(unique_gift_colors, chat.unique_gift_colors) &&
+                Objects.equals(first_profile_audio, chat.first_profile_audio);
     }
 
     @Override
@@ -393,6 +399,7 @@ public String toString() {
                 ", rating=" + rating +
                 ", paid_message_star_count=" + paid_message_star_count +
                 ", unique_gift_colors=" + unique_gift_colors +
+                ", first_profile_audio=" + first_profile_audio +
                 '}';
     }
 }

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

@@ -2,6 +2,8 @@
 
 import com.pengrad.telegrambot.model.chatbackground.ChatBackground;
 import com.pengrad.telegrambot.model.chatboost.ChatBoostAdded;
+import com.pengrad.telegrambot.model.chatowner.ChatOwnerChanged;
+import com.pengrad.telegrambot.model.chatowner.ChatOwnerLeft;
 import com.pengrad.telegrambot.model.checklist.Checklist;
 import com.pengrad.telegrambot.model.checklist.ChecklistTasksAdded;
 import com.pengrad.telegrambot.model.checklist.ChecklistTasksDone;
@@ -131,6 +133,8 @@ public class Message extends MaybeInaccessibleMessage implements Serializable {
     private SuggestedPostRefunded suggested_post_refunded;
     private DirectMessagePriceChanged direct_message_price_changed;
     private Integer paid_star_count;
+    private ChatOwnerLeft chat_owner_left;
+    private ChatOwnerChanged chat_owner_changed;
 
     public Long messageThreadId() {
         return message_thread_id;
@@ -533,6 +537,14 @@ public Integer paidStarCount() {
         return paid_star_count;
     }
 
+    public ChatOwnerLeft chatOwnerLeft() {
+        return chat_owner_left;
+    }
+
+    public ChatOwnerChanged chatOwnerChanged() {
+        return chat_owner_changed;
+    }
+
     /**
      * Only for backwards-compatibility with MaybeInaccessibleMessage
      */
@@ -661,7 +673,9 @@ public boolean equals(Object o) {
                 Objects.equals(suggested_post_paid, message.suggested_post_paid) &&
                 Objects.equals(suggested_post_refunded, message.suggested_post_refunded) &&
                 Objects.equals(direct_message_price_changed, message.direct_message_price_changed) &&
-                Objects.equals(paid_star_count, message.paid_star_count);
+                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);
     }
 
     @Override
@@ -775,6 +789,8 @@ public String toString() {
                 ", suggested_post_refunded=" + suggested_post_refunded +
                 ", direct_message_price_changed=" + direct_message_price_changed +
                 ", paid_star_count=" + paid_star_count +
+                ", chat_owner_left=" + chat_owner_left +
+                ", chat_owner_changed=" + chat_owner_changed +
                 '}';
     }
 }

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

@@ -24,6 +24,7 @@ public class User implements Serializable {
     private Boolean can_connect_to_business;
     private Boolean has_main_web_app;
     private Boolean has_topics_enabled;
+    private Boolean allows_users_to_create_topics;
 
     private User() {
     }
@@ -88,12 +89,22 @@ public Boolean hasTopicsEnabled() {
         return has_topics_enabled;
     }
 
+    public Boolean allowsUsersToCreateTopics() {
+        return allows_users_to_create_topics;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         User user = (User) o;
-        return Objects.equals(id, user.id) && Objects.equals(is_bot, user.is_bot) && Objects.equals(first_name, user.first_name) && Objects.equals(last_name, user.last_name) && Objects.equals(username, user.username) && Objects.equals(language_code, user.language_code) && Objects.equals(is_premium, user.is_premium) && Objects.equals(added_to_attachment_menu, user.added_to_attachment_menu) && Objects.equals(can_join_groups, user.can_join_groups) && Objects.equals(can_read_all_group_messages, user.can_read_all_group_messages) && Objects.equals(supports_inline_queries, user.supports_inline_queries) && Objects.equals(can_connect_to_business, user.can_connect_to_business) && Objects.equals(has_main_web_app, user.has_main_web_app) && Objects.equals(has_topics_enabled, user.has_topics_enabled);
+        return Objects.equals(id, user.id) && Objects.equals(is_bot, user.is_bot) && Objects.equals(first_name, user.first_name)
+                && Objects.equals(last_name, user.last_name) && Objects.equals(username, user.username) && Objects.equals(language_code, user.language_code)
+                && Objects.equals(is_premium, user.is_premium) && Objects.equals(added_to_attachment_menu, user.added_to_attachment_menu)
+                && Objects.equals(can_join_groups, user.can_join_groups) && Objects.equals(can_read_all_group_messages, user.can_read_all_group_messages)
+                && Objects.equals(supports_inline_queries, user.supports_inline_queries) && Objects.equals(can_connect_to_business, user.can_connect_to_business)
+                && Objects.equals(has_main_web_app, user.has_main_web_app) && Objects.equals(has_topics_enabled, user.has_topics_enabled)
+                && Objects.equals(allows_users_to_create_topics, user.allows_users_to_create_topics);
     }
 
     @Override
@@ -118,6 +129,7 @@ public String toString() {
                 ", can_connect_to_business=" + can_connect_to_business +
                 ", has_main_web_app=" + has_main_web_app +
                 ", has_topics_enabled=" + has_topics_enabled +
+                ", allows_users_to_create_topics=" + allows_users_to_create_topics +
                 '}';
     }
 }

library/src/main/java/com/pengrad/telegrambot/model/UserProfileAudios.kt

@@ -0,0 +1,22 @@
+package com.pengrad.telegrambot.model
+
+data class UserProfileAudios(
+    @get:JvmName("totalCount") val totalCount: Int,
+    @get:JvmName("audios") val audios: Array<Audio>
+) {
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is UserProfileAudios) return false
+
+        return totalCount == other.totalCount &&
+                audios contentEquals other.audios
+    }
+
+    override fun hashCode(): Int {
+        var result = totalCount.hashCode()
+        result = 31 * result + audios.contentHashCode()
+        return result
+    }
+
+}

library/src/main/java/com/pengrad/telegrambot/model/Video.kt

@@ -17,7 +17,9 @@ data class Video(
 
     @get:JvmName("fileName") val fileName: String? = null,
     @get:JvmName("mimeType") val mimeType: String? = null,
-    @get:JvmName("fileSize") val fileSize: Long? = null
+    @get:JvmName("fileSize") val fileSize: Long? = null,
+
+    @get:JvmName("qualities") val qualities: Array<VideoQuality>? = null
 ) {
 
     /**
@@ -35,4 +37,38 @@ data class Video(
      */
     fun duration() = duration as JavaInteger
 
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is Video) return false
+
+        return fileId == other.fileId &&
+                fileUniqueId == other.fileUniqueId &&
+                width == other.width &&
+                height == other.height &&
+                duration == other.duration &&
+                thumbnail == other.thumbnail &&
+                cover == other.cover &&
+                startTimestamp == other.startTimestamp &&
+                fileName == other.fileName &&
+                mimeType == other.mimeType &&
+                fileSize == other.fileSize &&
+                qualities contentEquals other.qualities
+    }
+
+    override fun hashCode(): Int {
+        var result = fileId.hashCode()
+        result = 31 * result + fileUniqueId.hashCode()
+        result = 31 * result + width.hashCode()
+        result = 31 * result + height.hashCode()
+        result = 31 * result + duration.hashCode()
+        result = 31 * result + (thumbnail?.hashCode() ?: 0)
+        result = 31 * result + (cover?.hashCode() ?: 0)
+        result = 31 * result + (startTimestamp?.hashCode() ?: 0)
+        result = 31 * result + (fileName?.hashCode() ?: 0)
+        result = 31 * result + (mimeType?.hashCode() ?: 0)
+        result = 31 * result + (fileSize?.hashCode() ?: 0)
+        result = 31 * result + (qualities?.contentHashCode() ?: 0)
+        return result
+    }
+
 }

library/src/main/java/com/pengrad/telegrambot/model/VideoQuality.kt

@@ -0,0 +1,10 @@
+package com.pengrad.telegrambot.model
+
+data class VideoQuality(
+    @get:JvmName("fileId") val fileId: String,
+    @get:JvmName("fileUniqueId") val fileUniqueId: String,
+    @get:JvmName("width") val width: Int,
+    @get:JvmName("height") val height: Int,
+    @get:JvmName("codec") val codec: String,
+    @get:JvmName("fileSize") val fileSize: Long? = null
+)

library/src/main/java/com/pengrad/telegrambot/model/chatowner/ChatOwnerChanged.kt

@@ -0,0 +1,8 @@
+package com.pengrad.telegrambot.model.chatowner
+
+import com.pengrad.telegrambot.model.User
+
+data class ChatOwnerChanged(
+    @get:JvmName("newOwner") val newOwner: User
+) {
+}