electrogram 2.184.0__tar.gz → 2.184.2__tar.gz

{electrogram-2.184.0 → electrogram-2.184.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: electrogram
-Version: 2.184.0
+Version: 2.184.2
 Summary: Telegram MTProto API framework in Python, designed for fluid user and bot interactions.
 Project-URL: homepage, https://github.com/5hojib/electrogram
 Project-URL: community, https://t.me/ProjectAeon

{electrogram-2.184.0 → electrogram-2.184.2}/pyproject.toml

@@ -107,15 +107,12 @@ select = [
 ]
 
 ignore = [
-    "E203",
     "E501",
+    "F403",
     "N801",
-    "N818",
+    "N806",
     "PLR09",
     "SIM115",
-    "RUF001",
-    "RUF002",
-    "RUF003",
     "PERF203",
     "PLR0912",
     "PLR0913",

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "v2.184.0"
+__version__ = "v2.184.2"
 __license__ = "MIT License"
 
 from concurrent.futures.thread import ThreadPoolExecutor
@@ -22,7 +22,6 @@ crypto_executor = ThreadPoolExecutor(
 
 # ruff: noqa: E402
 import asyncio
-from contextlib import suppress
 
 import uvloop
 

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/errors/__init__.py

@@ -57,3 +57,6 @@ class CDNFileHashMismatch(SecurityError):
             if msg is None
             else msg
         )
+
+
+__all__ = ["UnknownError"]

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/errors/rpc_error.py

@@ -6,11 +6,10 @@ from importlib import import_module
 from pathlib import Path
 from typing import TYPE_CHECKING, NoReturn
 
-from pyrogram import __version__, raw
-
 from .exceptions.all import exceptions
 
 if TYPE_CHECKING:
+    from pyrogram import raw
     from pyrogram.raw.core import TLObject
 
 
@@ -26,15 +25,14 @@ class RPCError(Exception):
         rpc_name: str | None = None,
         is_unknown: bool = False,
         is_signed: bool = False,
-    ) -> None:
+    ):
         super().__init__(
-            "Telegram says: [{}{} {}] {} Pyrogram {} thinks: {}".format(
+            "Telegram says: [{}{} {}] - {}".format(
                 "-" if is_signed else "",
                 self.CODE,
                 self.ID or self.NAME,
+                #  self.MESSAGE.format(value=value),
                 f'(caused by "{rpc_name}")' if rpc_name else "",
-                __version__,
-                self.MESSAGE.format(value=value),
             )
         )
 
@@ -83,7 +81,7 @@ class RPCError(Exception):
             )
 
         value = re.search(r"_(\d+)", error_message)
