Merge pull request #274 from mircoianese/master

BOT Api v6.0

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

@@ -0,0 +1,112 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Mirco Ianese
+ * 20 Apr 2022
+ */
+public class ChatAdministratorRights implements Serializable {
+
+    private final static long serialVersionUID = 0L;
+
+    private Boolean is_anonymous;
+    private Boolean can_manage_chat;
+    private Boolean can_delete_messages;
+    private Boolean can_manage_video_chats;
+    private Boolean can_restrict_members;
+    private Boolean can_promote_members;
+    private Boolean can_change_info;
+    private Boolean can_invite_users;
+    private Boolean can_post_messages;
+    private Boolean can_edit_messages;
+    private Boolean can_pin_messages;
+
+    public Boolean isAnonymous() {
+        return is_anonymous;
+    }
+
+    public Boolean canManageChat() {
+        return can_manage_chat;
+    }
+
+    public Boolean canDeleteMessages() {
+        return can_delete_messages;
+    }
+
+    public Boolean canManageVideoChats() {
+        return can_manage_video_chats;
+    }
+
+    public Boolean canRestrictMembers() {
+        return can_restrict_members;
+    }
+
+    public Boolean canPromoteMembers() {
+        return can_promote_members;
+    }
+
+    public Boolean canChangeInfo() {
+        return can_change_info;
+    }
+
+    public Boolean canInviteUsers() {
+        return can_invite_users;
+    }
+
+    public Boolean canPostMessages() {
+        return can_post_messages;
+    }
+
+    public Boolean canEditMessages() {
+        return can_edit_messages;
+    }
+
+    public Boolean canPinMessages() {
+        return can_pin_messages;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ChatAdministratorRights that = (ChatAdministratorRights) o;
+        return is_anonymous == that.is_anonymous &&
+                can_manage_chat == that.can_manage_chat &&
+                can_delete_messages == that.can_delete_messages &&
+                can_manage_video_chats == that.can_manage_video_chats &&
+                can_restrict_members == that.can_restrict_members &&
+                can_promote_members == that.can_promote_members &&
+                can_change_info == that.can_change_info &&
+                can_invite_users == that.can_invite_users &&
+                can_post_messages == that.can_post_messages &&
+                can_edit_messages == that.can_edit_messages &&
+                can_pin_messages == that.can_pin_messages;
+
+    }
+
+    @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);
+    }
+
+    @Override
+    public String toString() {
+        return "ChatAdministratorRights{" +
+                "is_anonymous=" + is_anonymous +
+                ", can_manage_chat=" + can_manage_chat +
+                ", can_delete_messages='" + can_delete_messages + '\'' +
+                ", can_manage_video_chats=" + can_manage_video_chats +
+                ", can_restrict_members=" + can_restrict_members +
+                ", can_promote_members=" + can_promote_members +
+                ", can_change_info=" + can_change_info +
+                ", can_invite_users=" + can_invite_users +
+                ", can_post_messages=" + can_post_messages +
+                ", can_edit_messages=" + can_edit_messages +
+                ", can_pin_messages=" + can_pin_messages +
+                '}';
+    }
+
+}

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

@@ -24,8 +24,8 @@ public enum Status {
     private Boolean can_manage_chat;
     private Boolean can_post_messages;
     private Boolean can_edit_messages;
-    private Boolean can_delete_messages;
-    private Boolean can_manage_voice_chats;
+    private Boolean can_delete_messages;    
+    private Boolean can_manage_video_chats;
     private Boolean can_restrict_members;
     private Boolean can_promote_members;
     private Boolean can_change_info;
@@ -78,8 +78,15 @@ public Boolean canDeleteMessages() {
         return can_delete_messages;
     }
 
+    /**
+     *  @Deprecated Use canManageVideoChats() instead
+     */   
     public Boolean canManageVoiceChats() {
-        return can_manage_voice_chats;
+        return can_manage_video_chats;
+    }
+
+    public Boolean canManageVideoChats() {
+        return can_manage_video_chats;
     }
 
     public Boolean canRestrictMembers() {
@@ -141,7 +148,7 @@ public boolean equals(Object o) {
                 Objects.equals(can_post_messages, that.can_post_messages) &&
                 Objects.equals(can_edit_messages, that.can_edit_messages) &&
                 Objects.equals(can_delete_messages, that.can_delete_messages) &&
-                Objects.equals(can_manage_voice_chats, that.can_manage_voice_chats) &&
+                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) &&
@@ -157,7 +164,7 @@ 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_voice_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, is_member, can_send_messages, can_send_media_messages, can_send_polls, can_send_other_messages, can_add_web_page_previews);
     }
 
     @Override
