Added the sendVideoNote method, the new field video_note to Message, the fields record_video_note or upload_video_note to sendChatAction

Author: pengrad

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

@@ -29,12 +29,13 @@ public class Message implements Serializable {
     private Sticker sticker;
     private Video video;
     private Voice voice;
+    private VideoNote video_note;
+    private User[] new_chat_members;
     private String caption;
     private Contact contact;
     private Location location;
     private Venue venue;
     private User new_chat_member;
-    private User[] new_chat_members;
     private User left_chat_member;
     private String new_chat_title;
     private PhotoSize[] new_chat_photo;
@@ -122,6 +123,14 @@ public Voice voice() {
         return voice;
     }
 
+    public VideoNote videoNote() {
+        return video_note;
+    }
+
+    public User[] newChatMembers() {
+        return new_chat_members;
+    }
+
     public String caption() {
         return caption;
     }
@@ -146,10 +155,6 @@ public User newChatMember() {
         return new_chat_member;
     }
 
-    public User[] newChatMembers() {
-        return new_chat_members;
-    }
-
     public User leftChatMember() {
         return left_chat_member;
     }
@@ -221,12 +226,15 @@ public boolean equals(Object o) {
         if (sticker != null ? !sticker.equals(message.sticker) : message.sticker != null) return false;
         if (video != null ? !video.equals(message.video) : message.video != null) return false;
         if (voice != null ? !voice.equals(message.voice) : message.voice != null) return false;
+        if (video_note != null ? !video_note.equals(message.video_note) : message.video_note != null) return false;
+        // Probably incorrect - comparing Object[] arrays with Arrays.equals
+        if (!Arrays.equals(new_chat_members, message.new_chat_members)) return false;
         if (caption != null ? !caption.equals(message.caption) : message.caption != null) return false;
         if (contact != null ? !contact.equals(message.contact) : message.contact != null) return false;
         if (location != null ? !location.equals(message.location) : message.location != null) return false;
         if (venue != null ? !venue.equals(message.venue) : message.venue != null) return false;
-        // Probably incorrect - comparing Object[] arrays with Arrays.equals
-        if (!Arrays.equals(new_chat_members, message.new_chat_members)) return false;
+        if (new_chat_member != null ? !new_chat_member.equals(message.new_chat_member) : message.new_chat_member != null)
+            return false;
         if (left_chat_member != null ? !left_chat_member.equals(message.left_chat_member) : message.left_chat_member != null)
             return false;
         if (new_chat_title != null ? !new_chat_title.equals(message.new_chat_title) : message.new_chat_title != null)
@@ -246,7 +254,6 @@ public boolean equals(Object o) {
         if (migrate_from_chat_id != null ? !migrate_from_chat_id.equals(message.migrate_from_chat_id) : message.migrate_from_chat_id != null)
             return false;
         return pinned_message != null ? pinned_message.equals(message.pinned_message) : message.pinned_message == null;
-
     }
 
     @Override
@@ -276,11 +283,13 @@ public String toString() {
                 ", sticker=" + sticker +
                 ", video=" + video +
                 ", voice=" + voice +
+                ", video_note=" + video_note +
+                ", new_chat_members=" + Arrays.toString(new_chat_members) +
                 ", caption='" + caption + '\'' +
                 ", contact=" + contact +
                 ", location=" + location +
                 ", venue=" + venue +
-                ", new_chat_members=" + Arrays.toString(new_chat_members) +
+                ", new_chat_member=" + new_chat_member +
                 ", left_chat_member=" + left_chat_member +
                 ", new_chat_title='" + new_chat_title + '\'' +
                 ", new_chat_photo=" + Arrays.toString(new_chat_photo) +

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

@@ -0,0 +1,67 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+
+/**
+ * Stas Parshin
+ * 23 May 2017
+ */
+public class VideoNote implements Serializable {
+    private final static long serialVersionUID = 0L;
+
+    private String file_id;
+    private Integer length;
+    private Integer duration;
+    private PhotoSize thumb;
+    private Integer file_size;
+
+    public String fileId() {
+        return file_id;
+    }
+
+    public Integer length() {
+        return length;
+    }
+
+    public Integer duration() {
+        return duration;
+    }
+
+    public PhotoSize thumb() {
+        return thumb;
+    }
+
+    public Integer fileSize() {
+        return file_size;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        VideoNote videoNote = (VideoNote) o;
+
+        if (file_id != null ? !file_id.equals(videoNote.file_id) : videoNote.file_id != null) return false;
+        if (length != null ? !length.equals(videoNote.length) : videoNote.length != null) return false;
+        if (duration != null ? !duration.equals(videoNote.duration) : videoNote.duration != null) return false;
+        if (thumb != null ? !thumb.equals(videoNote.thumb) : videoNote.thumb != null) return false;
+        return file_size != null ? file_size.equals(videoNote.file_size) : videoNote.file_size == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return file_id != null ? file_id.hashCode() : 0;
+    }
+
+    @Override
+    public String toString() {
+        return "VideoNote{" +
+                "file_id='" + file_id + '\'' +
+                ", length=" + length +
+                ", duration=" + duration +
+                ", thumb=" + thumb +
+                ", file_size=" + file_size +
+                '}';
+    }
+}

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

@@ -5,5 +5,6 @@
  * 10/21/15.
  */
 public enum ChatAction {
-    typing, upload_photo, record_video, upload_video, record_audio, upload_audio, upload_document, find_location
+    typing, upload_photo, record_video, upload_video, record_audio, upload_audio, upload_document, find_location,
+    record_video_note, upload_video_note
 }

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

@@ -1,5 +1,6 @@
 package com.pengrad.telegrambot.request;
 
+import com.pengrad.telegrambot.model.request.ChatAction;
 import com.pengrad.telegrambot.response.BaseResponse;
 
 /**
@@ -12,4 +13,9 @@ public SendChatAction(Object chatId, String action) {
         super(BaseResponse.class);
         add("chat_id", chatId).add("action", action);
     }
+
+    public SendChatAction(Object chatId, ChatAction action) {
+        super(BaseResponse.class);
+        add("chat_id", chatId).add("action", action.name());
+    }
 }

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

@@ -0,0 +1,45 @@
+package com.pengrad.telegrambot.request;
+
+import java.io.File;
+
+/**
+ * Stas Parshin
+ * 24 May 2017
+ */
+public class SendVideoNote extends AbstractMultipartRequest<SendVideoNote> {
+
+    public SendVideoNote(Object chatId, String videoNote) {
+        super(chatId, videoNote);
+    }
+
+    public SendVideoNote(Object chatId, File videoNote) {
+        super(chatId, videoNote);
+    }
+
+    public SendVideoNote(Object chatId, byte[] videoNote) {
+        super(chatId, videoNote);
+    }
+
+    public SendVideoNote duration(int duration) {
+        return add("duration", duration);
+    }
+
+    public SendVideoNote length(int length) {
+        return add("length", length);
+    }
+
+    @Override
+    protected String getFileParamName() {
+        return "video_note";
+    }
+
+    @Override
+    public String getContentType() {
+        return ContentTypes.VIDEO_MIME_TYPE;
+    }
+
+    @Override
+    protected String getDefaultFileName() {
+        return ContentTypes.VIDEO_FILE_NAME;
+    }
+}

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

@@ -64,7 +64,7 @@ public void getMe() {
 
     @Test
     public void getUpdates() {
-        GetUpdatesResponse response = bot.execute(new GetUpdates().offset(279824711).allowedUpdates("callback_query"));
+        GetUpdatesResponse response = bot.execute(new GetUpdates());
         System.out.println(response);
     }
 
@@ -281,4 +281,24 @@ public void deleteMessage() {
         BaseResponse response = bot.execute(new DeleteMessage(chatId, message.messageId()));
         assertTrue(response.isOk());
     }
+
+    @Test
+    public void sendChatAction() {
+        assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.typing)).isOk());
+        assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.upload_photo)).isOk());
+        assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.record_video)).isOk());
+        assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.upload_video)).isOk());
+        assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.record_audio)).isOk());
+        assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.upload_audio)).isOk());
+        assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.upload_document)).isOk());
+        assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.find_location)).isOk());
+        assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.record_video_note)).isOk());
+        assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.upload_video_note)).isOk());
+    }
+
+    @Test
+    public void sendVideoNote() {
+        SendResponse response = bot.execute(new SendVideoNote(chatId, "DQADAgADmQADYgwpSbum1JrxPsbmAg").length(240));
+        VideoNoteCheck.check(response.message().videoNote());
+    }
 }

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

@@ -0,0 +1,21 @@
+package com.pengrad.telegrambot;
+
+import com.pengrad.telegrambot.model.VideoNote;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Stas Parshin
+ * 24 May 2017
+ */
+public class VideoNoteCheck {
+
+    public static void check(VideoNote videoNote) {
+        assertNotNull(videoNote.fileId());
+        assertNotNull(videoNote.length());
+        assertNotNull(videoNote.duration());
+        assertNotNull(videoNote.fileSize());
+        PhotoSizeTest.checkPhotos(videoNote.thumb());
+    }
+
+}