Added vCard support when sharing contacts: added the field vcard to the objects Contact, InlineQueryResultContact, InputContactMessageContent and the method sendContact

Author: pengrad

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

@@ -13,6 +13,7 @@ public class Contact implements Serializable {
     private String first_name;
     private String last_name;
     private Integer user_id;
+    private String vcard;
 
     public String phoneNumber() {
         return phone_number;
@@ -30,18 +31,22 @@ public Integer userId() {
         return user_id;
     }
 
+    public String vcard() {
+        return vcard;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
         Contact contact = (Contact) o;
 
-        if (phone_number != null ? !phone_number.equals(contact.phone_number) : contact.phone_number != null)
-            return false;
+        if (phone_number != null ? !phone_number.equals(contact.phone_number) : contact.phone_number != null) return false;
         if (first_name != null ? !first_name.equals(contact.first_name) : contact.first_name != null) return false;
         if (last_name != null ? !last_name.equals(contact.last_name) : contact.last_name != null) return false;
-        return user_id != null ? user_id.equals(contact.user_id) : contact.user_id == null;
+        if (user_id != null ? !user_id.equals(contact.user_id) : contact.user_id != null) return false;
+        return vcard != null ? vcard.equals(contact.vcard) : contact.vcard == null;
     }
 
     @Override
@@ -56,6 +61,7 @@ public String toString() {
                 ", first_name='" + first_name + '\'' +
                 ", last_name='" + last_name + '\'' +
                 ", user_id=" + user_id +
+                ", vcard='" + vcard + '\'' +
                 '}';
     }
 }

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

@@ -13,6 +13,7 @@ public class InlineQueryResultContact extends InlineQueryResult<InlineQueryResul
     private String first_name;
 
     private String last_name;
+    private String vcard;
     private String thumb_url;
     private Integer thumb_width;
     private Integer thumb_height;
@@ -28,6 +29,11 @@ public InlineQueryResultContact lastName(String lastName) {
         return this;
     }
 
+    public InlineQueryResultContact vcard(String vcard) {
+        this.vcard = vcard;
+        return this;
+    }
+
     public InlineQueryResultContact thumbUrl(String thumbUrl) {
         this.thumb_url = thumbUrl;
         return this;

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

@@ -12,6 +12,7 @@ public class InputContactMessageContent extends InputMessageContent implements S
     private String phone_number;
     private String first_name;
     private String last_name;
+    private String vcard;
 
     public InputContactMessageContent(String phoneNumber, String firstName) {
         this.phone_number = phoneNumber;
@@ -22,4 +23,9 @@ public InputContactMessageContent lastName(String lastName) {
         this.last_name = lastName;
         return this;
     }
+
+    public InputContactMessageContent vcard(String vcard) {
+        this.vcard = vcard;
+        return this;
+    }
 }

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

@@ -15,4 +15,8 @@ public SendContact(Object chatId, String phoneNumber, String firstName) {
     public SendContact lastName(String lastName) {
         return add("last_name", lastName);
     }
+
+    public SendContact vcard(String vcard) {
+        return add("vcard", vcard);
+    }
 }

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

@@ -254,13 +254,13 @@ public void answerInline() {
                         new InputTextMessageContent("message").disableWebPagePreview(false).parseMode(ParseMode.HTML))
                         .url(someUrl).hideUrl(true).description("desc").thumbUrl(someUrl).thumbHeight(100).thumbWidth(100),
                 new InlineQueryResultArticle("2", "title",
-                        new InputContactMessageContent("123123123", "na,e").lastName("lastName")),
+                        new InputContactMessageContent("123123123", "na,e").lastName("lastName").vcard("qr vcard")),
                 new InlineQueryResultArticle("3", "title", new InputLocationMessageContent(50f, 50f).livePeriod(60)),
                 new InlineQueryResultArticle("4", "title",
                         new InputVenueMessageContent(50f, 50f, "title", "address").foursquareId("sqrId").foursquareType("frType")),
                 new InlineQueryResultArticle("5", "title", "message"),
                 new InlineQueryResultAudio("6", someUrl, "title").caption("cap <b>bold</b>").parseMode(ParseMode.HTML).performer("perf").audioDuration(100),
-                new InlineQueryResultContact("7", "123123123", "name").lastName("lastName")
+                new InlineQueryResultContact("7", "123123123", "name").lastName("lastName").vcard("tt vcard")
                         .thumbUrl(someUrl).thumbHeight(100).thumbWidth(100),
                 new InlineQueryResultDocument("8", someUrl, "title", "application/pdf").caption("cap <b>bold</b>").parseMode(ParseMode.HTML).description("desc")
                         .thumbUrl(someUrl).thumbHeight(100).thumbWidth(100),
@@ -735,11 +735,12 @@ public void sendVenue() {
 
     @Test
     public void sendContact() {
-        String phone = "000111", name = "first", lastName = "last";
-        Contact contact = bot.execute(new SendContact(chatId, phone, name).lastName(lastName)).message().contact();
+        String phone = "000111", name = "first", lastName = "last", vcard = "ok vcard";
+        Contact contact = bot.execute(new SendContact(chatId, phone, name).lastName(lastName).vcard(vcard)).message().contact();
         assertEquals(phone, contact.phoneNumber());
         assertEquals(name, contact.firstName());
         assertEquals(lastName, contact.lastName());
+        assertEquals(vcard, contact.vcard());
         assertNull(contact.userId());
     }