All send* methods take chat_id as Object type, to support Long for chats, String for channels or Integer for users and groups

pengrad · pengrad · commit 314ae461540b · 2015-10-31T20:34:41.000+03:00
diff --git a/src/main/java/com/pengrad/telegrambot/TelegramBot.java b/src/main/java/com/pengrad/telegrambot/TelegramBot.java
@@ -36,91 +36,91 @@ public GetMeResponse getMe() {
         return botApi.getMe();
     }
 
-    public SendResponse sendMessage(Long chatId, String text, ParseMode parse_mode, Boolean disableWebPagePreview, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendMessage(Object chatId, String text, ParseMode parse_mode, Boolean disableWebPagePreview, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendMessage(String.valueOf(chatId), text, parse_mode, disableWebPagePreview, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse forwardMessage(Long chatId, Long fromChatId, Integer messageId) {
+    public SendResponse forwardMessage(Object chatId, Object fromChatId, Integer messageId) {
         return botApi.forwardMessage(String.valueOf(chatId), String.valueOf(fromChatId), messageId);
     }
 
-    public SendResponse sendPhoto(Long chatId, String photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendPhoto(Object chatId, String photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendPhoto(String.valueOf(chatId), photo, caption, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendPhoto(Long chatId, InputFile photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendPhoto(Object chatId, InputFile photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendPhoto(String.valueOf(chatId), photo, caption, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendPhoto(Long chatId, InputFileBytes photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendPhoto(Object chatId, InputFileBytes photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendPhoto(String.valueOf(chatId), photo, caption, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendAudio(Long chatId, String audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendAudio(Object chatId, String audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendAudio(String.valueOf(chatId), audio, duration, performer, title, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendAudio(Long chatId, InputFile audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendAudio(Object chatId, InputFile audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendAudio(String.valueOf(chatId), audio, duration, performer, title, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendAudio(Long chatId, InputFileBytes audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendAudio(Object chatId, InputFileBytes audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendAudio(String.valueOf(chatId), audio, duration, performer, title, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendDocument(Long chatId, String document, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendDocument(Object chatId, String document, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendDocument(String.valueOf(chatId), document, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendDocument(Long chatId, InputFile document, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendDocument(Object chatId, InputFile document, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendDocument(String.valueOf(chatId), document, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendDocument(Long chatId, InputFileBytes document, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendDocument(Object chatId, InputFileBytes document, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendDocument(String.valueOf(chatId), document, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendSticker(Long chatId, String sticker, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendSticker(Object chatId, String sticker, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendSticker(String.valueOf(chatId), sticker, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendSticker(Long chatId, InputFile sticker, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendSticker(Object chatId, InputFile sticker, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendSticker(String.valueOf(chatId), sticker, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendSticker(Long chatId, InputFileBytes sticker, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendSticker(Object chatId, InputFileBytes sticker, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendSticker(String.valueOf(chatId), sticker, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendVideo(Long chatId, String video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendVideo(Object chatId, String video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendVideo(String.valueOf(chatId), video, duration, caption, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendVideo(Long chatId, InputFile video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendVideo(Object chatId, InputFile video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendVideo(String.valueOf(chatId), video, duration, caption, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendVideo(Long chatId, InputFileBytes video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendVideo(Object chatId, InputFileBytes video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendVideo(String.valueOf(chatId), video, duration, caption, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendVoice(Long chatId, String voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendVoice(Object chatId, String voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendVoice(String.valueOf(chatId), voice, duration, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendVoice(Long chatId, InputFile voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendVoice(Object chatId, InputFile voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendVoice(String.valueOf(chatId), voice, duration, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendVoice(Long chatId, InputFileBytes voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendVoice(Object chatId, InputFileBytes voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendVoice(String.valueOf(chatId), voice, duration, replyToMessageId, replyMarkup);
     }
 
-    public SendResponse sendLocation(Long chatId, Float latitude, Float longitude, Integer replyToMessageId, Keyboard replyMarkup) {
+    public SendResponse sendLocation(Object chatId, Float latitude, Float longitude, Integer replyToMessageId, Keyboard replyMarkup) {
         return botApi.sendLocation(String.valueOf(chatId), latitude, longitude, replyToMessageId, replyMarkup);
     }
 
-    public SendChatActionResponse sendChatAction(Long chatId, ChatAction action) {
+    public SendChatActionResponse sendChatAction(Object chatId, ChatAction action) {
         return botApi.sendChatAction(String.valueOf(chatId), action);
     }
 
diff --git a/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java b/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java
@@ -24,8 +24,9 @@
 public class TelegramBotTest {
 
     TelegramBot bot;
-    Long chatId;
-    Integer forwardMessageId;
+    Integer chatId, forwardMessageId;
+    String channelName = "@bottest";
+    Long channelId = -1001002720332L;
     String stickerId;
     String imagefile = getClass().getClassLoader().getResource("image.png").getFile();
     String audioFile = getClass().getClassLoader().getResource("beep.mp3").getFile();
@@ -36,7 +37,7 @@ public TelegramBotTest() throws IOException {
         Properties properties = new Properties();
         properties.load(new FileInputStream("local.properties"));
         bot = TelegramBotAdapter.buildDebug(properties.getProperty("TEST_TOKEN"));
-        chatId = Long.parseLong(properties.getProperty("CHAT_ID"));
+        chatId = Integer.parseInt(properties.getProperty("CHAT_ID"));
         forwardMessageId = Integer.parseInt(properties.getProperty("FORWARD_MESSAGE"));
         stickerId = properties.getProperty("STICKER_FILE_ID");
     }
@@ -66,8 +67,11 @@ public void testForwardMessage() throws Exception {
     @Test
     public void testSendMessage() throws Exception {
         SendResponse sendResponse = bot.sendMessage(chatId, "sendMessage _italic_ *markdown*", ParseMode.Markdown, false, forwardMessageId, new ReplyKeyboardMarkup(new String[]{"ok", "test"}).oneTimeKeyboard(true));
-        Message message = sendResponse.message();
-        MessageTest.checkTextdMessage(message);
+        MessageTest.checkTextdMessage(sendResponse.message());
+        sendResponse = bot.sendMessage(channelName, "to channel _italic_ *markdown*", ParseMode.Markdown, false, null, null);
+        MessageTest.checkTextdMessage(sendResponse.message());
+        sendResponse = bot.sendMessage(channelId, "explicit to channel id _italic_ *markdown*", ParseMode.Markdown, false, null, null);
+        MessageTest.checkTextdMessage(sendResponse.message());
     }
 
     @Test
@@ -138,7 +142,7 @@ public void testSendChatAction() throws Exception {
 
     @Test
     public void testGetUserProfilePhotos() throws Exception {
-        GetUserProfilePhotosResponse userProfilePhotosResponse = bot.getUserProfilePhotos(chatId.intValue(), 0, 5);
+        GetUserProfilePhotosResponse userProfilePhotosResponse = bot.getUserProfilePhotos(chatId, 0, 5);
         UserProfilePhotosTest.check(userProfilePhotosResponse.photos());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -36,91 +36,91 @@ public GetMeResponse getMe() {`
`36`	`36`	`return botApi.getMe();`
`37`	`37`	`}`
`38`	`38`
`39`		`- public SendResponse sendMessage(Long chatId, String text, ParseMode parse_mode, Boolean disableWebPagePreview, Integer replyToMessageId, Keyboard replyMarkup) {`
	`39`	`+ public SendResponse sendMessage(Object chatId, String text, ParseMode parse_mode, Boolean disableWebPagePreview, Integer replyToMessageId, Keyboard replyMarkup) {`
`40`	`40`	`return botApi.sendMessage(String.valueOf(chatId), text, parse_mode, disableWebPagePreview, replyToMessageId, replyMarkup);`
`41`	`41`	`}`
`42`	`42`
`43`		`- public SendResponse forwardMessage(Long chatId, Long fromChatId, Integer messageId) {`
	`43`	`+ public SendResponse forwardMessage(Object chatId, Object fromChatId, Integer messageId) {`
`44`	`44`	`return botApi.forwardMessage(String.valueOf(chatId), String.valueOf(fromChatId), messageId);`
`45`	`45`	`}`
`46`	`46`
`47`		`- public SendResponse sendPhoto(Long chatId, String photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {`
	`47`	`+ public SendResponse sendPhoto(Object chatId, String photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {`
`48`	`48`	`return botApi.sendPhoto(String.valueOf(chatId), photo, caption, replyToMessageId, replyMarkup);`
`49`	`49`	`}`
`50`	`50`
`51`		`- public SendResponse sendPhoto(Long chatId, InputFile photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {`
	`51`	`+ public SendResponse sendPhoto(Object chatId, InputFile photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {`
`52`	`52`	`return botApi.sendPhoto(String.valueOf(chatId), photo, caption, replyToMessageId, replyMarkup);`
`53`	`53`	`}`
`54`	`54`
`55`		`- public SendResponse sendPhoto(Long chatId, InputFileBytes photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {`
	`55`	`+ public SendResponse sendPhoto(Object chatId, InputFileBytes photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {`
`56`	`56`	`return botApi.sendPhoto(String.valueOf(chatId), photo, caption, replyToMessageId, replyMarkup);`
`57`	`57`	`}`
`58`	`58`
`59`		`- public SendResponse sendAudio(Long chatId, String audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {`
	`59`	`+ public SendResponse sendAudio(Object chatId, String audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {`
`60`	`60`	`return botApi.sendAudio(String.valueOf(chatId), audio, duration, performer, title, replyToMessageId, replyMarkup);`
`61`	`61`	`}`
`62`	`62`
`63`		`- public SendResponse sendAudio(Long chatId, InputFile audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {`
	`63`	`+ public SendResponse sendAudio(Object chatId, InputFile audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {`
`64`	`64`	`return botApi.sendAudio(String.valueOf(chatId), audio, duration, performer, title, replyToMessageId, replyMarkup);`
`65`	`65`	`}`
`66`	`66`
`67`		`- public SendResponse sendAudio(Long chatId, InputFileBytes audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {`
	`67`	`+ public SendResponse sendAudio(Object chatId, InputFileBytes audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {`
`68`	`68`	`return botApi.sendAudio(String.valueOf(chatId), audio, duration, performer, title, replyToMessageId, replyMarkup);`
`69`	`69`	`}`
`70`	`70`
`71`		`- public SendResponse sendDocument(Long chatId, String document, Integer replyToMessageId, Keyboard replyMarkup) {`
	`71`	`+ public SendResponse sendDocument(Object chatId, String document, Integer replyToMessageId, Keyboard replyMarkup) {`
`72`	`72`	`return botApi.sendDocument(String.valueOf(chatId), document, replyToMessageId, replyMarkup);`
`73`	`73`	`}`
`74`	`74`
`75`		`- public SendResponse sendDocument(Long chatId, InputFile document, Integer replyToMessageId, Keyboard replyMarkup) {`
	`75`	`+ public SendResponse sendDocument(Object chatId, InputFile document, Integer replyToMessageId, Keyboard replyMarkup) {`
`76`	`76`	`return botApi.sendDocument(String.valueOf(chatId), document, replyToMessageId, replyMarkup);`
`77`	`77`	`}`
`78`	`78`
`79`		`- public SendResponse sendDocument(Long chatId, InputFileBytes document, Integer replyToMessageId, Keyboard replyMarkup) {`
	`79`	`+ public SendResponse sendDocument(Object chatId, InputFileBytes document, Integer replyToMessageId, Keyboard replyMarkup) {`
`80`	`80`	`return botApi.sendDocument(String.valueOf(chatId), document, replyToMessageId, replyMarkup);`
`81`	`81`	`}`
`82`	`82`
`83`		`- public SendResponse sendSticker(Long chatId, String sticker, Integer replyToMessageId, Keyboard replyMarkup) {`
	`83`	`+ public SendResponse sendSticker(Object chatId, String sticker, Integer replyToMessageId, Keyboard replyMarkup) {`
`84`	`84`	`return botApi.sendSticker(String.valueOf(chatId), sticker, replyToMessageId, replyMarkup);`
`85`	`85`	`}`
`86`	`86`
`87`		`- public SendResponse sendSticker(Long chatId, InputFile sticker, Integer replyToMessageId, Keyboard replyMarkup) {`
	`87`	`+ public SendResponse sendSticker(Object chatId, InputFile sticker, Integer replyToMessageId, Keyboard replyMarkup) {`
`88`	`88`	`return botApi.sendSticker(String.valueOf(chatId), sticker, replyToMessageId, replyMarkup);`
`89`	`89`	`}`
`90`	`90`
`91`		`- public SendResponse sendSticker(Long chatId, InputFileBytes sticker, Integer replyToMessageId, Keyboard replyMarkup) {`
	`91`	`+ public SendResponse sendSticker(Object chatId, InputFileBytes sticker, Integer replyToMessageId, Keyboard replyMarkup) {`
`92`	`92`	`return botApi.sendSticker(String.valueOf(chatId), sticker, replyToMessageId, replyMarkup);`
`93`	`93`	`}`
`94`	`94`
`95`		`- public SendResponse sendVideo(Long chatId, String video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {`
	`95`	`+ public SendResponse sendVideo(Object chatId, String video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {`
`96`	`96`	`return botApi.sendVideo(String.valueOf(chatId), video, duration, caption, replyToMessageId, replyMarkup);`
`97`	`97`	`}`
`98`	`98`
`99`		`- public SendResponse sendVideo(Long chatId, InputFile video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {`
	`99`	`+ public SendResponse sendVideo(Object chatId, InputFile video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {`
`100`	`100`	`return botApi.sendVideo(String.valueOf(chatId), video, duration, caption, replyToMessageId, replyMarkup);`
`101`	`101`	`}`
`102`	`102`
`103`		`- public SendResponse sendVideo(Long chatId, InputFileBytes video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {`
	`103`	`+ public SendResponse sendVideo(Object chatId, InputFileBytes video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {`
`104`	`104`	`return botApi.sendVideo(String.valueOf(chatId), video, duration, caption, replyToMessageId, replyMarkup);`
`105`	`105`	`}`
`106`	`106`
`107`		`- public SendResponse sendVoice(Long chatId, String voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {`
	`107`	`+ public SendResponse sendVoice(Object chatId, String voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {`
`108`	`108`	`return botApi.sendVoice(String.valueOf(chatId), voice, duration, replyToMessageId, replyMarkup);`
`109`	`109`	`}`
`110`	`110`
`111`		`- public SendResponse sendVoice(Long chatId, InputFile voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {`
	`111`	`+ public SendResponse sendVoice(Object chatId, InputFile voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {`
`112`	`112`	`return botApi.sendVoice(String.valueOf(chatId), voice, duration, replyToMessageId, replyMarkup);`
`113`	`113`	`}`
`114`	`114`
`115`		`- public SendResponse sendVoice(Long chatId, InputFileBytes voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {`
	`115`	`+ public SendResponse sendVoice(Object chatId, InputFileBytes voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {`
`116`	`116`	`return botApi.sendVoice(String.valueOf(chatId), voice, duration, replyToMessageId, replyMarkup);`
`117`	`117`	`}`
`118`	`118`
`119`		`- public SendResponse sendLocation(Long chatId, Float latitude, Float longitude, Integer replyToMessageId, Keyboard replyMarkup) {`
	`119`	`+ public SendResponse sendLocation(Object chatId, Float latitude, Float longitude, Integer replyToMessageId, Keyboard replyMarkup) {`
`120`	`120`	`return botApi.sendLocation(String.valueOf(chatId), latitude, longitude, replyToMessageId, replyMarkup);`
`121`	`121`	`}`
`122`	`122`
`123`		`- public SendChatActionResponse sendChatAction(Long chatId, ChatAction action) {`
	`123`	`+ public SendChatActionResponse sendChatAction(Object chatId, ChatAction action) {`
`124`	`124`	`return botApi.sendChatAction(String.valueOf(chatId), action);`
`125`	`125`	`}`
`126`	`126`