From a9c3829216504e73d49b98d4cf3303f83c196d44 Mon Sep 17 00:00:00 2001 From: Kyler Juresic Date: Tue, 8 Aug 2017 19:44:43 -0500 Subject: [PATCH 1/3] Purge argument numLines adds arg to modify num lines to purge, defaults to 20. --- app/dragon-bot.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/dragon-bot.py b/app/dragon-bot.py index ca28d18f..7c107bb4 100644 --- a/app/dragon-bot.py +++ b/app/dragon-bot.py @@ -162,7 +162,14 @@ async def on_message(message): await client.send_message(message.channel, random.choice(excuses)) if message.content.startswith('!purge'): - await client.purge_from(message.channel, limit=20, check=is_me) + num = 20 + if len(message.content.split()) > 1: + num = message.content.split()[1] + try: + await client.purge_from(message.channel, limit=num, check=is_me) + except ValueError: + await client.send_message(message.channel, 'You want me to purge what?') + # await client.send_message(message.channel, 'Deleted {} message(s)'.format(len(deleted))) if message.content.startswith('!decide'): From d02b1c44352959a164da6148c8dd697f6b1d93e9 Mon Sep 17 00:00:00 2001 From: Kyler Juresic Date: Wed, 9 Aug 2017 15:01:12 -0500 Subject: [PATCH 2/3] Purge argument numLines Revision1 --- app/dragon-bot.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/dragon-bot.py b/app/dragon-bot.py index 7c107bb4..89a92c5f 100644 --- a/app/dragon-bot.py +++ b/app/dragon-bot.py @@ -164,12 +164,13 @@ async def on_message(message): if message.content.startswith('!purge'): num = 20 if len(message.content.split()) > 1: - num = message.content.split()[1] try: - await client.purge_from(message.channel, limit=num, check=is_me) + num = int(message.content.split()[1]) except ValueError: - await client.send_message(message.channel, 'You want me to purge what?') - + # If they dont enter a number, show them an error and return out of the function + await client.send_message(message.channel, "You need to give me a number, you entered {}".format(message.content.split()[1])) + return + await client.purge_from(message.channel, limit=num, check=is_me) # await client.send_message(message.channel, 'Deleted {} message(s)'.format(len(deleted))) if message.content.startswith('!decide'): From 0323a7800995559ee300e1be9614fee9bc502e4d Mon Sep 17 00:00:00 2001 From: Kyler Juresic Date: Wed, 9 Aug 2017 15:06:04 -0500 Subject: [PATCH 3/3] Edited help to reflect changes to purge --- app/help_methods.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/help_methods.py b/app/help_methods.py index b78cf92e..a01faf5d 100644 --- a/app/help_methods.py +++ b/app/help_methods.py @@ -25,8 +25,8 @@ def get_help_message(method): 'Can only be used in NSFW channels' ], 'purge': [ - 'Deletes the last 100 messages you sent from the channel you', - 'typed purge in' + 'Deletes the last 20 messages you sent from the channel you', + 'typed purge in, unless otherwise specified. eg. !purge 8' ], 'triggered': [ 'REEEEEEEEEEEEEEEEEE'],