diff --git a/pyrogram/methods/bots/send_game.py b/pyrogram/methods/bots/send_game.py index f659bb0cd3..bceac53db5 100644 --- a/pyrogram/methods/bots/send_game.py +++ b/pyrogram/methods/bots/send_game.py @@ -45,7 +45,6 @@ async def send_game( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None ) -> "types.Message": """Send a game. @@ -105,19 +104,6 @@ async def send_game( await app.send_game(chat_id, "gamename") """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - reply_to = await utils._get_reply_message_parameters( self, message_thread_id, diff --git a/pyrogram/methods/bots/send_inline_bot_result.py b/pyrogram/methods/bots/send_inline_bot_result.py index 06fda3bd8b..3cedcf28e1 100644 --- a/pyrogram/methods/bots/send_inline_bot_result.py +++ b/pyrogram/methods/bots/send_inline_bot_result.py @@ -38,7 +38,6 @@ async def send_inline_bot_result( paid_message_star_count: int = None, message_thread_id: int = None, schedule_date: datetime = None, - reply_to_message_id: int = None ) -> Union["types.Message", bool]: """Send an inline bot result. Bot results can be retrieved using :meth:`~pyrogram.Client.get_inline_bot_results` @@ -92,19 +91,6 @@ async def send_inline_bot_result( await app.send_inline_bot_result(chat_id, query_id, result_id) """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - reply_to = await utils._get_reply_message_parameters( self, message_thread_id, diff --git a/pyrogram/methods/messages/copy_media_group.py b/pyrogram/methods/messages/copy_media_group.py index fec3210ce2..6fb96833f2 100644 --- a/pyrogram/methods/messages/copy_media_group.py +++ b/pyrogram/methods/messages/copy_media_group.py @@ -42,7 +42,6 @@ async def copy_media_group( allow_paid_broadcast: bool = None, paid_message_star_count: int = None, message_effect_id: int = None, - reply_to_message_id: int = None ) -> list["types.Message"]: """Copy a media group by providing one of the message ids. @@ -118,19 +117,6 @@ async def copy_media_group( captions=["caption 1", None, ""]) """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - media_group = await self.get_media_group(from_chat_id, message_id) multi_media = [] show_caption_above_media = [] diff --git a/pyrogram/methods/messages/copy_message.py b/pyrogram/methods/messages/copy_message.py index 4458002967..6c24797369 100644 --- a/pyrogram/methods/messages/copy_message.py +++ b/pyrogram/methods/messages/copy_message.py @@ -51,7 +51,6 @@ async def copy_message( send_as: Union[int, str] = None, protect_content: bool = None, message_thread_id: int = None, - reply_to_message_id: int = None ) -> "types.Message": """Copy messages of any kind. @@ -142,19 +141,6 @@ async def copy_message( """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - message: types.Message = await self.get_messages( chat_id=from_chat_id, message_ids=message_id diff --git a/pyrogram/methods/messages/edit_inline_text.py b/pyrogram/methods/messages/edit_inline_text.py index c7dc40ac8c..c7e2fe981e 100644 --- a/pyrogram/methods/messages/edit_inline_text.py +++ b/pyrogram/methods/messages/edit_inline_text.py @@ -35,7 +35,6 @@ async def edit_inline_text( entities: list["types.MessageEntity"] = None, link_preview_options: "types.LinkPreviewOptions" = None, reply_markup: "types.InlineKeyboardMarkup" = None, - disable_web_page_preview: bool = None ) -> bool: """Edit the text of inline messages. @@ -80,18 +79,6 @@ async def edit_inline_text( ) ) """ - if disable_web_page_preview and link_preview_options: - raise ValueError( - "Parameters `disable_web_page_preview` and `link_preview_options` are mutually " - "exclusive." - ) - - if disable_web_page_preview is not None: - log.warning( - "This property is deprecated. " - "Please use link_preview_options instead" - ) - link_preview_options = types.LinkPreviewOptions(is_disabled=disable_web_page_preview) link_preview_options = link_preview_options or self.link_preview_options diff --git a/pyrogram/methods/messages/edit_message_text.py b/pyrogram/methods/messages/edit_message_text.py index 85ca2cb2f2..17cb932120 100644 --- a/pyrogram/methods/messages/edit_message_text.py +++ b/pyrogram/methods/messages/edit_message_text.py @@ -40,7 +40,6 @@ async def edit_message_text( reply_markup: "types.InlineKeyboardMarkup" = None, schedule_date: datetime = None, business_connection_id: str = None, - disable_web_page_preview: bool = None ) -> "types.Message": """Edit the text of messages. @@ -94,18 +93,6 @@ async def edit_message_text( ) ) """ - if disable_web_page_preview and link_preview_options: - raise ValueError( - "Parameters `disable_web_page_preview` and `link_preview_options` are mutually " - "exclusive." - ) - - if disable_web_page_preview is not None: - log.warning( - "This property is deprecated. " - "Please use link_preview_options instead" - ) - link_preview_options = types.LinkPreviewOptions(is_disabled=disable_web_page_preview) link_preview_options = link_preview_options or self.link_preview_options diff --git a/pyrogram/methods/messages/send_animation.py b/pyrogram/methods/messages/send_animation.py index 87dacc54bc..e3baecf64b 100644 --- a/pyrogram/methods/messages/send_animation.py +++ b/pyrogram/methods/messages/send_animation.py @@ -65,7 +65,6 @@ async def send_animation( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> Optional["types.Message"]: @@ -217,19 +216,6 @@ async def progress(current, total): await app.send_animation("me", "animation.gif", ttl_seconds=10) """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - file = None try: diff --git a/pyrogram/methods/messages/send_audio.py b/pyrogram/methods/messages/send_audio.py index a164fa2272..1e674edcbf 100644 --- a/pyrogram/methods/messages/send_audio.py +++ b/pyrogram/methods/messages/send_audio.py @@ -61,7 +61,6 @@ async def send_audio( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> Optional["types.Message"]: @@ -199,19 +198,6 @@ async def progress(current, total): await app.send_audio("me", "audio.mp3", progress=progress) """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - file = None try: diff --git a/pyrogram/methods/messages/send_cached_media.py b/pyrogram/methods/messages/send_cached_media.py index f0f6493eb0..0f236db99a 100644 --- a/pyrogram/methods/messages/send_cached_media.py +++ b/pyrogram/methods/messages/send_cached_media.py @@ -52,7 +52,6 @@ async def send_cached_media( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None ) -> Optional["types.Message"]: """Send any media stored on the Telegram servers using a file_id. @@ -136,19 +135,6 @@ async def send_cached_media( await app.send_cached_media("me", file_id) """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - reply_to = await utils._get_reply_message_parameters( self, message_thread_id, diff --git a/pyrogram/methods/messages/send_contact.py b/pyrogram/methods/messages/send_contact.py index cf1717c07b..084c9d3d35 100644 --- a/pyrogram/methods/messages/send_contact.py +++ b/pyrogram/methods/messages/send_contact.py @@ -50,7 +50,6 @@ async def send_contact( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None ) -> "types.Message": """Send phone contacts. @@ -122,19 +121,6 @@ async def send_contact( await app.send_contact("me", "+1-123-456-7890", "Name") """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - reply_to = await utils._get_reply_message_parameters( self, message_thread_id, diff --git a/pyrogram/methods/messages/send_dice.py b/pyrogram/methods/messages/send_dice.py index 4d0d82b6df..f4e12acf77 100644 --- a/pyrogram/methods/messages/send_dice.py +++ b/pyrogram/methods/messages/send_dice.py @@ -47,7 +47,6 @@ async def send_dice( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None ) -> Optional["types.Message"]: """Send a dice with a random value from 1 to 6. @@ -121,19 +120,6 @@ async def send_dice( await app.send_dice(chat_id, "🏀") """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - reply_to = await utils._get_reply_message_parameters( self, message_thread_id, diff --git a/pyrogram/methods/messages/send_document.py b/pyrogram/methods/messages/send_document.py index 47dcd08ff0..10b392699e 100644 --- a/pyrogram/methods/messages/send_document.py +++ b/pyrogram/methods/messages/send_document.py @@ -59,8 +59,6 @@ async def send_document( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None, - force_document: bool = None, progress: Callable = None, progress_args: tuple = () ) -> Optional["types.Message"]: @@ -188,32 +186,6 @@ async def progress(current, total): await app.send_document("me", "document.zip", progress=progress) """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - - if force_document and disable_content_type_detection: - raise ValueError( - "Parameters `force_document` and `disable_content_type_detection` " - "are mutually exclusive." - ) - - if force_document is not None: - log.warning( - "This property is deprecated. " - "Please use disable_content_type_detection instead" - ) - disable_content_type_detection = force_document - file = None try: diff --git a/pyrogram/methods/messages/send_location.py b/pyrogram/methods/messages/send_location.py index fd528ca876..ad76774650 100644 --- a/pyrogram/methods/messages/send_location.py +++ b/pyrogram/methods/messages/send_location.py @@ -51,7 +51,6 @@ async def send_location( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None ) -> "types.Message": """Send points on the map. @@ -120,19 +119,6 @@ async def send_location( app.send_location("me", latitude, longitude) """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - reply_to = await utils._get_reply_message_parameters( self, message_thread_id, diff --git a/pyrogram/methods/messages/send_media_group.py b/pyrogram/methods/messages/send_media_group.py index dcb2040590..b01653f365 100644 --- a/pyrogram/methods/messages/send_media_group.py +++ b/pyrogram/methods/messages/send_media_group.py @@ -51,7 +51,6 @@ async def send_media_group( allow_paid_broadcast: bool = None, paid_message_star_count: int = None, message_effect_id: int = None, - reply_to_message_id: int = None ) -> list["types.Message"]: """Send a group of photos or videos as an album. @@ -119,19 +118,6 @@ async def send_media_group( ) """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - show_caption_above_media = [] multi_media = [] diff --git a/pyrogram/methods/messages/send_message.py b/pyrogram/methods/messages/send_message.py index fa54982abb..15e7b59402 100644 --- a/pyrogram/methods/messages/send_message.py +++ b/pyrogram/methods/messages/send_message.py @@ -51,8 +51,6 @@ async def send_message( "types.ForceReply" ] = None, schedule_date: datetime = None, - disable_web_page_preview: bool = None, - reply_to_message_id: int = None ) -> "types.Message": """Send text messages. @@ -161,34 +159,9 @@ async def send_message( ] ])) """ - if disable_web_page_preview and link_preview_options: - raise ValueError( - "Parameters `disable_web_page_preview` and `link_preview_options` are mutually " - "exclusive." - ) - - if disable_web_page_preview is not None: - log.warning( - "This property is deprecated. " - "Please use link_preview_options instead" - ) - link_preview_options = types.LinkPreviewOptions(is_disabled=disable_web_page_preview) link_preview_options = link_preview_options or self.link_preview_options - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - reply_to = await utils._get_reply_message_parameters( self, message_thread_id, diff --git a/pyrogram/methods/messages/send_photo.py b/pyrogram/methods/messages/send_photo.py index 4ab9333ee8..a4ea9e1947 100644 --- a/pyrogram/methods/messages/send_photo.py +++ b/pyrogram/methods/messages/send_photo.py @@ -60,7 +60,6 @@ async def send_photo( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> Optional["types.Message"]: @@ -188,19 +187,6 @@ async def send_photo( await app.send_photo("me", "photo.jpg", ttl_seconds=10) """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - file = None ttl_seconds = 0x7FFFFFFF if view_once else ttl_seconds diff --git a/pyrogram/methods/messages/send_poll.py b/pyrogram/methods/messages/send_poll.py index d4d343aecc..6381bd836a 100644 --- a/pyrogram/methods/messages/send_poll.py +++ b/pyrogram/methods/messages/send_poll.py @@ -60,7 +60,6 @@ async def send_poll( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None ) -> "types.Message": """Send a new poll. @@ -184,19 +183,6 @@ async def send_poll( """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - solution, solution_entities = (await utils.parse_text_entities( self, explanation, explanation_parse_mode, explanation_entities )).values() diff --git a/pyrogram/methods/messages/send_sticker.py b/pyrogram/methods/messages/send_sticker.py index 2411117a9e..5143d71b67 100644 --- a/pyrogram/methods/messages/send_sticker.py +++ b/pyrogram/methods/messages/send_sticker.py @@ -57,7 +57,6 @@ async def send_sticker( "types.ForceReply" ] = None, schedule_date: datetime = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> Optional["types.Message"]: @@ -167,19 +166,6 @@ async def send_sticker( await app.send_sticker("me", file_id) """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - file = None try: diff --git a/pyrogram/methods/messages/send_venue.py b/pyrogram/methods/messages/send_venue.py index 5c72ab53c4..ff9f3f2d86 100644 --- a/pyrogram/methods/messages/send_venue.py +++ b/pyrogram/methods/messages/send_venue.py @@ -54,7 +54,6 @@ async def send_venue( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None ) -> "types.Message": """Send information about a venue. @@ -135,19 +134,6 @@ async def send_venue( "Venue title", "Venue address") """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - reply_to = await utils._get_reply_message_parameters( self, message_thread_id, diff --git a/pyrogram/methods/messages/send_video.py b/pyrogram/methods/messages/send_video.py index ac16768061..0efb2231a5 100644 --- a/pyrogram/methods/messages/send_video.py +++ b/pyrogram/methods/messages/send_video.py @@ -69,7 +69,6 @@ async def send_video( file_name: str = None, mime_type: str = None, schedule_date: datetime = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> Optional["types.Message"]: @@ -236,19 +235,6 @@ async def progress(current, total): await app.send_video("me", "video.mp4", progress=progress) """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - file = None ttl_seconds = 0x7FFFFFFF if view_once else ttl_seconds diff --git a/pyrogram/methods/messages/send_video_note.py b/pyrogram/methods/messages/send_video_note.py index 8c43676c77..440035d789 100644 --- a/pyrogram/methods/messages/send_video_note.py +++ b/pyrogram/methods/messages/send_video_note.py @@ -60,7 +60,6 @@ async def send_video_note( schedule_date: datetime = None, ttl_seconds: int = None, view_once: bool = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> Optional["types.Message"]: @@ -192,19 +191,6 @@ async def send_video_note( await app.send_video_note("me", "video_note.mp4", view_once=True) """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - file = None ttl_seconds = 0x7FFFFFFF if view_once else ttl_seconds diff --git a/pyrogram/methods/messages/send_voice.py b/pyrogram/methods/messages/send_voice.py index 323c190fd7..d16e50cbf6 100644 --- a/pyrogram/methods/messages/send_voice.py +++ b/pyrogram/methods/messages/send_voice.py @@ -60,7 +60,6 @@ async def send_voice( ttl_seconds: int = None, view_once: bool = None, waveform: bytes = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> Optional["types.Message"]: @@ -187,19 +186,6 @@ async def send_voice( """ - if reply_to_message_id and reply_parameters: - raise ValueError( - "Parameters `reply_to_message_id` and `reply_parameters` are mutually " - "exclusive." - ) - - if reply_to_message_id is not None: - log.warning( - "This property is deprecated. " - "Please use reply_parameters instead" - ) - reply_parameters = types.ReplyParameters(message_id=reply_to_message_id) - file = None ttl_seconds = 0x7FFFFFFF if view_once else ttl_seconds diff --git a/pyrogram/methods/messages/set_reaction.py b/pyrogram/methods/messages/set_reaction.py index c9cc801e02..b3ad3fc224 100644 --- a/pyrogram/methods/messages/set_reaction.py +++ b/pyrogram/methods/messages/set_reaction.py @@ -130,28 +130,3 @@ async def set_reaction( else: raise ValueError("You need to pass one of message_id OR story_id!") - - - async def send_reaction( - self: "pyrogram.Client", - chat_id: Union[int, str], - message_id: int, - emoji: str = "", - big: bool = False, - add_to_recent: bool = True - ) -> bool: - log.warning( - "This property is deprecated. " - "Please use set_reaction instead" - ) - return bool( - await self.invoke( - raw.functions.messages.SendReaction( - reaction=[raw.types.ReactionEmoji(emoticon=emoji)] if emoji else None, - big=big, - peer=await self.resolve_peer(chat_id), - msg_id=message_id, - add_to_recent=add_to_recent - ) - ) - ) diff --git a/pyrogram/types/bots_and_keyboards/force_reply.py b/pyrogram/types/bots_and_keyboards/force_reply.py index b07c01e506..619b926846 100644 --- a/pyrogram/types/bots_and_keyboards/force_reply.py +++ b/pyrogram/types/bots_and_keyboards/force_reply.py @@ -49,20 +49,7 @@ def __init__( self, selective: bool = None, input_field_placeholder: str = None, - placeholder: str = None ): - if placeholder and input_field_placeholder: - raise ValueError( - "Parameters `placeholder` and `input_field_placeholder` are mutually exclusive." - ) - - if placeholder is not None: - log.warning( - "This property is deprecated. " - "Please use input_field_placeholder instead" - ) - input_field_placeholder = placeholder - super().__init__() self.selective = selective diff --git a/pyrogram/types/bots_and_keyboards/reply_keyboard_markup.py b/pyrogram/types/bots_and_keyboards/reply_keyboard_markup.py index 3b86826955..a3272813c4 100644 --- a/pyrogram/types/bots_and_keyboards/reply_keyboard_markup.py +++ b/pyrogram/types/bots_and_keyboards/reply_keyboard_markup.py @@ -66,20 +66,7 @@ def __init__( one_time_keyboard: bool = None, input_field_placeholder: str = None, selective: bool = None, - placeholder: str = None, ): - if placeholder and input_field_placeholder: - raise ValueError( - "Parameters `placeholder` and `input_field_placeholder` are mutually exclusive." - ) - - if placeholder is not None: - log.warning( - "This property is deprecated. " - "Please use input_field_placeholder instead" - ) - input_field_placeholder = placeholder - super().__init__() self.keyboard = keyboard diff --git a/pyrogram/types/business/business_connection.py b/pyrogram/types/business/business_connection.py index a63f54fde3..9042aa1783 100644 --- a/pyrogram/types/business/business_connection.py +++ b/pyrogram/types/business/business_connection.py @@ -99,14 +99,3 @@ def _parse( ), is_enabled=not bool(getattr(business_connect_update.connection, "disabled", None)) ) - - - @property - def can_reply(self) -> str: - log.warning( - "This property is deprecated. " - "Please use rights instead" - ) - if self.rights: - return self.rights.can_reply - return False diff --git a/pyrogram/types/inline_mode/inline_query_result_animation.py b/pyrogram/types/inline_mode/inline_query_result_animation.py index 3c0a168c6b..d5a58c5e90 100644 --- a/pyrogram/types/inline_mode/inline_query_result_animation.py +++ b/pyrogram/types/inline_mode/inline_query_result_animation.py @@ -104,35 +104,7 @@ def __init__( show_caption_above_media: bool = None, reply_markup: "types.InlineKeyboardMarkup" = None, input_message_content: "types.InputMessageContent" = None, - thumb_url: str = None, - thumb_mime_type: str = None, ): - if thumb_url and thumbnail_url: - raise ValueError( - "Parameters `thumb_url` and `thumbnail_url` are mutually " - "exclusive." - ) - - if thumb_url is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_url instead" - ) - thumbnail_url = thumb_url - - if thumb_mime_type and thumbnail_mime_type: - raise ValueError( - "Parameters `thumb_mime_type` and `thumbnail_mime_type` are mutually " - "exclusive." - ) - - if thumb_mime_type is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_mime_type instead" - ) - thumbnail_mime_type = thumb_mime_type - super().__init__("gif", id, input_message_content, reply_markup) self.animation_url = animation_url diff --git a/pyrogram/types/inline_mode/inline_query_result_article.py b/pyrogram/types/inline_mode/inline_query_result_article.py index fd6faaca14..5b9e3f24f1 100644 --- a/pyrogram/types/inline_mode/inline_query_result_article.py +++ b/pyrogram/types/inline_mode/inline_query_result_article.py @@ -71,49 +71,7 @@ def __init__( thumbnail_url: str = None, thumbnail_width: int = 0, thumbnail_height: int = 0, - thumb_url: str = None, - thumb_width: int = None, - thumb_height: int = None ): - if thumb_url and thumbnail_url: - raise ValueError( - "Parameters `thumb_url` and `thumbnail_url` are mutually " - "exclusive." - ) - - if thumb_url is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_url instead" - ) - thumbnail_url = thumb_url - - if thumb_width and thumbnail_width: - raise ValueError( - "Parameters `thumb_width` and `thumbnail_width` are mutually " - "exclusive." - ) - - if thumb_width is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_width instead" - ) - thumbnail_width = thumb_width - - if thumb_height and thumbnail_height: - raise ValueError( - "Parameters `thumb_height` and `thumbnail_height` are mutually " - "exclusive." - ) - - if thumb_height is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_height instead" - ) - thumbnail_height = thumb_height - super().__init__("article", id, input_message_content, reply_markup) self.title = title diff --git a/pyrogram/types/inline_mode/inline_query_result_contact.py b/pyrogram/types/inline_mode/inline_query_result_contact.py index 63c1bf3e39..6822af6a3f 100644 --- a/pyrogram/types/inline_mode/inline_query_result_contact.py +++ b/pyrogram/types/inline_mode/inline_query_result_contact.py @@ -77,49 +77,7 @@ def __init__( thumbnail_url: str = None, thumbnail_width: int = 0, thumbnail_height: int = 0, - thumb_url: str = None, - thumb_width: int = None, - thumb_height: int = None ): - if thumb_url and thumbnail_url: - raise ValueError( - "Parameters `thumb_url` and `thumbnail_url` are mutually " - "exclusive." - ) - - if thumb_url is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_url instead" - ) - thumbnail_url = thumb_url - - if thumb_width and thumbnail_width: - raise ValueError( - "Parameters `thumb_width` and `thumbnail_width` are mutually " - "exclusive." - ) - - if thumb_width is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_width instead" - ) - thumbnail_width = thumb_width - - if thumb_height and thumbnail_height: - raise ValueError( - "Parameters `thumb_height` and `thumbnail_height` are mutually " - "exclusive." - ) - - if thumb_height is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_height instead" - ) - thumbnail_height = thumb_height - super().__init__("contact", id, input_message_content, reply_markup) self.phone_number = phone_number diff --git a/pyrogram/types/inline_mode/inline_query_result_document.py b/pyrogram/types/inline_mode/inline_query_result_document.py index 7905c63d9c..dcfe41bf8e 100644 --- a/pyrogram/types/inline_mode/inline_query_result_document.py +++ b/pyrogram/types/inline_mode/inline_query_result_document.py @@ -92,49 +92,7 @@ def __init__( thumbnail_url: str = None, thumbnail_width: int = 0, thumbnail_height: int = 0, - thumb_url: str = None, - thumb_width: int = None, - thumb_height: int = None ): - if thumb_url and thumbnail_url: - raise ValueError( - "Parameters `thumb_url` and `thumbnail_url` are mutually " - "exclusive." - ) - - if thumb_url is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_url instead" - ) - thumbnail_url = thumb_url - - if thumb_width and thumbnail_width: - raise ValueError( - "Parameters `thumb_width` and `thumbnail_width` are mutually " - "exclusive." - ) - - if thumb_width is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_width instead" - ) - thumbnail_width = thumb_width - - if thumb_height and thumbnail_height: - raise ValueError( - "Parameters `thumb_height` and `thumbnail_height` are mutually " - "exclusive." - ) - - if thumb_height is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_height instead" - ) - thumbnail_height = thumb_height - super().__init__("file", id, input_message_content, reply_markup) self.document_url = document_url diff --git a/pyrogram/types/inline_mode/inline_query_result_location.py b/pyrogram/types/inline_mode/inline_query_result_location.py index 4bbe32f536..ab556ffbcd 100644 --- a/pyrogram/types/inline_mode/inline_query_result_location.py +++ b/pyrogram/types/inline_mode/inline_query_result_location.py @@ -91,49 +91,7 @@ def __init__( thumbnail_url: str = None, thumbnail_width: int = 0, thumbnail_height: int = 0, - thumb_url: str = None, - thumb_width: int = None, - thumb_height: int = None ): - if thumb_url and thumbnail_url: - raise ValueError( - "Parameters `thumb_url` and `thumbnail_url` are mutually " - "exclusive." - ) - - if thumb_url is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_url instead" - ) - thumbnail_url = thumb_url - - if thumb_width and thumbnail_width: - raise ValueError( - "Parameters `thumb_width` and `thumbnail_width` are mutually " - "exclusive." - ) - - if thumb_width is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_width instead" - ) - thumbnail_width = thumb_width - - if thumb_height and thumbnail_height: - raise ValueError( - "Parameters `thumb_height` and `thumbnail_height` are mutually " - "exclusive." - ) - - if thumb_height is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_height instead" - ) - thumbnail_height = thumb_height - super().__init__("location", id, input_message_content, reply_markup) self.title = title diff --git a/pyrogram/types/inline_mode/inline_query_result_photo.py b/pyrogram/types/inline_mode/inline_query_result_photo.py index 5699f9858a..cd5d0f9544 100644 --- a/pyrogram/types/inline_mode/inline_query_result_photo.py +++ b/pyrogram/types/inline_mode/inline_query_result_photo.py @@ -94,21 +94,7 @@ def __init__( show_caption_above_media: bool = None, reply_markup: "types.InlineKeyboardMarkup" = None, input_message_content: "types.InputMessageContent" = None, - thumb_url: str = None ): - if thumb_url and thumbnail_url: - raise ValueError( - "Parameters `thumb_url` and `thumbnail_url` are mutually " - "exclusive." - ) - - if thumb_url is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_url instead" - ) - thumbnail_url = thumb_url - super().__init__("photo", id, input_message_content, reply_markup) self.photo_url = photo_url diff --git a/pyrogram/types/inline_mode/inline_query_result_venue.py b/pyrogram/types/inline_mode/inline_query_result_venue.py index 1418d68f57..f2675690a5 100644 --- a/pyrogram/types/inline_mode/inline_query_result_venue.py +++ b/pyrogram/types/inline_mode/inline_query_result_venue.py @@ -92,49 +92,7 @@ def __init__( thumbnail_url: str = None, thumbnail_width: int = 0, thumbnail_height: int = 0, - thumb_url: str = None, - thumb_width: int = None, - thumb_height: int = None ): - if thumb_url and thumbnail_url: - raise ValueError( - "Parameters `thumb_url` and `thumbnail_url` are mutually " - "exclusive." - ) - - if thumb_url is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_url instead" - ) - thumbnail_url = thumb_url - - if thumb_width and thumbnail_width: - raise ValueError( - "Parameters `thumb_width` and `thumbnail_width` are mutually " - "exclusive." - ) - - if thumb_width is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_width instead" - ) - thumbnail_width = thumb_width - - if thumb_height and thumbnail_height: - raise ValueError( - "Parameters `thumb_height` and `thumbnail_height` are mutually " - "exclusive." - ) - - if thumb_height is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_height instead" - ) - thumbnail_height = thumb_height - super().__init__("venue", id, input_message_content, reply_markup) self.title = title diff --git a/pyrogram/types/inline_mode/inline_query_result_video.py b/pyrogram/types/inline_mode/inline_query_result_video.py index a17ff21cbe..b59820a9a6 100644 --- a/pyrogram/types/inline_mode/inline_query_result_video.py +++ b/pyrogram/types/inline_mode/inline_query_result_video.py @@ -107,21 +107,7 @@ def __init__( show_caption_above_media: bool = None, reply_markup: "types.InlineKeyboardMarkup" = None, input_message_content: "types.InputMessageContent" = None, - thumb_url: str = None, ): - if thumb_url and thumbnail_url: - raise ValueError( - "Parameters `thumb_url` and `thumbnail_url` are mutually " - "exclusive." - ) - - if thumb_url is not None: - log.warning( - "This property is deprecated. " - "Please use thumbnail_url instead" - ) - thumbnail_url = thumb_url - super().__init__("video", id, input_message_content, reply_markup) self.video_url = video_url diff --git a/pyrogram/types/input_message_content/input_text_message_content.py b/pyrogram/types/input_message_content/input_text_message_content.py index c4dfa97f21..fff3d9abf4 100644 --- a/pyrogram/types/input_message_content/input_text_message_content.py +++ b/pyrogram/types/input_message_content/input_text_message_content.py @@ -50,21 +50,7 @@ def __init__( parse_mode: Optional["enums.ParseMode"] = None, entities: list["types.MessageEntity"] = None, link_preview_options: "types.LinkPreviewOptions" = None, - disable_web_page_preview: bool = None ): - if disable_web_page_preview and link_preview_options: - raise ValueError( - "Parameters `disable_web_page_preview` and `link_preview_options` are mutually " - "exclusive." - ) - - if disable_web_page_preview is not None: - log.warning( - "This property is deprecated. " - "Please use link_preview_options instead" - ) - link_preview_options = types.LinkPreviewOptions(is_disabled=disable_web_page_preview) - super().__init__() self.message_text = message_text diff --git a/pyrogram/types/messages_and_media/message.py b/pyrogram/types/messages_and_media/message.py index 5245dff8dc..39f682c5e7 100644 --- a/pyrogram/types/messages_and_media/message.py +++ b/pyrogram/types/messages_and_media/message.py @@ -1559,8 +1559,6 @@ async def reply_text( ] = None, send_as: Union[int, str] = None, schedule_date: datetime = None, - disable_web_page_preview: bool = None, - reply_to_message_id: int = None ) -> "Message": """Bound method *reply_text* of :obj:`~pyrogram.types.Message`. @@ -1663,8 +1661,6 @@ async def reply_text( reply_parameters=reply_parameters, reply_markup=reply_markup, schedule_date=schedule_date, - disable_web_page_preview=disable_web_page_preview, - reply_to_message_id=reply_to_message_id ) reply = reply_text @@ -1698,7 +1694,6 @@ async def reply_animation( "types.ForceReply" ] = None, send_as: Union[int, str] = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> "Message": @@ -1867,7 +1862,6 @@ async def reply_animation( paid_message_star_count=(self and self.chat and self.chat.paid_message_star_count) or None, ttl_seconds=ttl_seconds, reply_markup=reply_markup, - reply_to_message_id=reply_to_message_id, progress=progress, progress_args=progress_args ) @@ -1897,7 +1891,6 @@ async def reply_audio( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> "Message": @@ -2048,7 +2041,6 @@ async def reply_audio( allow_paid_broadcast=allow_paid_broadcast, paid_message_star_count=(self and self.chat and self.chat.paid_message_star_count) or None, reply_markup=reply_markup, - reply_to_message_id=reply_to_message_id, progress=progress, progress_args=progress_args ) @@ -2073,7 +2065,6 @@ async def reply_cached_media( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None ) -> "Message": """Bound method *reply_cached_media* of :obj:`~pyrogram.types.Message`. @@ -2174,7 +2165,6 @@ async def reply_cached_media( protect_content=self.has_protected_content, has_spoiler=self.has_media_spoiler, reply_markup=reply_markup, - reply_to_message_id=reply_to_message_id ) async def reply_chat_action( @@ -2259,7 +2249,6 @@ async def reply_contact( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None ) -> "Message": """Bound method *reply_contact* of :obj:`~pyrogram.types.Message`. @@ -2357,7 +2346,6 @@ async def reply_contact( allow_paid_broadcast=allow_paid_broadcast, paid_message_star_count=(self and self.chat and self.chat.paid_message_star_count) or None, reply_markup=reply_markup, - reply_to_message_id=reply_to_message_id ) async def reply_document( @@ -2383,8 +2371,6 @@ async def reply_document( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None, - force_document: bool = None, progress: Callable = None, progress_args: tuple = () ) -> "Message": @@ -2530,8 +2516,6 @@ async def reply_document( allow_paid_broadcast=allow_paid_broadcast, paid_message_star_count=(self and self.chat and self.chat.paid_message_star_count) or None, reply_markup=reply_markup, - reply_to_message_id=reply_to_message_id, - force_document=force_document, progress=progress, progress_args=progress_args ) @@ -2552,7 +2536,6 @@ async def reply_game( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None ) -> "Message": """Bound method *reply_game* of :obj:`~pyrogram.types.Message`. @@ -2633,7 +2616,6 @@ async def reply_game( business_connection_id=self.business_connection_id, send_as=send_as, reply_markup=reply_markup, - reply_to_message_id=reply_to_message_id ) async def reply_inline_bot_result( @@ -2644,7 +2626,6 @@ async def reply_inline_bot_result( disable_notification: bool = None, reply_parameters: "types.ReplyParameters" = None, send_as: Union[int, str] = None, - reply_to_message_id: int = None ) -> "Message": """Bound method *reply_inline_bot_result* of :obj:`~pyrogram.types.Message`. @@ -2710,7 +2691,6 @@ async def reply_inline_bot_result( disable_notification=disable_notification, reply_parameters=reply_parameters, send_as=send_as, - reply_to_message_id=reply_to_message_id ) async def reply_location( @@ -2733,7 +2713,6 @@ async def reply_location( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None ) -> "Message": """Bound method *reply_location* of :obj:`~pyrogram.types.Message`. @@ -2827,7 +2806,6 @@ async def reply_location( allow_paid_broadcast=allow_paid_broadcast, paid_message_star_count=(self and self.chat and self.chat.paid_message_star_count) or None, reply_markup=reply_markup, - reply_to_message_id=reply_to_message_id ) async def reply_media_group( @@ -2841,7 +2819,6 @@ async def reply_media_group( schedule_date: datetime = None, protect_content: bool = None, allow_paid_broadcast: bool = None, - reply_to_message_id: int = None ) -> list["types.Message"]: """Bound method *reply_media_group* of :obj:`~pyrogram.types.Message`. @@ -2924,7 +2901,6 @@ async def reply_media_group( protect_content=protect_content, allow_paid_broadcast=allow_paid_broadcast, paid_message_star_count=(self and self.chat and self.chat.paid_message_star_count) or None, - reply_to_message_id=reply_to_message_id ) async def reply_photo( @@ -2951,7 +2927,6 @@ async def reply_photo( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> "Message": @@ -3099,7 +3074,6 @@ async def reply_photo( paid_message_star_count=(self and self.chat and self.chat.paid_message_star_count) or None, view_once=view_once, reply_markup=reply_markup, - reply_to_message_id=reply_to_message_id, progress=progress, progress_args=progress_args ) @@ -3134,7 +3108,6 @@ async def reply_poll( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None ) -> "Message": """Bound method *reply_poll* of :obj:`~pyrogram.types.Message`. @@ -3294,7 +3267,6 @@ async def reply_poll( business_connection_id=self.business_connection_id, send_as=send_as, schedule_date=schedule_date, - reply_to_message_id=reply_to_message_id, reply_markup=reply_markup ) @@ -3319,7 +3291,6 @@ async def reply_sticker( ] = None, send_as: Union[int, str] = None, schedule_date: datetime = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> "Message": @@ -3450,7 +3421,6 @@ async def reply_sticker( reply_parameters=reply_parameters, reply_markup=reply_markup, schedule_date=schedule_date, - reply_to_message_id=reply_to_message_id, progress=progress, progress_args=progress_args ) @@ -3478,7 +3448,6 @@ async def reply_venue( "types.ReplyKeyboardRemove", "types.ForceReply" ] = None, - reply_to_message_id: int = None ) -> "Message": """Bound method *reply_venue* of :obj:`~pyrogram.types.Message`. @@ -3586,7 +3555,6 @@ async def reply_venue( protect_content=protect_content, allow_paid_broadcast=allow_paid_broadcast, paid_message_star_count=(self and self.chat and self.chat.paid_message_star_count) or None, - reply_to_message_id=reply_to_message_id, reply_markup=reply_markup ) @@ -3623,7 +3591,6 @@ async def reply_video( mime_type: str = None, send_as: Union[int, str] = None, schedule_date: datetime = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> "Message": @@ -3808,7 +3775,6 @@ async def reply_video( file_name=file_name, mime_type=mime_type, schedule_date=schedule_date, - reply_to_message_id=reply_to_message_id, progress=progress, progress_args=progress_args ) @@ -3838,7 +3804,6 @@ async def reply_video_note( schedule_date: datetime = None, ttl_seconds: int = None, view_once: bool = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> "Message": @@ -3989,7 +3954,6 @@ async def reply_video_note( schedule_date=schedule_date, ttl_seconds=ttl_seconds, view_once=view_once, - reply_to_message_id=reply_to_message_id, progress=progress, progress_args=progress_args ) @@ -4018,7 +3982,6 @@ async def reply_voice( ttl_seconds: int = None, view_once: bool = None, waveform: bytes = None, - reply_to_message_id: int = None, progress: Callable = None, progress_args: tuple = () ) -> "Message": @@ -4162,7 +4125,6 @@ async def reply_voice( ttl_seconds=ttl_seconds, view_once=view_once, waveform=waveform, - reply_to_message_id=reply_to_message_id, progress=progress, progress_args=progress_args ) @@ -4377,7 +4339,6 @@ async def edit_text( entities: list["types.MessageEntity"] = None, link_preview_options: "types.LinkPreviewOptions" = None, reply_markup: "types.InlineKeyboardMarkup" = None, - disable_web_page_preview: bool = None ) -> "Message": """Bound method *edit_text* of :obj:`~pyrogram.types.Message`. @@ -4431,7 +4392,6 @@ async def edit_text( link_preview_options=link_preview_options, reply_markup=reply_markup, business_connection_id=self.business_connection_id, - disable_web_page_preview=disable_web_page_preview ) edit = edit_text @@ -4756,7 +4716,6 @@ async def copy( allow_paid_broadcast: bool = None, paid_message_star_count: int = None, message_thread_id: int = None, - reply_to_message_id: int = None ) -> Union["types.Message", list["types.Message"]]: """Bound method *copy* of :obj:`~pyrogram.types.Message`. @@ -4876,7 +4835,6 @@ async def copy( message_effect_id=self.effect_id, reply_parameters=reply_parameters, reply_markup=self.reply_markup if reply_markup is object else reply_markup, - reply_to_message_id=reply_to_message_id, send_as=send_as, schedule_date=schedule_date ) @@ -4895,7 +4853,6 @@ async def copy( allow_paid_broadcast=allow_paid_broadcast, paid_message_star_count=paid_message_star_count, has_spoiler=self.has_media_spoiler, - reply_to_message_id=reply_to_message_id, send_as=send_as, reply_markup=self.reply_markup if reply_markup is object else reply_markup ) @@ -4931,7 +4888,6 @@ async def copy( reply_markup=self.reply_markup if reply_markup is object else reply_markup, # TODO schedule_date=schedule_date, - reply_to_message_id=reply_to_message_id ) elif self.animation: file_id = self.animation.file_id @@ -4957,7 +4913,6 @@ async def copy( protect_content=self.has_protected_content if protect_content is None else protect_content, allow_paid_broadcast=allow_paid_broadcast, paid_message_star_count=paid_message_star_count, - reply_to_message_id=reply_to_message_id, send_as=send_as, reply_markup=self.reply_markup if reply_markup is object else reply_markup ) @@ -4975,7 +4930,6 @@ async def copy( protect_content=self.has_protected_content if protect_content is None else protect_content, allow_paid_broadcast=allow_paid_broadcast, paid_message_star_count=paid_message_star_count, - reply_to_message_id=reply_to_message_id, send_as=send_as, reply_markup=self.reply_markup if reply_markup is object else reply_markup ) @@ -4997,7 +4951,6 @@ async def copy( protect_content=self.has_protected_content if protect_content is None else protect_content, allow_paid_broadcast=allow_paid_broadcast, paid_message_star_count=paid_message_star_count, - reply_to_message_id=reply_to_message_id, send_as=send_as, reply_markup=self.reply_markup if reply_markup is object else reply_markup ) @@ -5029,7 +4982,6 @@ async def copy( message_thread_id=self.message_thread_id if message_thread_id is None else message_thread_id, business_connection_id=self.business_connection_id if business_connection_id is None else business_connection_id, schedule_date=schedule_date, - reply_to_message_id=reply_to_message_id, send_as=send_as, reply_markup=self.reply_markup if reply_markup is object else reply_markup ) @@ -5045,7 +4997,6 @@ async def copy( business_connection_id=self.business_connection_id if business_connection_id is None else business_connection_id, message_effect_id=self.effect_id, reply_parameters=reply_parameters, - reply_to_message_id=reply_to_message_id, send_as=send_as, reply_markup=self.reply_markup if reply_markup is object else reply_markup ) @@ -5621,66 +5572,6 @@ async def unpin(self) -> bool: message_id=self.id ) - # BEGIN: the below properties were removed in `BOT API 7.0 `_ - - @property - def forward_from(self) -> "types.User": - log.warning( - "This property is deprecated. " - "Please use forward_origin instead" - ) - return getattr(self.forward_origin, "sender_user", None) - - @property - def forward_sender_name(self) -> str: - log.warning( - "This property is deprecated. " - "Please use forward_origin instead" - ) - return getattr(self.forward_origin, "sender_user_name", None) - - @property - def forward_from_chat(self) -> "types.Chat": - log.warning( - "This property is deprecated. " - "Please use forward_origin instead" - ) - return getattr( - self.forward_origin, - "chat", - getattr( - self.forward_origin, - "sender_chat", - None - ) - ) - - @property - def forward_from_message_id(self) -> int: - log.warning( - "This property is deprecated. " - "Please use forward_origin instead" - ) - return getattr(self.forward_origin, "message_id", None) - - @property - def forward_signature(self) -> str: - log.warning( - "This property is deprecated. " - "Please use forward_origin instead" - ) - return getattr(self.forward_origin, "author_signature", None) - - @property - def forward_date(self) -> datetime: - log.warning( - "This property is deprecated. " - "Please use forward_origin instead" - ) - return getattr(self.forward_origin, "date", None) - - # END: the below properties were removed in `BOT API 7.0 `_ - async def read(self) -> bool: """Bound method *read* of :obj:`~pyrogram.types.Message`. diff --git a/pyrogram/types/messages_and_media/photo.py b/pyrogram/types/messages_and_media/photo.py index 5665c6c7ca..a877e9490a 100644 --- a/pyrogram/types/messages_and_media/photo.py +++ b/pyrogram/types/messages_and_media/photo.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU Lesser General Public License # along with Pyrogram. If not, see . -import logging from datetime import datetime import pyrogram @@ -25,8 +24,6 @@ from pyrogram.file_id import FileId, FileType, FileUniqueId, FileUniqueType, ThumbnailSource from ..object import Object -log = logging.getLogger(__name__) - class Photo(Object): """A Photo. @@ -121,53 +118,3 @@ def _parse( thumbs=types.Thumbnail._parse(client, photo), client=client ) - - @property - def file_id(self) -> str: - log.warning( - "This property is deprecated. " - "Please use sizes instead" - ) - if len(self.sizes) > 0: - return self.sizes[-1].file_id - return None - - @property - def file_unique_id(self) -> str: - log.warning( - "This property is deprecated. " - "Please use sizes instead" - ) - if len(self.sizes) > 0: - return self.sizes[-1].file_unique_id - return None - - @property - def width(self) -> int: - log.warning( - "This property is deprecated. " - "Please use sizes instead" - ) - if len(self.sizes) > 0: - return self.sizes[-1].width - return None - - @property - def height(self) -> int: - log.warning( - "This property is deprecated. " - "Please use sizes instead" - ) - if len(self.sizes) > 0: - return self.sizes[-1].height - return None - - @property - def file_size(self) -> int: - log.warning( - "This property is deprecated. " - "Please use sizes instead" - ) - if len(self.sizes) > 0: - return self.sizes[-1].file_size - return None