diff --git a/library/src/main/java/com/pengrad/telegrambot/model/ChatAdministratorRights.java b/library/src/main/java/com/pengrad/telegrambot/model/ChatAdministratorRights.java index 511746dc..68a837c8 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/ChatAdministratorRights.java +++ b/library/src/main/java/com/pengrad/telegrambot/model/ChatAdministratorRights.java @@ -22,6 +22,9 @@ public class ChatAdministratorRights implements Serializable { private Boolean can_post_messages; private Boolean can_edit_messages; private Boolean can_pin_messages; + private Boolean can_post_stories; + private Boolean can_edit_stories; + private Boolean can_delete_stories; private Boolean can_manage_topics; public Boolean isAnonymous() { @@ -68,6 +71,18 @@ public Boolean canPinMessages() { return can_pin_messages; } + public Boolean canPostStories() { + return can_post_stories; + } + + public Boolean canEditStories() { + return can_edit_stories; + } + + public Boolean canDeleteStories() { + return can_delete_stories; + } + public Boolean canManageTopics() { return can_manage_topics; } @@ -122,6 +137,21 @@ public ChatAdministratorRights canPinMessages(boolean canPinMessages) { return this; } + public ChatAdministratorRights canPostStories(boolean canPostStories) { + this.can_post_stories = canPostStories; + return this; + } + + public ChatAdministratorRights canEditStories(boolean canEditStories) { + this.can_edit_stories = canEditStories; + return this; + } + + public ChatAdministratorRights canDeleteStories(boolean canDeleteStories) { + this.can_delete_stories = canDeleteStories; + return this; + } + public ChatAdministratorRights canManageTopics(boolean canManageTopics) { this.can_manage_topics = canManageTopics; return this; @@ -144,6 +174,9 @@ 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_pin_messages, that.can_pin_messages) && + Objects.equals(can_post_stories, that.can_post_stories) && + Objects.equals(can_edit_stories, that.can_edit_stories) && + Objects.equals(can_delete_stories, that.can_delete_stories) && Objects.equals(can_manage_topics, that.can_manage_topics); } @@ -160,6 +193,9 @@ public int hashCode() { can_post_messages, can_edit_messages, can_pin_messages, + can_post_stories, + can_edit_stories, + can_delete_stories, can_manage_topics); } @@ -177,6 +213,9 @@ public String toString() { ", can_post_messages=" + can_post_messages + ", can_edit_messages=" + can_edit_messages + ", can_pin_messages=" + can_pin_messages + + ", can_post_stories=" + can_post_stories + + ", can_edit_stories=" + can_edit_stories + + ", can_delete_stories=" + can_delete_stories + ", can_manage_topics=" + can_manage_topics + '}'; } diff --git a/library/src/main/java/com/pengrad/telegrambot/model/ChatMember.java b/library/src/main/java/com/pengrad/telegrambot/model/ChatMember.java index 2995e74a..b06df2a7 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/ChatMember.java +++ b/library/src/main/java/com/pengrad/telegrambot/model/ChatMember.java @@ -31,6 +31,9 @@ public enum Status { private Boolean can_change_info; private Boolean can_invite_users; private Boolean can_pin_messages; + private Boolean can_post_stories; + private Boolean can_edit_stories; + private Boolean can_delete_stories; private Boolean can_manage_topics; private Boolean is_member; private Boolean can_send_messages; @@ -117,6 +120,18 @@ public Boolean canPinMessages() { return can_pin_messages; } + public Boolean canPostStories() { + return can_post_stories; + } + + public Boolean canEditStories() { + return can_edit_stories; + } + + public Boolean canDeleteStories() { + return can_delete_stories; + } + public Boolean canManageTopics() { return can_manage_topics; } @@ -186,6 +201,9 @@ 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_post_stories, that.can_post_stories) && + Objects.equals(can_edit_stories, that.can_edit_stories) && + Objects.equals(can_delete_stories, that.can_delete_stories) && 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) && @@ -218,6 +236,9 @@ public int hashCode() { can_change_info, can_invite_users, can_pin_messages, + can_post_stories, + can_edit_stories, + can_delete_stories, can_manage_topics, is_member, can_send_messages, @@ -251,6 +272,9 @@ public String toString() { ", can_change_info=" + can_change_info + ", can_invite_users=" + can_invite_users + ", can_pin_messages=" + can_pin_messages + + ", can_post_stories=" + can_post_stories + + ", can_edit_stories=" + can_edit_stories + + ", can_delete_stories=" + can_delete_stories + ", can_manage_topics=" + can_manage_topics + ", is_member=" + is_member + ", can_send_messages=" + can_send_messages + diff --git a/library/src/main/java/com/pengrad/telegrambot/model/WriteAccessAllowed.java b/library/src/main/java/com/pengrad/telegrambot/model/WriteAccessAllowed.java index 3590a6d9..23e16953 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/WriteAccessAllowed.java +++ b/library/src/main/java/com/pengrad/telegrambot/model/WriteAccessAllowed.java @@ -6,27 +6,45 @@ public class WriteAccessAllowed implements Serializable { private final static long serialVersionUID = 0L; + private Boolean from_request; private String web_app_name; + private Boolean from_attachment_menu; + + public Boolean fromRequest() { + return from_request; + } public String webAppName() { return web_app_name; } + public Boolean fromAttachmentMenu() { + return from_attachment_menu; + } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; WriteAccessAllowed that = (WriteAccessAllowed) o; - return Objects.equals(web_app_name, that.web_app_name); + return Objects.equals(from_request, that.from_request) && + Objects.equals(web_app_name, that.web_app_name) && + Objects.equals(from_attachment_menu, that.from_attachment_menu); } @Override public int hashCode() { - return Objects.hash(web_app_name); + return Objects.hash(from_request, + web_app_name, + from_attachment_menu); } @Override public String toString() { - return "WriteAccessAllowed{" + "web_app_name='" + web_app_name + '\'' + '}'; + return "WriteAccessAllowed{" + + "from_request=" + from_request + + ", web_app_name='" + web_app_name + '\'' + + ", from_attachment_menu=" + from_attachment_menu + + '}'; } } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/PromoteChatMember.java b/library/src/main/java/com/pengrad/telegrambot/request/PromoteChatMember.java index 7abd5cba..32f9239c 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/PromoteChatMember.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/PromoteChatMember.java @@ -37,6 +37,18 @@ public PromoteChatMember canDeleteMessages(boolean canDeleteMessages) { return add("can_delete_messages", canDeleteMessages); } + public PromoteChatMember canPostStories(boolean canPostStories) { + return add("can_post_stories", canPostStories); + } + + public PromoteChatMember canEditStories(boolean canEditStories) { + return add("can_edit_stories", canEditStories); + } + + public PromoteChatMember canDeleteStories(boolean canDeleteStories) { + return add("can_delete_stories", canDeleteStories); + } + /** * @deprecated Use canManageVideoChats(boolean canManageVideoChats) instead */