Skip to content

Fix !clean users command to handle more than one user #2178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xithrius merged 3 commits into from
May 27, 2022
Merged

Fix !clean users command to handle more than one user #2178

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf58634
Fix !clean users command to properly handle more than one user
Autonymic May 22, 2022
6f34095
Make !clean user an alias of !clean users instead of the other way ar…
Autonymic May 22, 2022
feb6c94
Merge branch 'main' into fix/clean-users
Xithrius May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions bot/exts/moderation/clean.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,24 +486,24 @@ async def clean_group(

await self._clean_messages(ctx, channels, bots_only, users, regex, first_limit, second_limit)

@clean_group.command(name="user", aliases=["users"])
async def clean_user(
@clean_group.command(name="users", aliases=["user"])
async def clean_users(
self,
ctx: Context,
user: User,
users: Greedy[User],
message_or_time: CleanLimit,
*,
channels: CleanChannels = None
) -> None:
"""
Delete messages posted by the provided user, stop cleaning after reaching `message_or_time`.
Delete messages posted by the provided users, stop cleaning after reaching `message_or_time`.

`message_or_time` can be either a message to stop at (exclusive), a timedelta for max message age, or an ISO
datetime.

If a message is specified, `channels` cannot be specified.
"""
await self._clean_messages(ctx, users=[user], channels=channels, first_limit=message_or_time)
await self._clean_messages(ctx, users=users, channels=channels, first_limit=message_or_time)

@clean_group.command(name="bots", aliases=["bot"])
async def clean_bots(self, ctx: Context, message_or_time: CleanLimit, *, channels: CleanChannels = None) -> None:
Expand Down