From 311b7a2eb9bdc6ad9d6ed7af2b7faf6f95631698 Mon Sep 17 00:00:00 2001 From: Almeida Date: Thu, 6 Apr 2023 19:51:44 +0100 Subject: [PATCH] feat(APIBaseInteraction): add `channel` (#741) --- deno/payloads/v10/_interactions/applicationCommands.ts | 5 ++++- deno/payloads/v10/_interactions/base.ts | 8 +++++++- deno/payloads/v10/_interactions/messageComponents.ts | 6 +++--- deno/payloads/v9/_interactions/applicationCommands.ts | 5 ++++- deno/payloads/v9/_interactions/base.ts | 8 +++++++- deno/payloads/v9/_interactions/messageComponents.ts | 6 +++--- payloads/v10/_interactions/applicationCommands.ts | 5 ++++- payloads/v10/_interactions/base.ts | 8 +++++++- payloads/v10/_interactions/messageComponents.ts | 6 +++--- payloads/v9/_interactions/applicationCommands.ts | 5 ++++- payloads/v9/_interactions/base.ts | 8 +++++++- payloads/v9/_interactions/messageComponents.ts | 6 +++--- 12 files changed, 56 insertions(+), 20 deletions(-) diff --git a/deno/payloads/v10/_interactions/applicationCommands.ts b/deno/payloads/v10/_interactions/applicationCommands.ts index 22c39c7b..4bdcaa46 100644 --- a/deno/payloads/v10/_interactions/applicationCommands.ts +++ b/deno/payloads/v10/_interactions/applicationCommands.ts @@ -115,7 +115,10 @@ export type APIApplicationCommandInteractionData = export type APIApplicationCommandInteractionWrapper = APIBaseInteraction & Required< - Pick, 'channel_id' | 'data' | 'app_permissions'> + Pick< + APIBaseInteraction, + 'channel' | 'channel_id' | 'data' | 'app_permissions' + > >; /** diff --git a/deno/payloads/v10/_interactions/base.ts b/deno/payloads/v10/_interactions/base.ts index 7fe280a4..15093762 100644 --- a/deno/payloads/v10/_interactions/base.ts +++ b/deno/payloads/v10/_interactions/base.ts @@ -1,7 +1,7 @@ import type { InteractionType } from './responses.ts'; import type { Permissions, Snowflake } from '../../../globals.ts'; import type { APIRole, LocaleString } from '../../../v10.ts'; -import type { APIAttachment, APIMessage, APIPartialChannel, APIThreadMetadata } from '../channel.ts'; +import type { APIAttachment, APIChannel, APIMessage, APIPartialChannel, APIThreadMetadata } from '../channel.ts'; import type { APIGuildMember } from '../guild.ts'; import type { APIUser } from '../user.ts'; @@ -81,6 +81,12 @@ export interface APIBaseInteraction { /** * The channel it was sent from */ + channel?: Partial & Pick; + /** + * The id of the channel it was sent from + * + * @deprecated Use {@apilink APIBaseInteraction#channel} instead + */ channel_id?: Snowflake; /** * Guild member data for the invoking user, including permissions diff --git a/deno/payloads/v10/_interactions/messageComponents.ts b/deno/payloads/v10/_interactions/messageComponents.ts index 78f0b381..b2da35ad 100644 --- a/deno/payloads/v10/_interactions/messageComponents.ts +++ b/deno/payloads/v10/_interactions/messageComponents.ts @@ -15,7 +15,7 @@ export type APIMessageComponentInteraction = APIBaseInteraction< Required< Pick< APIBaseInteraction, - 'channel_id' | 'data' | 'app_permissions' | 'message' + 'channel' | 'channel_id' | 'data' | 'app_permissions' | 'message' > >; @@ -26,7 +26,7 @@ export type APIMessageComponentButtonInteraction = APIBaseInteraction< Required< Pick< APIBaseInteraction, - 'channel_id' | 'data' | 'app_permissions' | 'message' + 'channel' | 'channel_id' | 'data' | 'app_permissions' | 'message' > >; @@ -37,7 +37,7 @@ export type APIMessageComponentSelectMenuInteraction = APIBaseInteraction< Required< Pick< APIBaseInteraction, - 'channel_id' | 'data' | 'app_permissions' | 'message' + 'channel' | 'channel_id' | 'data' | 'app_permissions' | 'message' > >; diff --git a/deno/payloads/v9/_interactions/applicationCommands.ts b/deno/payloads/v9/_interactions/applicationCommands.ts index 2ad831b9..ae9c6cb7 100644 --- a/deno/payloads/v9/_interactions/applicationCommands.ts +++ b/deno/payloads/v9/_interactions/applicationCommands.ts @@ -115,7 +115,10 @@ export type APIApplicationCommandInteractionData = export type APIApplicationCommandInteractionWrapper = APIBaseInteraction & Required< - Pick, 'channel_id' | 'data' | 'app_permissions'> + Pick< + APIBaseInteraction, + 'channel' | 'channel_id' | 'data' | 'app_permissions' + > >; /** diff --git a/deno/payloads/v9/_interactions/base.ts b/deno/payloads/v9/_interactions/base.ts index 792104ff..e0e648a5 100644 --- a/deno/payloads/v9/_interactions/base.ts +++ b/deno/payloads/v9/_interactions/base.ts @@ -1,7 +1,7 @@ import type { InteractionType } from './responses.ts'; import type { Permissions, Snowflake } from '../../../globals.ts'; import type { APIRole, LocaleString } from '../../../v9.ts'; -import type { APIAttachment, APIMessage, APIPartialChannel, APIThreadMetadata } from '../channel.ts'; +import type { APIAttachment, APIChannel, APIMessage, APIPartialChannel, APIThreadMetadata } from '../channel.ts'; import type { APIGuildMember } from '../guild.ts'; import type { APIUser } from '../user.ts'; @@ -81,6 +81,12 @@ export interface APIBaseInteraction { /** * The channel it was sent from */ + channel?: Partial & Pick; + /** + * The id of the channel it was sent from + * + * @deprecated Use {@apilink APIBaseInteraction#channel} instead + */ channel_id?: Snowflake; /** * Guild member data for the invoking user, including permissions diff --git a/deno/payloads/v9/_interactions/messageComponents.ts b/deno/payloads/v9/_interactions/messageComponents.ts index 78f0b381..b2da35ad 100644 --- a/deno/payloads/v9/_interactions/messageComponents.ts +++ b/deno/payloads/v9/_interactions/messageComponents.ts @@ -15,7 +15,7 @@ export type APIMessageComponentInteraction = APIBaseInteraction< Required< Pick< APIBaseInteraction, - 'channel_id' | 'data' | 'app_permissions' | 'message' + 'channel' | 'channel_id' | 'data' | 'app_permissions' | 'message' > >; @@ -26,7 +26,7 @@ export type APIMessageComponentButtonInteraction = APIBaseInteraction< Required< Pick< APIBaseInteraction, - 'channel_id' | 'data' | 'app_permissions' | 'message' + 'channel' | 'channel_id' | 'data' | 'app_permissions' | 'message' > >; @@ -37,7 +37,7 @@ export type APIMessageComponentSelectMenuInteraction = APIBaseInteraction< Required< Pick< APIBaseInteraction, - 'channel_id' | 'data' | 'app_permissions' | 'message' + 'channel' | 'channel_id' | 'data' | 'app_permissions' | 'message' > >; diff --git a/payloads/v10/_interactions/applicationCommands.ts b/payloads/v10/_interactions/applicationCommands.ts index 8d695ad1..7d72b697 100644 --- a/payloads/v10/_interactions/applicationCommands.ts +++ b/payloads/v10/_interactions/applicationCommands.ts @@ -115,7 +115,10 @@ export type APIApplicationCommandInteractionData = export type APIApplicationCommandInteractionWrapper = APIBaseInteraction & Required< - Pick, 'channel_id' | 'data' | 'app_permissions'> + Pick< + APIBaseInteraction, + 'channel' | 'channel_id' | 'data' | 'app_permissions' + > >; /** diff --git a/payloads/v10/_interactions/base.ts b/payloads/v10/_interactions/base.ts index 79164ef7..eb879800 100644 --- a/payloads/v10/_interactions/base.ts +++ b/payloads/v10/_interactions/base.ts @@ -1,7 +1,7 @@ import type { InteractionType } from './responses'; import type { Permissions, Snowflake } from '../../../globals'; import type { APIRole, LocaleString } from '../../../v10'; -import type { APIAttachment, APIMessage, APIPartialChannel, APIThreadMetadata } from '../channel'; +import type { APIAttachment, APIChannel, APIMessage, APIPartialChannel, APIThreadMetadata } from '../channel'; import type { APIGuildMember } from '../guild'; import type { APIUser } from '../user'; @@ -81,6 +81,12 @@ export interface APIBaseInteraction { /** * The channel it was sent from */ + channel?: Partial & Pick; + /** + * The id of the channel it was sent from + * + * @deprecated Use {@apilink APIBaseInteraction#channel} instead + */ channel_id?: Snowflake; /** * Guild member data for the invoking user, including permissions diff --git a/payloads/v10/_interactions/messageComponents.ts b/payloads/v10/_interactions/messageComponents.ts index 269c9f7d..c62c4c4c 100644 --- a/payloads/v10/_interactions/messageComponents.ts +++ b/payloads/v10/_interactions/messageComponents.ts @@ -15,7 +15,7 @@ export type APIMessageComponentInteraction = APIBaseInteraction< Required< Pick< APIBaseInteraction, - 'channel_id' | 'data' | 'app_permissions' | 'message' + 'channel' | 'channel_id' | 'data' | 'app_permissions' | 'message' > >; @@ -26,7 +26,7 @@ export type APIMessageComponentButtonInteraction = APIBaseInteraction< Required< Pick< APIBaseInteraction, - 'channel_id' | 'data' | 'app_permissions' | 'message' + 'channel' | 'channel_id' | 'data' | 'app_permissions' | 'message' > >; @@ -37,7 +37,7 @@ export type APIMessageComponentSelectMenuInteraction = APIBaseInteraction< Required< Pick< APIBaseInteraction, - 'channel_id' | 'data' | 'app_permissions' | 'message' + 'channel' | 'channel_id' | 'data' | 'app_permissions' | 'message' > >; diff --git a/payloads/v9/_interactions/applicationCommands.ts b/payloads/v9/_interactions/applicationCommands.ts index 2c9c7163..bbe4f881 100644 --- a/payloads/v9/_interactions/applicationCommands.ts +++ b/payloads/v9/_interactions/applicationCommands.ts @@ -115,7 +115,10 @@ export type APIApplicationCommandInteractionData = export type APIApplicationCommandInteractionWrapper = APIBaseInteraction & Required< - Pick, 'channel_id' | 'data' | 'app_permissions'> + Pick< + APIBaseInteraction, + 'channel' | 'channel_id' | 'data' | 'app_permissions' + > >; /** diff --git a/payloads/v9/_interactions/base.ts b/payloads/v9/_interactions/base.ts index 3b1a0a7d..bfde82b1 100644 --- a/payloads/v9/_interactions/base.ts +++ b/payloads/v9/_interactions/base.ts @@ -1,7 +1,7 @@ import type { InteractionType } from './responses'; import type { Permissions, Snowflake } from '../../../globals'; import type { APIRole, LocaleString } from '../../../v9'; -import type { APIAttachment, APIMessage, APIPartialChannel, APIThreadMetadata } from '../channel'; +import type { APIAttachment, APIChannel, APIMessage, APIPartialChannel, APIThreadMetadata } from '../channel'; import type { APIGuildMember } from '../guild'; import type { APIUser } from '../user'; @@ -81,6 +81,12 @@ export interface APIBaseInteraction { /** * The channel it was sent from */ + channel?: Partial & Pick; + /** + * The id of the channel it was sent from + * + * @deprecated Use {@apilink APIBaseInteraction#channel} instead + */ channel_id?: Snowflake; /** * Guild member data for the invoking user, including permissions diff --git a/payloads/v9/_interactions/messageComponents.ts b/payloads/v9/_interactions/messageComponents.ts index 269c9f7d..c62c4c4c 100644 --- a/payloads/v9/_interactions/messageComponents.ts +++ b/payloads/v9/_interactions/messageComponents.ts @@ -15,7 +15,7 @@ export type APIMessageComponentInteraction = APIBaseInteraction< Required< Pick< APIBaseInteraction, - 'channel_id' | 'data' | 'app_permissions' | 'message' + 'channel' | 'channel_id' | 'data' | 'app_permissions' | 'message' > >; @@ -26,7 +26,7 @@ export type APIMessageComponentButtonInteraction = APIBaseInteraction< Required< Pick< APIBaseInteraction, - 'channel_id' | 'data' | 'app_permissions' | 'message' + 'channel' | 'channel_id' | 'data' | 'app_permissions' | 'message' > >; @@ -37,7 +37,7 @@ export type APIMessageComponentSelectMenuInteraction = APIBaseInteraction< Required< Pick< APIBaseInteraction, - 'channel_id' | 'data' | 'app_permissions' | 'message' + 'channel' | 'channel_id' | 'data' | 'app_permissions' | 'message' > >;