refactor(IntegrationApplication): move common properties to Application

Author: imnaiyar

packages/discord.js/src/structures/ClientApplication.js

@@ -173,26 +173,6 @@ class ClientApplication extends Application {
       this.guildId ??= null;
     }
 
-    if ('cover_image' in data) {
-      /**
-       * The hash of the application's cover image
-       * @type {?string}
-       */
-      this.cover = data.cover_image;
-    } else {
-      this.cover ??= null;
-    }
-
-    if ('rpc_origins' in data) {
-      /**
-       * The application's RPC origins, if enabled
-       * @type {string[]}
-       */
-      this.rpcOrigins = data.rpc_origins;
-    } else {
-      this.rpcOrigins ??= [];
-    }
-
     if ('bot_require_code_grant' in data) {
       /**
        * If this application's bot requires a code grant when using the OAuth2 flow

packages/discord.js/src/structures/IntegrationApplication.js

@@ -20,36 +20,6 @@ class IntegrationApplication extends Application {
       this.bot ??= null;
     }
 
-    if ('terms_of_service_url' in data) {
-      /**
-       * The URL of the application's terms of service
-       * @type {?string}
-       */
-      this.termsOfServiceURL = data.terms_of_service_url;
-    } else {
-      this.termsOfServiceURL ??= null;
-    }
-
-    if ('privacy_policy_url' in data) {
-      /**
-       * The URL of the application's privacy policy
-       * @type {?string}
-       */
-      this.privacyPolicyURL = data.privacy_policy_url;
-    } else {
-      this.privacyPolicyURL ??= null;
-    }
-
-    if ('rpc_origins' in data) {
-      /**
-       * The Array of RPC origin URLs
-       * @type {string[]}
-       */
-      this.rpcOrigins = data.rpc_origins;
-    } else {
-      this.rpcOrigins ??= [];
-    }
-
     if ('hook' in data) {
       /**
        * Whether the application can be default hooked by the client
@@ -59,26 +29,6 @@ class IntegrationApplication extends Application {
     } else {
       this.hook ??= null;
     }
-
-    if ('cover_image' in data) {
-      /**
-       * The hash of the application's cover image
-       * @type {?string}
-       */
-      this.cover = data.cover_image;
-    } else {
-      this.cover ??= null;
-    }
-
-    if ('verify_key' in data) {
-      /**
-       * The hex-encoded key for verification in interactions and the GameSDK's GetTicket
-       * @type {?string}
-       */
-      this.verifyKey = data.verify_key;
-    } else {
-      this.verifyKey ??= null;
-    }
   }
 }
 

packages/discord.js/src/structures/interfaces/Application.js

@@ -50,6 +50,56 @@ class Application extends Base {
     } else {
       this.icon ??= null;
     }
+
+    if ('terms_of_service_url' in data) {
+      /**
+       * The URL of the application's terms of service
+       * @type {?string}
+       */
+      this.termsOfServiceURL = data.terms_of_service_url;
+    } else {
+      this.termsOfServiceURL ??= null;
+    }
+
+    if ('privacy_policy_url' in data) {
+      /**
+       * The URL of the application's privacy policy
+       * @type {?string}
+       */
+      this.privacyPolicyURL = data.privacy_policy_url;
+    } else {
+      this.privacyPolicyURL ??= null;
+    }
+
+    if ('rpc_origins' in data) {
+      /**
+       * The application's RPC origins, if enabled
+       * @type {string[]}
+       */
+      this.rpcOrigins = data.rpc_origins;
+    } else {
+      this.rpcOrigins ??= [];
+    }
+
+    if ('cover_image' in data) {
+      /**
+       * The hash of the application's cover image
+       * @type {?string}
+       */
+      this.cover = data.cover_image;
+    } else {
+      this.cover ??= null;
+    }
+
+    if ('verify_key' in data) {
+      /**
+       * The hex-encoded key for verification in interactions and the GameSDK's GetTicket
+       * @type {?string}
+       */
+      this.verifyKey = data.verify_key;
+    } else {
+      this.verifyKey ??= null;
+    }
   }
 
   /**

packages/discord.js/typings/index.d.ts

@@ -412,6 +412,11 @@ export abstract class Application extends Base {
   public icon: string | null;
   public id: Snowflake;
   public name: string | null;
+  public termsOfServiceURL: string | null;
+  public privacyPolicyURL: string | null;
+  public rpcOrigins: string[];
+  public cover: string | null;
+  public verifyKey: string | null;
   public coverURL(options?: ImageURLOptions): string | null;
   public iconURL(options?: ImageURLOptions): string | null;
   public toJSON(): unknown;
@@ -1899,12 +1904,7 @@ export class Integration extends Base {
 export class IntegrationApplication extends Application {
   private constructor(client: Client<true>, data: RawIntegrationApplicationData);
   public bot: User | null;
-  public termsOfServiceURL: string | null;
-  public privacyPolicyURL: string | null;
-  public rpcOrigins: string[];
   public hook: boolean | null;
-  public cover: string | null;
-  public verifyKey: string | null;
 }
 
 export type GatewayIntentsString = keyof typeof GatewayIntentBits;