From 8e5f6a247ec0ac677faaf23902de3e93b59735d1 Mon Sep 17 00:00:00 2001 From: F33RNI Date: Fri, 5 Apr 2024 11:29:37 -0500 Subject: [PATCH 1/4] feat: auto-split /users message --- bot_handler.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bot_handler.py b/bot_handler.py index 0d3aa799..cd345519 100644 --- a/bot_handler.py +++ b/bot_handler.py @@ -1515,8 +1515,16 @@ async def bot_command_users(self, update: Update, context: ContextTypes.DEFAULT_ admins_num=users_admin_counter, ) - # Send as markdown - await bot_sender.send_reply(self.config.get("telegram").get("api_key"), user_id, message, markdown=True) + # Send message with auto-splitting + request_response = request_response_container.RequestResponseContainer( + user_id=user_id, + reply_message_id=update.effective_message.id, + module_name="", + response_text=message, + ) + await bot_sender.send_message_async( + self.config.get("telegram"), self.messages, request_response, end=True, plain_text=True + ) async def bot_command_chatid(self, update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: """/chatid command callback From 77ee1fb7cbdb748fa15254677fe3e1835adbeb4f Mon Sep 17 00:00:00 2001 From: F33RNI Date: Fri, 5 Apr 2024 11:29:58 -0500 Subject: [PATCH 2/4] build(version): bump version to 5.2.7 --- _version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_version.py b/_version.py index 208447ee..5d1365da 100644 --- a/_version.py +++ b/_version.py @@ -20,7 +20,7 @@ from packaging import version -__version__ = "5.2.6" +__version__ = "5.2.7" def version_major() -> int: From e22db601836ac2ec6a81adcb1bf39e40e345ca96 Mon Sep 17 00:00:00 2001 From: F33RNI Date: Fri, 5 Apr 2024 11:34:44 -0500 Subject: [PATCH 3/4] feat: auto-split /broadcast result message --- bot_handler.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/bot_handler.py b/bot_handler.py index cd345519..4610d122 100644 --- a/bot_handler.py +++ b/bot_handler.py @@ -1240,13 +1240,18 @@ async def bot_command_broadcast(self, update: Update, context: ContextTypes.DEFA except Exception as e: logging.warning(f"Error sending message to {broadcast_user_id}", exc_info=e) - # Send final message with list of users - await _send_safe( - user_id, - self.messages.get_message("broadcast_done", lang_id=lang_id).format( - broadcast_ok_users="\n".join(broadcast_ok_users) - ), - context, + # Send list of users with auto-splitting + message = self.messages.get_message("broadcast_done", lang_id=lang_id).format( + broadcast_ok_users="\n".join(broadcast_ok_users) + ) + request_response = request_response_container.RequestResponseContainer( + user_id=user_id, + reply_message_id=update.effective_message.id, + module_name="", + response_text=message, + ) + await bot_sender.send_message_async( + self.config.get("telegram"), self.messages, request_response, end=True, plain_text=True ) async def bot_command_module(self, update: Update, context: ContextTypes.DEFAULT_TYPE): From 95066b80d40a247e1528ab8f0c05c47e5faedd6b Mon Sep 17 00:00:00 2001 From: F33RNI Date: Fri, 5 Apr 2024 11:34:58 -0500 Subject: [PATCH 4/4] build(version): bump version to 5.2.8 --- _version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_version.py b/_version.py index 5d1365da..82a8d7a5 100644 --- a/_version.py +++ b/_version.py @@ -20,7 +20,7 @@ from packaging import version -__version__ = "5.2.7" +__version__ = "5.2.8" def version_major() -> int: