diff --git a/app/decide.py b/app/decide.py new file mode 100644 index 00000000..8984c628 --- /dev/null +++ b/app/decide.py @@ -0,0 +1,11 @@ +import random +import help_methods + +def get_decide_choice(decide): + choices = decide.replace('!decide', '' ).lstrip().split(' or ') + if len(choices) > 1: + return random.choice(choices) + elif '' in choices: + return help_methods.get_help_message('decide') + else: + return random.choice(["yes", "no"]) diff --git a/app/dragon-bot.py b/app/dragon-bot.py index 0dc463c7..1e0456ca 100644 --- a/app/dragon-bot.py +++ b/app/dragon-bot.py @@ -3,6 +3,7 @@ import sys import requests import os +import decide import eight_ball import excuse import define_word @@ -174,14 +175,11 @@ async def on_message(message): # await client.send_message(message.channel, 'Deleted {} message(s)'.format(len(deleted))) if message.content.startswith('!decide'): - choices = message.content.replace('!decide', '').lstrip().split(' or ') - if len(choices) > 1: - ####### debug ########### - # await client.send_message(message.channel, "I see {} choices, {}".format(len(choices), 'and '.join(choices))) - print("{} has initated a decide between {}".format(message.author, choices)) - await client.send_message(message.channel, "{} {}".format(message.author.mention, random.choice(choices))) - else: - await client.send_message(message.channel, "{} {}".format(message.author.mention, random.choice(['yes', 'no']))) + await client.send_message(message.channel, + "{} {}".format(message.author.mention, + decide_method.get_decide_choice(message.content))) + + if message.content.startswith('!cleanup') and message.author.id == '144986109804412928': def is_bot(m):