From 300d26dc7e2900c78af21af931093892631af1e9 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sat, 4 May 2024 22:50:30 -0400 Subject: [PATCH] fix(aurora): fixed a bunch of json issues --- aurora/models.py | 8 ++++---- aurora/utilities/utils.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aurora/models.py b/aurora/models.py index e80b345..66ed68a 100644 --- a/aurora/models.py +++ b/aurora/models.py @@ -98,8 +98,8 @@ class Moderation(AuroraGuildModel): self.resolved_by, self.resolve_reason, self.expired, - dumps(self.changes).strip('"').replace('\\"', '"'), - dumps(self.metadata).strip('"').replace('\\"', '"'), + dumps(self.changes).replace('\\"', '"').replace('["{', '[{').replace('}"]', '}]'), + dumps(self.metadata).replace('\\"', '"').replace('["{', '[{').replace('}"]', '}]'), self.moderation_id )) cursor.close() @@ -119,8 +119,8 @@ class Moderation(AuroraGuildModel): self.resolved_by, self.resolve_reason, self.expired, - dumps(self.changes).strip('"').replace('\\"', '"'), - dumps(self.metadata).strip('"').replace('\\"', '"'), + dumps(self.changes).replace('\\"', '"').replace('["{', '[{').replace('}"]', '}]'), + dumps(self.metadata).replace('\\"', '"').replace('["{', '[{').replace('}"]', '}]'), ) @classmethod diff --git a/aurora/utilities/utils.py b/aurora/utilities/utils.py index b15a865..67fb902 100644 --- a/aurora/utilities/utils.py +++ b/aurora/utilities/utils.py @@ -134,7 +134,7 @@ def generate_dict(bot: Red, result: dict, guild_id: int) -> dict: duration = None if result[14] is not None: - changes = json.loads(result[14].strip('"').replace('\\"', '"')) + changes = json.loads(result[14].replace('\\"', '"').replace('["{', '[{').replace('}"]', '}]')) change_obj_list = [] for change in changes: change_obj_list.append(Change.from_dict(bot=bot, data=change)) @@ -156,7 +156,7 @@ def generate_dict(bot: Red, result: dict, guild_id: int) -> dict: "resolve_reason": result[12], "expired": bool(result[13]), "changes": change_obj_list if result[14] else [], - "metadata": json.loads(result[15].strip('"').replace('\\"', '"')) if result[15] else {}, + "metadata": json.loads(result[15].replace('\\"', '"').replace('["{', '[{').replace('}"]', '}]')) if result[15] else {}, } return case