Merge pull request #17 from iflare3g/fix/issue-#16

FIX ISSUE #16 BUG

Author: Kavuti

tg_bot/__init__.py

@@ -51,15 +51,15 @@
 
     DB_URI = os.environ.get('DATABASE_URL')
     DONATION_LINK = os.environ.get('DONATION_LINK')
-    LOAD = os.environ.get("LOAD", "").split()
-    NO_LOAD = os.environ.get("NO_LOAD", "translation").split()
+    LOAD = os.environ.get("LOAD", "").split(",") if "," in os.environ.get("LOAD", "") else os.environ.get("LOAD", "").split()
+    NO_LOAD = os.environ.get("NO_LOAD", "translation").split(",")
     DEL_CMDS = bool(os.environ.get('DEL_CMDS', False))
     STRICT_GBAN = bool(os.environ.get('STRICT_GBAN', False))
     WORKERS = int(os.environ.get('WORKERS', 8))
     BAN_STICKER = os.environ.get('BAN_STICKER', 'CAADAgADOwADPPEcAXkko5EB3YGYAg')
     ALLOW_EXCL = os.environ.get('ALLOW_EXCL', False)
     DEFAULT_CHAT_ID = os.environ.get('DEFAULT_CHAT_ID', None)
-    VERSION = os.environ.get('DEFAULT_CHAT_ID', 'Production.version')
+    VERSION = __version__
 
 else:
     from tg_bot.config import Development as Config

tg_bot/modules/log_channel.py

@@ -44,22 +44,24 @@ def log_resource(bot: Bot, update: Update):
         entities = update.effective_message.parse_entities()
         caption_entities = update.effective_message.parse_caption_entities()
         chat = update.effective_chat  # type: Optional[Chat]
-        if chat.type == chat.SUPERGROUP:
-            log_chat = sql.get_chat_log_channel(chat.id)
-            if log_chat:
-                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)
-
-                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)
+        log_chat = sql.get_chat_log_channel(chat.id)
+        if log_chat:
+            result = f'<b>Risorsa inviata da @{update.effective_user.username}:</b>\n'
+            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)
+
+            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)
 
 
     def send_log(bot: Bot, log_chat_id: str, orig_chat_id: str, result: str):
@@ -182,7 +184,7 @@ def __chat_settings__(chat_id, user_id):
     SET_LOG_HANDLER = CommandHandler("setlog", setlog)
     UNSET_LOG_HANDLER = CommandHandler("unsetlog", unsetlog)
 
-    LOG_RESOURCES_HANDLER = MessageHandler(Filters.all & Filters.group, log_resource)
+    LOG_RESOURCES_HANDLER = MessageHandler((Filters.entity("url") | Filters.entity("text_link")), log_resource)
 
     dispatcher.add_handler(LOG_HANDLER)
     dispatcher.add_handler(SET_LOG_HANDLER)

tg_bot/modules/spam.py

@@ -20,7 +20,8 @@ def spam_filter(bot: Bot, update: Update):
     found = False
     for descriptor, entity in message_entities.items():
         LOGGER.debug(f"Found message entity: {descriptor['type']} {entity}")
-        found = True
+        if descriptor["type"] in FORBIDDEN_ENTITY_TYPES:
+            found = True
 
     if found:
         spam_action(update)
@@ -40,4 +41,4 @@ def white_spam_add(bot: Bot, update: Update):
 
 SPAM_HANDLER = MessageHandler(Filters.all & Filters.group, spam_filter)
 WHITE_SPAM_HANDLER = CommandHandler("whitespam", white_spam_add)
-#dispatcher.add_handler(SPAM_HANDLER)
+dispatcher.add_handler(SPAM_HANDLER)