Merge pull request #21 from Kavuti/log_channel_evolution

Log channel evolution

Author: MattiaFailla

tg_bot/__init__.py

@@ -7,7 +7,7 @@
 
 # enable logging
 logging.basicConfig(
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.DEBUG
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO
 )
 
 LOGGER = logging.getLogger(__name__)

tg_bot/deactivated-modules

@@ -1 +1 @@
-NO_LOAD = ['translation','rss', 'sed', 'afk','notes','filters']
+NO_LOAD = ['translation','rss', 'sed', 'afk','notes','filters', 'spam']

tg_bot/modules/log_channel.py

@@ -5,7 +5,7 @@
 FILENAME = __name__.rsplit(".", 1)[-1]
 
 if is_module_loaded(FILENAME):
-    from telegram import Bot, Update, ParseMode, Message, Chat
+    from telegram import Bot, Update, ParseMode, Message, Chat, MessageEntity
     from telegram.error import BadRequest, Unauthorized
     from telegram.ext import CommandHandler, MessageHandler, run_async
     from telegram.utils.helpers import escape_markdown
@@ -14,6 +14,8 @@
     from tg_bot import dispatcher, LOGGER
     from tg_bot.modules.helper_funcs.chat_status import user_admin
     from tg_bot.modules.sql import log_channel_sql as sql
+    import requests
+    import tldextract
 
     def loggable(func):
         @wraps(func)
@@ -48,29 +50,94 @@ def log_action(bot: Bot, update: Update, *args, **kwargs):
     def log_resource(bot: Bot, update: Update):
         entities = update.effective_message.parse_entities()
         caption_entities = update.effective_message.parse_caption_entities()
+        LOGGER.info(entities)
         chat = update.effective_chat  # type: Optional[Chat]
         log_chat = sql.get_chat_log_channel(chat.id)
+
+        url = None
+        tags = []
+
         if log_chat:
-            result = f"<b>Risorsa inviata da @{update.effective_user.username}:</b>\n"
+            for descriptor, entity in entities.items():
+                if descriptor["type"] == MessageEntity.HASHTAG:
+                    tags.append(entity)
+            if tags:
+                tags.sort()
+
             for descriptor, entity in entities.items():
                 result = (
                     f"<b>Risorsa inviata da @{update.effective_user.username}:</b>\n"
                 )
-                if descriptor["type"] in ["url", "text_link"]:
-                    result += f"{entity}"
-                    LOGGER.debug(f"Found message entity: {descriptor['type']} {entity}")
-                    send_log(bot, log_chat, chat.id, result)
+
+                if descriptor["type"] == MessageEntity.URL:
+                    try:
+                        response = requests.get(entity)
+                        if response.status_code == requests.codes.ok:
+                            result += f"{entity}"
+                            extracted = tldextract.extract(entity)
+                            if f"#{extracted.domain}" not in tags:
+                                tags.append(f"#{extracted.domain}")
+                                tags.sort()
+                            if tags:
+                                tags_string = " ".join(tags)
+                                result += f"\n\nTags:\n{tags_string}"
+                            send_log(bot, log_chat, chat.id, result)
+                    except Exception as e:
+                        LOGGER.info(f"Resource {entity} is not a valid url")
+                        LOGGER.error(e)
+                elif descriptor["type"] == MessageEntity.TEXT_LINK:
+                    try:
+                        response = requests.get(descriptor["url"])
+                        if response.status_code == requests.codes.ok:
+                            result += f'{descriptor["url"]}'
+                            extracted = tldextract.extract(descriptor["url"])
+                            if f"#{extracted.domain}" not in tags:
+                                tags.append(f"#{extracted.domain}")
+                                tags.sort()
+                            if tags:
+                                tags_string = " ".join(tags)
+                                result += f"\n\nTags:\n{tags_string}"
+                            send_log(bot, log_chat, chat.id, result)
+                    except Exception as e:
+                        LOGGER.info(f"Resource {entity} is not a valid url")
+                        LOGGER.error(e)
 
             for descriptor, entity in caption_entities.items():
                 result = (
                     "<b>Risorsa inviata da @{update.effective_user.username}:</b>\n"
                 )
-                if descriptor["type"] in ["url", "text_link"]:
-                    result += f"{entity}"
-                    LOGGER.debug(f"Found message entity: {descriptor['type']} {entity}")
-                    send_log(bot, log_chat, chat.id, result)
-        else:
-            send_log(bot, log_chat, chat.id, result)
+                if descriptor["type"] == MessageEntity.URL:
+                    try:
+                        response = requests.get(entity)
+                        if response.status_code == requests.codes.ok:
+                            result += f"{entity}"
+                            extracted = tldextract.extract(entity)
+                            if f"#{extracted.domain}" not in tags:
+                                tags.append(f"#{extracted.domain}")
+                                tags.sort()
+                            if tags:
+                                tags_string = " ".join(tags)
+                                result += f"\n\nTags:\n{tags_string}"
+                            send_log(bot, log_chat, chat.id, result)
+                    except Exception as e:
+                        LOGGER.info(f"Resource {entity} is not a valid url")
+                        LOGGER.error(e)
+                elif descriptor["type"] == MessageEntity.TEXT_LINK:
+                    try:
+                        response = requests.get(descriptor["url"])
+                        if response.status_code == requests.codes.ok:
+                            result += f'{descriptor["url"]}'
+                            extracted = tldextract.extract(descriptor["url"])
+                            if f"#{extracted.domain}" not in tags:
+                                tags.append(f"#{extracted.domain}")
+                                tags.sort()
+                            if tags:
+                                tags_string = " ".join(tags)
+                                result += f"\n\nTags:\n{tags_string}"
+                            send_log(bot, log_chat, chat.id, result)
+                    except Exception as e:
+                        LOGGER.info(f"Resource {entity} is not a valid url")
+                        LOGGER.error(e)
 
     def send_log(bot: Bot, log_chat_id: str, orig_chat_id: str, result: str):
         try:
@@ -207,7 +274,12 @@ def __chat_settings__(chat_id, user_id):
     UNSET_LOG_HANDLER = CommandHandler("unsetlog", unsetlog)
 
     LOG_RESOURCES_HANDLER = MessageHandler(
-        (Filters.entity("url") | Filters.entity("text_link")), log_resource
+        (
+            Filters.entity("url")
+            | Filters.entity("text_link")
+            | Filters.entity("hashtag")
+        ),
+        log_resource,
     )
 
     dispatcher.add_handler(LOG_HANDLER)