Revert "Add business_connection_id parameter in"

This reverts commit 4d6fb40. Signed-off-by: wulan17 <wulan17@nusantararom.org>
Mayuri-Chan · Jul 14, 2024 · c452f31 · c452f31
1 parent 181f47f
commit c452f31
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 216 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -20,18 +20,16 @@
 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:
     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])