Skip to content

Commit f964bf8

Browse files
committed
Added caption_entities in Message
1 parent b05201a commit f964bf8

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class Message implements Serializable {
2424
private String author_signature;
2525
private String text;
2626
private MessageEntity[] entities;
27+
private MessageEntity[] caption_entities;
2728
private Audio audio;
2829
private Document document;
2930
private Game game;
@@ -107,6 +108,10 @@ public MessageEntity[] entities() {
107108
return entities;
108109
}
109110

111+
public MessageEntity[] captionEntities() {
112+
return caption_entities;
113+
}
114+
110115
public Audio audio() {
111116
return audio;
112117
}
@@ -242,6 +247,8 @@ public boolean equals(Object o) {
242247
if (text != null ? !text.equals(message.text) : message.text != null) return false;
243248
// Probably incorrect - comparing Object[] arrays with Arrays.equals
244249
if (!Arrays.equals(entities, message.entities)) return false;
250+
// Probably incorrect - comparing Object[] arrays with Arrays.equals
251+
if (!Arrays.equals(caption_entities, message.caption_entities)) return false;
245252
if (audio != null ? !audio.equals(message.audio) : message.audio != null) return false;
246253
if (document != null ? !document.equals(message.document) : message.document != null) return false;
247254
if (game != null ? !game.equals(message.game) : message.game != null) return false;
@@ -305,6 +312,7 @@ public String toString() {
305312
", author_signature='" + author_signature + '\'' +
306313
", text='" + text + '\'' +
307314
", entities=" + Arrays.toString(entities) +
315+
", caption_entities=" + Arrays.toString(caption_entities) +
308316
", audio=" + audio +
309317
", document=" + document +
310318
", game=" + game +

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ public void sendAudio() throws IOException {
461461
AudioTest.checkAudio(message.audio());
462462

463463
byte[] bytes = Files.readAllBytes(new File(audioFile).toPath());
464-
String cap = "cap", title = "title", performer = "performer";
464+
String cap = "http://ya.ru", title = "title", performer = "performer";
465465
int duration = 100;
466466
SendAudio sendAudio = new SendAudio(chatId, bytes).duration(duration).caption(cap).performer(performer).title(title);
467467
message = bot.execute(sendAudio).message();
@@ -473,6 +473,11 @@ public void sendAudio() throws IOException {
473473
assertEquals((Integer) 100, audio.duration());
474474
assertEquals(performer, audio.performer());
475475
assertEquals(title, audio.title());
476+
477+
MessageEntity captionEntity = message.captionEntities()[0];
478+
assertEquals(MessageEntity.Type.url, captionEntity.type());
479+
assertEquals((Integer) 0, captionEntity.offset());
480+
assertEquals((Integer) 12, captionEntity.length());
476481
}
477482

478483
@Test

0 commit comments

Comments
 (0)