Merge pull request #424 from mircoianese/api_9.0

BOT API v9.0

Author: pengrad

README.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 library for interacting with [Telegram Bot API](https://core.telegram.org/bots/api)
-- Full support of all Bot API 8.3 methods
+- Full support of all Bot API 9.0 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)
@@ -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:8.3.0'
+implementation 'com.github.pengrad:java-telegram-bot-api:9.0.0'
 ```
 Maven:
 ```xml
 <dependency>
   <groupId>com.github.pengrad</groupId>
   <artifactId>java-telegram-bot-api</artifactId>
-  <version>8.3.0</version>
+  <version>9.0.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 8.3
+- Полная поддержка всех методов BOT API 9.0
 - Поддержка 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:8.3.0'
+implementation 'com.github.pengrad:java-telegram-bot-api:9.0.0'
 ```
 Maven:
 ```xml
 <dependency>
   <groupId>com.github.pengrad</groupId>
   <artifactId>java-telegram-bot-api</artifactId>
-  <version>8.3.0</version>
+  <version>9.0.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=8.3.0
+VERSION_NAME=9.0.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

@@ -4,6 +4,7 @@
 import com.pengrad.telegrambot.model.business.BusinessIntro;
 import com.pengrad.telegrambot.model.business.BusinessLocation;
 import com.pengrad.telegrambot.model.business.BusinessOpeningHours;
+import com.pengrad.telegrambot.model.gift.AcceptedGiftTypes;
 import com.pengrad.telegrambot.model.reaction.ReactionType;
 
 
