From: Muhammad Rizki <[email protected]>
To: Ammar Faizi <[email protected]>
Cc: Muhammad Rizki <[email protected]>,
GNU/Weeb Mailing List <[email protected]>
Subject: [PATCH v3 14/17] daemon: Remove __send_patch_msg()
Date: Fri, 22 Jul 2022 06:29:35 +0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
From: Muhammad Rizki <[email protected]>
I want to remove the __send_patch_msg() and displace the prepare patch,
send patch, and clean up patch into the send_patch_email() in
packages/client.py.
Signed-off-by: Muhammad Rizki <[email protected]>
---
daemon/packages/client.py | 12 +++++++++---
daemon/scraper/bot.py | 16 +++-------------
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/daemon/packages/client.py b/daemon/packages/client.py
index 45acac3..5be7427 100644
--- a/daemon/packages/client.py
+++ b/daemon/packages/client.py
@@ -7,6 +7,8 @@ from pyrogram import Client
from pyrogram.enums import ParseMode
from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton
from typing import Union, BinaryIO
+from email.message import Message
+from scraper import utils
from .decorator import handle_flood
@@ -44,15 +46,16 @@ class DaemonClient(Client):
@handle_flood
async def send_patch_email(
self,
+ mail: Message,
chat_id: Union[int, str],
- doc: Union[str, BinaryIO],
- caption: str,
+ text: str,
reply_to: int,
url: str = None,
parse_mode: ParseMode = ParseMode.HTML
) -> Message:
print("[send_patch_email]")
- return await self.send_document(
+ tmp, doc, caption, url = utils.prepare_send_patch(mail, text, url)
+ m = await self.send_document(
chat_id=chat_id,
document=doc,
caption=caption,
@@ -65,3 +68,6 @@ class DaemonClient(Client):
)]
])
)
+
+ utils.clean_up_after_send_patch(tmp)
+ return m
diff --git a/daemon/scraper/bot.py b/daemon/scraper/bot.py
index 38c6e94..c89ed58 100644
--- a/daemon/scraper/bot.py
+++ b/daemon/scraper/bot.py
@@ -118,8 +118,9 @@ class Bot():
url = str(re.sub(r"/raw$", "", url))
if is_patch:
- m = await self.__send_patch_msg(mail, tg_chat_id,
- reply_to, text, url)
+ m = await self.client.send_patch_email(
+ mail, tg_chat_id, text, reply_to, url
+ )
else:
text = "#ml\n" + text
m = await self.client.send_text_email(
@@ -156,14 +157,3 @@ class Bot():
return None
return self.db.get_tg_reply_to(reply_to, tg_chat_id)
-
-
- async def __send_patch_msg(self, mail, tg_chat_id, reply_to, text, url):
- print("[__send_patch_msg]")
-
- tmp, doc, caption, url = utils.prepare_send_patch(mail, text, url)
- ret = await self.client.send_patch_email(
- tg_chat_id, doc, caption, reply_to, url
- )
- utils.clean_up_after_send_patch(tmp)
- return ret
--
Muhammad Rizki
next prev parent reply other threads:[~2022-07-21 23:30 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-21 23:29 [PATCH v3 00/17] Code improvements Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 01/17] Fix __send_patch_msg function parameter Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 02/17] Fix import problem Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 03/17] Add default temporary directory Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 04/17] Move the Telegram bot session into the storage directory Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 05/17] daemon: Fix raw lore URL on the inline keyboard button Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 06/17] daemon: Use traceback.format_exc() to get the error detail Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 07/17] Re-design send email message to Telegram Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 08/17] Move ____send_patch_msg Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 09/17] Move prepare for patch and clean up patch functions Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 10/17] Create fix_utf8_chars function Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 11/17] Remove whitespace Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 12/17] Remove prepare patch and clean up patch Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 13/17] daemon: Add @handle_flood decorator and remove some functions Muhammad Rizki
2022-07-21 23:29 ` Muhammad Rizki [this message]
2022-07-21 23:29 ` [PATCH v3 15/17] daemon: Remove unused imports Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 16/17] Replace send email functions Muhammad Rizki
2022-07-21 23:29 ` [PATCH v3 17/17] Add typing in decorator Muhammad Rizki
2022-07-22 10:57 ` [PATCH v3 00/17] Code improvements Ammar Faizi
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