refactor media sending methods to use send_media and handle deprecated reply parameters

Author: ZeN220

pyrogram/methods/messages/send_animation.py

@@ -16,18 +16,16 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
-import logging
 import os
 import re
 from datetime import datetime
 from typing import BinaryIO, Callable, List, Optional, Union
 
 import pyrogram
 from pyrogram import StopTransmission, enums, raw, types, utils
-from pyrogram.errors import FilePartMissing
 from pyrogram.file_id import FileType
+from pyrogram.utils import handle_deprecated_reply_parameters, send_media
 
-log = logging.getLogger(__name__)
 
 class SendAnimation:
     async def send_animation(
@@ -217,55 +215,16 @@ async def progress(current, total):
 
                 await app.send_animation("me", "animation.gif", progress=progress)
         """
-        if any(
-            (
-                reply_to_message_id is not None,
-                reply_to_chat_id is not None,
-                reply_to_story_id is not None,
-                quote_text is not None,
-                quote_entities is not None,
-                quote_offset is not None,
-            )
-        ):
-            if reply_to_message_id is not None:
-                log.warning(
-                    "`reply_to_message_id` is deprecated and will be removed in future updates. Use `reply_parameters` instead."
-                )
-
-            if reply_to_chat_id is not None:
-                log.warning(
-                    "`reply_to_chat_id` is deprecated and will be removed in future updates. Use `reply_parameters` instead."
-                )
-
-            if reply_to_story_id is not None:
-                log.warning(
-                    "`reply_to_story_id` is deprecated and will be removed in future updates. Use `reply_parameters` instead."
-                )
-
-            if quote_text is not None:
-                log.warning(
-                    "`quote_text` is deprecated and will be removed in future updates. Use `reply_parameters` instead."
-                )
-
-            if quote_entities is not None:
-                log.warning(
-                    "`quote_entities` is deprecated and will be removed in future updates. Use `reply_parameters` instead."
-                )
-
-            if quote_offset is not None:
-                log.warning(
-                    "`quote_offset` is deprecated and will be removed in future updates. Use `reply_parameters` instead."
-                )
-
-            reply_parameters = types.ReplyParameters(
-                message_id=reply_to_message_id,
-                chat_id=reply_to_chat_id,
-                story_id=reply_to_story_id,
-                quote=quote_text,
-                quote_parse_mode=parse_mode,
-                quote_entities=quote_entities,
-                quote_position=quote_offset
-            )
+        reply_parameters = handle_deprecated_reply_parameters(
+            reply_to_message_id=reply_to_message_id,
+            reply_to_chat_id=reply_to_chat_id,
+            reply_to_story_id=reply_to_story_id,
+            quote_text=quote_text,
+            quote_entities=quote_entities,
+            quote_offset=quote_offset,
+            parse_mode=parse_mode,
+            reply_parameters=reply_parameters
+        )
 
         file = None
 
@@ -317,58 +276,39 @@ async def progress(current, total):
                     ]
                 )
 
-            while True:
-                try:
-                    peer = await self.resolve_peer(chat_id)
-                    r = await self.invoke(
-                        raw.functions.messages.SendMedia(
-                            peer=peer,
-                            media=media,
-                            silent=disable_notification or None,
-                            invert_media=show_caption_above_media,
-                            reply_to=await utils.get_reply_to(
-                                self,
-                                reply_parameters,
-                                message_thread_id,
-                                direct_messages_topic_id
-                            ),
-                            random_id=self.rnd_id(),
-                            schedule_date=utils.datetime_to_timestamp(schedule_date),
-                            noforwards=protect_content,
-                            allow_paid_floodskip=allow_paid_broadcast,
-                            reply_markup=await reply_markup.write(self) if reply_markup else None,
-                            effect=effect_id,
-                            allow_paid_stars=paid_message_star_count,
-                            suggested_post=suggested_post_parameters.write() if suggested_post_parameters else None,
-                            **await utils.parse_text_entities(self, caption, parse_mode, caption_entities)
-                        ),
-                        business_connection_id=business_connection_id
-                    )
-                except FilePartMissing as e:
-                    await self.save_file(animation, file_id=file.id, file_part=e.value)
-                else:
-                    for i in r.updates:
-                        if isinstance(i, (raw.types.UpdateNewMessage,
-                                          raw.types.UpdateNewChannelMessage,
-                                          raw.types.UpdateNewScheduledMessage,
-                                          raw.types.UpdateBotNewBusinessMessage)):
-                            message = await types.Message._parse(
-                                self, i.message,
-                                {i.id: i for i in r.users},
-                                {i.id: i for i in r.chats},
-                                is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
-                                business_connection_id=getattr(i, "connection_id", None),
-                            )
-
-                            if unsave and message.animation:
-                                document_id = utils.get_input_media_from_file_id(
-                                    message.animation.file_id,
-                                    FileType.ANIMATION,
-                                ).id
-
-                                await self.invoke(raw.functions.messages.SaveGif(id=document_id, unsave=True))  # type: ignore[arg-type]
-
-                            return message
-
+            # Функция для обработки unsave после отправки
+            async def post_process(client, message):
+                if unsave and message.animation:
+                    document_id = utils.get_input_media_from_file_id(
+                        message.animation.file_id,
+                        FileType.ANIMATION,
+                    ).id
+                    await client.invoke(raw.functions.messages.SaveGif(id=document_id, unsave=True))
+
+            return await send_media(
+                client=self,
+                chat_id=chat_id,
+                media=media,
+                caption=caption,
+                parse_mode=parse_mode,
+                caption_entities=caption_entities,
+                disable_notification=disable_notification,
+                message_thread_id=message_thread_id,
+                direct_messages_topic_id=direct_messages_topic_id,
+                effect_id=effect_id,
+                show_caption_above_media=show_caption_above_media,
+                reply_parameters=reply_parameters,
+                schedule_date=schedule_date,
+                protect_content=protect_content,
+                business_connection_id=business_connection_id,
+                allow_paid_broadcast=allow_paid_broadcast,
+                paid_message_star_count=paid_message_star_count,
+                suggested_post_parameters=suggested_post_parameters,
+                reply_markup=reply_markup,
+                file_reference=animation,
+                file_part_callback=lambda ref, part: self.save_file(ref, file_id=file.id, file_part=part),
+                use_parse_messages=False,  # Используем ручной парсинг для совместимости с unsave
+                post_process_callback=post_process if unsave else None,
+            )
         except StopTransmission:
             return None

pyrogram/methods/messages/send_audio.py

@@ -16,18 +16,16 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
-import logging
 import os
 import re
 from datetime import datetime
 from typing import BinaryIO, Callable, List, Optional, Union
 
 import pyrogram
 from pyrogram import StopTransmission, enums, raw, types, utils
-from pyrogram.errors import FilePartMissing
 from pyrogram.file_id import FileType
+from pyrogram.utils import handle_deprecated_reply_parameters, send_media
 
-log = logging.getLogger(__name__)
 
 class SendAudio:
     async def send_audio(
@@ -207,55 +205,16 @@ async def progress(current, total):
 
                 await app.send_audio("me", "audio.mp3", progress=progress)
         """
-        if any(
-            (
-                reply_to_message_id is not None,
-                reply_to_chat_id is not None,
-                reply_to_story_id is not None,
-                quote_text is not None,
-                quote_entities is not None,
-                quote_offset is not None,
-            )
-        ):
-            if reply_to_message_id is not None:
-                log.warning(
-                    "`reply_to_message_id` is deprecated and will be removed in future updates. Use `reply_parameters` instead."
-                )
-
-            if reply_to_chat_id is not None:
-                log.warning(
-                    "`reply_to_chat_id` is deprecated and will be removed in future updates. Use `reply_parameters` instead."
-                )
-
-            if reply_to_story_id is not None:
-                log.warning(
-                    "`reply_to_story_id` is deprecated and will be removed in future updates. Use `reply_parameters` instead."
-                )
-
-            if quote_text is not None:
-                log.warning(
-                    "`quote_text` is deprecated and will be removed in future updates. Use `reply_parameters` instead."
-                )
-
-            if quote_entities is not None:
-                log.warning(
-                    "`quote_entities` is deprecated and will be removed in future updates. Use `reply_parameters` instead."
-                )
-
-            if quote_offset is not None:
-                log.warning(
-                    "`quote_offset` is deprecated and will be removed in future updates. Use `reply_parameters` instead."
-                )
-
-            reply_parameters = types.ReplyParameters(
-                message_id=reply_to_message_id,
-                chat_id=reply_to_chat_id,
-                story_id=reply_to_story_id,
-                quote=quote_text,
-                quote_parse_mode=parse_mode,
-                quote_entities=quote_entities,
-                quote_position=quote_offset
-            )
+        reply_parameters = handle_deprecated_reply_parameters(
+            reply_to_message_id=reply_to_message_id,
+            reply_to_chat_id=reply_to_chat_id,
+            reply_to_story_id=reply_to_story_id,
+            quote_text=quote_text,
+            quote_entities=quote_entities,
+            quote_offset=quote_offset,
+            parse_mode=parse_mode,
+            reply_parameters=reply_parameters
+        )
 
         file = None
 
@@ -306,37 +265,27 @@ async def progress(current, total):
                     ]
                 )
 
-            while True:
-                try:
-                    peer = await self.resolve_peer(chat_id)
-                    r = await self.invoke(
-                        raw.functions.messages.SendMedia(
-                            peer=peer,
-                            media=media,
-                            silent=disable_notification or None,
-                            reply_to=await utils.get_reply_to(
-                                self,
-                                reply_parameters,
-                                message_thread_id,
-                                direct_messages_topic_id
-                            ),
-                            random_id=self.rnd_id(),
-                            schedule_date=utils.datetime_to_timestamp(schedule_date),
-                            noforwards=protect_content,
-                            allow_paid_floodskip=allow_paid_broadcast,
-                            reply_markup=await reply_markup.write(self) if reply_markup else None,
-                            effect=effect_id,
-                            allow_paid_stars=paid_message_star_count,
-                            suggested_post=suggested_post_parameters.write() if suggested_post_parameters else None,
-                            **await utils.parse_text_entities(self, caption, parse_mode, caption_entities)
-                        ),
-                        business_connection_id=business_connection_id
-                    )
-                except FilePartMissing as e:
-                    await self.save_file(audio, file_id=file.id, file_part=e.value)
-                else:
-                    messages = await utils.parse_messages(client=self, messages=r)
-
-                    return messages[0] if messages else None
+            return await send_media(
+                client=self,
+                chat_id=chat_id,
+                media=media,
+                caption=caption,
+                parse_mode=parse_mode,
+                caption_entities=caption_entities,
+                disable_notification=disable_notification,
+                message_thread_id=message_thread_id,
+                direct_messages_topic_id=direct_messages_topic_id,
+                effect_id=effect_id,
+                reply_parameters=reply_parameters,
+                schedule_date=schedule_date,
+                protect_content=protect_content,
+                business_connection_id=business_connection_id,
+                allow_paid_broadcast=allow_paid_broadcast,
+                paid_message_star_count=paid_message_star_count,
+                suggested_post_parameters=suggested_post_parameters,
+                reply_markup=reply_markup,
+                file_reference=audio,
+                file_part_callback=lambda ref, part: self.save_file(ref, file_id=file.id, file_part=part),
+            )
         except StopTransmission:
             return None