Added the field reply_markup to the Message object, containing the inline keyboard attached to the message

Author: pengrad

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

@@ -1,5 +1,6 @@
 package com.pengrad.telegrambot.model;
 
+import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup;
 import com.pengrad.telegrambot.passport.PassportData;
 
 import java.io.Serializable;
@@ -58,6 +59,7 @@ public class Message implements Serializable {
     private SuccessfulPayment successful_payment;
     private String connected_website;
     private PassportData passport_data;
+    private InlineKeyboardMarkup reply_markup;
 
     public Integer messageId() {
         return message_id;
@@ -243,6 +245,10 @@ public PassportData passportData() {
         return passport_data;
     }
 
+    public InlineKeyboardMarkup replyMarkup() {
+        return reply_markup;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -318,7 +324,8 @@ public boolean equals(Object o) {
             return false;
         if (connected_website != null ? !connected_website.equals(message.connected_website) : message.connected_website != null)
             return false;
-        return passport_data != null ? passport_data.equals(message.passport_data) : message.passport_data == null;
+        if (passport_data != null ? !passport_data.equals(message.passport_data) : message.passport_data != null) return false;
+        return reply_markup != null ? reply_markup.equals(message.reply_markup) : message.reply_markup == null;
     }
 
     @Override
@@ -375,6 +382,7 @@ public String toString() {
                 ", successful_payment=" + successful_payment +
                 ", connected_website='" + connected_website + '\'' +
                 ", passport_data=" + passport_data +
+                ", reply_markup=" + reply_markup +
                 '}';
     }
 }

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

@@ -0,0 +1,11 @@
+package com.pengrad.telegrambot.model.request;
+
+import java.io.Serializable;
+
+/**
+ * Stas Parshin
+ * 04 June 2019
+ */
+public class CallbackGame implements Serializable {
+    private final static long serialVersionUID = 0L;
+}

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

@@ -15,7 +15,7 @@ public class InlineKeyboardButton implements Serializable {
     private String callback_data;
     private String switch_inline_query;
     private String switch_inline_query_current_chat;
-    private String callback_game;
+    private CallbackGame callback_game;
     private Boolean pay;
 
     //todo can use only one optional field, make different constructors or static methods
@@ -50,12 +50,86 @@ public InlineKeyboardButton switchInlineQueryCurrentChat(String switchInlineQuer
     }
 
     public InlineKeyboardButton callbackGame(String callbackGame) {
-        callback_game = callbackGame;
+        callback_game = new CallbackGame();
         return this;
     }
 
     public InlineKeyboardButton pay() {
         this.pay = true;
         return this;
     }
+
+    public String text() {
+        return text;
+    }
+
+    public String url() {
+        return url;
+    }
+
+    public String callbackData() {
+        return callback_data;
+    }
+
+    public String switchInlineQuery() {
+        return switch_inline_query;
+    }
+
+    public String switchInlineQueryCurrentChat() {
+        return switch_inline_query_current_chat;
+    }
+
+    public CallbackGame callbackGame() {
+        return callback_game;
+    }
+
+    public boolean isPay() {
+        return pay != null && pay;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        InlineKeyboardButton that = (InlineKeyboardButton) o;
+
+        if (text != null ? !text.equals(that.text) : that.text != null) return false;
+        if (url != null ? !url.equals(that.url) : that.url != null) return false;
+        if (login_url != null ? !login_url.equals(that.login_url) : that.login_url != null) return false;
+        if (callback_data != null ? !callback_data.equals(that.callback_data) : that.callback_data != null) return false;
+        if (switch_inline_query != null ? !switch_inline_query.equals(that.switch_inline_query) : that.switch_inline_query != null)
+            return false;
+        if (switch_inline_query_current_chat != null ? !switch_inline_query_current_chat.equals(that.switch_inline_query_current_chat) : that.switch_inline_query_current_chat != null)
+            return false;
+        if (callback_game != null ? !callback_game.equals(that.callback_game) : that.callback_game != null) return false;
+        return pay != null ? pay.equals(that.pay) : that.pay == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = text != null ? text.hashCode() : 0;
+        result = 31 * result + (url != null ? url.hashCode() : 0);
+        result = 31 * result + (login_url != null ? login_url.hashCode() : 0);
+        result = 31 * result + (callback_data != null ? callback_data.hashCode() : 0);
+        result = 31 * result + (switch_inline_query != null ? switch_inline_query.hashCode() : 0);
+        result = 31 * result + (switch_inline_query_current_chat != null ? switch_inline_query_current_chat.hashCode() : 0);
+        result = 31 * result + (callback_game != null ? callback_game.hashCode() : 0);
+        result = 31 * result + (pay != null ? pay.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "InlineKeyboardButton{" +
+                "text='" + text + '\'' +
+                ", url='" + url + '\'' +
+                ", login_url=" + login_url +
+                ", callback_data='" + callback_data + '\'' +
+                ", switch_inline_query='" + switch_inline_query + '\'' +
+                ", switch_inline_query_current_chat='" + switch_inline_query_current_chat + '\'' +
+                ", callback_game=" + callback_game +
+                ", pay=" + pay +
+                '}';
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.pengrad.telegrambot.model.request;
 
 import java.io.Serializable;
+import java.util.Arrays;
 
 /**
  * stas
@@ -14,4 +15,23 @@ public class InlineKeyboardMarkup extends Keyboard implements Serializable {
     public InlineKeyboardMarkup(InlineKeyboardButton[]... keyboard) {
         this.inline_keyboard = keyboard;
     }
+
+    public InlineKeyboardButton[][] inlineKeyboard() {
+        return inline_keyboard;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        InlineKeyboardMarkup that = (InlineKeyboardMarkup) o;
+
+        return Arrays.deepEquals(inline_keyboard, that.inline_keyboard);
+    }
+
+    @Override
+    public int hashCode() {
+        return Arrays.deepHashCode(inline_keyboard);
+    }
 }

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

@@ -57,7 +57,7 @@ public class TelegramBotTest {
     File videoNoteFile = resourcePath.resolve("video_note.mp4").toFile();
     byte[] videoNoteBytes = Files.readAllBytes(videoNoteFile.toPath());
     String certificateFile = resourcePath.resolve("cert.pem").toString();
-    String someUrl = "http://google.com";
+    String someUrl = "http://google.com/";
     String audioFileId = "CQADAgADXAADgNqgSevw7NljQE4lAg";
     String docFileId = "BQADAgADuwADgNqYSaVAUsHMq6hqAg";
     String voiceFileId = "AwADAgADYwADuYNZSZww_hkrzCIpAg";
@@ -711,12 +711,37 @@ public void deleteWebhook() {
 
     @Test
     public void sendGame() {
+        InlineKeyboardButton[] buttons = {
+                new InlineKeyboardButton("inline game").callbackGame("pengrad test game description"),
+                new InlineKeyboardButton("inline ok").callbackData("callback ok"),
+                new InlineKeyboardButton("cancel").callbackData("callback cancel"),
+                new InlineKeyboardButton("url").url(someUrl),
+                new InlineKeyboardButton("switch inline").switchInlineQuery("query"),
+                new InlineKeyboardButton("switch inline current").switchInlineQueryCurrentChat("query"),
+        };
+
+        InlineKeyboardButton[][] inlineKeyboard = new InlineKeyboardButton[1][];
+        inlineKeyboard[0] = buttons;
+        InlineKeyboardMarkup keyboardMarkup = new InlineKeyboardMarkup(inlineKeyboard);
+
         String desc = "pengrad_test_game";
-        Message message = bot.execute(new SendGame(chatId, desc)).message();
+        Message message = bot.execute(new SendGame(chatId, desc).replyMarkup(keyboardMarkup)).message();
         MessageTest.checkMessage(message);
         Game game = message.game();
         GameTest.check(game);
         assertEquals(desc, game.description());
+
+        InlineKeyboardButton[] actualButtons = message.replyMarkup().inlineKeyboard()[0];
+        assertEquals(buttons.length, actualButtons.length);
+        assertNotNull(actualButtons[0].callbackGame());
+        for (int i = 1; i < buttons.length; i++) {
+            assertEquals(buttons[i].text(), actualButtons[i].text());
+        }
+        assertEquals(buttons[1].callbackData(), actualButtons[1].callbackData());
+        assertEquals(buttons[2].callbackData(), actualButtons[2].callbackData());
+        assertEquals(buttons[3].url(), actualButtons[3].url());
+        assertEquals(buttons[4].switchInlineQuery(), actualButtons[4].switchInlineQuery());
+        assertEquals(buttons[5].switchInlineQueryCurrentChat(), actualButtons[5].switchInlineQueryCurrentChat());
     }
 
     @Test
@@ -828,6 +853,9 @@ public void sendInvoice() {
                 }))
         );
         InvoiceCheck.check(response.message().invoice());
+        InlineKeyboardButton payButton = response.message().replyMarkup().inlineKeyboard()[0][0];
+        assertTrue(payButton.isPay());
+        assertEquals("just pay", payButton.text());
     }
 
     @Test