@@ -71,6 +72,7 @@ public enum Type {
     private Long linked_chat_id;
     private ChatLocation location;
     private Boolean can_send_gift;
+    private AcceptedGiftTypes accepted_gift_types;
 
     public Long id() {
         return id;
@@ -247,10 +249,19 @@ public ChatLocation location() {
         return location;
     }
 
+    /**
+     *
+     * @deprecated Use 'acceptedGiftTypes' instead
+     */
+    @Deprecated
     public Boolean canSendGift() {
         return can_send_gift;
     }
 
+    public AcceptedGiftTypes acceptedGiftTypes() {
+        return accepted_gift_types;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -300,7 +311,7 @@ public boolean equals(Object o) {
                 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) &&
-                Objects.equals(can_send_gift, chat.can_send_gift);
+                Objects.equals(accepted_gift_types, chat.accepted_gift_types);
     }
 
     @Override
@@ -355,7 +366,7 @@ public String toString() {
                 ", custom_emoji_sticker_set_name=" + custom_emoji_sticker_set_name +
                 ", linked_chat_id=" + linked_chat_id +
                 ", location=" + location +
-                ", can_send_gift=" + can_send_gift +
+                ", accepted_gift_types=" + accepted_gift_types +
                 '}';
     }
 }

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

@@ -0,0 +1,30 @@
+package com.pengrad.telegrambot.model
+
+@Suppress("unused")
+class LocationAddress private constructor(
+    @get:JvmName("countryCode") val countryCode: String,
+    @get:JvmName("state") var state: String?,
+    @get:JvmName("city") var city: String?,
+    @get:JvmName("street") var street: String?
+) {
+
+    constructor(countryCode: String) : this(
+        countryCode = countryCode,
+        state = null,
+        city = null,
+        street = null
+    )
+
+    fun state(state: String) = apply {
+        this.state = state
+    }
+
+    fun city(city: String) = apply {
+        this.city = city
+    }
+
+    fun street(street: String) = apply {
+        this.street = street
+    }
+
+}

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.gift.GiftInfo;
+import com.pengrad.telegrambot.model.gift.unique.UniqueGiftInfo;
 import com.pengrad.telegrambot.model.giveaway.Giveaway;
 import com.pengrad.telegrambot.model.giveaway.GiveawayCompleted;
 import com.pengrad.telegrambot.model.giveaway.GiveawayCreated;
@@ -105,6 +107,10 @@ public class Message extends MaybeInaccessibleMessage implements Serializable {
     private VideoChatScheduled video_chat_scheduled;
     private InlineKeyboardMarkup reply_markup;
     private WebAppData web_app_data;
+    private GiftInfo gift;
+    private UniqueGiftInfo unique_gift;
+    private PaidMessagePriceChanged paid_message_price_changed;
+    private Integer paid_star_count;
 
     public Integer messageThreadId() {
         return message_thread_id;
@@ -435,6 +441,22 @@ public WebAppData webAppData() {
         return web_app_data;
     }
 
+    public GiftInfo gift() {
+        return gift;
+    }
+
+    public UniqueGiftInfo uniqueGift() {
+        return unique_gift;
+    }
+
+    public PaidMessagePriceChanged paidMessagePriceChanged() {
+        return paid_message_price_changed;
+    }
+
+    public Integer paidStarCount() {
+        return paid_star_count;
+    }
+
     /**
      * Only for backwards-compatibility with MaybeInaccessibleMessage
      */
@@ -545,7 +567,11 @@ public boolean equals(Object o) {
                 Objects.equals(video_chat_participants_invited, message.video_chat_participants_invited) &&
                 Objects.equals(video_chat_scheduled, message.video_chat_scheduled) &&
                 Objects.equals(reply_markup, message.reply_markup) &&
-                Objects.equals(web_app_data, message.web_app_data);
+                Objects.equals(web_app_data, message.web_app_data) &&
+                Objects.equals(gift, message.gift) &&
+                Objects.equals(unique_gift, message.unique_gift) &&
+                Objects.equals(paid_message_price_changed, message.paid_message_price_changed) &&
+                Objects.equals(paid_star_count, message.paid_star_count);
     }
 
     @Override
@@ -641,6 +667,10 @@ public String toString() {
                 ", video_chat_scheduled=" + video_chat_scheduled +
                 ", reply_markup=" + reply_markup +
                 ", web_app_data=" + web_app_data +
+                ", gift=" + gift +
+                ", unique_gift=" + unique_gift +
+                ", paid_message_price_changed=" + paid_message_price_changed +
+                ", paid_star_count=" + paid_star_count +
                 '}';
     }
 }

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

@@ -0,0 +1,5 @@
+package com.pengrad.telegrambot.model
+
+data class PaidMessagePriceChanged(
+    @get:JvmName("prizeStarCount") val prizeStarCount: Int
+)

library/src/main/java/com/pengrad/telegrambot/model/business/BusinessBotRights.kt

@@ -0,0 +1,20 @@
+package com.pengrad.telegrambot.model.business
+
+data class BusinessBotRights(
+    @get:JvmName("canReply") val canReply: Boolean,
+    @get:JvmName("canReadMessages") val canReadMessages: Boolean,
+    @get:JvmName("canDeleteSentMessages") val canDeleteSentMessages: Boolean,
+    @get:JvmName("canDeleteAllMessages") val canDeleteAllMessages: Boolean,
+    @get:JvmName("canEditName") val canEditName: Boolean,
+    @get:JvmName("canEditBio") val canEditBio: Boolean,
+    @get:JvmName("canEditProfilePhoto") val canEditProfilePhoto: Boolean,
+    @get:JvmName("canEditUsername") val canEditUsername: Boolean,
+    @get:JvmName("canChangeGiftSettings") val canChangeGiftSettings: Boolean,
+    @get:JvmName("canViewGiftsAndStars") val canViewGiftsAndStars: Boolean,
+    @get:JvmName("canConvertGiftsToStars") val canConvertGiftsToStars: Boolean,
+    @get:JvmName("canTransferAndUpgradeGifts") val canTransferAndUpgradeGifts: Boolean,
+    @get:JvmName("canTransferStars") val canTransferStars: Boolean,
+    @get:JvmName("canManageStories") val canManageStories: Boolean,
+) {
+
+}

library/src/main/java/com/pengrad/telegrambot/model/business/BusinessConnection.java

@@ -10,6 +10,7 @@ public class BusinessConnection {
     private User user;
     private Long user_chat_id;
     private Integer date;
+    private BusinessBotRights rights;
     private Boolean can_reply;
     private Boolean is_enabled;
 
@@ -29,10 +30,18 @@ public Integer date() {
         return date;
     }
 
+    /**
+     * @deprecated Use the 'rights' field instead.
+     */
+    @Deprecated
     public Boolean canReply() {
         return can_reply;
     }
 
+    public BusinessBotRights rights() {
+        return rights;
+    }
+
     public Boolean isEnabled() {
         return is_enabled;
     }
@@ -42,12 +51,12 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         BusinessConnection that = (BusinessConnection) o;
-        return Objects.equals(id, that.id) && Objects.equals(user, that.user) && Objects.equals(user_chat_id, that.user_chat_id) && Objects.equals(date, that.date) && Objects.equals(can_reply, that.can_reply) && Objects.equals(is_enabled, that.is_enabled);
+        return Objects.equals(id, that.id) && Objects.equals(user, that.user) && Objects.equals(user_chat_id, that.user_chat_id) && Objects.equals(date, that.date) && Objects.equals(rights, that.rights) && Objects.equals(is_enabled, that.is_enabled);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, user, user_chat_id, date, can_reply, is_enabled);
+        return Objects.hash(id, user, user_chat_id, date, rights, is_enabled);
     }
 
     @Override
@@ -57,7 +66,7 @@ public String toString() {
                 ", user=" + user +
                 ", user_chat_id=" + user_chat_id +
                 ", date=" + date +
-                ", can_reply=" + can_reply +
+                ", rights=" + rights +
                 ", is_enabled=" + is_enabled +
                 '}';
     }

library/src/main/java/com/pengrad/telegrambot/model/gift/AcceptedGiftTypes.kt

@@ -0,0 +1,8 @@
+package com.pengrad.telegrambot.model.gift
+
+data class AcceptedGiftTypes(
+    @get:JvmName("unlimitedGifts") val unlimitedGifts: Boolean,
+    @get:JvmName("limitedGifts") val limitedGifts: Boolean,
+    @get:JvmName("uniqueGifts") val uniqueGifts: Boolean,
+    @get:JvmName("premiumSubscription") val premiumSubscription: Boolean
+)