Added filters to url MessageEntity for locks module

Author: Kavuti

tg_bot/modules/locks.py

@@ -26,7 +26,8 @@
               'contact': Filters.contact,
               'photo': Filters.photo,
               'gif': Filters.animation,
-              'url': Filters.entity(MessageEntity.URL) | Filters.caption_entity(MessageEntity.URL),
+              'url': Filters.entity(MessageEntity.URL) | Filters.caption_entity(MessageEntity.URL) |
+                     Filters.entity(MessageEntity.TEXT_LINK) | Filters.caption_entity(MessageEntity.TEXT_LINK),
               'bots': Filters.status_update.new_chat_members,
               'forward': Filters.forwarded,
               'game': Filters.game,

tg_bot/modules/spam.py

@@ -1,17 +1,40 @@
 from tg_bot import dispatcher, LOGGER
+from tg_bot.modules.helper_funcs.chat_status import bot_can_delete
 from telegram import Update, Bot
-from telegram.ext import MessageHandler, Filters
+from telegram.ext import MessageHandler, Filters, CommandHandler
+from telegram.ext.dispatcher import run_async
 
 
+FORBIDDEN_ENTITY_TYPES = ['url', 'text_link', 'email', 'phone_number']
+
+@run_async
+@bot_can_delete
 def spam_filter(bot: Bot, update: Update):
     msg = update.effective_message.text
-    LOGGER.debug("spam" in msg)
-    if msg and "spam" in msg:
-        user = update.effective_user.username
-        update.effective_message.reply_text(f"Non spammare! @{user}", quote=False)
-        update.effective_message.delete()
+    message_entities = update.effective_message.parse_entities()
+    message_caption_entities = update.effective_message.parse_caption_entities()
 
+    found = False
+    for descriptor, entity in message_entities.items():
+        LOGGER.debug(f"Found message entity: {descriptor['type']} {entity}")
+        found = True
 
-SPAM_HANDLER = MessageHandler(Filters.all & Filters.group, spam_filter)
+    if found:
+        spam_action(update)
+
+
+def spam_action(update: Update):
+    user = update.effective_user.username
+    update.effective_message.reply_text(f"Non spammare! @{user}", quote=False)
+    update.effective_message.delete()
 
-dispatcher.add_handler(SPAM_HANDLER)
+
+def white_spam_add(bot: Bot, update: Update):
+    if update.effective_message.reply_to_message:
+        pass
+    else:
+        update.effective_message.reply_text("Cosa vuoi aggiungere in whitelist?")
+
+SPAM_HANDLER = MessageHandler(Filters.all & Filters.group, spam_filter)
+WHITE_SPAM_HANDLER = CommandHandler("whitespam", white_spam_add)
+#dispatcher.add_handler(SPAM_HANDLER)