CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-06-02 10:44:32 +12:00
Code Issues Releases Wiki Activity

Clean up cat/e621 api calls

Browse source
This commit is contained in:
phxntxm 2018-05-07 09:56:23 -05:00
parent 9e46f4c37c
commit 750b12f7d9
1 changed files with 256 additions and 250 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
cogs/images.py
View file

@ -21,18 +21,12 @@ class Images:
EXAMPLE: !cat EXAMPLE: !cat
RESULT: A beautiful picture of a cat o3o""" RESULT: A beautiful picture of a cat o3o"""
result = await utils.request('http://aws.random.cat/meow') url = "http://thecatapi.com/api/images/get"
if result is None: opts = {"format": "src"}
await ctx.send("I couldn't connect! Sorry no cats right now ;w;") result = await utils.request(url, attr='url', payload=opts)
return
filename = result.get('file', None)
if filename is None:
await ctx.send("I couldn't connect! Sorry no cats right now ;w;")
return
image = await utils.download_image(filename) image = await utils.download_image(result)
filename = re.search('.*/i/(.*)', filename).group(1) f = discord.File(image, filename=result.name)
f = discord.File(image, filename=filename)
await ctx.send(file=f) await ctx.send(file=f)
@commands.command(aliases=['dog', 'rd']) @commands.command(aliases=['dog', 'rd'])
@ -219,14 +213,18 @@ class Images:
tags = tags.replace(',_', ' ') tags = tags.replace(',_', ' ')
url = 'https://e621.net/post/index.json' url = 'https://e621.net/post/index.json'
params = {'limit': 320, params = {
'tags': tags} 'limit': 5,
'tags': tags
}
nsfw = await utils.channel_is_nsfw(ctx.message.channel, self.bot.db) nsfw = await utils.channel_is_nsfw(ctx.message.channel, self.bot.db)
# e621 by default does not filter explicit content, so tack on # e621 by default does not filter explicit content, so tack on
# safe/explicit based on if this channel is nsfw or not # safe/explicit based on if this channel is nsfw or not
params['tags'] += " rating:explicit" if nsfw else " rating:safe" params['tags'] += " rating:explicit" if nsfw else " rating:safe"
# Tack on a random order
params['tags'] += " order:random"
data = await utils.request(url, payload=params) data = await utils.request(url, payload=params)
@ -239,8 +237,16 @@ class Images:
# The response should be in a list format, so we'll end up getting a key error if the response was in json # The response should be in a list format, so we'll end up getting a key error if the response was in json
# i.e. it responded with a 404/504/etc. # i.e. it responded with a 404/504/etc.
try: try:
rand_image = data[random.SystemRandom().randint(0, len(data) - 1)]['file_url'] for image in data:
await ctx.send(rand_image) # Will support in the future
blacklist = []
tags = image["tags"]
# Check if any of the tags are in the blacklist
if any(tag in blacklist for tag in tags):
continue
# If this image is fine, then send this and break
await ctx.send(image["file_url"])
return
except (ValueError, KeyError): except (ValueError, KeyError):
await ctx.send("No results with that tag {}".format(ctx.message.author.mention)) await ctx.send("No results with that tag {}".format(ctx.message.author.mention))
return return