Skip to content

Commit 18e0ea6

Browse files
committed
Added the new field is_bot to the User object
1 parent e389aca commit 18e0ea6

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

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

+7
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public class User implements Serializable {
1010
private final static long serialVersionUID = 0L;
1111

1212
private Integer id;
13+
private Boolean is_bot;
1314
private String first_name;
1415
private String last_name;
1516
private String username;
@@ -19,6 +20,10 @@ public Integer id() {
1920
return id;
2021
}
2122

23+
public Boolean isBot() {
24+
return is_bot;
25+
}
26+
2227
public String firstName() {
2328
return first_name;
2429
}
@@ -43,6 +48,7 @@ public boolean equals(Object o) {
4348
User user = (User) o;
4449

4550
if (id != null ? !id.equals(user.id) : user.id != null) return false;
51+
if (is_bot != null ? !is_bot.equals(user.is_bot) : user.is_bot != null) return false;
4652
if (first_name != null ? !first_name.equals(user.first_name) : user.first_name != null) return false;
4753
if (last_name != null ? !last_name.equals(user.last_name) : user.last_name != null) return false;
4854
if (username != null ? !username.equals(user.username) : user.username != null) return false;
@@ -58,6 +64,7 @@ public int hashCode() {
5864
public String toString() {
5965
return "User{" +
6066
"id=" + id +
67+
", is_bot=" + is_bot +
6168
", first_name='" + first_name + '\'' +
6269
", last_name='" + last_name + '\'' +
6370
", username='" + username + '\'' +

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public TelegramBotTest() throws IOException {
8484
@Test
8585
public void getMe() {
8686
GetMeResponse response = bot.execute(new GetMe());
87-
System.out.println(response);
8887
UserTest.checkUser(response.user());
88+
assertTrue(response.user().isBot());
8989
}
9090

9191
@Test
@@ -148,7 +148,6 @@ public void promoteChatMember() {
148148
.canRestrictMembers(false)
149149
.canPinMessages(false)
150150
.canPromoteMembers(false));
151-
System.out.println(response);
152151
}
153152

154153
@Test
@@ -877,7 +876,6 @@ public void getStickerSet() {
877876
assertEquals(0f, maskPosition.xShift(), 0);
878877
assertEquals(0f, maskPosition.yShift(), 0);
879878
assertEquals(1f, maskPosition.scale(), 0);
880-
System.out.println(response);
881879
}
882880

883881
@Test

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

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public static void checkUser(User user) {
1717

1818
public static void checkUser(User user, boolean full) {
1919
assertNotNull(user.id());
20+
assertNotNull(user.isBot());
2021
assertNotNull(user.firstName());
2122
assertNotNull(user.username());
2223
if (full) {

0 commit comments

Comments
 (0)