From 8f74e4dd3180846ece14345d3896e37a400ae275 Mon Sep 17 00:00:00 2001
From: Tobotimus <Tobotimus@users.noreply.github.com>
Date: Mon, 14 May 2018 09:51:50 +1000
Subject: [PATCH] [V3 Cleanup] Cleanup commands clean up after themselves
 (#1602)

Resolves #1572
---
 redbot/cogs/cleanup/cleanup.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/redbot/cogs/cleanup/cleanup.py b/redbot/cogs/cleanup/cleanup.py
index a6700f14d..e8c021c87 100644
--- a/redbot/cogs/cleanup/cleanup.py
+++ b/redbot/cogs/cleanup/cleanup.py
@@ -21,17 +21,24 @@ class Cleanup:
     @staticmethod
     async def check_100_plus(ctx: commands.Context, number: int) -> bool:
         """
-        Called when trying to delete more than 100 messages at once
+        Called when trying to delete more than 100 messages at once.
 
-        Prompts the user to choose whether they want to continue or not
+        Prompts the user to choose whether they want to continue or not.
+
+        Tries its best to cleanup after itself if the response is positive.
         """
         def author_check(message):
             return message.author == ctx.author
 
-        await ctx.send(_('Are you sure you want to delete {} messages? (y/n)').format(number))
+        prompt = await ctx.send(_('Are you sure you want to delete {} messages? (y/n)').format(number))
         response = await ctx.bot.wait_for('message', check=author_check)
 
         if response.content.lower().startswith('y'):
+            await prompt.delete()
+            try:
+                await response.delete()
+            except:
+                pass
             return True
         else:
             await ctx.send(_('Cancelled.'))
@@ -138,6 +145,7 @@ class Cleanup:
         cleanup user @\u200bTwentysix 2
         cleanup user Red 6"""
 
+        member = None
         try:
             member = await commands.converter.MemberConverter().convert(ctx, user)
         except commands.BadArgument:
@@ -243,6 +251,7 @@ class Cleanup:
             ctx, channel, number, limit=1000, before=ctx.message,
             delete_pinned=delete_pinned
         )
+        to_delete.append(ctx.message)
 
         reason = "{}({}) deleted {} messages in channel {}."\
                  "".format(author.name, author.id,
@@ -292,6 +301,7 @@ class Cleanup:
             ctx, channel, number, check=check, limit=1000, before=ctx.message,
             delete_pinned=delete_pinned
         )
+        to_delete.append(ctx.message)
 
         reason = "{}({}) deleted {} "\
                  " command messages in channel {}."\