From 7ae857e5f95ad7a4f74eccbbe935734094011c13 Mon Sep 17 00:00:00 2001 From: sgoudham Date: Sat, 25 Jul 2020 09:39:55 +0100 Subject: [PATCH] Updating commentary --- cogs/moderation.py | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/cogs/moderation.py b/cogs/moderation.py index 4e686df1..2d070c5e 100644 --- a/cogs/moderation.py +++ b/cogs/moderation.py @@ -81,22 +81,36 @@ class Moderation(commands.Cog): @has_guild_permissions(manage_messages=True) @bot_has_guild_permissions(manage_messages=True, read_message_history=True) async def purge(self, ctx, amount: int = None): - """Purge Messages from Channel""" + """Purge Messages from Channel + (No Amount Will Default to 50 Messages Deleted)""" + # When an amount is specified and is between 0 and 100 if amount: if 0 < amount <= 100: with ctx.channel.typing(): + + # Delete the message sent and then the amount specified + # (Only messages sent within the last 14 days) await ctx.message.delete() - deleted = await ctx.channel.purge(limit=amount + 1, + deleted = await ctx.channel.purge(limit=amount, after=datetime.datetime.utcnow() - timedelta(days=14)) - await ctx.send(f"Deleted **{(len(deleted) - 1):,}** messages.", delete_after=5) + await ctx.send(f"Deleted **{len(deleted):,}** messages.", delete_after=5) - # Send error if + # Send error if amount is not between 0 and 100 else: await ctx.send("The amount provided is not between **0** and **100**") + + # Delete the last 50 messages if no amount is given else: - await ctx.send("**You must specify an amount!**") + + # Delete the message sent and then the amount specified + # (Only messages sent within the last 14 days) + await ctx.message.delete() + deleted = await ctx.channel.purge(limit=50, + after=datetime.datetime.utcnow() - timedelta(days=14)) + + await ctx.send(f"Deleted **{len(deleted):,}** messages.", delete_after=5) def setup(bot):