From cf586348600a043827d2b5012c98327e77bc53fd Mon Sep 17 00:00:00 2001
From: Autonymic <75275746+Autonymic@users.noreply.github.com>
Date: Sun, 22 May 2022 18:19:56 +0200
Subject: [PATCH 1/2] Fix !clean users command to properly handle more than one
 user

---
 bot/exts/moderation/clean.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/exts/moderation/clean.py b/bot/exts/moderation/clean.py
index 0f14f515e7..4c069e1f69 100644
--- a/bot/exts/moderation/clean.py
+++ b/bot/exts/moderation/clean.py
@@ -490,7 +490,7 @@ async def clean_group(
     async def clean_user(
         self,
         ctx: Context,
-        user: User,
+        users: Greedy[User],
         message_or_time: CleanLimit,
         *,
         channels: CleanChannels = None
@@ -503,7 +503,7 @@ async def clean_user(
 
         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:

From 6f340954e701583f94a6a0e41c829fc3325146aa Mon Sep 17 00:00:00 2001
From: Autonymic <75275746+Autonymic@users.noreply.github.com>
Date: Sun, 22 May 2022 18:23:41 +0200
Subject: [PATCH 2/2] Make !clean user an alias of !clean users instead of the
 other way around

---
 bot/exts/moderation/clean.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bot/exts/moderation/clean.py b/bot/exts/moderation/clean.py
index 4c069e1f69..4f4bea3e52 100644
--- a/bot/exts/moderation/clean.py
+++ b/bot/exts/moderation/clean.py
@@ -486,8 +486,8 @@ 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,
         users: Greedy[User],
@@ -496,7 +496,7 @@ async def clean_user(
         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.