diff --git a/src/cogs/booru.py b/src/cogs/booru.py index 794e3e9..65684a8 100644 --- a/src/cogs/booru.py +++ b/src/cogs/booru.py @@ -1495,6 +1495,9 @@ class MsG: return True return False + if not tags: + raise exc.MissingArgument + aliases = {} try: @@ -1564,6 +1567,9 @@ class MsG: except exc.Abort: await dest.send('**Aborted**') + except exc.MissingArgument: + await dest.send('\N{CROSS MARK} **Missing tags**') + await ctx.message.add_reaction('\N{CROSS MARK}') @_add_tags.command(name='channel', aliases=['ch', 'c'], brief='@manage_channel@ Add tag(s) to the current channel blacklist (requires manage_channel)', description='Add tag(s) to the current channel blacklist ') @cmds.has_permissions(manage_channels=True) @@ -1585,6 +1591,9 @@ class MsG: except exc.Abort: await dest.send('**Aborted**') + except exc.MissingArgument: + await dest.send('\N{CROSS MARK} **Missing tags**') + await ctx.message.add_reaction('\N{CROSS MARK}') @_add_tags.command(name='me', aliases=['m']) async def __add_user_tags(self, ctx, *args): @@ -1602,6 +1611,9 @@ class MsG: except exc.Abort: await dest.send('**Aborted**') + except exc.MissingArgument: + await dest.send('\N{CROSS MARK} **Missing tags**') + await ctx.message.add_reaction('\N{CROSS MARK}') @blacklist.group(name='remove', aliases=['rm', 'r']) async def _remove_tags(self, ctx): diff --git a/src/cogs/owner.py b/src/cogs/owner.py index af6a3c2..d832c92 100644 --- a/src/cogs/owner.py +++ b/src/cogs/owner.py @@ -95,7 +95,7 @@ class Bot: if v: permissions[member.mention].append(k) - await ctx.send(f'**Permissions:**\n\n{formatter.dict_tostring(permissions, f=False)}') + await ctx.send(f'**Permissions:**\n\n{formatter.dict_tostring(permissions, f=False, newline=True)}') @cmds.command(name=',tasks', aliases=[',task']) @cmds.is_owner() diff --git a/src/run.py b/src/run.py index 7b0a55e..1cd23b0 100644 --- a/src/run.py +++ b/src/run.py @@ -197,8 +197,8 @@ async def on_command_completion(ctx): if ctx.guild.id in u.settings['del_ctx'] and ctx.me.permissions_in(ctx.channel).manage_messages and isinstance(ctx.message.channel, d.TextChannel): await ctx.message.delete() - with suppress(err.Forbidden): - await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}') + # with suppress(err.Forbidden): + # await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}') for command in ('lastcommand', ',restart', ',die'): if ctx.command.name == command: diff --git a/src/utils/formatter.py b/src/utils/formatter.py index d6fe811..024054f 100644 --- a/src/utils/formatter.py +++ b/src/utils/formatter.py @@ -20,17 +20,21 @@ def tostring_commas(i): return '' -def dict_tostring(i, f=True): +def dict_tostring(i, f=True, newline=False): o = '' if f: if i: for k, v in i.items(): o += '**' + k + ':** `' + tostring(v) + '`\n' + elif newline is True: + if i: + for k, v in i.items(): + o += k + ': ```' + tostring(v, newline=newline) + '```\n' else: if i: for k, v in i.items(): - o += k + ': ```' + tostring(v, newline=True) + '```\n' + o += k + ': ```' + tostring(v) + '```\n' return o