Test completed

Powers/database/captcha_db.py

@@ -101,11 +101,18 @@ class CAPTCHA_DATA(MongoDB):
                 return
         else:
             return
+        
+    def get_message_id(self, chat, user):
+        curr = self.find_one({"chat_id": chat, "user_id": user})
+        if curr:
+            return curr["message_id"]
+        else:
+            return False
 
     def is_already_data(self, chat, user):
         curr = self.find_one({"chat_id": chat, "user_id": user})
         if curr:
-            return curr["message_id"]
+            return curr.get("message_id", False)
         else:
             return False
 
@@ -114,4 +121,5 @@ class CAPTCHA_DATA(MongoDB):
         if curr:
             with INSERTION_LOCK:
                 self.delete_one({"chat_id": chat, "user_id": user})
-        return
+
+        return curr["message_id"]

Powers/plugins/auto_join.py

@@ -48,7 +48,7 @@ async def accept_join_requests(c: Gojo, m: Message):
                 is_al = a_j.load_autojoin(m.chat.id)
                 
                 if is_al:
-                    txt = "Now I will approve all the join request of the chat\nIf you want that I will just notify admins about the join request use command\n//joinreqmode [manual | auto]"
+                    txt = "Now I will approve all the join request of the chat\nIf you want that I will just notify admins about the join request use command\n/joinreqmode [manual | auto]"
                     await m.reply_text(txt)
                     return
                 else:
@@ -102,13 +102,16 @@ async def join_request_handler(c: Gojo, j: ChatJoinRequest):
     if join_type == "auto" or user in SUPPORT_STAFF:
         try:
             await c.approve_chat_join_request(chat,user)
+            await c.send_message(chat, f"Accepted join request of the {userr.mention}")
+            return
         except Exception as ef:
             await c.send_message(chat,f"Some error occured while approving request, report it using `/bug`\n<b>Error:</b> <code>{ef}</code>")
             LOGGER.error(ef)
             LOGGER.error(format_exc())
+            return
     elif join_type == "manual":
         txt = "New join request is available\n**USER's INFO**\n"
-        txt += f"Name: {userr.first_name} {userr.last_name if userr.last_name else ''}"
+        txt += f"Name: {userr.full_name}"
         txt += f"Mention: {userr.mention}"
         txt += f"Id: {user}"
         txt += f"Scam: {'True' if  userr.is_scam else 'False'}"
@@ -127,23 +130,30 @@ async def join_request_handler(c: Gojo, j: ChatJoinRequest):
 async def accept_decline_request(c:Gojo, q: CallbackQuery):
     user_id = q.from_user.id
     chat = q.message.chat.id
-    user_status = (await q.message.chat.get_member(user_id)).status
-    if user_status not in {CMS.OWNER, CMS.ADMINISTRATOR}:
-        await q.answer(
-            "You're not even an admin, don't try this explosive shit!",
-            show_alert=True,
-        )
+    try:
+        user_status = (await q.message.chat.get_member(user_id)).status
+        if user_status not in {CMS.OWNER, CMS.ADMINISTRATOR}:
+            await q.answer(
+                "You're not even an admin, don't try this explosive shit!",
+                show_alert=True,
+            )
+            return
+    except:
+        await q.answer("Unknow error occured. You are not admin or owner")
         return
-
     split = q.data.split("_")
     chat = q.message.chat.id
     user = int(split[-1])
     data = split[0]
-
+    try:
+        userr = await c.get_users(user)
+    except:
+        userr = None
     if data == "accept":
         try:
             await c.approve_chat_join_request(chat,user)
-            await q.answer(f"APPROVED: {user}",True)
+            await q.answer(f"Accepted join request of the {userr.mention if userr else user}",True)
+            await q.edit_message_text(f"Accepted join request of the {userr.mention if userr else user}")
         except Exception as ef:
             await c.send_message(chat,f"Some error occured while approving request, report it using `/bug`\n<b>Error:</b> <code>{ef}</code>")
             LOGGER.error(ef)
@@ -153,6 +163,7 @@ async def accept_decline_request(c:Gojo, q: CallbackQuery):
         try:
             await c.decline_chat_join_request(chat,user)
             await q.answer(f"DECLINED: {user}")
+            await q.edit_message_text()
         except Exception as ef:
             await c.send_message(chat,f"Some error occured while approving request, report it using `/bug`\n<b>Error:</b> <code>{ef}</code>")
             LOGGER.error(ef)

Powers/plugins/captcha.py

