Added support for native polls: added the object Poll, the methods sendPoll and stopPoll and the field poll in the Message and Update objects

Author: pengrad

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

@@ -41,6 +41,7 @@ public class Message implements Serializable {
     private Contact contact;
     private Location location;
     private Venue venue;
+    private Poll poll;
     private User new_chat_member;
     private User[] new_chat_members;
     private User left_chat_member;
@@ -174,6 +175,10 @@ public Venue venue() {
         return venue;
     }
 
+    public Poll poll() {
+        return poll;
+    }
+
     /**
      * @deprecated Replaced with new_chat_members
      */
@@ -287,6 +292,7 @@ public boolean equals(Object o) {
         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;
+        if (poll != null ? !poll.equals(message.poll) : message.poll != null) return false;
         if (new_chat_member != null ? !new_chat_member.equals(message.new_chat_member) : message.new_chat_member != null)
             return false;
         // Probably incorrect - comparing Object[] arrays with Arrays.equals
@@ -356,6 +362,7 @@ public String toString() {
                 ", contact=" + contact +
                 ", location=" + location +
                 ", venue=" + venue +
+                ", poll=" + poll +
                 ", new_chat_member=" + new_chat_member +
                 ", new_chat_members=" + Arrays.toString(new_chat_members) +
                 ", left_chat_member=" + left_chat_member +

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

@@ -0,0 +1,62 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+import java.util.Arrays;
+
+/**
+ * Stas Parshin
+ * 17 April 2019
+ */
+public class Poll implements Serializable {
+    private final static long serialVersionUID = 0L;
+
+    private String id;
+    private String question;
+    private PollOption[] options;
+    private Boolean is_closed;
+
+    public String id() {
+        return id;
+    }
+
+    public String question() {
+        return question;
+    }
+
+    public PollOption[] options() {
+        return options;
+    }
+
+    public Boolean isClosed() {
+        return is_closed;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Poll poll = (Poll) o;
+
+        if (id != null ? !id.equals(poll.id) : poll.id != null) return false;
+        if (question != null ? !question.equals(poll.question) : poll.question != null) return false;
+        // Probably incorrect - comparing Object[] arrays with Arrays.equals
+        if (!Arrays.equals(options, poll.options)) return false;
+        return is_closed != null ? is_closed.equals(poll.is_closed) : poll.is_closed == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return id != null ? id.hashCode() : 0;
+    }
+
+    @Override
+    public String toString() {
+        return "Poll{" +
+                "id='" + id + '\'' +
+                ", question='" + question + '\'' +
+                ", options=" + Arrays.toString(options) +
+                ", is_closed=" + is_closed +
+                '}';
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+
+/**
+ * Stas Parshin
+ * 17 April 2019
+ */
+public class PollOption implements Serializable {
+    private final static long serialVersionUID = 0L;
+
+    private String text;
+    private Integer voter_count;
+
+    public String text() {
+        return text;
+    }
+
+    public Integer voterCount() {
+        return voter_count;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        PollOption that = (PollOption) o;
+
+        if (text != null ? !text.equals(that.text) : that.text != null) return false;
+        return voter_count != null ? voter_count.equals(that.voter_count) : that.voter_count == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = text != null ? text.hashCode() : 0;
+        result = 31 * result + (voter_count != null ? voter_count.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "PollOption{" +
+                "text='" + text + '\'' +
+                ", voter_count=" + voter_count +
+                '}';
+    }
+}

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

@@ -19,6 +19,7 @@ public class Update implements Serializable {
     private CallbackQuery callback_query;
     private ShippingQuery shipping_query;
     private PreCheckoutQuery pre_checkout_query;
+    private Poll poll;
 
     public Integer updateId() {
         return update_id;
@@ -60,6 +61,10 @@ public PreCheckoutQuery preCheckoutQuery() {
         return pre_checkout_query;
     }
 
+    public Poll poll() {
+        return poll;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -81,7 +86,9 @@ public boolean equals(Object o) {
             return false;
         if (shipping_query != null ? !shipping_query.equals(update.shipping_query) : update.shipping_query != null)
             return false;
-        return pre_checkout_query != null ? pre_checkout_query.equals(update.pre_checkout_query) : update.pre_checkout_query == null;
+        if (pre_checkout_query != null ? !pre_checkout_query.equals(update.pre_checkout_query) : update.pre_checkout_query != null)
+            return false;
+        return poll != null ? poll.equals(update.poll) : update.poll == null;
     }
 
     @Override
@@ -102,6 +109,7 @@ public String toString() {
                 ", callback_query=" + callback_query +
                 ", shipping_query=" + shipping_query +
                 ", pre_checkout_query=" + pre_checkout_query +
+                ", poll=" + poll +
                 '}';
     }
 }

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

@@ -0,0 +1,14 @@
+package com.pengrad.telegrambot.request;
+
+/**
+ * Stas Parshin
+ * 17 April 2019
+ */
+public class SendPoll extends AbstractSendRequest<SendPoll> {
+
+    public SendPoll(Object chatId, String question, String... options) {
+        super(chatId);
+        add("question", question);
+        add("options", serialize(options));
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.pengrad.telegrambot.request;
+
+import com.pengrad.telegrambot.model.request.Keyboard;
+import com.pengrad.telegrambot.response.PollResponse;
+
+/**
+ * Stas Parshin
+ * 17 April 2019
+ */
+public class StopPoll extends BaseRequest<StopPoll, PollResponse> {
+
+    public StopPoll(Object chatId, int messageId) {
+        super(PollResponse.class);
+        add("chat_id", chatId).add("message_id", messageId);
+    }
+
+    public StopPoll replyMarkup(Keyboard replyMarkup) {
+        return add("reply_markup", replyMarkup);
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.pengrad.telegrambot.response;
+
+import com.pengrad.telegrambot.model.Poll;
+
+/**
+ * Stas Parshin
+ * 17 April 2019
+ */
+public class PollResponse extends BaseResponse {
+
+    private Poll result;
+
+    public Poll poll() {
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "PollResponse{" +
+                "result=" + result +
+                '}';
+    }
+}

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

@@ -107,7 +107,7 @@ public void getMe() {
     @Test
     public void getUpdates() {
         GetUpdates getUpdates = new GetUpdates()
-                .offset(864855364)
+                .offset(870644071)
                 .allowedUpdates("")
                 .timeout(0)
                 .limit(100);
@@ -1224,4 +1224,41 @@ public void decryptPassport() throws Exception {
             }
         }
     }
+
+    @Test
+    public void sendPoll() {
+        String question = "Question ?";
+        String[] answers = {"Answer 1", "Answer 2"};
+        SendResponse sendResponse = bot.execute(new SendPoll(groupId, question, answers));
+        Poll poll = sendResponse.message().poll();
+        assertFalse(poll.isClosed());
+        assertEquals(question, poll.question());
+        assertEquals(answers.length, poll.options().length);
+        for (int i = 0; i < answers.length; i++) {
+            PollOption option = poll.options()[i];
+            assertEquals(answers[i], option.text());
+            assertEquals(Integer.valueOf(0), option.voterCount());
+        }
+    }
+
+    @Test
+    public void stopPoll() throws InterruptedException {
+        String question = "Question ?";
+        String[] answers = {"Answer 1", "Answer 2"};
+        SendResponse sendResponse = bot.execute(new SendPoll(groupId, question, answers));
+        Integer messageId = sendResponse.message().messageId();
+
+        Thread.sleep(1000);
+
+        PollResponse response = bot.execute(new StopPoll(groupId, messageId));
+        Poll poll = response.poll();
+        assertTrue(poll.isClosed());
+        assertEquals(question, poll.question());
+        assertEquals(answers.length, poll.options().length);
+        for (int i = 0; i < answers.length; i++) {
+            PollOption option = poll.options()[i];
+            assertEquals(answers[i], option.text());
+            assertEquals(Integer.valueOf(0), option.voterCount());
+        }
+    }
 }

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

@@ -25,6 +25,7 @@ public static void check(List<Update> updates) {
             if (update.callbackQuery() != null) assertNotNull(update.callbackQuery().id());
             if (update.shippingQuery() != null) assertNotNull(update.shippingQuery().id());
             if (update.preCheckoutQuery() != null) assertNotNull(update.preCheckoutQuery().id());
+            if (update.poll() != null) assertNotNull(update.poll().id());
         }
     }