Fix rss exclude filter

- other minor fixes

Signed-off-by: anasty17 <[email protected]>

Author: anasty17

README.md

@@ -234,7 +234,7 @@ quotes, even if it's `Int`, `Bool` or `List`.
   generate database. Data will be saved in Database: bot settings, users settings, rss data and incomplete tasks. **NOTE**: You can always edit all settings that saved in database from the official site -> (Browse collections). `Str`
 - `DOWNLOAD_DIR`: The path to the vps local folder where the downloads should be downloaded to. `Str`
 - `CMD_SUFFIX`: Commands index number. This number will added at the end all commands. `Str`|`Int`
-- `AUTHORIZED_CHATS`: Fill user_id and chat_id of groups/users you want to authorize. To auth only specific topic write it in this format `chat_id|thread_id` Ex:-100XXXXXXXXXXX|10. Separate them by space. `Int`
+- `AUTHORIZED_CHATS`: Fill user_id and chat_id of groups/users you want to authorize. To auth only specific topic(s) write it in this format `chat_id|thread_id` Ex:-100XXXXXXXXXXX|10 or Ex:-100XXXXXXXXXXX|10|12. Separate them by space. `Int`
 - `SUDO_USERS`: Fill user_id of users whom you want to give sudo permission. Separate them by space. `Int`
 - `DEFAULT_UPLOAD`: Whether `rc` to upload to `RCLONE_PATH` or `gd` to upload to `GDRIVE_ID`. Default is `gd`. Read
   More [HERE](https://github.com/anasty17/mirror-leech-telegram-bot/tree/master#upload).`Str`

bot/__init__.py

@@ -239,14 +239,13 @@
 if len(AUTHORIZED_CHATS) != 0:
     aid = AUTHORIZED_CHATS.split()
     for id_ in aid:
-        if "|" in id_:
-            chat_id, thread_id = id_.split("|")
-            user_data[int(chat_id.strip())] = {
-                "is_auth": True,
-                "thread_ids": [int(thread_id.strip())],
-            }
+        chat_id, *thread_ids = id_.split("|")
+        chat_id = int(chat_id.strip())
+        if thread_ids:
+            thread_ids = list(map(lambda x: int(x.strip()), thread_ids))
+            user_data[chat_id] = {"is_auth": True, "thread_ids": thread_ids}
         else:
-            user_data[int(id_.strip())] = {"is_auth": True}
+            user_data[chat_id] = {"is_auth": True}
 
 SUDO_USERS = environ.get("SUDO_USERS", "")
 if len(SUDO_USERS) != 0:

bot/__main__.py

@@ -274,6 +274,8 @@ async def main():
         sync_to_async(start_aria2_listener, wait=False),
     )
     create_help_buttons()
+    bot_settings.add_job()
+    scheduler.start()
 
     bot.add_handler(
         MessageHandler(

bot/modules/authorize.py

@@ -27,8 +27,10 @@ async def authorize(_, message):
             thread_id = message.message_thread_id
         chat_id = message.chat.id
     if chat_id in user_data and user_data[chat_id].get("is_auth"):
-        if thread_id is not None and thread_id in user_data[chat_id].get(
-            "thread_ids", []
+        if (
+            thread_id is not None
+            and thread_id in user_data[chat_id].get("thread_ids", [])
+            or thread_id is None
         ):
             msg = "Already Authorized!"
         else:
@@ -65,7 +67,9 @@ async def unauthorize(_, message):
             thread_id = message.message_thread_id
         chat_id = message.chat.id
     if chat_id in user_data and user_data[chat_id].get("is_auth"):
-        if thread_id is not None and thread_id in user_data[chat_id].get("thread_ids", []):
+        if thread_id is not None and thread_id in user_data[chat_id].get(
+            "thread_ids", []
+        ):
             user_data[chat_id]["thread_ids"].remove(thread_id)
         else:
             update_user_ldata(chat_id, "is_auth", False)

bot/modules/bot_settings.py

@@ -974,14 +974,13 @@ async def load_config():
     if len(AUTHORIZED_CHATS) != 0:
         aid = AUTHORIZED_CHATS.split()
         for id_ in aid:
-            if "|" in id_:
-                chat_id, thread_id = id_.split("|")
-                user_data[int(chat_id.strip())] = {
-                    "is_auth": True,
-                    "thread_ids": [int(thread_id.strip())],
-                }
+            chat_id, *thread_ids = id_.split("|")
+            chat_id = int(chat_id.strip())
+            if thread_ids:
+                thread_ids = list(map(lambda x: int(x.strip()), thread_ids))
+                user_data[chat_id] = {"is_auth": True, "thread_ids": thread_ids}
             else:
-                user_data[int(id_.strip())] = {"is_auth": True}
+                user_data[chat_id] = {"is_auth": True}
 
     SUDO_USERS = environ.get("SUDO_USERS", "")
     if len(SUDO_USERS) != 0:

bot/modules/rss.py

@@ -717,7 +717,7 @@ async def rss_monitor():
                             data.get("sensitive", False)
                             and any(x.lower() in item_title.lower() for x in flist)
                         ) or (
-                            data.get("sensitive", False)
+                            not data.get("sensitive", False)
                             and any(x in item_title for x in flist)
                         ):
                             parse = False
@@ -770,6 +770,7 @@ def add_job():
         replace_existing=True,
     )
 
+
 bot.add_handler(
     MessageHandler(
         get_rss_menu,