@@ -1,23 +1,28 @@
-from random import shuffle
+import os
+from random import choice, shuffle
 from traceback import format_exc
+from typing import List
 
 import pyrogram
 from pyrogram import filters
-from pyrogram.types import CallbackQuery, ChatMemberUpdated, ChatPermissions
+from pyrogram.enums import ChatMemberStatus as CMS
+from pyrogram.enums import ParseMode as PM
+from pyrogram.types import CallbackQuery, ChatPermissions
 from pyrogram.types import InlineKeyboardButton as IKB
 from pyrogram.types import InlineKeyboardMarkup as ikm
-from pyrogram.types import Message
+from pyrogram.types import Message, User
 
-from Powers import DEV_USERS, LOGGER, SUDO_USERS, WHITELIST_USERS
+from Powers import DEV_USERS, LOGGER, MESSAGE_DUMP, SUDO_USERS, WHITELIST_USERS
 from Powers.bot_class import Gojo
 from Powers.database.captcha_db import CAPTCHA, CAPTCHA_DATA
 from Powers.utils.captcha_helper import (genrator, get_image_captcha,
                                          get_qr_captcha)
-from Powers.utils.custom_filters import admin_filter, command
+from Powers.utils.custom_filters import admin_filter, captcha_filter, command
+from Powers.utils.extras import BAN_GIFS
 
 
 @Gojo.on_message(command("captcha") & admin_filter & ~filters.private)
-async def start_captcha(c: Gojo, m: Message):
+async def start_captcha(_, m: Message):
     captcha = CAPTCHA()
     split = m.command
     if len(split) == 1:
@@ -59,8 +64,9 @@ async def set_captcha_mode(c: Gojo, m: Message):
     else:
         type_ = split[1].lower()
         if type_ == "qr":
-            captcha.update_type(m.chat.id, "qr")
-            await m.reply_text("Captcha verification is now changed to qr code")
+            await m.reply_text("This feature is not implemented yet\nUse /captchamode image")
+            # captcha.update_type(m.chat.id, "qr")
+            # await m.reply_text("Captcha verification is now changed to qr code")
             return
         elif type_ == "image":
             captcha.update_type(m.chat.id, "image")
@@ -106,44 +112,73 @@ async def captcha_codes_check(c: Gojo, q: CallbackQuery):
         new_cap = ":".join(caps)
         await q.answer(f"Wrong\nTries left: {tries}", True)
         if not tries:
-            new_cap = f"You have zero tries left now. I am going to kick you know coz you failed to solve captcha...see yaa {q.from_user.mention}"
+            txt = f"{q.from_user.mention} was not able to pass captcha verification thus banned from the group"
             try:
                 await q.message.chat.ban_member(user)
             except Exception as e:
-                await q.message.reply_text("Failed to kick member")
+                await q.message.reply_text("Failed to ban member")
                 return
             await q.message.delete()
-            await q.message.reply_text(new_cap)
-            await c.unban_chat_member(chat, user)
-
+            keyboard = ikm(
+                [
+                    [
+                        IKB(
+                            "Unban",
+                            callback_data=f"unban_={user}",
+                        ),
+                    ],
+                ],
+            )
+            anim = choice(BAN_GIFS)
+            try:
+                await c.send_animation(
+                    chat_id=q.message.chat.id,
+                    animation=str(anim),
+                    caption=txt,
+                    reply_markup=keyboard,
+                    parse_mode=PM.HTML,
+                )
+            except Exception:
+                
+                await c.send_animation(
+                    chat_id=q.message.chat.id,
+                    text=txt,
+                    reply_markup=keyboard,
+                    parse_mode=PM.HTML,
+                )
+                await c.send_message(MESSAGE_DUMP,f"#REMOVE from BAN_GFIS\n{anim}")
+            c_data.remove_cap_data(chat, user)
+            c_data.del_message_id(q.message.chat.id, user)
+            return
         else:
             await q.edit_message_caption(new_cap, reply_markup=q.message.reply_markup)
             return
 
 
-@Gojo.on_chat_member_updated(filters.group, group=3)
-async def on_chat_members_updatess(c: Gojo, u: ChatMemberUpdated):
-    chat = u.chat.id
-
-    if u.new_chat_member:
-
-        user = u.new_chat_member.user.id
-        userr = u.new_chat_member.user
-
-        is_qr = CAPTCHA().is_captcha(chat)
-        if not is_qr:
-            return
+@Gojo.on_message(filters.group & captcha_filter & filters.new_chat_members, group=3)
+async def on_chat_members_updatess(c: Gojo, m: Message):
+    chat = m.chat.id
 
