Skip to content
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.

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

feat: Support bulk banning in guilds #2421

Merged
merged 19 commits into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ These changes are available on the `master` branch, but have not yet been releas
([#2417](https://github.com/Pycord-Development/pycord/pull/2417))
- Added `Guild.search_members`.
([#2418](https://github.com/Pycord-Development/pycord/pull/2418))
- Added bulk banning up to 200 users through `Guild.ban`
NeloBlivion marked this conversation as resolved.
Show resolved Hide resolved
([#2421](https://github.com/Pycord-Development/pycord/pull/2421))

### Fixed

Expand Down
59 changes: 47 additions & 12 deletions discord/guild.py
Original file line number Diff line number Diff line change
Expand Up @@ -3073,25 +3073,24 @@ async def kick(self, user: Snowflake, *, reason: str | None = None) -> None:

async def ban(
self,
user: Snowflake,
*,
*users: Snowflake,
delete_message_seconds: int | None = None,
delete_message_days: Literal[0, 1, 2, 3, 4, 5, 6, 7] | None = None,
reason: str | None = None,
) -> None:
NeloBlivion marked this conversation as resolved.
Show resolved Hide resolved
"""|coro|
r"""|coro|

Bans a user from the guild.
Bans users from the guild.
NeloBlivion marked this conversation as resolved.
Show resolved Hide resolved

The user must meet the :class:`abc.Snowflake` abc.
The users must meet the :class:`abc.Snowflake` abc.
NeloBlivion marked this conversation as resolved.
Show resolved Hide resolved

You must have the :attr:`~Permissions.ban_members` permission to
do this.

Parameters
----------
user: :class:`abc.Snowflake`
The user to ban from their guild.
\*users: :class:`abc.Snowflake`
An argument list of users to ban from the guild, up to 200.
delete_message_seconds: Optional[:class:`int`]
The number of seconds worth of messages to delete from
the user in the guild. The minimum is 0 and the maximum
Expand All @@ -3100,14 +3099,32 @@ async def ban(
***Deprecated parameter***, same as ``delete_message_seconds`` but
is used for days instead.
reason: Optional[:class:`str`]
The reason the user got banned.
The reason the users got banned.

Returns
-------
Optional[List[List[:class:`Snowflake`], List[:class:`Snowflake`]]]
If banning a single member, returns nothing. Otherwise, returns two lists;

Raises
------
ValueError
You tried to ban more than 200 users.
Forbidden
You do not have the proper permissions to ban.
HTTPException
Banning failed.
No users were banned.

Example Usage: ::

# Ban a single member
await guild.ban(member, reason="Spam")

# Ban multiple members
successes, failures = await guild.ban(member1, member2, member3, ..., reason="Raid")

# Ban a list of members
successes, failures = await guild.ban(*members, reason="Hacked")
NeloBlivion marked this conversation as resolved.
Show resolved Hide resolved
"""
if delete_message_seconds and delete_message_days:
raise TypeError(
Expand All @@ -3121,9 +3138,27 @@ async def ban(
"delete_message_seconds must be between 0 and 604800 seconds."
)

await self._state.http.ban(
user.id, self.id, delete_message_seconds, delete_message_days, reason=reason
)
if len(users) == 1:
await self._state.http.ban(
users[0].id,
self.id,
delete_message_seconds,
delete_message_days,
reason=reason,
)
elif len(users) > 200:
raise ValueError("You may only bulk ban up to 200 members.")
NeloBlivion marked this conversation as resolved.
Show resolved Hide resolved
else:
data = await self._state.http.bulk_ban(
[u.id for u in users],
self.id,
delete_message_seconds,
delete_message_days,
reason=reason,
)
banned = [u for u in users if str(u.id) in data["banned_users"]]
failed = [u for u in users if str(u.id) in data["failed_users"]]
return banned, failed

async def unban(self, user: Snowflake, *, reason: str | None = None) -> None:
"""|coro|
Expand Down
29 changes: 29 additions & 0 deletions discord/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -931,6 +931,35 @@ def ban(

return self.request(r, params=params, reason=reason)

def bulk_ban(
self,
user_ids: list[Snowflake],
guild_id: Snowflake,
delete_message_seconds: int = None,
delete_message_days: int = None,
reason: str | None = None,
) -> Response[guild.GuildBulkBan]:
r = Route(
"POST",
"/guilds/{guild_id}/bulk-ban",
guild_id=guild_id,
)
payload = {
"user_ids": user_ids,
}
if delete_message_seconds:
payload["delete_message_seconds"] = delete_message_seconds
elif delete_message_days:
warn_deprecated(
"delete_message_days",
"delete_message_seconds",
"2.2",
reference="https://github.com/discord/discord-api-docs/pull/5219",
)
payload["delete_message_days"] = delete_message_days

return self.request(r, json=payload, reason=reason)

def unban(
self, user_id: Snowflake, guild_id: Snowflake, *, reason: str | None = None
) -> Response[None]:
Expand Down
5 changes: 5 additions & 0 deletions discord/types/guild.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,3 +185,8 @@ class RolePositionUpdate(TypedDict, total=False):

class GuildMFAModify(TypedDict):
level: Literal[0, 1]


class GuildBulkBan(TypedDict):
banned_users: list[Snowflake]
failed_users: list[Snowflake]
Loading