Merge pull request #242 from mircoianese/api_5.2

Update to BOT API 5.2

Author: pengrad

.gitignore

@@ -1,5 +1,10 @@
 .idea
+.vs
+.settings
+library/bin/*
+
 *.iml
+*.class
 .gradle
 build
 out
@@ -8,3 +13,6 @@ target
 .DS_Store
 local.properties
 private.key
+.project
+library/.classpath
+sample/.classpath

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

@@ -12,7 +12,7 @@ public class Contact implements Serializable {
     private String phone_number;
     private String first_name;
     private String last_name;
-    private Integer user_id;
+    private Long user_id;
     private String vcard;
 
     public String phoneNumber() {
@@ -27,7 +27,7 @@ public String lastName() {
         return last_name;
     }
 
-    public Integer userId() {
+    public Long userId() {
         return user_id;
     }
 

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

@@ -14,6 +14,7 @@ public class InlineQuery implements Serializable {
     private Location location;
     private String query;
     private String offset;
+    private String chat_type;
 
     public String id() {
         return id;
@@ -35,6 +36,10 @@ public String offset() {
         return offset;
     }
 
+    public String chatType() {
+        return chat_type;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -46,8 +51,9 @@ public boolean equals(Object o) {
         if (from != null ? !from.equals(that.from) : that.from != null) return false;
         if (location != null ? !location.equals(that.location) : that.location != null) return false;
         if (query != null ? !query.equals(that.query) : that.query != null) return false;
-        return offset != null ? offset.equals(that.offset) : that.offset == null;
+        if (chat_type != null ? !chat_type.equals(that.chat_type) : that.chat_type != null) return false;
 
+        return offset != null ? offset.equals(that.offset) : that.offset == null;
     }
 
     @Override
@@ -63,6 +69,7 @@ public String toString() {
                 ", location=" + location +
                 ", query='" + query + '\'' +
                 ", offset='" + offset + '\'' +
+                ", chat_type='" + chat_type + '\'' +
                 '}';
     }
 }

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

@@ -68,6 +68,7 @@ public class Message implements Serializable {
     private VoiceChatStarted voice_chat_started;
     private VoiceChatEnded voice_chat_ended;
     private VoiceChatParticipantsInvited voice_chat_participants_invited;
+    private VoiceChatScheduled voice_chat_scheduled;
     private InlineKeyboardMarkup reply_markup;
 
     public Integer messageId() {
@@ -286,6 +287,10 @@ public VoiceChatParticipantsInvited voiceChatParticipantsInvited() {
         return voice_chat_participants_invited;
     }
 
+    public VoiceChatScheduled voiceChatScheduled() {
+        return voice_chat_scheduled;
+    }
+
     public InlineKeyboardMarkup replyMarkup() {
         return reply_markup;
     }
@@ -349,6 +354,7 @@ public boolean equals(Object o) {
                 Objects.equals(voice_chat_started, message.voice_chat_started) &&
                 Objects.equals(voice_chat_ended, message.voice_chat_ended) &&
                 Objects.equals(voice_chat_participants_invited, message.voice_chat_participants_invited) &&
+                Objects.equals(voice_chat_scheduled, message.voice_chat_scheduled) &&
                 Objects.equals(reply_markup, message.reply_markup);
     }
 
@@ -414,6 +420,7 @@ public String toString() {
                 ", voice_chat_started=" + voice_chat_started +
                 ", voice_chat_ended=" + voice_chat_ended +
                 ", voice_chat_participants_invited=" + voice_chat_participants_invited +
+                ", voice_chat_scheduled=" + voice_chat_scheduled +
                 ", reply_markup=" + reply_markup +
                 '}';
     }

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

@@ -9,7 +9,7 @@
 public class User implements Serializable {
     private final static long serialVersionUID = 0L;
 
-    private Integer id;
+    private Long id;
     private Boolean is_bot;
     private String first_name;
     private String last_name;
@@ -22,11 +22,11 @@ public class User implements Serializable {
     private User() {
     }
 
-    public User(Integer id) {
+    public User(Long id) {
         this.id = id;
     }
 
-    public Integer id() {
+    public Long id() {
         return id;
     }
 

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

@@ -0,0 +1,34 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+
+public class VoiceChatScheduled implements Serializable {
+
+    private final static long serialVersionUID = 0L;
+
+    private Integer start_date;
+
+    public Integer startDate() {
+        return start_date;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+
+        return o != null && getClass() == o.getClass();
+    }
+
+    @Override
+    public int hashCode() {
+        return 1;
+    }
+
+    @Override
+    public String toString() {
+        return "VoiceChatScheduled{" +
+                "start_date=" + start_date +
+                '}';
+    }
+    
+}

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

@@ -5,6 +5,6 @@
  * 10/21/15.
  */
 public enum ChatAction {
-    typing, upload_photo, record_video, upload_video, record_audio, upload_audio, upload_document, find_location,
+    typing, upload_photo, record_video, upload_video, record_voice, upload_voice, upload_document, find_location,
     record_video_note, upload_video_note
 }

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

