minor changes

Signed-off-by: anasty17 <e.anastayyar@gmail.com>

Author: anasty17

bot/helper/common.py

@@ -379,21 +379,37 @@ async def before_start(self):
                     except:
                         chat = None
                     if chat is None:
+                        LOGGER.warning(
+                            "Account of user session can't find the the destination chat!"
+                        )
                         self.user_transmission = False
                         self.hybrid_leech = False
                     else:
-                        uploader_id = TgClient.user.me.id
-                        if chat.type.name not in ["SUPERGROUP", "CHANNEL", "GROUP"]:
+                        if chat.type.name not in [
+                            "SUPERGROUP",
+                            "CHANNEL",
+                            "GROUP",
+                            "FORUM",
+                        ]:
                             self.user_transmission = False
                             self.hybrid_leech = False
-                        else:
-                            member = await chat.get_member(uploader_id)
+                        elif chat.is_admin:
+                            member = await chat.get_member(TgClient.user.me.id)
                             if (
                                 not member.privileges.can_manage_chat
                                 or not member.privileges.can_delete_messages
                             ):
                                 self.user_transmission = False
                                 self.hybrid_leech = False
+                            LOGGER.warning(
+                                "Enable manage chat and delete messages to account of the user session from administration settings!"
+                            )
+                        else:
+                            LOGGER.warning(
+                                "Promote the account of the user session to admin in the chat to get the benefit of user transmission!"
+                            )
+                            self.user_transmission = False
+                            self.hybrid_leech = False
 
                 if not self.user_transmission or self.hybrid_leech:
                     try:
@@ -406,19 +422,28 @@ async def before_start(self):
                         else:
                             raise ValueError("Chat not found!")
                     else:
-                        uploader_id = self.client.me.id
-                        if chat.type.name in ["SUPERGROUP", "CHANNEL", "GROUP"]:
-                            member = await chat.get_member(uploader_id)
-                            if (
-                                not member.privileges.can_manage_chat
-                                or not member.privileges.can_delete_messages
-                            ):
-                                if not self.user_transmission:
-                                    raise ValueError(
-                                        "You don't have enough privileges in this chat!"
-                                    )
-                                else:
-                                    self.hybrid_leech = False
+                        if chat.type.name in [
+                            "SUPERGROUP",
+                            "CHANNEL",
+                            "GROUP",
+                            "FORUM",
+                        ]:
+                            if not chat.is_admin:
+                                raise ValueError(
+                                    "Bot is not admin in the destination chat!"
+                                )
+                            else:
+                                member = await chat.get_member(self.client.me.id)
+                                if (
+                                    not member.privileges.can_manage_chat
+                                    or not member.privileges.can_delete_messages
+                                ):
+                                    if not self.user_transmission:
+                                        raise ValueError(
+                                            "You don't have enough privileges in this chat! Enable manage chat and delete messages for this bot!"
+                                        )
+                                    else:
+                                        self.hybrid_leech = False
                         else:
                             try:
                                 await self.client.send_chat_action(

bot/modules/rss.py

@@ -580,13 +580,13 @@ async def rss_listener(client, query):
             await update_rss_menu(query)
         elif data[1].endswith("pause"):
             async with rss_dict_lock:
-                for title in list(rss_dict[int(data[2])].keys()):
-                    rss_dict[int(data[2])][title]["paused"] = True
+                for info in rss_dict[int(data[2])].values():
+                    info["paused"] = True
             await database.rss_update(int(data[2]))
         elif data[1].endswith("resume"):
             async with rss_dict_lock:
-                for title in list(rss_dict[int(data[2])].keys()):
-                    rss_dict[int(data[2])][title]["paused"] = False
+                for info in rss_dict[int(data[2])].values():
+                    info["paused"] = False
             if scheduler.state == 2:
                 scheduler.resume()
             await database.rss_update(int(data[2]))
@@ -603,22 +603,23 @@ async def rss_listener(client, query):
             await update_rss_menu(query)
         elif data[1].endswith("pause"):
             async with rss_dict_lock:
-                for user in list(rss_dict.keys()):
-                    for title in list(rss_dict[user].keys()):
-                        rss_dict[int(data[2])][title]["paused"] = True
+                for user_feeds in rss_dict.values():
+                    for feed in user_feeds.values():
+                        feed["paused"] = True
             if scheduler.running:
                 scheduler.pause()
             await database.rss_update_all()
         elif data[1].endswith("resume"):
             async with rss_dict_lock:
-                for user in list(rss_dict.keys()):
-                    for title in list(rss_dict[user].keys()):
-                        rss_dict[int(data[2])][title]["paused"] = False
+                for user_feeds in rss_dict.values():
+                    for feed in user_feeds.values():
+                        feed["paused"] = False
             if scheduler.state == 2:
                 scheduler.resume()
             elif not scheduler.running:
                 add_job()
                 scheduler.start()
+                await update_rss_menu(query)
             await database.rss_update_all()
     elif data[1] == "deluser":
         if len(rss_dict) == 0: