diff --git a/.gitignore b/.gitignore index d44bcfdf..59302535 100644 --- a/.gitignore +++ b/.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 diff --git a/library/src/main/java/com/pengrad/telegrambot/model/Contact.java b/library/src/main/java/com/pengrad/telegrambot/model/Contact.java index 65d74153..605f9ef8 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/Contact.java +++ b/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; } diff --git a/library/src/main/java/com/pengrad/telegrambot/model/InlineQuery.java b/library/src/main/java/com/pengrad/telegrambot/model/InlineQuery.java index 75230cb5..fa3b208a 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/InlineQuery.java +++ b/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 + '\'' + '}'; } } diff --git a/library/src/main/java/com/pengrad/telegrambot/model/Message.java b/library/src/main/java/com/pengrad/telegrambot/model/Message.java index 6b2e1027..f5536716 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/Message.java +++ b/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 + '}'; } diff --git a/library/src/main/java/com/pengrad/telegrambot/model/User.java b/library/src/main/java/com/pengrad/telegrambot/model/User.java index a0194a11..2e49d5f4 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/User.java +++ b/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; } diff --git a/library/src/main/java/com/pengrad/telegrambot/model/VoiceChatScheduled.java b/library/src/main/java/com/pengrad/telegrambot/model/VoiceChatScheduled.java new file mode 100644 index 00000000..ce7be19d --- /dev/null +++ b/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 + + '}'; + } + +} diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/ChatAction.java b/library/src/main/java/com/pengrad/telegrambot/model/request/ChatAction.java index af6cc89a..491c8da4 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/request/ChatAction.java +++ b/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 } diff --git a/library/src/main/java/com/pengrad/telegrambot/model/request/InputInvoiceMessageContent.java b/library/src/main/java/com/pengrad/telegrambot/model/request/InputInvoiceMessageContent.java new file mode 100644 index 00000000..4fa8f8d6 --- /dev/null +++ b/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; + } + +} diff --git a/library/src/main/java/com/pengrad/telegrambot/passport/SetPassportDataErrors.java b/library/src/main/java/com/pengrad/telegrambot/passport/SetPassportDataErrors.java index 57d6b032..d5f9d990 100644 --- a/library/src/main/java/com/pengrad/telegrambot/passport/SetPassportDataErrors.java +++ b/library/src/main/java/com/pengrad/telegrambot/passport/SetPassportDataErrors.java @@ -9,7 +9,7 @@ */ public class SetPassportDataErrors extends BaseRequest { - public SetPassportDataErrors(int userId, PassportElementError... errors) { + public SetPassportDataErrors(long userId, PassportElementError... errors) { super(BaseResponse.class); add("user_id", userId).add("errors", errors); } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/AddStickerToSet.java b/library/src/main/java/com/pengrad/telegrambot/request/AddStickerToSet.java index 66989d6b..a456d6b9 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/AddStickerToSet.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/AddStickerToSet.java @@ -9,15 +9,15 @@ */ public class AddStickerToSet extends AbstractUploadRequest { - 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); diff --git a/library/src/main/java/com/pengrad/telegrambot/request/CreateNewStickerSet.java b/library/src/main/java/com/pengrad/telegrambot/request/CreateNewStickerSet.java index c0a97606..78d519a6 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/CreateNewStickerSet.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/CreateNewStickerSet.java @@ -9,15 +9,15 @@ */ public class CreateNewStickerSet extends AbstractUploadRequest { - public static CreateNewStickerSet tgsSticker(Integer userId, String name, String title, String emojis, Object tgsSticker) { + public static CreateNewStickerSet tgsSticker(Long userId, String name, String title, String emojis, Object tgsSticker) { return new CreateNewStickerSet(userId, name, title, emojis, "tgs_sticker", tgsSticker); } - public CreateNewStickerSet(Integer userId, String name, String title, Object pngSticker, String emojis) { + public CreateNewStickerSet(Long userId, String name, String title, Object pngSticker, String emojis) { this(userId, name, title, emojis, "png_sticker", pngSticker); } - private CreateNewStickerSet(Integer userId, String name, String title, String emojis, String stickerParam, Object sticker) { + private CreateNewStickerSet(Long userId, String name, String title, String emojis, String stickerParam, Object sticker) { super(BaseResponse.class, stickerParam, sticker); add("user_id", userId); add("name", name); diff --git a/library/src/main/java/com/pengrad/telegrambot/request/GetChatMember.java b/library/src/main/java/com/pengrad/telegrambot/request/GetChatMember.java index 33c263dc..683db6aa 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/GetChatMember.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/GetChatMember.java @@ -8,7 +8,7 @@ */ public class GetChatMember extends BaseRequest { - public GetChatMember(Object chatId, int userId) { + public GetChatMember(Object chatId, long userId) { super(GetChatMemberResponse.class); add("chat_id", chatId).add("user_id", userId); } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/GetGameHighScores.java b/library/src/main/java/com/pengrad/telegrambot/request/GetGameHighScores.java index 9655a824..ed06ce1e 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/GetGameHighScores.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/GetGameHighScores.java @@ -8,12 +8,12 @@ */ public class GetGameHighScores extends BaseRequest { - public GetGameHighScores(int userId, Object chatId, int messageId) { + public GetGameHighScores(long userId, Object chatId, int messageId) { super(GetGameHighScoresResponse.class); add("user_id", userId).add("chat_id", chatId).add("message_id", messageId); } - public GetGameHighScores(int userId, String inlineMessageId) { + public GetGameHighScores(long userId, String inlineMessageId) { super(GetGameHighScoresResponse.class); add("user_id", userId).add("inline_message_id", inlineMessageId); } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/GetUserProfilePhotos.java b/library/src/main/java/com/pengrad/telegrambot/request/GetUserProfilePhotos.java index 5954891c..10b9321c 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/GetUserProfilePhotos.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/GetUserProfilePhotos.java @@ -8,7 +8,7 @@ */ public class GetUserProfilePhotos extends BaseRequest { - public GetUserProfilePhotos(int userId) { + public GetUserProfilePhotos(long userId) { super(GetUserProfilePhotosResponse.class); add("user_id", userId); } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/KickChatMember.java b/library/src/main/java/com/pengrad/telegrambot/request/KickChatMember.java index 33d913ec..d429183d 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/KickChatMember.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/KickChatMember.java @@ -8,7 +8,7 @@ */ public class KickChatMember extends BaseRequest { - public KickChatMember(Object chatId, int userId) { + public KickChatMember(Object chatId, long userId) { super(BaseResponse.class); add("chat_id", chatId).add("user_id", userId); } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/PromoteChatMember.java b/library/src/main/java/com/pengrad/telegrambot/request/PromoteChatMember.java index 4fbf1487..111c9ae6 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/PromoteChatMember.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/PromoteChatMember.java @@ -8,7 +8,7 @@ */ public class PromoteChatMember extends BaseRequest { - public PromoteChatMember(Object chatId, int userId) { + public PromoteChatMember(Object chatId, long userId) { super(BaseResponse.class); add("chat_id", chatId).add("user_id", userId); } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/RestrictChatMember.java b/library/src/main/java/com/pengrad/telegrambot/request/RestrictChatMember.java index 2490220f..b8d2f336 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/RestrictChatMember.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/RestrictChatMember.java @@ -9,12 +9,12 @@ */ public class RestrictChatMember extends BaseRequest { - public RestrictChatMember(Object chatId, int userId) { + public RestrictChatMember(Object chatId, long userId) { super(BaseResponse.class); add("chat_id", chatId).add("user_id", userId); } - public RestrictChatMember(Object chatId, int userId, ChatPermissions permissions) { + public RestrictChatMember(Object chatId, long userId, ChatPermissions permissions) { super(BaseResponse.class); add("chat_id", chatId).add("user_id", userId).add("permissions", permissions); } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SendInvoice.java b/library/src/main/java/com/pengrad/telegrambot/request/SendInvoice.java index 7714bd0f..ec67a5d9 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/SendInvoice.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/SendInvoice.java @@ -8,7 +8,15 @@ */ public class SendInvoice extends AbstractSendRequest { - public SendInvoice(Integer chatId, String title, String description, String payload, String providerToken, + public SendInvoice(Long chatId, String title, String description, String payload, String providerToken, + String currency, LabeledPrice... prices) { + super(chatId); + add("title", title).add("description", description).add("payload", payload).add("provider_token", providerToken) + .add("currency", currency).add("prices", prices); + } + + // Backward compatibility: API 5.2, parameter "start_parameter" became optional + public SendInvoice(Long chatId, String title, String description, String payload, String providerToken, String startParameter, String currency, LabeledPrice... prices) { super(chatId); add("title", title).add("description", description).add("payload", payload).add("provider_token", providerToken) @@ -54,4 +62,26 @@ public SendInvoice needShippingAddress(boolean needShippingAddress) { public SendInvoice isFlexible(boolean isFlexible) { return add("is_flexible", isFlexible); } + + public SendInvoice startParameter(String startParameter) { + return add("start_parameter", startParameter); + } + + /** + * + * @param maxTipAmount The maximum accepted amount for tips in the smallest units of the currency + * @return + */ + public SendInvoice maxTipAmount(int maxTipAmount) { + return add("max_tip_amount", maxTipAmount); + } + + /** + * + * @param suggestedTipAmounts An array of suggested amounts of tip in the smallest units of the currency. At most 4 suggested tip amounts can be specified. The suggested tip amounts must be positive, passed in a strictly increased order and must not exceed max_tip_amount. + * @return + */ + public SendInvoice suggestedTipAmounts(Integer[] suggestedTipAmounts) { + return add("suggested_tip_amounts", suggestedTipAmounts); + } } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SetChatAdministratorCustomTitle.java b/library/src/main/java/com/pengrad/telegrambot/request/SetChatAdministratorCustomTitle.java index cd8e1b39..ff33cdbb 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/SetChatAdministratorCustomTitle.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/SetChatAdministratorCustomTitle.java @@ -8,7 +8,7 @@ */ public class SetChatAdministratorCustomTitle extends BaseRequest { - public SetChatAdministratorCustomTitle(Object chatId, int userId, String customTitle) { + public SetChatAdministratorCustomTitle(Object chatId, long userId, String customTitle) { super(BaseResponse.class); add("chat_id", chatId).add("user_id", userId).add("custom_title", customTitle); } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SetGameScore.java b/library/src/main/java/com/pengrad/telegrambot/request/SetGameScore.java index 380ce320..4999ce10 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/SetGameScore.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/SetGameScore.java @@ -9,12 +9,12 @@ */ public class SetGameScore extends BaseRequest { - public SetGameScore(int userId, int score, Object chatId, int messageId) { + public SetGameScore(long userId, int score, Object chatId, int messageId) { super(SendResponse.class); add("user_id", userId).add("score", score).add("chat_id", chatId).add("message_id", messageId); } - public SetGameScore(int userId, int score, String inlineMessageId) { + public SetGameScore(long userId, int score, String inlineMessageId) { super(BaseResponse.class); add("user_id", userId).add("score", score).add("inline_message_id", inlineMessageId); } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SetStickerSetThumb.java b/library/src/main/java/com/pengrad/telegrambot/request/SetStickerSetThumb.java index bf740b47..10fc1168 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/SetStickerSetThumb.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/SetStickerSetThumb.java @@ -8,13 +8,13 @@ */ public class SetStickerSetThumb extends AbstractUploadRequest { - public SetStickerSetThumb(String name, Integer userId, Object thumb) { + public SetStickerSetThumb(String name, Long userId, Object thumb) { super(BaseResponse.class, "thumb", thumb); add("name", name); add("user_id", userId); } - public SetStickerSetThumb(String name, Integer userId) { + public SetStickerSetThumb(String name, Long userId) { super(BaseResponse.class, "name", name); add("user_id", userId); } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/UnbanChatMember.java b/library/src/main/java/com/pengrad/telegrambot/request/UnbanChatMember.java index 25f1cc3c..c8e523c4 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/UnbanChatMember.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/UnbanChatMember.java @@ -8,7 +8,7 @@ */ public class UnbanChatMember extends BaseRequest { - public UnbanChatMember(Object chatId, int userId) { + public UnbanChatMember(Object chatId, long userId) { super(BaseResponse.class); add("chat_id", chatId).add("user_id", userId); } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/UploadStickerFile.java b/library/src/main/java/com/pengrad/telegrambot/request/UploadStickerFile.java index 4c14441c..e372e5c8 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/UploadStickerFile.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/UploadStickerFile.java @@ -8,7 +8,7 @@ */ public class UploadStickerFile extends AbstractUploadRequest { - public UploadStickerFile(Integer userId, Object pngSticker) { + public UploadStickerFile(Long userId, Object pngSticker) { super(GetFileResponse.class, "png_sticker", pngSticker); add("user_id", userId); } diff --git a/library/src/test/java/com/pengrad/telegrambot/PaymentsTest.java b/library/src/test/java/com/pengrad/telegrambot/PaymentsTest.java index dca76dc0..2e9a44be 100644 --- a/library/src/test/java/com/pengrad/telegrambot/PaymentsTest.java +++ b/library/src/test/java/com/pengrad/telegrambot/PaymentsTest.java @@ -18,7 +18,7 @@ public class PaymentsTest { static TelegramBot bot = TelegramBotTest.bot; - static Integer chatId = TelegramBotTest.chatId; + static Long chatId = TelegramBotTest.chatId; String testShippingQuery = getProp("TEST_SHIP_QUERY"); String testPreCheckoutQuery = getProp("TEST_PRECHECKOUT_QUERY"); diff --git a/library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java b/library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java index 0105cb35..b108c6cd 100644 --- a/library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java +++ b/library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java @@ -118,7 +118,7 @@ static String getProp(String key) { String chat = getProp("CHAT_ID"); String group = getProp("GROUP_ID"); - chatId = Integer.parseInt(chat); + chatId = Long.parseLong(chat); groupId = Long.parseLong(group); privateKey = getProp("PRIVATE_KEY"); @@ -145,14 +145,14 @@ public static TelegramBot createTestBot() { } static TelegramBot bot = createTestBot(); - static Integer chatId; + static Long chatId; static Long groupId; Integer forwardMessageId = 33263; Integer forwardMessageIdUser = 23714; String stickerId = "BQADAgAD4AAD9HsZAAGVRXVaYXiJVAI"; String channelName = "@bottest"; Long channelId = -1001002720332L; - Integer memberBot = 215003245; + Long memberBot = 215003245L; Long localGroup = -1001431704825L; static String privateKey; static String testPassportData; @@ -1130,8 +1130,8 @@ public void sendChatAction() { assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.upload_photo)).isOk()); assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.record_video)).isOk()); assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.upload_video)).isOk()); - assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.record_audio)).isOk()); - assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.upload_audio)).isOk()); + assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.record_voice)).isOk()); + assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.upload_voice)).isOk()); assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.upload_document)).isOk()); assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.find_location)).isOk()); assertTrue(bot.execute(new SendChatAction(chatId, ChatAction.record_video_note)).isOk());