+    users: List[User] = m.new_chat_members
+    for user in users:
         captcha = CAPTCHA()
         cap_data = CAPTCHA_DATA()
-
+        
+        if user.is_bot:
+            continue
         SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
-        if user in SUPPORT_STAFF:
-            return
 
-        captcha_type = captcha.get_captcha(chat)
-
-        is_already = cap_data.is_already_data(chat, user)
+        try:
+            status = (await m.chat.get_member(user)).status
+            if status in [CMS.OWNER, CMS.ADMINISTRATOR]:
+                continue
+        except:
+            pass
+        if user.id in SUPPORT_STAFF:
+            continue
+        captcha_info = captcha.get_captcha(chat)
+        captcha_type = captcha_info["captcha_type"]
+        is_already = cap_data.is_already_data(chat, user.id)
 
         mess = False
         try:
@@ -154,36 +189,40 @@ async def on_chat_members_updatess(c: Gojo, u: ChatMemberUpdated):
             mess = False
             is_already = False
 
-        if is_already and not mess:
+        if is_already and mess.empty:
             cap_data.del_message_id(chat, is_already)
-            return
+            continue
 
         try:
-            await c.restrict_chat_member(chat, user, ChatPermissions())
+            await c.restrict_chat_member(chat, user.id, ChatPermissions())
         except Exception as e:
             LOGGER.error(e)
             LOGGER.error(format_exc())
-            return
+            continue
 
         if not is_already:
+            captcha_type = "image" # I am not going to apply qr captcha in this update
             if captcha_type == "qr":
-                pic = await get_qr_captcha(chat, user)
-                cap = f"Please {userr.mention} scan this qr code with your phone to verify that you are human"
+                pic = await get_qr_captcha(chat, user.id, c.me.username)
+                cap = f"Please {user.mention} scan this qr code with your phone to verify that you are human"
                 ms = await c.send_photo(chat, pic, caption=cap)
-                cap_data.store_message_id(chat, user, ms.id)
-                return
+                os.remove(pic)
+                cap_data.store_message_id(chat, user.id, ms.id)
+                continue
             elif captcha_type == "image":
-                img, code = await get_image_captcha(chat, user)
-                cap = f"Please {userr.mention} please choose the correct code from the one given bellow\nYou have three tries if you get all three wrong u will be kicked from the chat.\nTries left: 3"
-                cap_data.load_cap_data(chat, user, code)
+                img, code = await get_image_captcha(chat, user.id)
+                cap = f"Please {user.mention} please choose the correct code from the one given bellow\nYou have three tries if you get all three wrong u will be banned from the chat.\nTries left: 3"
+                cap_data.load_cap_data(chat, user.id, code)
                 rand = [code]
                 while len(rand) != 5:
                     hehe = genrator()
+                    if hehe == code:
+                        continue
                     rand.append(hehe)
 
                 shuffle(rand)
 
-                ini = f"captcha_{chat}_{user}_"
+                ini = f"captcha_{chat}_{user.id}_"
 
                 kb = ikm(
                     [
@@ -205,7 +244,8 @@ async def on_chat_members_updatess(c: Gojo, u: ChatMemberUpdated):
                     ]
                 )
                 await c.send_photo(chat, img, caption=cap, reply_markup=kb)
-                return
+                os.remove(img)
+                continue
         elif is_already and mess:
             kb = ikm(
                 [
@@ -214,11 +254,11 @@ async def on_chat_members_updatess(c: Gojo, u: ChatMemberUpdated):
                     ]
                 ]
             )
-            await c.send_message(f"{userr.mention} your verification is already pending", reply_markup=kb)
-            return
+            await c.send_message(f"{user.mention} your verification is already pending", reply_markup=kb)
+            continue
         else:
-            await c.unban_chat_member(chat, user)
-            return
+            await c.unban_chat_member(chat, user.id)
+            continue
 
 
 __PLUGIN__ = "captcha"

Powers/plugins/flood.py

@@ -212,12 +212,17 @@ async def flood_set(c: Gojo, m: Message):
         c_id = m.chat.id
         if split[1].lower() in on_key:
             if is_flood:    
-                return await m.reply_text(f"Flood is on for this chat\n**Action**:{saction}\n**Messages**:{slimit} within {swithin} sec")
-            Flood.save_flood(m.chat.id, 5, 5, 'mute')
-            await m.reply_text("Flood protection has been started for this group.")
+                saction = is_flood[2]
+                slimit = is_flood[0]
+                swithin = is_flood[1]
+
+            await m.reply_text(f"Flood is on for this chat\n**Action**:{saction}\n**Messages**:{slimit} within {swithin} sec")
             return
         if split[1].lower() in off_key:
             x = Flood.rm_flood(c_id)
