diff --git a/src/helpers/webhooks/create_webhook.ts b/src/helpers/webhooks/create_webhook.ts index 0f1e344c8..b7b862c61 100644 --- a/src/helpers/webhooks/create_webhook.ts +++ b/src/helpers/webhooks/create_webhook.ts @@ -2,10 +2,9 @@ import { rest } from "../../rest/rest.ts"; import { Errors } from "../../types/misc/errors.ts"; import { CreateWebhook } from "../../types/webhooks/create_webhook.ts"; import { Webhook } from "../../types/webhooks/webhook.ts"; -import { DiscordWebhook } from "../../types/webhooks/webhook.ts"; import { endpoints } from "../../util/constants.ts"; import { requireBotChannelPermissions } from "../../util/permissions.ts"; -import { snakeKeysToCamelCase, urlToBase64 } from "../../util/utils.ts"; +import { urlToBase64 } from "../../util/utils.ts"; import { validateLength } from "../../util/validate_length.ts"; /** @@ -27,7 +26,7 @@ export async function createWebhook( throw new Error(Errors.INVALID_WEBHOOK_NAME); } - const result: DiscordWebhook = await rest.runMethod( + return await rest.runMethod( "post", endpoints.CHANNEL_WEBHOOKS(channelId), { @@ -35,6 +34,4 @@ export async function createWebhook( avatar: options.avatar ? await urlToBase64(options.avatar) : undefined, }, ); - - return snakeKeysToCamelCase(result); } diff --git a/src/helpers/webhooks/delete_webhook.ts b/src/helpers/webhooks/delete_webhook.ts index 1ac6e95f8..f8a233e48 100644 --- a/src/helpers/webhooks/delete_webhook.ts +++ b/src/helpers/webhooks/delete_webhook.ts @@ -6,10 +6,8 @@ import { requireBotChannelPermissions } from "../../util/permissions.ts"; export async function deleteWebhook(channelId: string, webhookId: string) { await requireBotChannelPermissions(channelId, ["MANAGE_WEBHOOKS"]); - const result = await rest.runMethod( + return await rest.runMethod( "delete", endpoints.WEBHOOK_ID(webhookId), ); - - return result; } diff --git a/src/helpers/webhooks/delete_webhook_message.ts b/src/helpers/webhooks/delete_webhook_message.ts index 61809f001..43269a735 100644 --- a/src/helpers/webhooks/delete_webhook_message.ts +++ b/src/helpers/webhooks/delete_webhook_message.ts @@ -6,10 +6,8 @@ export async function deleteWebhookMessage( webhookToken: string, messageId: string, ) { - const result = await rest.runMethod( + return await rest.runMethod( "delete", endpoints.WEBHOOK_MESSAGE(webhookId, webhookToken, messageId), ); - - return result; } diff --git a/src/helpers/webhooks/delete_webhook_with_token.ts b/src/helpers/webhooks/delete_webhook_with_token.ts index 342f9d3e7..b5c082791 100644 --- a/src/helpers/webhooks/delete_webhook_with_token.ts +++ b/src/helpers/webhooks/delete_webhook_with_token.ts @@ -6,10 +6,8 @@ export async function deleteWebhookWithToken( webhookId: string, webhookToken: string, ) { - const result = await rest.runMethod( + return await rest.runMethod( "delete", endpoints.WEBHOOK(webhookId, webhookToken), ); - - return result; } diff --git a/src/helpers/webhooks/edit_webhook.ts b/src/helpers/webhooks/edit_webhook.ts index fe969cd4b..84baf81d7 100644 --- a/src/helpers/webhooks/edit_webhook.ts +++ b/src/helpers/webhooks/edit_webhook.ts @@ -1,9 +1,8 @@ import { rest } from "../../rest/rest.ts"; import { ModifyWebhook } from "../../types/webhooks/modify_webhook.ts"; -import { DiscordWebhook, Webhook } from "../../types/webhooks/webhook.ts"; +import { Webhook } from "../../types/webhooks/webhook.ts"; import { endpoints } from "../../util/constants.ts"; import { requireBotChannelPermissions } from "../../util/permissions.ts"; -import { snakeKeysToCamelCase } from "../../util/utils.ts"; /** Edit a webhook. Requires the `MANAGE_WEBHOOKS` permission. Returns the updated webhook object on success. */ export async function editWebhook( @@ -13,7 +12,7 @@ export async function editWebhook( ) { await requireBotChannelPermissions(channelId, ["MANAGE_WEBHOOKS"]); - const result: DiscordWebhook = await rest.runMethod( + return await rest.runMethod( "patch", endpoints.WEBHOOK_ID(webhookId), { @@ -21,6 +20,4 @@ export async function editWebhook( channel_id: options.channelId, }, ); - - return snakeKeysToCamelCase(result); } diff --git a/src/helpers/webhooks/edit_webhook_message.ts b/src/helpers/webhooks/edit_webhook_message.ts index 5b78ca885..97d6c28b1 100644 --- a/src/helpers/webhooks/edit_webhook_message.ts +++ b/src/helpers/webhooks/edit_webhook_message.ts @@ -1,7 +1,7 @@ import { rest } from "../../rest/rest.ts"; import { structures } from "../../structures/mod.ts"; import { DiscordAllowedMentionsTypes } from "../../types/messages/allowed_mentions_types.ts"; -import { DiscordMessage } from "../../types/messages/message.ts"; +import { Message } from "../../types/messages/message.ts"; import { Errors } from "../../types/misc/errors.ts"; import { EditWebhookMessage } from "../../types/webhooks/edit_webhook_message.ts"; import { endpoints } from "../../util/constants.ts"; @@ -60,12 +60,11 @@ export async function editWebhookMessage( } } - const result = (await rest.runMethod( + const result = await rest.runMethod( "patch", endpoints.WEBHOOK_MESSAGE(webhookId, webhookToken, messageId), { ...options, allowedMentions: options.allowedMentions }, - )) as DiscordMessage; + ); - const message = await structures.createDiscordenoMessage(result); - return message; + return await structures.createDiscordenoMessage(result); } diff --git a/src/helpers/webhooks/edit_webhook_with_token.ts b/src/helpers/webhooks/edit_webhook_with_token.ts index 5b10e324d..258987379 100644 --- a/src/helpers/webhooks/edit_webhook_with_token.ts +++ b/src/helpers/webhooks/edit_webhook_with_token.ts @@ -2,7 +2,6 @@ import { rest } from "../../rest/rest.ts"; import { ModifyWebhook } from "../../types/webhooks/modify_webhook.ts"; import { Webhook } from "../../types/webhooks/webhook.ts"; import { endpoints } from "../../util/constants.ts"; -import { snakeKeysToCamelCase } from "../../util/utils.ts"; /** Edit a webhook. Returns the updated webhook object on success. */ export async function editWebhookWithToken( @@ -10,11 +9,9 @@ export async function editWebhookWithToken( webhookToken: string, options: Omit, ) { - const result = await rest.runMethod( + return await rest.runMethod( "patch", endpoints.WEBHOOK(webhookId, webhookToken), options, ); - - return snakeKeysToCamelCase(result) as Webhook; } diff --git a/src/helpers/webhooks/execute_webhook.ts b/src/helpers/webhooks/execute_webhook.ts index 3c29acbad..375d8e621 100644 --- a/src/helpers/webhooks/execute_webhook.ts +++ b/src/helpers/webhooks/execute_webhook.ts @@ -1,7 +1,7 @@ import { rest } from "../../rest/rest.ts"; import { structures } from "../../structures/mod.ts"; import { DiscordAllowedMentionsTypes } from "../../types/messages/allowed_mentions_types.ts"; -import { DiscordMessage } from "../../types/messages/message.ts"; +import { Message } from "../../types/messages/message.ts"; import { Errors } from "../../types/misc/errors.ts"; import { ExecuteWebhook } from "../../types/webhooks/execute_webhook.ts"; import { endpoints } from "../../util/constants.ts"; @@ -64,7 +64,7 @@ export async function executeWebhook( } } - const result = await rest.runMethod( + const result = await rest.runMethod( "post", `${endpoints.WEBHOOK(webhookId, webhookToken)}${ options.wait ? "?wait=true" : "" @@ -75,7 +75,8 @@ export async function executeWebhook( avatar_url: options.avatarUrl, }, ); + // TODO: not sure if (!options.wait) return; - return structures.createDiscordenoMessage(result as DiscordMessage); + return structures.createDiscordenoMessage(result); } diff --git a/src/helpers/webhooks/get_webhook.ts b/src/helpers/webhooks/get_webhook.ts index 8f57f844f..33399b6d8 100644 --- a/src/helpers/webhooks/get_webhook.ts +++ b/src/helpers/webhooks/get_webhook.ts @@ -1,11 +1,8 @@ import { rest } from "../../rest/rest.ts"; import { Webhook } from "../../types/webhooks/webhook.ts"; import { endpoints } from "../../util/constants.ts"; -import { snakeKeysToCamelCase } from "../../util/utils.ts"; /** Returns the new webhook object for the given id. */ export async function getWebhook(webhookId: string) { - const result = await rest.runMethod("get", endpoints.WEBHOOK_ID(webhookId)); - - return snakeKeysToCamelCase(result) as Webhook; + return await rest.runMethod("get", endpoints.WEBHOOK_ID(webhookId)); } diff --git a/src/helpers/webhooks/get_webhook_with_token.ts b/src/helpers/webhooks/get_webhook_with_token.ts index 5018628ee..f921a4a92 100644 --- a/src/helpers/webhooks/get_webhook_with_token.ts +++ b/src/helpers/webhooks/get_webhook_with_token.ts @@ -1,14 +1,11 @@ import { rest } from "../../rest/rest.ts"; import { Webhook } from "../../types/webhooks/webhook.ts"; import { endpoints } from "../../util/constants.ts"; -import { snakeKeysToCamelCase } from "../../util/utils.ts"; /** Returns the new webhook object for the given id, this call does not require authentication and returns no user in the webhook object. */ export async function getWebhookWithToken(webhookId: string, token: string) { - const result = await rest.runMethod( + return await rest.runMethod( "get", endpoints.WEBHOOK(webhookId, token), ); - - return snakeKeysToCamelCase(result) as Webhook; } diff --git a/src/helpers/webhooks/get_webhooks.ts b/src/helpers/webhooks/get_webhooks.ts index 32fe734da..20c7d120d 100644 --- a/src/helpers/webhooks/get_webhooks.ts +++ b/src/helpers/webhooks/get_webhooks.ts @@ -1,23 +1,19 @@ import { rest } from "../../rest/rest.ts"; -import { DiscordWebhook, Webhook } from "../../types/webhooks/webhook.ts"; +import { Webhook } from "../../types/webhooks/webhook.ts"; import { Collection } from "../../util/collection.ts"; import { endpoints } from "../../util/constants.ts"; import { requireBotGuildPermissions } from "../../util/permissions.ts"; -import { snakeKeysToCamelCase } from "../../util/utils.ts"; /** Returns a list of guild webhooks objects. Requires the MANAGE_WEBHOOKs permission. */ export async function getWebhooks(guildId: string) { await requireBotGuildPermissions(guildId, ["MANAGE_WEBHOOKS"]); - const result = (await rest.runMethod( + const result = await rest.runMethod( "get", endpoints.GUILD_WEBHOOKS(guildId), - )) as DiscordWebhook[]; + ); return new Collection( - result.map((webhook) => [ - webhook.id, - snakeKeysToCamelCase(webhook), - ]), + result.map((webhook) => [webhook.id, webhook]), ); }