@@ -0,0 +1,117 @@
+package com.pengrad.telegrambot.model.request;
+
+import java.io.Serializable;
+
+public class InputInvoiceMessageContent extends InputMessageContent implements Serializable {
+    
+    private final static long serialVersionUID = 0L;
+
+    private String title;
+    private String description;
+
+    private String payload;
+    private String provider_token;
+
+    private String currency;
+    private LabeledPrice[] prices;
+
+    private Integer max_tip_amount;
+    private Integer[] suggested_tip_amount;
+
+    private String provider_data;
+
+    private String photo_url;
+    private Integer photo_size;
+    private Integer photo_width;
+    private Integer photo_height;
+
+    private boolean need_name;
+    private boolean need_phone_number;
+    private boolean need_email;
+    private boolean need_shipping_address;
+    private boolean send_phone_number_to_provider;
+    private boolean send_email_to_provider;
+
+    private boolean is_flexible;
+
+
+    public InputInvoiceMessageContent(String title, String description, String payload, String providerToken, String currency, LabeledPrice[] prices) {
+        this.title = title;
+        this.description = description;
+        this.payload = payload;
+        this.provider_token = providerToken;
+        this.currency = currency;
+        this.prices = prices;
+    }
+
+    public InputInvoiceMessageContent maxTipAmount(Integer maxTipAmount) {
+        this.max_tip_amount = maxTipAmount;
+        return this;
+    }
+
+    public InputInvoiceMessageContent suggestedTipAmount(Integer[] suggestedTipAmount) {
+        this.suggested_tip_amount = suggestedTipAmount;
+        return this;
+    }
+
+    public InputInvoiceMessageContent providerData(String providerData) {
+        this.provider_data = providerData;
+        return this;
+    }
+
+    public InputInvoiceMessageContent photoUrl(String photoUrl) {
+        this.photo_url = photoUrl;
+        return this;
+    }
+
+    public InputInvoiceMessageContent photoSize(Integer photoSize) {
+        this.photo_size = photoSize;
+        return this;
+    }
+
+    public InputInvoiceMessageContent photoWidth(Integer photoWidth) {
+        this.photo_width = photoWidth;
+        return this;
+    }
+
+    public InputInvoiceMessageContent photoHeight(Integer photoHeight) {
+        this.photo_height = photoHeight;
+        return this;
+    }
+
+    public InputInvoiceMessageContent needName(boolean needName) {
+        this.need_name = needName;
+        return this;
+    }
+
+    public InputInvoiceMessageContent needPhoneNumber(boolean needPhoneNumber) {
+        this.need_phone_number = needPhoneNumber;
+        return this;
+    }
+
+    public InputInvoiceMessageContent needEmail(boolean needEmail) {
+        this.need_email = needEmail;
+        return this;
+    }
+
+    public InputInvoiceMessageContent needShippingAddress(boolean needShippingAddress) {
+        this.need_shipping_address = needShippingAddress;
+        return this;
+    }
+
+    public InputInvoiceMessageContent sendPhoneNumberToProvider(boolean sendPhoneNumberToProvider) {
+        this.send_phone_number_to_provider = sendPhoneNumberToProvider;
+        return this;
+    }
+
+    public InputInvoiceMessageContent sendEmailToProvider(boolean sendEmailToProvider) {
+        this.send_email_to_provider = sendEmailToProvider;
+        return this;
+    }
+
+    public InputInvoiceMessageContent isFlexible(boolean isFlexible) {
+        this.is_flexible = isFlexible;
+        return this;
+    }
+
+}

library/src/main/java/com/pengrad/telegrambot/passport/SetPassportDataErrors.java

@@ -9,7 +9,7 @@
  */
 public class SetPassportDataErrors extends BaseRequest<SetPassportDataErrors, BaseResponse> {
 
-    public SetPassportDataErrors(int userId, PassportElementError... errors) {
+    public SetPassportDataErrors(long userId, PassportElementError... errors) {
         super(BaseResponse.class);
         add("user_id", userId).add("errors", errors);
     }

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

@@ -9,15 +9,15 @@
  */
 public class AddStickerToSet extends AbstractUploadRequest<AddStickerToSet, BaseResponse> {
 
-    public static AddStickerToSet tgsSticker(Integer userId, String name, String emojis, Object tgsSticker) {
+    public static AddStickerToSet tgsSticker(Long userId, String name, String emojis, Object tgsSticker) {
         return new AddStickerToSet(userId, name, emojis, "tgs_sticker", tgsSticker);
     }
 
-    public AddStickerToSet(Integer userId, String name, Object pngSticker, String emojis) {
+    public AddStickerToSet(Long userId, String name, Object pngSticker, String emojis) {
         this(userId, name, emojis, "png_sticker", pngSticker);
     }
 
-    private AddStickerToSet(Integer userId, String name, String emojis, String stickerParam, Object sticker) {
+    private AddStickerToSet(Long userId, String name, String emojis, String stickerParam, Object sticker) {
         super(BaseResponse.class, stickerParam, sticker);
         add("user_id", userId);
         add("name", name);