CodeMirror/Brandon209-Red-bot-Cogs
1
0
Fork 0
mirror of https://github.com/brandons209/Red-bot-Cogs.git synced 2024-04-28 09:32:40 +12:00
Code Issues Projects Releases Wiki Activity

fix OR operator bypassing filters in pony search

Browse source
This commit is contained in:
Brandon 2022-01-13 00:05:38 -05:00
parent 54d5d56314
commit aa057d953b
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pony/pony.py
View file

@ -43,13 +43,13 @@ class Pony(commands.Cog):
@commands.command() @commands.command()
@commands.guild_only() @commands.guild_only()
async def pony(self, ctx, *text): async def pony(self, ctx, *, text: str = ""):
"""Retrieves the latest result from Derpibooru""" """Retrieves the latest result from Derpibooru"""
await self.fetch_image(ctx, randomize=False, tags=text) await self.fetch_image(ctx, randomize=False, tags=text)
@commands.command() @commands.command()
@commands.guild_only() @commands.guild_only()
async def ponyr(self, ctx, *text): async def ponyr(self, ctx, *, text: str = ""):
"""Retrieves a random result from Derpibooru""" """Retrieves a random result from Derpibooru"""
await self.fetch_image(ctx, randomize=True, tags=text) await self.fetch_image(ctx, randomize=True, tags=text)
@ -60,7 +60,7 @@ class Pony(commands.Cog):
""" """
Gives a random picture of our mascot! Gives a random picture of our mascot!
""" """
await self.fetch_image(ctx, randomize=True, mascot=True, tags=["safe,", "coe"]) await self.fetch_image(ctx, randomize=True, mascot=True, tags="safe, coe OR oc:aurelia coe")
@commands.group() @commands.group()
@commands.guild_only() @commands.guild_only()
@ -254,7 +254,7 @@ class Pony(commands.Cog):
except json.decoder.JSONDecodeError: except json.decoder.JSONDecodeError:
await ctx.send("Invalid or malformed json files.") await ctx.send("Invalid or malformed json files.")
async def fetch_image(self, ctx, randomize: bool = False, tags: list = [], mascot=False): async def fetch_image(self, ctx, randomize: bool = False, tags: str = "", mascot=False):
guild = ctx.guild guild = ctx.guild
# check cooldown # check cooldown
@ -267,6 +267,7 @@ class Pony(commands.Cog):
cooldown = await self.config.guild(guild).cooldown() cooldown = await self.config.guild(guild).cooldown()
self.cooldowns[guild.id][ctx.author.id] = time.time() + cooldown self.cooldowns[guild.id][ctx.author.id] = time.time() + cooldown
tags = [t for t in tags.split(",") if t != ""]
filters = await self.config.guild(guild).filters() filters = await self.config.guild(guild).filters()
verbose = await self.config.guild(guild).verbose() verbose = await self.config.guild(guild).verbose()
display_artist = await self.config.guild(guild).display_artist() display_artist = await self.config.guild(guild).display_artist()
@ -288,15 +289,12 @@ class Pony(commands.Cog):
# Assign tags to URL # Assign tags to URL
if tags: if tags:
tagSearch += "{} ".format(" ".join(tags)).strip().strip(",") # parentheses resolves user's search before filters so that OR operator doesnt break search
if filters and not mascot: tagSearch += "({})".format(", ".join(tags)).strip().strip(",")
if not mascot:
if filters != [] and tags: if filters != [] and tags:
tagSearch += ", " tagSearch += ", "
tagSearch += ", ".join(filters) tagSearch += ", ".join(filters)
elif not mascot:
if tags:
tagSearch += ", "
tagSearch += ", ".join(filters)
search += parse.quote_plus(tagSearch) search += parse.quote_plus(tagSearch)
if search[-1] == "=": if search[-1] == "=":