Added the ability to manually specify text entities instead of specifying the parse_mode in the classes InputMediaPhoto, InputMediaVideo, InputMediaAnimation, InputMediaAudio, InputMediaDocument, InlineQueryResultPhoto, InlineQueryResultGif, InlineQueryResultMpeg4Gif, InlineQueryResultVideo, InlineQueryResultAudio, InlineQueryResultVoice, InlineQueryResultDocument, InlineQueryResultCachedPhoto, InlineQueryResultCachedGif, InlineQueryResultCachedMpeg4Gif, InlineQueryResultCachedVideo, InlineQueryResultCachedAudio, InlineQueryResultCachedVoice, InlineQueryResultCachedDocument, InputTextMessageContent and the methods sendMessage, sendPhoto, sendVideo, sendAnimation, sendAudio, sendDocument, sendVoice, sendPoll, editMessageText, editMessageCaption.

pengrad · pengrad · commit 52751054957a · 2020-11-07T12:57:28.000+08:00
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/User.java b/library/src/main/java/com/pengrad/telegrambot/model/User.java
@@ -19,6 +19,10 @@ public class User implements Serializable {
     private Boolean can_read_all_group_messages;
     private Boolean supports_inline_queries;
 
+    public User(Integer id) {
+        this.id = id;
+    }
+
     public Integer id() {
         return id;
     }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResult.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResult.java
@@ -1,5 +1,7 @@
 package com.pengrad.telegrambot.model.request;
 
+import com.pengrad.telegrambot.model.MessageEntity;
+
 import java.io.Serializable;
 
 /**
@@ -14,6 +16,7 @@ public abstract class InlineQueryResult<T extends InlineQueryResult<T>> implemen
 
     private String type;
     private String id;
+    private MessageEntity[] caption_entities;
     private InputMessageContent input_message_content;
     private InlineKeyboardMarkup reply_markup;
 
@@ -22,6 +25,11 @@ public InlineQueryResult(String type, String id) {
         this.id = id;
     }
 
+    public T captionEntities(MessageEntity... entities) {
+        this.caption_entities = entities;
+        return thisAsT;
+    }
+
     public T inputMessageContent(InputMessageContent inputMessageContent) {
         this.input_message_content = inputMessageContent;
         return thisAsT;
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InputMedia.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InputMedia.java
@@ -1,6 +1,8 @@
 package com.pengrad.telegrambot.model.request;
 
 import com.pengrad.telegrambot.AttachName;
+import com.pengrad.telegrambot.model.MessageEntity;
+import com.pengrad.telegrambot.request.CopyMessage;
 
 import java.io.File;
 import java.io.Serializable;
@@ -22,6 +24,7 @@ abstract public class InputMedia<T extends InputMedia<T>> implements Serializabl
     private String thumb;
     private String caption;
     private String parse_mode;
+    private MessageEntity[] caption_entities;
 
     transient private Map<String, Object> attachments = new HashMap<>();
     transient private String filename;
@@ -68,6 +71,11 @@ public T parseMode(ParseMode parseMode) {
         return thisAsT;
     }
 
+    public T captionEntities(MessageEntity... entities) {
+        this.caption_entities = entities;
+        return thisAsT;
+    }
+
     public String getFileName() {
         return filename != null ? filename : getDefaultFileName();
     }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InputTextMessageContent.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InputTextMessageContent.java
@@ -1,5 +1,7 @@
 package com.pengrad.telegrambot.model.request;
 
+import com.pengrad.telegrambot.model.MessageEntity;
+
 import java.io.Serializable;
 
 /**
@@ -12,6 +14,7 @@ public class InputTextMessageContent extends InputMessageContent implements Seri
     private String message_text;
     private String parse_mode;
     private Boolean disable_web_page_preview;
+    private MessageEntity[] entities;
 
     public InputTextMessageContent(String messageText) {
         this.message_text = messageText;
@@ -22,6 +25,11 @@ public InputTextMessageContent parseMode(ParseMode parseMode) {
         return this;
     }
 
+    public InputTextMessageContent entities(MessageEntity... entities) {
+        this.entities = entities;
+        return this;
+    }
+
     public InputTextMessageContent disableWebPagePreview(Boolean disableWebPagePreview) {
         this.disable_web_page_preview = disableWebPagePreview;
         return this;
diff --git a/library/src/main/java/com/pengrad/telegrambot/request/EditMessageCaption.java b/library/src/main/java/com/pengrad/telegrambot/request/EditMessageCaption.java
@@ -1,5 +1,6 @@
 package com.pengrad.telegrambot.request;
 
+import com.pengrad.telegrambot.model.MessageEntity;
 import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup;
 import com.pengrad.telegrambot.model.request.ParseMode;
 import com.pengrad.telegrambot.response.BaseResponse;
@@ -29,6 +30,10 @@ public EditMessageCaption parseMode(ParseMode parseMode) {
         return add("parse_mode", parseMode.name());
     }
 
+    public EditMessageCaption captionEntities(MessageEntity... entities) {
+        return add("caption_entities", entities);
+    }
+
     public EditMessageCaption replyMarkup(InlineKeyboardMarkup replyMarkup) {
         return add("reply_markup", replyMarkup);
     }
diff --git a/library/src/main/java/com/pengrad/telegrambot/request/EditMessageText.java b/library/src/main/java/com/pengrad/telegrambot/request/EditMessageText.java
@@ -1,5 +1,6 @@
 package com.pengrad.telegrambot.request;
 
+import com.pengrad.telegrambot.model.MessageEntity;
 import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup;
 import com.pengrad.telegrambot.model.request.ParseMode;
 import com.pengrad.telegrambot.response.BaseResponse;
@@ -25,6 +26,10 @@ public EditMessageText parseMode(ParseMode parseMode) {
         return add("parse_mode", parseMode.name());
     }
 
+    public EditMessageText entities(MessageEntity... entities) {
+        return add("entities", entities);
+    }
+
     public EditMessageText disableWebPagePreview(boolean disableWebPagePreview) {
         return add("disable_web_page_preview", disableWebPagePreview);
     }
diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SendAnimation.java b/library/src/main/java/com/pengrad/telegrambot/request/SendAnimation.java
@@ -1,5 +1,6 @@
 package com.pengrad.telegrambot.request;
 
+import com.pengrad.telegrambot.model.MessageEntity;
 import com.pengrad.telegrambot.model.request.ParseMode;
 
 import java.io.File;
@@ -50,6 +51,10 @@ public SendAnimation parseMode(ParseMode parseMode) {
         return add("parse_mode", parseMode.name());
     }
 
+    public SendAnimation captionEntities(MessageEntity... entities) {
+        return add("caption_entities", entities);
+    }
+
     @Override
     protected String getFileParamName() {
         return "animation";
diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SendAudio.java b/library/src/main/java/com/pengrad/telegrambot/request/SendAudio.java
@@ -1,5 +1,6 @@
 package com.pengrad.telegrambot.request;
 
+import com.pengrad.telegrambot.model.MessageEntity;
 import com.pengrad.telegrambot.model.request.ParseMode;
 
 import java.io.File;
@@ -30,6 +31,10 @@ public SendAudio parseMode(ParseMode parseMode) {
         return add("parse_mode", parseMode.name());
     }
 
+    public SendAudio captionEntities(MessageEntity... entities) {
+        return add("caption_entities", entities);
+    }
+
     public SendAudio duration(int duration) {
         return add("duration", duration);
     }
diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SendDocument.java b/library/src/main/java/com/pengrad/telegrambot/request/SendDocument.java
@@ -1,5 +1,6 @@
 package com.pengrad.telegrambot.request;
 
+import com.pengrad.telegrambot.model.MessageEntity;
 import com.pengrad.telegrambot.model.request.ParseMode;
 
 import java.io.File;
@@ -38,6 +39,10 @@ public SendDocument parseMode(ParseMode parseMode) {
         return add("parse_mode", parseMode.name());
     }
 
+    public SendDocument captionEntities(MessageEntity... entities) {
+        return add("caption_entities", entities);
+    }
+
     public SendDocument disableContentTypeDetection(boolean disableContentTypeDetection) {
         return add("disable_content_type_detection", disableContentTypeDetection);
     }
diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SendMessage.java b/library/src/main/java/com/pengrad/telegrambot/request/SendMessage.java
@@ -1,5 +1,6 @@
 package com.pengrad.telegrambot.request;
 
+import com.pengrad.telegrambot.model.MessageEntity;
 import com.pengrad.telegrambot.model.request.ParseMode;
 
 /**
@@ -17,6 +18,10 @@ public SendMessage parseMode(ParseMode parseMode) {
         return add("parse_mode", parseMode.name());
     }
 
+    public SendMessage entities(MessageEntity... entities) {
+        return add("entities", entities);
+    }
+
     public SendMessage disableWebPagePreview(boolean disableWebPagePreview) {
         return add("disable_web_page_preview", disableWebPagePreview);
     }
diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SendPhoto.java b/library/src/main/java/com/pengrad/telegrambot/request/SendPhoto.java
@@ -1,5 +1,6 @@
 package com.pengrad.telegrambot.request;
 
+import com.pengrad.telegrambot.model.MessageEntity;
 import com.pengrad.telegrambot.model.request.ParseMode;
 
 import java.io.File;
@@ -30,6 +31,10 @@ public SendPhoto parseMode(ParseMode parseMode) {
         return add("parse_mode", parseMode.name());
     }
 
+    public SendPhoto captionEntities(MessageEntity... entities) {
+        return add("caption_entities", entities);
+    }
+
     @Override
     protected String getFileParamName() {
         return "photo";
diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SendPoll.java b/library/src/main/java/com/pengrad/telegrambot/request/SendPoll.java
@@ -1,5 +1,6 @@
 package com.pengrad.telegrambot.request;
 
+import com.pengrad.telegrambot.model.MessageEntity;
 import com.pengrad.telegrambot.model.Poll;
 import com.pengrad.telegrambot.model.request.ParseMode;
 
@@ -43,6 +44,10 @@ public SendPoll explanationParseMode(ParseMode parseMode) {
         return add("explanation_parse_mode", parseMode.name());
     }
 
+    public SendPoll explanationEntities(MessageEntity... entities) {
+        return add("explanation_entities", entities);
+    }
+
     public SendPoll openPeriod(int openPeriod) {
         return add("open_period", openPeriod);
     }
diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SendVideo.java b/library/src/main/java/com/pengrad/telegrambot/request/SendVideo.java
@@ -1,5 +1,6 @@
 package com.pengrad.telegrambot.request;
 
+import com.pengrad.telegrambot.model.MessageEntity;
 import com.pengrad.telegrambot.model.request.ParseMode;
 
 import java.io.File;
@@ -50,6 +51,10 @@ public SendVideo parseMode(ParseMode parseMode) {
         return add("parse_mode", parseMode.name());
     }
 
+    public SendVideo captionEntities(MessageEntity... entities) {
+        return add("caption_entities", entities);
+    }
+
     public SendVideo supportsStreaming(boolean supportsStreaming) {
         return add("supports_streaming", supportsStreaming);
     }
diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SendVoice.java b/library/src/main/java/com/pengrad/telegrambot/request/SendVoice.java
@@ -1,5 +1,6 @@
 package com.pengrad.telegrambot.request;
 
+import com.pengrad.telegrambot.model.MessageEntity;
 import com.pengrad.telegrambot.model.request.ParseMode;
 
 import java.io.File;
@@ -30,6 +31,10 @@ public SendVoice parseMode(ParseMode parseMode) {
         return add("parse_mode", parseMode.name());
     }
 
+    public SendVoice captionEntities(MessageEntity... entities) {
+        return add("caption_entities", entities);
+    }
+
     public SendVoice duration(int duration) {
         return add("duration", duration);
     }
diff --git a/library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java b/library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java
@@ -396,7 +396,9 @@ public void answerInline() {
 
         InlineQueryResult<?>[] results = new InlineQueryResult[]{
                 new InlineQueryResultArticle("1", "title",
-                        new InputTextMessageContent("message").disableWebPagePreview(false).parseMode(ParseMode.HTML))
+                        new InputTextMessageContent("message")
+                                .entities(new MessageEntity(MessageEntity.Type.bold, 0, 2))
+                                .disableWebPagePreview(false).parseMode(ParseMode.HTML))
                         .url(someUrl).hideUrl(true).description("desc").thumbUrl(someUrl).thumbHeight(100).thumbWidth(100),
                 new InlineQueryResultArticle("2", "title",
                         new InputContactMessageContent("123123123", "na,e").lastName("lastName").vcard("qr vcard")),
@@ -422,6 +424,8 @@ public void answerInline() {
                         .mpeg4Height(100).mpeg4Width(100).mpeg4Duration(100),
                 new InlineQueryResultPhoto("13", someUrl, someUrl).photoWidth(100).photoHeight(100).title("title")
                         .description("desc").caption("cap <b>bold</b>").parseMode(ParseMode.HTML),
+                new InlineQueryResultPhoto("131", someUrl, someUrl).photoWidth(100).photoHeight(100).title("title")
+                        .description("desc").caption("bold").captionEntities(new MessageEntity(MessageEntity.Type.bold, 0, 2)),
                 new InlineQueryResultVenue("14", 54f, 55f, "title", "address").foursquareId("frsqrId").foursquareType("frType")
                         .thumbUrl(someUrl).thumbHeight(100).thumbWidth(100),
                 new InlineQueryResultVideo("15", someUrl, VIDEO_MIME_TYPE, "text", someUrl, "title").caption("cap <b>bold</b>").parseMode(ParseMode.HTML)
@@ -1412,9 +1416,18 @@ public void deleteChatStickerSet() {
 
     @Test
     public void sendMediaGroup() {
+        String url = "https://google.com/";
+        User user = new User(memberBot);
+        String language = "ru";
         MessagesResponse response = bot.execute(new SendMediaGroup(chatId,
                 new InputMediaPhoto(photoFileId),
-                new InputMediaPhoto(imageFile).caption("some caption <b>bold</b>").parseMode(ParseMode.HTML),
+                new InputMediaPhoto(imageFile).caption("some caption bold")
+                        .captionEntities(
+                                new MessageEntity(MessageEntity.Type.bold, 0, 4),
+                                new MessageEntity(MessageEntity.Type.text_link, 5, 1).url(url),
+                                new MessageEntity(MessageEntity.Type.text_mention, 6, 1).user(user),
+                                new MessageEntity(MessageEntity.Type.pre, 7, 1).language(language)
+                        ),
                 new InputMediaPhoto(imageBytes),
                 new InputMediaVideo(videoFileId),
                 new InputMediaVideo(videoFile),
@@ -1436,6 +1449,15 @@ public void sendMediaGroup() {
             }
         }
         assertEquals(2, messagesWithCaption);
+
+        MessageEntity[] entities = response.messages()[1].captionEntities();
+        assertEquals(MessageEntity.Type.bold, entities[0].type());
+        assertEquals(MessageEntity.Type.text_link, entities[1].type());
+        assertEquals(MessageEntity.Type.text_mention, entities[2].type());
+        assertEquals(MessageEntity.Type.pre, entities[3].type());
+        assertEquals(url, entities[1].url());
+        assertEquals(user.id(), entities[2].user().id());
+        assertEquals(language, entities[3].language());
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.pengrad.telegrambot.request;`
`2`	`2`
	`3`	`+import com.pengrad.telegrambot.model.MessageEntity;`
`3`	`4`	`import com.pengrad.telegrambot.model.request.ParseMode;`
`4`	`5`
`5`	`6`	`import java.io.File;`
`@@ -30,6 +31,10 @@ public SendAudio parseMode(ParseMode parseMode) {`
`30`	`31`	`return add("parse_mode", parseMode.name());`
`31`	`32`	`}`
`32`	`33`
	`34`	`+ public SendAudio captionEntities(MessageEntity... entities) {`
	`35`	`+ return add("caption_entities", entities);`
	`36`	`+ }`
	`37`	`+`
`33`	`38`	`public SendAudio duration(int duration) {`
`34`	`39`	`return add("duration", duration);`
`35`	`40`	`}`