Support text formatting in media captions. Add parse_mode to every method with caption

pengrad · pengrad · commit 4ff3038af6ab · 2018-02-18T22:17:20.000+07:00
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultAudio.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultAudio.java
@@ -13,6 +13,7 @@ public class InlineQueryResultAudio extends InlineQueryResult<InlineQueryResultA
     private String title;
 
     private String caption;
+    private String parse_mode;
     private String performer;
     private Integer audio_duration;
 
@@ -27,6 +28,11 @@ public InlineQueryResultAudio caption(String caption) {
         return this;
     }
 
+    public InlineQueryResultAudio parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
+
     public InlineQueryResultAudio performer(String performer) {
         this.performer = performer;
         return this;
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedAudio.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedAudio.java
@@ -12,6 +12,7 @@ public class InlineQueryResultCachedAudio extends InlineQueryResult<InlineQueryR
     private String audio_file_id;
 
     private String caption;
+    private String parse_mode;
 
     public InlineQueryResultCachedAudio(String id, String fileId) {
         super("audio", id);
@@ -22,4 +23,9 @@ public InlineQueryResultCachedAudio caption(String caption) {
         this.caption = caption;
         return this;
     }
+
+    public InlineQueryResultCachedAudio parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
 }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedDocument.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedDocument.java
@@ -14,7 +14,7 @@ public class InlineQueryResultCachedDocument extends InlineQueryResult<InlineQue
 
     private String description;
     private String caption;
-
+    private String parse_mode;
 
     public InlineQueryResultCachedDocument(String id, String fileId, String title) {
         super("document", id);
@@ -31,4 +31,9 @@ public InlineQueryResultCachedDocument caption(String caption) {
         this.caption = caption;
         return this;
     }
+
+    public InlineQueryResultCachedDocument parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
 }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedGif.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedGif.java
@@ -13,7 +13,7 @@ public class InlineQueryResultCachedGif extends InlineQueryResult<InlineQueryRes
 
     private String title;
     private String caption;
-
+    private String parse_mode;
 
     public InlineQueryResultCachedGif(String id, String fileId) {
         super("gif", id);
@@ -29,4 +29,9 @@ public InlineQueryResultCachedGif caption(String caption) {
         this.caption = caption;
         return this;
     }
+
+    public InlineQueryResultCachedGif parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
 }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedMpeg4Gif.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedMpeg4Gif.java
@@ -13,7 +13,7 @@ public class InlineQueryResultCachedMpeg4Gif extends InlineQueryResult<InlineQue
 
     private String title;
     private String caption;
-
+    private String parse_mode;
 
     public InlineQueryResultCachedMpeg4Gif(String id, String fileId) {
         super("mpeg4_gif", id);
@@ -29,4 +29,9 @@ public InlineQueryResultCachedMpeg4Gif caption(String caption) {
         this.caption = caption;
         return this;
     }
+
+    public InlineQueryResultCachedMpeg4Gif parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
 }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedPhoto.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedPhoto.java
@@ -14,7 +14,7 @@ public class InlineQueryResultCachedPhoto extends InlineQueryResult<InlineQueryR
     private String title;
     private String description;
     private String caption;
-
+    private String parse_mode;
 
     public InlineQueryResultCachedPhoto(String id, String fileId) {
         super("photo", id);
@@ -35,4 +35,9 @@ public InlineQueryResultCachedPhoto caption(String caption) {
         this.caption = caption;
         return this;
     }
+
+    public InlineQueryResultCachedPhoto parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
 }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedVideo.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedVideo.java
@@ -14,7 +14,7 @@ public class InlineQueryResultCachedVideo extends InlineQueryResult<InlineQueryR
 
     private String description;
     private String caption;
-
+    private String parse_mode;
 
     public InlineQueryResultCachedVideo(String id, String fileId, String title) {
         super("video", id);
@@ -31,4 +31,9 @@ public InlineQueryResultCachedVideo caption(String caption) {
         this.caption = caption;
         return this;
     }
+
+    public InlineQueryResultCachedVideo parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
 }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedVoice.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultCachedVoice.java
@@ -13,6 +13,7 @@ public class InlineQueryResultCachedVoice extends InlineQueryResult<InlineQueryR
     private String title;
 
     private String caption;
+    private String parse_mode;
 
     public InlineQueryResultCachedVoice(String id, String fileId, String title) {
         super("voice", id);
@@ -24,4 +25,9 @@ public InlineQueryResultCachedVoice caption(String caption) {
         this.caption = caption;
         return this;
     }
+
+    public InlineQueryResultCachedVoice parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
 }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultDocument.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultDocument.java
@@ -17,6 +17,7 @@ public class InlineQueryResultDocument extends InlineQueryResult<InlineQueryResu
     private String mime_type;
 
     private String caption;
+    private String parse_mode;
     private String description;
     private String thumb_url;
     private Integer thumb_width;
@@ -35,6 +36,11 @@ public InlineQueryResultDocument caption(String caption) {
         return this;
     }
 
+    public InlineQueryResultDocument parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
+
     public InlineQueryResultDocument description(String description) {
         this.description = description;
         return this;
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultGif.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultGif.java
@@ -17,6 +17,7 @@ public class InlineQueryResultGif extends InlineQueryResult<InlineQueryResultGif
     private Integer gif_duration;
     private String title;
     private String caption;
+    private String parse_mode;
 
     public InlineQueryResultGif(String id, String gifUrl, String thumbUrl) {
         super("gif", id);
@@ -48,4 +49,9 @@ public InlineQueryResultGif caption(String caption) {
         this.caption = caption;
         return this;
     }
+
+    public InlineQueryResultGif parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
 }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultMpeg4Gif.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultMpeg4Gif.java
@@ -17,6 +17,7 @@ public class InlineQueryResultMpeg4Gif extends InlineQueryResult<InlineQueryResu
     private Integer mpeg4_duration;
     private String title;
     private String caption;
+    private String parse_mode;
 
     public InlineQueryResultMpeg4Gif(String id, String mpeg4Url, String thumbUrl) {
         super("mpeg4_gif", id);
@@ -48,4 +49,9 @@ public InlineQueryResultMpeg4Gif caption(String caption) {
         this.caption = caption;
         return this;
     }
+
+    public InlineQueryResultMpeg4Gif parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
 }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultPhoto.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultPhoto.java
@@ -17,6 +17,7 @@ public class InlineQueryResultPhoto extends InlineQueryResult<InlineQueryResultP
     private String title;
     private String description;
     private String caption;
+    private String parse_mode;
 
     public InlineQueryResultPhoto(String id, String photoUrl, String thumbUrl) {
         super("photo", id);
@@ -48,4 +49,9 @@ public InlineQueryResultPhoto caption(String caption) {
         this.caption = caption;
         return this;
     }
+
+    public InlineQueryResultPhoto parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
 }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultVideo.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultVideo.java
@@ -18,6 +18,7 @@ public class InlineQueryResultVideo extends InlineQueryResult<InlineQueryResultV
     private String title;
 
     private String caption;
+    private String parse_mode;
     private Integer video_width;
     private Integer video_height;
     private Integer video_duration;
@@ -41,6 +42,11 @@ public InlineQueryResultVideo caption(String caption) {
         return this;
     }
 
+    public InlineQueryResultVideo parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
+
     public InlineQueryResultVideo videoWidth(Integer videoWidth) {
         this.video_width = videoWidth;
         return this;
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultVoice.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InlineQueryResultVoice.java
@@ -13,6 +13,7 @@ public class InlineQueryResultVoice extends InlineQueryResult<InlineQueryResultV
     private String title;
 
     private String caption;
+    private String parse_mode;
     private Integer voice_duration;
 
     public InlineQueryResultVoice(String id, String voiceUrl, String title) {
@@ -30,4 +31,9 @@ public InlineQueryResultVoice voiceDuration(Integer voiceDuration) {
         this.voice_duration = voiceDuration;
         return this;
     }
+
+    public InlineQueryResultVoice parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return this;
+    }
 }
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
@@ -9,15 +9,21 @@
  * Stas Parshin
  * 23 November 2017
  */
-abstract public class InputMedia implements Serializable {
+abstract public class InputMedia<T extends InputMedia> implements Serializable {
     private final static long serialVersionUID = 0L;
 
     private static final AtomicInteger counter = new AtomicInteger();
 
+    @SuppressWarnings("unchecked")
+    private final T thisAsT = (T) this;
+
     private final String type;
     private final String media;
     transient private Map<String, Object> attachments;
 
+    private String caption;
+    private String parse_mode;
+
     public InputMedia(String type, Object media) {
         this.type = type;
         if (media instanceof String) {
@@ -40,4 +46,14 @@ private int nextId() {
     public Map<String, Object> getAttachments() {
         return attachments;
     }
+
+    public T caption(String caption) {
+        this.caption = caption;
+        return thisAsT;
+    }
+
+    public T parseMode(ParseMode parseMode) {
+        this.parse_mode = parseMode.name();
+        return thisAsT;
+    }
 }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InputMediaPhoto.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InputMediaPhoto.java
@@ -7,10 +7,8 @@
  * Stas Parshin
  * 23 November 2017
  */
-public class InputMediaPhoto extends InputMedia implements Serializable {
-    private final static long serialVersionUID = 0L;
-
-    private String caption;
+public class InputMediaPhoto extends InputMedia<InputMediaPhoto> implements Serializable {
+    private final static long serialVersionUID = 1L;
 
     public InputMediaPhoto(String media) {
         super("photo", media);
@@ -23,9 +21,4 @@ public InputMediaPhoto(File media) {
     public InputMediaPhoto(byte[] media) {
         super("photo", media);
     }
-
-    public InputMediaPhoto caption(String caption) {
-        this.caption = caption;
-        return this;
-    }
 }
diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InputMediaVideo.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InputMediaVideo.java
@@ -7,10 +7,9 @@
  * Stas Parshin
  * 23 November 2017
  */
-public class InputMediaVideo extends InputMedia implements Serializable {
-    private final static long serialVersionUID = 0L;
+public class InputMediaVideo extends InputMedia<InputMediaVideo> implements Serializable {
+    private final static long serialVersionUID = 1L;
 
-    private String caption;
     private Integer width, height, duration;
 
     public InputMediaVideo(String media) {
@@ -25,11 +24,6 @@ public InputMediaVideo(byte[] media) {
         super("video", media);
     }
 
-    public InputMediaVideo caption(String caption) {
-        this.caption = caption;
-        return this;
-    }
-
     public InputMediaVideo width(Integer width) {
         this.width = width;
         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,6 +1,7 @@
 package com.pengrad.telegrambot.request;
 
 import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup;
+import com.pengrad.telegrambot.model.request.ParseMode;
 import com.pengrad.telegrambot.response.BaseResponse;
 import com.pengrad.telegrambot.response.SendResponse;
 
@@ -40,6 +41,10 @@ public EditMessageCaption caption(String caption) {
         return add("caption", caption);
     }
 
+    public EditMessageCaption parseMode(ParseMode parseMode) {
+        return add("parse_mode", parseMode.name());
+    }
+
     public EditMessageCaption replyMarkup(InlineKeyboardMarkup replyMarkup) {
         return add("reply_markup", replyMarkup);
     }
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,7 @@
 package com.pengrad.telegrambot.request;
 
+import com.pengrad.telegrambot.model.request.ParseMode;
+
 import java.io.File;
 
 /**
@@ -24,6 +26,10 @@ public SendAudio caption(String caption) {
         return add("caption", caption);
     }
 
+    public SendAudio parseMode(ParseMode parseMode) {
+        return add("parse_mode", parseMode.name());
+    }
+
     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
diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SendPhoto.java b/library/src/main/java/com/pengrad/telegrambot/request/SendPhoto.java
diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SendVideo.java b/library/src/main/java/com/pengrad/telegrambot/request/SendVideo.java
diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SendVoice.java b/library/src/main/java/com/pengrad/telegrambot/request/SendVoice.java
diff --git a/library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java b/library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java
