mirror of
https://github.com/myned/modufur.git
synced 2024-12-24 22:27:28 +00:00
Refactor blacklist and alias commands
~ Streamline help attributes ~ Align with PEP guidelines ~ Align with simpler command methodology ~ Change file management logic + Add alias commands as switch for blacklist management - Remove deprecated code
This commit is contained in:
Dylan Dizon
parent
d87c35b3da
commit
8b28020069
1 changed files with 265 additions and 252 deletions
|
|
@ -1389,324 +1389,337 @@ class MsG:
|
||||||
# async def __clear_favorite_posts(self, ctx):
|
# async def __clear_favorite_posts(self, ctx):
|
||||||
# pass
|
# pass
|
||||||
|
|
||||||
# Umbrella command structure to manage global, channel, and user blacklists
|
@cmds.group(
|
||||||
@cmds.group(aliases=['bl', 'b'], brief='(G) Manage blacklists', description='Manage channel or personal blacklists\n\nUsage:\n{p}bl get {blacklist} to show a blacklist\n{p}bl clear {blacklist} to clear a blacklist\n{p}bl add {blacklist} {tags...} to add tag(s) to a blacklist\n{p}bl remove {blacklist} {tags...} to remove tags from a blacklist')
|
aliases=['bl', 'b'],
|
||||||
|
brief='(G) Manage blacklists',
|
||||||
|
description='Manage global, guild (WIP), channel, and personal blacklists',
|
||||||
|
usage='[option] [blacklist] [--aliases|-a] [tags...]')
|
||||||
async def blacklist(self, ctx):
|
async def blacklist(self, ctx):
|
||||||
if not ctx.invoked_subcommand:
|
if not ctx.invoked_subcommand:
|
||||||
await ctx.send('**Use a flag to manage blacklists.**\n*Type* `{}help bl` *for more info.*'.format(ctx.prefix))
|
await ctx.send(
|
||||||
|
'**Use a flag to manage blacklists.**\n'
|
||||||
|
f'*Type* `{ctx.prefix}help bl` *for more info.*')
|
||||||
await ctx.message.add_reaction('\N{CROSS MARK}')
|
await ctx.message.add_reaction('\N{CROSS MARK}')
|
||||||
|
|
||||||
# @blacklist.error
|
@blacklist.group(
|
||||||
# async def blacklist_error(self, ctx, error):
|
name='get',
|
||||||
# if isinstance(error, KeyError):
|
aliases=['g'],
|
||||||
# return await ctx.send('**Blacklist does not exist**')
|
brief='Get a blacklist',
|
||||||
|
description='Get global, channel, or personal blacklists',
|
||||||
@blacklist.group(name='get', aliases=['g'], brief='(G) Get a blacklist\n\nUsage:\n\{p\}bl get \{blacklist\}')
|
usage='[blacklist]')
|
||||||
async def _get_blacklist(self, ctx):
|
async def get_blacklist(self, ctx):
|
||||||
if not ctx.invoked_subcommand:
|
if not ctx.invoked_subcommand:
|
||||||
await ctx.send('**Invalid blacklist**')
|
await ctx.send('**Invalid blacklist**')
|
||||||
await ctx.message.add_reaction('\N{CROSS MARK}')
|
await ctx.message.add_reaction('\N{CROSS MARK}')
|
||||||
|
|
||||||
@_get_blacklist.command(name='alias', aliases=['aliases'])
|
@get_blacklist.command(
|
||||||
async def __get_blacklist_aliases(self, ctx, *args):
|
name='global',
|
||||||
guild = ctx.guild if isinstance(
|
aliases=['gl', 'g'],
|
||||||
ctx.guild, d.Guild) else ctx.channel
|
brief='Get global blacklist',
|
||||||
|
description='Get global blacklist\n\n'
|
||||||
|
'In accordance with Discord\'s ToS: cub, related tags, and their aliases are blacklisted')
|
||||||
|
async def get_global_blacklist(self, ctx, *args):
|
||||||
args, lst = u.kwargs(args)
|
args, lst = u.kwargs(args)
|
||||||
|
|
||||||
aliases = {}
|
await formatter.paginate(
|
||||||
# Creates temp aliases based on context
|
ctx,
|
||||||
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())):
|
self.blacklists['global'].get(lst, set()),
|
||||||
for tag in bl:
|
start=f'\N{NO ENTRY SIGN} **Global {lst}:**\n')
|
||||||
aliases[tag] = list(self.aliases[tag])
|
|
||||||
|
|
||||||
# paginator.add_line(f'{tag}\n```{" ".join(alias_list)}```')
|
@get_blacklist.command(
|
||||||
|
name='channel',
|
||||||
|
aliases=['chan', 'ch', 'c'],
|
||||||
|
brief='Get channel blacklist',
|
||||||
|
description='Get channel blacklist')
|
||||||
|
async def get_channel_blacklist(self, ctx, *args):
|
||||||
args, lst = u.kwargs(args)
|
args, lst = u.kwargs(args)
|
||||||
|
|
||||||
await formatter.paginate(ctx, aliases, start='\N{NO ENTRY SIGN} **Contextual blacklist aliases:**\n')
|
await formatter.paginate(
|
||||||
|
ctx,
|
||||||
|
self.blacklists['channel'].get(ctx.channel.id, {}).get(lst, set()),
|
||||||
|
start=f'\N{NO ENTRY SIGN} {ctx.channel.mention} **{lst}:**\n')
|
||||||
|
|
||||||
@_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')
|
@get_blacklist.command(
|
||||||
async def __get_global_blacklist(self, ctx, *args):
|
name='me',
|
||||||
await ctx.send('\N{NO ENTRY SIGN} **Global blacklist:**\n```\n{}```'.format(' '.join(self.blacklists['global_blacklist'])))
|
aliases=['m'],
|
||||||
|
brief='Get your personal blacklist',
|
||||||
|
description='Get your personal blacklist')
|
||||||
|
async def get_user_blacklist(self, ctx, *args):
|
||||||
args, lst = u.kwargs(args)
|
args, lst = u.kwargs(args)
|
||||||
|
|
||||||
@_get_blacklist.command(name='channel', aliases=['ch', 'c'], brief='Get current channel blacklist', description='Get current channel blacklist\n\nThis is based on context - the channel where the command was executed\n\nExample:\{p\}bl get channel')
|
await formatter.paginate(
|
||||||
async def __get_channel_blacklist(self, ctx, *args):
|
ctx,
|
||||||
guild = ctx.guild if isinstance(
|
self.blacklists['user'].get(ctx.author.id, {}).get(lst, set()),
|
||||||
ctx.guild, d.Guild) else ctx.channel
|
start=f'\N{NO ENTRY SIGN} {ctx.author.mention}**\'s {lst}:**\n')
|
||||||
|
|
||||||
await ctx.send('\N{NO ENTRY SIGN} {} **blacklist:**\n```\n{}```'.format(ctx.channel.mention, ' '.join(self.blacklists['guild_blacklist'].get(guild.id, {}).get(ctx.channel.id, set()))))
|
@blacklist.group(
|
||||||
|
name='add',
|
||||||
@_get_blacklist.command(name='me', aliases=['m'], brief='Get your personal blacklist', description='Get your personal blacklist\n\nYour blacklist is not viewable by anyone but you, except if you call this command in a public channel. The blacklist will be deleted soon after for your privacy\n\nExample:\n\{p\}bl get me')
|
aliases=['a'],
|
||||||
async def __get_user_blacklist(self, ctx, *args):
|
brief='Add tags to a blacklist',
|
||||||
await ctx.send('\N{NO ENTRY SIGN} {}**\'s blacklist:**\n```\n{}```'.format(ctx.author.mention, ' '.join(self.blacklists['user_blacklist'].get(ctx.author.id, set()))))
|
description='Add tags to global, channel, or personal blacklists',
|
||||||
|
usage='[blacklist] [tags...]')
|
||||||
@_get_blacklist.command(name='here', aliases=['h'], brief='Get current global and channel blacklists', description='Get current global and channel blacklists in a single message\n\nExample:\{p\}bl get here')
|
async def add_tags(self, ctx):
|
||||||
async def __get_here_blacklists(self, ctx, *args):
|
|
||||||
guild = ctx.guild if isinstance(
|
|
||||||
ctx.guild, d.Guild) else ctx.channel
|
|
||||||
|
|
||||||
await ctx.send('\N{NO ENTRY SIGN} **__Blacklisted:__**\n\n**Global:**\n```\n{}```\n**{}:**\n```\n{}```'.format(' '.join(self.blacklists['global_blacklist']), ctx.channel.mention, ' '.join(self.blacklists['guild_blacklist'].get(guild.id, {}).get(ctx.channel.id, set()))))
|
|
||||||
|
|
||||||
@blacklist.group(name='add', aliases=['a'], brief='(G) Add tag(s) to a blacklist\n\nUsage:\n\{p\}bl add \{blacklist\} \{tags...\}')
|
|
||||||
async def _add_tags(self, ctx):
|
|
||||||
if not ctx.invoked_subcommand:
|
if not ctx.invoked_subcommand:
|
||||||
await ctx.send('**Invalid blacklist**')
|
await ctx.send('**Invalid blacklist**')
|
||||||
await ctx.message.add_reaction('\N{CROSS MARK}')
|
await ctx.message.add_reaction('\N{CROSS MARK}')
|
||||||
|
|
||||||
async def _aliases(self, ctx, tags, blacklist):
|
async def _add(self, tags, lst, alias=False):
|
||||||
def on_reaction(reaction, user):
|
if not alias:
|
||||||
if user is ctx.author and reaction.message.channel is ctx.message.channel:
|
if tags:
|
||||||
if reaction.emoji == '\N{THUMBS DOWN SIGN}':
|
lst.update(tags)
|
||||||
raise exc.Continue
|
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
||||||
if reaction.emoji == '\N{HEAVY MINUS SIGN}':
|
|
||||||
raise exc.Remove
|
|
||||||
if reaction.emoji == '\N{THUMBS UP SIGN}':
|
|
||||||
return True
|
|
||||||
return False
|
|
||||||
|
|
||||||
def on_message(msg):
|
|
||||||
if msg.author is ctx.message.author and msg.channel is ctx.message.channel:
|
|
||||||
if msg.content == '0':
|
|
||||||
raise exc.Continue
|
|
||||||
return True
|
|
||||||
return False
|
|
||||||
|
|
||||||
if not tags:
|
|
||||||
raise exc.MissingArgument
|
|
||||||
|
|
||||||
aliases = {}
|
|
||||||
messages = []
|
|
||||||
|
|
||||||
try:
|
|
||||||
for tag in tags:
|
|
||||||
blacklist.add(tag)
|
|
||||||
aliases[tag] = set()
|
|
||||||
|
|
||||||
alias_request = await u.fetch('https://e621.net/tag_alias/index.json', params={'aliased_to': tag, 'approved': 'true'}, json=True)
|
|
||||||
if alias_request:
|
|
||||||
for dic in alias_request:
|
|
||||||
if dic['name']:
|
|
||||||
aliases[tag].add(dic['name'])
|
|
||||||
|
|
||||||
messages = await formatter.paginate(ctx, aliases)
|
|
||||||
message = await ctx.send(
|
|
||||||
'**Also add aliases?** React with the minus sign (\N{HEAVY MINUS SIGN}) to remove unwanted aliases')
|
|
||||||
await message.add_reaction('\N{THUMBS DOWN SIGN}')
|
|
||||||
await message.add_reaction('\N{HEAVY MINUS SIGN}')
|
|
||||||
await message.add_reaction('\N{THUMBS UP SIGN}')
|
|
||||||
|
|
||||||
try:
|
|
||||||
await self.bot.wait_for('reaction_add', check=on_reaction, timeout=8 * 60)
|
|
||||||
|
|
||||||
except exc.Remove:
|
|
||||||
await message.edit(content=f'Type the tag(s) to remove or `0` to continue:')
|
|
||||||
|
|
||||||
try:
|
|
||||||
while not self.bot.is_closed():
|
|
||||||
response = await self.bot.wait_for('message', check=on_message, timeout=8 * 60)
|
|
||||||
|
|
||||||
for tag in response.content.split(' '):
|
|
||||||
try:
|
|
||||||
for e in aliases.values():
|
|
||||||
e.remove(tag)
|
|
||||||
messages.append(await ctx.send(f'\N{WHITE HEAVY CHECK MARK} `{tag}` **removed**'))
|
|
||||||
except KeyError:
|
|
||||||
await ctx.send(f'\N{CROSS MARK} `{tag}` **not in aliases**', delete_after=8)
|
|
||||||
except exc.Continue:
|
|
||||||
pass
|
|
||||||
|
|
||||||
await message.edit(content=f'Confirm or deny changes')
|
|
||||||
await self.bot.wait_for('reaction_add', check=on_reaction, timeout=8 * 60)
|
|
||||||
|
|
||||||
self.aliases.update(aliases)
|
|
||||||
u.dump(self.aliases, 'cogs/aliases.pkl')
|
|
||||||
|
|
||||||
return blacklist
|
|
||||||
|
|
||||||
except exc.Continue:
|
|
||||||
return tags
|
return tags
|
||||||
except asyncio.TimeoutError:
|
else:
|
||||||
await ctx.send('\N{CROSS MARK} **Command timed out**')
|
aliases = {}
|
||||||
raise exc.Abort
|
|
||||||
except exc.Abort:
|
|
||||||
raise exc.Abort
|
|
||||||
|
|
||||||
finally:
|
if tags:
|
||||||
if messages:
|
for tag in tags:
|
||||||
with suppress(err.NotFound):
|
request = await u.fetch(
|
||||||
for msg in messages:
|
'https://e621.net/tag_alias/index.json',
|
||||||
await msg.delete()
|
params={'aliased_to': tag, 'approved': 'true'},
|
||||||
await message.delete()
|
json=True)
|
||||||
|
|
||||||
@_add_tags.command(name='global', aliases=['gl', 'g'])
|
for elem in request:
|
||||||
|
if elem['name']:
|
||||||
|
aliases.setdefault(tag, set()).add(elem['name'])
|
||||||
|
|
||||||
|
if aliases:
|
||||||
|
lst.update(aliases)
|
||||||
|
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
||||||
|
|
||||||
|
return list(aliases.keys())
|
||||||
|
|
||||||
|
@add_tags.command(
|
||||||
|
name='global',
|
||||||
|
aliases=['gl', 'g'],
|
||||||
|
brief='Add tags to global blacklist',
|
||||||
|
description='Add tags to global blacklist',
|
||||||
|
usage='[tags...]')
|
||||||
@cmds.is_owner()
|
@cmds.is_owner()
|
||||||
async def __add_global_tags(self, ctx, *args):
|
async def add_global_tags(self, ctx, *args):
|
||||||
tags, lst = u.kwargs(args)
|
tags, lst = u.kwargs(args)
|
||||||
|
|
||||||
try:
|
|
||||||
async with ctx.channel.typing():
|
async with ctx.channel.typing():
|
||||||
tags = await self._aliases(ctx, tags, self.blacklists['global_blacklist'])
|
added = await self._add(
|
||||||
|
tags,
|
||||||
|
self.blacklists['global'].setdefault(lst, set() if lst == 'blacklist' else {}),
|
||||||
|
alias=True if lst == 'aliases' else False)
|
||||||
|
|
||||||
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
await formatter.paginate(
|
||||||
|
ctx,
|
||||||
|
added,
|
||||||
|
start=f'\N{WHITE HEAVY CHECK MARK} **Added to global {lst}:**\n')
|
||||||
|
|
||||||
await ctx.send('\N{WHITE HEAVY CHECK MARK} **Added to global blacklist:**\n```\n{}```'.format(' '.join(tags)))
|
@add_tags.command(
|
||||||
|
name='channel',
|
||||||
except exc.Abort:
|
aliases=['chan', 'ch', 'c'],
|
||||||
await ctx.send('**Aborted**')
|
brief='Add tags to channel blacklist',
|
||||||
except exc.MissingArgument:
|
description='Add tags to channel blacklist',
|
||||||
await ctx.send('\N{CROSS MARK} **Missing tags**')
|
usage='[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)
|
@cmds.has_permissions(manage_channels=True)
|
||||||
async def __add_channel_tags(self, ctx, *args):
|
async def add_channel_tags(self, ctx, *args):
|
||||||
tags, lst = u.kwargs(args)
|
tags, lst = u.kwargs(args)
|
||||||
|
|
||||||
guild = ctx.guild if isinstance(
|
|
||||||
ctx.guild, d.Guild) else ctx.channel
|
|
||||||
|
|
||||||
try:
|
|
||||||
async with ctx.channel.typing():
|
async with ctx.channel.typing():
|
||||||
tags = await self._aliases(ctx, tags, self.blacklists['guild_blacklist'].setdefault(guild.id, {}).setdefault(ctx.channel.id, set()))
|
added = await self._add(
|
||||||
|
tags,
|
||||||
|
self.blacklists['channel'].setdefault(ctx.channel.id, {}).setdefault(lst, set() if lst == 'blacklist' else {}),
|
||||||
|
alias=True if lst == 'aliases' else False)
|
||||||
|
|
||||||
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
await formatter.paginate(
|
||||||
|
ctx,
|
||||||
|
added,
|
||||||
|
start=f'\N{WHITE HEAVY CHECK MARK} **Added to {ctx.channel.mention} {lst}:**\n')
|
||||||
|
|
||||||
await ctx.send('\N{WHITE HEAVY CHECK MARK} **Added to** {} **blacklist:**\n```\n{}```'.format(ctx.channel.mention, ' '.join(tags)))
|
@add_tags.command(
|
||||||
|
name='me',
|
||||||
except exc.Abort:
|
aliases=['m'],
|
||||||
await ctx.send('**Aborted**')
|
brief='Add tags to personal blacklist',
|
||||||
except exc.MissingArgument:
|
description='Add tags to personal blacklist',
|
||||||
await ctx.send('\N{CROSS MARK} **Missing tags**')
|
usage='[tags...]')
|
||||||
await ctx.message.add_reaction('\N{CROSS MARK}')
|
async def add_user_tags(self, ctx, *args):
|
||||||
|
|
||||||
@_add_tags.command(name='me', aliases=['m'])
|
|
||||||
async def __add_user_tags(self, ctx, *args):
|
|
||||||
kwargs = u.get_kwargs(ctx, args)
|
|
||||||
tags = kwargs['remaining']
|
|
||||||
tags, lst = u.kwargs(args)
|
tags, lst = u.kwargs(args)
|
||||||
|
|
||||||
try:
|
|
||||||
async with ctx.channel.typing():
|
async with ctx.channel.typing():
|
||||||
tags = await self._aliases(ctx, tags, self.blacklists['user_blacklist'].setdefault(ctx.author.id, set()))
|
added = await self._add(
|
||||||
|
tags,
|
||||||
|
self.blacklists['user'].setdefault(ctx.author.id, {}).setdefault(lst, set() if lst == 'blacklist' else {}),
|
||||||
|
alias=True if lst == 'aliases' else False)
|
||||||
|
|
||||||
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
await formatter.paginate(
|
||||||
|
ctx,
|
||||||
|
added,
|
||||||
|
start=f'\N{WHITE HEAVY CHECK MARK} **Added to {ctx.author.mention}\'s {lst}:**\n')
|
||||||
|
|
||||||
await ctx.send('\N{WHITE HEAVY CHECK MARK} {} **added to their blacklist:**\n```\n{}```'.format(ctx.author.mention, ' '.join(tags)))
|
@blacklist.group(
|
||||||
|
name='remove',
|
||||||
except exc.Abort:
|
aliases=['rm', 'r'],
|
||||||
await ctx.send('**Aborted**')
|
brief='Remove tags from a blacklist',
|
||||||
except exc.MissingArgument:
|
description='Remove tags from global, channel, or personal blacklists',
|
||||||
await ctx.send('\N{CROSS MARK} **Missing tags**')
|
usage='[blacklist] [tags...]')
|
||||||
await ctx.message.add_reaction('\N{CROSS MARK}')
|
async def remove_tags(self, ctx):
|
||||||
|
|
||||||
@blacklist.group(name='remove', aliases=['rm', 'r'])
|
|
||||||
async def _remove_tags(self, ctx):
|
|
||||||
if not ctx.invoked_subcommand:
|
if not ctx.invoked_subcommand:
|
||||||
await ctx.send('**Invalid blacklist**')
|
await ctx.send('**Invalid blacklist**')
|
||||||
await ctx.message.add_reaction('\N{CROSS MARK}')
|
await ctx.message.add_reaction('\N{CROSS MARK}')
|
||||||
|
|
||||||
@_remove_tags.command(name='global', aliases=['gl', 'g'])
|
def _remove(self, tags, lst):
|
||||||
@cmds.is_owner()
|
removed = []
|
||||||
async def __remove_global_tags(self, ctx, *args):
|
skipped = []
|
||||||
try:
|
|
||||||
kwargs = u.get_kwargs(ctx, args)
|
|
||||||
tags = kwargs['remaining']
|
|
||||||
|
|
||||||
|
if tags:
|
||||||
|
if type(lst) is set:
|
||||||
|
temp = set()
|
||||||
for tag in tags:
|
for tag in tags:
|
||||||
try:
|
if tag not in tags:
|
||||||
self.blacklists['global_blacklist'].remove(tag)
|
temp.add(tag)
|
||||||
|
else:
|
||||||
except KeyError:
|
removed.append(tag)
|
||||||
raise exc.TagError(tag)
|
else:
|
||||||
|
temp = {}
|
||||||
|
for k, v in lst.items():
|
||||||
|
temp[k] = set()
|
||||||
|
for tag in v:
|
||||||
|
if tag not in tags:
|
||||||
|
temp[k].add(tag)
|
||||||
|
else:
|
||||||
|
removed.append(tag)
|
||||||
|
lst.update(temp)
|
||||||
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
||||||
|
|
||||||
|
return removed, skipped
|
||||||
|
|
||||||
|
@remove_tags.command(
|
||||||
|
name='global',
|
||||||
|
aliases=['gl', 'g'],
|
||||||
|
brief='Remove tags from global blacklist',
|
||||||
|
description='Remove tags from global blacklist',
|
||||||
|
usage='[tags...]')
|
||||||
|
@cmds.is_owner()
|
||||||
|
async def remove_global_tags(self, ctx, *args):
|
||||||
tags, lst = u.kwargs(args)
|
tags, lst = u.kwargs(args)
|
||||||
|
|
||||||
await ctx.send('**Removed from global blacklist:**\n```\n{}```'.format(' '.join(tags)))
|
async with ctx.channel.typing():
|
||||||
|
removed, skipped = self._remove(
|
||||||
|
tags,
|
||||||
|
self.blacklists['global'].get(lst, set()))
|
||||||
|
|
||||||
except exc.TagError as e:
|
await formatter.paginate(
|
||||||
await ctx.send('`{}` **not in blacklist**'.format(e))
|
ctx,
|
||||||
await ctx.message.add_reaction('\N{CROSS MARK}')
|
removed,
|
||||||
|
start=f'\N{WHITE HEAVY CHECK MARK} **Removed from global {lst}:**\n')
|
||||||
|
if skipped:
|
||||||
|
await formatter.paginate(
|
||||||
|
ctx,
|
||||||
|
skipped,
|
||||||
|
start=f'\N{CROSS MARK} **Not in global {lst}:**\n')
|
||||||
|
|
||||||
@_remove_tags.command(name='channel', aliases=['ch', 'c'])
|
@remove_tags.command(
|
||||||
|
name='channel',
|
||||||
|
aliases=['ch', 'c'],
|
||||||
|
brief='Remove tags from channel blacklist',
|
||||||
|
description='Remove tags from channel blacklist',
|
||||||
|
usage='[tags...]')
|
||||||
@cmds.has_permissions(manage_channels=True)
|
@cmds.has_permissions(manage_channels=True)
|
||||||
async def __remove_channel_tags(self, ctx, *args):
|
async def remove_channel_tags(self, ctx, *args):
|
||||||
try:
|
tags, lst = u.kwargs(args)
|
||||||
kwargs = u.get_kwargs(ctx, args)
|
|
||||||
tags = kwargs['remaining']
|
|
||||||
|
|
||||||
guild = ctx.guild if isinstance(
|
async with ctx.channel.typing():
|
||||||
ctx.guild, d.Guild) else ctx.channel
|
removed, skipped = self._remove(
|
||||||
|
tags,
|
||||||
|
self.blacklists['channel'].get(ctx.channel.id, {}).get(lst, set()))
|
||||||
|
|
||||||
for tag in tags:
|
await formatter.paginate(
|
||||||
try:
|
ctx,
|
||||||
self.blacklists['guild_blacklist'][guild.id][ctx.channel.id].remove(
|
removed,
|
||||||
tag)
|
start=f'\N{WHITE HEAVY CHECK MARK} **Removed from {ctx.channel.mention} {lst}:**\n')
|
||||||
|
if skipped:
|
||||||
|
await formatter.paginate(
|
||||||
|
ctx,
|
||||||
|
skipped,
|
||||||
|
start=f'\N{CROSS MARK} **Not in {ctx.channel.mention} {lst}:**\n')
|
||||||
|
|
||||||
except KeyError:
|
@remove_tags.command(
|
||||||
raise exc.TagError(tag)
|
name='me',
|
||||||
|
aliases=['m'],
|
||||||
|
brief='Remove tags from personal blacklist',
|
||||||
|
description='Remove tags from personal blacklist',
|
||||||
|
usage='[tags...]')
|
||||||
|
async def remove_user_tags(self, ctx, *args):
|
||||||
|
tags, lst = u.kwargs(args)
|
||||||
|
|
||||||
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
async with ctx.channel.typing():
|
||||||
|
removed, skipped = self._remove(
|
||||||
|
tags,
|
||||||
|
self.blacklists['user'].get(ctx.author.id, {}).get(lst, set()))
|
||||||
|
|
||||||
await ctx.send('**Removed from** {} **blacklist:**\n```\n{}```'.format(ctx.channel.mention, ' '.join(tags)))
|
await formatter.paginate(
|
||||||
|
ctx,
|
||||||
|
removed,
|
||||||
|
start=f'\N{WHITE HEAVY CHECK MARK} **Removed from {ctx.author.mention}\'s {lst}:**\n')
|
||||||
|
if skipped:
|
||||||
|
await formatter.paginate(
|
||||||
|
ctx,
|
||||||
|
skipped,
|
||||||
|
start=f'\N{CROSS MARK} **Not in {ctx.author.mention}\'s {lst}:**\n')
|
||||||
|
|
||||||
except exc.TagError as e:
|
@blacklist.group(
|
||||||
await ctx.send('`{}` **not in blacklist**'.format(e))
|
name='clear',
|
||||||
await ctx.message.add_reaction('\N{CROSS MARK}')
|
aliases=['cl', 'c'],
|
||||||
|
brief='Delete a blacklist',
|
||||||
@_remove_tags.command(name='me', aliases=['m'])
|
description='Delete global, channel, or personal blacklists',
|
||||||
async def __remove_user_tags(self, ctx, *args):
|
usage='[blacklist]')
|
||||||
try:
|
async def clear_blacklist(self, ctx):
|
||||||
kwargs = u.get_kwargs(ctx, args)
|
|
||||||
tags = kwargs['remaining']
|
|
||||||
|
|
||||||
for tag in tags:
|
|
||||||
try:
|
|
||||||
self.blacklists['user_blacklist'][ctx.author.id].remove(
|
|
||||||
tag)
|
|
||||||
|
|
||||||
except KeyError:
|
|
||||||
raise exc.TagError(tag)
|
|
||||||
|
|
||||||
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
|
||||||
|
|
||||||
await ctx.send('{} **removed from their blacklist:**\n```\n{}```'.format(ctx.author.mention, ' '.join(tags)))
|
|
||||||
|
|
||||||
except exc.TagError as e:
|
|
||||||
await ctx.send('`{}` **not in blacklist**'.format(e))
|
|
||||||
await ctx.message.add_reaction('\N{CROSS MARK}')
|
|
||||||
|
|
||||||
@blacklist.group(name='clear', aliases=['cl', 'c'])
|
|
||||||
async def _clear_blacklist(self, ctx):
|
|
||||||
if not ctx.invoked_subcommand:
|
if not ctx.invoked_subcommand:
|
||||||
await ctx.send('**Invalid blacklist**')
|
await ctx.send('**Invalid blacklist**')
|
||||||
await ctx.message.add_reaction('\N{CROSS MARK}')
|
await ctx.message.add_reaction('\N{CROSS MARK}')
|
||||||
|
|
||||||
@_clear_blacklist.command(name='global', aliases=['gl', 'g'])
|
@clear_blacklist.command(
|
||||||
|
name='global',
|
||||||
|
aliases=['gl', 'g'],
|
||||||
|
brief='Delete global blacklist',
|
||||||
|
description='Delete global blacklist')
|
||||||
@cmds.is_owner()
|
@cmds.is_owner()
|
||||||
async def __clear_global_blacklist(self, ctx, *args):
|
async def clear_global_blacklist(self, ctx, *args):
|
||||||
args, lst = u.kwargs(args)
|
args, lst = u.kwargs(args)
|
||||||
|
|
||||||
|
async with ctx.channel.typing():
|
||||||
|
with suppress(KeyError):
|
||||||
|
del self.blacklists['global'][lst]
|
||||||
|
|
||||||
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
||||||
|
|
||||||
await ctx.send('**Global blacklist cleared**')
|
await ctx.send(f'\N{WHITE HEAVY CHECK MARK} **Global {lst} cleared**')
|
||||||
|
|
||||||
@_clear_blacklist.command(name='channel', aliases=['ch', 'c'])
|
@clear_blacklist.command(
|
||||||
|
name='channel',
|
||||||
|
aliases=['ch', 'c'],
|
||||||
|
brief='Delete channel blacklist',
|
||||||
|
description='Delete channel blacklist')
|
||||||
@cmds.has_permissions(manage_channels=True)
|
@cmds.has_permissions(manage_channels=True)
|
||||||
async def __clear_channel_blacklist(self, ctx, *args):
|
async def clear_channel_blacklist(self, ctx, *args):
|
||||||
args, lst = u.kwargs(args)
|
|
||||||
ctx.guild, d.Guild) else ctx.channel
|
|
||||||
|
|
||||||
with suppress(KeyError):
|
|
||||||
del self.blacklists['guild_blacklist'][guild.id][ctx.channel.id]
|
|
||||||
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
|
||||||
|
|
||||||
await ctx.send('{} **blacklist cleared**'.format(ctx.channel.mention))
|
|
||||||
args, lst = u.kwargs(args)
|
args, lst = u.kwargs(args)
|
||||||
|
|
||||||
@_clear_blacklist.command(name='me', aliases=['m'])
|
async with ctx.channel.typing():
|
||||||
async def __clear_user_blacklist(self, ctx, *args):
|
|
||||||
with suppress(KeyError):
|
with suppress(KeyError):
|
||||||
del self.blacklists['user_blacklist'][ctx.author.id]
|
del self.blacklists['channel'][ctx.channel.id][lst]
|
||||||
|
|
||||||
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
||||||
|
|
||||||
await ctx.send('{}**\'s blacklist cleared**'.format(ctx.author.mention))
|
await ctx.send(f'\N{WHITE HEAVY CHECK MARK} **{ctx.channel.mention} {lst} cleared**')
|
||||||
|
|
||||||
|
@clear_blacklist.command(
|
||||||
|
name='me',
|
||||||
|
aliases=['m'],
|
||||||
|
brief='Delete your personal blacklist',
|
||||||
|
description='Delete your personal blacklist')
|
||||||
|
async def clear_user_blacklist(self, ctx, *args):
|
||||||
|
args, lst = u.kwargs(args)
|
||||||
|
|
||||||
|
async with ctx.channel.typing():
|
||||||
|
with suppress(KeyError):
|
||||||
|
del self.blacklists['user'][ctx.author.id][lst]
|
||||||
|
|
||||||
|
u.dump(self.blacklists, 'cogs/blacklists.pkl')
|
||||||
|
|
||||||
|
await ctx.send(f'\N{WHITE HEAVY CHECK MARK} **{ctx.author.mention}\'s {lst} cleared**')
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue