cswimr/SeaCogs
cswimr/SeaCogs
1
1
Fork 1
Code Issues 10 Pull requests 4 Projects 1 Packages 1 Wiki Activity Actions

fix(aurora): fixed Moderation.get_latest() breaking when using only before and after, and no other kwargs
Some checks failed
Actions / Build Documentation (MkDocs) (pull_request) Failing after 27s
Details
Actions / Lint Code (Ruff & Pylint) (pull_request) Successful in 39s
Details

Browse source
This commit is contained in:
Seaswimmer 2024-08-10 13:42:15 -04:00
parent 14750787b2
commit f3246366ff
Signed by: cswimr
GPG key ID: 3813315477F26F82
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aurora/aurora.py
View file

@ -44,7 +44,7 @@ class Aurora(commands.Cog):
This cog stores all of its data in an SQLite database.""" This cog stores all of its data in an SQLite database."""
__author__ = ["SeaswimmerTheFsh"] __author__ = ["SeaswimmerTheFsh"]
__version__ = "2.4.0" __version__ = "2.4.1"
__documentation__ = "https://seacogs.coastalcommits.com/aurora/" __documentation__ = "https://seacogs.coastalcommits.com/aurora/"
async def red_delete_data_for_user(self, *, requester, user_id: int): async def red_delete_data_for_user(self, *, requester, user_id: int):

12
aurora/models/moderation.py
View file

@ -315,16 +315,22 @@ class Moderation(AuroraGuildModel):
async def get_latest(cls, bot: Red, guild_id: int, before: datetime = None, after: datetime = None, limit: int | None = None, offset: int = 0, types: Iterable[Type] | None = None, cursor: Cursor | None = None) -> Tuple["Moderation"]: async def get_latest(cls, bot: Red, guild_id: int, before: datetime = None, after: datetime = None, limit: int | None = None, offset: int = 0, types: Iterable[Type] | None = None, cursor: Cursor | None = None) -> Tuple["Moderation"]:
params = [] params = []
query = f"SELECT * FROM moderation_{guild_id} ORDER BY moderation_id DESC" query = f"SELECT * FROM moderation_{guild_id} ORDER BY moderation_id DESC"
conditions = []
if types: if types:
query += f" WHERE moderation_type IN ({', '.join(['?' for _ in types])})" conditions.append(f"moderation_type IN ({', '.join(['?' for _ in types])})")
for t in types: for t in types:
params.append(t.key) params.append(t.key)
if before: if before:
query += " WHERE timestamp < ?" conditions.append("timestamp < ?")
params.append(int(before.timestamp())) params.append(int(before.timestamp()))
if after: if after:
query += " WHERE timestamp > ?" conditions.append("timestamp > ?")
params.append(int(after.timestamp())) params.append(int(after.timestamp()))
if conditions:
query += " WHERE " + " AND ".join(conditions)
if limit: if limit:
query += " LIMIT ? OFFSET ?" query += " LIMIT ? OFFSET ?"
params.extend((limit, offset)) params.extend((limit, offset))