diff --git a/modules/afk.py b/modules/afk.py index dbccd38..4f6a749 100644 --- a/modules/afk.py +++ b/modules/afk.py @@ -107,7 +107,7 @@ async def collect_afk_messages(bot: Client, message: Message): @Client.on_message(filters.command("afk", prefix) & filters.me, group=3) -async def afk_set(bot: Client, message: Message): +async def afk_set(_, message: Message): global AFK_REASON, AFK, AFK_TIME cmd = message.command @@ -126,7 +126,7 @@ async def afk_set(bot: Client, message: Message): @Client.on_message(filters.command("afk", "!") & filters.me, group=3) -async def afk_unset(bot: Client, message: Message): +async def afk_unset(_, message: Message): global AFK, AFK_TIME, AFK_REASON, USERS, GROUPS if AFK: @@ -146,7 +146,7 @@ async def afk_unset(bot: Client, message: Message): @Client.on_message(filters.me, group=3) -async def auto_afk_unset(bot: Client, message: Message): +async def auto_afk_unset(_, message: Message): global AFK, AFK_TIME, AFK_REASON, USERS, GROUPS if AFK: diff --git a/modules/antipm.py b/modules/antipm.py index 8239670..c127599 100644 --- a/modules/antipm.py +++ b/modules/antipm.py @@ -46,12 +46,12 @@ async def anti_pm_handler(client: Client, message: Message): m_n = 0 warns = db.get("core.antipm", "warns", m_n) user_id = message.from_user.id - id = message.chat.id + ids = message.chat.id b_f = await client.get_me() u_n = b_f.first_name - user = await client.get_users(id) + user = await client.get_users(ids) u_f = user.first_name - user_info = await client.resolve_peer(message.chat.id) + user_info = await client.resolve_peer(ids) default_text = f"""Hello, {u_f}! This is the Assistant Of {u_n}. My Boss is away or busy as of now, You can wait for him to respond. @@ -66,9 +66,9 @@ Do not spam further messages else I may have to block you! await client.block_user(user_info) if db.get("core.antipm", f"disallowusers{id}") == user_id != db.get( - "core.antipm", f"allowusers{id}" + "core.antipm", f"allowusers{ids}" ) or db.get("core.antipm", f"disallowusers{id}") != user_id != db.get( - "core.antipm", f"allowusers{id}" + "core.antipm", f"allowusers{ids}" ): await client.send_message(message.chat.id, f"{default_text}") @@ -162,20 +162,20 @@ async def antipm_block(_, message: Message): @Client.on_message(filters.command(["a"], prefix) & filters.me) -async def add_contact(client: Client, message: Message): - id = message.chat.id +async def add_contact(_, message: Message): + ids = message.chat.id - db.set("core.antipm", f"allowusers{id}", id) + db.set("core.antipm", f"allowusers{ids}", ids) db.set("core.antipm", "warns", 0) await message.edit("User Approved!") @Client.on_message(filters.command(["d"], prefix) & filters.me) -async def del_contact(client: Client, message: Message): - id = message.chat.id +async def del_contact(_, message: Message): + ids = message.chat.id - db.set("core.antipm", f"disallowusers{id}", id) - db.remove("core.antipm", f"allowusers{id}") + db.set("core.antipm", f"disallowusers{ids}", ids) + db.remove("core.antipm", f"allowusers{ids}") await message.edit("User DisApproved!") diff --git a/modules/chatbot.py b/modules/chatbot.py index 276e43b..5d606f1 100644 --- a/modules/chatbot.py +++ b/modules/chatbot.py @@ -14,7 +14,7 @@ chatai_users = db.getaiusers() @Client.on_message(filters.command("addai", prefix) & filters.me) -async def adduser(client: Client, message: Message): +async def adduser(_, message: Message): if len(message.command) > 1: user_id = message.text.split(maxsplit=1)[1] if user_id.isdigit(): @@ -31,7 +31,7 @@ async def adduser(client: Client, message: Message): @Client.on_message(filters.command("remai", prefix) & filters.me) -async def remuser(client: Client, message: Message): +async def remuser(_, message: Message): if len(message.command) > 1: user_id = message.text.split(maxsplit=1)[1] if user_id.isdigit(): @@ -48,7 +48,7 @@ async def remuser(client: Client, message: Message): @Client.on_message(filters.user(users=chatai_users) & filters.text) -async def chatbot(client: Client, message: Message): +async def chatbot(_, message: Message): user_id = message.chat.id if user_id in chatai_users: @@ -84,14 +84,14 @@ async def chatbot(client: Client, message: Message): @Client.on_message(filters.command("chatoff", prefix) & filters.me) -async def chatoff(client: Client, message: Message): +async def chatoff(_, message: Message): db.remove("core.chatbot", "chatai_users") await message.reply_text("ChatBot is off now") restart() @Client.on_message(filters.command("listai", prefix) & filters.me) -async def listai(client: Client, message: Message): +async def listai(_, message: Message): await message.edit_text( f"User ID's Currently in AI ChatBot List:\n {chatai_users}" ) diff --git a/modules/filters.py b/modules/filters.py index 04e2159..78dfbf5 100644 --- a/modules/filters.py +++ b/modules/filters.py @@ -201,7 +201,7 @@ async def filter_handler(client: Client, message: Message): @Client.on_message(filters.command(["filters"], prefix) & filters.me) -async def filters_handler(client: Client, message: Message): +async def filters_handler(_, message: Message): try: text = "" for index, a in enumerate(get_filters_chat(message.chat.id).items(), start=1): @@ -218,7 +218,7 @@ async def filters_handler(client: Client, message: Message): @Client.on_message( filters.command(["delfilter", "filterdel", "fdel"], prefix) & filters.me ) -async def filter_del_handler(client: Client, message: Message): +async def filter_del_handler(_, message: Message): try: if len(message.text.split()) < 2: return await message.edit( @@ -240,7 +240,7 @@ async def filter_del_handler(client: Client, message: Message): @Client.on_message(filters.command(["fsearch"], prefix) & filters.me) -async def filter_search_handler(client: Client, message: Message): +async def filter_search_handler(_, message: Message): try: if len(message.text.split()) < 2: return await message.edit( diff --git a/modules/id.py b/modules/id.py index 0f0071c..04bd9c4 100644 --- a/modules/id.py +++ b/modules/id.py @@ -19,51 +19,60 @@ from pyrogram.types import Message from utils.misc import modules_help, prefix + @Client.on_message(filters.command("id", prefix) & filters.me) -async def id(client: Client, message: Message): - text = "\n".join( - [ - f"Chat ID: `{message.chat.id}`", - f"Chat DC ID: `{message.chat.dc_id}`\n", - f"Message ID: `{message.id}`", - (f"Your ID: `{message.from_user.id}`" if message.from_user else f"Channel/Group ID: `{message.sender_chat.id}`"), - (f"Your DC ID: `{message.from_user.dc_id}`" if message.from_user else f"Channel/Group ID: `{message.sender_chat.id}`"), - ] - ) +async def ids(_, message: Message): + text = "\n".join( + [ + f"Chat ID: `{message.chat.id}`", + f"Chat DC ID: `{message.chat.dc_id}`\n", + f"Message ID: `{message.id}`", + ( + f"Your ID: `{message.from_user.id}`" + if message.from_user + else f"Channel/Group ID: `{message.sender_chat.id}`" + ), + ( + f"Your DC ID: `{message.from_user.dc_id}`" + if message.from_user + else f"Channel/Group ID: `{message.sender_chat.id}`" + ), + ] + ) - if (rtm := message.reply_to_message): - text += f"\n\nReplied Message ID: `{rtm.id}`" + if rtm := message.reply_to_message: + text += f"\n\nReplied Message ID: `{rtm.id}`" - if (user := rtm.from_user): - text = "\n".join( - [ - text, - f"Replied User ID: `{user.id}`", - f"Replied User DC ID: `{user.dc_id}`" - ] - ) + if user := rtm.from_user: + text = "\n".join( + [ + text, + f"Replied User ID: `{user.id}`", + f"Replied User DC ID: `{user.dc_id}`", + ] + ) - else: - text = "\n".join( - [ - text, - f"Replied Chat ID: `{rtm.sender_chat.id}`", - f"Replied Chat DC ID: `{rtm.sender_chat.dc_id}`" - ] - ) + else: + text = "\n".join( + [ + text, + f"Replied Chat ID: `{rtm.sender_chat.id}`", + f"Replied Chat DC ID: `{rtm.sender_chat.dc_id}`", + ] + ) - if rtm.forward_date and (ffc := rtm.forward_from_chat): - text = "\n".join( - [ - text, - f"\nForwarded Message ID: `{rtm.forward_from_message_id}`", - f"Forwarded from Chat ID: `{ffc.id}`", - f"Forwarded from Chat DC ID: `{ffc.dc_id}`", - ] - ) + if rtm.forward_date and (ffc := rtm.forward_from_chat): + text = "\n".join( + [ + text, + f"\nForwarded Message ID: `{rtm.forward_from_message_id}`", + f"Forwarded from Chat ID: `{ffc.id}`", + f"Forwarded from Chat DC ID: `{ffc.dc_id}`", + ] + ) + await message.edit("**__" + text + "__**", parse_mode=enums.ParseMode.MARKDOWN) - await message.edit("**__" + text + "__**", parse_mode=enums.ParseMode.MARKDOWN) modules_help["id"] = { "id": "simply run or reply to message", diff --git a/modules/vt.py b/modules/vt.py index f18c346..1ca4ce8 100644 --- a/modules/vt.py +++ b/modules/vt.py @@ -19,7 +19,7 @@ from utils.scripts import edit_or_reply, format_exc, progress @Client.on_message(filters.command("vt", prefix) & filters.me) -async def scan_my_file(client: Client, message: Message): +async def scan_my_file(_, message: Message): ms_ = await edit_or_reply(message, "`Please Wait! Scanning This File`") if not message.reply_to_message: return await ms_.edit( @@ -64,7 +64,7 @@ async def scan_my_file(client: Client, message: Message): @Client.on_message(filters.command("vtl", prefix) & filters.me) -async def scan_my_large_file(client: Client, message: Message): +async def scan_my_large_file(_, message: Message): ms_ = await edit_or_reply(message, "`Please Wait! Scanning This File`") if not message.reply_to_message: return await ms_.edit(