TeamPGM/pyrogram
2
0
Fork 0
mirror of https://github.com/TeamPGM/pyrogram.git synced 2024-11-18 13:34:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into asyncio

Browse Source 
# Conflicts:
#	pyrogram/client/types/messages_and_media/message.py
This commit is contained in:
Dan 2018-11-13 14:01:47 +01:00
commit f7f1dbd25c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/start/Installation.rst
View File

@ -82,7 +82,7 @@ If no error shows up you are good to go.
>>> import pyrogram >>> import pyrogram
>>> pyrogram.__version__ >>> pyrogram.__version__
'0.9.1' '0.9.2'
.. _TgCrypto: https://docs.pyrogram.ml/resources/TgCrypto .. _TgCrypto: https://docs.pyrogram.ml/resources/TgCrypto
.. _develop: http://github.com/pyrogram/pyrogram .. _develop: http://github.com/pyrogram/pyrogram

4
pyrogram/client/types/messages_and_media/message.py
View File

@ -68,7 +68,7 @@ class Message(Object):
new_chat_photo, delete_chat_photo, group_chat_created, supergroup_chat_created, channel_chat_created, new_chat_photo, delete_chat_photo, group_chat_created, supergroup_chat_created, channel_chat_created,
migrate_to_chat_id, migrate_from_chat_id, pinned_message. migrate_to_chat_id, migrate_from_chat_id, pinned_message.
media (``bool``` *optional*): media (``bool`` *optional*):
The message is a media message. The message is a media message.
A media message has one and only one of these fields set: audio, document, photo, sticker, video, animation, A media message has one and only one of these fields set: audio, document, photo, sticker, video, animation,
voice, video_note, contact, location, venue. voice, video_note, contact, location, venue.
@ -391,7 +391,7 @@ class Message(Object):
) )
async def edit(self, text: str, parse_mode: str = "", disable_web_page_preview: bool = None, reply_markup=None): async def edit(self, text: str, parse_mode: str = "", disable_web_page_preview: bool = None, reply_markup=None):
"""Bound method *edit* of :obj:`Message <pyrogram.Message> """Bound method *edit* of :obj:`Message <pyrogram.Message>`
Use as a shortcut for: Use as a shortcut for: