Merge branch 'master' into optional-option

Signed-off-by: Lumouille <[email protected]>

Author: Lumabots

.github/CODEOWNERS

@@ -1,4 +1,4 @@
-* @Pycord-Development/maintainers
+* @Pycord-Development/library-maintainers @Pycord-Development/library-contributors
 
 /discord/ @Pycord-Development/maintain-discord-api
 

.github/SECURITY.md

@@ -5,7 +5,7 @@
 | Version | Supported          |
 | ------- | ------------------ |
 | 2.x     | :white_check_mark: |
-| <2.0.0  | :x:                |
+| <2.6.1  | :x:                |
 
 ## Reporting a Vulnerability
 

.github/workflows/docs-json-export.yml

@@ -0,0 +1,51 @@
+name: Docs JSON Export
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  export-docs-json:
+    name: Export docs.json
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        id: checkout
+        uses: actions/checkout@v5
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        id: setup-python
+        with:
+          python-version: "3.13"
+          cache: "pip"
+          cache-dependency-path: "requirements/docs.txt"
+          check-latest: true
+      - name: Install dependencies
+        id: install-deps
+        run: |
+          python -m pip install -U pip
+          pip install ".[docs]"
+          pip install beautifulsoup4
+      - name: Build Sphinx HTML docs
+        id: build-sphinx
+        run: sphinx-build -b html docs docs/_build/html
+      - name: Export docs.json
+        id: generate-json
+        run: python scripts/docs_json_exporter.py
+      - name: Upload docs.json as artifact
+        uses: actions/[email protected]
+        id: artifact-upload
+        with:
+          name: Pycord Docs JSON
+          path: docs.json
+          retention-days: 1
+      - name: Show docs.json summary
+        run: |
+          head -n 40 docs.json || tail -n 40 docs.json
+      - name: Output artifact ID
+        run:  |
+          echo "artifact-id=${{ steps.artifact-upload.outputs.artifact-id }}" >> $GITHUB_OUTPUT
+          echo "artifact-url=${{ steps.artifact-upload.outputs.artifact-url }}" >> $GITHUB_OUTPUT
+          echo "::notice::Artifact uploaded: ${{ steps.artifact-upload.outputs.artifact-url }}"

.github/workflows/release.yml

@@ -10,6 +10,19 @@ possible (see our [Version Guarantees] for more info).
 
 These changes are available on the `master` branch, but have not yet been released.
 
