Fix small merge issues

This commit is contained in:
Dan 2018-08-22 10:32:57 +02:00
parent 3f7b0b25af
commit c3cf924ddd
2 changed files with 19 additions and 19 deletions

View File

@ -22,10 +22,10 @@ from ...ext import BaseClient, utils
class GetDialogs(BaseClient): class GetDialogs(BaseClient):
def get_dialogs(self, async def get_dialogs(self,
offset_dialogs=None, offset_dialogs=None,
limit: int = 100, limit: int = 100,
pinned_only: bool = False): pinned_only: bool = False):
"""Use this method to get the user's dialogs """Use this method to get the user's dialogs
You can get up to 100 dialogs at once. You can get up to 100 dialogs at once.

View File

@ -27,21 +27,21 @@ from pyrogram.client.ext import BaseClient, utils
class SendAnimation(BaseClient): class SendAnimation(BaseClient):
asyncdef send_animation(self, async def send_animation(self,
chat_id: int or str, chat_id: int or str,
animation: str, animation: str,
caption: str = "", caption: str = "",
parse_mode: str = "", parse_mode: str = "",
duration: int = 0, duration: int = 0,
width: int = 0, width: int = 0,
height: int = 0, height: int = 0,
thumb: str = None, thumb: str = None,
disable_notification: bool = None, disable_notification: bool = None,
reply_to_message_id: int = None, reply_to_message_id: int = None,
reply_markup=None, reply_markup=None,
progress: callable = None, progress: callable = None,
progress_args: tuple = ()): progress_args: tuple = ()):
"""Use this method to send animation files(animation or H.264/MPEG-4 AVC video without sound). """Use this method to send animation files (animation or H.264/MPEG-4 AVC video without sound).
Args: Args:
chat_id (``int`` | ``str``): chat_id (``int`` | ``str``):