Merge branch 'master' into dev-1.2.0

Author: tb-sourse

examples/add_big_list_users_to_channel.py

@@ -0,0 +1,48 @@
+from trueconf import Bot
+from trueconf.exceptions import ApiErrorException
+import asyncio
+import logging
+from pathlib import Path
+
+SERVER_ADDR = ""
+BOT_USERNAME = ""
+BOT_PASSWORD = ""
+PATH_LIST_USERS = ""
+CHANNEL_NAME = ""
+
+bot = Bot.from_credentials(
+    server=SERVER_ADDR,
+    username=BOT_USERNAME,
+    password=BOT_PASSWORD,
+    verify_ssl=False,
+)
+
+Path("logs").mkdir(parents=True, exist_ok=True)
+
+logging.basicConfig(
+    level=logging.DEBUG,
+    format="%(asctime)s [%(levelname)s] %(name)s: %(message)s",
+    filename="logs/bot.log",
+    encoding="utf-8",
+)
+
+async def main():
+    await bot.start()
+    await bot.connected_event.wait()
+    await bot.authorized_event.wait()
+
+    resp = await bot.create_channel(title=CHANNEL_NAME)
+    with open(PATH_LIST_USERS, "r") as file:
+        for line in file:
+            user_id = line.strip()
+            if user_id:
+                try:
+                    await bot.add_participant_to_chat(resp.chat_id, user_id=user_id, display_history=True)
+                except ApiErrorException as e:
+                    if e.code == 309:
+                        continue
+
+    await bot.shutdown()
+
+if __name__ == "__main__":
+    asyncio.run(main())

trueconf/client/bot.py

@@ -7,6 +7,7 @@
 import ssl
 import tempfile
 import websockets
+import warnings
 from pathlib import Path
 from aiohttp import ClientSession, ClientTimeout, TCPConnector, FormData
 from async_property import async_cached_property
@@ -348,7 +349,7 @@ async def __upload_file_to_server(
             preview: InputFile | None = None,
             is_sticker: bool = False,
             timeout: int = 60,
-    ) -> str | None:
+    ) -> str:
         """
            Uploads a file to the server and returns a temporary file identifier (temporalFileId).
 
@@ -401,7 +402,7 @@ async def __upload_file_to_server(
 
         try:
             async with ClientSession(connector=connector, timeout=timeout) as session:
-                data = FormData()
+                data = FormData(quote_fields=False)
                 data.add_field(
                     name="file",
                     value= await file.read(),
@@ -436,7 +437,13 @@ async def _send_ws_payload(self, message: dict) -> bool:
             return False
 
     async def __connect_and_listen(self):
-        ssl_context = ssl._create_unverified_context() if self.https else None
+        ssl_context = None
+        if self.https:
+            if self.verify_ssl:
+                ssl_context = ssl.create_default_context()
+            else:
+                ssl_context = ssl._create_unverified_context()
+
         uri = f"wss://{self.server}:{self.web_port}/websocket/chat_bot" if self.https else f"ws://{self.server}:{self.web_port}/websocket/chat_bot"
 
         while not self._stop:
@@ -1172,6 +1179,12 @@ async def reply_message(
             SendMessageResponse: Object containing the result of the message delivery.
         """
 
