From f4cf58c63a93d3011ace0f673bd2a18fde04b19d Mon Sep 17 00:00:00 2001 From: Soheab <33902984+Soheab@users.noreply.github.com> Date: Thu, 4 Sep 2025 21:18:53 +0200 Subject: [PATCH 1/7] Add support for new current member fields https://github.com/discord/discord-api-docs/pull/7807 --- discord/http.py | 39 +--------------------------- discord/member.py | 65 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 40 deletions(-) diff --git a/discord/http.py b/discord/http.py index 76e680f638..c8e3252f0f 100644 --- a/discord/http.py +++ b/discord/http.py @@ -1020,38 +1020,6 @@ def guild_voice_state( def edit_profile(self, payload: dict[str, Any]) -> Response[user.User]: return self.request(Route("PATCH", "/users/@me"), json=payload) - def change_my_nickname( - self, - guild_id: Snowflake, - nickname: str, - *, - reason: str | None = None, - ) -> Response[member.Nickname]: - r = Route("PATCH", "/guilds/{guild_id}/members/@me", guild_id=guild_id) - payload = { - "nick": nickname, - } - return self.request(r, json=payload, reason=reason) - - def change_nickname( - self, - guild_id: Snowflake, - user_id: Snowflake, - nickname: str, - *, - reason: str | None = None, - ) -> Response[member.Member]: - r = Route( - "PATCH", - "/guilds/{guild_id}/members/{user_id}", - guild_id=guild_id, - user_id=user_id, - ) - payload = { - "nick": nickname, - } - return self.request(r, json=payload, reason=reason) - def edit_my_voice_state( self, guild_id: Snowflake, payload: dict[str, Any] ) -> Response[None]: @@ -1077,12 +1045,7 @@ def edit_member( reason: str | None = None, **fields: Any, ) -> Response[member.MemberWithUser]: - r = Route( - "PATCH", - "/guilds/{guild_id}/members/{user_id}", - guild_id=guild_id, - user_id=user_id, - ) + r = Route("PATCH", "/guilds/{guild_id}/members/{user_id}", guild_id=guild_id, user_id=user_id) return self.request(r, json=fields, reason=reason) # Channel management diff --git a/discord/member.py b/discord/member.py index 0ff90cce04..b5e5719958 100644 --- a/discord/member.py +++ b/discord/member.py @@ -44,6 +44,7 @@ from .permissions import Permissions from .user import BaseUser, User, _UserTag from .utils import MISSING +from .errors import InvalidArgument __all__ = ( "VoiceState", @@ -769,6 +770,9 @@ async def edit( reason: str | None = None, communication_disabled_until: datetime.datetime | None = MISSING, bypass_verification: bool | None = MISSING, + banner: bytes | None = MISSING, + avatar: bytes | None = MISSING, + bio: str | None = MISSING, ) -> Member | None: """|coro| @@ -804,6 +808,14 @@ async def edit( - Client has ALL THREE of :attr:`Permissions.moderate_members`, :attr:`Permissions.kick_members`, and :attr:`Permissions.ban_members` + .. note:: + + The following parameters are only available when editing the bot's own member: + + - ``avatar`` + - ``banner`` + - ``bio`` + All parameters are optional. .. versionchanged:: 1.1 @@ -841,6 +853,26 @@ async def edit( Indicates if the member should bypass the guild's verification requirements. .. versionadded:: 2.6 + banner: Optional[:class:`bytes`] + A :term:`py:bytes-like object` representing the banner. + Could be ``None`` to denote removal of the banner. + + This is only available when editing the bot's own member (i.e. :attr:`Guild.me`). + + .. versionadded:: 2.7 + avatar: Optional[:class:`bytes`] + A :term:`py:bytes-like object` representing the avatar. + Could be ``None`` to denote removal of the avatar. + + This is only available when editing the bot's own member (i.e. :attr:`Guild.me`). + + .. versionadded:: 2.7 + bio: Optional[:class:`str`] + The new bio for the member. Could be ``None`` to denote removal of the bio. + + This is only available when editing the bot's own member (i.e. :attr:`Guild.me`). + + .. versionadded:: 2.7 Returns ------- @@ -854,16 +886,19 @@ async def edit( You do not have the proper permissions to the action requested. HTTPException The operation failed. + InvalidArgument + You tried to edit the avatar, banner, or bio of a member that is not the bot. """ http = self._state.http guild_id = self.guild.id me = self._state.self_id == self.id payload: dict[str, Any] = {} + bot_payload: dict[str, Any] = {} if nick is not MISSING: nick = nick or "" if me: - await http.change_my_nickname(guild_id, nick, reason=reason) + bot_payload["nick"] = nick else: payload["nick"] = nick @@ -910,9 +945,35 @@ async def edit( flags.bypasses_verification = bypass_verification payload["flags"] = flags.value + + if avatar is not MISSING: + if avatar is None: + bot_payload["avatar"] = None + else: + bot_payload["avatar"] = utils._bytes_to_base64_data(avatar) + + if banner is not MISSING: + if banner is None: + bot_payload["banner"] = None + else: + bot_payload["banner"] = utils._bytes_to_base64_data(banner) + + if bio is not MISSING: + bot_payload["bio"] = bio or "" + + if bot_payload and not me: + raise InvalidArgument("Can only edit avatar, banner, or bio for the bot's member.") + + if not payload and not bot_payload: + return None + if payload: data = await http.edit_member(guild_id, self.id, reason=reason, **payload) - return Member(data=data, guild=self.guild, state=self._state) + else: + data = await http.edit_member(guild_id, "@me", reason=reason, **bot_payload) + + return Member(data=data, guild=self.guild, state=self._state) + async def timeout( self, until: datetime.datetime | None, *, reason: str | None = None From 0821dc3d40b1020c1ec43ee98b9dbafc634aeaba Mon Sep 17 00:00:00 2001 From: Soheab <33902984+Soheab@users.noreply.github.com> Date: Thu, 4 Sep 2025 21:25:12 +0200 Subject: [PATCH 2/7] chore: add changelog entry --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0219ed388c..865cc821e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ These changes are available on the `master` branch, but have not yet been releas ([#2711](https://github.com/Pycord-Development/pycord/pull/2711)) - Added `RawMessageUpdateEvent.new_message` - message update events now contain full message objects ([#2780](https://github.com/Pycord-Development/pycord/pull/2780)) +- Added support for setting guild-specfic `avatar`, `banner`, and `bio` for the bot user + through `Member.edit`. + ([#2908](https://github.com/Pycord-Development/pycord/pull/2908)) ### Changed From 5a3695268b15173f39398641de9dca6f0818ed57 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 19:28:50 +0000 Subject: [PATCH 3/7] style(pre-commit): auto fixes from pre-commit.com hooks --- discord/http.py | 7 ++++++- discord/member.py | 12 ++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/discord/http.py b/discord/http.py index c8e3252f0f..bfefed91d1 100644 --- a/discord/http.py +++ b/discord/http.py @@ -1045,7 +1045,12 @@ def edit_member( reason: str | None = None, **fields: Any, ) -> Response[member.MemberWithUser]: - r = Route("PATCH", "/guilds/{guild_id}/members/{user_id}", guild_id=guild_id, user_id=user_id) + r = Route( + "PATCH", + "/guilds/{guild_id}/members/{user_id}", + guild_id=guild_id, + user_id=user_id, + ) return self.request(r, json=fields, reason=reason) # Channel management diff --git a/discord/member.py b/discord/member.py index b5e5719958..f5ba3aea20 100644 --- a/discord/member.py +++ b/discord/member.py @@ -39,12 +39,12 @@ from .asset import Asset from .colour import Colour from .enums import Status, try_enum +from .errors import InvalidArgument from .flags import MemberFlags from .object import Object from .permissions import Permissions from .user import BaseUser, User, _UserTag from .utils import MISSING -from .errors import InvalidArgument __all__ = ( "VoiceState", @@ -945,7 +945,6 @@ async def edit( flags.bypasses_verification = bypass_verification payload["flags"] = flags.value - if avatar is not MISSING: if avatar is None: bot_payload["avatar"] = None @@ -962,8 +961,10 @@ async def edit( bot_payload["bio"] = bio or "" if bot_payload and not me: - raise InvalidArgument("Can only edit avatar, banner, or bio for the bot's member.") - + raise InvalidArgument( + "Can only edit avatar, banner, or bio for the bot's member." + ) + if not payload and not bot_payload: return None @@ -971,9 +972,8 @@ async def edit( data = await http.edit_member(guild_id, self.id, reason=reason, **payload) else: data = await http.edit_member(guild_id, "@me", reason=reason, **bot_payload) - - return Member(data=data, guild=self.guild, state=self._state) + return Member(data=data, guild=self.guild, state=self._state) async def timeout( self, until: datetime.datetime | None, *, reason: str | None = None From e245d323a3e6c49b60b2f091cf055a09a0540c56 Mon Sep 17 00:00:00 2001 From: Soheab <33902984+Soheab@users.noreply.github.com> Date: Thu, 4 Sep 2025 22:49:38 +0200 Subject: [PATCH 4/7] Update CHANGELOG.md Co-authored-by: plun1331 Signed-off-by: Soheab <33902984+Soheab@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 865cc821e9..0636fc3cdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ These changes are available on the `master` branch, but have not yet been releas ([#2711](https://github.com/Pycord-Development/pycord/pull/2711)) - Added `RawMessageUpdateEvent.new_message` - message update events now contain full message objects ([#2780](https://github.com/Pycord-Development/pycord/pull/2780)) -- Added support for setting guild-specfic `avatar`, `banner`, and `bio` for the bot user +- Added support for setting guild-specific `avatar`, `banner`, and `bio` for the bot user through `Member.edit`. ([#2908](https://github.com/Pycord-Development/pycord/pull/2908)) From 13a0c273a5a16bd3612c996df346c4051be1d300 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 20:50:04 +0000 Subject: [PATCH 5/7] style(pre-commit): auto fixes from pre-commit.com hooks --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0636fc3cdf..d998e17bea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,8 +17,8 @@ These changes are available on the `master` branch, but have not yet been releas ([#2711](https://github.com/Pycord-Development/pycord/pull/2711)) - Added `RawMessageUpdateEvent.new_message` - message update events now contain full message objects ([#2780](https://github.com/Pycord-Development/pycord/pull/2780)) -- Added support for setting guild-specific `avatar`, `banner`, and `bio` for the bot user - through `Member.edit`. +- Added support for setting guild-specific `avatar`, `banner`, and `bio` for the bot + user through `Member.edit`. ([#2908](https://github.com/Pycord-Development/pycord/pull/2908)) ### Changed From f30e46092d88b90e3f81d29c106b895f0e1e3cf8 Mon Sep 17 00:00:00 2001 From: Soheab <33902984+Soheab@users.noreply.github.com> Date: Wed, 10 Sep 2025 19:13:44 +0200 Subject: [PATCH 6/7] chore: do requested change https://github.com/Pycord-Development/pycord/pull/2910#discussion_r2324401017 --- discord/member.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/discord/member.py b/discord/member.py index f5ba3aea20..35b92ae73f 100644 --- a/discord/member.py +++ b/discord/member.py @@ -965,13 +965,13 @@ async def edit( "Can only edit avatar, banner, or bio for the bot's member." ) - if not payload and not bot_payload: - return None - + print(payload, bot_payload) if payload: data = await http.edit_member(guild_id, self.id, reason=reason, **payload) - else: + elif bot_payload: data = await http.edit_member(guild_id, "@me", reason=reason, **bot_payload) + else: + return None return Member(data=data, guild=self.guild, state=self._state) From ce5eb9640f3257174b657f6462f8de08bd81cf55 Mon Sep 17 00:00:00 2001 From: Soheab <33902984+Soheab@users.noreply.github.com> Date: Wed, 10 Sep 2025 19:51:44 +0200 Subject: [PATCH 7/7] Update discord/member.py Co-authored-by: DA344 <108473820+DA-344@users.noreply.github.com> Signed-off-by: Soheab <33902984+Soheab@users.noreply.github.com> --- discord/member.py | 1 - 1 file changed, 1 deletion(-) diff --git a/discord/member.py b/discord/member.py index 35b92ae73f..8d8e5bd818 100644 --- a/discord/member.py +++ b/discord/member.py @@ -965,7 +965,6 @@ async def edit( "Can only edit avatar, banner, or bio for the bot's member." ) - print(payload, bot_payload) if payload: data = await http.edit_member(guild_id, self.id, reason=reason, **payload) elif bot_payload: