Merge pull request #295 from mircoianese/api_6.2

BOT Api v6.2

Author: pengrad

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

@@ -32,6 +32,7 @@ public enum Type {
     private ChatPhoto photo;
     private String bio;
     private Boolean has_private_forwards;
+    private Boolean has_restricted_voice_and_video_messages;
     private Boolean join_to_send_messages;
     private Boolean join_by_request;
     private String description;
@@ -82,6 +83,10 @@ public Boolean hasPrivateForwards() {
         return has_private_forwards != null && has_private_forwards;
     }
 
+    public Boolean hasRestrictedVoiceAndVideoMessages() {
+        return has_restricted_voice_and_video_messages != null && has_restricted_voice_and_video_messages;
+    }
+
     public Boolean joinToSendMessages() {
         return join_to_send_messages != null && join_to_send_messages;
     }
@@ -148,6 +153,7 @@ public boolean equals(Object o) {
                 Objects.equals(photo, chat.photo) &&
                 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) &&
                 Objects.equals(join_to_send_messages, chat.join_to_send_messages) &&
                 Objects.equals(join_by_request, chat.join_by_request) &&
                 Objects.equals(description, chat.description) &&
@@ -180,6 +186,7 @@ public String toString() {
                 ", photo=" + photo +
                 ", bio='" + bio + '\'' +
                 ", has_private_forwards=" + has_private_forwards +
+                ", has_restricted_voice_and_video_messages=" + has_restricted_voice_and_video_messages +
                 ", join_to_send_messages=" + join_to_send_messages +
                 ", join_by_request=" + join_by_request +
                 ", description='" + description + '\'' +

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

@@ -12,7 +12,7 @@ public class MessageEntity implements Serializable {
 
     public enum Type {
         mention, hashtag, cashtag, bot_command, url, email, phone_number, bold, italic, code, pre, text_link,
-        text_mention, underline, strikethrough, spoiler
+        text_mention, underline, strikethrough, spoiler, custom_emoji
     }
 
     private Type type;
@@ -21,6 +21,7 @@ public enum Type {
     private String url;
     private User user;
     private String language;
+    private String custom_emoji_id;
 
     private MessageEntity() {
     }
@@ -55,6 +56,10 @@ public String language() {
         return language;
     }
 
+    public String customEmojiId() {
+        return custom_emoji_id;
+    }
+
     public MessageEntity url(String url) {
         this.url = url;
         return this;
@@ -70,6 +75,11 @@ public MessageEntity language(String language) {
         return this;
     }
 
+    public MessageEntity customEmojiId(String custom_emoji_id) {
+        this.custom_emoji_id = custom_emoji_id;
+        return this;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -80,12 +90,13 @@ public boolean equals(Object o) {
                 Objects.equals(length, that.length) &&
                 Objects.equals(url, that.url) &&
                 Objects.equals(user, that.user) &&
-                Objects.equals(language, that.language);
+                Objects.equals(language, that.language) &&
+                Objects.equals(custom_emoji_id, that.custom_emoji_id);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(type, offset, length, url, user, language);
+        return Objects.hash(type, offset, length, url, user, language, custom_emoji_id);
     }
 
     @Override
@@ -97,6 +108,7 @@ public String toString() {
                 ", url='" + url + '\'' +
                 ", user=" + user +
                 ", language='" + language + '\'' +
+                ", custom_emoji_id='" + custom_emoji_id + '\'' +
                 '}';
     }
 }

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

@@ -8,10 +8,16 @@
  * 8/5/15.
  */
 public class Sticker implements Serializable {
+
+    public enum Type {
+        regular, mask, custom_emoji
+    }
+
     private final static long serialVersionUID = 0L;
 
     private String file_id;
     private String file_unique_id;
+    private Type type;
     private Integer width;
     private Integer height;
     private Boolean is_animated;
@@ -21,6 +27,7 @@ public class Sticker implements Serializable {
     private String set_name;
     private File premium_animation;
     private MaskPosition mask_position;
+    private String custom_emoji_id;
     private Long file_size;
 
     public String fileId() {
@@ -31,6 +38,10 @@ public String fileUniqueId() {
         return file_unique_id;
     }
 
+    public Type type() {
+        return type;
+    }
+
     public Integer width() {
         return width;
     }
@@ -67,6 +78,10 @@ public MaskPosition maskPosition() {
         return mask_position;
     }
 
+    public String customEmojiId() {
+        return custom_emoji_id;
+    }
+
     public Long fileSize() {
         return file_size;
     }
@@ -78,6 +93,7 @@ public boolean equals(Object o) {
         Sticker sticker = (Sticker) o;
         return Objects.equals(file_id, sticker.file_id) &&
                 Objects.equals(file_unique_id, sticker.file_unique_id) &&
+                Objects.equals(type, sticker.type) &&
                 Objects.equals(width, sticker.width) &&
                 Objects.equals(height, sticker.height) &&
                 Objects.equals(is_animated, sticker.is_animated) &&
@@ -87,6 +103,7 @@ public boolean equals(Object o) {
                 Objects.equals(set_name, sticker.set_name) &&
                 Objects.equals(premium_animation, sticker.premium_animation) &&
                 Objects.equals(mask_position, sticker.mask_position) &&
+                Objects.equals(custom_emoji_id, sticker.custom_emoji_id) &&
                 Objects.equals(file_size, sticker.file_size);
     }
 
@@ -100,6 +117,7 @@ public String toString() {
         return "Sticker{" +
                 "file_id='" + file_id + '\'' +
                 ", file_unique_id='" + file_unique_id + '\'' +
+                ", type=" + type +
                 ", width=" + width +
                 ", height=" + height +
                 ", is_animated=" + is_animated +
@@ -109,6 +127,7 @@ public String toString() {
                 ", set_name='" + set_name + '\'' +
                 ", premium_animation=" + premium_animation +
                 ", mask_position=" + mask_position +
+                ", custom_emoji_id=" + custom_emoji_id +
                 ", file_size=" + file_size +
                 '}';
     }

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

@@ -4,6 +4,8 @@
 import java.util.Arrays;
 import java.util.Objects;
 
+import com.pengrad.telegrambot.model.Sticker.Type;
+
 /**
  * Stas Parshin
  * 23 July 2017
@@ -13,6 +15,7 @@ public class StickerSet implements Serializable {
 
     private String name;
     private String title;
+    private Type sticker_type;
     private Boolean is_animated;
     private Boolean is_video;
     private Boolean contains_masks;
@@ -27,10 +30,18 @@ public String title() {
         return title;
     }
 
+    public Type stickerType() {
+        return sticker_type;
+    }
+
     public Boolean isAnimated() {
         return is_animated;
     }
 
+    /** 
+     *  @deprecated Use type() and check if it equals to Type.mask
+     */   
+    @Deprecated
     public Boolean containsMasks() {
         return contains_masks;
     }
@@ -54,16 +65,16 @@ public boolean equals(Object o) {
         StickerSet that = (StickerSet) o;
         return Objects.equals(name, that.name) &&
                 Objects.equals(title, that.title) &&
+                Objects.equals(sticker_type, that.sticker_type) &&
                 Objects.equals(is_animated, that.is_animated) &&
                 Objects.equals(is_video, that.is_video) &&
-                Objects.equals(contains_masks, that.contains_masks) &&
                 Arrays.equals(stickers, that.stickers) &&
                 Objects.equals(thumb, that.thumb);
     }
 
     @Override
     public int hashCode() {
-        int result = Objects.hash(name, title, is_animated, is_video, contains_masks, thumb);
+        int result = Objects.hash(name, title, sticker_type, is_animated, is_video, thumb);
         result = 31 * result + Arrays.hashCode(stickers);
         return result;
     }
@@ -73,9 +84,9 @@ public String toString() {
         return "StickerSet{" +
                 "name='" + name + '\'' +
                 ", title='" + title + '\'' +
+                ", sticker_type='" + sticker_type + '\'' +
                 ", is_animated=" + is_animated +
                 ", is_video=" + is_video +
-                ", contains_masks=" + contains_masks +
                 ", stickers=" + Arrays.toString(stickers) +
                 ", thumb=" + thumb +
                 '}';

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

@@ -1,6 +1,7 @@
 package com.pengrad.telegrambot.request;
 
 import com.pengrad.telegrambot.model.MaskPosition;
+import com.pengrad.telegrambot.model.Sticker.Type;
 import com.pengrad.telegrambot.response.BaseResponse;
 
 /**
@@ -37,11 +38,24 @@ private CreateNewStickerSet(Long userId, String name, String title, String emoji
         add("emojis", emojis);
     }
 
+    /**
+     * @deprecated Use stickerType(Type.mask) instead
+     */
+    @Deprecated
     public CreateNewStickerSet containsMasks(boolean containsMasks) {
         return add("contains_masks", containsMasks);
     }
 
     public CreateNewStickerSet maskPosition(MaskPosition maskPosition) {
         return add("mask_position", maskPosition).containsMasks(true);
     }
+
+    /**
+     * Type of stickers in the set.
+     * @param stickerType pass “regular” or “mask”. "custom_emoji" is defaulted to "regular".
+     * @return a CreateNewStickerSet object
+     */
+    public CreateNewStickerSet stickerType(Type stickerType) {
+        return add("sticker_type", stickerType.name());
+    }
 }

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

@@ -0,0 +1,15 @@
+package com.pengrad.telegrambot.request;
+
+import com.pengrad.telegrambot.response.GetCustomEmojiStickersResponse;
+
+/**
+ * Mirco Ianese
+ * 16 Aug 2022
+ */
+public class GetCustomEmojiStickers extends BaseRequest<GetCustomEmojiStickers, GetCustomEmojiStickersResponse> {
+
+    public GetCustomEmojiStickers(String... custom_emoji_ids) {
+        super(GetCustomEmojiStickersResponse.class);
+        add("custom_emoji_ids", custom_emoji_ids);
+    }
+}

library/src/main/java/com/pengrad/telegrambot/response/GetCustomEmojiStickersResponse.java

@@ -0,0 +1,25 @@
+package com.pengrad.telegrambot.response;
+
+import java.util.Arrays;
+
+import com.pengrad.telegrambot.model.Sticker;
+
+/**
+ * Mirco Ianese
+ * 16 Aug 2022
+ */
+public class GetCustomEmojiStickersResponse extends BaseResponse {
+
+    private Sticker[] result;
+
+    public Sticker[] result() {
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "GetCustomEmojiStickersResponse{" +
+                "result=" + Arrays.toString(result) +
+                '}';
+    }
+}