Added new methods restrictChatMember and promoteChatMember to manage users and admins, added new parameter until_date to kickChatMember for temporary bans

Author: pengrad

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

@@ -12,4 +12,8 @@ public KickChatMember(Object chatId, int userId) {
         super(BaseResponse.class);
         add("chat_id", chatId).add("user_id", userId);
     }
+
+    public KickChatMember untilDate(int untilDate) {
+        return add("until_date", untilDate);
+    }
 }

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

@@ -0,0 +1,43 @@
+package com.pengrad.telegrambot.request;
+
+import com.pengrad.telegrambot.response.BaseResponse;
+
+/**
+ * Stas Parshin
+ * 01 July 2017
+ */
+public class PromoteChatMember extends BaseRequest<PromoteChatMember, BaseResponse> {
+
+    public PromoteChatMember(Object chatId, int userId) {
+        super(BaseResponse.class);
+        add("chat_id", chatId).add("user_id", userId);
+    }
+
+    public PromoteChatMember canChangeInfo(boolean canChangeInfo) {
+        return add("can_change_info", canChangeInfo);
+    }
+
+    public PromoteChatMember canPostMessages(boolean canPostMessages) {
+        return add("can_post_messages", canPostMessages);
+    }
+
+    public PromoteChatMember canEditMessages(boolean canEditMessages) {
+        return add("can_edit_messages", canEditMessages);
+    }
+
+    public PromoteChatMember canDeleteMessages(boolean canDeleteMessages) {
+        return add("can_delete_messages", canDeleteMessages);
+    }
+
+    public PromoteChatMember canRestrictMembers(boolean canRestrictMembers) {
+        return add("can_restrict_members", canRestrictMembers);
+    }
+
+    public PromoteChatMember canPinMessages(boolean canPinMessages) {
+        return add("can_pin_messages", canPinMessages);
+    }
+
+    public PromoteChatMember canPromoteMembers(boolean canPromoteMembers) {
+        return add("can_promote_members", canPromoteMembers);
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.pengrad.telegrambot.request;
+
+import com.pengrad.telegrambot.response.BaseResponse;
+
+/**
+ * Stas Parshin
+ * 01 July 2017
+ */
+public class RestrictChatMember extends BaseRequest<RestrictChatMember, BaseResponse> {
+
+    public RestrictChatMember(Object chatId, int userId) {
+        super(BaseResponse.class);
+        add("chat_id", chatId).add("user_id", userId);
+    }
+
+    public RestrictChatMember untilDate(int untilDate) {
+        return add("until_date", untilDate);
+    }
+
+    public RestrictChatMember canSendMessages(boolean canSendMessages) {
+        return add("can_send_messages", canSendMessages);
+    }
+
+    public RestrictChatMember canSendMediaMessages(boolean canSendMediaMessages) {
+        return add("can_send_media_messages", canSendMediaMessages);
+    }
+
+    public RestrictChatMember canSendOtherMessages(boolean canSendOtherMessages) {
+        return add("can_send_other_messages", canSendOtherMessages);
+    }
+
+    public RestrictChatMember canAddWebPagePreviews(boolean canAddWebPagePreviews) {
+        return add("can_add_web_page_previews", canAddWebPagePreviews);
+    }
+}

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

@@ -30,8 +30,10 @@ public class TelegramBotTest {
 
     TelegramBot bot;
     Integer chatId, forwardMessageId;
+    Long groupId;
     String channelName = "@bottest";
     Long channelId = -1001002720332L;
+    Integer memberBot = 215003245;
     String stickerId;
 
     Path resourcePath = Paths.get("src/test/resources");
@@ -51,26 +53,29 @@ public class TelegramBotTest {
     String withSpaceFileId = "BAADAgADZwADkg-4SQI5WM0SPNHrAg";
 
     public TelegramBotTest() throws IOException {
-        String token, chat, forwardMessage, sticker;
+        String token, chat, group, forwardMessage, sticker;
 
         try {
             Properties properties = new Properties();
             properties.load(new FileInputStream("local.properties"));
 
             token = properties.getProperty("TEST_TOKEN");
             chat = properties.getProperty("CHAT_ID");
+            group = properties.getProperty("GROUP_ID");
             forwardMessage = properties.getProperty("FORWARD_MESSAGE");
             sticker = properties.getProperty("STICKER_FILE_ID");
 
         } catch (Exception e) {
             token = System.getenv("TEST_TOKEN");
             chat = System.getenv("CHAT_ID");
+            group = System.getenv("GROUP_ID");
             forwardMessage = System.getenv("FORWARD_MESSAGE");
             sticker = System.getenv("STICKER_FILE_ID");
         }
 
         bot = TelegramBotAdapter.buildDebug(token);
         chatId = Integer.parseInt(chat);
+        groupId = Long.parseLong(group);
         forwardMessageId = Integer.parseInt(forwardMessage);
         stickerId = sticker;
     }
@@ -107,7 +112,7 @@ public void getFile() throws IOException {
 
     @Test
     public void kickChatMember() {
-        BaseResponse response = bot.execute(new KickChatMember(channelName, chatId));
+        BaseResponse response = bot.execute(new KickChatMember(channelName, chatId).untilDate(123));
         assertFalse(response.isOk());
         assertEquals(400, response.errorCode());
         assertEquals("Bad Request: user is an administrator of the chat", response.description());
@@ -119,6 +124,32 @@ public void unbanChatMember() {
         assertTrue(response.isOk());
     }
 
+    @Test
+    public void restrictChatMember() {
+        BaseResponse response = bot.execute(
+                new RestrictChatMember(groupId, memberBot)
+                        .untilDate(100)
+                        .canSendMessages(false)
+                        .canSendMediaMessages(false)
+                        .canSendOtherMessages(false)
+                        .canAddWebPagePreviews(false));
+        assertTrue(response.isOk());
+    }
+
+    @Test
+    public void promoteChatMember() {
+        BaseResponse response = bot.execute(
+                new PromoteChatMember(groupId, memberBot)
+                        .canChangeInfo(false)
+                        .canPostMessages(false)
+                        .canEditMessages(false)
+                        .canDeleteMessages(false)
+                        .canRestrictMembers(false)
+                        .canPinMessages(false)
+                        .canPromoteMembers(false));
+        System.out.println(response);
+    }
+
     @Test
     public void editMessageText() {
         String text = "Update " + System.currentTimeMillis();