+### Added
+
+### Changed
+
+### Fixed
+
+- Manage silence for new SSRC with existing user_id.
+  ([#2808](https://github.com/Pycord-Development/pycord/pull/2808))
+
+### Removed
+
+## [2.7.0rc1] - 2025-08-30
+
 ⚠️ **This version removes support for Python 3.8.** ⚠️
 
 ### Added
@@ -167,6 +180,9 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2878](https://github.com/Pycord-Development/pycord/pull/2878))
 - Fixed `AttributeError` when accessing `AuditLogEntry.changes` more than once.
   ([#2882])(https://github.com/Pycord-Development/pycord/pull/2882))
+- Fixed type hint for argument `start_time` and `end_time` of
+  `Guild.create_scheduled_event`
+  ([#2879](https://github.com/Pycord-Development/pycord/pull/2879))
 
 ### Changed
 
@@ -1113,7 +1129,8 @@ These changes are available on the `master` branch, but have not yet been releas
 - Fix py3.10 UnionType checks issue.
   ([#1240](https://github.com/Pycord-Development/pycord/pull/1240))
 
-[unreleased]: https://github.com/Pycord-Development/pycord/compare/v2.6.1...HEAD
+[unreleased]: https://github.com/Pycord-Development/pycord/compare/v2.7.0rc1...HEAD
+[2.7.0rc1]: https://github.com/Pycord-Development/pycord/compare/v2.6.0...v2.7.0rc1
 [2.6.1]: https://github.com/Pycord-Development/pycord/compare/v2.6.0...v2.6.1
 [2.6.0]: https://github.com/Pycord-Development/pycord/compare/v2.5.0...v2.6.0
 [2.5.0]: https://github.com/Pycord-Development/pycord/compare/v2.4.1...v2.5.0

CHANGELOG.md

@@ -17,11 +17,12 @@ Pycord is a modern, easy to use, feature-rich, and async ready API wrapper for D
 .. image:: https://img.shields.io/github/v/release/Pycord-Development/pycord?include_prereleases&label=Latest%20Release&logo=github&sort=semver&style=for-the-badge&logoColor=white
    :target: https://github.com/Pycord-Development/pycord/releases
    :alt: Latest release
-
 .. image:: https://img.shields.io/discord/881207955029110855?label=discord&style=for-the-badge&logo=discord&color=5865F2&logoColor=white
    :target: https://pycord.dev/discord
    :alt: Discord server invite
-
+.. image:: https://img.shields.io/github/sponsors/Pycord-Development?style=for-the-badge
+   :target: https://github.com/sponsors/Pycord-Development
+   :alt: GitHub Sponsors
 .. image:: https://badges.crowdin.net/badge/dark/crowdin-on-light.png
    :target: https://translations.pycord.dev/documentation/?utm_source=badge&utm_medium=referral&utm_campaign=badge-add-on
    :alt: Crowdin | Agile localization for tech companies

README.rst

@@ -274,6 +274,18 @@ def _from_cover_image(cls, state, object_id: int, cover_image_hash: str) -> Asse
             animated=False,
         )
 
+    @classmethod
+    def _from_collectible(
+        cls, state: ConnectionState, asset: str, animated: bool = False
+    ) -> Asset:
+        name = "static.png" if not animated else "asset.webm"
+        return cls(
+            state,
+            url=f"{cls.BASE}/assets/collectibles/{asset}{name}",
+            key=asset,
+            animated=animated,
+        )
+
     @classmethod
     def _from_guild_image(cls, state, guild_id: int, image: str, path: str) -> Asset:
         animated = False

discord/asset.py

@@ -2884,8 +2884,6 @@ class CategoryChannel(discord.abc.GuildChannel, Hashable):
         The position in the category list. This is a number that starts at 0. e.g. the
         top category is position 0. Can be ``None`` if the channel was received in an interaction.
 
-        .. note::
-
     flags: :class:`ChannelFlags`
         Extra features of the channel.
 

discord/channel.py

@@ -69,7 +69,7 @@
 if TYPE_CHECKING:
     from .abc import GuildChannel, PrivateChannel, Snowflake, SnowflakeTime
     from .channel import DMChannel
-    from .interaction import Interaction
+    from .interactions import Interaction
     from .member import Member
     from .message import Message
     from .poll import Poll
@@ -553,6 +553,15 @@ async def on_view_error(
         The default view error handler provided by the client.
 
         This only fires for a view if you did not define its :func:`~discord.ui.View.on_error`.
+
+        Parameters
+        ----------
+        error: :class:`Exception`
+            The exception that was raised.
+        item: :class:`Item`
+            The item that the user interacted with.
+        interaction: :class:`Interaction`
+            The interaction that was received.
         """
 
         print(
@@ -570,6 +579,13 @@ async def on_modal_error(self, error: Exception, interaction: Interaction) -> No
         The default implementation prints the traceback to stderr.
 
         This only fires for a modal if you did not define its :func:`~discord.ui.Modal.on_error`.
+
+        Parameters
+        ----------
+        error: :class:`Exception`
+            The exception that was raised.
+        interaction: :class:`Interaction`
+            The interaction that was received.
         """
 
         print(f"Ignoring exception in modal {interaction.modal}:", file=sys.stderr)
@@ -1297,7 +1313,7 @@ def add_listener(self, func: Coro, name: str = MISSING) -> None:
         TypeError
             The ``func`` parameter is not a coroutine function.
         ValueError
-            The ``name`` (event name) does not start with 'on_'
+            The ``name`` (event name) does not start with ``on_``.
 
         Example
         -------
@@ -1361,7 +1377,7 @@ def listen(self, name: str = MISSING, once: bool = False) -> Callable[[Coro], Co
         TypeError
             The function being listened to is not a coroutine.
         ValueError
-            The ``name`` (event name) does not start with 'on_'
+            The ``name`` (event name) does not start with ``on_``.
 
         Example
         -------

discord/client.py

@@ -22,6 +22,7 @@
 DEALINGS IN THE SOFTWARE.
 """
 
+from functools import cached_property
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -55,21 +56,23 @@ def __init__(self, data: NameplatePayload, state: "ConnectionState") -> None:
     def __repr__(self) -> str:
         return f"<Nameplate sku_id={self.sku_id} palette={self.palette}>"
 
-    def get_asset(self, animated: bool = False) -> Asset:
-        """Returns the asset of the nameplate.
+    @cached_property
+    def static_asset(self) -> Asset:
+        """
+        The static :class:`Asset` of this nameplate.
+
+        .. versionadded:: 2.7
+        """
+        return Asset._from_collectible(self._state, self._asset)
+
+    @cached_property
+    def animated_asset(self) -> Asset:
+        """
+        The animated :class:`Asset` of this nameplate.
 
-        Parameters
-        ----------
-        animated: :class:`bool`
-            Whether to return the animated version of the asset, in webm version. Defaults to ``False``.
+        .. versionadded:: 2.7
         """
-        fn = "static.png" if not animated else "asset.webm"
-        return Asset(
-            state=self._state,
-            url=f"{Asset.BASE}/assets/collectibles/{self._asset}{fn}",
-            key=self._asset.split("/")[-1],
-            animated=animated,
-        )
+        return Asset._from_collectible(self._state, self._asset, animated=True)
 
 
 __all__ = ("Nameplate",)