From 522609c8ef208d80197ec4bdbec2ac2bd919dce9 Mon Sep 17 00:00:00 2001
From: Unknown <kylerjuresic@gmail.com>
Date: Thu, 17 Aug 2017 00:30:17 -0500
Subject: [PATCH] Complete Rewrite

changed everything
---
 app/dragon-bot.py |  2 +-
 app/wallpaper.py  | 37 +++++++++++++++++--------------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/app/dragon-bot.py b/app/dragon-bot.py
index a19a12a2..da68e14a 100644
--- a/app/dragon-bot.py
+++ b/app/dragon-bot.py
@@ -194,7 +194,7 @@ async def on_message(message):
     if message.content.startswith('!wallpaper'):
         await client.send_message(
             message.channel,
-            wallpaper.getselect(message.content)
+            wallpaper.get_wall(message.content)
     )
 
     ###################################
diff --git a/app/wallpaper.py b/app/wallpaper.py
index e21dde03..dd1740ca 100644
--- a/app/wallpaper.py
+++ b/app/wallpaper.py
@@ -1,25 +1,22 @@
 import help_methods
 
-def getselect(select):
-    url = 'https://source.unsplash.com/3840x2160/'
+def get_wall(message):
+    unsplash_url = "https://source.unsplash.com/{}/?".format(resolution)
 
-    if len(select.split()) > 2:
-        keyword = str(select.split('-'))
-        keyword = keyword.replace(' ', '&')
-        for reform in ['[', ']', '\'', '!wallpaper&']:
-            if reform in keyword:
-                keyword = keyword.replace(reform,"")
-        url = "?".join((url, keyword))
-        if 'waifu' in keyword:
-            url = 'https://media0.giphy.com/media/C79RKZ7nOcK8U/giphy.gif'
+    if len(message.split()) > 2:
+        search_terms = message.split()[1:]
 
-    if len(select.split()) > 1:
-        #print (url)
-        keyword = select.split()[1]
-        url = "?".join((url, keyword))
-        if 'waifu' in keyword:
-            url = 'https://media0.giphy.com/media/C79RKZ7nOcK8U/giphy.gif'
-        if 'help' in keyword:
-            return help_methods.get_help_message('wallpaper')
+        # Turn search_terms into strings separated by commas
+        joined_terms = ','.join(search_terms)
 
-        return url
+        # Add those comma separated strings onto the end of the URL variable
+        url = unsplash_url + joined_terms
+
+    elif len(message.split()) > 1:
+        term = message.split()[1]
+        url = unsplash_url + term
+
+    else:
+        url = unsplash_url
+
+    return url