+            if not is_flood:
+                await m.reply_text("Flood protection is already off for this chat")
+                return
             if x:
                 await m.reply_text("Flood protection has been stopped for this chat")
                 return
@@ -322,8 +327,8 @@ async def callbacks(c: Gojo, q: CallbackQuery):
                     "Flood protection setting has been updated",
                     reply_markup=close_kb
                 )
-                return
                 await q.answer("skip")
+                return
             if not change == swithin:
                 Flood.save_flood(c_id, slimit, change, saction)
                 await q.answer("Updated", show_alert=True)
@@ -390,7 +395,7 @@ async def reverse_callbacks(c: Gojo, q: CallbackQuery):
         return
 
 dic = {}
-@Gojo.on_message(flood_filter & ~admin_filter, 18)
+@Gojo.on_message(flood_filter, 18)
 async def flood_watcher(c: Gojo, m: Message):
     c_id = m.chat.id
     
@@ -573,13 +578,14 @@ async def flood_watcher(c: Gojo, m: Message):
                 
             elif action == "kick":
                 try:
-                    await m.chat.ban_member(u_id, datetime.now()+timedelta(seconds=1))
-                    txt = "Don't dare to spam here if I am around! Nothing can escape my 6 eyes\nAction: kicked\nReason: Spaming"
+                    d = datetime.now()+timedelta(seconds=31) #will automatically unban user after 31 seconds kind of fail safe if unban members doesn't work properly
+                    await m.chat.ban_member(u_id, until_date=d)
+                    success = await c.unban_chat_member(m.chat.id, u_id)
+                    txt = f"Don't dare to spam here if I am around! Nothing can escape my 6 eyes\nAction: {'kicked' if success else 'banned for 30 seconds'}\nReason: Spaming"
                     await m.reply_animation(
                         animation=str(choice(KICK_GIFS)),
-                        caption=txt,
+                        caption=txt
                     )
-                    await m.chat.unban_member(m.from_user.id)
                     dic[c_id][u_id][1].clear()
                     dic[c_id][u_id][0].clear()
                     return
@@ -601,6 +607,12 @@ async def flood_watcher(c: Gojo, m: Message):
                     dic[c_id][u_id][1].clear()
                     dic[c_id][u_id][0].clear()
                     return
