Merge branch 'master' into gw-caps

Author: Lulalaby

.github/workflows/codeql.yml

@@ -28,10 +28,10 @@ jobs:
       - name: "Checkout repository"
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: "Initialize CodeQL"
-        uses: github/codeql-action/init@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4
+        uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
         with:
           languages: ${{ matrix.language }}
       - name: "Autobuild"
-        uses: github/codeql-action/autobuild@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4
+        uses: github/codeql-action/autobuild@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
       - name: "Perform CodeQL Analysis"
-        uses: github/codeql-action/analyze@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4
+        uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6

.github/workflows/pr-auto-approve.yml

@@ -13,19 +13,10 @@ permissions:
 jobs:
   auto-approve:
     runs-on: ubuntu-latest
-    # Bot IDs:
-    # - renovate[bot]: 29139614
-    # - dependabot[bot]: 49699333
-    # - pre-commit-ci[bot]: 66853113
-    # - crowdin-bot: 58779643
-    # - NyuwBot: 106019021
     if:
       ${{
-        github.event.pull_request.user.id == 29139614 ||
-        github.event.pull_request.user.id == 49699333 ||
-        github.event.pull_request.user.id == 66853113 ||
-        github.event.pull_request.user.id == 58779643 ||
-        github.event.pull_request.user.id == 106019021
+        contains(format(',{0},', vars.AUTOMATED_DEPENDENCY_BOT_IDS), format(',{0},', github.event.pull_request.user.id)) ||
+        contains(format(',{0},', vars.AUTOMATED_DEPENDENCY_BOT_IDS), format(', {0},', github.event.pull_request.user.id))
       }}
     continue-on-error: true
     steps:

CHANGELOG.md

@@ -12,13 +12,18 @@ These changes are available on the `master` branch, but have not yet been releas
 
 ### Added
 
+- Added `Member.vr_status` property.
+  ([#3328](https://github.com/Pycord-Development/pycord/pull/3328))
+
 ### Changed
 
 ### Fixed
 
 - Fix `TypeError` when accessing `ApplicationCommand.guild_only` or
   `SlashCommandGroup.guild_only` when `contexts` is `None`.
   ([#3320](https://github.com/Pycord-Development/pycord/pull/3320))
+- Fix `SyntaxWarning` about `return` in a `finally` block raised on Python 3.14+
+  ([#3332](https://github.com/Pycord-Development/pycord/pull/3334))
 
 ### Deprecated
 
@@ -1829,7 +1834,7 @@ These changes are available on the `master` branch, but have not yet been releas
 [unreleased]: https://github.com/Pycord-Development/pycord/compare/v2.8.1...HEAD
 [2.8.1]: https://github.com/Pycord-Development/pycord/compare/v2.8.0...v2.8.1
 [2.8.0]: https://github.com/Pycord-Development/pycord/compare/v2.7.2...v2.8.0
-[2.8.0rc1]: https://github.com/Pycord-Development/pycord/compare/v2.8.0rc1...v2.8.0rc2
+[2.8.0rc2]: https://github.com/Pycord-Development/pycord/compare/v2.8.0rc1...v2.8.0rc2
 [2.8.0rc1]: https://github.com/Pycord-Development/pycord/compare/v2.7.2...v2.8.0rc1
 [2.7.2]: https://github.com/Pycord-Development/pycord/compare/v2.7.1...v2.7.2
 [2.7.1]: https://github.com/Pycord-Development/pycord/compare/v2.7.0...v2.7.1

discord/client.py

@@ -2303,7 +2303,7 @@ async def create_emoji(
             The emoji name. Must be at least 2 characters.
         image: :class:`bytes`
             The :term:`py:bytes-like object` representing the image data to use.
-            Only JPG, PNG and GIF images are supported.
+            Only JPEG, PNG, GIF, WebP and AVIF images are supported.
 
         Raises
         -------

discord/gateway.py

@@ -169,13 +169,13 @@ def run(self) -> None:
 
                 try:
                     f.result()
-                except Exception:
+                except BaseException:
                     _log.exception(
                         "An error occurred while stopping the gateway. Ignoring."
                     )
                 finally:
                     self.stop()
-                    return
+                return
 
             data = self.get_payload()
             _log.debug(self.msg, self.shard_id, data["d"])

discord/guild.py

@@ -3221,7 +3221,7 @@ async def create_custom_emoji(
             The emoji name. Must be at least 2 characters.
         image: :class:`bytes`
             The :term:`py:bytes-like object` representing the image data to use.
-            Only JPG, PNG and GIF images are supported.
+            Only JPEG, PNG, GIF, WebP and AVIF images are supported.
         roles: List[:class:`Role`]
             A :class:`list` of :class:`Role`\s that can use this emoji. Leave empty to make it available to everyone.
         reason: Optional[:class:`str`]

discord/member.py

@@ -561,6 +561,14 @@ def desktop_status(self) -> Status:
         """The member's status on the desktop client, if applicable."""
         return try_enum(Status, self._client_status.get("desktop", "offline"))
 
+    @property
+    def vr_status(self) -> Status:
+        """The member's status set for an active virtual reality application session, if applicable.
+
+        .. versionadded:: 2.9
+        """
+        return try_enum(Status, self._client_status.get("vr", "offline"))
+
     @property
     def web_status(self) -> Status:
         """The member's status on the web client, if applicable."""

discord/types/activity.py

@@ -47,6 +47,7 @@ class ClientStatus(TypedDict, total=False):
     desktop: str
     mobile: str
     web: str
+    vr: str
 
 
 class ActivityTimestamps(TypedDict, total=False):

discord/types/message.py

@@ -84,7 +84,7 @@ class Attachment(TypedDict):
     ephemeral: NotRequired[bool]
 
 
-MessageActivityType = Literal[1, 2, 3, 5]
+MessageActivityType = Literal[1, 2, 3, 5, 6]
 
 
 class MessageActivity(TypedDict):

discord/ui/media_gallery.py

@@ -55,11 +55,6 @@ class MediaGallery(ViewItem[V]):
         The initial items contained in this gallery, up to 10.
     id: Optional[:class:`int`]
         The gallery's ID.
-
-    Attributes
-    ----------
-    items: List[:class:`~discord.MediaGalleryItem`]
-        The list of media items in this gallery.
     """
 
     __item_repr_attributes__: tuple[str, ...] = (