feat: add ApplicationEventWebhookStatus enum and update AppInfo to use it

Author: Lumabots

discord/appinfo.py

@@ -26,6 +26,7 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
+from .enums import ApplicationEventWebhookStatus, try_enum
 
 from . import utils
 from .asset import Asset
@@ -46,6 +47,7 @@
     "PartialAppInfo",
     "AppInstallParams",
     "IntegrationTypesConfig",
+    "ApplicationEventWebhookStatus",
 )
 
 
@@ -151,6 +153,11 @@ class AppInfo:
 
         .. versionadded:: 2.7
 
+    event_webhooks_status: :class:`ApplicationEventWebhookStatus`
+        The status of event webhooks for the application.
+
+        .. versionadded:: 2.7
+
     event_webhooks_types: Optional[List[:class:`str`]]
         List of event webhook types subscribed to, if set.
 
@@ -260,7 +267,9 @@ def __init__(self, state: ConnectionState, data: AppInfoPayload):
             "role_connections_verification_url"
         )
         self.event_webhooks_url: str | None = data.get("event_webhooks_url")
-        self._event_webhooks_status: int | None = data.get("event_webhooks_status")
+        self.event_webhooks_status: ApplicationEventWebhookStatus | None = data.get(
+            "event_webhooks_status"
+        ) and try_enum(ApplicationEventWebhookStatus, data["event_webhooks_status"])
         self.event_webhooks_types: list[str] | None = data.get("event_webhooks_types")
 
         self.install_params: AppInstallParams | None = data.get("install_params") and (
@@ -307,7 +316,7 @@ async def edit(
         integration_types_config: IntegrationTypesConfig | None = utils.MISSING,
         flags: ApplicationFlags | None = utils.MISSING,
         event_webhooks_url: str | None = utils.MISSING,
-        event_webhooks_status: bool = utils.MISSING,
+        event_webhooks_status: ApplicationEventWebhookStatus = utils.MISSING,
         event_webhooks_types: list[str] | None = utils.MISSING,
     ) -> AppInfo:
         """|coro|
@@ -346,8 +355,9 @@ async def edit(
             Application public flags. Pass ``None`` to clear (not typical).
         event_webhooks_url: Optional[:class:`str`]
             Event webhooks callback URL for receiving application webhook events. Pass ``None`` to clear.
-        event_webhooks_status: :class:`bool`
-            Whether webhook events are enabled. ``True`` maps to API value ``2`` (enabled), ``False`` maps to ``1`` (disabled).
+        event_webhooks_status: :class:`ApplicationEventWebhookStatus`
+            The desired webhook status. Pass an :class:`ApplicationEventWebhookStatus` value to set
+            a specific status (``DISABLED``=1, ``ENABLED``=2, ``DISABLED_BY_DISCORD``=3).
         event_webhooks_types: Optional[List[:class:`str`]]
             List of webhook event types to subscribe to. Pass ``None`` to clear.
 
@@ -402,7 +412,7 @@ async def edit(
         if event_webhooks_url is not utils.MISSING:
             payload["event_webhooks_url"] = event_webhooks_url
         if event_webhooks_status is not utils.MISSING:
-            payload["event_webhooks_status"] = 2 if event_webhooks_status else 1
+            payload["event_webhooks_status"] = event_webhooks_status.value
         if event_webhooks_types is not utils.MISSING:
             payload["event_webhooks_types"] = event_webhooks_types
 
@@ -452,16 +462,6 @@ def summary(self) -> str | None:
         )
         return self._summary
 
-    @property
-    def event_webhooks_enabled(self) -> bool | None:
-        """Returns whether event webhooks are enabled.
-        This is a convenience around the raw API status integer where ``True`` means enabled and ``False`` means disabled.
-        ``None`` indicates the status is not present.
-        """
-        if self._event_webhooks_status is None:
-            return None
-        return self._event_webhooks_status == 2
-
 
 class PartialAppInfo:
     """Represents a partial AppInfo given by :func:`~discord.abc.GuildChannel.create_invite`

discord/client.py

@@ -244,9 +244,9 @@ def __init__(
         self.loop: asyncio.AbstractEventLoop = (
             asyncio.get_event_loop() if loop is None else loop
         )
-        self._listeners: dict[str, list[tuple[asyncio.Future, Callable[..., bool]]]] = (
-            {}
-        )
+        self._listeners: dict[
+            str, list[tuple[asyncio.Future, Callable[..., bool]]]
+        ] = {}
         self.shard_id: int | None = options.get("shard_id")
         self.shard_count: int | None = options.get("shard_count")
 

discord/enums.py

@@ -84,6 +84,7 @@
     "SubscriptionStatus",
     "SeparatorSpacingSize",
     "SelectDefaultValueType",
+    "ApplicationEventWebhookStatus",
 )
 
 
@@ -1131,6 +1132,14 @@ class SelectDefaultValueType(Enum):
     user = "user"
 
 
+class ApplicationEventWebhookStatus(Enum):
+    """Represents the application event webhook status."""
+
+    DISABLED = 1
+    ENABLED = 2
+    DISABLED_BY_DISCORD = 3
+
+
 T = TypeVar("T")