feat - adding reply on send image

open-news-brasil · Oct 4, 2024 · 4c7a343 · 4c7a343
1 parent 4d06bc0
commit 4c7a343
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/function/telegram/message.py b/function/telegram/message.py
@@ -21,9 +21,7 @@ def __init__(self, message: Message):
 
     @cached_property
     def _album_images(self) -> list[str]:
-        if len(self.message.images) > 1:
-            return self.message.images[1 : TELEGRAM_MAX_ALBUM_QUANTITY + 1]
-        return []
+        return self.message.images[1 : TELEGRAM_MAX_ALBUM_QUANTITY + 1]
 
     @cached_property
     def _album_caption(self) -> str:
@@ -87,9 +85,7 @@ def chat_id(self) -> str:
 
     @cached_property
     def image(self) -> str | None:
-        if len(self.message.images) == 1:
-            return self.message.images[0]
-        return None
+        return self.message.images[0]
 
     @cached_property
     def album(self) -> list[InputMediaPhoto]:

diff --git a/function/telegram/sender.py b/function/telegram/sender.py
@@ -67,13 +67,16 @@ async def _send_message(
             reply_markup=message.buttons,
         )
 
-    async def _send_image(self, client: Client, message: TelegramMessage):
+    async def _send_image(
+        self, client: Client, message: TelegramMessage, reply_to: int | None = None
+    ):
         try:
             await client.send_photo(
                 chat_id=message.chat_id,
                 photo=message.image,  # type: ignore
                 caption=message.content,
                 parse_mode=ParseMode.MARKDOWN,
+                reply_to_message_id=reply_to,  # type: ignore
                 reply_markup=message.buttons,
             )
 
@@ -82,7 +85,7 @@ async def _send_image(self, client: Client, message: TelegramMessage):
 
         except BadRequest as exc:
             self.logger.warning(str(exc))
-            await self._send_message(client, message)
+            await self._send_message(client, message, reply_to)
 
     async def _send_album(self, client: Client, message: TelegramMessage) -> int:
         sent_messages = await client.send_media_group(
@@ -100,7 +103,9 @@ async def send(self, message: TelegramMessage):
                 reply_to = await self._token_rotation(self._send_album, message=message)
 
             if message.image:
-                await self._token_rotation(self._send_image, message=message)
+                await self._token_rotation(
+                    self._send_image, message=message, reply_to=reply_to
+                )
 
             else:
                 await self._token_rotation(