Merge branch 'Pycord-Development:master' into master

Author: plun1331

CHANGELOG.md

@@ -10,6 +10,8 @@ possible (see our [Version Guarantees] for more info).
 
 These changes are available on the `master` branch, but have not yet been released.
 
+## [2.5.0] - 2024-03-02
+
 ### Added
 
 - Added method to start bot via async context manager.
@@ -93,6 +95,12 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2342](https://github.com/Pycord-Development/pycord/pull/2342))
 - Added `invitable` and `slowmode_delay` to `Thread` creation methods.
   ([#2350](https://github.com/Pycord-Development/pycord/pull/2350))
+- Added support for voice channel statuses.
+  ([#2368](https://github.com/Pycord-Development/pycord/pull/2368))
+- Added `enforce_nonce` parameter for message sending.
+  ([#2370](https://github.com/Pycord-Development/pycord/pull/2370))
+- Added audit log support for voice channel status.
+  ([#2373](https://github.com/Pycord-Development/pycord/pull/2373))
 
 ### Changed
 
@@ -772,7 +780,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.4.1...HEAD
+[unreleased]: https://github.com/Pycord-Development/pycord/compare/v2.5.0...HEAD
+[2.5.0]: https://github.com/Pycord-Development/pycord/compare/v2.4.1...v2.5.0
 [2.4.1]: https://github.com/Pycord-Development/pycord/compare/v2.4.0...v2.4.1
 [2.4.0]: https://github.com/Pycord-Development/pycord/compare/v2.3.3...v2.4.0
 [2.3.3]: https://github.com/Pycord-Development/pycord/compare/v2.3.2...v2.3.3

discord/abc.py

@@ -1346,6 +1346,7 @@ async def send(
         stickers: Sequence[GuildSticker | StickerItem] = ...,
         delete_after: float = ...,
         nonce: str | int = ...,
+        enforce_nonce: bool = ...,
         allowed_mentions: AllowedMentions = ...,
         reference: Message | MessageReference | PartialMessage = ...,
         mention_author: bool = ...,
@@ -1365,6 +1366,7 @@ async def send(
         stickers: Sequence[GuildSticker | StickerItem] = ...,
         delete_after: float = ...,
         nonce: str | int = ...,
+        enforce_nonce: bool = ...,
         allowed_mentions: AllowedMentions = ...,
         reference: Message | MessageReference | PartialMessage = ...,
         mention_author: bool = ...,
@@ -1384,6 +1386,7 @@ async def send(
         stickers: Sequence[GuildSticker | StickerItem] = ...,
         delete_after: float = ...,
         nonce: str | int = ...,
+        enforce_nonce: bool = ...,
         allowed_mentions: AllowedMentions = ...,
         reference: Message | MessageReference | PartialMessage = ...,
         mention_author: bool = ...,
@@ -1403,6 +1406,7 @@ async def send(
         stickers: Sequence[GuildSticker | StickerItem] = ...,
         delete_after: float = ...,
         nonce: str | int = ...,
+        enforce_nonce: bool = ...,
         allowed_mentions: AllowedMentions = ...,
         reference: Message | MessageReference | PartialMessage = ...,
         mention_author: bool = ...,
@@ -1423,6 +1427,7 @@ async def send(
         stickers=None,
         delete_after=None,
         nonce=None,
+        enforce_nonce=None,
         allowed_mentions=None,
         reference=None,
         mention_author=None,
@@ -1463,6 +1468,10 @@ async def send(
         nonce: :class:`int`
             The nonce to use for sending this message. If the message was successfully sent,
             then the message will have a nonce with this value.
+        enforce_nonce: Optional[:class:`bool`]
+            Whether :attr:`nonce` is enforced to be validated.
+
+            .. versionadded:: 2.5
         delete_after: :class:`float`
             If provided, the number of seconds to wait in the background
             before deleting the message we just sent. If the deletion fails,
@@ -1602,6 +1611,7 @@ async def send(
                     embed=embed,
                     embeds=embeds,
                     nonce=nonce,
+                    enforce_nonce=enforce_nonce,
                     message_reference=reference,
                     stickers=stickers,
                     components=components,
@@ -1627,6 +1637,7 @@ async def send(
                     embed=embed,
                     embeds=embeds,
                     nonce=nonce,
+                    enforce_nonce=enforce_nonce,
                     allowed_mentions=allowed_mentions,
                     message_reference=reference,
                     stickers=stickers,
@@ -1644,6 +1655,7 @@ async def send(
                 embed=embed,
                 embeds=embeds,
                 nonce=nonce,
+                enforce_nonce=enforce_nonce,
                 allowed_mentions=allowed_mentions,
                 message_reference=reference,
                 stickers=stickers,

discord/channel.py

@@ -1519,20 +1519,37 @@ class VoiceChannel(discord.abc.Messageable, VocalGuildChannel):
         Bots and users with :attr:`~Permissions.manage_channels` or
         :attr:`~Permissions.manage_messages` bypass slowmode.
 
+        .. versionadded:: 2.5
+    status: Optional[:class:`str`]
+        The channel's status, if set.
+
         .. versionadded:: 2.5
     flags: :class:`ChannelFlags`
         Extra features of the channel.
 
         .. versionadded:: 2.0
     """
 
+    def __init__(
+        self,
+        *,
+        state: ConnectionState,
+        guild: Guild,
+        data: VoiceChannelPayload,
+    ):
+        self.status: str | None = None
+        super().__init__(state=state, guild=guild, data=data)
+
     def _update(self, guild: Guild, data: VoiceChannelPayload):
         super()._update(guild, data)
+        if data.get("status"):
+            self.status = data.get("status")
 
     def __repr__(self) -> str:
         attrs = [
             ("id", self.id),
             ("name", self.name),
+            ("status", self.status),
             ("rtc_region", self.rtc_region),
             ("position", self.position),
             ("bitrate", self.bitrate),
@@ -1955,6 +1972,31 @@ async def create_activity_invite(
             **kwargs,
         )
 
+    async def set_status(
+        self, status: str | None, *, reason: str | None = None
+    ) -> None:
+        """|coro|
+
+        Sets the status of the voice channel.
+
+        You must have the :attr:`~Permissions.set_voice_channel_status` permission to use this.
+
+        Parameters
+        ----------
+        status: Union[:class:`str`, None]
+            The new status.
+        reason: Optional[:class:`str`]
+            The reason for setting the status. Shows up on the audit log.
+
+        Raises
+        ------
+        Forbidden
+            You do not have proper permissions to set the status.
+        HTTPException
+            Setting the status failed.
+        """
+        await self._state.http.set_voice_channel_status(self.id, status, reason=reason)
+
 
 class StageChannel(discord.abc.Messageable, VocalGuildChannel):
     """Represents a Discord guild stage channel.

discord/enums.py

@@ -439,6 +439,8 @@ class AuditLogAction(Enum):
     onboarding_update = 167
     server_guide_create = 190
     server_guide_update = 191
+    voice_channel_status_update = 192
+    voice_channel_status_delete = 193
 
     @property
     def category(self) -> AuditLogActionCategory | None:
@@ -506,6 +508,8 @@ def category(self) -> AuditLogActionCategory | None:
             AuditLogAction.onboarding_update: AuditLogActionCategory.update,
             AuditLogAction.server_guide_create: AuditLogActionCategory.create,
             AuditLogAction.server_guide_update: AuditLogActionCategory.update,
+            AuditLogAction.voice_channel_status_update: AuditLogActionCategory.update,
+            AuditLogAction.voice_channel_status_delete: AuditLogActionCategory.delete,
         }
         return lookup[self]
 
@@ -552,6 +556,8 @@ def target_type(self) -> str | None:
             return "onboarding"
         elif v < 192:
             return "server_guide"
+        elif v < 194:
+            return "voice_channel_status"
 
 
 class UserFlags(Enum):

discord/http.py

@@ -465,6 +465,7 @@ def send_message(
         embed: embed.Embed | None = None,
         embeds: list[embed.Embed] | None = None,
         nonce: str | None = None,
+        enforce_nonce: bool | None = None,
         allowed_mentions: message.AllowedMentions | None = None,
         message_reference: message.MessageReference | None = None,
         stickers: list[sticker.StickerItem] | None = None,
@@ -489,6 +490,9 @@ def send_message(
         if nonce:
             payload["nonce"] = nonce
 
+        if enforce_nonce:
+            payload["enforce_nonce"] = enforce_nonce
+
         if allowed_mentions:
             payload["allowed_mentions"] = allowed_mentions
 
@@ -521,6 +525,7 @@ def send_multipart_helper(
         embed: embed.Embed | None = None,
         embeds: Iterable[embed.Embed | None] | None = None,
         nonce: str | None = None,
+        enforce_nonce: bool | None = None,
         allowed_mentions: message.AllowedMentions | None = None,
         message_reference: message.MessageReference | None = None,
         stickers: list[sticker.StickerItem] | None = None,
@@ -538,6 +543,8 @@ def send_multipart_helper(
             payload["embeds"] = embeds
         if nonce:
             payload["nonce"] = nonce
+        if enforce_nonce:
+            payload["enforce_nonce"] = enforce_nonce
         if allowed_mentions:
             payload["allowed_mentions"] = allowed_mentions
         if message_reference:
@@ -581,6 +588,7 @@ def send_files(
         embed: embed.Embed | None = None,
         embeds: list[embed.Embed] | None = None,
         nonce: str | None = None,
+        enforce_nonce: bool | None = None,
         allowed_mentions: message.AllowedMentions | None = None,
         message_reference: message.MessageReference | None = None,
         stickers: list[sticker.StickerItem] | None = None,
@@ -596,6 +604,7 @@ def send_files(
             embed=embed,
             embeds=embeds,
             nonce=nonce,
+            enforce_nonce=enforce_nonce,
             allowed_mentions=allowed_mentions,
             message_reference=message_reference,
             stickers=stickers,
@@ -2185,6 +2194,13 @@ def move_member(
             guild_id=guild_id, user_id=user_id, channel_id=channel_id, reason=reason
         )
 
+    def set_voice_channel_status(
+        self, channel_id: Snowflake, status: str | None, *, reason: str | None = None
+    ) -> Response[None]:
+        payload = {"status": status}
+        r = Route("PUT", "/channels/{channel_id}/voice-status", channel_id=channel_id)
+        return self.request(r, json=payload, reason=reason)
+
     # Stage instance management
 
     def get_stage_instance(

discord/permissions.py

@@ -180,7 +180,7 @@ def all(cls: type[P]) -> P:
         """A factory method that creates a :class:`Permissions` with all
         permissions set to ``True``.
         """
-        return cls(0b11111111111111111111111111111111111111111)
+        return cls(0b1111111111111111111111111111111111111111111111111)
 
     @classmethod
     def all_channel(cls: type[P]) -> P:
@@ -250,7 +250,7 @@ def voice(cls: type[P]) -> P:
         """A factory method that creates a :class:`Permissions` with all
         "Voice" permissions from the official Discord UI set to ``True``.
         """
-        return cls(0b00000011111100000000001100000000)
+        return cls(0b1000000001000000000000011111100000000001100000000)
 
     @classmethod
     def stage(cls: type[P]) -> P:
@@ -618,6 +618,14 @@ def send_voice_messages(self) -> int:
         """
         return 1 << 46
 
+    @flag_value
+    def set_voice_channel_status(self) -> int:
+        """:class:`bool`: Returns ``True`` if a member can set voice channel status.
+
+        .. versionadded:: 2.5
+        """
+        return 1 << 48
+
 
 PO = TypeVar("PO", bound="PermissionOverwrite")
 
@@ -736,6 +744,7 @@ class PermissionOverwrite:
         start_embedded_activities: bool | None
         moderate_members: bool | None
         send_voice_messages: bool | None
+        set_voice_channel_status: bool | None
 
     def __init__(self, **kwargs: bool | None):
         self._values: dict[str, bool | None] = {}

discord/raw_models.py

@@ -56,6 +56,7 @@
         ThreadMembersUpdateEvent,
         ThreadUpdateEvent,
         TypingEvent,
+        VoiceChannelStatusUpdateEvent,
     )
 
 
@@ -75,6 +76,7 @@
     "AutoModActionExecutionEvent",
     "RawThreadMembersUpdateEvent",
     "RawAuditLogEntryEvent",
+    "RawVoiceChannelStatusUpdateEvent",
 )
 
 
@@ -441,6 +443,36 @@ def __init__(self, data: ThreadDeleteEvent) -> None:
         self.data: ThreadDeleteEvent = data
 
 
+class RawVoiceChannelStatusUpdateEvent(_RawReprMixin):
+    """Represents the payload for an :func:`on_raw_voice_channel_status_update` event.
+
+    .. versionadded:: 2.5
+
+    Attributes
+    ----------
+    id: :class:`int`
+        The channel ID where the voice channel status update originated from.
+    guild_id: :class:`int`
+        The guild ID where the voice channel status update originated from.
+    status: Optional[:class:`str`]
+        The new new voice channel status.
+    data: :class:`dict`
+        The raw data sent by the `gateway <https://discord.com/developers/docs/topics/gateway-events#voice-channel-status-update>`_.
+    """
+
+    __slots__ = ("id", "guild_id", "status", "data")
+
+    def __init__(self, data: VoiceChannelStatusUpdateEvent) -> None:
+        self.id: int = int(data["id"])
+        self.guild_id: int = int(data["guild_id"])
+
+        try:
+            self.status: str | None = data["status"]
+        except KeyError:
+            self.status: str | None = None
+        self.data: VoiceChannelStatusUpdateEvent = data
+
+
 class RawTypingEvent(_RawReprMixin):
     """Represents the payload for a :func:`on_raw_typing` event.
 

discord/state.py

@@ -1785,6 +1785,30 @@ def parse_voice_server_update(self, data) -> None:
                 )
             )
 
+    def parse_voice_channel_status_update(self, data) -> None:
+        raw = RawVoiceChannelStatusUpdateEvent(data)
+        self.dispatch("raw_voice_channel_status_update", raw)
+        guild = self._get_guild(int(data["guild_id"]))
+        channel_id = int(data["id"])
+        if guild is not None:
+            channel = guild.get_channel(channel_id)
+            if channel is not None:
+                old_status = channel.status
+                channel.status = data.get("status", None)
+                self.dispatch(
+                    "voice_channel_status_update", channel, old_status, channel.status
+                )
+            else:
+                _log.debug(
+                    "VOICE_CHANNEL_STATUS_UPDATE referencing an unknown channel ID: %s. Discarding.",
+                    channel_id,
+                )
+        else:
+            _log.debug(
+                "VOICE_CHANNEL_STATUS_UPDATE referencing unknown guild ID: %s. Discarding.",
+                data["guild_id"],
+            )
+
     def parse_typing_start(self, data) -> None:
         raw = RawTypingEvent(data)