Added the new method sendMediaGroup and two kinds of InputMedia objects to support the new albums feature

Author: pengrad

library/src/main/java/com/pengrad/telegrambot/model/request/InputMedia.java

@@ -0,0 +1,43 @@
+package com.pengrad.telegrambot.model.request;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Stas Parshin
+ * 23 November 2017
+ */
+abstract public class InputMedia implements Serializable {
+    private final static long serialVersionUID = 0L;
+
+    private static final AtomicInteger counter = new AtomicInteger();
+
+    private final String type;
+    private final String media;
+    transient private Map<String, Object> attachments;
+
+    public InputMedia(String type, Object media) {
+        this.type = type;
+        if (media instanceof String) {
+            this.media = (String) media;
+        } else {
+            String attachName = "inputMedia" + nextId();
+            this.media = "attach://" + attachName;
+            if (attachments == null) {
+                attachments = new HashMap<String, Object>();
+            }
+            attachments.put(attachName, media);
+        }
+    }
+
+    private int nextId() {
+        return counter.incrementAndGet();
+    }
+
+    // Nullable
+    public Map<String, Object> getAttachments() {
+        return attachments;
+    }
+}

library/src/main/java/com/pengrad/telegrambot/model/request/InputMediaPhoto.java

@@ -0,0 +1,31 @@
+package com.pengrad.telegrambot.model.request;
+
+import java.io.File;
+import java.io.Serializable;
+
+/**
+ * Stas Parshin
+ * 23 November 2017
+ */
+public class InputMediaPhoto extends InputMedia implements Serializable {
+    private final static long serialVersionUID = 0L;
+
+    private String caption;
+
+    public InputMediaPhoto(String media) {
+        super("photo", media);
+    }
+
+    public InputMediaPhoto(File media) {
+        super("photo", media);
+    }
+
+    public InputMediaPhoto(byte[] media) {
+        super("photo", media);
+    }
+
+    public InputMediaPhoto caption(String caption) {
+        this.caption = caption;
+        return this;
+    }
+}

library/src/main/java/com/pengrad/telegrambot/model/request/InputMediaVideo.java

@@ -0,0 +1,47 @@
+package com.pengrad.telegrambot.model.request;
+
+import java.io.File;
+import java.io.Serializable;
+
+/**
+ * Stas Parshin
+ * 23 November 2017
+ */
+public class InputMediaVideo extends InputMedia implements Serializable {
+    private final static long serialVersionUID = 0L;
+
+    private String caption;
+    private Integer width, height, duration;
+
+    public InputMediaVideo(String media) {
+        super("video", media);
+    }
+
+    public InputMediaVideo(File media) {
+        super("video", media);
+    }
+
+    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;
+    }
+
+    public InputMediaVideo height(Integer height) {
+        this.height = height;
+        return this;
+    }
+
+    public InputMediaVideo duration(Integer duration) {
+        this.duration = duration;
+        return this;
+    }
+}

library/src/main/java/com/pengrad/telegrambot/request/AnswerShippingQuery.java

@@ -1,6 +1,5 @@
 package com.pengrad.telegrambot.request;
 
-import com.google.gson.Gson;
 import com.pengrad.telegrambot.model.request.ShippingOption;
 import com.pengrad.telegrambot.response.BaseResponse;
 
