Merge remote-tracking branch 'KurimuzonAkuma/dev' into dev

Author: SychO3

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.2.13"
+__version__ = "2.2.15"
 __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_dialogs.py

@@ -19,7 +19,7 @@
 from typing import AsyncGenerator, Optional
 
 import pyrogram
-from pyrogram import types, raw, utils
+from pyrogram import raw, types, utils
 
 
 class GetDialogs:
@@ -91,9 +91,9 @@ async def get_dialogs(
                 if isinstance(message, raw.types.MessageEmpty):
                     continue
 
-                chat_id = utils.get_peer_id(message.peer_id)
-
-                messages[chat_id] = await types.Message._parse(self, message, users, chats)
+                messages[utils.get_peer_id(message.peer_id)] = await types.Message._parse(
+                    self, message, users, chats
+                )
 
             dialogs = []
 
@@ -116,9 +116,9 @@ async def get_dialogs(
             if not dialogs:
                 return
 
-            last_message = next(filter(None, (
-                messages.get(utils.get_raw_peer_id(d.chat.id)) for d in reversed(dialogs)
-            )), None)
+            last_message = next(
+                filter(None, (messages.get(d.chat.id) for d in reversed(dialogs))), None
+            )
 
             offset_id = last_message.id if last_message else 0
             offset_date = utils.datetime_to_timestamp(last_message.date) if last_message else 0

pyrogram/methods/stories/edit_story_media.py

@@ -17,7 +17,7 @@
 #  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from typing import Union, BinaryIO, Callable
+from typing import List, Union, BinaryIO, Callable
 
 import pyrogram
 from pyrogram import raw, types, utils, StopTransmission
@@ -29,6 +29,7 @@ async def edit_story_media(
         chat_id: Union[int, str],
         story_id: int,
         media: Union[str, BinaryIO] = None,
+        media_areas: List["types.MediaArea"] = None,
         duration: int = 0,
         width: int = 0,
         height: int = 0,
@@ -56,6 +57,9 @@ async def edit_story_media(
                 pass a file path as string to upload a new animation that exists on your local machine, or
                 pass a binary file-like object with its attribute ".name" set for in-memory uploads.
 
+            media_areas (List of :obj:`~pyrogram.types.MediaArea`, *optional*):
+                List of media areas to edit in the story.
+
             duration (``int``, *optional*):
                 Duration of sent video in seconds.
 
@@ -94,8 +98,6 @@ async def edit_story_media(
                 # Replace the current media with a local video
                 await app.edit_story_media(chat_id, story_id, "new_video.mp4")
         """
-        # TODO: media_areas
-
         try:
             if isinstance(media, str):
                 if os.path.isfile(media):
@@ -153,6 +155,7 @@ async def edit_story_media(
                             peer=await self.resolve_peer(chat_id),
                             id=story_id,
                             media=media,
+                            media_areas=[await area.write(self) for area in (media_areas or [])] or None,
                         )
                     )
                 except FilePartXMissing as e:

pyrogram/methods/stories/send_story.py

@@ -31,6 +31,7 @@ async def send_story(
         media: Union[str, BinaryIO],
         caption: str = None,
         period: int = None,
+        media_areas: List["types.MediaArea"] = None,
         duration: int = 0,
         width: int = 0,
         height: int = 0,
@@ -46,7 +47,6 @@ async def send_story(
         caption_entities: List["types.MessageEntity"] = None,
         progress: Callable = None,
         progress_args: tuple = (),
-        media_areas: List["types.MediaArea"] = None
     ) -> "types.Story":
         """Post new story.
 
@@ -71,6 +71,9 @@ async def send_story(
                 Must be one of ``6 * 3600``, ``12 * 3600``, ``86400``, or ``2 * 86400`` for Telegram Premium users,
                 and 86400 otherwise.
 
+            media_areas (List of :obj:`~pyrogram.types.MediaArea`, *optional*):
+                List of media areas to add to the story.
+
             duration (``int``, *optional*):
                 Duration of sent video in seconds.
 
@@ -132,9 +135,6 @@ async def send_story(
                 You can pass anything you need to be available in the progress callback scope; for example, a Message
                 object or a Client instance in order to edit the message with the updated progress status.
 
-            media_areas (List of :obj:`~pyrogram.types.MediaArea`, *optional*):
-                List of media areas to add to the story.
-
         Returns:
             :obj:`~pyrogram.types.Story` a single story is returned.
 
@@ -150,8 +150,6 @@ async def send_story(
         Raises:
             ValueError: In case of invalid arguments.
         """
-        # TODO: media_areas
-
         message, entities = (await utils.parse_text_entities(self, caption, parse_mode, caption_entities)).values()
 
         try:

pyrogram/types/messages_and_media/gift.py

@@ -83,6 +83,9 @@ class Gift(Object):
         host_id (``int``, *optional*):
             Identifier of the user or the chat to which the upgraded gift was assigned from blockchain.
 
+        host (:obj:`~pyrogram.types.Chat`, *optional*):
+            User or the chat to which the upgraded gift was assigned from blockchain.
+
         owner (:obj:`~pyrogram.types.Chat`, *optional*):
             Current gift owner.
 
@@ -224,6 +227,7 @@ def __init__(
         locked_until_date: Optional[datetime] = None,
         from_user: Optional["types.User"] = None,
         host_id: Optional[int] = None,
+        host: Optional["types.Chat"] = None,
         owner: Optional["types.Chat"] = None,
         owner_name: Optional[str] = None,
         owner_address: Optional[str] = None,
@@ -283,6 +287,7 @@ def __init__(
         self.locked_until_date = locked_until_date
         self.from_user = from_user
         self.host_id = host_id
+        self.host = host
         self.owner = owner
         self.owner_name = owner_name
         self.owner_address = owner_address
@@ -334,7 +339,7 @@ async def _parse(client, gift, users: Dict[int, "raw.base.User"] = {}, chats: Di
             return await Gift._parse_regular(client, gift, users, chats)
         elif isinstance(gift, raw.types.StarGiftUnique):
             return await Gift._parse_unique(client, gift, users, chats)
-        elif isinstance(gift, raw.types.StarGiftSaved):
+        elif isinstance(gift, raw.types.SavedStarGift):
             return await Gift._parse_saved(client, gift, users, chats)
 
     @staticmethod
@@ -383,7 +388,8 @@ async def _parse_unique(
         if not isinstance(star_gift, raw.types.StarGiftUnique):
             return
 
-        owner_id = utils.get_raw_peer_id(star_gift.owner_id)
+        raw_host_id = utils.get_raw_peer_id(star_gift.host_id)
+        raw_owner_id = utils.get_raw_peer_id(star_gift.owner_id)
 
         return Gift(
             id=star_gift.id,
@@ -401,7 +407,8 @@ async def _parse_unique(
             is_theme_available=star_gift.theme_available,
             used_theme_chat_id=utils.get_peer_id(star_gift.theme_peer) if star_gift.theme_peer else None,
             host_id=utils.get_peer_id(star_gift.host_id) if star_gift.host_id else None,
-            owner=types.Chat._parse_chat(client, users.get(owner_id) or chats.get(owner_id)),
+            host=types.Chat._parse_chat(client, users.get(raw_host_id) or chats.get(raw_host_id)),
+            owner=types.Chat._parse_chat(client, users.get(raw_owner_id) or chats.get(raw_owner_id)),
             owner_name=star_gift.owner_name,
             owner_address=star_gift.owner_address,
             gift_address=star_gift.gift_address,

pyrogram/types/user_and_chats/__init__.py

@@ -38,7 +38,7 @@
 from .chat_member_updated import ChatMemberUpdated
 from .chat_permissions import ChatPermissions
 from .chat_photo import ChatPhoto
-from .chat_administrator_rights import ChatAdministratorRights
+from .chat_administrator_rights import ChatAdministratorRights, ChatPrivileges
 from .chat_reactions import ChatReactions
 from .chat_settings import ChatSettings
 from .dialog import Dialog
@@ -102,6 +102,7 @@
     "VideoChatScheduled",
     "ChatJoinRequest",
     "ChatAdministratorRights",
+    "ChatPrivileges",
     "ChatJoiner",
     "EmojiStatus",
     "FailedToAddMember",