From ab6d592f8ca393e5ef642295b0da44557ad4a2b0 Mon Sep 17 00:00:00 2001 From: Nadir Chowdhury Date: Mon, 7 Jun 2021 08:28:26 +0100 Subject: [PATCH] Add support for integration create/update/delete events --- discord/flags.py | 3 +++ discord/raw_models.py | 27 ++++++++++++++++++++++++++ discord/state.py | 30 +++++++++++++++++++++++++++++ docs/api.rst | 45 +++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 103 insertions(+), 2 deletions(-) diff --git a/discord/flags.py b/discord/flags.py index 166a82ef2..d6a892c83 100644 --- a/discord/flags.py +++ b/discord/flags.py @@ -572,6 +572,9 @@ class Intents(BaseFlags): This corresponds to the following events: - :func:`on_guild_integrations_update` + - :func:`on_integration_create` + - :func:`on_integration_update` + - :func:`on_raw_integration_delete` This does not correspond to any attributes or classes in the library in terms of cache. """ diff --git a/discord/raw_models.py b/discord/raw_models.py index 6c0b0da3d..0fdae813e 100644 --- a/discord/raw_models.py +++ b/discord/raw_models.py @@ -29,6 +29,7 @@ __all__ = ( 'RawReactionActionEvent', 'RawReactionClearEvent', 'RawReactionClearEmojiEvent', + 'RawIntegrationDeleteEvent', ) class _RawReprMixin: @@ -222,3 +223,29 @@ class RawReactionClearEmojiEvent(_RawReprMixin): self.guild_id = int(data['guild_id']) except KeyError: self.guild_id = None + +class RawIntegrationDeleteEvent(_RawReprMixin): + """Represents the payload for a :func:`on_raw_integration_delete` event. + + .. versionadded:: 2.0 + + Attributes + ----------- + integration_id: :class:`int` + The ID of the integration that got deleted. + application_id: Optional[:class:`int`] + The ID of the bot/OAuth2 application for this deleted integration. + guild_id: :class:`int` + The guild ID where the integration got deleted. + """ + + __slots__ = ('integration_id', 'application_id', 'guild_id') + + def __init__(self, data): + self.integration_id = int(data['id']) + self.guild_id = int(data['guild_id']) + + try: + self.application_id = int(data['application_id']) + except KeyError: + self.application_id = None diff --git a/discord/state.py b/discord/state.py index 71892fd85..f9c028567 100644 --- a/discord/state.py +++ b/discord/state.py @@ -51,6 +51,7 @@ from . import utils from .flags import ApplicationFlags, Intents, MemberCacheFlags from .object import Object from .invite import Invite +from .integrations import _integration_factory from .interactions import Interaction from .ui.view import ViewStore from .stage_instance import StageInstance @@ -957,6 +958,35 @@ class ConnectionState: else: log.debug('GUILD_INTEGRATIONS_UPDATE referencing an unknown guild ID: %s. Discarding.', data['guild_id']) + def parse_integration_create(self, data): + guild_id = int(data.pop('guild_id')) + guild = self._get_guild(guild_id) + if guild is not None: + cls, _ = _integration_factory(data['type']) + integration = cls(data=data, guild=guild) + self.dispatch('integration_create', integration) + else: + log.debug('INTEGRATION_CREATE referencing an unknown guild ID: %s. Discarding.', guild_id) + + def parse_integration_update(self, data): + guild_id = int(data.pop('guild_id')) + guild = self._get_guild(guild_id) + if guild is not None: + cls, _ = _integration_factory(data['type']) + integration = cls(data=data, guild=guild) + self.dispatch('integration_update', integration) + else: + log.debug('INTEGRATION_UPDATE referencing an unknown guild ID: %s. Discarding.', guild_id) + + def parse_integration_delete(self, data): + guild_id = int(data['guild_id']) + guild = self._get_guild(guild_id) + if guild is not None: + raw = RawIntegrationDeleteEvent(data) + self.dispatch('raw_integration_delete', raw) + else: + log.debug('INTEGRATION_DELETE referencing an unknown guild ID: %s. Discarding.', guild_id) + def parse_webhooks_update(self, data): channel = self.get_channel(int(data['channel_id'])) if channel is not None: diff --git a/docs/api.rst b/docs/api.rst index eb72d76e4..d06f15652 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -660,15 +660,48 @@ to handle it, which defaults to print a traceback and ignoring the exception. .. function:: on_guild_integrations_update(guild) - .. versionadded:: 1.4 - Called whenever an integration is created, modified, or removed from a guild. This requires :attr:`Intents.integrations` to be enabled. + .. versionadded:: 1.4 + :param guild: The guild that had its integrations updated. :type guild: :class:`Guild` +.. function:: on_integration_create(integration) + + Called when an integration is created. + + This requires :attr:`Intents.integrations` to be enabled. + + .. versionadded:: 2.0 + + :param integration: The integration that was created. + :type integration: :class:`Integration` + +.. function:: on_integration_update(integration) + + Called when an integration is updated. + + This requires :attr:`Intents.integrations` to be enabled. + + .. versionadded:: 2.0 + + :param integration: The integration that was created. + :type integration: :class:`Integration` + +.. function:: on_raw_integration_delete(payload) + + Called when an integration is deleted. + + This requires :attr:`Intents.integrations` to be enabled. + + .. versionadded:: 2.0 + + :param payload: The raw event payload data. + :type payload: :class:`RawIntegrationDeleteEvent` + .. function:: on_webhooks_update(channel) Called whenever a webhook is created, modified, or removed from a guild channel. @@ -3332,6 +3365,14 @@ RawReactionClearEmojiEvent .. autoclass:: RawReactionClearEmojiEvent() :members: +RawIntegrationDeleteEvent +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. attributetable:: RawIntegrationDeleteEvent + +.. autoclass:: RawIntegrationDeleteEvent() + :members: + PartialWebhookGuild ~~~~~~~~~~~~~~~~~~~~