wallpaper moved to isolated module

also allows !wallpaper help
see issue #7 for details
This commit is contained in:
Unknown 2017-08-16 21:00:32 -05:00 committed by Kyler E Juresic
parent e7608d7c46
commit fc7c65a6d9
2 changed files with 34 additions and 11 deletions

View File

@ -10,6 +10,7 @@ import define_word
import help_methods import help_methods
import discord import discord
import docker import docker
import wallpaper
from pybooru import Danbooru from pybooru import Danbooru
# Client object # Client object
@ -191,17 +192,10 @@ async def on_message(message):
# await client.send_message(message.channel, 'Deleted {} message(s)'.format(len(deleted))) # await client.send_message(message.channel, 'Deleted {} message(s)'.format(len(deleted)))
if message.content.startswith('!wallpaper'): if message.content.startswith('!wallpaper'):
url = 'https://source.unsplash.com/3840x2160/' await client.send_message(
if len(message.content.split()) > 1: message.channel,
keyword = message.content.split()[1] wallpaper.getselect(message.content)
url = "?".join((url, keyword)) )
if 'waifu' in keyword:
url = 'https://media0.giphy.com/media/C79RKZ7nOcK8U/giphy.gif'
results = requests.get(url).url
await client.send_message(message.channel, results)
################################### ###################################
###### +-------------------+ ###### ###### +-------------------+ ######

29
app/wallpaper.py Normal file
View File

@ -0,0 +1,29 @@
import help_methods
def getselect(select):
url = 'https://source.unsplash.com/3840x2160/'
if len(select.split()) > 2:
keyword = str(select.split('-'))
keyword = keyword.replace('[', '')
keyword = keyword.replace(']', '')
keyword = keyword.replace('\'', '')
keyword = keyword.replace(' ', '&')
keyword = keyword.replace('!wallpaper&', '')
#print(url)
url = "?".join((url, keyword))
if 'waifu' in keyword:
url = 'https://media0.giphy.com/media/C79RKZ7nOcK8U/giphy.gif'
return url
if len(select.split()) > 1:
keyword = select.split()[1]
#print (url)
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')
return url