Skip to content

Commit 2c90503

Browse files
committed
Added the field emoji to the Dice object
1 parent 51fca8e commit 2c90503

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@
99
public class Dice implements Serializable {
1010
private final static long serialVersionUID = 0L;
1111

12+
private String emoji;
1213
private Integer value;
1314

15+
public String emoji() {
16+
return emoji;
17+
}
18+
1419
public Integer value() {
1520
return value;
1621
}
@@ -22,18 +27,22 @@ public boolean equals(Object o) {
2227

2328
Dice dice = (Dice) o;
2429

30+
if (emoji != null ? !emoji.equals(dice.emoji) : dice.emoji != null) return false;
2531
return value != null ? value.equals(dice.value) : dice.value == null;
2632
}
2733

2834
@Override
2935
public int hashCode() {
30-
return value != null ? value.hashCode() : 0;
36+
int result = emoji != null ? emoji.hashCode() : 0;
37+
result = 31 * result + (value != null ? value.hashCode() : 0);
38+
return result;
3139
}
3240

3341
@Override
3442
public String toString() {
3543
return "Dice{" +
36-
"value=" + value +
44+
"emoji='" + emoji + '\'' +
45+
", value=" + value +
3746
'}';
3847
}
3948
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1838,11 +1838,13 @@ public void sendDice() {
18381838
Dice dice = response.message().dice();
18391839
assertNotNull(dice);
18401840
assertTrue(dice.value() >= 1 && dice.value() <= 6);
1841+
assertEquals("🎲", dice.emoji());
18411842

18421843
response = bot.execute(new SendDice(chatId).darts());
18431844
dice = response.message().dice();
18441845
assertNotNull(dice);
18451846
assertTrue(dice.value() >= 1 && dice.value() <= 6);
1847+
assertEquals("🎯", dice.emoji());
18461848
}
18471849

18481850
@Test

0 commit comments

Comments
 (0)