diff --git a/app/dragon-bot.py b/app/dragon-bot.py index 71462400..d25ce402 100644 --- a/app/dragon-bot.py +++ b/app/dragon-bot.py @@ -124,6 +124,18 @@ async def on_message(message): weather.get_weather(message.content) ) + if message.content.startswith('!pout'): + await client.send_message( + message.channel, + get_from_reddit.get_image('pouts') + ) + + if message.content.startswith('!smug'): + await client.send_message( + message.channel, + get_from_reddit.get_image('smuganimegirls') + ) + if message.content.startswith('!purge'): num = 20 if len(message.content.split()) > 1: diff --git a/app/help_methods.py b/app/help_methods.py index 9c3b9fcf..9a0f9f58 100644 --- a/app/help_methods.py +++ b/app/help_methods.py @@ -62,7 +62,14 @@ def get_help_message(method): ], 'weather': [ 'Returns the weather for the location you entered.', - '\nUsage: !weather Berkeley'] + '\nUsage: !weather Berkeley' + ], + 'pout': [ + 'Returns the URL for an anime girl pouting you filthy weeb' + ], + 'smug': [ + 'Returns the URL for smug anime girl' + ] } # Print out every help method @@ -77,16 +84,14 @@ def get_help_message(method): # Join key : value of the help method they passed in message = "{} : {}".format(method, ' '.join(supported_methods[method])) - # Return the message wrapped in css formatting so we get pretty colors - return "```css\n{}\n```".format(message) + return "\n{}\n".format(message) def parse_message(message): + method = 'show_all' if len(message.split()) > 1: method = message.split()[1] - try: - explanation = get_help_message(method) - except KeyError: - return "I can't help you with that" - return "```css\n{}\n```".format(explanation) - - return get_help_message('show_all') + try: + explanation = get_help_message(method) + except KeyError: + return "I can't help you with that" + return "```css\n{}\n```".format(explanation)