New field callback_game in InlineKeyboardButton, new fields game_short_name and chat_instance in CallbackQuery

Author: pengrad

src/main/java/com/pengrad/telegrambot/model/CallbackQuery.java

@@ -10,6 +10,7 @@ public class CallbackQuery {
     private User from;
     private Message message;
     private String inline_message_id;
+    private String chat_instance;
     private String data;
     private String game_short_name;
 
@@ -29,6 +30,10 @@ public String inlineMessageId() {
         return inline_message_id;
     }
 
+    public String chatInstance() {
+        return chat_instance;
+    }
+
     public String data() {
         return data;
     }
@@ -49,6 +54,7 @@ public boolean equals(Object o) {
         if (message != null ? !message.equals(that.message) : that.message != null) return false;
         if (inline_message_id != null ? !inline_message_id.equals(that.inline_message_id) : that.inline_message_id != null)
             return false;
+        if (chat_instance != null ? !chat_instance.equals(that.chat_instance) : that.chat_instance != null) return false;
         if (data != null ? !data.equals(that.data) : that.data != null) return false;
         return game_short_name != null ? game_short_name.equals(that.game_short_name) : that.game_short_name == null;
     }
@@ -65,6 +71,7 @@ public String toString() {
                 ", from=" + from +
                 ", message=" + message +
                 ", inline_message_id='" + inline_message_id + '\'' +
+                ", chat_instance='" + chat_instance + '\'' +
                 ", data='" + data + '\'' +
                 ", game_short_name='" + game_short_name + '\'' +
                 '}';

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

@@ -11,6 +11,7 @@ public class InlineKeyboardButton {
     private String callback_data;
     private String switch_inline_query;
     private String switch_inline_query_current_chat;
+    private String callback_game;
 
     public InlineKeyboardButton(String text) {
         this.text = text;
@@ -35,4 +36,9 @@ public InlineKeyboardButton switchInlineQueryCurrentChat(String switchInlineQuer
         switch_inline_query_current_chat = switchInlineQueryCurrentChat;
         return this;
     }
+
+    public InlineKeyboardButton callbackGame(String callbackGame) {
+        callback_game = callbackGame;
+        return this;
+    }
 }

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

@@ -1,10 +1,7 @@
 package com.pengrad.telegrambot;
 
 import com.pengrad.telegrambot.model.*;
-import com.pengrad.telegrambot.model.request.InlineKeyboardButton;
-import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup;
-import com.pengrad.telegrambot.model.request.InlineQueryResult;
-import com.pengrad.telegrambot.model.request.InlineQueryResultArticle;
+import com.pengrad.telegrambot.model.request.*;
 import com.pengrad.telegrambot.request.*;
 import com.pengrad.telegrambot.response.*;
 import org.junit.Test;
@@ -95,13 +92,14 @@ public void answerInline() {
 
         InlineKeyboardMarkup keyboardMarkup = new InlineKeyboardMarkup(
                 new InlineKeyboardButton[]{
-//                        new InlineKeyboardButton("inline game").callbackGame("pengrad_test_game"),
-                        new InlineKeyboardButton("inline ok").callbackData("callback ok")
-
+                        new InlineKeyboardButton("inline game").callbackGame("pengrad test game description"),
+                        new InlineKeyboardButton("inline ok").callbackData("callback ok"),
+                        new InlineKeyboardButton("cancel").callbackData("callback cancel"),
                 });
 
-        InlineQueryResult r1 = new InlineQueryResultArticle("1", "title", "message").replyMarkup(keyboardMarkup);
-        bot.execute(new AnswerInlineQuery(inlineQueryId, r1));
+        InlineQueryResult r1 = new InlineQueryResultArticle("1", "title", "message");
+        InlineQueryResult r2 = new InlineQueryResultGame("2", "pengrad_test_game").replyMarkup(keyboardMarkup);
+        bot.execute(new AnswerInlineQuery(inlineQueryId, r1, r2));
     }
 
     private InlineQuery getLastInlineQuery() {
@@ -125,7 +123,7 @@ public void answerCallback() {
 
         bot.execute(new AnswerCallbackQuery(callbackQuery.id())
                 .text("answer callback")
-                .url("https://telegram.me/pengrad_test_bot?start=callback"));
+                .url("telegram.me/pengrad_test_bot?game=pengrad_test_game"));
     }
 
     private CallbackQuery getLastCallbackQuery() {