From c452f31dc3612ce59ab81af8645a77c52d51925d Mon Sep 17 00:00:00 2001 From: wulan17 Date: Sun, 14 Jul 2024 19:49:40 +0700 Subject: [PATCH] Revert "Add business_connection_id parameter in" This reverts commit 4d6fb409b83fface5e925597995e338e1d7d136d. Signed-off-by: wulan17 --- .../methods/messages/edit_message_caption.py | 9 +-- .../methods/messages/edit_message_media.py | 61 ++++-------------- .../messages/edit_message_reply_markup.py | 62 +++---------------- .../methods/messages/edit_message_text.py | 57 +++-------------- pyrogram/methods/messages/stop_poll.py | 57 +++++------------ .../bots_and_keyboards/callback_query.py | 9 +-- pyrogram/types/messages_and_media/message.py | 9 +-- pyrogram/types/messages_and_media/poll.py | 9 +-- 8 files changed, 57 insertions(+), 216 deletions(-) diff --git a/pyrogram/methods/messages/edit_message_caption.py b/pyrogram/methods/messages/edit_message_caption.py index 25f063666..a902b03aa 100644 --- a/pyrogram/methods/messages/edit_message_caption.py +++ b/pyrogram/methods/messages/edit_message_caption.py @@ -32,8 +32,7 @@ async def edit_message_caption( parse_mode: Optional["enums.ParseMode"] = None, caption_entities: List["types.MessageEntity"] = None, invert_media: bool = False, - reply_markup: "types.InlineKeyboardMarkup" = None, - business_connection_id: str = None + reply_markup: "types.InlineKeyboardMarkup" = None ) -> "types.Message": """Edit the caption of media messages. @@ -65,9 +64,6 @@ async def edit_message_caption( reply_markup (:obj:`~pyrogram.types.InlineKeyboardMarkup`, *optional*): An InlineKeyboardMarkup object. - business_connection_id (``str``, *optional*): - Unique identifier of the business connection on behalf of which the message to be edited was sent - Returns: :obj:`~pyrogram.types.Message`: On success, the edited message is returned. @@ -83,6 +79,5 @@ async def edit_message_caption( parse_mode=parse_mode, entities=caption_entities, invert_media=invert_media, - reply_markup=reply_markup, - business_connection_id=business_connection_id + reply_markup=reply_markup ) diff --git a/pyrogram/methods/messages/edit_message_media.py b/pyrogram/methods/messages/edit_message_media.py index d14fcff7e..e15218e4e 100644 --- a/pyrogram/methods/messages/edit_message_media.py +++ b/pyrogram/methods/messages/edit_message_media.py @@ -28,8 +28,6 @@ from pyrogram import utils from pyrogram.file_id import FileType -from .inline_session import get_session - class EditMessageMedia: async def edit_message_media( @@ -39,8 +37,7 @@ async def edit_message_media( media: "types.InputMedia", reply_markup: "types.InlineKeyboardMarkup" = None, file_name: str = None, - invert_media: bool = False, - business_connection_id: str = None + invert_media: bool = False ) -> "types.Message": """Edit animation, audio, document, photo or video messages. @@ -72,9 +69,6 @@ async def edit_message_media( invert_media (``bool``, *optional*): Inverts the position of the media and caption. - business_connection_id (``str``, *optional*): - Unique identifier of the business connection on behalf of which the message to be edited was sent - Returns: :obj:`~pyrogram.types.Message`: On success, the edited message is returned. @@ -279,35 +273,17 @@ async def edit_message_media( else: media = utils.get_input_media_from_file_id(media.media, FileType.DOCUMENT) - rpc = raw.functions.messages.EditMessage( - peer=await self.resolve_peer(chat_id), - id=message_id, - media=media, - reply_markup=await reply_markup.write(self) if reply_markup else None, - message=message, - entities=entities, - invert_media=invert_media - ) - session = None - business_connection = None - if business_connection_id: - business_connection = self.business_user_connection_cache[business_connection_id] - if not business_connection: - business_connection = await self.get_business_connection(business_connection_id) - session = await get_session( - self, - business_connection._raw.connection.dc_id - ) - if business_connection_id: - r = await session.invoke( - raw.functions.InvokeWithBusinessConnection( - query=rpc, - connection_id=business_connection_id - ) + r = await self.invoke( + raw.functions.messages.EditMessage( + peer=await self.resolve_peer(chat_id), + id=message_id, + media=media, + reply_markup=await reply_markup.write(self) if reply_markup else None, + message=message, + entities=entities, + invert_media=invert_media ) - # await session.stop() - else: - r = await self.invoke(rpc) + ) for i in r.updates: if isinstance(i, (raw.types.UpdateEditMessage, raw.types.UpdateEditChannelMessage)): @@ -316,18 +292,3 @@ async def edit_message_media( {i.id: i for i in r.users}, {i.id: i for i in r.chats} ) - elif isinstance( - i, - ( - raw.types.UpdateBotEditBusinessMessage - ) - ): - return await types.Message._parse( - self, - i.message, - {i.id: i for i in r.users}, - {i.id: i for i in r.chats}, - business_connection_id=getattr(i, "connection_id", business_connection_id), - raw_reply_to_message=i.reply_to_message, - replies=0 - ) diff --git a/pyrogram/methods/messages/edit_message_reply_markup.py b/pyrogram/methods/messages/edit_message_reply_markup.py index 43717478d..c2c70da85 100644 --- a/pyrogram/methods/messages/edit_message_reply_markup.py +++ b/pyrogram/methods/messages/edit_message_reply_markup.py @@ -20,9 +20,8 @@ from typing import Union import pyrogram -from pyrogram import raw, types - -from .inline_session import get_session +from pyrogram import raw +from pyrogram import types class EditMessageReplyMarkup: @@ -31,7 +30,6 @@ async def edit_message_reply_markup( chat_id: Union[int, str], message_id: int, reply_markup: "types.InlineKeyboardMarkup" = None, - business_connection_id: str = None ) -> "types.Message": """Edit only the reply markup of messages sent by the bot. @@ -50,9 +48,6 @@ async def edit_message_reply_markup( reply_markup (:obj:`~pyrogram.types.InlineKeyboardMarkup`, *optional*): An InlineKeyboardMarkup object. - business_connection_id (``str``, *optional*): - Unique identifier of the business connection on behalf of which the message to be edited was sent - Returns: :obj:`~pyrogram.types.Message`: On success, the edited message is returned. @@ -67,57 +62,18 @@ async def edit_message_reply_markup( InlineKeyboardMarkup([[ InlineKeyboardButton("New button", callback_data="new_data")]])) """ - rpc = raw.functions.messages.EditMessage( - peer=await self.resolve_peer(chat_id), - id=message_id, - reply_markup=await reply_markup.write(self) if reply_markup else None, - ) - session = None - business_connection = None - if business_connection_id: - business_connection = self.business_user_connection_cache[business_connection_id] - if not business_connection: - business_connection = await self.get_business_connection(business_connection_id) - session = await get_session( - self, - business_connection._raw.connection.dc_id + r = await self.invoke( + raw.functions.messages.EditMessage( + peer=await self.resolve_peer(chat_id), + id=message_id, + reply_markup=await reply_markup.write(self) if reply_markup else None, ) - if business_connection_id: - r = await session.invoke( - raw.functions.InvokeWithBusinessConnection( - query=rpc, - connection_id=business_connection_id - ) - ) - # await session.stop() - else: - r = await self.invoke(rpc) + ) for i in r.updates: - if isinstance( - i, - ( - raw.types.UpdateEditMessage, - raw.types.UpdateEditChannelMessage - ) - ): + if isinstance(i, (raw.types.UpdateEditMessage, raw.types.UpdateEditChannelMessage)): return await types.Message._parse( self, i.message, {i.id: i for i in r.users}, {i.id: i for i in r.chats} ) - elif isinstance( - i, - ( - raw.types.UpdateBotEditBusinessMessage - ) - ): - return await types.Message._parse( - self, - i.message, - {i.id: i for i in r.users}, - {i.id: i for i in r.chats}, - business_connection_id=getattr(i, "connection_id", business_connection_id), - raw_reply_to_message=i.reply_to_message, - replies=0 - ) diff --git a/pyrogram/methods/messages/edit_message_text.py b/pyrogram/methods/messages/edit_message_text.py index bc0a30df8..cf5eb72f6 100644 --- a/pyrogram/methods/messages/edit_message_text.py +++ b/pyrogram/methods/messages/edit_message_text.py @@ -35,8 +35,7 @@ async def edit_message_text( entities: List["types.MessageEntity"] = None, disable_web_page_preview: bool = None, invert_media: bool = None, - reply_markup: "types.InlineKeyboardMarkup" = None, - business_connection_id: str = None + reply_markup: "types.InlineKeyboardMarkup" = None ) -> "types.Message": """Edit the text of messages. @@ -71,9 +70,6 @@ async def edit_message_text( reply_markup (:obj:`~pyrogram.types.InlineKeyboardMarkup`, *optional*): An InlineKeyboardMarkup object. - business_connection_id (``str``, *optional*): - Unique identifier of the business connection on behalf of which the message to be edited was sent - Returns: :obj:`~pyrogram.types.Message`: On success, the edited message is returned. @@ -89,34 +85,16 @@ async def edit_message_text( disable_web_page_preview=True) """ - rpc = raw.functions.messages.EditMessage( - peer=await self.resolve_peer(chat_id), - id=message_id, - no_webpage=disable_web_page_preview or None, - invert_media=invert_media, - reply_markup=await reply_markup.write(self) if reply_markup else None, - **await utils.parse_text_entities(self, text, parse_mode, entities) - ) - session = None - business_connection = None - if business_connection_id: - business_connection = self.business_user_connection_cache[business_connection_id] - if not business_connection: - business_connection = await self.get_business_connection(business_connection_id) - session = await get_session( - self, - business_connection._raw.connection.dc_id + r = await self.invoke( + raw.functions.messages.EditMessage( + peer=await self.resolve_peer(chat_id), + id=message_id, + no_webpage=disable_web_page_preview or None, + invert_media=invert_media, + reply_markup=await reply_markup.write(self) if reply_markup else None, + **await utils.parse_text_entities(self, text, parse_mode, entities) ) - if business_connection_id: - r = await session.invoke( - raw.functions.InvokeWithBusinessConnection( - query=rpc, - connection_id=business_connection_id - ) - ) - # await session.stop() - else: - r = await self.invoke(rpc) + ) for i in r.updates: if isinstance(i, (raw.types.UpdateEditMessage, raw.types.UpdateEditChannelMessage)): @@ -125,18 +103,3 @@ async def edit_message_text( {i.id: i for i in r.users}, {i.id: i for i in r.chats} ) - elif isinstance( - i, - ( - raw.types.UpdateBotEditBusinessMessage - ) - ): - return await types.Message._parse( - self, - i.message, - {i.id: i for i in r.users}, - {i.id: i for i in r.chats}, - business_connection_id=getattr(i, "connection_id", business_connection_id), - raw_reply_to_message=i.reply_to_message, - replies=0 - ) diff --git a/pyrogram/methods/messages/stop_poll.py b/pyrogram/methods/messages/stop_poll.py index c95ec0b5f..7c3b32e3e 100644 --- a/pyrogram/methods/messages/stop_poll.py +++ b/pyrogram/methods/messages/stop_poll.py @@ -20,9 +20,8 @@ from typing import Union import pyrogram -from pyrogram import raw, types - -from .inline_session import get_session +from pyrogram import raw +from pyrogram import types class StopPoll: @@ -30,8 +29,7 @@ async def stop_poll( self: "pyrogram.Client", chat_id: Union[int, str], message_id: int, - reply_markup: "types.InlineKeyboardMarkup" = None, - business_connection_id: str = None + reply_markup: "types.InlineKeyboardMarkup" = None ) -> "types.Poll": """Stop a poll which was sent by you. @@ -52,9 +50,6 @@ async def stop_poll( reply_markup (:obj:`~pyrogram.types.InlineKeyboardMarkup`, *optional*): An InlineKeyboardMarkup object. - business_connection_id (``str``, *optional*): - Unique identifier of the business connection on behalf of which the message to be edited was sent - Returns: :obj:`~pyrogram.types.Poll`: On success, the stopped poll with the final results is returned. @@ -65,38 +60,20 @@ async def stop_poll( """ poll = (await self.get_messages(chat_id, message_id)).poll - rpc = raw.functions.messages.EditMessage( - peer=await self.resolve_peer(chat_id), - id=message_id, - media=raw.types.InputMediaPoll( - poll=raw.types.Poll( - id=int(poll.id), - closed=True, - question="", - answers=[] - ) - ), - reply_markup=await reply_markup.write(self) if reply_markup else None - ) - session = None - business_connection = None - if business_connection_id: - business_connection = self.business_user_connection_cache[business_connection_id] - if not business_connection: - business_connection = await self.get_business_connection(business_connection_id) - session = await get_session( - self, - business_connection._raw.connection.dc_id + r = await self.invoke( + raw.functions.messages.EditMessage( + peer=await self.resolve_peer(chat_id), + id=message_id, + media=raw.types.InputMediaPoll( + poll=raw.types.Poll( + id=int(poll.id), + closed=True, + question="", + answers=[] + ) + ), + reply_markup=await reply_markup.write(self) if reply_markup else None ) - if business_connection_id: - r = await session.invoke( - raw.functions.InvokeWithBusinessConnection( - query=rpc, - connection_id=business_connection_id - ) - ) - # await session.stop() - else: - r = await self.invoke(rpc) + ) return types.Poll._parse(self, r.updates[0]) diff --git a/pyrogram/types/bots_and_keyboards/callback_query.py b/pyrogram/types/bots_and_keyboards/callback_query.py index c1ac0d6c3..9b110fa1e 100644 --- a/pyrogram/types/bots_and_keyboards/callback_query.py +++ b/pyrogram/types/bots_and_keyboards/callback_query.py @@ -215,8 +215,7 @@ async def edit_message_text( text=text, parse_mode=parse_mode, disable_web_page_preview=disable_web_page_preview, - reply_markup=reply_markup, - business_connection_id=self.message.business_connection_id + reply_markup=reply_markup ) else: return await self._client.edit_inline_text( @@ -285,8 +284,7 @@ async def edit_message_media( chat_id=self.message.chat.id, message_id=self.message.id, media=media, - reply_markup=reply_markup, - business_connection_id=self.message.business_connection_id + reply_markup=reply_markup ) else: return await self._client.edit_inline_media( @@ -318,8 +316,7 @@ async def edit_message_reply_markup( return await self._client.edit_message_reply_markup( chat_id=self.message.chat.id, message_id=self.message.id, - reply_markup=reply_markup, - business_connection_id=self.message.business_connection_id, + reply_markup=reply_markup ) else: return await self._client.edit_inline_reply_markup( diff --git a/pyrogram/types/messages_and_media/message.py b/pyrogram/types/messages_and_media/message.py index f1b56b371..f797fcbd7 100644 --- a/pyrogram/types/messages_and_media/message.py +++ b/pyrogram/types/messages_and_media/message.py @@ -4121,8 +4121,7 @@ async def edit_text( entities=entities, disable_web_page_preview=disable_web_page_preview, invert_media=invert_media, - reply_markup=reply_markup, - business_connection_id=self.business_connection_id + reply_markup=reply_markup ) edit = edit_text @@ -4229,8 +4228,7 @@ async def edit_media( message_id=self.id, media=media, invert_media=invert_media, - reply_markup=reply_markup, - business_connection_id=self.business_connection_id + reply_markup=reply_markup ) async def edit_reply_markup(self, reply_markup: "types.InlineKeyboardMarkup" = None) -> "Message": @@ -4265,8 +4263,7 @@ async def edit_reply_markup(self, reply_markup: "types.InlineKeyboardMarkup" = N return await self._client.edit_message_reply_markup( chat_id=self.chat.id, message_id=self.id, - reply_markup=reply_markup, - business_connection_id=self.business_connection_id + reply_markup=reply_markup ) async def forward( diff --git a/pyrogram/types/messages_and_media/poll.py b/pyrogram/types/messages_and_media/poll.py index 5c04cc791..001a9d8ef 100644 --- a/pyrogram/types/messages_and_media/poll.py +++ b/pyrogram/types/messages_and_media/poll.py @@ -218,8 +218,7 @@ def _parse_update(client, update: "raw.types.UpdateMessagePoll"): async def stop( self, - reply_markup: "types.InlineKeyboardMarkup" = None, - business_connection_id: str = None + reply_markup: "types.InlineKeyboardMarkup" = None ) -> "types.Poll": """Bound method *stop* of :obj:`~pyrogram.types.Poll`. @@ -236,9 +235,6 @@ async def stop( reply_markup (:obj:`~pyrogram.types.InlineKeyboardMarkup`, *optional*): An InlineKeyboardMarkup object. - business_connection_id (``str``, *optional*): - Unique identifier of the business connection on behalf of which the message to be edited was sent - Example: .. code-block:: python @@ -254,6 +250,5 @@ async def stop( return await self._client.stop_poll( chat_id=self.chat.id, message_id=self.id, - reply_markup=reply_markup, - business_connection_id=business_connection_id + reply_markup=reply_markup )