From 460a2e7a1b1689b07e3401ea0151f9af2bdde18f Mon Sep 17 00:00:00 2001
From: Tyler <nightfire929@gmail.com>
Date: Wed, 16 Aug 2017 16:58:47 -0600
Subject: [PATCH 1/2] moves decide into a module, fixes #11

---
 app/decide_method.py | 18 ++++++++++++++++++
 app/dragon-bot.py    | 16 +++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 app/decide_method.py

diff --git a/app/decide_method.py b/app/decide_method.py
new file mode 100644
index 00000000..9e68423b
--- /dev/null
+++ b/app/decide_method.py
@@ -0,0 +1,18 @@
+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 2ef6359f..6dcd0544 100644
--- a/app/dragon-bot.py
+++ b/app/dragon-bot.py
@@ -3,6 +3,7 @@ import sys
 import requests
 import os
 
+import decide_method
 import eight_ball
 import define_word
 import help_methods
@@ -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")
@@ -176,14 +177,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):

From c15bccc4e3e36bbcbe8f9f60388f5ade7db01f21 Mon Sep 17 00:00:00 2001
From: Tyler <nightfire929@gmail.com>
Date: Wed, 16 Aug 2017 18:53:30 -0600
Subject: [PATCH 2/2] fixing the names of decide

---
 app/{decide_method.py => decide.py} | 7 -------
 app/dragon-bot.py                   | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)
 rename app/{decide_method.py => decide.py} (96%)

diff --git a/app/decide_method.py b/app/decide.py
similarity index 96%
rename from app/decide_method.py
rename to app/decide.py
index 9e68423b..8984c628 100644
--- a/app/decide_method.py
+++ b/app/decide.py
@@ -2,17 +2,10 @@ 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 6dcd0544..89b5c84e 100644
--- a/app/dragon-bot.py
+++ b/app/dragon-bot.py
@@ -3,7 +3,7 @@ import sys
 import requests
 import os
 
-import decide_method
+import decide
 import eight_ball
 import define_word
 import help_methods