CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-05-07 06:02:24 +12:00
Code Issues Releases Wiki Activity

Update e621 to work with new API

Browse source
This commit is contained in:
Dan Hess 2020-04-06 12:00:46 -05:00
parent 84c0ea6414
commit 3587154281
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cogs/images.py
View file

@ -1,5 +1,6 @@
from discord.ext import commands
import discord
import itertools
import random
import re
import math
@ -228,12 +229,14 @@ class Images(commands.Cog):
tags = tags.replace(' ', '_')
tags = tags.replace(',_', ' ')
url = 'https://e621.net/post/index.json'
url = 'https://e621.net/posts.json'
params = {
'login': config.e621_user,
'api_key': config.e621_key,
'limit': 5,
'tags': tags
}
headers = {'User-Agent': config.user_agent}
nsfw = utils.channel_is_nsfw(ctx.message.channel)
# e621 by default does not filter explicit content, so tack on
@ -242,7 +245,7 @@ class Images(commands.Cog):
# Tack on a random order
params['tags'] += " order:random"
data = await utils.request(url, payload=params)
data = await utils.request(url, payload=params, headers=headers)
if data is None:
await ctx.send("Sorry, I had trouble connecting at the moment; please try again later")
@ -253,15 +256,15 @@ class Images(commands.Cog):
# 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:
for image in data:
for image in data["posts"]:
# Will support in the future
blacklist = []
tags = image["tags"]
tags = itertools.chain.from_iterable(image["tags"].values())
# Check if any of the tags are in the blacklist
if any(tag in blacklist for tag in tags):
if any(tag in tags for tag in blacklist):
continue
# If this image is fine, then send this and break
await ctx.send(image["file_url"])
await ctx.send(image["file"]["url"])
return
except (ValueError, KeyError):
await ctx.send("No results with that tag {}".format(ctx.message.author.mention))

4
utils/config.py
View file

@ -34,6 +34,10 @@ twitch_key = global_config.get('twitch_key', "")
youtube_key = global_config.get("youtube_key", "")
# The key for Osu API calls
osu_key = global_config.get('osu_key', '')
# The key for e621 calls
e621_key = global_config.get('e621_key', '')
# The username the API key is under
e621_user = global_config.get('e621_user', '')
# The key for League of Legends API calls
lol_key = global_config.get('lol_key', '')
# The keys needed for deviant art calls