Skip to content

Commit e33856f

Browse files
committed
Added two new MessageEntity types: cashtag and phone_number
1 parent 5a157d8 commit e33856f

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ public class MessageEntity implements Serializable {
1010
private final static long serialVersionUID = 0L;
1111

1212
public enum Type {
13-
mention, hashtag, bot_command, url, email, bold, italic, code, pre, text_link, text_mention;
13+
mention, hashtag, cashtag, bot_command, url, email, phone_number, bold, italic, code, pre, text_link,
14+
text_mention
1415
}
1516

1617
private Type type;

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void getMe() {
103103
@Test
104104
public void getUpdates() {
105105
GetUpdates getUpdates = new GetUpdates()
106-
.offset(144932952)
106+
.offset(864855330)
107107
.allowedUpdates("")
108108
.timeout(0)
109109
.limit(10);
@@ -471,6 +471,10 @@ public void forwardMessage() {
471471
Message message = bot.execute(new ForwardMessage(channelName, channelName, 651)).message();
472472
assertNotNull(message.authorSignature());
473473
assertNotNull(message.forwardSignature());
474+
475+
message = bot.execute(new ForwardMessage(chatId, groupId, 352)).message();
476+
assertEquals(MessageEntity.Type.text_mention, message.entities()[0].type());
477+
assertNotNull(message.entities()[0].user());
474478
}
475479

476480
@Test
@@ -484,7 +488,7 @@ public void sendAudio() {
484488
AudioTest.checkAudio(message.audio());
485489
assertEquals(thumbSize, message.audio().thumb().fileSize());
486490

487-
String cap = "http://ya.ru <b>bold</b>", title = "title", performer = "performer";
491+
String cap = "http://ya.ru <b>bold</b> #audio @pengrad_test_bot", title = "title", performer = "performer";
488492
ParseMode parseMode = ParseMode.HTML;
489493
int duration = 100;
490494
SendAudio sendAudio = new SendAudio(chatId, audioBytes).thumb(thumbBytes).duration(duration)
@@ -509,6 +513,8 @@ public void sendAudio() {
509513
assertEquals(MessageEntity.Type.bold, captionEntity.type());
510514
assertEquals((Integer) 14, captionEntity.offset());
511515
assertEquals((Integer) 4, captionEntity.length());
516+
517+
assertEquals(MessageEntity.Type.hashtag, message.captionEntities()[2].type());
512518
}
513519

514520
@Test

0 commit comments

Comments
 (0)