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
parent 72c33a3588
commit f34b230238
2 changed files with 35 additions and 12 deletions

View File

@ -8,6 +8,7 @@ import define_word
import help_methods
import discord
import docker
import wallpaper
from pybooru import Danbooru
# Client object
@ -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")
@ -192,17 +193,10 @@ async def on_message(message):
# await client.send_message(message.channel, 'Deleted {} message(s)'.format(len(deleted)))
if message.content.startswith('!wallpaper'):
url = 'https://source.unsplash.com/3840x2160/'
if len(message.content.split()) > 1:
keyword = message.content.split()[1]
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)
await client.send_message(
message.channel,
wallpaper.getselect(message.content)
)
###################################
###### +-------------------+ ######

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