myned/modufur
1
0
Fork 0
mirror of https://github.com/myned/modufur.git synced 2024-11-01 21:02:38 +00:00
Code Issues Activity

Fixed alias name conflict, check for no command arg, pass ValueError

Browse source
This commit is contained in:
Myned 2017-10-13 21:57:57 -04:00
parent 80050b9541
commit 2ff61c4794
1 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/main/cogs/booru.py
View file

@ -31,18 +31,29 @@ class MsG:
@commands.command(aliases=['tag', 't'], brief='e621 Tag search', description='e621 | NSFW\nReturn a link search for given tags') @commands.command(aliases=['tag', 't'], brief='e621 Tag search', description='e621 | NSFW\nReturn a link search for given tags')
@checks.del_ctx() @checks.del_ctx()
async def tags(self, ctx, *tags): async def tags(self, ctx, *tags):
await ctx.send('✅ `{}`\nhttps://e621.net/post?tags={}'.format(formatter.tostring(tags), ','.join(tags))) try:
if tags:
await ctx.send('✅ `{}`\nhttps://e621.net/post?tags={}'.format(formatter.tostring(tags), ','.join(tags)))
else:
raise exc.TagError
except exc.TagError:
await ctx.send('❌ **No tags given.**', delete_after=10)
# Tag aliases # Tag aliases
@commands.command(aliases=['alias', 'a'], brief='e621 Tag aliases', description='e621 | NSFW\nSearch aliases for given tag') @commands.command(name='aliases', aliases=['alias', 'a'], brief='e621 Tag aliases', description='e621 | NSFW\nSearch aliases for given tag')
@checks.del_ctx() @checks.del_ctx()
async def aliases(self, ctx, tag): async def tag_aliases(self, ctx, tag=None):
aliases = [] aliases = []
try:
alias_request = await u.fetch('https://e621.net/tag_alias/index.json', params={'aliased_to': tag, 'approved': 'true'}, json=True) if tag is not None:
for dic in alias_request: alias_request = await u.fetch('https://e621.net/tag_alias/index.json', params={'aliased_to': tag, 'approved': 'true'}, json=True)
aliases.append(dic['name']) for dic in alias_request:
await ctx.send('✅ `' + tag + '` **aliases:**\n```' + formatter.tostring(aliases) + '```') aliases.append(dic['name'])
await ctx.send('✅ `' + tag + '` **aliases:**\n```' + formatter.tostring(aliases) + '```')
else:
raise exc.TagError
except exc.TagError:
await ctx.send('❌ **No tags given.**', delete_after=10)
# Reverse image searches a linked image using the public iqdb # Reverse image searches a linked image using the public iqdb
@commands.command(name='reverse', aliases=['rev', 'ris'], brief='e621 Reverse image search', description='e621 | NSFW\nReverse-search an image with given URL') @commands.command(name='reverse', aliases=['rev', 'ris'], brief='e621 Reverse image search', description='e621 | NSFW\nReverse-search an image with given URL')
@ -420,11 +431,14 @@ class MsG:
# Checks for, defines, and removes limit from args # Checks for, defines, and removes limit from args
for arg in args: for arg in args:
if len(arg) == 1: if len(arg) == 1:
if int(arg) <= 6 and int(arg) >= 1: try
limit = int(arg) if int(arg) <= 6 and int(arg) >= 1:
args.remove(arg) limit = int(arg)
else: args.remove(arg)
raise exc.BoundsError(arg) else:
raise exc.BoundsError(arg)
except ValueError:
pass
# , previous=temp_urls.get(ctx.message.author.id, [])) # , previous=temp_urls.get(ctx.message.author.id, []))
posts = await self.check_return_posts(ctx=ctx, booru='e621', tags=args, limit=limit) posts = await self.check_return_posts(ctx=ctx, booru='e621', tags=args, limit=limit)
for ident, post in posts.items(): for ident, post in posts.items():
@ -468,11 +482,14 @@ class MsG:
# Checks for, defines, and removes limit from args # Checks for, defines, and removes limit from args
for arg in args: for arg in args:
if len(arg) == 1: if len(arg) == 1:
if int(arg) <= 6 and int(arg) >= 1: try:
limit = int(arg) if int(arg) <= 6 and int(arg) >= 1:
args.remove(arg) limit = int(arg)
else: args.remove(arg)
raise exc.BoundsError(arg) else:
raise exc.BoundsError(arg)
except ValueError:
pass
# , previous=temp_urls.get(ctx.message.author.id, [])) # , previous=temp_urls.get(ctx.message.author.id, []))
posts = await self.check_return_posts(ctx=ctx, booru='e926', tags=args, limit=limit) posts = await self.check_return_posts(ctx=ctx, booru='e926', tags=args, limit=limit)
for ident, post in posts.items(): for ident, post in posts.items():