WPyrogram 2.0.122__tar.gz → 2.0.123__tar.gz

{WPyrogram-2.0.122 → WPyrogram-2.0.123}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: WPyrogram
-Version: 2.0.122
+Version: 2.0.123
 Summary: Elegant, modern and asynchronous Telegram MTProto API framework in Python for users and bots - Amano's experimental fork
 Home-page: https://github.com/ALiwoto/WPyrogram
 Download-URL: https://github.com/AmanoTeam/pyrogram

{WPyrogram-2.0.122 → WPyrogram-2.0.123}/WPyrogram.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: WPyrogram
-Version: 2.0.122
+Version: 2.0.123
 Summary: Elegant, modern and asynchronous Telegram MTProto API framework in Python for users and bots - Amano's experimental fork
 Home-page: https://github.com/ALiwoto/WPyrogram
 Download-URL: https://github.com/AmanoTeam/pyrogram

{WPyrogram-2.0.122 → WPyrogram-2.0.123}/WPyrogram.egg-info/SOURCES.txt

@@ -254,7 +254,6 @@ pyrogram/methods/messages/send_photo.py
 pyrogram/methods/messages/send_poll.py
 pyrogram/methods/messages/send_reaction.py
 pyrogram/methods/messages/send_sticker.py
-pyrogram/methods/messages/send_story.py
 pyrogram/methods/messages/send_venue.py
 pyrogram/methods/messages/send_video.py
 pyrogram/methods/messages/send_video_note.py
@@ -268,6 +267,8 @@ pyrogram/methods/password/__init__.py
 pyrogram/methods/password/change_cloud_password.py
 pyrogram/methods/password/enable_cloud_password.py
 pyrogram/methods/password/remove_cloud_password.py
+pyrogram/methods/stories/__init__.py
+pyrogram/methods/stories/send_story.py
 pyrogram/methods/users/__init__.py
 pyrogram/methods/users/block_user.py
 pyrogram/methods/users/delete_profile_photos.py

{WPyrogram-2.0.122 → WPyrogram-2.0.123}/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.122"
+__version__ = "2.0.123"
 __license__ = "GNU Lesser General Public License v3.0 (LGPL-3.0)"
 __copyright__ = "Copyright (C) 2017-present Dan <https://github.com/delivrance>"
 

{WPyrogram-2.0.122 → WPyrogram-2.0.123}/pyrogram/methods/__init__.py

@@ -25,6 +25,7 @@ from .decorators import Decorators
 from .invite_links import InviteLinks
 from .messages import Messages
 from .password import Password
+from .stories import Stories
 from .users import Users
 from .utilities import Utilities
 
