Added support for Foursquare venues: added the new field foursquare_type to the objects Venue, InlineQueryResultVenue and InputVenueMessageContent, and the parameter foursquare_type to the sendVenue method

Author: pengrad

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

@@ -13,6 +13,7 @@ public class Venue implements Serializable {
     private String title;
     private String address;
     private String foursquare_id;
+    private String foursquare_type;
 
     public Location location() {
         return location;
@@ -30,6 +31,10 @@ public String foursquareId() {
         return foursquare_id;
     }
 
+    public String foursquareType() {
+        return foursquare_type;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -40,8 +45,8 @@ public boolean equals(Object o) {
         if (location != null ? !location.equals(venue.location) : venue.location != null) return false;
         if (title != null ? !title.equals(venue.title) : venue.title != null) return false;
         if (address != null ? !address.equals(venue.address) : venue.address != null) return false;
-        return foursquare_id != null ? foursquare_id.equals(venue.foursquare_id) : venue.foursquare_id == null;
-
+        if (foursquare_id != null ? !foursquare_id.equals(venue.foursquare_id) : venue.foursquare_id != null) return false;
+        return foursquare_type != null ? foursquare_type.equals(venue.foursquare_type) : venue.foursquare_type == null;
     }
 
     @Override
@@ -50,6 +55,7 @@ public int hashCode() {
         result = 31 * result + (title != null ? title.hashCode() : 0);
         result = 31 * result + (address != null ? address.hashCode() : 0);
         result = 31 * result + (foursquare_id != null ? foursquare_id.hashCode() : 0);
+        result = 31 * result + (foursquare_type != null ? foursquare_type.hashCode() : 0);
         return result;
     }
 
@@ -60,6 +66,7 @@ public String toString() {
                 ", title='" + title + '\'' +
                 ", address='" + address + '\'' +
                 ", foursquare_id='" + foursquare_id + '\'' +
+                ", foursquare_type='" + foursquare_type + '\'' +
                 '}';
     }
 }

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

@@ -15,6 +15,7 @@ public class InlineQueryResultVenue extends InlineQueryResult<InlineQueryResultV
     private String address;
 
     private String foursquare_id;
+    private String foursquare_type;
     private String thumb_url;
     private Integer thumb_width;
     private Integer thumb_height;
@@ -32,6 +33,11 @@ public InlineQueryResultVenue foursquareId(String foursquareId) {
         return this;
     }
 
+    public InlineQueryResultVenue foursquareType(String foursquareType) {
+        this.foursquare_type = foursquareType;
+        return this;
+    }
+
     public InlineQueryResultVenue thumbUrl(String thumbUrl) {
         this.thumb_url = thumbUrl;
         return this;

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

@@ -14,6 +14,7 @@ public class InputVenueMessageContent extends InputMessageContent implements Ser
     private String title;
     private String address;
     private String foursquare_id;
+    private String foursquare_type;
 
     public InputVenueMessageContent(Float latitude, Float longitude, String title, String address) {
         this.latitude = latitude;
@@ -26,4 +27,9 @@ public InputVenueMessageContent foursquareId(String foursquareId) {
         this.foursquare_id = foursquareId;
         return this;
     }
+
+    public InputVenueMessageContent foursquareType(String foursquareType) {
+        this.foursquare_type = foursquareType;
+        return this;
+    }
 }

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

@@ -17,4 +17,8 @@ public SendVenue(Object chatId, float latitude, float longitude, String title, S
     public SendVenue foursquareId(String foursquareId) {
         return add("foursquare_id", foursquareId);
     }
+
+    public SendVenue foursquareType(String foursquareType) {
+        return add("foursquare_type", foursquareType);
+    }
 }

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

@@ -257,7 +257,7 @@ public void answerInline() {
                         new InputContactMessageContent("123123123", "na,e").lastName("lastName")),
                 new InlineQueryResultArticle("3", "title", new InputLocationMessageContent(50f, 50f).livePeriod(60)),
                 new InlineQueryResultArticle("4", "title",
-                        new InputVenueMessageContent(50f, 50f, "title", "address").foursquareId("sqrId")),
+                        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")
@@ -273,7 +273,7 @@ public void answerInline() {
                         .mpeg4Height(100).mpeg4Width(100).mpeg4Duration(100),
                 new InlineQueryResultPhoto("13", someUrl, someUrl).photoWidth(100).photoHeight(100).title("title")
                         .description("desc").caption("cap <b>bold</b>").parseMode(ParseMode.HTML),
-                new InlineQueryResultVenue("14", 54f, 55f, "title", "address").foursquareId("frsqrId")
+                new InlineQueryResultVenue("14", 54f, 55f, "title", "address").foursquareId("frsqrId").foursquareType("frType")
                         .thumbUrl(someUrl).thumbHeight(100).thumbWidth(100),
                 new InlineQueryResultVideo("15", someUrl, VIDEO_MIME_TYPE, "text", someUrl, "title").caption("cap <b>bold</b>").parseMode(ParseMode.HTML)
                         .videoWidth(100).videoHeight(100).videoDuration(100).description("desc"),
@@ -720,13 +720,17 @@ public void sendLocation() {
     @Test
     public void sendVenue() {
         Float lat = 21.999998f, lng = 105.2f;
-        String title = "title", address = "addr", frsqrId = "asdfasdf";
-        Venue venue = bot.execute(new SendVenue(chatId, lat, lng, title, address).foursquareId(frsqrId)).message().venue();
+        String title = "title", address = "addr", frsqrId = "asdfasdf", frsqrType = "frType";
+        Venue venue = bot.execute(new SendVenue(chatId, lat, lng, title, address)
+                .foursquareId(frsqrId)
+                .foursquareType(frsqrType)
+        ).message().venue();
         assertEquals(lat, venue.location().latitude());
         assertEquals(lng, venue.location().longitude());
         assertEquals(address, venue.address());
         assertEquals(title, venue.title());
         assertEquals(frsqrId, venue.foursquareId());
+        assertEquals(frsqrType, venue.foursquareType());
     }
 
     @Test