From 970de1b55f348198ce5618db4910552936700f29 Mon Sep 17 00:00:00 2001 From: Jonathan Tan Date: Wed, 16 Aug 2017 17:00:43 -0700 Subject: [PATCH 1/2] doin the thing --- app/dragon-bot.py | 8 +++----- app/excuse.py | 7 +++++++ 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 app/excuse.py diff --git a/app/dragon-bot.py b/app/dragon-bot.py index 2ef6359f..0dc463c7 100644 --- a/app/dragon-bot.py +++ b/app/dragon-bot.py @@ -4,6 +4,7 @@ import requests import os import eight_ball +import excuse import define_word import help_methods import discord @@ -26,7 +27,7 @@ async def on_ready(): print("\n********************************") await client.change_presence(game=discord.Game(name='Type !help to see how to use me')) - + if debug: print("\nPress control+c to exit the bot") print("Followed by control+d or by typing") @@ -158,10 +159,7 @@ async def on_message(message): await client.send_message(message.channel, 'https://i.imgur.com/g6yOJjp.gif') if message.content.startswith('!excuse'): - excuses = requests.get( - 'https://gist.githubusercontent.com/AndrewBrinker/6763cdd5d79d6e3eaa3f/raw/624b946ebcca71ac76b74afa5ea41280540c1b97/excuses.txt' - ).text.split("\n") - await client.send_message(message.channel, random.choice(excuses)) + await client.send_message(message.channel, excuse.get_excuse()) if message.content.startswith('!purge'): num = 20 diff --git a/app/excuse.py b/app/excuse.py new file mode 100644 index 00000000..27910ba4 --- /dev/null +++ b/app/excuse.py @@ -0,0 +1,7 @@ +import requests, random + +def get_excuse(): + excuses = requests.get( + 'https://gist.githubusercontent.com/AndrewBrinker/6763cdd5d79d6e3eaa3f/raw/624b946ebcca71ac76b74afa5ea41280540c1b97/excuses.txt' + ).text.split("\n") + return random.choice(excuses) From 3f77d880a79eac850352556221f0d98ebc42cebd Mon Sep 17 00:00:00 2001 From: Jonathan Tan Date: Wed, 16 Aug 2017 17:02:55 -0700 Subject: [PATCH 2/2] changed ordering --- app/excuse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/excuse.py b/app/excuse.py index 27910ba4..c166b7de 100644 --- a/app/excuse.py +++ b/app/excuse.py @@ -1,4 +1,4 @@ -import requests, random +import random, requests def get_excuse(): excuses = requests.get(