-        value = value.group(1) if value is not None else value
+        value = value[1] if value is not None else value
 
         raise getattr(
             import_module("pyrogram.errors"),

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/chats/archive_chats.py

@@ -35,14 +35,12 @@ class ArchiveChats:
         if not isinstance(chat_ids, list):
             chat_ids = [chat_ids]
 
-        folder_peers = []
-
-        for chat in chat_ids:
-            folder_peers.append(
-                raw.types.InputFolderPeer(
-                    peer=await self.resolve_peer(chat), folder_id=1
-                )
+        folder_peers = [
+            raw.types.InputFolderPeer(
+                peer=await self.resolve_peer(chat), folder_id=1
             )
+            for chat in chat_ids
+        ]
 
         await self.invoke(
             raw.functions.folders.EditPeerFolders(

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/chats/get_forum_topics_by_id.py

@@ -69,9 +69,9 @@ class GetForumTopicsByID:
         r = await self.invoke(rpc, sleep_threshold=-1)
 
         if is_iterable:
-            topic_list = []
-            for topic in r.topics:
-                topic_list.append(types.ForumTopic._parse(topic))
+            topic_list = [
+                types.ForumTopic._parse(topic) for topic in r.topics
+            ]
             topics = types.List(topic_list)
         else:
             topics = types.ForumTopic._parse(r.topics[0])

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/chats/set_chat_photo.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import os
+from pathlib import Path
 from typing import BinaryIO
 
 import pyrogram
@@ -69,7 +69,7 @@ class SetChatPhoto:
         peer = await self.resolve_peer(chat_id)
 
         if isinstance(photo, str):
-            if os.path.isfile(photo):
+            if Path(photo).is_file():
                 photo = raw.types.InputChatUploadedPhoto(
                     file=await self.save_file(photo),
                     video=await self.save_file(video),

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/chats/set_chat_username.py

@@ -46,7 +46,6 @@ class SetChatUsername:
                     )
                 )
             )
-        else:
-            raise ValueError(
-                f'The chat_id "{chat_id}" belongs to a user or chat'
-            )
+        raise ValueError(
+            f'The chat_id "{chat_id}" belongs to a user or chat'
+        )

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/chats/unarchive_chats.py

@@ -35,14 +35,12 @@ class UnarchiveChats:
         if not isinstance(chat_ids, list):
             chat_ids = [chat_ids]
 
-        folder_peers = []
-
-        for chat in chat_ids:
-            folder_peers.append(
-                raw.types.InputFolderPeer(
-                    peer=await self.resolve_peer(chat), folder_id=0
-                )
+        folder_peers = [
+            raw.types.InputFolderPeer(
+                peer=await self.resolve_peer(chat), folder_id=0
             )
+            for chat in chat_ids
+        ]
 
         await self.invoke(
             raw.functions.folders.EditPeerFolders(

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/download_media.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import asyncio
 import os
 from datetime import datetime
+from pathlib import Path
 from typing import TYPE_CHECKING, BinaryIO
 
 import pyrogram
@@ -147,7 +148,7 @@ class DownloadMedia:
         directory, file_name = os.path.split(file_name)
         file_name = file_name or media_file_name or ""
 
-        if not os.path.isabs(file_name):
+        if not Path(file_name).is_absolute():
             directory = self.PARENT_DIR / (
                 directory or DEFAULT_DOWNLOAD_DIR
             )
@@ -197,6 +198,5 @@ class DownloadMedia:
 
         if block:
             return await downloader
-        else:
-            asyncio.get_event_loop().create_task(downloader)
-            return None
+        asyncio.get_event_loop().create_task(downloader)
+        return None

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/edit_inline_media.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 import asyncio
 import io
-import os
 import re
+from pathlib import Path
 
 import pyrogram
 from pyrogram import raw, types, utils
@@ -63,7 +63,7 @@ class EditInlineMedia:
         parse_mode = media.parse_mode
 
         is_bytes_io = isinstance(media.media, io.BytesIO)
-        is_uploaded_file = is_bytes_io or os.path.isfile(media.media)
+        is_uploaded_file = is_bytes_io or Path(media.media).is_file()
 
         is_external_url = not is_uploaded_file and re.match(
             "^https?://", media.media
@@ -77,7 +77,7 @@ class EditInlineMedia:
                 raw.types.DocumentAttributeFilename(
                     file_name=media.media.name
                     if is_bytes_io
-                    else os.path.basename(media.media)
+                    else Path(media.media).name
                 )
             ]
         else:

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/edit_message_media.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import io
-import os
 import re
+from pathlib import Path
 
 import pyrogram
 from pyrogram import enums, raw, types, utils
@@ -76,8 +76,6 @@ class EditMessageMedia:
                     InputMediaAudio("new_audio.mp3"))
         """
         caption = media.caption
-        parse_mode = parse_mode
-
         message, entities = None, None
 
         if caption is not None:
@@ -86,8 +84,9 @@ class EditMessageMedia:
             ).values()
 
         if isinstance(media, types.InputMediaPhoto):
-            if isinstance(media.media, io.BytesIO) or os.path.isfile(
-                media.media
+            if (
+                isinstance(media.media, io.BytesIO)
+                or Path(media.media).is_file()
             ):
                 uploaded_media = await self.invoke(
                     raw.functions.messages.UploadMedia(
@@ -116,8 +115,9 @@ class EditMessageMedia:
                     media.media, FileType.PHOTO
                 )
         elif isinstance(media, types.InputMediaVideo):
-            if isinstance(media.media, io.BytesIO) or os.path.isfile(
-                media.media
+            if (
+                isinstance(media.media, io.BytesIO)
+                or Path(media.media).is_file()
             ):
                 uploaded_media = await self.invoke(
                     raw.functions.messages.UploadMedia(
@@ -140,7 +140,7 @@ class EditMessageMedia:
                                 ),
                                 raw.types.DocumentAttributeFilename(
                                     file_name=file_name
-                                    or os.path.basename(media.media)
+                                    or Path(media.media).name
                                 ),
                             ],
                         ),
@@ -164,8 +164,9 @@ class EditMessageMedia:
                     media.media, FileType.VIDEO
                 )
         elif isinstance(media, types.InputMediaAudio):
-            if isinstance(media.media, io.BytesIO) or os.path.isfile(
-                media.media
+            if (
+                isinstance(media.media, io.BytesIO)
+                or Path(media.media).is_file()
             ):
                 media = await self.invoke(
                     raw.functions.messages.UploadMedia(
@@ -185,7 +186,7 @@ class EditMessageMedia:
                                 ),
                                 raw.types.DocumentAttributeFilename(
                                     file_name=file_name
-                                    or os.path.basename(media.media)
+                                    or Path(media.media).name
                                 ),
                             ],
                         ),
@@ -208,8 +209,9 @@ class EditMessageMedia:
                     media.media, FileType.AUDIO
                 )
         elif isinstance(media, types.InputMediaAnimation):
-            if isinstance(media.media, io.BytesIO) or os.path.isfile(
-                media.media
+            if (
+                isinstance(media.media, io.BytesIO)
+                or Path(media.media).is_file()
             ):
                 uploaded_media = await self.invoke(
                     raw.functions.messages.UploadMedia(
@@ -231,7 +233,7 @@ class EditMessageMedia:
                                 ),
                                 raw.types.DocumentAttributeFilename(
                                     file_name=file_name
-                                    or os.path.basename(media.media)
+                                    or Path(media.media).name
                                 ),
                                 raw.types.DocumentAttributeAnimated(),
                             ],
@@ -256,8 +258,9 @@ class EditMessageMedia:
                     media.media, FileType.ANIMATION
                 )
         elif isinstance(media, types.InputMediaDocument):
-            if isinstance(media.media, io.BytesIO) or os.path.isfile(
-                media.media
+            if (
+                isinstance(media.media, io.BytesIO)
+                or Path(media.media).is_file()
             ):
                 media = await self.invoke(
                     raw.functions.messages.UploadMedia(
@@ -272,7 +275,7 @@ class EditMessageMedia:
                             attributes=[
                                 raw.types.DocumentAttributeFilename(
                                     file_name=file_name
-                                    or os.path.basename(media.media)
+                                    or Path(media.media).name
                                 )
                             ],
                         ),

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/forward_messages.py

@@ -94,23 +94,19 @@ class ForwardMessages:
             )
         )
 
-        forwarded_messages = []
-
         users = {i.id: i for i in r.users}
         chats = {i.id: i for i in r.chats}
 
-        for i in r.updates:
+        forwarded_messages = [
+            await types.Message._parse(self, i.message, users, chats)
+            for i in r.updates
             if isinstance(
                 i,
                 raw.types.UpdateNewMessage
                 | raw.types.UpdateNewChannelMessage
                 | raw.types.UpdateNewScheduledMessage,
-            ):
-                forwarded_messages.append(
-                    await types.Message._parse(
-                        self, i.message, users, chats
-                    )
-                )
+            )
+        ]
 
         return (
             types.List(forwarded_messages)

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/get_chat_history_count.py

@@ -51,5 +51,4 @@ class GetChatHistoryCount:
 
         if isinstance(r, raw.types.messages.Messages):
             return len(r.messages)
-        else:
-            return r.count
+        return r.count

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/search_global_count.py

@@ -42,5 +42,4 @@ class SearchGlobalCount:
 
         if hasattr(r, "count"):
             return r.count
-        else:
-            return len(r.messages)
+        return len(r.messages)

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/search_global_hashtag_messages_count.py

@@ -35,5 +35,4 @@ class SearchGlobalHashtagMessagesCount:
 
         if hasattr(r, "count"):
             return r.count
-        else:
-            return len(r.messages)
+        return len(r.messages)

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/search_messages_count.py

@@ -63,5 +63,4 @@ class SearchMessagesCount:
 
         if hasattr(r, "count"):
             return r.count
-        else:
-            return len(r.messages)
+        return len(r.messages)

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/send_animation.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-import os
 import re
+from pathlib import Path
 from typing import TYPE_CHECKING, BinaryIO
 
 import pyrogram
@@ -210,7 +210,7 @@ class SendAnimation:
 
         try:
             if isinstance(animation, str):
-                if os.path.isfile(animation):
+                if Path(animation).is_file():
                     thumb = await self.save_file(thumb)
                     file = await self.save_file(
                         animation,
@@ -232,7 +232,7 @@ class SendAnimation:
                             ),
                             raw.types.DocumentAttributeFilename(
                                 file_name=file_name
-                                or os.path.basename(animation)
+                                or Path(animation).name
                             ),
                             raw.types.DocumentAttributeAnimated(),
                         ],

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/send_audio.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-import os
 import re
+from pathlib import Path
 from typing import TYPE_CHECKING, BinaryIO
 
 import pyrogram
@@ -200,7 +200,7 @@ class SendAudio:
 
         try:
             if isinstance(audio, str):
-                if os.path.isfile(audio):
+                if Path(audio).is_file():
                     thumb = await self.save_file(thumb)
                     file = await self.save_file(
                         audio,
@@ -220,7 +220,7 @@ class SendAudio:
                             ),
                             raw.types.DocumentAttributeFilename(
                                 file_name=file_name
-                                or os.path.basename(audio)
+                                or Path(audio).name
                             ),
                         ],
                     )

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/send_document.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-import os
 import re
+from pathlib import Path
 from typing import TYPE_CHECKING, BinaryIO
 
 import pyrogram
@@ -187,7 +187,7 @@ class SendDocument:
 
         try:
             if isinstance(document, str):
-                if os.path.isfile(document):
+                if Path(document).is_file():
                     thumb = await self.save_file(thumb)
                     file = await self.save_file(
                         document,
@@ -203,7 +203,7 @@ class SendDocument:
                         attributes=[
                             raw.types.DocumentAttributeFilename(
                                 file_name=file_name
-                                or os.path.basename(document)
+                                or Path(document).name
                             )
                         ],
                     )

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/send_media_group.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import logging
-import os
 import re
+from pathlib import Path
 from typing import TYPE_CHECKING
 
 from pymediainfo import MediaInfo
@@ -139,7 +139,7 @@ class SendMediaGroup:
         for i in media:
             if isinstance(i, types.InputMediaPhoto):
                 if isinstance(i.media, str):
-                    if os.path.isfile(i.media):
+                    if Path(i.media).is_file():
                         media = await self.invoke(
                             raw.functions.messages.UploadMedia(
                                 peer=await self.resolve_peer(chat_id),
@@ -206,7 +206,7 @@ class SendMediaGroup:
             ):
                 if isinstance(i.media, str):
                     is_animation = False
-                    if os.path.isfile(i.media):
+                    if Path(i.media).is_file():
                         try:
                             videoInfo = MediaInfo.parse(i.media)
                         except OSError:
@@ -231,7 +231,7 @@ class SendMediaGroup:
                                 h=i.height,
                             ),
                             raw.types.DocumentAttributeFilename(
-                                file_name=os.path.basename(i.media)
+                                file_name=Path(i.media).name
                             ),
                         ]
                         if is_animation:
@@ -333,7 +333,7 @@ class SendMediaGroup:
                     )
             elif isinstance(i, types.InputMediaAudio):
                 if isinstance(i.media, str):
-                    if os.path.isfile(i.media):
+                    if Path(i.media).is_file():
                         media = await self.invoke(
                             raw.functions.messages.UploadMedia(
                                 peer=await self.resolve_peer(chat_id),
@@ -355,9 +355,9 @@ class SendMediaGroup:
                                             title=i.title,
                                         ),
                                         raw.types.DocumentAttributeFilename(
-                                            file_name=os.path.basename(
+                                            file_name=Path(
                                                 i.media
-                                            )
+                                            ).name
                                         ),
                                     ],
                                 ),
@@ -432,7 +432,7 @@ class SendMediaGroup:
                     )
             elif isinstance(i, types.InputMediaDocument):
                 if isinstance(i.media, str):
-                    if os.path.isfile(i.media):
+                    if Path(i.media).is_file():
                         media = await self.invoke(
                             raw.functions.messages.UploadMedia(
                                 peer=await self.resolve_peer(chat_id),
@@ -449,9 +449,9 @@ class SendMediaGroup:
                                     ),
                                     attributes=[
                                         raw.types.DocumentAttributeFilename(
-                                            file_name=os.path.basename(
+                                            file_name=Path(
                                                 i.media
-                                            )
+                                            ).name
                                         )
                                     ],
                                 ),

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/send_paid_media.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-import os
 import re
+from pathlib import Path
 from typing import TYPE_CHECKING
 
 from pymediainfo import MediaInfo
@@ -86,7 +86,7 @@ class SendPaidMedia:
         for i in media:
             if isinstance(i, types.InputMediaPhoto):
                 if isinstance(i.media, str):
-                    if os.path.isfile(i.media):
+                    if Path(i.media).is_file():
                         media = await self.invoke(
                             raw.functions.messages.UploadMedia(
                                 peer=await self.resolve_peer(chat_id),
@@ -153,7 +153,7 @@ class SendPaidMedia:
             ):
                 if isinstance(i.media, str):
                     is_animation = False
-                    if os.path.isfile(i.media):
+                    if Path(i.media).is_file():
                         try:
                             videoInfo = MediaInfo.parse(i.media)
                         except OSError:
@@ -178,7 +178,7 @@ class SendPaidMedia:
                                 h=i.height,
                             ),
                             raw.types.DocumentAttributeFilename(
-                                file_name=os.path.basename(i.media)
+                                file_name=Path(i.media).name
                             ),
                         ]
                         if is_animation:

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/send_photo.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-import os
 import re
+from pathlib import Path
 from typing import TYPE_CHECKING, BinaryIO
 
 import pyrogram
@@ -188,7 +188,7 @@ class SendPhoto:
 
         try:
             if isinstance(photo, str):
-                if os.path.isfile(photo):
+                if Path(photo).is_file():
                     file = await self.save_file(
                         photo,
                         progress=progress,

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/send_reaction.py

@@ -101,7 +101,7 @@ class SendReaction:
                         self, i.reactions
                     )
             return None
-        elif story_id is not None:
+        if story_id is not None:
             await self.invoke(
                 raw.functions.stories.SendReaction(
                     peer=await self.resolve_peer(chat_id),
@@ -113,5 +113,4 @@ class SendReaction:
                 )
             )
             return True
-        else:
-            raise ValueError("You need to pass one of message_id!")
+        raise ValueError("You need to pass one of message_id!")

{electrogram-2.184.0 → electrogram-2.184.2}/pyrogram/methods/messages/send_sticker.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-import os
 import re
+from pathlib import Path
 from typing import TYPE_CHECKING, BinaryIO
 
 import pyrogram
@@ -157,7 +157,7 @@ class SendSticker:
 
         try:
             if isinstance(sticker, str):
-                if os.path.isfile(sticker):
+                if Path(sticker).is_file():
                     file = await self.save_file(
                         sticker,
                         progress=progress,
@@ -169,7 +169,7 @@ class SendSticker:
                         file=file,
                         attributes=[
                             raw.types.DocumentAttributeFilename(
-                                file_name=os.path.basename(sticker)
+                                file_name=Path(sticker).name
                             )
                         ],
                     )