Delete Unhandled Commands

Bibo-Joshi · Bibo-Joshi · commit 8acd242b4886 · 2024-03-29T09:45:32.000+01:00
diff --git a/components/callbacks.py b/components/callbacks.py
@@ -284,8 +284,8 @@ async def reply_search(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
         await reply_or_edit(update, context, "\n".join(html_markup_items))
 
 
-async def delete_new_chat_members_message(update: Update, _: ContextTypes.DEFAULT_TYPE) -> None:
-    await cast(Message, update.effective_message).delete()
+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:
diff --git a/rules_bot.py b/rules_bot.py
@@ -28,7 +28,7 @@
     ban_sender_channels,
     buy,
     command_token_warning,
-    delete_new_chat_members_message,
+    delete_message,
     leave_chat,
     off_on_topic,
     raise_app_handler_stop,
@@ -175,12 +175,15 @@ def main() -> None:
         MessageHandler(filters.TEXT & filters.UpdateType.MESSAGES & ~filters.COMMAND, reply_search)
     )
 
+    # Delete unhandled commands - e.g. for users that like to click on blue text in other messages
+    application.add_handler(MessageHandler(filters.COMMAND, delete_message))
+
     # Status updates
     application.add_handler(
         MessageHandler(
             filters.Chat(username=[ONTOPIC_USERNAME, OFFTOPIC_USERNAME])
             & filters.StatusUpdate.NEW_CHAT_MEMBERS,
-            delete_new_chat_members_message,
+            delete_message,
             block=False,
         ),
         group=1,
