From: Muhammad Rizki <[email protected]>
To: Ammar Faizi <[email protected]>
Cc: Muhammad Rizki <[email protected]>,
Alviro Iskandar Setiawan <[email protected]>,
GNU/Weeb Mailing List <[email protected]>
Subject: [PATCH v2 03/17] fix: utils: add a substr for the patch media caption
Date: Wed, 9 Nov 2022 09:49:48 +0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
Add a substr caption for the patch email to avoid MediaCaptionTooLong
for the Telegram bot.
Regarding to commit 125111a7, its forget to add a substring to trim the
media caption for the Telegram bot, because Telegram only allow
media caption to 1024 only, so trim it to 1020.
Fixes: 125111a7 ("daemon: Full refactor everything about scraper")
Signed-off-by: Muhammad Rizki <[email protected]>
---
daemon/atom/utils.py | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/daemon/atom/utils.py b/daemon/atom/utils.py
index 9483d26..2e85461 100644
--- a/daemon/atom/utils.py
+++ b/daemon/atom/utils.py
@@ -186,9 +186,11 @@ def create_template(thread: Message, platform: Platform, to=None, cc=None):
cc = extract_list("cc", thread)
if platform is Platform.TELEGRAM:
substr = 4000
+ media_substr = 1010
border = f"\n<code>{'-'*72}</code>"
else:
substr = 1900
+ media_substr = None
border = f"\n{'-'*80}"
subject = thread.get('subject')
@@ -201,15 +203,18 @@ def create_template(thread: Message, platform: Platform, to=None, cc=None):
if is_patch:
ret += content
- else:
- ret += content.strip().replace("\t", " ")
+ if not media_substr:
+ return ret, files, is_patch
- if len(ret) >= substr:
- ret = ret[:substr] + "..."
+ if len(ret) >= media_substr:
+ return ret[:media_substr] + "...", files, is_patch
- ret = fix_utf8_char(ret, platform is Platform.TELEGRAM)
- ret += border
+ ret += content.strip().replace("\t", " "*8)
+ if len(ret) >= substr:
+ ret = ret[:substr] + "..."
+ ret = fix_utf8_char(ret, platform is Platform.TELEGRAM)
+ ret += border
return ret, files, is_patch
--
Muhammad Rizki
next prev parent reply other threads:[~2022-11-09 2:50 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-09 2:49 [PATCH v2 00/17] Fix, improvement and implement a bot logger Muhammad Rizki
2022-11-09 2:49 ` [PATCH v2 01/17] discord: Fix typo on _flood_exception() Muhammad Rizki
2022-11-09 2:49 ` [PATCH v2 02/17] fix: utils: Fix .patch file payload Muhammad Rizki
2022-11-09 8:59 ` Ammar Faizi
2022-11-09 9:04 ` Muhammad Rizki
2022-11-09 9:44 ` Muhammad Rizki
2022-11-09 9:49 ` Ammar Faizi
2022-11-09 9:50 ` Muhammad Rizki
2022-11-20 4:49 ` Ammar Faizi
2022-11-20 6:39 ` Muhammad Rizki
2022-11-09 2:49 ` Muhammad Rizki [this message]
2022-11-20 4:51 ` [PATCH v2 03/17] fix: utils: add a substr for the patch media caption Ammar Faizi
2022-11-23 9:38 ` Muhammad Rizki
2022-11-09 2:49 ` [PATCH v2 04/17] fix: utils: Fix the extract_list() utility function Muhammad Rizki
2022-11-09 2:49 ` [PATCH v2 05/17] utils: Back to use decode=True for the get_payload() Muhammad Rizki
2022-11-09 2:49 ` [PATCH v2 06/17] utils: Improve fix_utf8_char() Muhammad Rizki
2022-11-20 5:23 ` Ammar Faizi
2022-11-23 9:50 ` Muhammad Rizki
2022-11-09 2:49 ` [PATCH v2 07/17] utils: Add catch_err() for the log message Muhammad Rizki
2022-11-09 2:49 ` [PATCH v2 08/17] logger: Initial work for the bot logger for future use Muhammad Rizki
2022-11-09 2:49 ` [PATCH v2 09/17] telegram: Use the created BotLogger() class Muhammad Rizki
2022-11-09 2:49 ` [PATCH v2 10/17] telegram: Add variable LOG_CHANNEL_ID declaration Muhammad Rizki
2022-11-20 4:56 ` Ammar Faizi
2022-11-20 6:26 ` Muhammad Rizki
2022-11-09 2:49 ` [PATCH v2 11/17] telegram: Add send_log_file() in the DaemonClient() Muhammad Rizki
2022-11-09 2:49 ` [PATCH v2 12/17] telegram: Implement the log message for catching errors Muhammad Rizki
2022-11-09 2:49 ` [PATCH v2 13/17] discord: Add variable LOG_CHANNEL_ID declaration Muhammad Rizki
2022-11-09 2:49 ` [PATCH v2 14/17] discord: Use the BotLogger() to the GWClient() Muhammad Rizki
2022-11-09 2:50 ` [PATCH v2 15/17] discord: Add send_log_file in " Muhammad Rizki
2022-11-09 2:50 ` [PATCH v2 16/17] discord: Implement the catch erros and logs Muhammad Rizki
2022-11-09 2:50 ` [PATCH v2 17/17] Remove some unused imports Muhammad Rizki
2022-12-07 14:42 ` [PATCH v2 00/17] Fix, improvement and implement a bot logger Alviro Iskandar Setiawan
2022-12-07 14:59 ` Ammar Faizi
2022-12-08 6:41 ` Kiizuha
[not found] ` <[email protected]>
2022-12-08 16:36 ` Kiizuha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox