Pre update bug fixes

Powers/plugins/bans.py

@@ -3,7 +3,7 @@ from traceback import format_exc
 
 from pyrogram import enums
 from pyrogram.errors import (ChatAdminRequired, PeerIdInvalid, RightForbidden,
-                             RPCError, UserAdminInvalid)
+                             RPCError, UserAdminInvalid, UserNotParticipant)
 from pyrogram.filters import regex
 from pyrogram.types import (CallbackQuery, ChatPrivileges,
                             InlineKeyboardButton, InlineKeyboardMarkup,
@@ -137,6 +137,8 @@ async def tban_usr(c: Gojo, m: Message):
         await m.reply_text(
             text="Cannot act on this user, maybe I wasn't the one who changed their permissions."
         )
+    except UserNotParticipant:
+        await m.reply_text("User is not part of the group")
     except RightForbidden:
         await m.reply_text(text="I don't have enough rights to ban this user.")
     except RPCError as ef:
@@ -227,6 +229,8 @@ async def stban_usr(c: Gojo, m: Message):
         await m.reply_text(
             text="Cannot act on this user, maybe I wasn't the one who changed their permissions."
         )
+    except UserNotParticipant:
+        await m.reply_text("User is not part of the group")
     except RightForbidden:
         await m.reply_text(text="I don't have enough rights to ban this user.")
     except RPCError as ef:
@@ -444,6 +448,8 @@ async def kick_usr(c: Gojo, m: Message):
         await m.reply_text(
             text="Cannot act on this user, maybe I wasn't the one who changed their permissions."
         )
+    except UserNotParticipant:
+        await m.reply_text("User is not part of the group")
     except RightForbidden:
         await m.reply_text(text="I don't have enough rights to ban this user.")
     except RPCError as ef:
@@ -512,6 +518,8 @@ async def skick_usr(c: Gojo, m: Message):
         await m.reply_text(
             text="Cannot act on this user, maybe I wasn't the one who changed their permissions."
         )
+    except UserNotParticipant:
+        await m.reply_text("User is not part of the group")
     except RightForbidden:
         await m.reply_text(text="I don't have enough rights to kick this user.")
     except RPCError as ef:
@@ -601,6 +609,8 @@ async def dkick_usr(c: Gojo, m: Message):
         )
     except RightForbidden:
         await m.reply_text(text="I don't have enough rights to kick this user.")
+    except UserNotParticipant:
+        await m.reply_text("User is not part of the group")
     except RPCError as ef:
         await m.reply_text(
             text=f"""Some error occured, report it using `/bug`
@@ -730,6 +740,8 @@ async def sban_usr(c: Gojo, m: Message):
         )
     except RightForbidden:
         await m.reply_text(text="I don't have enough rights to ban this user.")
+    except UserNotParticipant:
+        await m.reply_text("User is not part of the group")
     except RPCError as ef:
         await m.reply_text(
             text=f"""Some error occured, report it using `/bug`
@@ -830,6 +842,8 @@ async def dban_usr(c: Gojo, m: Message):
         )
     except RightForbidden:
         await m.reply_text(text="I don't have enough rights to ban this user.")
+    except UserNotParticipant:
+        await m.reply_text("User is not part of the group")
     except RPCError as ef:
         await m.reply_text(
             text=f"""Some error occured, report it using `/bug`
@@ -938,6 +952,8 @@ async def ban_usr(c: Gojo, m: Message):
         await m.reply_text(
             "I have not seen this user yet...!\nMind forwarding one of their message so I can recognize them?",
         )
+    except UserNotParticipant:
+        await m.reply_text("User is not part of the group")
     except UserAdminInvalid:
         await m.reply_text(
             text="Cannot act on this user, maybe I wasn't the one who changed their permissions."
@@ -968,7 +984,7 @@ async def unbanbutton(c: Gojo, q: CallbackQuery):
         )
         return
 
-    if not user.privileges.can_restrict_members and q.from_user.id != OWNER_ID:
+    elif user and not user.privileges.can_restrict_members and q.from_user.id != OWNER_ID:
         await q.answer(
             "You don't have enough permission to do this!\nStay in your limits!",
             show_alert=True,

Powers/plugins/greetings.py

@@ -2,7 +2,7 @@ from html import escape
 from secrets import choice
 from traceback import format_exc
 
-from pyrogram import enums, filters
+from pyrogram import emoji, enums, filters
 from pyrogram.enums import ChatMemberStatus as CMS
 from pyrogram.errors import ChatAdminRequired, RPCError
 from pyrogram.types import ChatMemberUpdated, Message
@@ -301,6 +301,10 @@ async def member_has_joined(c: Gojo, member: ChatMemberUpdated):
             teks = choice(filter_reply)
         else:
             teks = tek
+
+        if not teks:
+            teks = f"A wild {user.mention} appeared in {member.chat.title}! Everyone be aware."
+
         ifff = db.get_current_cleanwelcome_id()
         gg = db.get_current_cleanwelcome_settings()
         if ifff and gg:
@@ -375,6 +379,10 @@ async def member_has_left(c: Gojo, member: ChatMemberUpdated):
             teks = choice(filter_reply)
         else:
             teks = tek
+
+        if not teks: #Just in case
+            teks = f"Thanks for being part of this group {user.mention}. But I don't like your arrogance and leaving the group {emoji.EYES}"
+       
         ifff = db.get_current_cleangoodbye_id()
         iii = db.get_current_cleangoodbye_settings()
         if ifff and iii:

Powers/plugins/locks.py

@@ -478,7 +478,7 @@ async def lock_del_mess(c:Gojo, m: Message):
     all_chats = lock.get_lock_channel()
     if not all_chats:
         return
-    if m.chat.id not in all_chats:
+    if m.chat and m.chat.id not in all_chats:
         return
     if m.sender_chat and not (m.forward_from_chat or m.forward_from):
         if m.sender_chat.id == m.chat.id:

Powers/plugins/scheduled_jobs.py

@@ -1,4 +1,4 @@
-import time
+import time as TIME
 from asyncio import sleep
 from traceback import format_exc
 
@@ -28,7 +28,7 @@ async def clean_my_db(c:Client,is_cmd=False, id=None):
     to_clean = list()
     chats_list = Chats.list_chats_by_id()
     to_clean.clear()
-    start = time.time()
+    start = TIME.time()
     for chats in chats_list:
         try:
             stat = await c.get_chat_member(chat_id=chats,user_id=Config.BOT_ID)
@@ -60,7 +60,7 @@ async def clean_my_db(c:Client,is_cmd=False, id=None):
     x = len(to_clean)
     txt = f"#INFO\n\nCleaned db:\nTotal chats removed: {x}"
     to_clean.clear()
-    nums = time.time()-start
+    nums = TIME.time()-start
     if is_cmd:
         txt += f"\nClean type: Forced\nInitiated by: {(await c.get_users(user_ids=id)).mention}"
         txt += f"\nClean type: Manual\n\tTook {round(nums,2)} seconds to complete the process"