From e9889173199efa2548bffabeb6db17feb9996e73 Mon Sep 17 00:00:00 2001 From: Seaswimmer Date: Wed, 5 Jun 2024 01:31:40 -0400 Subject: [PATCH] feat(aurora): added a return_obj parameter to `Moderation.execute()` --- aurora/aurora.py | 2 +- aurora/models/moderation.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aurora/aurora.py b/aurora/aurora.py index 6cbfff5..3d7f683 100644 --- a/aurora/aurora.py +++ b/aurora/aurora.py @@ -1614,7 +1614,7 @@ class Aurora(commands.Cog): continue expiry_query = f"UPDATE `moderation_{guild.id}` SET expired = 1 WHERE (end_timestamp IS NOT NULL AND end_timestamp <= ? AND expired = 0) OR (expired = 0 AND resolved = 1);" - await Moderation.execute(bot=self.bot, guild_id=guild.id, query=expiry_query, parameters=(time.time(),)) + await Moderation.execute(bot=self.bot, guild_id=guild.id, query=expiry_query, parameters=(time.time(),), return_obj=False) per_guild_completion_time = (time.time() - time_per_guild) * 1000 logger.debug( diff --git a/aurora/models/moderation.py b/aurora/models/moderation.py index 2972747..8887dd5 100644 --- a/aurora/models/moderation.py +++ b/aurora/models/moderation.py @@ -208,7 +208,7 @@ class Moderation(AuroraGuildModel): return cls.from_dict(bot=bot, data=case) @classmethod - async def execute(cls, bot: Red, guild_id: int, query: str, parameters: tuple | None = None, cursor: Cursor | None = None) -> Tuple["Moderation"]: + async def execute(cls, bot: Red, guild_id: int, query: str, parameters: tuple | None = None, cursor: Cursor | None = None, return_obj: bool = True) -> Tuple["Moderation"]: from ..utilities.database import connect logger.trace("Executing query: %s", query) logger.trace("With parameters: %s", parameters) @@ -227,7 +227,7 @@ class Moderation(AuroraGuildModel): await cursor.close() await database.close() - if results: + if results and return_obj: cases = [] for result in results: case = cls.from_result(bot=bot, result=result, guild_id=guild_id)