From aad25b4825f3e4509aa7ba4f462e45ab3aa6e11b Mon Sep 17 00:00:00 2001 From: Monbrey Date: Sat, 14 Aug 2021 16:33:02 +1000 Subject: [PATCH] feat(InteractionReponses): allow fetching of ephemeral messages --- src/errors/Messages.js | 3 +-- src/structures/interfaces/InteractionResponses.js | 9 --------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/errors/Messages.js b/src/errors/Messages.js index c97aa4cf8fd9..d25c868dbe03 100644 --- a/src/errors/Messages.js +++ b/src/errors/Messages.js @@ -131,8 +131,7 @@ const Messages = { INTERACTION_ALREADY_REPLIED: 'The reply to this interaction has already been sent or deferred.', INTERACTION_NOT_REPLIED: 'The reply to this interaction has not been sent or deferred.', - INTERACTION_EPHEMERAL_REPLIED: 'Ephemeral responses cannot be fetched or deleted.', - INTERACTION_FETCH_EPHEMERAL: 'Ephemeral responses cannot be fetched.', + INTERACTION_EPHEMERAL_REPLIED: 'Ephemeral responses cannot be deleted.', COMMAND_INTERACTION_OPTION_NOT_FOUND: name => `Required option "${name}" not found.`, COMMAND_INTERACTION_OPTION_TYPE: (name, type, expected) => diff --git a/src/structures/interfaces/InteractionResponses.js b/src/structures/interfaces/InteractionResponses.js index c692a55ca53c..66597602e3c3 100644 --- a/src/structures/interfaces/InteractionResponses.js +++ b/src/structures/interfaces/InteractionResponses.js @@ -53,7 +53,6 @@ class InteractionResponses { */ async deferReply(options = {}) { if (this.deferred || this.replied) throw new Error('INTERACTION_ALREADY_REPLIED'); - if (options.fetchReply && options.ephemeral) throw new Error('INTERACTION_FETCH_EPHEMERAL'); this.ephemeral = options.ephemeral ?? false; await this.client.api.interactions(this.id, this.token).callback.post({ data: { @@ -87,7 +86,6 @@ class InteractionResponses { */ async reply(options) { if (this.deferred || this.replied) throw new Error('INTERACTION_ALREADY_REPLIED'); - if (options.fetchReply && options.ephemeral) throw new Error('INTERACTION_FETCH_EPHEMERAL'); this.ephemeral = options.ephemeral ?? false; let messagePayload; @@ -119,7 +117,6 @@ class InteractionResponses { * .catch(console.error); */ fetchReply() { - if (this.ephemeral) throw new Error('INTERACTION_EPHEMERAL_REPLIED'); return this.webhook.fetchMessage('@original'); } @@ -177,9 +174,6 @@ class InteractionResponses { */ async deferUpdate(options = {}) { if (this.deferred || this.replied) throw new Error('INTERACTION_ALREADY_REPLIED'); - if (options.fetchReply && new MessageFlags(this.message.flags).has(MessageFlags.FLAGS.EPHEMERAL)) { - throw new Error('INTERACTION_FETCH_EPHEMERAL'); - } await this.client.api.interactions(this.id, this.token).callback.post({ data: { type: InteractionResponseTypes.DEFERRED_MESSAGE_UPDATE, @@ -205,9 +199,6 @@ class InteractionResponses { */ async update(options) { if (this.deferred || this.replied) throw new Error('INTERACTION_ALREADY_REPLIED'); - if (options.fetchReply && new MessageFlags(this.message.flags).has(MessageFlags.FLAGS.EPHEMERAL)) { - throw new Error('INTERACTION_FETCH_EPHEMERAL'); - } let messagePayload; if (options instanceof MessagePayload) messagePayload = options;