Skip to content

Commit 0f1d6b3

Browse files
pengradpengrad
committed
Bot API 9.5
 - Added support for chat member tags with the new setChatMemberTag method - Added the field tag to ChatMemberMember and ChatMemberRestricted - Added the field can_edit_tag to ChatMemberRestricted and ChatPermissions - Added the field can_manage_tags to ChatMemberAdministrator and ChatAdministratorRights - Added the parameter can_manage_tags to promoteChatMember - Added the field sender_tag to Message - Added the type date_time to MessageEntity with unix_time and date_time_format fields - Allowed all bots to use the method sendMessageDraft
1 parent 1bdd2e0 commit 0f1d6b3

File tree

7 files changed

+107
-7
lines changed

7 files changed

+107
-7
lines changed

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public class ChatAdministratorRights implements Serializable {
2727
private Boolean can_delete_stories;
2828
private Boolean can_manage_topics;
2929
private Boolean can_manage_direct_messages;
30+
private Boolean can_manage_tags;
3031

3132
public Boolean isAnonymous() {
3233
return is_anonymous != null && is_anonymous;
@@ -92,6 +93,10 @@ public Boolean canManageDirectMessages() {
9293
return can_manage_direct_messages != null && can_manage_direct_messages;
9394
}
9495

96+
public Boolean canManageTags() {
97+
return can_manage_tags != null && can_manage_tags;
98+
}
99+
95100
public ChatAdministratorRights canManageChat(boolean canManageChat) {
96101
this.can_manage_chat = canManageChat;
97102
return this;
@@ -167,6 +172,11 @@ public ChatAdministratorRights canManageDirectMessages(boolean can_manage_direct
167172
return this;
168173
}
169174

175+
public ChatAdministratorRights canManageTags(boolean canManageTags) {
176+
this.can_manage_tags = canManageTags;
177+
return this;
178+
}
179+
170180
@Override
171181
public boolean equals(Object o) {
172182
if (this == o) return true;
@@ -188,7 +198,8 @@ public boolean equals(Object o) {
188198
Objects.equals(can_edit_stories, that.can_edit_stories) &&
189199
Objects.equals(can_delete_stories, that.can_delete_stories) &&
190200
Objects.equals(can_manage_topics, that.can_manage_topics) &&
191-
Objects.equals(can_manage_direct_messages, that.can_manage_direct_messages);
201+
Objects.equals(can_manage_direct_messages, that.can_manage_direct_messages) &&
202+
Objects.equals(can_manage_tags, that.can_manage_tags);
192203
}
193204

194205
@Override
@@ -208,7 +219,8 @@ public int hashCode() {
208219
can_edit_stories,
209220
can_delete_stories,
210221
can_manage_topics,
211-
can_manage_direct_messages);
222+
can_manage_direct_messages,
223+
can_manage_tags);
212224
}
213225

214226
@Override
@@ -230,6 +242,7 @@ public String toString() {
230242
", can_delete_stories=" + can_delete_stories +
231243
", can_manage_topics=" + can_manage_topics +
232244
", can_manage_direct_messages=" + can_manage_direct_messages +
245+
", can_manage_tags=" + can_manage_tags +
233246
'}';
234247
}
235248

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ public enum Status {
3636
private Boolean can_delete_stories;
3737
private Boolean can_manage_topics;
3838
private Boolean can_manage_direct_messages;
39+
private Boolean can_manage_tags;
40+
private Boolean can_edit_tag;
41+
private String tag;
3942
private Boolean is_member;
4043
private Boolean can_send_messages;
4144

@@ -134,6 +137,18 @@ public Boolean canManageDirectMessages() {
134137
return can_manage_direct_messages != null && can_manage_direct_messages;
135138
}
136139

140+
public Boolean canManageTags() {
141+
return can_manage_tags != null && can_manage_tags;
142+
}
143+
144+
public Boolean canEditTag() {
145+
return can_edit_tag != null && can_edit_tag;
146+
}
147+
148+
public String tag() {
149+
return tag;
150+
}
151+
137152
public Boolean isMember() {
138153
return is_member != null && is_member;
139154
}
@@ -204,6 +219,9 @@ public boolean equals(Object o) {
204219
Objects.equals(can_delete_stories, that.can_delete_stories) &&
205220
Objects.equals(can_manage_topics, that.can_manage_topics) &&
206221
Objects.equals(can_manage_direct_messages, that.can_manage_direct_messages) &&
222+
Objects.equals(can_manage_tags, that.can_manage_tags) &&
223+
Objects.equals(can_edit_tag, that.can_edit_tag) &&
224+
Objects.equals(tag, that.tag) &&
207225
Objects.equals(is_member, that.is_member) &&
208226
Objects.equals(can_send_messages, that.can_send_messages) &&
209227
Objects.equals(can_send_audios, that.can_send_audios) &&
@@ -240,6 +258,9 @@ public int hashCode() {
240258
can_delete_stories,
241259
can_manage_topics,
242260
can_manage_direct_messages,
261+
can_manage_tags,
262+
can_edit_tag,
263+
tag,
243264
is_member,
244265
can_send_messages,
245266
can_send_audios,
@@ -277,6 +298,9 @@ public String toString() {
277298
", can_delete_stories=" + can_delete_stories +
278299
", can_manage_topics=" + can_manage_topics +
279300
", can_manage_direct_messages=" + can_manage_direct_messages +
301+
", can_manage_tags=" + can_manage_tags +
302+
", can_edit_tag=" + can_edit_tag +
303+
", tag='" + tag + '\'' +
280304
", is_member=" + is_member +
281305
", can_send_messages=" + can_send_messages +
282306
", can_send_audios=" + can_send_audios +

‎library/src/main/java/com/pengrad/telegrambot/model/ChatPermissions.java‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public class ChatPermissions implements Serializable {
3030
private Boolean can_post_stories;
3131
private Boolean can_edit_stories;
3232
private Boolean can_delete_stories;
33+
private Boolean can_edit_tag;
3334

3435
public Boolean canSendMessages() {
3536
return can_send_messages != null && can_send_messages;
@@ -99,6 +100,10 @@ public Boolean canDeleteStories() {
99100
return can_delete_stories != null && can_delete_stories;
100101
}
101102

103+
public Boolean canEditTag() {
104+
return can_edit_tag != null && can_edit_tag;
105+
}
106+
102107
public ChatPermissions canSendMessages(boolean canSendMessages) {
103108
can_send_messages = canSendMessages;
104109
return this;
@@ -184,6 +189,11 @@ public ChatPermissions canDeleteStories(Boolean canDeleteStories) {
184189
return this;
185190
}
186191

192+
public ChatPermissions canEditTag(boolean canEditTag) {
193+
this.can_edit_tag = canEditTag;
194+
return this;
195+
}
196+
187197
@Override
188198
public boolean equals(Object o) {
189199
if (this == o) return true;
@@ -207,7 +217,8 @@ public boolean equals(Object o) {
207217
Objects.equals(can_manage_topics, that.can_manage_topics) &&
208218
Objects.equals(can_post_stories, that.can_post_stories) &&
209219
Objects.equals(can_edit_stories, that.can_edit_stories) &&
210-
Objects.equals(can_delete_stories, that.can_delete_stories);
220+
Objects.equals(can_delete_stories, that.can_delete_stories) &&
221+
Objects.equals(can_edit_tag, that.can_edit_tag);
211222
}
212223

213224
@Override
@@ -228,7 +239,8 @@ public int hashCode() {
228239
can_manage_topics,
229240
can_post_stories,
230241
can_edit_stories,
231-
can_delete_stories);
242+
can_delete_stories,
243+
can_edit_tag);
232244
}
233245

234246
@Override
@@ -251,6 +263,7 @@ public String toString() {
251263
", can_post_stories=" + can_post_stories +
252264
", can_edit_stories=" + can_edit_stories +
253265
", can_delete_stories=" + can_delete_stories +
266+
", can_edit_tag=" + can_edit_tag +
254267
'}';
255268
}
256269
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class Message extends MaybeInaccessibleMessage implements Serializable {
3737
private DirectMessagesTopic direct_messages_topic;
3838
private User from;
3939
private Chat sender_chat;
40+
private String sender_tag;
4041
private Integer sender_boost_count;
4142
private User sender_business_bot;
4243
private String business_connection_id;
@@ -152,6 +153,10 @@ public Chat senderChat() {
152153
return sender_chat;
153154
}
154155

156+
public String senderTag() {
157+
return sender_tag;
158+
}
159+
155160
public Integer senderBoostCount() {
156161
return sender_boost_count;
157162
}
@@ -576,6 +581,7 @@ public boolean equals(Object o) {
576581
Objects.equals(direct_messages_topic, message.direct_messages_topic) &&
577582
Objects.equals(from, message.from) &&
578583
Objects.equals(sender_chat, message.sender_chat) &&
584+
Objects.equals(sender_tag, message.sender_tag) &&
579585
Objects.equals(sender_boost_count, message.sender_boost_count) &&
580586
Objects.equals(date, message.date) &&
581587
Objects.equals(sender_business_bot, message.sender_business_bot) &&
@@ -691,6 +697,7 @@ public String toString() {
691697
", direct_messages_topic=" + direct_messages_topic +
692698
", from=" + from +
693699
", sender_chat=" + sender_chat +
700+
", sender_tag='" + sender_tag + '\'' +
694701
", sender_boost_count=" + sender_boost_count +
695702
", date=" + date +
696703
", sender_business_bot=" + sender_business_bot +

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

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class MessageEntity implements Serializable {
1212

1313
public enum Type {
1414
mention, hashtag, cashtag, bot_command, url, email, phone_number, bold, italic, code, pre, text_link,
15-
text_mention, underline, strikethrough, spoiler, custom_emoji, blockquote, expandable_blockquote
15+
text_mention, underline, strikethrough, spoiler, custom_emoji, blockquote, expandable_blockquote, date_time
1616
}
1717

1818
private Type type;
@@ -22,6 +22,8 @@ public enum Type {
2222
private User user;
2323
private String language;
2424
private String custom_emoji_id;
25+
private Integer unix_time;
26+
private String date_time_format;
2527

2628
private MessageEntity() {
2729
}
@@ -60,6 +62,14 @@ public String customEmojiId() {
6062
return custom_emoji_id;
6163
}
6264

65+
public Integer unixTime() {
66+
return unix_time;
67+
}
68+
69+
public String dateTimeFormat() {
70+
return date_time_format;
71+
}
72+
6373
public MessageEntity url(String url) {
6474
this.url = url;
6575
return this;
@@ -80,6 +90,16 @@ public MessageEntity customEmojiId(String custom_emoji_id) {
8090
return this;
8191
}
8292

93+
public MessageEntity unixTime(Integer unix_time) {
94+
this.unix_time = unix_time;
95+
return this;
96+
}
97+
98+
public MessageEntity dateTimeFormat(String date_time_format) {
99+
this.date_time_format = date_time_format;
100+
return this;
101+
}
102+
83103
@Override
84104
public boolean equals(Object o) {
85105
if (this == o) return true;
@@ -91,12 +111,14 @@ public boolean equals(Object o) {
91111
Objects.equals(url, that.url) &&
92112
Objects.equals(user, that.user) &&
93113
Objects.equals(language, that.language) &&
94-
Objects.equals(custom_emoji_id, that.custom_emoji_id);
114+
Objects.equals(custom_emoji_id, that.custom_emoji_id) &&
115+
Objects.equals(unix_time, that.unix_time) &&
116+
Objects.equals(date_time_format, that.date_time_format);
95117
}
96118

97119
@Override
98120
public int hashCode() {
99-
return Objects.hash(type, offset, length, url, user, language, custom_emoji_id);
121+
return Objects.hash(type, offset, length, url, user, language, custom_emoji_id, unix_time, date_time_format);
100122
}
101123

102124
@Override
@@ -109,6 +131,8 @@ public String toString() {
109131
", user=" + user +
110132
", language='" + language + '\'' +
111133
", custom_emoji_id='" + custom_emoji_id + '\'' +
134+
", unix_time=" + unix_time +
135+
", date_time_format='" + date_time_format + '\'' +
112136
'}';
113137
}
114138
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,8 @@ public PromoteChatMember canManageDirectMessages(boolean canManageDirectMessages
7676
public PromoteChatMember canPromoteMembers(boolean canPromoteMembers) {
7777
return add("can_promote_members", canPromoteMembers);
7878
}
79+
80+
public PromoteChatMember canManageTags(boolean canManageTags) {
81+
return add("can_manage_tags", canManageTags);
82+
}
7983
}

‎library/src/main/java/com/pengrad/telegrambot/request/SetChatMemberTag.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.pengrad.telegrambot.request;
2+
3+
import com.pengrad.telegrambot.response.BaseResponse;
4+
5+
public class SetChatMemberTag extends BaseRequest<SetChatMemberTag, BaseResponse> {
6+
7+
public SetChatMemberTag(Object chatId, long userId) {
8+
super(BaseResponse.class);
9+
add("chat_id", chatId).add("user_id", userId);
10+
}
11+
12+
public SetChatMemberTag tag(String tag) {
13+
return add("tag", tag);
14+
}
15+
}

0 commit comments

Comments
 (0)