Skip to content

Commit 42db94f

Browse files
committed
Rework logic of purge_user_messages
1 parent a8c5933 commit 42db94f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

cogs/server_logs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ async def logsdelete(self, interaction: discord.Interaction,
180180
before: app_commands.Transform[Optional[datetime], DateTransformer] = None,
181181
after: app_commands.Transform[Optional[datetime], DateTransformer] = None,
182182
during: app_commands.Transform[Optional[datetime], DateTransformer] = None,
183-
limit: app_commands.Range[int, 1, 100] = 10,
183+
limit: app_commands.Range[int, 1, 50] = 10,
184184
):
185185
"""Delete messages from user according to messages stored in the server logs, deletes last limit messages by default.
186186

utils/serverlogs.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ async def purge_user_messages(self, user_id: int, limit: int, channel_id: int =
8686
if self.conn is None:
8787
return deleted, failures
8888

89-
stmt, bindings = self.build_query(member=user_id, after=after, limit=limit, channel=channel_id, before=before, during=during, sort_by_channel=False)
89+
stmt, bindings = self.build_query(member=user_id, after=after, limit=50, channel=channel_id, before=before, during=during, sort_by_channel=False)
9090

9191
async with self.conn.transaction():
9292
async for message_id, created_at, channel_id, channel_name, _, _ in self.conn.cursor(stmt, *bindings):
@@ -96,6 +96,8 @@ async def purge_user_messages(self, user_id: int, limit: int, channel_id: int =
9696
try:
9797
await channel.get_partial_message(message_id).delete()
9898
deleted += 1
99+
if deleted == limit:
100+
break
99101
except discord.NotFound:
100102
pass
101103
except (discord.Forbidden, discord.HTTPException) as e:

0 commit comments

Comments
 (0)