+        warnings.warn(
+            "reply_message is deprecated, use send_message(..., reply_message_id=...) instead",
+            DeprecationWarning,
+            stacklevel=2
+        )
+
         call = SendMessage(
             chat_id=chat_id,
             reply_message_id=message_id,
@@ -1216,6 +1229,7 @@ async def send_document(
             file: InputFile,
             caption: str | None = None,
             parse_mode: ParseMode | str = ParseMode.TEXT,
+            reply_message_id: str | None = None
     ) -> SendFileResponse:
         """
         Sends a document or any arbitrary file to the specified chat.
@@ -1232,6 +1246,7 @@ async def send_document(
             file (InputFile): The file to be uploaded. Must be a subclass of `InputFile`.
             caption (str | None): Optional caption text to be sent with the file.
             parse_mode (ParseMode | str): Text formatting mode (e.g., Markdown, HTML, or plain text).
+            reply_message_id (str, optional): Optional identifier of the message to which this message is a reply.
 
         Returns:
             SendFileResponse: An object containing the result of the file upload.
@@ -1253,14 +1268,21 @@ async def send_document(
             file=file,
         )
 
-        call = SendFile(chat_id=chat_id, temporal_file_id=temporal_file_id, text=caption, parse_mode=parse_mode)
+        call = SendFile(
+            chat_id=chat_id,
+            temporal_file_id=temporal_file_id,
+            text=caption,
+            parse_mode=parse_mode,
+            reply_message_id=reply_message_id
+        )
         return await self(call)
 
     async def send_message(
             self,
             chat_id: str,
             text: str,
-            parse_mode: ParseMode | str = ParseMode.TEXT
+            parse_mode: ParseMode | str = ParseMode.TEXT,
+            reply_message_id: str | None = None
     ) -> SendMessageResponse:
         """
         Sends a message to the specified chat.
@@ -1273,13 +1295,19 @@ async def send_message(
             text (str): Text content of the message.
             parse_mode (ParseMode | str, optional): Text formatting mode.
                 Defaults to plain text.
+            reply_message_id (str, optional): Optional identifier of the message to which this message is a reply.
 
         Returns:
             SendMessageResponse: Object containing the result of the message delivery.
         """
 
         loggers.chatbot.info(f"✉️ Sending message to {chat_id}")
-        call = SendMessage(chat_id=chat_id, text=text, parse_mode=parse_mode)
+        call = SendMessage(
+            chat_id=chat_id,
+            text=text,
+            parse_mode=parse_mode,
+            reply_message_id=reply_message_id
+        )
         return await self(call)
 
     async def send_photo(
@@ -1288,7 +1316,8 @@ async def send_photo(
             file: InputFile,
             preview: InputFile | None,
             caption: str | None = None,
-            parse_mode: ParseMode | str = ParseMode.TEXT
+            parse_mode: ParseMode | str = ParseMode.TEXT,
+            reply_message_id: str | None = None
     ) -> SendFileResponse:
         """
         Sends a photo to the specified chat, with optional caption and preview support.
@@ -1311,6 +1340,7 @@ async def send_photo(
             preview (InputFile | None): Optional preview image. Must also be an `InputFile` if provided.
             caption (str | None): Optional caption to be sent along with the image.
             parse_mode (ParseMode | str): Formatting mode for the caption (e.g., Markdown, HTML, plain text).
+            reply_message_id (str, optional): Optional identifier of the message to which this message is a reply.
 
         Returns:
             SendFileResponse: An object containing the result of the file upload.
@@ -1334,10 +1364,21 @@ async def send_photo(
             preview=preview,
         )
 
-        call = SendFile(chat_id=chat_id, temporal_file_id=temporal_file_id, text=caption, parse_mode=parse_mode)
+        call = SendFile(
+            chat_id=chat_id,
+            temporal_file_id=temporal_file_id,
+            text=caption,
+            parse_mode=parse_mode,
+            reply_message_id=reply_message_id
+        )
         return await self(call)
 
-    async def send_sticker(self, chat_id: str, file: InputFile) -> SendFileResponse:
+    async def send_sticker(
+            self,
+            chat_id: str,
+            file: InputFile,
+            reply_message_id: str | None = None
+    ) -> SendFileResponse:
         """
         Sends a sticker in WebP format to the specified chat.
 
@@ -1354,6 +1395,7 @@ async def send_sticker(self, chat_id: str, file: InputFile) -> SendFileResponse:
         Args:
             chat_id (str): Identifier of the chat to which the sticker will be sent.
             file (InputFile): The sticker file in WebP format. Must be a subclass of `InputFile`.
+            reply_message_id (str, optional): Optional identifier of the message to which this message is a reply.
 
         Returns:
             SendFileResponse: An object containing the result of the file upload.
@@ -1378,15 +1420,19 @@ async def send_sticker(self, chat_id: str, file: InputFile) -> SendFileResponse:
             is_sticker=True
         )
 
-        call = SendFile(chat_id=chat_id, temporal_file_id=temporal_file_id)
+        call = SendFile(
+            chat_id=chat_id,
+            temporal_file_id=temporal_file_id,
+            reply_message_id=reply_message_id
+        )
         return await self(call)
 
     async def send_survey(
             self,
             chat_id: str,
             title: str,
             survey_campaign_id: str,
-            reply_message_id: str = None,
+            reply_message_id: str | None = None,
             survey_type: SurveyType = SurveyType.NON_ANONYMOUS,
     ) -> SendSurveyResponse:
         """
@@ -1399,7 +1445,7 @@ async def send_survey(
             chat_id (str): Identifier of the chat to send the survey to.
             title (str): Title of the survey displayed in the chat.
             survey_campaign_id (str): Identifier of the survey campaign.
-            reply_message_id (str, optional): Identifier of the message being replied to.
+            reply_message_id (str, optional): Optional identifier of the message to which this message is a reply.
             survey_type (SurveyType, optional): Type of the survey (anonymous or non-anonymous). Defaults to non-anonymous.
 
         Returns:

trueconf/methods/send_file.py

@@ -12,15 +12,17 @@ class SendFile(TrueConfMethod[SendFileResponse]):
 
     chat_id: str
     temporal_file_id: str
-    text: str = None
-    parse_mode: str = None
+    text: str | None = None
+    parse_mode: str | None = None
+    reply_message_id: str | None = None
 
     def __post_init__(self):
         super().__init__()
 
     def payload(self):
         return {
             "chatId": self.chat_id,
+            "replyMessageId": self.reply_message_id,
             "content": {
                 "temporalFileId": self.temporal_file_id,
                 "caption":{