@@ -10,8 +9,6 @@
  */
 public class AnswerShippingQuery extends BaseRequest<AnswerShippingQuery, BaseResponse> {
 
-    private static Gson gson = new Gson();
-
     public AnswerShippingQuery(String shippingQueryId, ShippingOption... shippingOptions) {
         super(BaseResponse.class);
         add("shipping_query_id", shippingQueryId).add("ok", true).add("shipping_options", serialize(shippingOptions));

library/src/main/java/com/pengrad/telegrambot/request/BaseRequest.java

@@ -31,6 +31,11 @@ protected T add(String name, Object val) {
         return thisAsT;
     }
 
+    protected T addAll(Map<String, Object> values) {
+        parameters.putAll(values);
+        return thisAsT;
+    }
+
     public String getMethod() {
         String className = this.getClass().getSimpleName();
         return Character.toLowerCase(className.charAt(0)) + className.substring(1);

library/src/main/java/com/pengrad/telegrambot/request/SendMediaGroup.java

@@ -0,0 +1,41 @@
+package com.pengrad.telegrambot.request;
+
+import com.pengrad.telegrambot.model.request.InputMedia;
+import com.pengrad.telegrambot.response.MessagesResponse;
+
+import java.util.Map;
+
+/**
+ * Stas Parshin
+ * 23 November 2017
+ */
+public class SendMediaGroup extends BaseRequest<SendMediaGroup, MessagesResponse> {
+
+    private boolean isMultipart = false;
+
+    public SendMediaGroup(Object chatId, InputMedia... media) {
+        super(MessagesResponse.class);
+        add("chat_id", chatId).add("media", serialize(media));
+
+        for (InputMedia m : media) {
+            Map<String, Object> attachments = m.getAttachments();
+            if (attachments != null) {
+                addAll(attachments);
+                isMultipart = true;
+            }
+        }
+    }
+
+    public SendMediaGroup disableNotification(boolean disableNotification) {
+        return add("disable_notification", disableNotification);
+    }
+
+    public SendMediaGroup replyToMessageId(int replyToMessageId) {
+        return add("reply_to_message_id", replyToMessageId);
+    }
+
+    @Override
+    public boolean isMultipart() {
+        return isMultipart;
+    }
+}

library/src/main/java/com/pengrad/telegrambot/response/MessagesResponse.java

@@ -0,0 +1,28 @@
+package com.pengrad.telegrambot.response;
+
+import com.pengrad.telegrambot.model.Message;
+
+import java.util.Arrays;
+
+/**
+ * Stas Parshin
+ * 23 November 2017
+ */
+public class MessagesResponse extends BaseResponse {
+
+    private Message[] result;
+
+    MessagesResponse() {
+    }
+
+    public Message[] messages() {
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "MessagesResponse{" +
+                "result=" + Arrays.toString(result) +
+                '}';
+    }
+}

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

@@ -41,12 +41,13 @@ public class TelegramBotTest {
     Integer memberBot = 215003245;
 
     Path resourcePath = Paths.get("src/test/resources");
-    String imagefile = resourcePath.resolve("image.png").toString();
     File imageFile = resourcePath.resolve("image.jpg").toFile();
+    byte[] imageBytes = Files.readAllBytes(imageFile.toPath());
     File stickerFile = resourcePath.resolve("imageSticker.png").toFile();
     String audioFile = resourcePath.resolve("beep.mp3").toString();
     String docFile = resourcePath.resolve("doc.txt").toString();
-    String videoFile = resourcePath.resolve("tabs.mp4").toString();
+    File videoFile = resourcePath.resolve("tabs.mp4").toFile();
+    byte[] videoBytes = Files.readAllBytes(videoFile.toPath());
     String videoNoteFile = resourcePath.resolve("video_note.mp4").toString();
     String certificateFile = resourcePath.resolve("cert.pem").toString();
     String someUrl = "http://google.com";
@@ -505,13 +506,12 @@ public void sendPhoto() throws IOException {
         MessageTest.checkMessage(message);
         PhotoSizeTest.checkPhotos(false, message.photo());
 
-        message = bot.execute(new SendPhoto(chatId, new File(imagefile))).message();
+        message = bot.execute(new SendPhoto(chatId, imageFile)).message();
         MessageTest.checkMessage(message);
         PhotoSizeTest.checkPhotos(message.photo());
 
-        byte[] bytes = Files.readAllBytes(new File(imagefile).toPath());
         String caption = "caption";
-        message = bot.execute(new SendPhoto(channelName, bytes).caption(caption)).message();
+        message = bot.execute(new SendPhoto(channelName, imageBytes).caption(caption)).message();
         MessageTest.checkMessage(message);
         assertEquals(caption, message.caption());
         PhotoSizeTest.checkPhotos(message.photo());
@@ -523,12 +523,11 @@ public void sendSticker() throws IOException {
         MessageTest.checkMessage(message);
         StickerTest.check(message.sticker(), true, false);
 
-        message = bot.execute(new SendSticker(chatId, new File(imagefile))).message();
+        message = bot.execute(new SendSticker(chatId, imageFile)).message();
         MessageTest.checkMessage(message);
         StickerTest.check(message.sticker(), false, true);
 
-        byte[] bytes = Files.readAllBytes(new File(imagefile).toPath());
-        message = bot.execute(new SendSticker(chatId, bytes)).message();
+        message = bot.execute(new SendSticker(chatId, imageBytes)).message();
         MessageTest.checkMessage(message);
         StickerTest.check(message.sticker(), false, true);
     }
@@ -539,14 +538,13 @@ public void sendVideo() throws IOException {
         MessageTest.checkMessage(message);
         VideoTest.check(message.video(), false);
 
-        message = bot.execute(new SendVideo(chatId, new File(videoFile))).message();
+        message = bot.execute(new SendVideo(chatId, videoFile)).message();
         MessageTest.checkMessage(message);
         VideoTest.check(message.video());
 
-        byte[] bytes = Files.readAllBytes(new File(videoFile).toPath());
         String caption = "my video";
         Integer duration = 100;
-        message = bot.execute(new SendVideo(chatId, bytes).caption(caption).duration(duration).height(1).width(2)).message();
+        message = bot.execute(new SendVideo(chatId, videoBytes).caption(caption).duration(duration).height(1).width(2)).message();
         MessageTest.checkMessage(message);
         assertEquals(caption, message.caption());
 
@@ -982,4 +980,18 @@ public void deleteChatStickerSet() {
         assertEquals(400, response.errorCode());
         assertEquals("Bad Request: can't set channel sticker set", response.description());
     }
+
+    @Test
+    public void sendMediaGroup() {
+        MessagesResponse response = bot.execute(new SendMediaGroup(chatId,
+                new InputMediaPhoto(photoFileId),
+                new InputMediaPhoto(imageFile).caption("some caption"),
+                new InputMediaPhoto(imageBytes),
+                new InputMediaVideo(videoFileId),
+                new InputMediaVideo(videoFile),
+                new InputMediaVideo(videoBytes).caption("my video").duration(10).width(11).height(12)
+        ));
+        assertTrue(response.isOk());
+        assertEquals(6, response.messages().length);
+    }
 }