From 09450e5d74d4a69c39f3b73e26376c206e611820 Mon Sep 17 00:00:00 2001 From: rigormorrtiss Date: Wed, 26 May 2021 22:01:27 +0400 Subject: [PATCH 1/3] fix(helpers): convert options case to snake case --- src/helpers/webhooks/edit_webhook_message.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/helpers/webhooks/edit_webhook_message.ts b/src/helpers/webhooks/edit_webhook_message.ts index fadc1c99c..76f5721c7 100644 --- a/src/helpers/webhooks/edit_webhook_message.ts +++ b/src/helpers/webhooks/edit_webhook_message.ts @@ -5,7 +5,7 @@ import { DiscordAllowedMentionsTypes } from "../../types/messages/allowed_mentio import type { Message } from "../../types/messages/message.ts"; import type { EditWebhookMessage } from "../../types/webhooks/edit_webhook_message.ts"; import { endpoints } from "../../util/constants.ts"; -import { validateComponents } from "../../util/utils.ts"; +import { snakelize, validateComponents } from "../../util/utils.ts"; export async function editWebhookMessage( webhookId: bigint, @@ -51,7 +51,7 @@ export async function editWebhookMessage( options.messageId ? endpoints.WEBHOOK_MESSAGE(webhookId, webhookToken, options.messageId) : endpoints.WEBHOOK_MESSAGE_ORIGINAL(webhookId, webhookToken), - { ...options, allowedMentions: options.allowedMentions } + snakelize({ ...options, allowedMentions: options.allowedMentions }) ); return await structures.createDiscordenoMessage(result); From 6fe7d0e1dc7b445d20c5eeba441fa5a4f7a3734c Mon Sep 17 00:00:00 2001 From: rigormorrtiss Date: Wed, 26 May 2021 22:09:34 +0400 Subject: [PATCH 2/3] fix(helpers/interactions): convert options to snake case --- src/helpers/interactions/send_interaction_response.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/helpers/interactions/send_interaction_response.ts b/src/helpers/interactions/send_interaction_response.ts index 44bbc31c5..4e52fc171 100644 --- a/src/helpers/interactions/send_interaction_response.ts +++ b/src/helpers/interactions/send_interaction_response.ts @@ -3,7 +3,7 @@ import { cache } from "../../cache.ts"; import { rest } from "../../rest/rest.ts"; import type { DiscordenoInteractionResponse } from "../../types/discordeno/interaction_response.ts"; import { endpoints } from "../../util/constants.ts"; -import { validateComponents } from "../../util/utils.ts"; +import { snakelize, validateComponents } from "../../util/utils.ts"; /** * Send a response to a users slash command. The command data will have the id and token necessary to respond. @@ -16,9 +16,7 @@ export async function sendInteractionResponse(id: bigint, token: string, options if (options.data?.components) validateComponents(options.data?.components); // If its already been executed, we need to send a followup response if (cache.executedSlashCommands.has(token)) { - return await rest.runMethod("post", endpoints.WEBHOOK(applicationId, token), { - ...options, - }); + return await rest.runMethod("post", endpoints.WEBHOOK(applicationId, token), snakelize(options)); } // Expire in 15 minutes @@ -38,5 +36,5 @@ export async function sendInteractionResponse(id: bigint, token: string, options options.data = { ...options.data, allowedMentions: { parse: [] } }; } - return await rest.runMethod("post", endpoints.INTERACTION_ID_TOKEN(id, token), options); + return await rest.runMethod("post", endpoints.INTERACTION_ID_TOKEN(id, token), snakelize(options)); } From f01143145d81102ae7e1e975c39b8a67dad3dcf9 Mon Sep 17 00:00:00 2001 From: rigormorrtiss Date: Wed, 26 May 2021 22:10:36 +0400 Subject: [PATCH 3/3] Directly pass options to snakelize() --- src/helpers/webhooks/edit_webhook_message.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/webhooks/edit_webhook_message.ts b/src/helpers/webhooks/edit_webhook_message.ts index 76f5721c7..7fed5041d 100644 --- a/src/helpers/webhooks/edit_webhook_message.ts +++ b/src/helpers/webhooks/edit_webhook_message.ts @@ -51,7 +51,7 @@ export async function editWebhookMessage( options.messageId ? endpoints.WEBHOOK_MESSAGE(webhookId, webhookToken, options.messageId) : endpoints.WEBHOOK_MESSAGE_ORIGINAL(webhookId, webhookToken), - snakelize({ ...options, allowedMentions: options.allowedMentions }) + snakelize(options) ); return await structures.createDiscordenoMessage(result);