diff --git a/packages/core/src/api/channel.ts b/packages/core/src/api/channel.ts index 3ed52c0c5..d8aa3f145 100644 --- a/packages/core/src/api/channel.ts +++ b/packages/core/src/api/channel.ts @@ -41,6 +41,14 @@ export interface StartForumThreadOptions extends RESTPostAPIGuildForumThreadsJSO message: RESTPostAPIGuildForumThreadsJSONBody['message'] & { files?: RawFile[] }; } +export interface CreateMessageOptions extends RESTPostAPIChannelMessageJSONBody { + files?: RawFile[]; +} + +export interface EditMessageOptions extends RESTPatchAPIChannelMessageJSONBody { + files?: RawFile[]; +} + export class ChannelsAPI { public constructor(private readonly rest: REST) {} @@ -54,7 +62,7 @@ export class ChannelsAPI { */ public async createMessage( channelId: Snowflake, - { files, ...body }: RESTPostAPIChannelMessageJSONBody & { files?: RawFile[] }, + { files, ...body }: CreateMessageOptions, { signal }: Pick = {}, ) { return this.rest.post(Routes.channelMessages(channelId), { @@ -76,7 +84,7 @@ export class ChannelsAPI { public async editMessage( channelId: Snowflake, messageId: Snowflake, - { files, ...body }: RESTPatchAPIChannelMessageJSONBody & { files?: RawFile[] }, + { files, ...body }: EditMessageOptions, { signal }: Pick = {}, ) { return this.rest.patch(Routes.channelMessage(channelId, messageId), { diff --git a/packages/core/src/api/guild.ts b/packages/core/src/api/guild.ts index 698b6df36..4cb5414b3 100644 --- a/packages/core/src/api/guild.ts +++ b/packages/core/src/api/guild.ts @@ -1,6 +1,6 @@ /* eslint-disable jsdoc/check-param-names */ -import { makeURLSearchParams, type REST, type RawFile, type RequestData } from '@discordjs/rest'; +import { makeURLSearchParams, type RawFile, type REST, type RequestData } from '@discordjs/rest'; import { Routes, type GuildMFALevel, @@ -110,6 +110,10 @@ import { } from 'discord-api-types/v10'; import { VoiceAPI } from './voice'; +export interface CreateStickerOptions extends Omit { + file: RawFile; +} + export class GuildsAPI { public constructor(private readonly rest: REST) {} @@ -1013,7 +1017,7 @@ export class GuildsAPI { */ public async createSticker( guildId: Snowflake, - { file, ...body }: Omit & { file: RawFile }, + { file, ...body }: CreateStickerOptions, { reason, signal }: Pick = {}, ) { const fileData = { ...file, key: 'file' }; diff --git a/packages/core/src/api/interactions.ts b/packages/core/src/api/interactions.ts index 7bc52cc29..bc485a762 100644 --- a/packages/core/src/api/interactions.ts +++ b/packages/core/src/api/interactions.ts @@ -16,6 +16,26 @@ import { } from 'discord-api-types/v10'; import type { WebhooksAPI } from './webhook.js'; +export interface CreateInteractionResponseOptions + extends APIInteractionResponseCallbackData, + RESTPostAPIInteractionCallbackQuery { + files?: RawFile[]; +} + +export type CreateInteractionDeferResponseOptions = APIInteractionResponseDeferredChannelMessageWithSource['data'] & + RESTPostAPIInteractionCallbackQuery; + +export type CreateInteractionFollowUpResponseOptions = APIInteractionResponseCallbackData & { files?: RawFile[] }; +export type EditInteractionResponseOptions = APIInteractionResponseCallbackData & { files?: RawFile[] }; + +export type CreateInteractionUpdateMessageResponseOptions = APIInteractionResponseCallbackData & + RESTPostAPIInteractionCallbackQuery & { files?: RawFile[] }; + +export type CreateAutocompleteResponseOptions = APICommandAutocompleteInteractionResponseCallbackData & + RESTPostAPIInteractionCallbackQuery; + +export type CreateModalResponseOptions = APIModalInteractionResponseCallbackData & RESTPostAPIInteractionCallbackQuery; + export class InteractionsAPI { public constructor( private readonly rest: REST, @@ -34,8 +54,7 @@ export class InteractionsAPI { public async reply( interactionId: Snowflake, interactionToken: string, - body: APIInteractionResponseCallbackData & - RESTPostAPIInteractionCallbackQuery & { files?: RawFile[]; with_response: true }, + body: CreateInteractionResponseOptions & { with_response: true }, options?: Pick, ): Promise; @@ -51,19 +70,14 @@ export class InteractionsAPI { public async reply( interactionId: Snowflake, interactionToken: string, - body: APIInteractionResponseCallbackData & - RESTPostAPIInteractionCallbackQuery & { files?: RawFile[]; with_response?: false }, + body: CreateInteractionResponseOptions & { with_response?: false }, options?: Pick, ): Promise; public async reply( interactionId: Snowflake, interactionToken: string, - { - files, - with_response, - ...data - }: APIInteractionResponseCallbackData & RESTPostAPIInteractionCallbackQuery & { files?: RawFile[] }, + { files, with_response, ...data }: CreateInteractionResponseOptions, { signal }: Pick = {}, ) { const response = await this.rest.post(Routes.interactionCallback(interactionId, interactionToken), { @@ -92,8 +106,7 @@ export class InteractionsAPI { public async defer( interactionId: Snowflake, interactionToken: string, - body: APIInteractionResponseDeferredChannelMessageWithSource['data'] & - RESTPostAPIInteractionCallbackQuery & { with_response: true }, + body: CreateInteractionDeferResponseOptions & { with_response: true }, options?: Pick, ): Promise; @@ -109,18 +122,14 @@ export class InteractionsAPI { public async defer( interactionId: Snowflake, interactionToken: string, - body?: APIInteractionResponseDeferredChannelMessageWithSource['data'] & - RESTPostAPIInteractionCallbackQuery & { with_response?: false }, + body?: CreateInteractionDeferResponseOptions & { with_response?: false }, options?: Pick, ): Promise; public async defer( interactionId: Snowflake, interactionToken: string, - { - with_response, - ...data - }: APIInteractionResponseDeferredChannelMessageWithSource['data'] & RESTPostAPIInteractionCallbackQuery = {}, + { with_response, ...data }: CreateInteractionDeferResponseOptions = {}, { signal }: Pick = {}, ) { const response = await this.rest.post(Routes.interactionCallback(interactionId, interactionToken), { @@ -198,7 +207,7 @@ export class InteractionsAPI { public async followUp( applicationId: Snowflake, interactionToken: string, - body: APIInteractionResponseCallbackData & { files?: RawFile[] }, + body: CreateInteractionFollowUpResponseOptions, { signal }: Pick = {}, ) { return this.webhooks.execute(applicationId, interactionToken, { ...body, wait: true }, { signal }); @@ -218,7 +227,7 @@ export class InteractionsAPI { public async editReply( applicationId: Snowflake, interactionToken: string, - callbackData: APIInteractionResponseCallbackData & { files?: RawFile[] }, + callbackData: EditInteractionResponseOptions, messageId?: Snowflake | '@original', { signal }: Pick = {}, ) { @@ -280,8 +289,7 @@ export class InteractionsAPI { public async updateMessage( interactionId: Snowflake, interactionToken: string, - callbackData: APIInteractionResponseCallbackData & - RESTPostAPIInteractionCallbackQuery & { files?: RawFile[]; with_response: true }, + callbackData: CreateInteractionUpdateMessageResponseOptions & { with_response: true }, options: Pick, ): Promise; @@ -297,19 +305,14 @@ export class InteractionsAPI { public async updateMessage( interactionId: Snowflake, interactionToken: string, - callbackData: APIInteractionResponseCallbackData & - RESTPostAPIInteractionCallbackQuery & { files?: RawFile[]; with_response?: false }, + callbackData: CreateInteractionUpdateMessageResponseOptions & { with_response?: false }, options: Pick, ): Promise; public async updateMessage( interactionId: Snowflake, interactionToken: string, - { - files, - with_response, - ...data - }: APIInteractionResponseCallbackData & RESTPostAPIInteractionCallbackQuery & { files?: RawFile[] }, + { files, with_response, ...data }: CreateInteractionUpdateMessageResponseOptions, { signal }: Pick = {}, ) { const response = await this.rest.post(Routes.interactionCallback(interactionId, interactionToken), { @@ -337,8 +340,7 @@ export class InteractionsAPI { public async createAutocompleteResponse( interactionId: Snowflake, interactionToken: string, - callbackData: APICommandAutocompleteInteractionResponseCallbackData & - RESTPostAPIInteractionCallbackQuery & { with_response: true }, + callbackData: CreateAutocompleteResponseOptions & { with_response: true }, options?: Pick, ): Promise; @@ -354,18 +356,14 @@ export class InteractionsAPI { public async createAutocompleteResponse( interactionId: Snowflake, interactionToken: string, - callbackData: APICommandAutocompleteInteractionResponseCallbackData & - RESTPostAPIInteractionCallbackQuery & { with_response?: false }, + callbackData: CreateAutocompleteResponseOptions & { with_response?: false }, options: Pick, ): Promise; public async createAutocompleteResponse( interactionId: Snowflake, interactionToken: string, - { - with_response, - ...data - }: APICommandAutocompleteInteractionResponseCallbackData & RESTPostAPIInteractionCallbackQuery, + { with_response, ...data }: CreateAutocompleteResponseOptions, { signal }: Pick = {}, ) { const response = await this.rest.post(Routes.interactionCallback(interactionId, interactionToken), { @@ -392,8 +390,7 @@ export class InteractionsAPI { public async createModal( interactionId: Snowflake, interactionToken: string, - callbackData: APIModalInteractionResponseCallbackData & - RESTPostAPIInteractionCallbackQuery & { with_response: true }, + callbackData: CreateModalResponseOptions & { with_response: true }, options?: Pick, ): Promise; @@ -409,15 +406,14 @@ export class InteractionsAPI { public async createModal( interactionId: Snowflake, interactionToken: string, - callbackData: APIModalInteractionResponseCallbackData & - RESTPostAPIInteractionCallbackQuery & { with_response?: false }, + callbackData: CreateModalResponseOptions & { with_response?: false }, options?: Pick, ): Promise; public async createModal( interactionId: Snowflake, interactionToken: string, - { with_response, ...data }: APIModalInteractionResponseCallbackData & RESTPostAPIInteractionCallbackQuery, + { with_response, ...data }: CreateModalResponseOptions, { signal }: Pick = {}, ) { const response = await this.rest.post(Routes.interactionCallback(interactionId, interactionToken), { diff --git a/packages/core/src/api/webhook.ts b/packages/core/src/api/webhook.ts index d54253c25..34855d78a 100644 --- a/packages/core/src/api/webhook.ts +++ b/packages/core/src/api/webhook.ts @@ -18,6 +18,14 @@ import { type Snowflake, } from 'discord-api-types/v10'; +export type CreateWebhookMessageOptions = RESTPostAPIWebhookWithTokenJSONBody & + RESTPostAPIWebhookWithTokenQuery & { files?: RawFile[] }; + +export type EditWebhookMessageOptions = RESTPatchAPIWebhookWithTokenMessageJSONBody & { + files?: RawFile[]; + thread_id?: string; +}; + export class WebhooksAPI { public constructor(private readonly rest: REST) {} @@ -92,7 +100,7 @@ export class WebhooksAPI { public async execute( id: Snowflake, token: string, - body: RESTPostAPIWebhookWithTokenJSONBody & RESTPostAPIWebhookWithTokenQuery & { files?: RawFile[]; wait: true }, + body: CreateWebhookMessageOptions & { wait: true }, options?: Pick, ): Promise; @@ -108,7 +116,7 @@ export class WebhooksAPI { public async execute( id: Snowflake, token: string, - body: RESTPostAPIWebhookWithTokenJSONBody & RESTPostAPIWebhookWithTokenQuery & { files?: RawFile[]; wait?: false }, + body: CreateWebhookMessageOptions & { wait?: false }, options?: Pick, ): Promise; @@ -124,12 +132,7 @@ export class WebhooksAPI { public async execute( id: Snowflake, token: string, - { - wait, - thread_id, - files, - ...body - }: RESTPostAPIWebhookWithTokenJSONBody & RESTPostAPIWebhookWithTokenQuery & { files?: RawFile[] }, + { wait, thread_id, files, ...body }: CreateWebhookMessageOptions, { signal }: Pick = {}, ) { return this.rest.post(Routes.webhook(id, token), { @@ -230,11 +233,7 @@ export class WebhooksAPI { id: Snowflake, token: string, messageId: Snowflake, - { - thread_id, - files, - ...body - }: RESTPatchAPIWebhookWithTokenMessageJSONBody & { files?: RawFile[]; thread_id?: string }, + { thread_id, files, ...body }: EditWebhookMessageOptions, { signal }: Pick = {}, ) { return this.rest.patch(Routes.webhookMessage(id, token, messageId), {