CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Core] A few data API grammar improvements (#4164)

Browse Source 
* stuff

* .

* oops

* aaaaaaaaaa
This commit is contained in:
Vexed 2020-08-06 23:22:08 +01:00 committed by GitHub
parent fcbb07a333
commit 61df4f88b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
redbot/core/core_commands.py
View File

@ -519,14 +519,14 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
@commands.group(cls=commands.commands._AlwaysAvailableGroup) @commands.group(cls=commands.commands._AlwaysAvailableGroup)
async def mydata(self, ctx: commands.Context): async def mydata(self, ctx: commands.Context):
""" Commands which interact with the data [botname] has about you """ """ Commands which interact with the data [botname] has about you. """
# 1/10 minutes. It's a static response, but the inability to lock # 1/10 minutes. It's a static response, but the inability to lock
# will annoy people if it's spammable # will annoy people if it's spammable
@commands.cooldown(1, 600, commands.BucketType.user) @commands.cooldown(1, 600, commands.BucketType.user)
@mydata.command(cls=commands.commands._AlwaysAvailableCommand, name="whatdata") @mydata.command(cls=commands.commands._AlwaysAvailableCommand, name="whatdata")
async def mydata_whatdata(self, ctx: commands.Context): async def mydata_whatdata(self, ctx: commands.Context):
""" Find out what type of data [botname] stores and why """ """ Find out what type of data [botname] stores and why. """
ver = "latest" if red_version_info.dev_release else "stable" ver = "latest" if red_version_info.dev_release else "stable"
link = f"https://docs.discord.red/en/{ver}/red_core_data_statement.html" link = f"https://docs.discord.red/en/{ver}/red_core_data_statement.html"
@ -555,7 +555,7 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
# Can't check this as a command check, and want to prompt DMs as an option. # Can't check this as a command check, and want to prompt DMs as an option.
if not ctx.channel.permissions_for(ctx.me).attach_files: if not ctx.channel.permissions_for(ctx.me).attach_files:
ctx.command.reset_cooldown(ctx) ctx.command.reset_cooldown(ctx)
return await ctx.send(_("I need to be able to attach files (try in DMs?)")) return await ctx.send(_("I need to be able to attach files (try in DMs?)."))
statements = { statements = {
ext_name: getattr(ext, "__red_end_user_data_statement__", None) ext_name: getattr(ext, "__red_end_user_data_statement__", None)
@ -603,7 +603,7 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
fp = io.BytesIO(html.encode()) fp = io.BytesIO(html.encode())
await ctx.send( await ctx.send(
_("Here's a generated page with the statements provided by 3rd-party extensions"), _("Here's a generated page with the statements provided by 3rd-party extensions."),
file=discord.File(fp, filename="3rd-party.html"), file=discord.File(fp, filename="3rd-party.html"),
) )
@ -647,7 +647,7 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
# lol, no, we're not letting users schedule deletions every day to thrash the bot. # lol, no, we're not letting users schedule deletions every day to thrash the bot.
ctx.command.reset_cooldown(ctx) # We will however not let that lock them out either. ctx.command.reset_cooldown(ctx) # We will however not let that lock them out either.
return await ctx.send( return await ctx.send(
_("This command ({command}) does not support non-interactive usage").format( _("This command ({command}) does not support non-interactive usage.").format(
command=ctx.command.qualified_name command=ctx.command.qualified_name
) )
) )
@ -664,7 +664,7 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
): ):
ctx.command.reset_cooldown(ctx) ctx.command.reset_cooldown(ctx)
return return
await ctx.send(_("This may take some time")) await ctx.send(_("This may take some time."))
if await ctx.bot._config.datarequests.user_requests_are_strict(): if await ctx.bot._config.datarequests.user_requests_are_strict():
requester = "user_strict" requester = "user_strict"
@ -681,7 +681,7 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
"I tried to delete all non-operational data about you " "I tried to delete all non-operational data about you "
"(that I know how to delete) " "(that I know how to delete) "
"{mention}, however the following modules errored: {modules}. " "{mention}, however the following modules errored: {modules}. "
"Additionally, the following cogs errored: {cogs}\n" "Additionally, the following cogs errored: {cogs}.\n"
"Please contact the owner of this bot to address this.\n" "Please contact the owner of this bot to address this.\n"
"Note: Outside of these failures, data should have been deleted." "Note: Outside of these failures, data should have been deleted."
).format( ).format(
@ -720,7 +720,7 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
if results.unhandled: if results.unhandled:
await ctx.send( await ctx.send(
_("{mention} The following cogs did not handle deletion:\n{cogs}").format( _("{mention} The following cogs did not handle deletion:\n{cogs}.").format(
mention=ctx.author.mention, cogs=humanize_list(results.unhandled) mention=ctx.author.mention, cogs=humanize_list(results.unhandled)
) )
) )
@ -801,7 +801,7 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
@mydata_owner_management.command(name="processdiscordrequest") @mydata_owner_management.command(name="processdiscordrequest")
async def mydata_discord_deletion_request(self, ctx, user_id: int): async def mydata_discord_deletion_request(self, ctx, user_id: int):
""" """
Handle a deletion request from discord. Handle a deletion request from Discord.
""" """
if not await self.get_serious_confirmation( if not await self.get_serious_confirmation(
@ -864,7 +864,7 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
if results.unhandled: if results.unhandled:
await ctx.send( await ctx.send(
_("{mention} The following cogs did not handle deletion:\n{cogs}").format( _("{mention} The following cogs did not handle deletion:\n{cogs}.").format(
mention=ctx.author.mention, cogs=humanize_list(results.unhandled) mention=ctx.author.mention, cogs=humanize_list(results.unhandled)
) )
) )
@ -942,7 +942,7 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
if results.unhandled: if results.unhandled:
await ctx.send( await ctx.send(
_("{mention} The following cogs did not handle deletion:\n{cogs}").format( _("{mention} The following cogs did not handle deletion:\n{cogs}.").format(
mention=ctx.author.mention, cogs=humanize_list(results.unhandled) mention=ctx.author.mention, cogs=humanize_list(results.unhandled)
) )
) )
@ -1002,13 +1002,11 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
).format(modules=humanize_list(results.failed_modules)) ).format(modules=humanize_list(results.failed_modules))
) )
else: else:
await ctx.send( await ctx.send(_("I've deleted all data about that user that I know how to delete."))
_("I've deleted all data about that user " "that I know how to delete.")
)
if results.unhandled: if results.unhandled:
await ctx.send( await ctx.send(
_("{mention} The following cogs did not handle deletion:\n{cogs}").format( _("{mention} The following cogs did not handle deletion:\n{cogs}.").format(
mention=ctx.author.mention, cogs=humanize_list(results.unhandled) mention=ctx.author.mention, cogs=humanize_list(results.unhandled)
) )
) )