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

Author: SychO3

pyrogram/methods/chats/ban_chat_member.py

@@ -17,7 +17,7 @@
 #  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
 from datetime import datetime
-from typing import Union
+from typing import Optional, Union
 
 import pyrogram
 from pyrogram import raw, types, utils
@@ -29,6 +29,7 @@ async def ban_chat_member(
         chat_id: Union[int, str],
         user_id: Union[int, str],
         until_date: datetime = utils.zero_datetime(),
+        revoke_messages: Optional[bool] = None,
     ) -> Union["types.Message", bool]:
         """Ban a user from a group, a supergroup or a channel.
         In the case of supergroups and channels, the user will not be able to return to the group on their own using
@@ -50,6 +51,9 @@ async def ban_chat_member(
                 If user is banned for more than 366 days or less than 30 seconds from the current time they are
                 considered to be banned forever. Defaults to epoch (ban forever).
 
+            revoke_messages (``bool``, *optional*):
+                Pass True to delete all messages in the chat for the user who is being removed.
+
         Returns:
             :obj:`~pyrogram.types.Message` | ``bool``: On success, a service message will be returned (when applicable),
             otherwise, in case a message object couldn't be returned, True is returned.
@@ -68,6 +72,9 @@ async def ban_chat_member(
         chat_peer = await self.resolve_peer(chat_id)
         user_peer = await self.resolve_peer(user_id)
 
+        if isinstance(chat_peer, (raw.types.InputPeerSelf, raw.types.InputPeerUser)):
+            raise ValueError("Can't ban members in private chats")
+
         if isinstance(chat_peer, raw.types.InputPeerChannel):
             r = await self.invoke(
                 raw.functions.channels.EditBanned(
@@ -86,13 +93,21 @@ async def ban_chat_member(
                     ),
                 )
             )
+
+            if revoke_messages:
+                await self.invoke(
+                    raw.functions.channels.DeleteParticipantHistory(
+                        channel=chat_peer, participant=user_peer
+                    )
+                )
         else:
+            if not isinstance(user_peer, raw.types.InputPeerUser):
+                raise ValueError("Can't ban chats in basic groups")
+
             r = await self.invoke(
                 raw.functions.messages.DeleteChatUser(
-                    chat_id=abs(chat_id), user_id=user_peer
+                    chat_id=abs(chat_id), user_id=user_peer, revoke_history=revoke_messages
                 )
             )
 
-        messages = await utils.parse_messages(client=self, messages=r)
-
-        return messages[0] if messages else True
+        return next(iter(await utils.parse_messages(client=self, messages=r)), True)

pyrogram/types/messages_and_media/story.py

@@ -350,15 +350,25 @@ async def _parse(
             ] or None
             reactions_count = getattr(story.views, "reactions_count", None)
 
-        if isinstance(story.media, raw.types.MessageMediaPhoto):
-            photo = types.Photo._parse(client, story.media.photo, story.media.ttl_seconds)
-            media_type = enums.MessageMediaType.PHOTO
-        else:
-            doc = story.media.document
-            attributes = {type(i): i for i in doc.attributes}
-            video_attributes = attributes.get(raw.types.DocumentAttributeVideo, None)
-            video = types.Video._parse(client, doc, video_attributes, alternative_videos=getattr(story.media, "alt_documents", []))
-            media_type = enums.MessageMediaType.VIDEO
+        photo = None
+        video = None
+
+        media = story.media
+        media_type = None
+
+        if media:
+            if isinstance(media, raw.types.MessageMediaPhoto):
+                photo = types.Photo._parse(client, media.photo, media.ttl_seconds)
+                media_type = enums.MessageMediaType.PHOTO
+            elif isinstance(media, raw.types.MessageMediaDocument):
+                doc = media.document
+                attributes = {type(i): i for i in doc.attributes}
+                video_attributes = attributes.get(raw.types.DocumentAttributeVideo, None)
+                video = types.Video._parse(client, doc, video_attributes, alternative_videos=getattr(story.media, "alt_documents", []))
+                media_type = enums.MessageMediaType.VIDEO
+            else:
+                media_type = enums.MessageMediaType.UNSUPPORTED
+                media = None
 
         privacy_map = {
             raw.types.PrivacyValueAllowAll: enums.StoriesPrivacyRules.PUBLIC,

pyrogram/types/user_and_chats/chat.py

@@ -1496,7 +1496,10 @@ async def set_ttl(self, ttl_seconds: int) -> "types.Message":
         )
 
     async def ban_member(
-        self, user_id: Union[int, str], until_date: datetime = utils.zero_datetime()
+        self,
+        user_id: Union[int, str],
+        until_date: datetime = utils.zero_datetime(),
+        revoke_messages: Optional[bool] = None
     ) -> Union["types.Message", bool]:
         """Bound method *ban_member* of :obj:`~pyrogram.types.Chat`.
 
@@ -1524,6 +1527,9 @@ async def ban_member(
                 If user is banned for more than 366 days or less than 30 seconds from the current time they are
                 considered to be banned forever. Defaults to epoch (ban forever).
 
+            revoke_messages (``bool``, *optional*):
+                Pass True to delete all messages in the chat for the user who is being removed.
+
         Returns:
             :obj:`~pyrogram.types.Message` | ``bool``: On success, a service message will be returned (when applicable), otherwise, in
             case a message object couldn't be returned, True is returned.
@@ -1532,7 +1538,10 @@ async def ban_member(
             RPCError: In case of a Telegram RPC error.
         """
         return await self._client.ban_chat_member(
-            chat_id=self.id, user_id=user_id, until_date=until_date
+            chat_id=self.id,
+            user_id=user_id,
+            until_date=until_date,
+            revoke_messages=revoke_messages
         )
 
     async def unban_member(