Xtao-Labs/MTPyroger
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/pyrogram/pyrogram into develop

Browse Source
This commit is contained in:
Dan 2020-03-21 16:06:35 +01:00
commit 5501ac07a4
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pyrogram/client/methods/chats/set_chat_photo.py
View File

@ -27,7 +27,8 @@ class SetChatPhoto(BaseClient):
def set_chat_photo( def set_chat_photo(
self, self,
chat_id: Union[int, str], chat_id: Union[int, str],
photo: str photo: str,
file_ref: str = None
) -> bool: ) -> bool:
"""Set a new profile photo for the chat. """Set a new profile photo for the chat.
@ -41,6 +42,10 @@ class SetChatPhoto(BaseClient):
New chat photo. You can pass a :obj:`Photo` file_id or a file path to upload a new photo from your local New chat photo. You can pass a :obj:`Photo` file_id or a file path to upload a new photo from your local
machine. machine.
file_ref (``str``, *optional*):
A valid file reference obtained by a recently fetched media message.
To be used in combination with a file id in case a file reference is needed.
Returns: Returns:
``bool``: True on success. ``bool``: True on success.
@ -54,14 +59,14 @@ class SetChatPhoto(BaseClient):
app.set_chat_photo(chat_id, "photo.jpg") app.set_chat_photo(chat_id, "photo.jpg")
# Set chat photo using an exiting Photo file_id # Set chat photo using an exiting Photo file_id
app.set_chat_photo(chat_id, photo.file_id) app.set_chat_photo(chat_id, photo.file_id, photo.file_ref)
""" """
peer = self.resolve_peer(chat_id) peer = self.resolve_peer(chat_id)
if os.path.exists(photo): if os.path.exists(photo):
photo = types.InputChatUploadedPhoto(file=self.save_file(photo)) photo = types.InputChatUploadedPhoto(file=self.save_file(photo))
else: else:
photo = utils.get_input_media_from_file_id(photo) photo = utils.get_input_media_from_file_id(photo, file_ref, 2)
photo = types.InputChatPhoto(id=photo.id) photo = types.InputChatPhoto(id=photo.id)
if isinstance(peer, types.InputPeerChat): if isinstance(peer, types.InputPeerChat):

2
pyrogram/client/methods/messages/send_poll.py
View File

@ -110,7 +110,7 @@ class SendPoll(BaseClient):
public_voters=not is_anonymous or None, public_voters=not is_anonymous or None,
quiz=type == "quiz" or None quiz=type == "quiz" or None
), ),
correct_answers=[bytes([correct_option_id])] if correct_option_id else None correct_answers=None if correct_option_id is None else [bytes([correct_option_id])]
), ),
message="", message="",
silent=disable_notification or None, silent=disable_notification or None,