Stabilize Leaving of Disallowed Chats & Delete Privacy Command in Groups (#143)

* Stabilize Leaving of Disallowed Chats

* Delete Privacy Command in Groups

Author: Bibo-Joshi

components/callbacks.py

@@ -1,4 +1,5 @@
 import asyncio
+import contextlib
 import logging
 import random
 import re
@@ -18,11 +19,14 @@
     User,
 )
 from telegram.constants import ChatAction, MessageLimit
+from telegram.error import BadRequest
 from telegram.ext import Application, ApplicationHandlerStop, ContextTypes, Job, JobQueue
 from telegram.helpers import escape_markdown
 
 from components import const
 from components.const import (
+    ALLOWED_CHAT_IDS,
+    ALLOWED_USERNAMES,
     BUY_TEXT,
     DEFAULT_REPO_NAME,
     DEFAULT_REPO_OWNER,
@@ -290,8 +294,18 @@ async def delete_message(update: Update, _: ContextTypes.DEFAULT_TYPE) -> None:
     await try_to_delete(cast(Message, update.effective_message))
 
 
-async def leave_chat(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
-    context.application.create_task(cast(Chat, update.effective_chat).leave(), update=update)
+async def leave_chat(update: Update, _: ContextTypes.DEFAULT_TYPE) -> None:
+    if (
+        not (chat := update.effective_chat)
+        or chat.type == chat.PRIVATE
+        or chat.username in ALLOWED_USERNAMES
+        or chat.id in ALLOWED_CHAT_IDS
+    ):
+        return
+
+    with contextlib.suppress(BadRequest):
+        await chat.leave()
+
     raise ApplicationHandlerStop
 
 
@@ -585,5 +599,7 @@ async def privacy(update: Update, _: ContextTypes.DEFAULT_TYPE) -> None:
     """Reply with the privacy policy"""
     message = cast(Message, update.effective_message)
     await message.reply_text(
-        f"Please read my privacy policy in <a href='{PRIVACY_POLICY}'>here</a>."
+        f"Please read my privacy policy in <a href='{PRIVACY_POLICY}'>here</a>.", quote=False
     )
+    if message.chat.type != message.chat.PRIVATE:
+        await try_to_delete(message)

components/const.py

@@ -19,6 +19,8 @@
 OFFTOPIC_USERNAME = "pythontelegrambottalk"
 ONTOPIC_USERNAME = "pythontelegrambotgroup"
 DEV_GROUP_USERNAME = "pythontelegrambotdev"
+CHANNEL_USERNAME = "pythontelegrambotchannel"
+CHANNEL_CHAT_ID = "@" + CHANNEL_USERNAME
 OFFTOPIC_CHAT_ID = "@" + OFFTOPIC_USERNAME
 ONTOPIC_CHAT_ID = "@" + ONTOPIC_USERNAME
 ERROR_CHANNEL_CHAT_ID = -1001397960657
@@ -34,7 +36,7 @@
 WIKI_FAQ_URL = urljoin(WIKI_URL, "Frequently-Asked-Questions")
 WIKI_FRDP_URL = urljoin(WIKI_URL, "Frequently-requested-design-patterns")
 EXAMPLES_URL = urljoin(DOCS_URL, "/examples.html")
-ALLOWED_USERNAMES = (OFFTOPIC_USERNAME, ONTOPIC_USERNAME, DEV_GROUP_USERNAME)
+ALLOWED_USERNAMES = (OFFTOPIC_USERNAME, ONTOPIC_USERNAME, DEV_GROUP_USERNAME, CHANNEL_USERNAME)
 ALLOWED_CHAT_IDS = (
     ERROR_CHANNEL_CHAT_ID,
     -1001494805131,  # dev chat

rules_bot.py

@@ -20,6 +20,7 @@
     Defaults,
     InlineQueryHandler,
     MessageHandler,
+    TypeHandler,
     filters,
 )
 
@@ -45,8 +46,6 @@
     tag_hint,
 )
 from components.const import (
-    ALLOWED_CHAT_IDS,
-    ALLOWED_USERNAMES,
     COMPAT_ERRORS,
     DESCRIPTION,
     ERROR_CHANNEL_CHAT_ID,
@@ -135,11 +134,9 @@ def main() -> None:
     )
     # Leave groups that are not maintained by PTB
     application.add_handler(
-        MessageHandler(
-            filters.ChatType.GROUPS
-            & ~filters.StatusUpdate.LEFT_CHAT_MEMBER
-            & ~(filters.Chat(username=ALLOWED_USERNAMES) | filters.Chat(chat_id=ALLOWED_CHAT_IDS)),
-            leave_chat,
+        TypeHandler(
+            type=Update,
+            callback=leave_chat,
         ),
         group=-2,
     )
@@ -153,9 +150,7 @@ def main() -> None:
 
     application.add_handler(
         MessageHandler(
-            filters.SenderChat.CHANNEL
-            & ~filters.IS_AUTOMATIC_FORWARD
-            & ~filters.Chat(chat_id=ERROR_CHANNEL_CHAT_ID),
+            filters.SenderChat.CHANNEL & ~filters.ChatType.CHANNEL & ~filters.IS_AUTOMATIC_FORWARD,
             ban_sender_channels,
             block=False,
         )