LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-10 19:46:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Modify iter_participants to also include .participant info

Browse Source
This commit is contained in:
Lonami Exo 2018-03-12 10:27:49 +01:00
parent 657c771fa0
commit 751461f0f5
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
telethon/telegram_client.py
View File

@ -1154,7 +1154,7 @@ class TelegramClient(TelegramBareClient):
def iter_participants(self, entity, limit=None, search='', def iter_participants(self, entity, limit=None, search='',
aggressive=False, _total_box=None): aggressive=False, _total_box=None):
""" """
Gets the list of participants from the specified entity. Iterator over the participants belonging to the specified chat.
Args: Args:
entity (:obj:`entity`): entity (:obj:`entity`):
@ -1179,9 +1179,11 @@ class TelegramClient(TelegramBareClient):
_total_box (:obj:`_Box`, optional): _total_box (:obj:`_Box`, optional):
A _Box instance to pass the total parameter by reference. A _Box instance to pass the total parameter by reference.
Returns: Yields:
A list of participants with an additional .total variable on the The ``User`` objects returned by ``GetParticipantsRequest``
list indicating the total amount of members in this group/channel. with an additional ``.participant`` attribute which is the
matched ``ChannelParticipant`` type for channels/megagroups
or ``ChatParticipants`` for normal chats.
""" """
entity = self.get_input_entity(entity) entity = self.get_input_entity(entity)
limit = float('inf') if limit is None else int(limit) limit = float('inf') if limit is None else int(limit)
@ -1234,30 +1236,38 @@ class TelegramClient(TelegramBareClient):
requests.pop(i) requests.pop(i)
else: else:
requests[i].offset += len(participants.participants) requests[i].offset += len(participants.participants)
for user in participants.users: users = {user.id: user for user in participants.users}
if user.id not in seen: for participant in participants.participants:
seen.add(user.id) if participant.user_id not in seen:
seen.add(participant.user_id)
user = users[participant.user_id]
user.participant = participant
yield user yield user
if len(seen) >= limit: if len(seen) >= limit:
return return
elif isinstance(entity, InputPeerChat): elif isinstance(entity, InputPeerChat):
users = self(GetFullChatRequest(entity.chat_id)).users full = self(GetFullChatRequest(entity.chat_id))
if _total_box: if _total_box:
_total_box.x = len(users) _total_box.x = len(full.full_chat.participants.participants)
have = 0 have = 0
for user in users: users = {user.id: user for user in full.users}
for participant in full.full_chat.participants.participants:
have += 1 have += 1
if have > limit: if have > limit:
break break
else: else:
user = users[participant.user_id]
user.participant = participant
yield user yield user
else: else:
if _total_box: if _total_box:
_total_box.x = 1 _total_box.x = 1
if limit != 0: if limit != 0:
yield self.get_entity(entity) user = self.get_entity(entity)
user.participant = None
yield user
def get_participants(self, *args, **kwargs): def get_participants(self, *args, **kwargs):
""" """
@ -1266,9 +1276,9 @@ class TelegramClient(TelegramBareClient):
""" """
total_box = _Box(0) total_box = _Box(0)
kwargs['_total_box'] = total_box kwargs['_total_box'] = total_box
dialogs = UserList(self.iter_participants(*args, **kwargs)) participants = UserList(self.iter_participants(*args, **kwargs))
dialogs.total = total_box.x participants.total = total_box.x
return dialogs return participants
# endregion # endregion