Added width, height, duration to Animation object. Added the field animation to the Message object. Added the method sendAnimation

Author: pengrad

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

@@ -10,6 +10,9 @@ public class Animation implements Serializable {
     private final static long serialVersionUID = 0L;
 
     private String file_id;
+    private Integer width;
+    private Integer height;
+    private Integer duration;
     private PhotoSize thumb;
     private String file_name;
     private String mime_type;
@@ -19,6 +22,18 @@ public String fileId() {
         return file_id;
     }
 
+    public Integer width() {
+        return width;
+    }
+
+    public Integer height() {
+        return height;
+    }
+
+    public Integer duration() {
+        return duration;
+    }
+
     public PhotoSize thumb() {
         return thumb;
     }
@@ -43,6 +58,9 @@ public boolean equals(Object o) {
         Animation animation = (Animation) o;
 
         if (file_id != null ? !file_id.equals(animation.file_id) : animation.file_id != null) return false;
+        if (width != null ? !width.equals(animation.width) : animation.width != null) return false;
+        if (height != null ? !height.equals(animation.height) : animation.height != null) return false;
+        if (duration != null ? !duration.equals(animation.duration) : animation.duration != null) return false;
         if (thumb != null ? !thumb.equals(animation.thumb) : animation.thumb != null) return false;
         if (file_name != null ? !file_name.equals(animation.file_name) : animation.file_name != null) return false;
         if (mime_type != null ? !mime_type.equals(animation.mime_type) : animation.mime_type != null) return false;
@@ -58,6 +76,9 @@ public int hashCode() {
     public String toString() {
         return "Animation{" +
                 "file_id='" + file_id + '\'' +
+                ", width=" + width +
+                ", height=" + height +
+                ", duration=" + duration +
                 ", thumb=" + thumb +
                 ", file_name='" + file_name + '\'' +
                 ", mime_type='" + mime_type + '\'' +

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

@@ -28,6 +28,7 @@ public class Message implements Serializable {
     private MessageEntity[] caption_entities;
     private Audio audio;
     private Document document;
+    private Animation animation;
     private Game game;
     private PhotoSize[] photo;
     private Sticker sticker;
@@ -126,6 +127,10 @@ public Document document() {
         return document;
     }
 
+    public Animation animation() {
+        return animation;
+    }
+
     public Game game() {
         return game;
     }
@@ -263,6 +268,7 @@ public boolean equals(Object o) {
         if (!Arrays.equals(caption_entities, message.caption_entities)) return false;
         if (audio != null ? !audio.equals(message.audio) : message.audio != null) return false;
         if (document != null ? !document.equals(message.document) : message.document != null) return false;
+        if (animation != null ? !animation.equals(message.animation) : message.animation != null) return false;
         if (game != null ? !game.equals(message.game) : message.game != null) return false;
         // Probably incorrect - comparing Object[] arrays with Arrays.equals
         if (!Arrays.equals(photo, message.photo)) return false;
@@ -330,6 +336,7 @@ public String toString() {
                 ", caption_entities=" + Arrays.toString(caption_entities) +
                 ", audio=" + audio +
                 ", document=" + document +
+                ", animation=" + animation +
                 ", game=" + game +
                 ", photo=" + Arrays.toString(photo) +
                 ", sticker=" + sticker +

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

@@ -0,0 +1,67 @@
+package com.pengrad.telegrambot.request;
+
+import com.pengrad.telegrambot.model.request.ParseMode;
+
+import java.io.File;
+
+/**
+ * Stas Parshin
+ * 28 July 2018
+ */
+public class SendAnimation extends AbstractMultipartRequest<SendAnimation> {
+
+    public SendAnimation(Object chatId, String animation) {
+        super(chatId, animation);
+    }
+
+    public SendAnimation(Object chatId, File animation) {
+        super(chatId, animation);
+    }
+
+    public SendAnimation(Object chatId, byte[] animation) {
+        super(chatId, animation);
+    }
+
+    public SendAnimation duration(int duration) {
+        return add("duration", duration);
+    }
+
+    public SendAnimation width(int width) {
+        return add("width", width);
+    }
+
+    public SendAnimation height(int height) {
+        return add("height", height);
+    }
+
+    public SendAnimation thumb(byte[] thumb) {
+        return super.thumb(thumb);
+    }
+
+    public SendAnimation thumb(File thumb) {
+        return super.thumb(thumb);
+    }
+
+    public SendAnimation caption(String caption) {
+        return add("caption", caption);
+    }
+
+    public SendAnimation parseMode(ParseMode parseMode) {
+        return add("parse_mode", parseMode.name());
+    }
+
+    @Override
+    protected String getFileParamName() {
+        return "animation";
+    }
+
+    @Override
+    public String getDefaultFileName() {
+        return ContentTypes.GIF_FILE_NAME;
+    }
+
+    @Override
+    public String getContentType() {
+        return ContentTypes.GIF_MIME_TYPE;
+    }
+}

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

@@ -4,11 +4,9 @@
 import com.pengrad.telegrambot.model.request.*;
 import com.pengrad.telegrambot.request.*;
 import com.pengrad.telegrambot.response.*;
-
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-
 import org.junit.Test;
 
 import java.io.File;
@@ -1133,4 +1131,34 @@ public void editMessageMedia() {
         assertEquals(performer, audio.performer());
         assertEquals(title, audio.title());
     }
+
+    @Test
+    public void sendAnimation() {
+        Integer width = 340, height = 240;
+        String caption = "gif *file*", captionCheck = "gif file";
+        SendResponse response = bot.execute(new SendAnimation(chatId, gifFile)
+                .duration(222).width(width).height(height).thumb(thumbFile)
+                .caption(caption).parseMode(ParseMode.Markdown));
+        assertTrue(response.isOk());
+        Animation animation = response.message().animation();
+        assertEquals((Integer) 1, animation.duration());
+        assertEquals(width, animation.width());
+        assertEquals(height, animation.height());
+        assertEquals(thumbSize, animation.thumb().fileSize());
+        assertEquals(captionCheck, response.message().caption());
+        assertEquals(MessageEntity.Type.bold, response.message().captionEntities()[0].type());
+
+        response = bot.execute(new SendAnimation(chatId, gifBytes).thumb(thumbBytes));
+        animation = response.message().animation();
+        assertEquals((Integer) 1, animation.duration());
+        assertEquals((Integer) 160, animation.width());
+        assertEquals((Integer) 160, animation.height());
+        assertEquals(thumbSize, animation.thumb().fileSize());
+
+        response = bot.execute(new SendAnimation(chatId, gifFileId));
+        animation = response.message().animation();
+        assertEquals((Integer) 3, animation.duration());
+        assertEquals((Integer) 128, animation.width());
+        assertEquals((Integer) 128, animation.height());
+    }
 }