Merge remote-tracking branch 'upstream/master' into feature/dave

shiftinv · shiftinv · commit 590b26e66534 · 2026-02-17T16:19:39.000+01:00
diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
@@ -22,7 +22,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'skip news') != true
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           # towncrier needs a non-shallow clone
           fetch-depth: '0'
diff --git a/.github/workflows/create-release-pr.yaml b/.github/workflows/create-release-pr.yaml
@@ -29,7 +29,7 @@ jobs:
           app-id: ${{ secrets.BOT_APP_ID }}
           private-key: ${{ secrets.BOT_PRIVATE_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           token: ${{ steps.generate_token.outputs.token }}
           persist-credentials: false
@@ -61,7 +61,7 @@ jobs:
           git commit -a -m "docs: build changelog"
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725  # v8.0.0
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0  # v8.1.0
         with:
           token: ${{ steps.generate_token.outputs.token }}
           branch: auto/release-v${{ inputs.version }}
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
@@ -45,7 +45,7 @@ jobs:
     env:
       UV_RESOLUTION: highest
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
@@ -56,7 +56,7 @@ jobs:
           use-cached-uv-lock: 'false' # we don't need the lock here, we will automatically download it below
 
       - name: Restore uv lock
-        uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         id: cache-uv-lock
         with:
           key: uv-lock-resolved-${{ env.UV_RESOLUTION }}
@@ -79,7 +79,7 @@ jobs:
           UV_LOCKED: 0
         run: uv lock --refresh
 
-      - uses: actions/cache/save@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+      - uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         if: steps.lock-uv-deps.outcome == 'success'
         name: upload-uv-lock
         with:
@@ -100,7 +100,7 @@ jobs:
       pyright-sessions: ${{ steps.set-matrix.outputs.pyright-sessions }}
       test-sessions: ${{ steps.set-matrix.outputs.test-sessions }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - name: Set up environment
@@ -126,20 +126,20 @@ jobs:
       RUFF_OUTPUT_FORMAT: github
     steps:
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
       - name: Cache pip cache
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           key: ${{ runner.os }}-prek-pip-${{ hashFiles('**/pyproject.toml') }}
           path: ~/.cache/pip
           lookup-only: true
 
       - name: Run prek
         id: prek
-        uses: j178/prek-action@9d6a3097e0c1865ecce00cfb89fe80f2ee91b547 # v1.0.12
+        uses: j178/prek-action@0bb87d7f00b0c99306c8bcb8b8beba1eb581c037 # v1.1.1
         # given the interoperability and the nature of prek, we stay unpinned for now
         # note that this action by default uses the latest version of prek
         # this is exactly how the pre-commit action worked, and we never had any issues
@@ -154,7 +154,7 @@ jobs:
       - lock-dependencies
       - lint
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: '0'
           persist-credentials: false
@@ -181,7 +181,7 @@ jobs:
       fail-fast: false
     continue-on-error: ${{ matrix.session.experimental }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
@@ -213,7 +213,7 @@ jobs:
           nox --install-only
 
       - name: Run pyright (Linux)
-        uses: jakebailey/pyright-action@6cabc0f01c4994be48fd45cd9dbacdd6e1ee6e5e # v2.3.3
+        uses: jakebailey/pyright-action@8ec14b5cfe41f26e5f41686a31eb6012758217ef # v3.0.2
         id: pyright-linux
         with:
           version: PATH
@@ -224,7 +224,7 @@ jobs:
           extra-args: ${{join(matrix.session.paths, ' ')}}
 
       - name: Run pyright (Windows)
-        uses: jakebailey/pyright-action@6cabc0f01c4994be48fd45cd9dbacdd6e1ee6e5e # v2.3.3
+        uses: jakebailey/pyright-action@8ec14b5cfe41f26e5f41686a31eb6012758217ef # v3.0.2
         if: always() && (steps.pyright-linux.outcome == 'success' || steps.pyright-linux.outcome == 'failure')
         with:
           version: PATH
@@ -242,7 +242,7 @@ jobs:
       - lock-dependencies
       - lint
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: '0'
           persist-credentials: false
@@ -273,7 +273,7 @@ jobs:
       - lock-dependencies
       - lint
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
@@ -319,7 +319,7 @@ jobs:
     env:
       NOXSESSION: ${{ matrix.session.name }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: '0'
           persist-credentials: false
@@ -178,7 +178,7 @@ jobs:
           app-id: ${{ secrets.BOT_APP_ID }}
           private-key: ${{ secrets.BOT_PRIVATE_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           token: ${{ steps.generate_token.outputs.token }}
           persist-credentials: false
@@ -200,7 +200,7 @@ jobs:
           echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725  # v8.0.0
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0  # v8.1.0
         with:
           token: ${{ steps.generate_token.outputs.token }}
           branch: auto/dev-v${{ steps.update-version.outputs.new_version }}
diff --git a/changelog/1484.feature.rst b/changelog/1484.feature.rst
@@ -0,0 +1 @@
+Add :attr:`.Permissions.bypass_slowmode` which allows a user to bypass slowmode. Note that bot users are not impacted by slowmode regardless of this permission.
diff --git a/changelog/1485.doc.rst b/changelog/1485.doc.rst
@@ -0,0 +1 @@
+Update descriptions of ``slowmode_delay`` fields and :meth:`Guild.create_custom_emoji`/:meth:`~Guild.create_sticker`/:meth:`~Guild.create_scheduled_event` methods to account for the permission split on 2026-02-23.
diff --git a/changelog/1487.feature.rst b/changelog/1487.feature.rst
@@ -0,0 +1 @@
+Add :meth:`Colour.from_hex` to create :class:`Colour` from hex color codes (``#RRGGBB``).
diff --git a/changelog/1499.misc.rst b/changelog/1499.misc.rst
@@ -0,0 +1 @@
+Support PyNaCl ``v1.6.x``.
diff --git a/disnake/abc.py b/disnake/abc.py
@@ -865,6 +865,7 @@ async def set_permissions(
         administrator: bool | None = ...,
         attach_files: bool | None = ...,
         ban_members: bool | None = ...,
+        bypass_slowmode: bool | None = ...,
         change_nickname: bool | None = ...,
         connect: bool | None = ...,
         create_events: bool | None = ...,
diff --git a/disnake/channel.py b/disnake/channel.py
@@ -208,8 +208,7 @@ class TextChannel(disnake.abc.Messageable, disnake.abc.GuildChannel, Hashable):
         in this channel.
 
         A value of `0` denotes that it is disabled.
-        Bots, and users with :attr:`~Permissions.manage_channels` or
-        :attr:`~Permissions.manage_messages` permissions, bypass slowmode.
+        Bots, and users with :attr:`~Permissions.bypass_slowmode` permissions, bypass slowmode.
 
         See also :attr:`default_thread_slowmode_delay`.
 
@@ -218,8 +217,7 @@ class TextChannel(disnake.abc.Messageable, disnake.abc.GuildChannel, Hashable):
         in newly created threads in this channel.
 
         A value of ``0`` denotes that it is disabled.
-        Bots, and users with :attr:`~Permissions.manage_channels` or
-        :attr:`~Permissions.manage_messages`, bypass slowmode.
+        Bots, and users with :attr:`~Permissions.bypass_slowmode` permissions, bypass slowmode.
 
         .. versionadded:: 2.8
 
@@ -1350,9 +1348,10 @@ class VoiceChannel(disnake.abc.Messageable, VocalGuildChannel):
 
     slowmode_delay: :class:`int`
         The number of seconds a member must wait between sending messages
-        in this channel. A value of `0` denotes that it is disabled.
-        Bots, and users with :attr:`~Permissions.manage_channels` or
-        :attr:`~Permissions.manage_messages`, bypass slowmode.
+        in this channel.
+
+        A value of `0` denotes that it is disabled.
+        Bots, and users with :attr:`~Permissions.bypass_slowmode` permissions, bypass slowmode.
 
         .. versionadded:: 2.3
 
@@ -2036,9 +2035,10 @@ class StageChannel(disnake.abc.Messageable, VocalGuildChannel):
 
     slowmode_delay: :class:`int`
         The number of seconds a member must wait between sending messages
-        in this channel. A value of `0` denotes that it is disabled.
-        Bots, and users with :attr:`~Permissions.manage_channels` or
-        :attr:`~Permissions.manage_messages`, bypass slowmode.
+        in this channel.
+
+        A value of `0` denotes that it is disabled.
+        Bots, and users with :attr:`~Permissions.bypass_slowmode` permissions, bypass slowmode.
 
         .. versionadded:: 2.9
 
@@ -3981,8 +3981,7 @@ class ForumChannel(ThreadOnlyGuildChannel):
         in this channel.
 
         A value of ``0`` denotes that it is disabled.
-        Bots, and users with :attr:`~Permissions.manage_channels` or
-        :attr:`~Permissions.manage_messages`, bypass slowmode.
+        Bots, and users with :attr:`~Permissions.bypass_slowmode` permissions, bypass slowmode.
 
         See also :attr:`default_thread_slowmode_delay`.
 
@@ -3991,8 +3990,7 @@ class ForumChannel(ThreadOnlyGuildChannel):
         in newly created threads in this channel.
 
         A value of ``0`` denotes that it is disabled.
-        Bots, and users with :attr:`~Permissions.manage_channels` or
-        :attr:`~Permissions.manage_messages`, bypass slowmode.
+        Bots, and users with :attr:`~Permissions.bypass_slowmode` permissions, bypass slowmode.
 
         .. versionadded:: 2.6
 
@@ -4418,8 +4416,7 @@ class MediaChannel(ThreadOnlyGuildChannel):
         in this channel.
 
         A value of ``0`` denotes that it is disabled.
-        Bots, and users with :attr:`~Permissions.manage_channels` or
-        :attr:`~Permissions.manage_messages`, bypass slowmode.
+        Bots, and users with :attr:`~Permissions.bypass_slowmode` permissions, bypass slowmode.
 
         See also :attr:`default_thread_slowmode_delay`.
 
@@ -4428,8 +4425,7 @@ class MediaChannel(ThreadOnlyGuildChannel):
         in newly created threads in this channel.
 
         A value of ``0`` denotes that it is disabled.
-        Bots, and users with :attr:`~Permissions.manage_channels` or
-        :attr:`~Permissions.manage_messages`, bypass slowmode.
+        Bots, and users with :attr:`~Permissions.bypass_slowmode` permissions, bypass slowmode.
 
     default_sort_order: :class:`ThreadSortOrder` | :data:`None`
         The default sort order of threads in this channel.
diff --git a/disnake/colour.py b/disnake/colour.py
@@ -115,6 +115,14 @@ def default(cls) -> Self:
         """A factory method that returns a :class:`Colour` with a value of ``0``."""
         return cls(0)
 
+    @classmethod
+    def from_hex(cls, hex_str: str, /) -> Self:
+        """Constructs a :class:`Colour` from a hex color code (``#RRGGBB``).
+
+        .. versionadded:: |vnext|
+        """
+        return cls(int(hex_str.removeprefix("#"), 16))
+
     @classmethod
     def random(cls, *, seed: int | str | float | bytes | bytearray | None = None) -> Self:
         """A factory method that returns a :class:`Colour` with a random hue.
diff --git a/disnake/ext/commands/base_core.py b/disnake/ext/commands/base_core.py
@@ -711,6 +711,7 @@ def default_member_permissions(
     administrator: bool = ...,
     attach_files: bool = ...,
     ban_members: bool = ...,
+    bypass_slowmode: bool = ...,
     change_nickname: bool = ...,
     connect: bool = ...,
     create_events: bool = ...,
diff --git a/disnake/ext/commands/core.py b/disnake/ext/commands/core.py
@@ -2019,6 +2019,7 @@ def has_permissions(
     administrator: bool = ...,
     attach_files: bool = ...,
     ban_members: bool = ...,
+    bypass_slowmode: bool = ...,
     change_nickname: bool = ...,
     connect: bool = ...,
     create_events: bool = ...,
@@ -2146,6 +2147,7 @@ def bot_has_permissions(
     administrator: bool = ...,
     attach_files: bool = ...,
     ban_members: bool = ...,
+    bypass_slowmode: bool = ...,
     change_nickname: bool = ...,
     connect: bool = ...,
     create_events: bool = ...,
@@ -2251,6 +2253,7 @@ def has_guild_permissions(
     administrator: bool = ...,
     attach_files: bool = ...,
     ban_members: bool = ...,
+    bypass_slowmode: bool = ...,
     change_nickname: bool = ...,
     connect: bool = ...,
     create_events: bool = ...,
@@ -2353,6 +2356,7 @@ def bot_has_guild_permissions(
     administrator: bool = ...,
     attach_files: bool = ...,
     ban_members: bool = ...,
+    bypass_slowmode: bool = ...,
     change_nickname: bool = ...,
     connect: bool = ...,
     create_events: bool = ...,
diff --git a/disnake/guild.py b/disnake/guild.py
@@ -2708,7 +2708,7 @@ async def create_scheduled_event(
 
         Creates a :class:`GuildScheduledEvent`.
 
-        You must have :attr:`~Permissions.manage_events` permission to do this.
+        You must have :attr:`~Permissions.create_events` permission to do this.
 
         Based on the channel/entity type, there are different restrictions regarding
         other parameter values, as shown in this table:
@@ -3539,7 +3539,7 @@ async def create_sticker(
 
         Creates a :class:`Sticker` for the guild.
 
-        You must have :attr:`~Permissions.manage_guild_expressions` permission to
+        You must have :attr:`~Permissions.create_guild_expressions` permission to
         do this.
 
         .. versionadded:: 2.0
@@ -3688,7 +3688,7 @@ async def create_custom_emoji(
         Emojis with subscription roles (see ``roles`` below) are considered premium emoji,
         and count towards a separate limit of 25 emojis.
 
-        You must have :attr:`~Permissions.manage_guild_expressions` permission to
+        You must have :attr:`~Permissions.create_guild_expressions` permission to
         do this.
 
         Parameters
diff --git a/disnake/permissions.py b/disnake/permissions.py
diff --git a/disnake/threads.py b/disnake/threads.py
diff --git a/pyproject.toml b/pyproject.toml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Add :attr:`.Permissions.bypass_slowmode` which allows a user to bypass slowmode. Note that bot users are not impacted by slowmode regardless of this permission.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Update descriptions of ``slowmode_delay`` fields and :meth:`Guild.create_custom_emoji`/:meth:`~Guild.create_sticker`/:meth:`~Guild.create_scheduled_event` methods to account for the permission split on 2026-02-23.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Add :meth:`Colour.from_hex` to create :class:`Colour` from hex color codes (``#RRGGBB``).