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

Merge branch 'V3/release/3.0.0' into V3/develop

Browse Source 
# Conflicts:
#	redbot/cogs/mod/mod.py
This commit is contained in:
Toby Harradine
2019-01-11 16:42:42 +11:00
parent 937d2fe0f6 32bd47e105
commit e07408161a
18 changed files with 529 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
redbot/core/core_commands.py
View File

@@ -1173,6 +1173,9 @@ class Core(commands.Cog, CoreLogic):
await ctx.send(
_("A backup has been made of this instance. It is at {}.").format(backup_file)
)
if backup_file.stat().st_size > 8_000_000:
await ctx.send(_("This backup is to large to send via DM."))
return
await ctx.send(_("Would you like to receive a copy via DM? (y/n)"))
pred = MessagePredicate.yes_or_no(ctx)
@@ -1183,10 +1186,18 @@ class Core(commands.Cog, CoreLogic):
else:
if pred.result is True:
await ctx.send(_("OK, it's on its way!"))
async with ctx.author.typing():
await ctx.author.send(
_("Here's a copy of the backup"), file=discord.File(str(backup_file))
try:
async with ctx.author.typing():
await ctx.author.send(
_("Here's a copy of the backup"),
file=discord.File(str(backup_file)),
)
except discord.Forbidden:
await ctx.send(
_("I don't seem to be able to DM you. Do you have closed DMs?")
)
except discord.HTTPException:
await ctx.send(_("I could not send the backup file."))
else:
await ctx.send(_("OK then."))
else: