Fix download_media method not checking for file_id.

Fix topic.top_message parsing.

Signed-off-by: Aliwoto <[email protected]>

Author: ALiwoto

pyrogram/__init__.py

@@ -16,7 +16,7 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = "2.0.141"
+__version__ = "2.0.142"
 __license__ = "GNU Lesser General Public License v3.0 (LGPL-3.0)"
 __copyright__ = "Copyright (C) 2017-present Dan <https://github.com/delivrance>"
 

pyrogram/methods/chats/get_forum_topics_by_id.py

@@ -75,6 +75,18 @@ async def get_forum_topics_by_id(
         chats = {c.id: c for c in getattr(r, "chats", [])}
         messages = {m.id: m for m in getattr(r, "messages", [])}
 
+        for message in messages:
+            if isinstance(message, raw.types.MessageEmpty):
+                continue
+
+            messages[message.id] = await types.Message._parse(
+                client=self, 
+                message=message, 
+                users=users,
+                chats=chats,
+                replies=0
+            )
+
         for current in getattr(r, "topics", []):
             topics.append(types.ForumTopic._parse(
                 self, 

pyrogram/methods/messages/download_media.py

@@ -104,6 +104,9 @@ async def download_media(
                 # Download from file id
                 await app.download_media(message.photo.file_id)
 
+                # Download document of a message
+                await app.download_media(message.document)
+
                 # Keep track of the progress while downloading
                 async def progress(current, total):
                     print(f"{current * 100 / total:.1f}%")
@@ -138,6 +141,8 @@ async def progress(current, total):
             media = getattr(message, message.media.value, None)
         elif isinstance(message, str):
             media = message
+        elif hasattr(message, "file_id"):
+            media = getattr(message, "file_id")
 
         if not media:
             raise ValueError("This message doesn't contain any downloadable media")
@@ -193,4 +198,4 @@ async def progress(current, total):
         if block:
             return await downloader
         else:
-            asyncio.get_event_loop().create_task(downloader)
+            asyncio.get_event_loop().create_task(downloader)

pyrogram/types/messages_and_media/message.py

@@ -599,7 +599,8 @@ async def _parse(
         chats: dict,
         topics: dict = None,
         is_scheduled: bool = False,
-        replies: int = 1
+        replies: int = 1,
+        from_topic: types.ForumTopic = None
     ):
         if isinstance(message, raw.types.MessageEmpty):
             return Message(id=message.id, empty=True, client=client, raw=message)
@@ -1066,6 +1067,9 @@ async def _parse(
             if any((isinstance(entity, raw.types.MessageEntityBlockquote) for entity in message.entities)):
                 parsed_message.quote = True
 
+            if from_topic:
+                parsed_message.topic = from_topic
+            
             if message.reply_to:
                 if isinstance(message.reply_to, raw.types.MessageReplyHeader):
                     if message.reply_to.forum_topic:
@@ -1077,7 +1081,7 @@ async def _parse(
 
                         parsed_message.message_thread_id = thread_id
 
-                        if topics:
+                        if topics and not parsed_message.topic:
                             parsed_message.topic = types.ForumTopic._parse(client, topics[thread_id], users=users, chats=chats)
                     else:
                         if message.reply_to.quote: