CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-06-01 10:19:38 +12:00
Code Issues Releases Wiki Activity

Added a check to ensure e621 responded without an error

Browse source
This commit is contained in:
Phxntxm 2016-09-22 22:45:26 -05:00
parent f030504b6f
commit f611b37b11
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cogs/links.py
View file

@ -104,7 +104,7 @@ class Links:
else:
# If no search term was provided, search for a random image
async with self.session.get('https://derpibooru.org/images/random') as r:
# .url will be the URl we end up at, not the one requested.
# .url will be the URl we end up at, not the one requested.
# https://derpibooru.org/images/random redirects to a random image, so this is exactly what we want
image_link = r.url
await self.bot.say(image_link)
@ -138,16 +138,16 @@ class Links:
async with self.session.get(url, headers=self.headers) as r:
data = await r.json()
# Check if there were any results, if there are find a random image based on the length of results
if len(data) == 0:
# Try to find an image from the list. If there were no results, we're going to attempt to find
# A number between (0,-1) and receive an error.
# 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.
try:
rand_image = data[random.SystemRandom().randint(0, len(data) - 1)]['file_url']
await self.bot.say(rand_image)
except (ValueError, KeyError):
await self.bot.say("No results with that image {}".format(ctx.message.author.mention))
return
else:
if len(data) == 1:
rand_image = data[0]['file_url']
else:
rand_image = data[random.SystemRandom().randint(0, len(data) - 1)]['file_url']
await self.bot.say(rand_image)
def setup(bot):