+                except Exception as e:
+                    LOGGER.error(e)
+                    LOGGER.error(format_exc())
+                    dic[c_id][u_id][1].clear()
+                    dic[c_id][u_id][0].clear()
+                    return
             elif action == "mute":
                 try:
                     await m.chat.restrict_member(

Powers/plugins/greetings.py

@@ -1,18 +1,19 @@
 from html import escape
 from secrets import choice
 from traceback import format_exc
+from typing import List
 
 from pyrogram import emoji, enums, filters
-from pyrogram.enums import ChatMemberStatus as CMS
 from pyrogram.errors import ChannelPrivate, ChatAdminRequired, RPCError
-from pyrogram.types import ChatMemberUpdated, Message
+from pyrogram.types import Message, User
 
 from Powers import DEV_USERS, LOGGER
 from Powers.bot_class import Gojo
 from Powers.database.antispam_db import GBan
 from Powers.database.greetings_db import Greetings
 from Powers.utils.cmd_senders import send_cmd
-from Powers.utils.custom_filters import admin_filter, bot_admin_filter, command
+from Powers.utils.custom_filters import (admin_filter, bot_admin_filter,
+                                         captcha_filter, command)
 from Powers.utils.kbhelpers import ikb
 from Powers.utils.msg_types import Types, get_wlcm_type
 from Powers.utils.parser import escape_markdown, mention_html
@@ -25,17 +26,13 @@ gdb = GBan()
 ChatType = enums.ChatType
 
 
-async def escape_mentions_using_curly_brackets_wl(
-    m: ChatMemberUpdated,
-    n: bool,
+async def  escape_mentions_using_curly_brackets_wl(
+    user: User,
+    m: Message,
     text: str,
     parse_words: list,
 ) -> str:
     teks = await escape_invalid_curly_brackets(text, parse_words)
-    if n:
-        user = m.new_chat_member.user if m.new_chat_member else m.from_user
-    else:
-        user = m.old_chat_member.user if m.old_chat_member else m.from_user
     if teks:
         teks = teks.format(
             first=escape(user.first_name),
@@ -235,113 +232,101 @@ async def cleannnnn(_, m: Message):
     except Exception:
         pass
 
-
-@Gojo.on_chat_member_updated(filters.group, group=69)
-async def member_has_joined(c: Gojo, member: ChatMemberUpdated):
-
-    if member.old_chat_member.status not in {CMS.MEMBER, CMS.OWNER, CMS.ADMINISTRATOR}:
-        pass
-    else:
-        return
-
-    user = member.new_chat_member.user if member.new_chat_member else member.from_user
-
-    db = Greetings(member.chat.id)
-    banned_users = gdb.check_gban(user.id)
-    try:
-        if user.id == c.me.id:
-            return
-        if user.id in DEV_USERS:
-            await c.send_animation(
-                chat_id=member.chat.id,
-                animation="./extras/william.gif",
-                caption=f"😳 My **DEV** {user.mention} has also joined the chat!",
-            )
-            return
-        if banned_users:
-            await member.chat.ban_member(user.id)
-            await c.send_message(
-                member.chat.id,
-                f"{user.mention} was globally banned so i banned!",
-            )
-            return
-        if user.is_bot:
-            return  # ignore bots
-    except ChatAdminRequired:
-        return
-    status = db.get_welcome_status()
-    oo = db.get_welcome_text()
-    UwU = db.get_welcome_media()
-    mtype = db.get_welcome_msgtype()
-    parse_words = [
-        "first",
-        "last",
-        "fullname",
-        "username",
-        "mention",
-        "id",
-        "chatname",
-    ]
-    hmm = await escape_mentions_using_curly_brackets_wl(member, True, oo, parse_words)
-    if status:
-        tek, button = await parse_button(hmm)
-        button = await build_keyboard(button)
-        button = ikb(button) if button else None
-
-        if "%%%" in tek:
-            filter_reply = tek.split("%%%")
-            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:
-            try:
-                await c.delete_messages(member.chat.id, int(ifff))
-            except RPCError:
-                pass
-        if not teks:
-            teks = "Hey {first}, welcome to {chatname}"
+@Gojo.on_message(filters.group & filters.new_chat_members & ~captcha_filter, group=69)
+async def member_has_joined(c: Gojo, m: Message):
+    users: List[User] = m.new_chat_members
+    db = Greetings(m.chat.id)
+    for user in users:
+        banned_users = gdb.check_gban(user.id)
         try:
-            if not UwU:
-                jj = await c.send_message(
-                    member.chat.id,
-                    text=teks,
-                    reply_markup=button,
-                    disable_web_page_preview=True,
+            if user.id == c.me.id:
+                continue
+            if user.id in DEV_USERS:
+                await c.send_animation(
+                    chat_id=m.chat.id,
+                    animation="./extras/william.gif",
+                    caption=f"😳 My **DEV** {user.mention} has also joined the chat!",
                 )
-            elif UwU:
-                jj = await (await send_cmd(c,mtype))(
-                    member.chat.id,
-                    UwU,
-                    caption=teks,
-                    reply_markup=button,
+                continue
+            if banned_users:
+                await m.chat.ban_member(user.id)
+                await c.send_message(
+                    m.chat.id,
+                    f"{user.mention} was globally banned so i banned!",
                 )
+                continue
+            if user.is_bot:
+                continue # ignore bots
+        except ChatAdminRequired:
+            continue
+        status = db.get_welcome_status()
+        oo = db.get_welcome_text()
+        UwU = db.get_welcome_media()
+        mtype = db.get_welcome_msgtype()
+        parse_words = [
+            "first",
+            "last",
+            "fullname",
+            "username",
+            "mention",
+            "id",
+            "chatname",
+        ]
+        hmm = await escape_mentions_using_curly_brackets_wl(user, m, oo, parse_words)
+        if status:
+            tek, button = await parse_button(hmm)
+            button = await build_keyboard(button)
+            button = ikb(button) if button else None
+
+            if "%%%" in tek:
+                filter_reply = tek.split("%%%")
+                teks = choice(filter_reply)
+            else:
+                teks = tek
+
+            if not teks:
+                teks = f"A wild {user.mention} appeared in {m.chat.title}! Everyone be aware."
+
+            ifff = db.get_current_cleanwelcome_id()
+            gg = db.get_current_cleanwelcome_settings()
+            if ifff and gg:
+                try:
+                    await c.delete_messages(m.chat.id, int(ifff))
+                except RPCError:
+                    pass
+            if not teks:
+                teks = "Hey {first}, welcome to {chatname}"
+            try:
+                if not UwU:
+                    jj = await c.send_message(
+                        m.chat.id,
+                        text=teks,
+                        reply_markup=button,
+                        disable_web_page_preview=True,
+                    )
+                elif UwU:
+                    jj = await (await send_cmd(c,mtype))(
+                        m.chat.id,
+                        UwU,
+                        caption=teks,
+                        reply_markup=button,
+                    )
+
+                if jj:
+                    db.set_cleanwlcm_id(int(jj.id))
+            except ChannelPrivate:
+                continue
+            except RPCError as e:
+                LOGGER.error(e)
+                LOGGER.error(format_exc(e))
+                continue
+        else:
+            continue
 
-            if jj:
-                db.set_cleanwlcm_id(int(jj.id))
-        except ChannelPrivate:
-            return
-        except RPCError as e:
-            LOGGER.error(e)
-            LOGGER.error(format_exc(e))
-            return
-    else:
-        return
-
-
-@Gojo.on_chat_member_updated(filters.group, group=99)
-async def member_has_left(c: Gojo, member: ChatMemberUpdated):
 
-    if member.old_chat_member.status not in [CMS.LEFT, CMS.BANNED, CMS.RESTRICTED]:
-        pass
-    else:
-        return
-    db = Greetings(member.chat.id)
+@Gojo.on_message(filters.group & filters.left_chat_member, group=99)
+async def member_has_left(c: Gojo, m: Message):
+    db = Greetings(m.chat.id)
     status = db.get_goodbye_status()
     oo = db.get_goodbye_text()
     UwU = db.get_goodbye_media()
@@ -356,9 +341,9 @@ async def member_has_left(c: Gojo, member: ChatMemberUpdated):
         "chatname",
     ]
 
-    user = member.old_chat_member.user if member.old_chat_member else member.from_user
+    user = m.left_chat_member if m.left_chat_member else m.from_user
 
-    hmm = await escape_mentions_using_curly_brackets_wl(member, False, oo, parse_words)
+    hmm = await escape_mentions_using_curly_brackets_wl(user, m, oo, parse_words)
     if status:
         tek, button = await parse_button(hmm)
         button = await build_keyboard(button)
@@ -377,12 +362,12 @@ async def member_has_left(c: Gojo, member: ChatMemberUpdated):
         iii = db.get_current_cleangoodbye_settings()
         if ifff and iii:
             try:
-                await c.delete_messages(member.chat.id, int(ifff))
+                await c.delete_messages(m.chat.id, int(ifff))
             except RPCError:
                 pass
         if user.id in DEV_USERS:
             await c.send_message(
-                member.chat.id,
+                m.chat.id,
                 f"Will miss you my master {user.mention} :(",
             )
             return
@@ -391,14 +376,14 @@ async def member_has_left(c: Gojo, member: ChatMemberUpdated):
         try:
             if not UwU:
                 ooo = await c.send_message(
-                    member.chat.id,
+                    m.chat.id,
                     text=teks,
                     reply_markup=button,
                     disable_web_page_preview=True,
                 )
             elif UwU:
                 ooo = await (await send_cmd(c,mtype))(
-                    member.chat.id,
+                    m.chat.id,
                     UwU,
                     caption=teks,
                     reply_markup=button,

Powers/plugins/locks.py

@@ -464,10 +464,9 @@ async def is_approved_user(c: Gojo, m: Message):
             return True
         return False
     elif m.forward_from_chat:
-        x_chat = (await c.get_chat(m.forward_from_chat.id)).linked_chat
         if m.from_user and (m.from_user.id in ul or m.from_user.id in SUDO_LEVEL or m.from_user.id in admins_group or m.from_user.id == c.me.id):
             return True
-        elif x_chat and x_chat.id == m.chat.id:
+        elif m.automatic_forward:
             return True
         else:
             return False

Powers/plugins/scheduled_jobs.py

@@ -38,14 +38,12 @@ async def send_wishish(JJK: Client):
                     agee = ""
                     if i["is_year"]:
                         agee = curr.year - dob.year
-                        if str(agee).endswith("1"):
-                            agee = f"{agee}st"
-                        elif str(agee).endswith("2"):
-                            agee = f"{agee}nd"
-                        elif str(agee).endswith("3"):
-                            agee = f"{agee}rd"
+                        suffix = {1: 'st', 2: 'nd', 3: 'rd'}
+                        if int(agee/10) == 1:
+                            suf = "th"
                         else:
-                            agee = f"{agee}th"
+                            suffix.get((agee%10), "th")
+                        agee = f"{agee}{suf}"
                     U = await JJK.get_chat_member(chat_id=j,user_id=i["user_id"])
                     wish = choice(birthday_wish)
                     if U.status in [ChatMemberStatus.MEMBER,ChatMemberStatus.ADMINISTRATOR, ChatMemberStatus.OWNER]:

Powers/plugins/start.py

@@ -14,6 +14,7 @@ from Powers import (DEV_USERS, HELP_COMMANDS, LOGGER, OWNER_ID, PREFIX_HANDLER,
                     PYROGRAM_VERSION, PYTHON_VERSION, SUDO_USERS, UPTIME,
                     VERSION, WHITELIST_USERS)
 from Powers.bot_class import Gojo
+from Powers.database.captcha_db import CAPTCHA_DATA
 from Powers.utils.custom_filters import command
 from Powers.utils.extras import StartPic
 from Powers.utils.kbhelpers import ikb
@@ -69,7 +70,8 @@ async def start(c: Gojo, m: Message):
 
     if m.chat.type == ChatType.PRIVATE:
         if len(m.text.strip().split()) > 1:
-            help_option = (m.text.split(None, 1)[1]).lower()
+            arg = m.text.split(None, 1)[1]
+            help_option = arg.lower()
 
             if help_option.startswith("note") and (
                 help_option not in ("note", "notes")
@@ -83,9 +85,7 @@ async def start(c: Gojo, m: Message):
 
             help_msg, help_kb = await get_help_msg(c, m, help_option)
 
-            if not help_msg:
-                return
-            elif help_msg:
+            if help_msg:
                 await m.reply_photo(
                     photo=str(choice(StartPic)),
                     caption=help_msg,
@@ -94,8 +94,8 @@ async def start(c: Gojo, m: Message):
                     quote=True,
                 )
                 return
-            if len(help_option.split("_", 1)) == 2:
-                if help_option.split("_")[1] == "help":
+            if len(arg.split("_", 1)) >= 2:
+                if arg.split("_")[1] == "help":
                     await m.reply_photo(
                         photo=str(choice(StartPic)),
                         caption=help_msg,
@@ -104,9 +104,9 @@ async def start(c: Gojo, m: Message):
                         quote=True,
                     )
                     return
-                elif help_option.split("_", 1)[0] == "qrcaptcha":
+                elif arg.split("_", 1)[0] == "qr":
                     decoded = encode_decode(
-                        help_option.split("_", 1)[1], "decode")
+                        arg.split("_", 1)[1], "decode")
                     decode = decoded.split(":")
                     chat = decode[0]
                     user = decode[1]
@@ -115,9 +115,25 @@ async def start(c: Gojo, m: Message):
                         return
                     try:
                         await c.unban_chat_member(int(chat), int(user))
+                        msg = CAPTCHA_DATA().del_message_id(chat, user)
+                        try:
+                            chat_ = await c.get_chat(chat)
+                            kb = ikb(
+                                [
+                                    [
+                                        "Link to chat",
+                                        f"{chat_.invite_link}",
+                                        "url"
+                                    ]
+                                ]
+                            )
+                        except:
+                            chat_ = False
+                            kb = None
+                        await m.reply_text("You can now talk in the chat", reply_markup=kb)
                         try:
-                            os.remove(f"captcha_verification{chat}_{user}.png")
-                        except Exception:
+                            await c.delete_messages(chat, msg)
+                        except:
                             pass
                         return
                     except Exception:

Powers/plugins/stickers.py

@@ -173,7 +173,6 @@ async def kang(c:Gojo, m: Message):
                 volume += 1
                 continue
             try:
-                print(sticker_set)
                 await add_sticker_to_set(c,sticker_set,sticker)
                 packname_found = True
             except StickerEmojiInvalid:
@@ -326,7 +325,7 @@ async def get_sticker_from_file(c: Gojo, m: Message):
             upp = await repl.download()
             up = toimage(upp,is_direc=True)
             await x.delete()
-            await m.reply_photo(up,caption=Caption)
+            await m.reply_document(up, caption=Caption)
             os.remove(up)
             return
     elif repl.photo:

Powers/utils/captcha_helper.py

@@ -2,20 +2,17 @@ from random import choice, randint, randrange
 
 import qrcode
 from captcha.image import ImageCaptcha
-from pyrogram.types import InlineKeyboardButton as IKB
-from pyrogram.types import InlineKeyboardMarkup as IKM
 
 from Powers.database.captcha_db import CAPTCHA_DATA
 from Powers.utils.string import encode_decode
-from Powers.vars import Config
 
-initial = f"t.me/{Config.BOT_USERNAME}?start=qrcaptcha_"
 captchaa = CAPTCHA_DATA()
 
 
-async def get_qr_captcha(chat, user):
+async def get_qr_captcha(chat, user, username):
+    initial = f"t.me/{username}?start=qr_"
     encode = f"{chat}:{user}"
-    encoded = encode_decode(encode)
+    encoded = await encode_decode(encode)
     final = initial+encoded
     qr = qrcode.make(final)
     name = f"captcha_verification{chat}_{user}.png"
@@ -42,7 +39,7 @@ def genrator():
     str_ = ""
     while len(str_) != 4:
         OwO = choice(list_)
-        str_ += OwO
+        str_ += str(OwO)
     return str_
 
 
@@ -55,4 +52,4 @@ async def get_image_captcha(chat, user):
     cap = image.generate(str_)
     image.write(str_, name)
 
-    return name, str_
+    return name, str_

Powers/utils/custom_filters.py

@@ -14,6 +14,7 @@ from Powers.bot_class import Gojo
 from Powers.database.afk_db import AFK
 from Powers.database.approve_db import Approve
 from Powers.database.autojoin_db import AUTOJOIN
+from Powers.database.captcha_db import CAPTCHA
 from Powers.database.disable_db import Disabling
 from Powers.database.flood_db import Floods
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
@@ -329,12 +330,19 @@ async def afk_check_filter(_, __, m: Message):
         return False
 
     afk = AFK()
-    user = m.from_user.id
     chat = m.chat.id
+    is_repl_afk = None
+    if m.reply_to_message:
+        repl_user = m.reply_to_message.from_user
+        if repl_user:
+            repl_user = m.reply_to_message.from_user.id
+            is_repl_afk = afk.check_afk(chat, repl_user)
+
+    user = m.from_user.id
 
     is_afk = afk.check_afk(chat, user)
 
-    if not is_afk:
+    if not (is_afk or is_repl_afk):
         return False
     else:
         return True
@@ -354,19 +362,36 @@ async def flood_check_filter(_, __, m: Message):
     u_id = m.from_user.id
     c_id = m.chat.id
     is_flood = Flood.is_chat(c_id)
-
+    if not is_flood:
+        return False
+    try:
+        admin_group = {i[0] for i in ADMIN_CACHE[m.chat.id]}
+    except KeyError:
+        admin_group = {
+            i[0] for i in await admin_cache_reload(m, "custom_filter_update")
+        }
     app_users = Approve(m.chat.id).list_approved()
     SUDO_LEVEL = DEV_USERS.union(SUDO_USERS)
 
-    if not is_flood or u_id in SUDO_LEVEL:
+    if u_id in SUDO_LEVEL:
         return False
 
+    elif u_id in admin_group:
+        return False
+    
     elif u_id in {i[0] for i in app_users}:
         return False
 
     else:
         return True
 
+async def captcha_filt(_, __, m: Message):
+    try:
+        return CAPTCHA().is_captcha(m.chat.id)
+    except:
+        return False
+
+captcha_filter = create(captcha_filt)
 flood_filter = create(flood_check_filter)
 afk_filter = create(afk_check_filter)
 auto_join_filter = create(auto_join_check_filter)

Powers/utils/sticker_help.py

@@ -349,14 +349,14 @@ async def draw_meme(image_path: str, text: str, sticker: bool, fiill: str) -> li
 
 
 def toimage(image, filename=None, is_direc=False):
-    filename = filename if filename else "gojo.jpg"
+    filename = filename if filename else "gojo.png"
     if is_direc:
         os.rename(image, filename)
         return filename
     img = Image.open(image)
     if img.mode != "RGB":
         img = img.convert("RGB")
-    img.save(filename, "jpeg")
+    img.save(filename, "png")
     os.remove(image)
     return filename
 

requirements.txt

@@ -16,7 +16,7 @@ pillow == 10.1.0
 prettyconf==2.2.1
 pyaes==1.6.1
 pymongo==4.6.1
-git+https://github.com/KurimuzonAkuma/[email protected].30
+git+https://github.com/KurimuzonAkuma/[email protected].32
 pysocks==1.7.1
 python-dateutil==2.8.2
 pytube==15.0.0