feat: add new interfaces for interaction-related structures (#129)

discordjs · May 3, 2021 · bd638b9 · bd638b9
1 parent 44b956a
commit bd638b9
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 6 deletions.
diff --git a/deno/payloads/v8/interactions.ts b/deno/payloads/v8/interactions.ts
@@ -133,6 +133,14 @@ export interface APIBaseInteraction {
 	version: 1;
 }
 
+/**
+ * https://discord.com/developers/docs/resources/guild#guild-member-object
+ */
+export interface APIInteractionGuildMember extends APIGuildMember {
+	permissions: Permissions;
+	user: APIUser;
+}
+
 /**
  * https://discord.com/developers/docs/interactions/slash-commands#interaction
  */
@@ -146,7 +154,7 @@ export interface APIGuildInteraction extends APIBaseInteraction {
 	/**
 	 * Guild member data for the invoking user, including permissions
 	 */
-	member: APIGuildMember & { permissions: Permissions; user: APIUser };
+	member: APIInteractionGuildMember;
 	channel_id: Snowflake;
 }
 
@@ -245,6 +253,20 @@ export enum ApplicationCommandPermissionType {
 	USER,
 }
 
+/**
+ * https://discord.com/developers/docs/resources/channel#channel-object
+ */
+export interface APIInteractionDataResolvedChannel extends Required<APIPartialChannel> {
+	permissions: Permissions;
+}
+
+/**
+ * https://discord.com/developers/docs/resources/guild#guild-member-object
+ */
+export interface APIInteractionDataResolvedGuildMember extends Omit<APIGuildMember, 'user' | 'deaf' | 'mute'> {
+	permissions: Permissions;
+}
+
 /**
  * https://discord.com/developers/docs/interactions/slash-commands#interaction-applicationcommandinteractiondata
  */
@@ -255,8 +277,8 @@ export interface APIApplicationCommandInteractionData {
 	resolved?: {
 		users?: Record<string, APIUser>;
 		roles?: Record<string, APIRole>;
-		members?: Record<string, Omit<APIGuildMember, 'user' | 'deaf' | 'mute'> & { permissions: Permissions }>;
-		channels?: Record<string, Required<APIPartialChannel> & { permissions: Permissions }>;
+		members?: Record<string, APIInteractionDataResolvedGuildMember>;
+		channels?: Record<string, APIInteractionDataResolvedChannel>;
 	};
 }
 

diff --git a/payloads/v8/interactions.ts b/payloads/v8/interactions.ts
@@ -133,6 +133,14 @@ export interface APIBaseInteraction {
 	version: 1;
 }
 
+/**
+ * https://discord.com/developers/docs/resources/guild#guild-member-object
+ */
+export interface APIInteractionGuildMember extends APIGuildMember {
+	permissions: Permissions;
+	user: APIUser;
+}
+
 /**
  * https://discord.com/developers/docs/interactions/slash-commands#interaction
  */
@@ -146,7 +154,7 @@ export interface APIGuildInteraction extends APIBaseInteraction {
 	/**
 	 * Guild member data for the invoking user, including permissions
 	 */
-	member: APIGuildMember & { permissions: Permissions; user: APIUser };
+	member: APIInteractionGuildMember;
 	channel_id: Snowflake;
 }
 
@@ -245,6 +253,20 @@ export const enum ApplicationCommandPermissionType {
 	USER,
 }
 
+/**
+ * https://discord.com/developers/docs/resources/channel#channel-object
+ */
+export interface APIInteractionDataResolvedChannel extends Required<APIPartialChannel> {
+	permissions: Permissions;
+}
+
+/**
+ * https://discord.com/developers/docs/resources/guild#guild-member-object
+ */
+export interface APIInteractionDataResolvedGuildMember extends Omit<APIGuildMember, 'user' | 'deaf' | 'mute'> {
+	permissions: Permissions;
+}
+
 /**
  * https://discord.com/developers/docs/interactions/slash-commands#interaction-applicationcommandinteractiondata
  */
@@ -255,8 +277,8 @@ export interface APIApplicationCommandInteractionData {
 	resolved?: {
 		users?: Record<string, APIUser>;
 		roles?: Record<string, APIRole>;
-		members?: Record<string, Omit<APIGuildMember, 'user' | 'deaf' | 'mute'> & { permissions: Permissions }>;
-		channels?: Record<string, Required<APIPartialChannel> & { permissions: Permissions }>;
+		members?: Record<string, APIInteractionDataResolvedGuildMember>;
+		channels?: Record<string, APIInteractionDataResolvedChannel>;
 	};
 }