From 4bc86c8f590b36924a4ce02d53af3f0276010fcc Mon Sep 17 00:00:00 2001 From: Dylan Dizon Date: Tue, 6 Nov 2018 17:04:59 -0500 Subject: [PATCH 1/3] Remove removal of reactions --- src/cogs/booru.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/cogs/booru.py b/src/cogs/booru.py index 043a76b..ffa2c8b 100644 --- a/src/cogs/booru.py +++ b/src/cogs/booru.py @@ -1521,10 +1521,6 @@ class MsG: except exc.Remove: await message.edit(content=f'**Also add aliases?**\n{formatter.dict_tostring(aliases, f=False)}\nType the tag(s) to remove or `0` to abort:') - with suppress(err.Forbidden): - await message.remove_reaction('\N{HEAVY MINUS SIGN}', self.bot.user) - await message.remove_reaction('\N{HEAVY MINUS SIGN}', ctx.author) - response = await self.bot.wait_for('message', check=on_message, timeout=7 * 60) for tag in response.content.split(' '): From 66191759b838248aaf01cdfb69e020353bcf3fd1 Mon Sep 17 00:00:00 2001 From: Dylan Dizon Date: Tue, 6 Nov 2018 17:05:17 -0500 Subject: [PATCH 2/3] Fix aliases not dumping to file --- src/cogs/booru.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cogs/booru.py b/src/cogs/booru.py index ffa2c8b..6fa2af3 100644 --- a/src/cogs/booru.py +++ b/src/cogs/booru.py @@ -1532,6 +1532,7 @@ class MsG: await self.bot.wait_for('reaction_add', check=on_reaction, timeout=7 * 60) self.aliases.update(aliases) + u.dump(self.aliases, 'cogs/aliases.pkl') await message.delete() From 9e26e6603dbe90c8d27941a0010ad3dcba5b242c Mon Sep 17 00:00:00 2001 From: Dylan Dizon Date: Tue, 6 Nov 2018 17:05:52 -0500 Subject: [PATCH 3/3] Fix command response overshooting character limit --- src/cogs/booru.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/cogs/booru.py b/src/cogs/booru.py index 6fa2af3..179f3e0 100644 --- a/src/cogs/booru.py +++ b/src/cogs/booru.py @@ -1409,13 +1409,20 @@ class MsG: guild = ctx.guild if isinstance( ctx.guild, d.Guild) else ctx.channel - blacklist = set() - # Creates temp blacklist based on context + aliases = {} + # Creates temp aliases based on context for bl in (self.blacklists['global_blacklist'], self.blacklists['guild_blacklist'].get(guild.id, {}).get(ctx.channel.id, set()), self.blacklists['user_blacklist'].get(ctx.author.id, set())): for tag in bl: - blacklist.update([tag] + list(self.aliases[tag])) + aliases[tag] = list(self.aliases[tag]) - await ctx.send(f'**Contextual blacklist aliases:**\n```\n{formatter.tostring(blacklist)}```') + paginator = cmds.Paginator(prefix='', suffix='') + + for tag, alias_list in aliases.items(): + paginator.add_line(f'{tag}\n```{" ".join(alias_list)}```') + + for page in paginator.pages: + print(page) + await ctx.send(f'\N{NO ENTRY SIGN} **Contextual blacklist aliases:**\n{page}') @_get_blacklist.command(name='global', aliases=['gl', 'g'], brief='Get current global blacklist', description='Get current global blacklist\n\nThis applies to all booru commands, in accordance with Discord\'s ToS agreement\n\nExample:\n\{p\}bl get global') async def __get_global_blacklist(self, ctx, *args):