Merge branch 'master' into feat/voice-rewrite-and-fixes

Author: Lulalaby

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
   - name: Ask a question
     about: Ask questions and discuss with other users of the library.

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-specific `avatar`, `banner`, and `bio` for the bot
+  user through `Member.edit`.
+  ([#2908](https://github.com/Pycord-Development/pycord/pull/2908))
 
 ### Changed
 
@@ -28,6 +31,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2905](https://github.com/Pycord-Development/pycord/pull/2905))
 - `view=None` in various methods causing an AttributeError.
   ([#2915](https://github.com/Pycord-Development/pycord/pull/2915))
+- `View.message` being `None` when it had not been interacted with yet.
+  ([#2916](https://github.com/Pycord-Development/pycord/pull/2916))
 
 ### Removed
 

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]:

discord/interactions.py

@@ -613,11 +613,13 @@ async def edit_original_response(
         # The message channel types should always match
         state = _InteractionMessageState(self, self._state)
         message = InteractionMessage(state=state, channel=self.channel, data=data)  # type: ignore
-        if view and not view.is_finished():
+        if view:
+            if not view.is_finished():
+                view.refresh(message.components)
+                if view.is_dispatchable():
+                    self._state.store_view(view, message.id)
+
             view.message = message
-            view.refresh(message.components)
-            if view.is_dispatchable():
-                self._state.store_view(view, message.id)
 
         if delete_after is not None:
             await self.delete_original_response(delay=delete_after)
@@ -1030,7 +1032,7 @@ async def send_message(
 
         flags = MessageFlags(ephemeral=ephemeral)
 
-        if view is not None:
+        if view:
             payload["components"] = view.to_components()
             if view.is_components_v2():
                 if embeds or content:
@@ -1100,16 +1102,19 @@ async def send_message(
                 for file in files:
                     file.close()
 
-        if view is not None:
-            if ephemeral and view.timeout is None:
-                view.timeout = 15 * 60.0
-
-            view.parent = self._parent
-            if view.is_dispatchable():
-                self._parent._state.store_view(view)
-
         self._responded = True
         await self._process_callback_response(callback_response)
+        if view:
+            if not view.is_finished():
+                if ephemeral and view.timeout is None:
+                    view.timeout = 15 * 60.0
+
+                view.parent = self._parent
+                if view.is_dispatchable():
+                    self._parent._state.store_view(view)
+
+            view.message = await self._parent.original_response()
+
         if delete_after is not None:
             await self._parent.delete_original_response(delay=delete_after)
         return self._parent
@@ -1268,12 +1273,13 @@ async def edit_message(
                 for file in files:
                     file.close()
 
-        if view and not view.is_finished():
-            view.message = msg
-            state.store_view(view, message_id)
-
         self._responded = True
         await self._process_callback_response(callback_response)
+        if view:
+            if not view.is_finished():
+                state.store_view(view, message_id)
+            view.message = msg or await parent.original_response()
+
         if delete_after is not None:
             await self._parent.delete_original_response(delay=delete_after)
 

discord/member.py

@@ -39,6 +39,7 @@
 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
@@ -782,6 +783,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|
 
@@ -817,6 +821,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
@@ -854,6 +866,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
         -------
@@ -867,16 +899,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
 
@@ -923,9 +958,34 @@ 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 payload:
             data = await http.edit_member(guild_id, self.id, reason=reason, **payload)
-            return Member(data=data, guild=self.guild, state=self._state)
+        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)
 
     async def timeout(
         self, until: datetime.datetime | None, *, reason: str | None = None