From 167e9f33d770421ef6f95ddd75d36b934d4103b6 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 01:17:09 +0000 Subject: [PATCH] feat: Updated modules/admintool.py --- modules/admintool.py | 67 ++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/modules/admintool.py b/modules/admintool.py index 6b39621..41e9937 100644 --- a/modules/admintool.py +++ b/modules/admintool.py @@ -379,9 +379,9 @@ async def kick_command(client: Client, message: Message): + f"\n{'Cause: ' + text_c.split(maxsplit=1)[1] + '' if len(text_c.split()) > 1 else ''}" ) except UserAdminInvalid: - await message.edit("No rights") + await message.edit(NO_RIGHTS) except ChatAdminRequired: - await message.edit("No rights") + await message.edit(NO_RIGHTS) except Exception as e: await message.edit(format_exc(e)) else: @@ -429,9 +429,19 @@ async def kick_command(client: Client, message: Message): + f"\n{'Cause: ' + text_c.split(' ', maxsplit=2)[2] + '' if len(text_c.split()) > 2 else ''}" ) except UserAdminInvalid: - await message.edit("No rights") + await message.edit(NO_RIGHTS) except ChatAdminRequired: - await message.edit("No rights") + await message.edit(NO_RIGHTS) + except PeerIdInvalid: + await message.edit(USER_NOT_FOUND) + except UsernameInvalid: + await message.edit(USER_NOT_FOUND) + except IndexError: + await message.edit(USER_NOT_FOUND) + else: + await message.edit(USER_ID_OR_USERNAME) + else: + await message.edit(UNSUPPORTED) except Exception as e: await message.edit(format_exc(e)) except PeerIdInvalid: @@ -443,7 +453,7 @@ async def kick_command(client: Client, message: Message): else: await message.edit("user_id or username") else: - await message.edit("Unsupported") + await message.edit(UNSUPPORTED) @Client.on_message(filters.command(["kickdel"], prefix) & filters.me) @@ -517,19 +527,18 @@ async def tmute_command(client: Client, message: Message): await message.edit(f"{name} already in tmute") except PeerIdInvalid: - await message.edit("User is not found") + await message.edit(USER_NOT_FOUND) except UsernameInvalid: - await message.edit("User is not found") + await message.edit(USER_NOT_FOUND) except IndexError: - await message.edit("User is not found") + await message.edit(USER_NOT_FOUND) else: - await message.edit("user_id or username") + await message.edit(USER_ID_OR_USERNAME) else: - await message.edit("Unsupported") + await message.edit(UNSUPPORTED) update_cache() - @Client.on_message(filters.command(["tunmute"], prefix) & filters.me) async def tunmute_command(client: Client, message: Message): cause = text(message) @@ -580,19 +589,18 @@ async def tunmute_command(client: Client, message: Message): + f"\n{'Cause: ' + cause.split(maxsplit=2)[2] + '' if len(cause.split()) > 2 else ''}" ) except PeerIdInvalid: - await message.edit("User is not found") + await message.edit(USER_NOT_FOUND) except UsernameInvalid: - await message.edit("User is not found") + await message.edit(USER_NOT_FOUND) except IndexError: - await message.edit("User is not found") + await message.edit(USER_NOT_FOUND) else: - await message.edit("user_id or username") + await message.edit(USER_ID_OR_USERNAME) else: - await message.edit("Unsupported") + await message.edit(UNSUPPORTED) update_cache() - @Client.on_message(filters.command(["tmute_users"], prefix) & filters.me) async def tunmute_users_command(client: Client, message: Message): if message.chat.type not in ["private", "channel"]: @@ -656,7 +664,7 @@ async def unmute_command(client, message): except UserAdminInvalid: await message.edit(NO_RIGHTS) except ChatAdminRequired: - await message.edit("No rights") + await message.edit(NO_RIGHTS) except Exception as e: await message.edit(format_exc(e)) else: @@ -678,7 +686,7 @@ async def unmute_command(client, message): + f"\n{'Cause: ' + cause.split(' ', maxsplit=2)[2] + '' if len(cause.split()) > 2 else ''}" ) except UserAdminInvalid: - await message.edit("No rights") + await message.edit(NO_RIGHTS) except ChatAdminRequired: await message.edit("No rights") except Exception as e: @@ -686,9 +694,9 @@ async def unmute_command(client, message): except PeerIdInvalid: await message.edit(USER_NOT_FOUND) except UsernameInvalid: - await message.edit("User is not found") + await message.edit(USER_NOT_FOUND) except IndexError: - await message.edit("User is not found") + await message.edit(USER_NOT_FOUND) else: await message.edit(USER_ID_OR_USERNAME) else: @@ -759,7 +767,7 @@ async def mute_command(client: Client, message: Message): except UserAdminInvalid: await message.edit(NO_RIGHTS) except ChatAdminRequired: - await message.edit("No rights") + await message.edit(NO_RIGHTS) except Exception as e: await message.edit(format_exc(e)) elif not message.reply_to_message and message.chat.type not in [ @@ -831,15 +839,15 @@ async def mute_command(client: Client, message: Message): except UserAdminInvalid: await message.edit(NO_RIGHTS) except ChatAdminRequired: - await message.edit("No rights") + await message.edit(NO_RIGHTS) except Exception as e: await message.edit(format_exc(e)) except PeerIdInvalid: await message.edit(USER_NOT_FOUND) except UsernameInvalid: - await message.edit("User is not found") + await message.edit(USER_NOT_FOUND) except IndexError: - await message.edit("User is not found") + await message.edit(USER_NOT_FOUND) else: await message.edit(USER_ID_OR_USERNAME) else: @@ -873,7 +881,7 @@ async def demote_command(client: Client, message: Message): except UserAdminInvalid: await message.edit(NO_RIGHTS) except ChatAdminRequired: - await message.edit("No rights") + await message.edit(NO_RIGHTS) except Exception as e: await message.edit(format_exc(e)) elif not message.reply_to_message and message.chat.type not in [ @@ -906,20 +914,19 @@ async def demote_command(client: Client, message: Message): except UserAdminInvalid: await message.edit(NO_RIGHTS) except ChatAdminRequired: - await message.edit("No rights") + await message.edit(NO_RIGHTS) except Exception as e: await message.edit(format_exc(e)) except PeerIdInvalid: await message.edit(USER_NOT_FOUND) except UsernameInvalid: - await message.edit("User is not found") + await message.edit(USER_NOT_FOUND) except IndexError: - await message.edit("User is not found") + await message.edit(USER_NOT_FOUND) else: await message.edit(USER_ID_OR_USERNAME) else: await message.edit(UNSUPPORTED) - await message.edit("Unsupported") @Client.on_message(filters.command(["promote"], prefix) & filters.me)