ldooks/dragon-bot
ldooks/dragon-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'weather'

Browse Source 
# Conflicts:
#   .gitlab-ci.yml
#   Dockerfile
#   Dockerfile-test-env

Resolved by importing both PyOWM and BeautifulSoup4
This commit is contained in:
Jason Ji 2017-09-22 00:56:10 +00:00
commit 2c5907d6ec
7 changed files with 79 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ services:
before_script:
- apk add --no-cache python3
- pip3 install pylint requests discord.py docker pylint wolframalpha pyowm
- pip3 install pylint requests discord.py docker pylint wolframalpha pyowm beautifulsoup4
stages:
- test

2
Dockerfile
View File

@ -2,7 +2,7 @@ FROM python:3.6.2-alpine3.6
LABEL name="Dragon Bot"
RUN apk update && apk add --no-cache docker
RUN pip install requests discord.py docker wolframalpha pyowm
RUN pip install requests discord.py docker wolframalpha pyowm beautifulsoup4
ADD app /app
CMD python app/dragon-bot.py

2
Dockerfile-test-env
View File

@ -2,7 +2,7 @@ FROM python:3.6.2-alpine3.6
LABEL name="Dragon Bot Test environment"
RUN apk update && apk add --no-cache vim docker
RUN pip install requests discord.py docker pylint wolframalpha pyowm
RUN pip install requests discord.py docker pylint wolframalpha pyowm beautifulsoup4
ADD app /app
RUN printf "\n\nTesting your python code for errors\n\n" && \

2
README.md
View File

@ -19,7 +19,7 @@ A discord bot for the trifecta discord channel
* The dragon-bot-test bot will connect to the server.
* If you want to test what the bot is seeing when you type commands, add LOTS of of print statements to dragon-bot.py
* you will see the output in the terminal. This is useful for debugging
* pipeline [here](https://cloud.docker.com/app/ldooks/repository/docker/ldooks/dragon-bot/builds)
* pipeline [here](https://gitlab.com/ldooks/dragon-bot/pipelines)
### Contribution guidelines ###

20
app/dragon-bot.py
View File

@ -84,7 +84,7 @@ async def on_message(message):
def is_bot(m):
return m.author == client.user
await client.purge_from(message.channel, limit=100, check=is_bot)
await client.purge_from(message.channel, limit=10, check=is_bot)
if message.content.startswith('!decide'):
await client.send_message(
@ -105,8 +105,9 @@ async def on_message(message):
await client.send_message(message.channel, excuse.get_excuse())
if message.content.startswith('!help'):
await client.send_message(message.channel, "ok {}, check your private messages".format(message.author.mention))
await client.send_message(
message.channel,
message.author,
help_methods.parse_message(message.content)
)
@ -131,12 +132,27 @@ async def on_message(message):
return
await client.purge_from(message.channel, limit=num, check=is_me)
if message.content.startswith('!roles'):
await client.send_message(
message.channel,
"ok {}. Check your PMs".format(message.author.mention)
)
await client.send_message(
message.author,
"```{}```".format(' '.join(list(map(lambda x: x.name, message.author.roles))))
)
if message.content.startswith('!wallpaper'):
await client.send_message(
message.channel,
wallpaper.get_wall(message.content)
)
if message.content.startswith('!homepage'):
await client.send_message(
message.channel,
wallpaper.get_picture(message.content)
)
if message.content.startswith('!docker'):
# Check permissions
if not role_check.docker_permissions(message.author.roles):

62
app/help_methods.py
View File

@ -10,56 +10,72 @@ def get_help_message(method):
supported_methods = {
'8ball': [
'Ask dragon bot a question and it will give you an 8ball response',
'\n\nUsage: !8ball Will I win the lottery tomorrow?'
'\nUsage: !8ball Will I win the lottery tomorrow?'
],
'decide': [
'Dragon-bot will help make the tough decisions for you',
'\n\n!decide option 1 or option 2.\n\nIf thre is only',
'one option, it will give you a yes or no'
' If there is only one option, it will give you a yes or no',
'\nUsage: !decide cake or pie\n!decide should I do my homework'
],
'define': [
'Returns a definiton of a word from urban dictionary',
'\n\nUsage: !define loli'
'\nUsage: !define loli'
],
'docker': [
'Two supported actions: logs and restart\n\nlogs: Shows you the',
'Two supported actions: logs and restart\nlogs: Shows you the',
'last X number of lines from the minecraft server. If no number',
'is specified, defaults to 10.\n\nrestart: will restart the min',
'ecraft server if something is fucky'
' is specified, defaults to 10.\nrestart: will restart the min',
'ecraft server.'
],
'excuse': [
'Generates a random excuse you can give your boss'],
'Generates a random excuse you can give your boss',
'\nUsage: !excuse'
],
'help': [
'Prints out a list of everything dragon-bot can do'
'Shows you this message'
],
'lewd': [
'Returns a URL for a lewd image.',
'Can only be used in NSFW channels'
'Can only be used in NSFW channels.',
'\nUsage: !lewd'
],
'purge': [
'Deletes the last 20 messages you sent from the channel you',
'typed purge in, unless otherwise specified. eg. !purge 8'
'By default, will delete your last 20 messages. You can override this',
' with your own number. \nUsage: !purge or !purge 15'
],
'roles': [
'Dragon bot will PM you a message with all the roles you have on the server'
],
'wallpaper': [
'Returns the URL for a 4k wallpaper. You can enter',
'a search term as well, for example, !wallpaper, or',
', !wallpaper flowers. Supports multiple tags.'
'a search term as well. Supports multiple search terms as well',
'\nUsage: !wallpaper flowers or !wallpaper mountain flowers sky '
],
'message': [
'You can ask me a question directly and I will do my best to answer it.',
'\nUsage:\n\n@dragon-bot what is the capital of France?\n@dragon-bot 94*37',
'\n@dragon-bot how many calories in a bottle of wine?'
'\nUsage: @dragon-bot what is the capital of France?'
],
'homepage': [
'This function now outputs the SWEET-ASS picture of the day.',
' Note this picture only changes once a day.',
'\nUsage: !homepage'
]
}
# Print out every help method
if method == 'show_all':
count = len(supported_methods)
keys = ', '.join(supported_methods.keys())
message = "I currently have `{}` methods,\n\n```{}```\n\nYou can get in formation about a specific method by typing !help <method>".format(count, keys)
# Might be a better way to do this, but build a list of method : description
build_message = []
for key, value in supported_methods.items():
build_message.append("\n{} : {}\n".format(key, ' '.join(supported_methods[key])))
# Join every element of the list with a space
message = ' '.join(build_message)
else:
message = ' '.join(supported_methods[method])
return message
# Join key : value of the help method they passed in
message = "{} : {}".format(method, ' '.join(supported_methods[method]))
# Return the message wrapped in css formatting so we get pretty colors
return "```css\n{}\n```".format(message)
def parse_message(message):
if len(message.split()) > 1:
@ -68,6 +84,6 @@ def parse_message(message):
explanation = get_help_message(method)
except KeyError:
return "I can't help you with that"
return "```{}```".format(explanation)
return "```css\n{}\n```".format(explanation)
return get_help_message('show_all')

19
app/wallpaper.py
View File

@ -1,5 +1,8 @@
import requests
import requests
from bs4 import BeautifulSoup
import urllib
from urllib.parse import urlparse
def get_wall(message):
unsplash_url = "https://source.unsplash.com/3840x2160/?"
@ -26,3 +29,17 @@ def get_wall(message):
return "Could not find an image for those tags."
else:
return response
def get_picture(find):
url = requests.get("http://fuckinghomepage.com")
soup = BeautifulSoup(url.content)
soup.prettify(formatter=None)
for parse in soup.find_all("p"):
if 'SWEET-ASS PICTURE' in ''.join(parse.findAll(text=True)):
link = parse.find_next_sibling('p')
if "http://" or "https://" in link.get('href', ''):
link = link.find('small').find_next('a', href=True)['href']
return urllib.parse.unquote(link.split('http://t.umblr.com/redirect?z=')[1].split('&')[0])