CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Cleanup] Correct handling of command message (#2310)

Browse Source 
Resolves #2307
This commit is contained in:
Michael H 2018-11-23 18:04:08 -05:00 committed by Toby Harradine
parent 2846dce6ea
commit 9d22d5b7b5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
redbot/cogs/cleanup/cleanup.py
View File

@ -133,8 +133,6 @@ class Cleanup(commands.Cog):
def check(m): def check(m):
if text in m.content: if text in m.content:
return True return True
elif m == ctx.message:
return True
else: else:
return False return False
@ -145,6 +143,7 @@ class Cleanup(commands.Cog):
before=ctx.message, before=ctx.message,
delete_pinned=delete_pinned, delete_pinned=delete_pinned,
) )
to_delete.append(ctx.message)
reason = "{}({}) deleted {} messages containing '{}' in channel {}.".format( reason = "{}({}) deleted {} messages containing '{}' in channel {}.".format(
author.name, author.id, len(to_delete), text, channel.id author.name, author.id, len(to_delete), text, channel.id
@ -188,8 +187,6 @@ class Cleanup(commands.Cog):
def check(m): def check(m):
if m.author.id == _id: if m.author.id == _id:
return True return True
elif m == ctx.message:
return True
else: else:
return False return False
@ -200,6 +197,8 @@ class Cleanup(commands.Cog):
before=ctx.message, before=ctx.message,
delete_pinned=delete_pinned, delete_pinned=delete_pinned,
) )
to_delete.append(ctx.message)
reason = ( reason = (
"{}({}) deleted {} messages " "{}({}) deleted {} messages "
" made by {}({}) in channel {}." " made by {}({}) in channel {}."
@ -231,6 +230,7 @@ class Cleanup(commands.Cog):
to_delete = await self.get_messages_for_deletion( to_delete = await self.get_messages_for_deletion(
channel=channel, number=None, after=after, delete_pinned=delete_pinned channel=channel, number=None, after=after, delete_pinned=delete_pinned
) )
to_delete.append(ctx.message)
reason = "{}({}) deleted {} messages in channel {}.".format( reason = "{}({}) deleted {} messages in channel {}.".format(
author.name, author.id, len(to_delete), channel.name author.name, author.id, len(to_delete), channel.name
@ -263,6 +263,7 @@ class Cleanup(commands.Cog):
to_delete = await self.get_messages_for_deletion( to_delete = await self.get_messages_for_deletion(
channel=channel, number=number, before=before, delete_pinned=delete_pinned channel=channel, number=number, before=before, delete_pinned=delete_pinned
) )
to_delete.append(ctx.message)
reason = "{}({}) deleted {} messages in channel {}.".format( reason = "{}({}) deleted {} messages in channel {}.".format(
author.name, author.id, len(to_delete), channel.name author.name, author.id, len(to_delete), channel.name