From: Muhammad Rizki <[email protected]>
To: Ammar Faizi <[email protected]>
Cc: Muhammad Rizki <[email protected]>,
GNU/Weeb Mailing List <[email protected]>
Subject: [PATCH v2 16/18] daemon: Add @handle_flood decorator and remove some functions
Date: Tue, 19 Jul 2022 07:17:42 +0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
From: Muhammad Rizki <[email protected]>
I decided to create @handle_flood decorator to make it easier to handle
the Telegram floodwait. Remove __send_text_msg() and replace the
call of the __send_text_msg() with send_text_email() in
packages/client.py and it have handle_flood decorator support.
Signed-off-by: Muhammad Rizki <[email protected]>
---
daemon/packages/client.py | 3 +++
daemon/packages/decorator.py | 38 +++++++++++++++++++++++++++++++++
daemon/scraper/bot.py | 41 +++++-------------------------------
3 files changed, 46 insertions(+), 36 deletions(-)
create mode 100644 daemon/packages/decorator.py
diff --git a/daemon/packages/client.py b/daemon/packages/client.py
index bb62c86..d4689d3 100644
--- a/daemon/packages/client.py
+++ b/daemon/packages/client.py
@@ -2,6 +2,7 @@ from pyrogram import Client
from pyrogram.enums import ParseMode
from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton
from typing import Union, BinaryIO
+from .decorator import handle_flood
class DaemonClient(Client):
@@ -11,6 +12,7 @@ class DaemonClient(Client):
api_hash, **kwargs)
+ @handle_flood
async def send_text_email(
self,
chat_id: Union[int, str],
@@ -34,6 +36,7 @@ class DaemonClient(Client):
)
+ @handle_flood
async def send_patch_email(
self,
chat_id: Union[int, str],
diff --git a/daemon/packages/decorator.py b/daemon/packages/decorator.py
new file mode 100644
index 0000000..7d7dc39
--- /dev/null
+++ b/daemon/packages/decorator.py
@@ -0,0 +1,38 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright (C) 2022 Muhammad Rizki <[email protected]>
+#
+
+from pyrogram.errors.exceptions.flood_420 import FloodWait
+from typing import Any, Callable
+from functools import wraps
+import re
+import asyncio
+
+__all__ = ["handle_flood"]
+
+
+def handle_flood(func: Callable[[Any], Any]) -> Callable[[Any], Any]:
+ @wraps(func)
+ async def callback(*args: Any) -> Any:
+ while True:
+ try:
+ return await func(*args)
+ except FloodWait as e:
+ #
+ # Aiee... we hit our limit.
+ # Let's slow down a bit.
+ #
+ _flood_exceptions(e)
+ print("[__handle_telegram_floodwait]: Woken up from flood wait...")
+ return callback
+
+
+async def _flood_exceptions(e):
+ x = re.search(r"A wait of (\d+) seconds is required", str(e))
+ if not x:
+ raise e
+
+ n = int(x.group(1))
+ print(f"[____handle_telegram_floodwait]: Sleeping for {n} seconds due to Telegram limit")
+ await asyncio.sleep(n)
diff --git a/daemon/scraper/bot.py b/daemon/scraper/bot.py
index 1acc783..bc4025d 100644
--- a/daemon/scraper/bot.py
+++ b/daemon/scraper/bot.py
@@ -118,8 +118,9 @@ class Bot():
reply_to, text, url)
else:
text = "#ml\n" + text
- m = await self.__send_text_msg(tg_chat_id, text,
- reply_to, url)
+ m = await self.client.send_text_email(
+ tg_chat_id, text,reply_to, url
+ )
self.db.insert_telegram(email_id, m.chat.id, m.id)
for d, f in files:
@@ -157,40 +158,8 @@ class Bot():
print("[__send_patch_msg]")
tmp, doc, caption, url = utils.prepare_send_patch(mail, text, url)
- ret = await self.__handle_telegram_floodwait(
- self.client.send_patch_email,
- *[tg_chat_id, doc, caption, reply_to, 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
-
-
- async def __send_text_msg(self, *args):
- return await self.__handle_telegram_floodwait(
- self.client.send_text_email,
- *args
- )
-
-
- async def __handle_telegram_floodwait(self, callback, *args):
- while True:
- try:
- return await callback(*args)
- except pyrogram.errors.exceptions.flood_420.FloodWait as e:
- #
- # Aiee... we hit our limit.
- # Let's slow down a bit.
- #
- await self.____handle_telegram_floodwait(e)
- print("[__handle_telegram_floodwait]: Woken up from flood wait...")
-
-
- async def ____handle_telegram_floodwait(self, e):
- x = str(e)
- x = re.search(r"A wait of (\d+) seconds is required", x)
- if not x:
- raise e
-
- n = int(x.group(1))
- print(f"[____handle_telegram_floodwait]: Sleeping for {n} seconds due to Telegram limit")
- await asyncio.sleep(n)
--
Muhammad Rizki
next prev parent reply other threads:[~2022-07-19 0:18 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-19 0:17 [PATCH v2 00/18] Plan to redesign codes Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 01/18] Fix __send_patch_msg function parameter Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 02/18] Fix import problem Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 03/18] Add default temporary directory Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 04/18] Move the Telegram bot session into the storage directory Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 05/18] daemon: Fix raw lore URL on the inline keyboard button Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 06/18] daemon: Use traceback.format_exc() to get the error detail Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 07/18] Re-design send email message to Telegram Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 08/18] Move ____send_patch_msg Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 09/18] Move prepare for patch and clean up patch functions Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 10/18] Create fix_utf8_chars function Muhammad Rizki
2022-07-19 8:20 ` Ammar Faizi
2022-07-19 0:17 ` [PATCH v2 11/18] Recode some codes Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 12/18] Fix indentation issue Muhammad Rizki
2022-07-19 8:15 ` Ammar Faizi
2022-07-19 0:17 ` [PATCH v2 13/18] Remove whitespace Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 14/18] Remove prepare patch and clean up patch Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 15/18] daemon: Remove unused imports Muhammad Rizki
2022-07-19 0:17 ` Muhammad Rizki [this message]
2022-07-19 0:17 ` [PATCH v2 17/18] daemon: Remove __send_patch_msg() Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 18/18] daemon: Remove unused imports Muhammad Rizki
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