@@ -35,6 +36,7 @@ class Methods(
     Bots,
     Contacts,
     Password,
+    Stories,
     Chats,
     Users,
     Messages,

{WPyrogram-2.0.122 → WPyrogram-2.0.123}/pyrogram/methods/messages/__init__.py

@@ -57,7 +57,6 @@ from .send_photo import SendPhoto
 from .send_poll import SendPoll
 from .send_reaction import SendReaction
 from .send_sticker import SendSticker
-from .send_story import SendStory
 from .send_venue import SendVenue
 from .send_video import SendVideo
 from .send_video_note import SendVideoNote
@@ -88,7 +87,6 @@ class Messages(
     SendMessage,
     SendPhoto,
     SendSticker,
-    SendStory,
     SendVenue,
     SendVideo,
     SendVideoNote,

WPyrogram-2.0.123/pyrogram/methods/stories/__init__.py

@@ -0,0 +1,6 @@
+from .send_story import SendStory
+
+class Stories(
+    SendStory
+):
+    pass

{WPyrogram-2.0.122/pyrogram/methods/messages → WPyrogram-2.0.123/pyrogram/methods/stories}/send_story.py

@@ -34,11 +34,13 @@ class SendStory:
     async def send_story(
         self: "pyrogram.Client",
         story: Union[str, BinaryIO],
+        chat_id: Union[int, str] = "me",
         caption: str = "",
         parse_mode: Optional["enums.ParseMode"] = None,
         caption_entities: List["types.MessageEntity"] = None,
+        media_area: List["raw.base.MediaArea"] = None,
         has_spoiler: bool = None,
-        pinned: bool = False,
+        pinned: bool = True,
         ttl_seconds: int = None,
         period: int = None,
         duration: int = 0,
@@ -52,9 +54,9 @@ class SendStory:
         progress: Callable = None,
         progress_args: tuple = ()
     ) -> Optional["types.Message"]:
-        """Send video files.
+        """Upload a story on a user profile or channel.
 
-        .. include:: /_includes/usable-by/users-bots.rst
+        .. include:: /_includes/usable-by/users.rst
 
         Parameters:
             chat_id (``int`` | ``str``):
@@ -62,8 +64,8 @@ class SendStory:
                 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).
 
-            video (``str`` | ``BinaryIO``):
-                Video to send.
+            story (``str`` | ``BinaryIO``):
+                story to send.
                 Pass a file_id as string to send a video that exists on the Telegram servers,
                 pass an HTTP URL as a string for Telegram to get a video from the Internet,
                 pass a file path as string to upload a new video that exists on your local machine, or
@@ -226,19 +228,54 @@ class SendStory:
                 )
 
             if not privacy_rules:
-                privacy_rules = [raw.types.PrivacyValueAllowAll()]
+                privacy_rules = [raw.types.InputPrivacyValueAllowCloseFriends()]
+            elif isinstance(privacy_rules, str):
+                # try to parse it from str
+                privacy_rules = privacy_rules.lower().replace("-", "")
+                if privacy_rules == "closefriends" or privacy_rules == "friends":
+                    privacy_rules = [raw.types.InputPrivacyValueAllowCloseFriends()]
+                elif privacy_rules == "contacts":
+                    privacy_rules = [raw.types.InputPrivacyValueAllowContacts()]
+                elif privacy_rules == "all":
+                    privacy_rules = [raw.types.InputPrivacyValueAllowAll()]
+                else:
+                    raise Exception(f"Invalid str value specified for privacy_rules: {privacy_rules}")
+            elif isinstance(privacy_rules, list):
+                # a list of input users
+                all_allowed_users = []
+                all_disallowed_users = []
+                correct_privacy_rules = []
+                for current_privacy_rule in privacy_rules:
+                    is_disallowed = isinstance(current_privacy_rule, str) and current_privacy_rule.startswith('!')
+                    if is_disallowed:
+                        current_privacy_rule = current_privacy_rule[1:]
+                    
+                    current_peer = await self.resolve_peer(current_privacy_rule)
+                    if not isinstance(current_peer, pyrogram.raw.base.InputUser):
+                        # yeah well... telegram is gonna return us error anyway...
+                        continue
+                    
+                    if is_disallowed: all_disallowed_users.append(current_peer)
+                    else: all_allowed_users.append(current_peer)
+                
+                if all_allowed_users:
+                    correct_privacy_rules.append(all_allowed_users)
+                if all_disallowed_users:
+                    correct_privacy_rules.append(all_disallowed_users)
+
+                privacy_rules = correct_privacy_rules
             
             while True:
                 try:
                     r = await self.invoke(
                         raw.functions.stories.send_story.SendStory(
-                            peer=await self.resolve_peer("me"),
+                            peer=await self.resolve_peer(chat_id),
                             media=media,
                             privacy_rules=privacy_rules,
                             random_id=self.rnd_id(),
                             pinned=pinned,
                             noforwards=protect_content,
-                            media_areas=[],
+                            media_areas=media_area,
                             period=period,
                             **await utils.parse_caption_entities(self, caption, parse_mode, caption_entities)
                         )