electrogram 2.186.0__tar.gz → 2.186.2__tar.gz

{electrogram-2.186.0 → electrogram-2.186.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: electrogram
-Version: 2.186.0
+Version: 2.186.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
@@ -18,7 +18,6 @@ Requires-Dist: pymediainfo
 Requires-Dist: pymongo
 Requires-Dist: pysocks
 Requires-Dist: tgcrypto-pyrofork
-Requires-Dist: uvloop
 Provides-Extra: dev
 Requires-Dist: hatch; extra == 'dev'
 Requires-Dist: pytest; extra == 'dev'

{electrogram-2.186.0 → electrogram-2.186.2}/compiler/api/source/main_api.tl

@@ -1,20 +1,5 @@
 ---types---
 
-int ? = Int;
-long ? = Long;
-double ? = Double;
-string ? = String;
-
-bytes = Bytes;
-
-ipPort#d433ad73 ipv4:int port:int = IpPort;
-ipPortSecret#37982646 ipv4:int port:int secret:bytes = IpPort;
-accessPointRule#4679b65f phone_prefix_rules:string dc_id:int ips:vector<IpPort> = AccessPointRule;
-help.configSimple#5a592a6c date:int expires:int rules:vector<AccessPointRule> = help.ConfigSimple;
-
-inputPeerPhotoFileLocationLegacy#27d69997 flags:# big:flags.0?true peer:InputPeer volume_id:long local_id:int = InputFileLocation;
-inputStickerSetThumbLegacy#dbaeae9 stickerset:InputStickerSet volume_id:long local_id:int = InputFileLocation;
-
 inputPeerEmpty#7f3b18ea = InputPeer;
 inputPeerSelf#7da07ec9 = InputPeer;
 inputPeerChat#35a95cb9 chat_id:long = InputPeer;
@@ -2536,8 +2521,4 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-test.useError = Error;
-test.useConfigSimple = help.ConfigSimple;
-test.parseInputAppEvent = InputAppEvent;
-
 // LAYER 186

{electrogram-2.186.0 → electrogram-2.186.2}/compiler/docs/compiler.py

@@ -506,6 +506,7 @@ def pyrogram_api():
             VideoChatMembersInvited
             WebAppData
             MessageReactions
+            MessageReactor
             ChatReactions
             ForumTopicCreated
             ForumTopicEdited
@@ -520,6 +521,7 @@ def pyrogram_api():
             MessageReactionUpdated
             MessageReactionCountUpdated
             TranslatedText
+            DraftMessage
         """,
         "stories": """
         Stories
@@ -775,6 +777,7 @@ def pyrogram_api():
         Story
             Story.delete
             Story.download
+            Story.react
             Story.edit
             Story.edit_animation
             Story.edit_caption

{electrogram-2.186.0 → electrogram-2.186.2}/compiler/errors/compiler.py

@@ -4,6 +4,7 @@ import csv
 import os
 import re
 import shutil
+from pathlib import Path
 
 HOME = "compiler/errors"
 DEST = "pyrogram/errors/exceptions"
@@ -21,11 +22,10 @@ def camel(s):
 
 def start():
     shutil.rmtree(DEST, ignore_errors=True)
-    os.makedirs(DEST)
-
+    Path(DEST).mkdir(parents=True, exist_ok=True)
     files = list(os.listdir(f"{HOME}/source"))
 
-    with open(f"{DEST}/all.py", "w", encoding="utf-8") as f_all:
+    with Path(DEST, "all.py").open("w", encoding="utf-8") as f_all:
         f_all.write("count = {count}\n\n")
         f_all.write("exceptions = {\n")
 
@@ -33,18 +33,16 @@ def start():
 
         for i in files:
             code, name = re.search(r"(\d+)_([A-Z_]+)", i).groups()
-
             f_all.write(f"    {code}: {{\n")
-
             init = f"{DEST}/__init__.py"
 
-            with open(init, "a", encoding="utf-8") as f_init:
+            with Path(init).open("a", encoding="utf-8") as f_init:
                 f_init.write(f"from .{name.lower()}_{code} import *\n")
 
             with (
-                open(f"{HOME}/source/{i}", encoding="utf-8") as f_csv,
-                open(
-                    f"{DEST}/{name.lower()}_{code}.py", "w", encoding="utf-8"
+                Path(HOME, "source", i).open(encoding="utf-8") as f_csv,
+                Path(DEST, f"{name.lower()}_{code}.py").open(
+                    "w", encoding="utf-8"
                 ) as f_class,
             ):
                 reader = csv.reader(f_csv, delimiter="\t")
@@ -80,13 +78,13 @@ def start():
 
                     sub_classes.append((sub_class, error_id, error_message))
 
-                with open(
-                    f"{HOME}/template/class.txt", encoding="utf-8"
+                with Path(HOME, "template/class.txt").open(
+                    encoding="utf-8"
                 ) as f_class_template:
                     class_template = f_class_template.read()
 
-                    with open(
-                        f"{HOME}/template/sub_class.txt", encoding="utf-8"
+                    with Path(HOME, "template/sub_class.txt").open(
+                        encoding="utf-8"
                     ) as f_sub_class_template:
                         sub_class_template = f_sub_class_template.read()
 
@@ -113,10 +111,10 @@ def start():
 
         f_all.write("}\n")
 
-    with open(f"{DEST}/all.py", encoding="utf-8") as f:
+    with Path(DEST, "all.py").open(encoding="utf-8") as f:
         content = f.read()
 
-    with open(f"{DEST}/all.py", "w", encoding="utf-8") as f:
+    with Path(DEST, "all.py").open("w", encoding="utf-8") as f:
         f.write(re.sub("{count}", str(count), content))
 
 

{electrogram-2.186.0 → electrogram-2.186.2}/docs/source/topics/synchronous.rst

@@ -71,18 +71,3 @@ possible.
     @app.on_edited_message()
     def handler2(client, message):
         message.forward("me")
-
-uvloop usage
-------------
-
-When using Electrogram in its synchronous mode combined with uvloop, you need to call ``uvloop.install()`` before importing
-Electrogram.
-
-.. code-block:: python
-
-    import uvloop
-    uvloop.install()
-
-    from pyrogram import Client
-
-    ...

{electrogram-2.186.0 → electrogram-2.186.2}/pyproject.toml

@@ -10,7 +10,6 @@ dependencies = [
     "pymediainfo",
     "pymongo",
     "TgCrypto-pyrofork",
-    "uvloop"
 ]
 requires-python = ">=3.10"
 

{electrogram-2.186.0 → electrogram-2.186.2}/pyrogram/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-__version__ = "v2.186.0"
+__version__ = "v2.186.2"
 __license__ = "MIT License"
 
 from concurrent.futures.thread import ThreadPoolExecutor
@@ -21,17 +21,10 @@ class ContinuePropagationError(StopAsyncIteration):
 crypto_executor = ThreadPoolExecutor(1, thread_name_prefix="CryptoWorker")
 
 # ruff: noqa: E402
-import asyncio
-
-import uvloop
-
 from . import enums, errors, filters, handlers, raw, types
 from .client import Client
 from .sync import compose, idle
 
-asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
-
-
 __all__ = [
     "Client",
     "ContinuePropagationError",

{electrogram-2.186.0 → electrogram-2.186.2}/pyrogram/client.py

@@ -193,6 +193,10 @@ class Client(Methods):
         client_platform (:obj:`~pyrogram.enums.ClientPlatform`, *optional*):
             The platform where this client is running.
             Defaults to 'other'
+
+        fetch_replies (``int``, *optional*):
+            Set the number of replies to be fetched when parsing the :obj:`~pyrogram.types.Message` object. Defaults to 1.
+            :doc:`More on Errors <../../api/errors/index>`
     """
 
     APP_VERSION = f"Pyrogram {__version__}"
@@ -246,6 +250,7 @@ class Client(Methods):
         client_platform: enums.ClientPlatform = enums.ClientPlatform.OTHER,
         max_message_cache_size: int = MAX_CACHE_SIZE,
         max_business_user_connection_cache_size: int = MAX_CACHE_SIZE,
+        fetch_replies: int = 1,
     ) -> None:
         super().__init__()
         self.name = name
@@ -293,15 +298,7 @@ class Client(Methods):
         elif self.in_memory:
             self.storage = MemoryStorage(self.name)
         elif self.mongodb:
-            try:
-                pass
-            except Exception:
-                log.warning(
-                    "pymongo is missing! " "Using MemoryStorage as session storage"
-                )
-                self.storage = MemoryStorage(self.name)
-            else:
-                self.storage = MongoStorage(self.name, **self.mongodb)
+            self.storage = MongoStorage(self.name, **self.mongodb)
         else:
             self.storage = FileStorage(self.name, self.workdir)
 
@@ -329,6 +326,7 @@ class Client(Methods):
         self.business_user_connection_cache = Cache(
             self.max_business_user_connection_cache_size
         )
+        self.fetch_replies = fetch_replies
         self.updates_watchdog_task = None
         self.updates_watchdog_event = asyncio.Event()
         self.last_update_time = datetime.now()

electrogram-2.186.2/pyrogram/connection/transport/__init__.py

@@ -0,0 +1,3 @@
+from __future__ import annotations
+
+from .tcp import *

{electrogram-2.186.0 → electrogram-2.186.2}/pyrogram/enums/message_service_type.py

@@ -11,9 +11,6 @@ class MessageServiceType(AutoName):
     NEW_CHAT_MEMBERS = auto()
     "New members join"
 
-    CHAT_JOINED_BY_REQUEST = auto()
-    "a member chat join request approved by admin."
-
     LEFT_CHAT_MEMBERS = auto()
     "Left chat members"
 

{electrogram-2.186.0 → electrogram-2.186.2}/pyrogram/methods/invite_links/export_chat_invite_link.py

@@ -8,6 +8,8 @@ class ExportChatInviteLink:
     async def export_chat_invite_link(
         self: pyrogram.Client,
         chat_id: int | str,
+        subscription_period: int | None = None,
+        subscription_price: int | None = None,
     ) -> types.ChatInviteLink:
         """Generate a new primary invite link for a chat; any previously generated primary link is revoked.
 
@@ -28,8 +30,15 @@ class ExportChatInviteLink:
                 (in the format @username).
                 You can also use chat public link in form of *t.me/<username>* (str).
 
+            subscription_period (``int``, *optional*):
+                Date when the subscription will expire.
+                for now, only 30 days is supported (30*24*60*60).
+
+            subscription_price (``int``, *optional*):
+                Subscription price (stars).
+
         Returns:
-            ``str``: On success, the new invite link as string is returned.
+            :obj:`~pyrogram.types.ChatInviteLink`: On success, the invite link is returned.
 
         Example:
             .. code-block:: python
@@ -41,7 +50,11 @@ class ExportChatInviteLink:
             raw.functions.messages.ExportChatInvite(
                 peer=await self.resolve_peer(chat_id),
                 legacy_revoke_permanent=True,
+                subscription_pricing=raw.types.StarsSubscriptionPricing(
+                    period=subscription_period,
+                    amount=subscription_price,
+                ),
             )
         )
 
-        return r.link
+        return types.ChatInviteLink._parse(self, r)

{electrogram-2.186.0 → electrogram-2.186.2}/pyrogram/methods/messages/edit_message_media.py

@@ -76,11 +76,14 @@ class EditMessageMedia:
                     InputMediaAudio("new_audio.mp3"))
         """
         caption = media.caption
+        caption_entities = media.caption_entities
         message, entities = None, None
 
         if caption is not None:
             message, entities = (
-                await self.parser.parse(caption, parse_mode)
+                await utils.parse_text_entities(
+                    self, caption, parse_mode, caption_entities
+                )
             ).values()
 
         if isinstance(media, types.InputMediaPhoto):

electrogram-2.186.2/pyrogram/methods/messages/get_messages.py

@@ -0,0 +1,174 @@
+from __future__ import annotations
+
+import logging
+from typing import TYPE_CHECKING
+
+import pyrogram
+from pyrogram import raw, types, utils
+from pyrogram.types.messages_and_media.message import Str
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+log = logging.getLogger(__name__)
+
+
+class GetMessages:
+    async def get_messages(
+        self: pyrogram.Client,
+        chat_id: int | str | None = None,
+        message_ids: int | Iterable[int] | None = None,
+        reply_to_message_ids: int | Iterable[int] | None = None,
+        replies: int = 1,
+        is_scheduled: bool = False,
+        link: str | None = None,
+    ) -> types.Message | list[types.Message] | types.DraftMessage:
+        """Get one or more messages from a chat by using message identifiers.
+
+        You can retrieve up to 200 messages at once.
+
+        .. include:: /_includes/usable-by/users-bots.rst
+
+        You must use exactly one of ``chat_id`` OR ``link``.
+
+        Parameters:
+            chat_id (``int`` | ``str``):
+                Unique identifier (int) or username (str) of the target chat.
+                For your personal cloud (Saved Messages) you can simply use "me" or "self".
+                For a contact that exists in your Telegram address book you can use his phone number (str).
+
+            message_ids (``int`` | Iterable of ``int``, *optional*):
+                Pass a single message identifier or an iterable of message ids (as integers) to get the content of the
+                message themselves.
+
+            reply_to_message_ids (``int`` | Iterable of ``int``, *optional*):
+                Pass a single message identifier or an iterable of message ids (as integers) to get the content of
+                the previous message you replied to using this message.
+                If *message_ids* is set, this argument will be ignored.
+
+            replies (``int``, *optional*):
+                The number of subsequent replies to get for each message.
+                Pass 0 for no reply at all or -1 for unlimited replies.
+                Defaults to 1.
+
+            is_scheduled (``bool``, *optional*):
+                Whether to get scheduled messages. Defaults to False.
+
+            link (``str``):
+                A link of the message, usually can be copied using ``Copy Link`` functionality OR obtained using :obj:`~pyrogram.raw.types.Message.link` OR  :obj:`~pyrogram.raw.functions.channels.ExportMessageLink`
+
+        Returns:
+            :obj:`~pyrogram.types.Message` | List of :obj:`~pyrogram.types.Message` | :obj:`~pyrogram.types.DraftMessage`: In case *message_ids* was not
+            a list, a single message is returned, otherwise a list of messages is returned.
+
+        Example:
+            .. code-block:: python
+
+                # Get one message
+                await app.get_messages(chat_id=chat_id, message_ids=12345)
+
+                # Get more than one message (list of messages)
+                await app.get_messages(chat_id=chat_id, message_ids=[12345, 12346])
+
+                # Get message by ignoring any replied-to message
+                await app.get_messages(chat_id=chat_id, message_ids=message_id, replies=0)
+
+                # Get message with all chained replied-to messages
+                await app.get_messages(chat_id=chat_id, message_ids=message_id, replies=-1)
+
+                # Get the replied-to message of a message
+                await app.get_messages(chat_id=chat_id, reply_to_message_ids=message_id)
+
+        Raises:
+            ValueError: In case of invalid arguments.
+        """
+        if chat_id:
+            ids, ids_type = (
+                (message_ids, raw.types.InputMessageID)
+                if message_ids
+                else (reply_to_message_ids, raw.types.InputMessageReplyTo)
+                if reply_to_message_ids
+                else (None, None)
+            )
+
+            if ids is None:
+                raise ValueError(
+                    "No argument supplied. Either pass message_ids or reply_to_message_ids"
+                )
+
+            peer = await self.resolve_peer(chat_id)
+
+            is_iterable = not isinstance(ids, int)
+            ids = list(ids) if is_iterable else [ids]
+
+            if replies < 0:
+                replies = (1 << 31) - 1
+
+            if is_scheduled:
+                rpc = raw.functions.messages.GetScheduledMessages(peer=peer, id=ids)
+            else:
+                ids = [ids_type(id=i) for i in ids]
+                if isinstance(peer, raw.types.InputPeerChannel):
+                    rpc = raw.functions.channels.GetMessages(channel=peer, id=ids)
+                else:
+                    rpc = raw.functions.messages.GetMessages(id=ids)
+
+            r = await self.invoke(rpc, sleep_threshold=-1)
+
+            messages = await utils.parse_messages(
+                self, r, is_scheduled=is_scheduled, replies=replies
+            )
+
+            return messages if is_iterable else messages[0] if messages else None
+
+        if link:
+            linkps = link.split("/")
+            raw_chat_id, _message_thread_id, message_id = None, None, None
+            if len(linkps) == 7 and linkps[3] == "c":
+                raw_chat_id = utils.get_channel_id(int(linkps[4]))
+                int(linkps[5])
+                message_id = int(linkps[6])
+            elif len(linkps) == 6:
+                if linkps[3] == "c":
+                    raw_chat_id = utils.get_channel_id(int(linkps[4]))
+                    message_id = int(linkps[5])
+                else:
+                    raw_chat_id = linkps[3]
+                    message_id = int(linkps[5])
+
+            elif not self.me.is_bot and len(linkps) == 5 and linkps[3] == "m":
+                r = await self.invoke(
+                    raw.functions.account.ResolveBusinessChatLink(slug=linkps[4])
+                )
+                users = {i.id: i for i in r.users}
+                entities = [
+                    types.MessageEntity._parse(self, entity, users)
+                    for entity in getattr(r, "entities", [])
+                ]
+                entities = types.List(filter(lambda x: x is not None, entities))
+                chat = None
+                cat_id = utils.get_raw_peer_id(r.peer)
+                if isinstance(r.peer, raw.types.PeerUser):
+                    chat = types.Chat._parse_user_chat(self, users[cat_id])
+                return types.DraftMessage(
+                    text=Str(r.message).init(entities) or None,
+                    entities=entities or None,
+                    chat=chat,
+                    _raw=r,
+                )
+
+            elif len(linkps) == 5:
+                raw_chat_id = linkps[3]
+                if raw_chat_id == "m":
+                    raise ValueError(
+                        "Invalid ClientType used to parse this message link"
+                    )
+                message_id = int(linkps[4])
+
+            return await self.get_messages(
+                chat_id=raw_chat_id, message_ids=message_id
+            )
+
+        raise ValueError(
+            "No argument supplied. Either pass link OR (chat_id, message_ids or reply_to_message_ids)"
+        )

{electrogram-2.186.0 → electrogram-2.186.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
 
 import pyrogram
@@ -90,7 +90,7 @@ class SendPaidMedia:
         for i in media:
             if isinstance(i, types.InputPaidMediaPhoto):
                 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),
@@ -145,7 +145,7 @@ class SendPaidMedia:
                     )
             elif isinstance(i, types.InputPaidMediaVideo):
                 if isinstance(i.media, str):
-                    if os.path.isfile(i.media):
+                    if Path(i.media).is_file():
                         attributes = [
                             raw.types.DocumentAttributeVideo(
                                 supports_streaming=i.supports_streaming or None,
@@ -154,7 +154,7 @@ class SendPaidMedia:
                                 h=i.height,
                             ),
                             raw.types.DocumentAttributeFilename(
-                                file_name=os.path.basename(i.media)
+                                file_name=Path(i.media).name
                             ),
                         ]
                         media = await self.invoke(

{electrogram-2.186.0 → electrogram-2.186.2}/pyrogram/methods/messages/send_paid_reaction.py

@@ -53,8 +53,9 @@ class SendPaidReaction:
                 private=is_anonymous,
             )
         )
+        users = {i.id: i for i in r.users}
         for i in r.updates:
             if isinstance(i, raw.types.UpdateMessageReactions):
-                return types.MessageReactions._parse(self, i.reactions)
+                return types.MessageReactions._parse(self, i.reactions, users)
         # TODO
         return r

{electrogram-2.186.0 → electrogram-2.186.2}/pyrogram/types/messages_and_media/__init__.py

@@ -7,6 +7,7 @@ from .contact import Contact
 from .contact_registered import ContactRegistered
 from .dice import Dice
 from .document import Document
+from .draft_message import DraftMessage
 from .exported_story_link import ExportedStoryLink
 from .game import Game
 from .gifted_premium import GiftedPremium
@@ -25,6 +26,7 @@ from .message_reaction_count_updated import (
 )
 from .message_reaction_updated import MessageReactionUpdated
 from .message_reactions import MessageReactions
+from .message_reactor import MessageReactor
 from .message_story import MessageStory
 from .payment_form import PaymentForm
 from .photo import Photo
@@ -65,6 +67,7 @@ __all__ = [
     "AvailableEffect",
     "Contact",
     "ContactRegistered",
+    "DraftMessage",
     "Document",
     "Game",
     "GiftedPremium",
@@ -96,6 +99,7 @@ __all__ = [
     "Dice",
     "WebAppData",
     "MessageReactions",
+    "MessageReactor",
     "MessageReactionUpdated",
     "MessageReactionCountUpdated",
     "MessageStory",