Merge remote-tracking branch 'origin/master' into dev

# Conflicts:
#	aiogram/bot/base.py

aiogram/bot/api.py

@@ -4,6 +4,7 @@ import os
 import aiohttp
 
 from ..exceptions import ValidationError, TelegramAPIError
+from ..utils import json
 
 log = logging.getLogger('aiogram')
 
@@ -40,7 +41,7 @@ async def _check_result(method_name, response):
         raise TelegramAPIError(f"The server returned HTTP {response.status}. Response body:\n[{body}]",
                                method_name, response.status, body)
 
-    result_json = await response.json()
+    result_json = await response.json(loads=json.loads)
 
     if not result_json.get('ok'):
         body = await response.text()
@@ -83,7 +84,7 @@ def _compose_data(params, files=None):
 async def request(session, token, method, data=None, files=None):
     log.debug(f"Make request: '{method}' with data: {data or {}} and files {files or {}}")
     data = _compose_data(data, files)
-    url = API_URL.format(token=token, method=method)
+    url = Methods.api_url(token=token, method=method)
     async with session.post(url, data=data) as response:
         return await _check_result(method, response)
 
@@ -122,6 +123,15 @@ class Methods:
     GET_CHAT_ADMINISTRATORS = 'getChatAdministrators'
     GET_CHAT_MEMBERS_COUNT = 'getChatMembersCount'
     GET_CHAT_MEMBER = 'getChatMember'
+    RESTRICT_CHAT_MEMBER = 'restrictChatMember'
+    PROMOTE_CHAT_MEMBER = 'promoteChatMember'
+    EXPORT_CHAT_INVITE_LINK = 'exportChatInviteLink'
+    SET_CHAT_PHOTO = 'setChatPhoto'
+    DELETE_CHAT_PHOTO = 'deleteChatPhoto'
+    SET_CHAT_TITLE = 'setChatTitle'
+    SET_CHAT_DESCRIPTION = 'setChatDescription'
+    PIN_CHAT_MESSAGE = 'pinChatMessage'
+    UNPIN_CHAT_MESSAGE = 'unpinChatMessage'
     ANSWER_CALLBACK_QUERY = 'answerCallbackQuery'
     ANSWER_INLINE_QUERY = 'answerInlineQuery'
     EDIT_MESSAGE_TEXT = 'editMessageText'
@@ -134,3 +144,11 @@ class Methods:
     SEND_GAME = 'sendGame'
     SET_GAME_SCORE = 'setGameScore'
     GET_GAME_HIGH_SCORES = 'getGameHighScores'
+
+    @staticmethod
+    def api_url(token, method):
+        return API_URL.format(token=token, method=method)
+
+    @staticmethod
+    def file_url(token, path):
+        return FILE_URL.format(token=token, path=path)

aiogram/bot/bot.py

@@ -1,4 +1,6 @@
-import json
+import datetime
+from ..utils import json
+import time
 
 from .base import BaseBot
 from .. import types
@@ -505,7 +507,7 @@ class Bot(BaseBot):
         file = await super(Bot, self).get_file(file_id)
         return self.prepare_object(types.File.de_json(file))
 
-    async def kick_chat_user(self, chat_id, user_id) -> bool:
+    async def kick_chat_member(self, chat_id, user_id) -> bool:
         """
         Use this method to kick a user from a group or a supergroup. In the case of supergroups, 
         the user will not be able to return to the group on their own using invite links, etc., 
@@ -515,7 +517,133 @@ class Bot(BaseBot):
         :param user_id: int
         :return: bool
         """
