From d9892ac44194180474a3f888a7def4aa7878c583 Mon Sep 17 00:00:00 2001 From: Tyler Date: Fri, 11 Aug 2017 20:13:03 -0600 Subject: [PATCH 1/3] added define module, fixes #3 --- app/define_method.py | 16 ++++++++++++++++ app/dragon-bot.py | 17 ++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 app/define_method.py diff --git a/app/define_method.py b/app/define_method.py new file mode 100644 index 00000000..7d54ea9a --- /dev/null +++ b/app/define_method.py @@ -0,0 +1,16 @@ +import requests +import help_methods +def get_definition(content): + if len(content.split()) > 1: + word = content.split()[1:] + try: + definition = requests.get( + "https://api.urbandictionary.com/v0/define?term={}".format('%20'.join(word)) + ).json()['list'][0]['definition'] + + except IndexError: + definition = 'No definition found' + + return "`{}`\n```{}```".format(' '.join(word), definition) + else: + return help_methods.get_help_message('define') diff --git a/app/dragon-bot.py b/app/dragon-bot.py index 74e16354..6ddefcf9 100644 --- a/app/dragon-bot.py +++ b/app/dragon-bot.py @@ -2,7 +2,7 @@ import random import sys import requests import os - +import define_method import help_methods import discord import docker @@ -134,17 +134,8 @@ async def on_message(message): print('fuck u') if message.content.startswith('!define'): - if len(message.content.split()) > 1: - word = message.content.split()[1:] - try: - definition = requests.get( - "https://api.urbandictionary.com/v0/define?term={}".format('%20'.join(word)) - ).json()['list'][0]['definition'] - except IndexError: - definition = 'No definition found' - await client.send_message(message.channel, "`{}`\n```{}```".format(' '.join(word), definition)) - else: - await client.send_message(message.channel, help_methods.get_help_message('define')) + define = define_method.get_definition(message.content) + await client.send_message(message.channel, define) if message.content.startswith('!help'): await client.send_message( @@ -268,4 +259,4 @@ async def on_message(message): await client.send_message(message.channel, "There arent {} lines of output yet".format(num_lines)) -client.run(tokens[dragon_environment]) \ No newline at end of file +client.run(tokens[dragon_environment]) From 19bfe341a8f864e42a027ab2a46fb7f7b1384b0f Mon Sep 17 00:00:00 2001 From: Tyler Hodapp Date: Sat, 12 Aug 2017 02:18:07 +0000 Subject: [PATCH 2/3] define_method.py edited online with Bitbucket --- app/define_method.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/define_method.py b/app/define_method.py index 7d54ea9a..c44a0a60 100644 --- a/app/define_method.py +++ b/app/define_method.py @@ -1,7 +1,9 @@ import requests import help_methods + def get_definition(content): - if len(content.split()) > 1: + + if len(content.split()) > 1: word = content.split()[1:] try: definition = requests.get( From 252cb45d4ec1b38e347df8094464c6a110b0a8ee Mon Sep 17 00:00:00 2001 From: Tyler Hodapp Date: Sat, 12 Aug 2017 02:21:34 +0000 Subject: [PATCH 3/3] dragon-bot.py edited online with Bitbucket --- app/dragon-bot.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/dragon-bot.py b/app/dragon-bot.py index 6ddefcf9..e4c48390 100644 --- a/app/dragon-bot.py +++ b/app/dragon-bot.py @@ -134,8 +134,7 @@ async def on_message(message): print('fuck u') if message.content.startswith('!define'): - define = define_method.get_definition(message.content) - await client.send_message(message.channel, define) + await client.send_message(message.channel, define_method.get_definition(message.content)) if message.content.startswith('!help'): await client.send_message(