mir/pyrogram
2
0
Fork 0
mirror of https://github.com/pyrogram/pyrogram synced 2025-08-28 21:07:59 +00:00
Code Issues Releases Wiki Activity

Merge develop -> asyncio-dev

Browse Source
This commit is contained in:
Dan 2020-04-06 14:54:55 +02:00
commit 570cb888b2
3 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -523,7 +523,7 @@ class Message(Object, Update):
if media:
if isinstance(media, types.MessageMediaPhoto):
photo = Photo._parse(client, media)
photo = Photo._parse(client, media.photo, media.ttl_seconds)
elif isinstance(media, types.MessageMediaGeo):
location = Location._parse(client, media.geo)
elif isinstance(media, types.MessageMediaContact):

6
pyrogram/client/types/messages_and_media/photo.py
View File

@ -80,9 +80,7 @@ class Photo(Object):
self.thumbs = thumbs
@staticmethod
def _parse(client, media_photo: types.MessageMediaPhoto) -> "Photo":
photo = media_photo.photo
def _parse(client, photo: types.Photo, ttl_seconds: int = None) -> "Photo":
if isinstance(photo, types.Photo):
big = photo.sizes[-1]
@ -98,7 +96,7 @@ class Photo(Object):
file_ref=encode_file_ref(photo.file_reference),
width=big.w,
height=big.h,
ttl_seconds=media_photo.ttl_seconds,
ttl_seconds=ttl_seconds,
file_size=big.size,
date=photo.date,
thumbs=Thumbnail._parse(client, photo),

32
pyrogram/client/types/user_and_chats/chat.py
View File

@ -566,15 +566,8 @@ class Chat(Object):
return await self._client.restrict_chat_member(
chat_id=self.id,
user_id=user_id,
permissions=permissions,
until_date=until_date,
can_send_messages=permissions.can_send_messages,
can_send_media_messages=permissions.can_send_media_messages,
can_send_other_messages=permissions.can_send_other_messages,
can_add_web_page_previews=permissions.can_add_web_page_previews,
can_send_polls=permissions.can_send_polls,
can_change_info=permissions.can_change_info,
can_invite_users=permissions.can_invite_users,
can_pin_messages=permissions.can_pin_messages
)
async def promote_member(
@ -725,7 +718,7 @@ class Chat(Object):
"""
return await self._client.export_chat_invite_link(self.id)
async def get_member(
self,
user_id: Union[int, str],
@ -749,18 +742,18 @@ class Chat(Object):
Returns:
:obj:`ChatMember`: On success, a chat member is returned.
"""
return await self._client.get_chat_member(
self.id,
user_id=user_id
)
async def get_members(
self,
offset: int = 0,
limit: int = 200,
query: str = "",
filter: str = Filters.ALL
filter: str = "all"
) -> List["pyrogram.ChatMember"]:
"""Bound method *get_members* of :obj:`Chat`.
@ -772,13 +765,14 @@ class Chat(Object):
Example:
.. code-block:: python
# Get first 200 recent members
chat.get_members()
Returns:
List of :obj:`ChatMember`: On success, a list of chat members is returned.
"""
return await self._client.get_chat_members(
self.id,
offset=offset,
@ -786,12 +780,12 @@ class Chat(Object):
query=query,
filter=filter
)
async def iter_members(
self,
limit: int = 0,
query: str = "",
filter: str = Filters.ALL
filter: str = "all"
) -> Optional[Generator["pyrogram.ChatMember", None, None]]:
"""Bound method *iter_members* of :obj:`Chat`.
@ -811,14 +805,14 @@ class Chat(Object):
Returns:
``Generator``: A generator yielding :obj:`ChatMember` objects.
"""
return self._client.iter_chat_members(
return await self._client.iter_chat_members(
self.id,
limit=limit,
query=query,
filter=filter
)
async def add_members(
self,
user_ids: Union[Union[int, str], List[Union[int, str]]],
@ -845,4 +839,4 @@ class Chat(Object):
self.id,
user_ids=user_ids,
forward_limit=forward_limit
)
)