mir/pyrogram
2
0
Fork 0
mirror of https://github.com/pyrogram/pyrogram synced 2025-08-29 13:27:47 +00:00
Code Issues Releases Wiki Activity

Return the correct message type with forward_messages()

Browse Source
This commit is contained in:
Dan 2018-04-23 18:33:20 +02:00
parent 88f7b35120
commit debc459686
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pyrogram/client/client.py
View File

@ -1147,18 +1147,18 @@ class Client:
Users will receive a notification with no sound. Users will receive a notification with no sound.
Returns: Returns:
On success, the sent Message is returned. On success and in case *message_ids* was a list, the returned value will be a list of the forwarded
:obj:`Messages <pyrogram.api.types.pyrogram.Message>` even if a list contains just one element, otherwise if
*message_ids* was an integer, the single forwarded :obj:`Message <pyrogram.api.types.pyrogram.Message>`
is returned.
Raises: Raises:
:class:`Error <pyrogram.Error>` :class:`Error <pyrogram.Error>`
""" """
message_ids = ( is_list = isinstance(message_ids, list)
message_ids message_ids = message_ids if is_list else [message_ids]
if isinstance(message_ids, list)
else [message_ids]
)
return self.send( r = self.send(
functions.messages.ForwardMessages( functions.messages.ForwardMessages(
to_peer=self.resolve_peer(chat_id), to_peer=self.resolve_peer(chat_id),
from_peer=self.resolve_peer(from_chat_id), from_peer=self.resolve_peer(from_chat_id),
@ -1168,6 +1168,19 @@ class Client:
) )
) )
messages = []
users = {i.id: i for i in r.users}
chats = {i.id: i for i in r.chats}
for i in r.updates:
if isinstance(i, (types.UpdateNewMessage, types.UpdateNewChannelMessage)):
messages.append(
message_parser.parse_message(self, i.message, users, chats)
)
return messages if is_list else messages[0]
def send_photo(self, def send_photo(self,
chat_id: int or str, chat_id: int or str,
photo: str, photo: str,