@@ -173,7 +180,7 @@ public String toString() {
                 ", can_post_messages=" + can_post_messages +
                 ", can_edit_messages=" + can_edit_messages +
                 ", can_delete_messages=" + can_delete_messages +
-                ", can_manage_voice_chats=" + can_manage_voice_chats +
+                ", can_manage_video_chats=" + can_manage_video_chats +
                 ", can_restrict_members=" + can_restrict_members +
                 ", can_promote_members=" + can_promote_members +
                 ", can_change_info=" + can_change_info +

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

@@ -0,0 +1,18 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+
+/**
+ * Mirco Ianese
+ * 20 Apr 2022
+ */
+public class MenuButton<T extends MenuButton<T>> implements Serializable {
+
+    private final static long serialVersionUID = 0L;
+
+    private final String type;
+
+    public MenuButton(String type) {
+        this.type = type;
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+
+/**
+ * Mirco Ianese
+ * 20 Apr 2022
+ */
+public class MenuButtonCommands extends MenuButton<MenuButtonCommands> implements Serializable {
+
+    private final static long serialVersionUID = 0L;
+
+    public MenuButtonCommands() {
+        super("commands");
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+
+/**
+ * Mirco Ianese
+ * 20 Apr 2022
+ */
+public class MenuButtonDefault extends MenuButton<MenuButtonDefault> implements Serializable {
+
+    private final static long serialVersionUID = 0L;
+
+    public MenuButtonDefault() {
+        super("default");
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+
+/**
+ * Mirco Ianese
+ * 20 Apr 2022
+ */
+public class MenuButtonWebApp extends MenuButton<MenuButtonWebApp> implements Serializable {
+
+    private final static long serialVersionUID = 0L;
+
+    private String text;
+    private WebAppInfo web_app_info;
+
+    public MenuButtonWebApp(String text, WebAppInfo webAppInfo) {
+        super("web_app");
+        this.text = text;
+        this.web_app_info = webAppInfo;
+    }
+
+}

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

@@ -67,11 +67,12 @@ public class Message implements Serializable {
     private String connected_website;
     private PassportData passport_data;
     private ProximityAlertTriggered proximity_alert_triggered;
-    private VoiceChatStarted voice_chat_started;
-    private VoiceChatEnded voice_chat_ended;
-    private VoiceChatParticipantsInvited voice_chat_participants_invited;
-    private VoiceChatScheduled voice_chat_scheduled;
+    private VideoChatStarted video_chat_started;
+    private VideoChatEnded video_chat_ended;
+    private VideoChatParticipantsInvited video_chat_participants_invited;
+    private VideoChatScheduled video_chat_scheduled;
     private InlineKeyboardMarkup reply_markup;
+    private WebAppData web_app_data;
 
     public Integer messageId() {
         return message_id;
@@ -285,26 +286,30 @@ public ProximityAlertTriggered proximityAlertTriggered() {
         return proximity_alert_triggered;
     }
 
-    public VoiceChatStarted voiceChatStarted() {
-        return voice_chat_started;
+    public VideoChatStarted videoChatStarted() {
+        return video_chat_started;
     }
 
-    public VoiceChatEnded voiceChatEnded() {
-        return voice_chat_ended;
+    public VideoChatEnded videoChatEnded() {
+        return video_chat_ended;
     }
 
-    public VoiceChatParticipantsInvited voiceChatParticipantsInvited() {
-        return voice_chat_participants_invited;
+    public VideoChatParticipantsInvited videoChatParticipantsInvited() {
+        return video_chat_participants_invited;
     }
 
-    public VoiceChatScheduled voiceChatScheduled() {
-        return voice_chat_scheduled;
+    public VideoChatScheduled videoChatScheduled() {
+        return video_chat_scheduled;
     }
 
     public InlineKeyboardMarkup replyMarkup() {
         return reply_markup;
     }
 
+    public WebAppData webAppData() {
+        return web_app_data;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -363,11 +368,12 @@ public boolean equals(Object o) {
                 Objects.equals(connected_website, message.connected_website) &&
                 Objects.equals(passport_data, message.passport_data) &&
                 Objects.equals(proximity_alert_triggered, message.proximity_alert_triggered) &&
-                Objects.equals(voice_chat_started, message.voice_chat_started) &&
-                Objects.equals(voice_chat_ended, message.voice_chat_ended) &&
-                Objects.equals(voice_chat_participants_invited, message.voice_chat_participants_invited) &&
-                Objects.equals(voice_chat_scheduled, message.voice_chat_scheduled) &&
-                Objects.equals(reply_markup, message.reply_markup);
+                Objects.equals(video_chat_started, message.video_chat_started) &&
+                Objects.equals(video_chat_ended, message.video_chat_ended) &&
+                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);
     }
 
     @Override
@@ -431,11 +437,12 @@ public String toString() {
                 ", connected_website='" + connected_website + '\'' +
                 ", passport_data=" + passport_data +
                 ", proximity_alert_triggered=" + proximity_alert_triggered +
-                ", voice_chat_started=" + voice_chat_started +
-                ", voice_chat_ended=" + voice_chat_ended +
-                ", voice_chat_participants_invited=" + voice_chat_participants_invited +
-                ", voice_chat_scheduled=" + voice_chat_scheduled +
+                ", video_chat_started=" + video_chat_started +
+                ", video_chat_ended=" + video_chat_ended +
+                ", video_chat_participants_invited=" + video_chat_participants_invited +
+                ", video_chat_scheduled=" + video_chat_scheduled +
                 ", reply_markup=" + reply_markup +
+                ", web_app_data=" + web_app_data +
                 '}';
     }
 }

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

@@ -0,0 +1,48 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+
+/**
+ * Mirco Ianese
+ * 20 Apr 2022
+ */
+public class SentWebAppMessage implements Serializable {
+
+    private final static long serialVersionUID = 0L;
+
+    private String inline_message_id;
+
+    public SentWebAppMessage() {
+        this.inline_message_id = null;
+    }
+
+    public SentWebAppMessage(String inlineMessageId) {
+        this.inline_message_id = inlineMessageId;
+    }
+
+    public String inlineMessageId() {
+        return inline_message_id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        SentWebAppMessage sentWebAppMessage = (SentWebAppMessage) o;
+
+        return sentWebAppMessage != null ? inline_message_id.equals(sentWebAppMessage.inline_message_id) : sentWebAppMessage.inline_message_id == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return inline_message_id != null ? inline_message_id.hashCode() : 0;
+    }
+
+    @Override
+    public String toString() {
+        return "SentWebAppMessage{" +
+                "inline_message_id='" + inline_message_id + '\'' +
+                '}';
+    }
+}