Merge branch 'master' into master

Signed-off-by: plun1331 <plun1331@gmail.com>

Author: plun1331

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/PyCQA/autoflake
-    rev: v2.3.0
+    rev: v2.3.1
     hooks:
       - id: autoflake
   #        args:
@@ -28,7 +28,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 24.2.0
+    rev: 24.3.0
     hooks:
       - id: black
         args: [--safe, --quiet]

CHANGELOG.md

@@ -12,13 +12,18 @@ These changes are available on the `master` branch, but have not yet been releas
 
 ### Added
 
+- Added `banner` parameter to `ClientUser.edit`.
+  ([#2396](https://github.com/Pycord-Development/pycord/pull/2396))
 - Added `user` argument to `Paginator.edit`.
   ([#2390](https://github.com/Pycord-Development/pycord/pull/2390))
 
 ### Fixed
 
 - Fixed the type-hinting of `Member.move_to` and `Member.edit` to reflect actual
   behavior. ([#2386](https://github.com/Pycord-Development/pycord/pull/2386))
+- Fixed a deprecation warning from being displayed when running `python -m discord -v`
+  by replacing the deprecated module.
+  ([#2392](https://github.com/Pycord-Development/pycord/pull/2392))
 - Fixed `Paginator.edit` to no longer set user to the bot.
   ([#2390](https://github.com/Pycord-Development/pycord/pull/2390))
 

discord/__main__.py

@@ -24,13 +24,13 @@
 """
 
 import argparse
+import importlib.metadata
 import platform
 import sys
 from pathlib import Path
 from typing import Tuple
 
 import aiohttp
-import pkg_resources
 
 import discord
 
@@ -47,9 +47,9 @@ def show_version() -> None:
         "- py-cord v{0.major}.{0.minor}.{0.micro}-{0.releaselevel}".format(version_info)
     )
     if version_info.releaselevel != "final":
-        pkg = pkg_resources.get_distribution("py-cord")
-        if pkg:
-            entries.append(f"    - py-cord pkg_resources: v{pkg.version}")
+        version = importlib.metadata.version("py-cord")
+        if version:
+            entries.append(f"    - py-cord importlib.metadata: v{version}")
 
     entries.append(f"- aiohttp v{aiohttp.__version__}")
     uname = platform.uname()

discord/user.py

@@ -422,31 +422,41 @@ def _update(self, data: UserPayload) -> None:
 
     # TODO: Username might not be able to edit anymore.
     async def edit(
-        self, *, username: str = MISSING, avatar: bytes = MISSING
+        self,
+        *,
+        username: str = MISSING,
+        avatar: bytes = MISSING,
+        banner: bytes = MISSING,
     ) -> ClientUser:
         """|coro|
 
         Edits the current profile of the client.
 
         .. note::
 
-            To upload an avatar, a :term:`py:bytes-like object` must be passed in that
+            To upload an avatar or banner, a :term:`py:bytes-like object` must be passed in that
             represents the image being uploaded. If this is done through a file
             then the file must be opened via ``open('some_filename', 'rb')`` and
             the :term:`py:bytes-like object` is given through the use of ``fp.read()``.
 
-            The only image formats supported for uploading is JPEG and PNG.
+            The only image formats supported for uploading are JPEG, PNG, and GIF.
 
         .. versionchanged:: 2.0
             The edit is no longer in-place, instead the newly edited client user is returned.
 
+        .. versionchanged:: 2.6
+            The ``banner`` keyword-only parameter was added.
+
         Parameters
         ----------
         username: :class:`str`
             The new username you wish to change to.
         avatar: :class:`bytes`
             A :term:`py:bytes-like object` representing the image to upload.
             Could be ``None`` to denote no avatar.
+        banner: :class:`bytes`
+            A :term:`py:bytes-like object` representing the image to upload.
+            Could be ``None`` to denote no banner.
 
         Returns
         -------
@@ -458,7 +468,7 @@ async def edit(
         HTTPException
             Editing your profile failed.
         InvalidArgument
-            Wrong image format passed for ``avatar``.
+            Wrong image format passed for ``avatar`` or ``banner``.
         """
         payload: dict[str, Any] = {}
         if username is not MISSING:
@@ -469,6 +479,11 @@ async def edit(
         elif avatar is not MISSING:
             payload["avatar"] = _bytes_to_base64_data(avatar)
 
+        if banner is None:
+            payload["banner"] = None
+        elif banner is not MISSING:
+            payload["banner"] = _bytes_to_base64_data(banner)
+
         data: UserPayload = await self._state.http.edit_profile(payload)
         return ClientUser(state=self._state, data=data)