blizzthewolf/SeaCogs
1
0
Fork 1
forked from cswimr/SeaCogs
Code Pull requests Activity

fix(backup): remove support for message content based json loading

Browse source
This commit is contained in:
SeaswimmerTheFsh 2024-01-31 13:17:54 -05:00
parent c2aa674bff
commit c07c7317f4
Signed by untrusted user: cswimr
GPG key ID: B8953EC01E5C4063
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
backup/backup.py
View file

@ -59,12 +59,12 @@ class Backup(commands.Cog):
@backup.command(name='import')
@commands.is_owner()
async def backup_import(self, ctx: commands.Context, *, export: str = None):
"""Import your installed repositories and cogs from an export."""
async def backup_import(self, ctx: commands.Context):
"""Import your installed repositories and cogs from an export file."""
if export is None and not len(ctx.message.attachments) == 0:
export = await ctx.message.attachments[0].read()
try:
export = json.loads(self.extract_json_from_codeblock(export))
export = json.loads(export)
except json.JSONDecodeError:
await ctx.send(error("Please provide a valid JSON export."))
return
@ -73,10 +73,3 @@ class Backup(commands.Cog):
if downloader is None:
await ctx.send(error(f"You do not have the `Downloader` cog loaded. Please run `{ctx.prefix}load downloader` and try again."))
return
def extract_json_from_codeblock(self, text):
match = re.match(r"```(?:\w+)?\n(.*?)\n```", text, re.DOTALL)
if match:
return match.group(1).strip()
else:
return text