Optimization of the log channel resources management.

Author: Kavuti

tg_bot/modules/log_channel.py

@@ -64,80 +64,50 @@ def log_resource(bot: Bot, update: Update):
             if tags:
                 tags.sort()
 
-            for descriptor, entity in entities.items():
-                result = (
-                    f"<b>Risorsa inviata da @{update.effective_user.username}:</b>\n"
-                )
+            log_entities_list(bot, chat, entities, log_chat, tags, update)
+
+            log_entities_list(bot, chat, caption_entities, log_chat, tags, update)
+
+
+    def log_entities_list(bot, chat, entities, log_chat, tags, update):
+        for descriptor, entity in entities.items():
+            result = (
+                f"<b>Risorsa inviata da @{update.effective_user.username}:</b>\n"
+            )
+
+            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)
 
-                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"] == 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: