|
|
@@ -36,17 +36,14 @@ from wbb.utils.functions import extract_user, extract_user_and_reason
|
|
|
__MODULE__ = "Admin"
|
|
|
__HELP__ = """/ban - Ban A User
|
|
|
/dban - Delete the replied message banning its sender
|
|
|
-/sban - Ban a user silently
|
|
|
/unban - Unban A User
|
|
|
/warn - Warn A User
|
|
|
/dwarn - Delete the replied message warning its sender
|
|
|
-/swarn - Warn a user silently
|
|
|
/rmwarn - Remove 1 Warning Of A User
|
|
|
/rmwarns - Remove All Warning of A User
|
|
|
/warns - Show Warning Of A User
|
|
|
/kick - Kick A User
|
|
|
/dkick - Delete the replied message kicking its sender
|
|
|
-/skick - Kick a user silently
|
|
|
/purge - Purge Messages
|
|
|
/del - Delete Replied Message
|
|
|
/promote - Promote A Member
|
|
|
@@ -176,7 +173,7 @@ async def purgeFunc(client, message: Message):
|
|
|
|
|
|
|
|
|
@app.on_message(
|
|
|
- filters.command(["kick", "skick", "dkick"]) & ~filters.edited & ~filters.private
|
|
|
+ filters.command(["kick", "dkick"]) & ~filters.edited & ~filters.private
|
|
|
)
|
|
|
@adminsOnly("can_restrict_members")
|
|
|
async def kickFunc(_, message: Message):
|
|
|
@@ -200,13 +197,10 @@ async def kickFunc(_, message: Message):
|
|
|
**Kicked User:** {mention}
|
|
|
**Kicked By:** {message.from_user.mention if message.from_user else 'Anon'}
|
|
|
**Reason:** {reason or 'No Reason Provided.'}"""
|
|
|
- await message.chat.kick_member(user_id)
|
|
|
- if message.command[0][0] in ("s", "d"):
|
|
|
+ if message.command[0][0] == "d":
|
|
|
await message.reply_to_message.delete()
|
|
|
- if message.command[0][0] == "s":
|
|
|
- await message.delete()
|
|
|
- if message.command[0][0] != "s":
|
|
|
- await message.reply_text(msg)
|
|
|
+ await message.chat.kick_member(user_id)
|
|
|
+ await message.reply_text(msg)
|
|
|
await asyncio.sleep(1)
|
|
|
await message.chat.unban_member(user_id)
|
|
|
|
|
|
@@ -215,7 +209,7 @@ async def kickFunc(_, message: Message):
|
|
|
|
|
|
|
|
|
@app.on_message(
|
|
|
- filters.command(["ban", "sban", "dban"]) & ~filters.edited & ~filters.private
|
|
|
+ filters.command(["ban", "dban"]) & ~filters.edited & ~filters.private
|
|
|
)
|
|
|
@adminsOnly("can_restrict_members")
|
|
|
async def banFunc(_, message: Message):
|
|
|
@@ -240,12 +234,9 @@ async def banFunc(_, message: Message):
|
|
|
**Banned By:** {message.from_user.mention if message.from_user else 'Anon'}
|
|
|
**Reason:** {reason or 'No Reason Provided.'}"""
|
|
|
await message.chat.kick_member(user_id)
|
|
|
- if message.command[0][0] in ("s", "d"):
|
|
|
+ if message.command[0][0] == "d":
|
|
|
await message.reply_to_message.delete()
|
|
|
- if message.command[0][0] == "s":
|
|
|
- await message.delete()
|
|
|
- if message.command[0][0] != "s":
|
|
|
- await message.reply_text(msg)
|
|
|
+ await message.reply_text(msg)
|
|
|
|
|
|
|
|
|
# Unban members
|
|
|
@@ -448,7 +439,7 @@ async def ban_deleted_accounts(_, message: Message):
|
|
|
|
|
|
|
|
|
@app.on_message(
|
|
|
- filters.command(["warn", "swarn", "dwarn"]) & ~filters.edited & ~filters.private
|
|
|
+ filters.command(["warn", "dwarn"]) & ~filters.edited & ~filters.private
|
|
|
)
|
|
|
@adminsOnly("can_restrict_members")
|
|
|
async def warn_user(_, message: Message):
|
|
|
@@ -480,15 +471,11 @@ async def warn_user(_, message: Message):
|
|
|
warns = warns["warns"]
|
|
|
else:
|
|
|
warns = 0
|
|
|
- if message.command[0][0] in ('s', 'd'):
|
|
|
+ if message.command[0][0] == "d":
|
|
|
await message.reply_to_message.delete()
|
|
|
- if message.command[0][0] == 's':
|
|
|
- await message.delete()
|
|
|
if warns >= 2:
|
|
|
await message.chat.kick_member(user_id)
|
|
|
-
|
|
|
- if message.command[0][0] != 's':
|
|
|
- await message.reply_text(
|
|
|
+ await message.reply_text(
|
|
|
f"Number of warns of {mention} exceeded, BANNED!"
|
|
|
)
|
|
|
await remove_warns(chat_id, await int_to_alpha(user_id))
|
|
|
@@ -499,8 +486,7 @@ async def warn_user(_, message: Message):
|
|
|
**Warned By:** {message.from_user.mention if message.from_user else 'Anon'}
|
|
|
**Reason:** {reason or 'No Reason Provided.'}
|
|
|
**Warns:** {warns + 1}/3"""
|
|
|
- if message.command[0][0] != 's':
|
|
|
- await message.reply_text(msg, reply_markup=keyboard)
|
|
|
+ await message.reply_text(msg, reply_markup=keyboard)
|
|
|
await add_warn(chat_id, await int_to_alpha(user_id), warn)
|
|
|
|
|
|
|