-        return await super(Bot, self).kick_chat_user(chat_id, user_id)
+        return await super(Bot, self).kick_chat_member(chat_id, user_id)
+
+    async def promote_chat_member(self, chat_id: int, user_id: int, can_change_info: bool, can_post_messages: bool,
+                                  can_edit_messages: bool, can_delete_messages: bool, can_invite_users: bool,
+                                  can_restrict_members: bool, can_pin_messages: bool,
+                                  can_promote_members: bool) -> bool:
+        """
+        Use this method to promote or demote a user in a supergroup or a channel.
+        The bot must be an administrator in the chat for this to work and must have the appropriate admin rights.
+        Pass False for all boolean parameters to demote a user.
+        
+        :param chat_id: int
+        :param user_id: int
+        :param can_change_info: bool 
+        :param can_post_messages: bool
+        :param can_edit_messages: bool
+        :param can_delete_messages: bool
+        :param can_invite_users: bool
+        :param can_restrict_members: bool
+        :param can_pin_messages: bool
+        :param can_promote_members: bool
+        :return: bool
+        """
+        return await super(Bot, self).promote_chat_member(chat_id, user_id, can_change_info, can_post_messages,
+                                                          can_edit_messages, can_delete_messages, can_invite_users,
+                                                          can_restrict_members, can_pin_messages, can_promote_members)
+
+    async def restrict_chat_member(self, chat_id: int, user_id: int, until_date: int, can_send_messages: bool,
+                                   can_send_media_messages: bool, can_send_other_messages: bool,
+                                   can_add_web_page_previews: bool) -> bool:
+        """
+        Use this method to restrict a user in a supergroup.
+        The bot must be an administrator in the supergroup for this to work and must have the appropriate admin rights.
+        Pass True for all boolean parameters to lift restrictions from a user.
+        
+        :param chat_id: int
+        :param user_id: int
+        :param until_date: int
+        :param can_send_messages: bool
+        :param can_send_media_messages: bool
+        :param can_send_other_messages: bool
+        :param can_add_web_page_previews: bool
+        :return: bool
+        """
+        if isinstance(until_date, datetime.datetime):
+            until_date = int(time.mktime(until_date.timetuple()))
+        return await super(Bot, self).restrict_chat_member(chat_id, user_id, until_date, can_send_messages,
+                                                           can_send_media_messages, can_send_other_messages,
+                                                           can_add_web_page_previews)
+
+    async def export_chat_invite_link(self, chat_id: int) -> str:
+        """
+        Use this method to export an invite link to a supergroup or a channel. 
+        The bot must be an administrator in the chat for this to work and must have the appropriate admin rights.
+        
+        :param chat_id: int
+        :return: 
+        """
+        return await super(Bot, self).export_chat_invite_link(chat_id)
+
+    async def set_chat_photo(self, chat_id: int, photo) -> bool:
+        """
+        Use this method to set a new profile photo for the chat.
+        Photos can't be changed for private chats.
+        The bot must be an administrator in the chat for this to work and must have the appropriate admin rights.
+        
+        :param chat_id: int
+        :param photo: file or str
+        :return: bool
+        """
+        return await super(Bot, self).set_chat_photo(chat_id, photo)
+
+    async def delete_chat_photo(self, chat_id: int) -> bool:
+        """
+        Use this method to delete a chat photo. 
+        Photos can't be changed for private chats. 
+        The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. 
+        
+        :param chat_id: int
+        :return: bool
+        """
+        return await super(Bot, self).delete_chat_photo(chat_id)
+
+    async def set_chat_title(self, chat_id: int, title: str) -> bool:
+        """
+        Use this method to change the title of a chat. 
+        Titles can't be changed for private chats. 
+        The bot must be an administrator in the chat for this to work and must have the appropriate admin rights.
+        
+        :param chat_id: int
+        :param title: str
+        :return: bool
+        """
+        return await super(Bot, self).set_chat_title(chat_id, title)
+
+    async def set_chat_description(self, chat_id: int, description: str) -> bool:
+        """
+        Use this method to change the description of a supergroup or a channel. 
+        The bot must be an administrator in the chat for this to work and must have the appropriate admin rights.
+        
+        :param chat_id: int
+        :param description: str 
+        :return: bool
+        """
+        return await super(Bot, self).set_chat_description(chat_id, description)
+
+    async def pin_chat_message(self, chat_id: int, message_id: int, disable_notification: bool = False) -> bool:
+        """
+        Use this method to pin a message in a supergroup. 
+        The bot must be an administrator in the chat for this to work and must have the appropriate admin rights.
+        
+        :param chat_id: int
+        :param message_id: int
+        :param disable_notification: bool 
+        :return: bool
+        """
+        return await super(Bot, self).pin_chat_message(chat_id, message_id, disable_notification)
+
+    async def unpin_chat_message(self, chat_id: int) -> bool:
+        """
+        Use this method to unpin a message in a supergroup chat. 
+        The bot must be an administrator in the chat for this to work and must have the appropriate admin rights.
+    
+        :param chat_id: int
+        :return: bool
+        """
+        return await super(Bot, self).unpin_chat_message(chat_id)
 
     async def unban_chat_member(self, chat_id, user_id) -> bool:
         """