Skip to content

Commit 721e7eb

Browse files
committed
Added the field is_member to the ChatMember object, which can be used to find whether a restricted user is a member of the chat
1 parent cac5fd4 commit 721e7eb

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public enum Status {
2626
private Boolean can_restrict_members;
2727
private Boolean can_pin_messages;
2828
private Boolean can_promote_members;
29+
private Boolean is_member;
2930
private Boolean can_send_messages;
3031
private Boolean can_send_media_messages;
3132
private Boolean can_send_other_messages;
@@ -79,6 +80,10 @@ public Boolean canPromoteMembers() {
7980
return can_promote_members;
8081
}
8182

83+
public Boolean isMember() {
84+
return is_member;
85+
}
86+
8287
public Boolean canSendMessages() {
8388
return can_send_messages;
8489
}
@@ -122,6 +127,7 @@ public boolean equals(Object o) {
122127
return false;
123128
if (can_promote_members != null ? !can_promote_members.equals(that.can_promote_members) : that.can_promote_members != null)
124129
return false;
130+
if (is_member != null ? !is_member.equals(that.is_member) : that.is_member != null) return false;
125131
if (can_send_messages != null ? !can_send_messages.equals(that.can_send_messages) : that.can_send_messages != null)
126132
return false;
127133
if (can_send_media_messages != null ? !can_send_media_messages.equals(that.can_send_media_messages) : that.can_send_media_messages != null)
@@ -145,6 +151,7 @@ public int hashCode() {
145151
result = 31 * result + (can_restrict_members != null ? can_restrict_members.hashCode() : 0);
146152
result = 31 * result + (can_pin_messages != null ? can_pin_messages.hashCode() : 0);
147153
result = 31 * result + (can_promote_members != null ? can_promote_members.hashCode() : 0);
154+
result = 31 * result + (is_member != null ? is_member.hashCode() : 0);
148155
result = 31 * result + (can_send_messages != null ? can_send_messages.hashCode() : 0);
149156
result = 31 * result + (can_send_media_messages != null ? can_send_media_messages.hashCode() : 0);
150157
result = 31 * result + (can_send_other_messages != null ? can_send_other_messages.hashCode() : 0);
@@ -167,6 +174,7 @@ public String toString() {
167174
", can_restrict_members=" + can_restrict_members +
168175
", can_pin_messages=" + can_pin_messages +
169176
", can_promote_members=" + can_promote_members +
177+
", is_member=" + is_member +
170178
", can_send_messages=" + can_send_messages +
171179
", can_send_media_messages=" + can_send_media_messages +
172180
", can_send_other_messages=" + can_send_other_messages +

library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -391,11 +391,14 @@ public void getChatMember() {
391391
ChatMember chatMember = bot.execute(new GetChatMember(groupId, memberBot)).chatMember();
392392
ChatMemberTest.check(chatMember);
393393
assertEquals(ChatMember.Status.restricted, chatMember.status());
394-
assertTrue(chatMember.untilDate() == 0);
395-
assertEquals(false, chatMember.canSendMessages());
396-
assertEquals(false, chatMember.canSendMediaMessages());
397-
assertEquals(false, chatMember.canSendOtherMessages());
398-
assertEquals(false, chatMember.canAddWebPagePreviews());
394+
assertEquals(Integer.valueOf(0), chatMember.untilDate());
395+
assertNull(chatMember.canPostMessages());
396+
assertNull(chatMember.canEditMessages());
397+
assertTrue(chatMember.isMember());
398+
assertFalse(chatMember.canSendMessages());
399+
assertFalse(chatMember.canSendMediaMessages());
400+
assertFalse(chatMember.canSendOtherMessages());
401+
assertFalse(chatMember.canAddWebPagePreviews());
399402
}
400403

401404
@Test

0 commit comments

Comments
 (0)