Skip to content

Commit 7dbd47a

Browse files
authored
Merge pull request #343 from mircoianese/api_v6.9
BOT Api v6.9
2 parents 6e5fa4a + 905dc82 commit 7dbd47a

File tree

4 files changed

+96
-3
lines changed

4 files changed

+96
-3
lines changed

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ public class ChatAdministratorRights implements Serializable {
2222
private Boolean can_post_messages;
2323
private Boolean can_edit_messages;
2424
private Boolean can_pin_messages;
25+
private Boolean can_post_stories;
26+
private Boolean can_edit_stories;
27+
private Boolean can_delete_stories;
2528
private Boolean can_manage_topics;
2629

2730
public Boolean isAnonymous() {
@@ -68,6 +71,18 @@ public Boolean canPinMessages() {
6871
return can_pin_messages;
6972
}
7073

74+
public Boolean canPostStories() {
75+
return can_post_stories;
76+
}
77+
78+
public Boolean canEditStories() {
79+
return can_edit_stories;
80+
}
81+
82+
public Boolean canDeleteStories() {
83+
return can_delete_stories;
84+
}
85+
7186
public Boolean canManageTopics() {
7287
return can_manage_topics;
7388
}
@@ -122,6 +137,21 @@ public ChatAdministratorRights canPinMessages(boolean canPinMessages) {
122137
return this;
123138
}
124139

140+
public ChatAdministratorRights canPostStories(boolean canPostStories) {
141+
this.can_post_stories = canPostStories;
142+
return this;
143+
}
144+
145+
public ChatAdministratorRights canEditStories(boolean canEditStories) {
146+
this.can_edit_stories = canEditStories;
147+
return this;
148+
}
149+
150+
public ChatAdministratorRights canDeleteStories(boolean canDeleteStories) {
151+
this.can_delete_stories = canDeleteStories;
152+
return this;
153+
}
154+
125155
public ChatAdministratorRights canManageTopics(boolean canManageTopics) {
126156
this.can_manage_topics = canManageTopics;
127157
return this;
@@ -144,6 +174,9 @@ public boolean equals(Object o) {
144174
Objects.equals(can_post_messages, that.can_post_messages) &&
145175
Objects.equals(can_edit_messages, that.can_edit_messages) &&
146176
Objects.equals(can_pin_messages, that.can_pin_messages) &&
177+
Objects.equals(can_post_stories, that.can_post_stories) &&
178+
Objects.equals(can_edit_stories, that.can_edit_stories) &&
179+
Objects.equals(can_delete_stories, that.can_delete_stories) &&
147180
Objects.equals(can_manage_topics, that.can_manage_topics);
148181
}
149182

@@ -160,6 +193,9 @@ public int hashCode() {
160193
can_post_messages,
161194
can_edit_messages,
162195
can_pin_messages,
196+
can_post_stories,
197+
can_edit_stories,
198+
can_delete_stories,
163199
can_manage_topics);
164200
}
165201

@@ -177,6 +213,9 @@ public String toString() {
177213
", can_post_messages=" + can_post_messages +
178214
", can_edit_messages=" + can_edit_messages +
179215
", can_pin_messages=" + can_pin_messages +
216+
", can_post_stories=" + can_post_stories +
217+
", can_edit_stories=" + can_edit_stories +
218+
", can_delete_stories=" + can_delete_stories +
180219
", can_manage_topics=" + can_manage_topics +
181220
'}';
182221
}

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ public enum Status {
3131
private Boolean can_change_info;
3232
private Boolean can_invite_users;
3333
private Boolean can_pin_messages;
34+
private Boolean can_post_stories;
35+
private Boolean can_edit_stories;
36+
private Boolean can_delete_stories;
3437
private Boolean can_manage_topics;
3538
private Boolean is_member;
3639
private Boolean can_send_messages;
@@ -117,6 +120,18 @@ public Boolean canPinMessages() {
117120
return can_pin_messages;
118121
}
119122

123+
public Boolean canPostStories() {
124+
return can_post_stories;
125+
}
126+
127+
public Boolean canEditStories() {
128+
return can_edit_stories;
129+
}
130+
131+
public Boolean canDeleteStories() {
132+
return can_delete_stories;
133+
}
134+
120135
public Boolean canManageTopics() {
121136
return can_manage_topics;
122137
}
@@ -186,6 +201,9 @@ public boolean equals(Object o) {
186201
Objects.equals(can_change_info, that.can_change_info) &&
187202
Objects.equals(can_invite_users, that.can_invite_users) &&
188203
Objects.equals(can_pin_messages, that.can_pin_messages) &&
204+
Objects.equals(can_post_stories, that.can_post_stories) &&
205+
Objects.equals(can_edit_stories, that.can_edit_stories) &&
206+
Objects.equals(can_delete_stories, that.can_delete_stories) &&
189207
Objects.equals(can_manage_topics, that.can_manage_topics) &&
190208
Objects.equals(is_member, that.is_member) &&
191209
Objects.equals(can_send_messages, that.can_send_messages) &&
@@ -218,6 +236,9 @@ public int hashCode() {
218236
can_change_info,
219237
can_invite_users,
220238
can_pin_messages,
239+
can_post_stories,
240+
can_edit_stories,
241+
can_delete_stories,
221242
can_manage_topics,
222243
is_member,
223244
can_send_messages,
@@ -251,6 +272,9 @@ public String toString() {
251272
", can_change_info=" + can_change_info +
252273
", can_invite_users=" + can_invite_users +
253274
", can_pin_messages=" + can_pin_messages +
275+
", can_post_stories=" + can_post_stories +
276+
", can_edit_stories=" + can_edit_stories +
277+
", can_delete_stories=" + can_delete_stories +
254278
", can_manage_topics=" + can_manage_topics +
255279
", is_member=" + is_member +
256280
", can_send_messages=" + can_send_messages +

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,45 @@
66
public class WriteAccessAllowed implements Serializable {
77
private final static long serialVersionUID = 0L;
88

9+
private Boolean from_request;
910
private String web_app_name;
11+
private Boolean from_attachment_menu;
12+
13+
public Boolean fromRequest() {
14+
return from_request;
15+
}
1016

1117
public String webAppName() {
1218
return web_app_name;
1319
}
1420

21+
public Boolean fromAttachmentMenu() {
22+
return from_attachment_menu;
23+
}
24+
1525
@Override
1626
public boolean equals(Object o) {
1727
if (this == o) return true;
1828
if (o == null || getClass() != o.getClass()) return false;
1929
WriteAccessAllowed that = (WriteAccessAllowed) o;
20-
return Objects.equals(web_app_name, that.web_app_name);
30+
return Objects.equals(from_request, that.from_request) &&
31+
Objects.equals(web_app_name, that.web_app_name) &&
32+
Objects.equals(from_attachment_menu, that.from_attachment_menu);
2133
}
2234

2335
@Override
2436
public int hashCode() {
25-
return Objects.hash(web_app_name);
37+
return Objects.hash(from_request,
38+
web_app_name,
39+
from_attachment_menu);
2640
}
2741

2842
@Override
2943
public String toString() {
30-
return "WriteAccessAllowed{" + "web_app_name='" + web_app_name + '\'' + '}';
44+
return "WriteAccessAllowed{" +
45+
"from_request=" + from_request +
46+
", web_app_name='" + web_app_name + '\'' +
47+
", from_attachment_menu=" + from_attachment_menu +
48+
'}';
3149
}
3250
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,18 @@ public PromoteChatMember canDeleteMessages(boolean canDeleteMessages) {
3737
return add("can_delete_messages", canDeleteMessages);
3838
}
3939

40+
public PromoteChatMember canPostStories(boolean canPostStories) {
41+
return add("can_post_stories", canPostStories);
42+
}
43+
44+
public PromoteChatMember canEditStories(boolean canEditStories) {
45+
return add("can_edit_stories", canEditStories);
46+
}
47+
48+
public PromoteChatMember canDeleteStories(boolean canDeleteStories) {
49+
return add("can_delete_stories", canDeleteStories);
50+
}
51+
4052
/**
4153
* @deprecated Use canManageVideoChats(boolean canManageVideoChats) instead
4254
*/

0 commit comments

Comments
 (0)