discord.js 15.0.0-dev.1732752781-e89c6b66a → 15.0.0-dev.1732795515-2b0944a92

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "discord.js",
-  "version": "15.0.0-dev.1732752781-e89c6b66a",
+  "version": "15.0.0-dev.1732795515-2b0944a92",
   "description": "A powerful library for interacting with the Discord API",
   "main": "./src/index.js",
   "types": "./typings/index.d.ts",
@@ -61,9 +61,9 @@
     "tslib": "^2.8.1",
     "undici": "6.21.0",
     "@discordjs/formatters": "^0.5.0",
-    "@discordjs/ws": "^2.0.0",
+    "@discordjs/rest": "^2.4.0",
     "@discordjs/util": "^1.1.1",
-    "@discordjs/rest": "^2.4.0"
+    "@discordjs/ws": "^2.0.0"
   },
   "devDependencies": {
     "@favware/cliff-jumper": "^4.1.0",
@@ -80,9 +80,9 @@
     "tslint": "6.1.3",
     "turbo": "^2.3.0",
     "typescript": "~5.5.4",
-    "@discordjs/api-extractor": "^7.38.1",
     "@discordjs/docgen": "^0.12.1",
-    "@discordjs/scripts": "^0.1.0"
+    "@discordjs/scripts": "^0.1.0",
+    "@discordjs/api-extractor": "^7.38.1"
   },
   "engines": {
     "node": ">=20"

package/src/client/websocket/handlers/SUBSCRIPTION_CREATE.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const Events = require('../../../util/Events');
+
+module.exports = (client, { d: data }) => {
+  const subscription = client.application.subscriptions._add(data);
+
+  /**
+   * Emitted whenever a subscription is created.
+   * @event Client#subscriptionCreate
+   * @param {Subscription} subscription The subscription that was created
+   */
+  client.emit(Events.SubscriptionCreate, subscription);
+};

package/src/client/websocket/handlers/SUBSCRIPTION_DELETE.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const Events = require('../../../util/Events');
+
+module.exports = (client, { d: data }) => {
+  const subscription = client.application.subscriptions._add(data, false);
+
+  client.application.subscriptions.cache.delete(subscription.id);
+
+  /**
+   * Emitted whenever a subscription is deleted.
+   * @event Client#subscriptionDelete
+   * @param {Subscription} subscription The subscription that was deleted
+   */
+  client.emit(Events.SubscriptionDelete, subscription);
+};

package/src/client/websocket/handlers/SUBSCRIPTION_UPDATE.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const Events = require('../../../util/Events');
+
+module.exports = (client, { d: data }) => {
+  const oldSubscription = client.application.subscriptions.cache.get(data.id)?._clone() ?? null;
+  const newSubscription = client.application.subscriptions._add(data);
+
+  /**
+   * Emitted whenever a subscription is updated - i.e. when a user's subscription renews.
+   * @event Client#subscriptionUpdate
+   * @param {?Subscription} oldSubscription The subscription before the update
+   * @param {Subscription} newSubscription The subscription after the update
+   */
+  client.emit(Events.SubscriptionUpdate, oldSubscription, newSubscription);
+};

package/src/client/websocket/handlers/index.js

@@ -52,6 +52,9 @@ const handlers = Object.fromEntries([
   ['STAGE_INSTANCE_CREATE', require('./STAGE_INSTANCE_CREATE')],
   ['STAGE_INSTANCE_DELETE', require('./STAGE_INSTANCE_DELETE')],
   ['STAGE_INSTANCE_UPDATE', require('./STAGE_INSTANCE_UPDATE')],
+  ['SUBSCRIPTION_CREATE', require('./SUBSCRIPTION_CREATE')],
+  ['SUBSCRIPTION_DELETE', require('./SUBSCRIPTION_DELETE')],
+  ['SUBSCRIPTION_UPDATE', require('./SUBSCRIPTION_UPDATE')],
   ['THREAD_CREATE', require('./THREAD_CREATE')],
   ['THREAD_DELETE', require('./THREAD_DELETE')],
   ['THREAD_LIST_SYNC', require('./THREAD_LIST_SYNC')],

package/src/index.js

@@ -83,6 +83,7 @@ exports.ReactionManager = require('./managers/ReactionManager');
 exports.ReactionUserManager = require('./managers/ReactionUserManager');
 exports.RoleManager = require('./managers/RoleManager');
 exports.StageInstanceManager = require('./managers/StageInstanceManager');
+exports.SubscriptionManager = require('./managers/SubscriptionManager').SubscriptionManager;
 exports.ThreadManager = require('./managers/ThreadManager');
 exports.ThreadMemberManager = require('./managers/ThreadMemberManager');
 exports.UserManager = require('./managers/UserManager');
@@ -142,6 +143,9 @@ exports.GuildScheduledEvent = require('./structures/GuildScheduledEvent').GuildS
 exports.GuildTemplate = require('./structures/GuildTemplate');
 exports.Integration = require('./structures/Integration');
 exports.IntegrationApplication = require('./structures/IntegrationApplication');
+exports.InteractionCallback = require('./structures/InteractionCallback');
+exports.InteractionCallbackResource = require('./structures/InteractionCallbackResource');
+exports.InteractionCallbackResponse = require('./structures/InteractionCallbackResponse');
 exports.BaseInteraction = require('./structures/BaseInteraction');
 exports.InteractionCollector = require('./structures/InteractionCollector');
 exports.InteractionResponse = require('./structures/InteractionResponse');
@@ -193,6 +197,7 @@ exports.SKU = require('./structures/SKU').SKU;
 exports.StringSelectMenuOptionBuilder = require('./structures/StringSelectMenuOptionBuilder');
 exports.StageChannel = require('./structures/StageChannel');
 exports.StageInstance = require('./structures/StageInstance').StageInstance;
+exports.Subscription = require('./structures/Subscription').Subscription;
 exports.Sticker = require('./structures/Sticker').Sticker;
 exports.StickerPack = require('./structures/StickerPack');
 exports.Team = require('./structures/Team');

package/src/managers/SubscriptionManager.js

@@ -0,0 +1,81 @@
+'use strict';
+
+const { Collection } = require('@discordjs/collection');
+const { makeURLSearchParams } = require('@discordjs/rest');
+const { Routes } = require('discord-api-types/v10');
+const CachedManager = require('./CachedManager');
+const { DiscordjsTypeError, ErrorCodes } = require('../errors/index');
+const { Subscription } = require('../structures/Subscription');
+const { resolveSKUId } = require('../util/Util');
+
+/**
+ * Manages API methods for subscriptions and stores their cache.
+ * @extends {CachedManager}
+ */
+class SubscriptionManager extends CachedManager {
+  constructor(client, iterable) {
+    super(client, Subscription, iterable);
+  }
+
+  /**
+   * The cache of this manager
+   * @type {Collection<Snowflake, Subscription>}
+   * @name SubscriptionManager#cache
+   */
+
+  /**
+   * Options used to fetch a subscription
+   * @typedef {BaseFetchOptions} FetchSubscriptionOptions
+   * @property {SKUResolvable} sku The SKU to fetch the subscription for
+   * @property {Snowflake} subscriptionId The id of the subscription to fetch
+   */
+
+  /**
+   * Options used to fetch subscriptions
+   * @typedef {Object} FetchSubscriptionsOptions
+   * @property {Snowflake} [after] Consider only subscriptions after this subscription id
+   * @property {Snowflake} [before] Consider only subscriptions before this subscription id
+   * @property {number} [limit] The maximum number of subscriptions to fetch
+   * @property {SKUResolvable} sku The SKU to fetch subscriptions for
+   * @property {UserResolvable} user The user to fetch entitlements for
+   * <warn>If both `before` and `after` are provided, only `before` is respected</warn>
+   */
+
+  /**
+   * Fetches subscriptions for this application
+   * @param {FetchSubscriptionOptions|FetchSubscriptionsOptions} [options={}] Options for fetching the subscriptions
+   * @returns {Promise<Subscription|Collection<Snowflake, Subscription>>}
+   */
+  async fetch(options = {}) {
+    if (typeof options !== 'object') throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'options', 'object', true);
+
+    const { after, before, cache, limit, sku, subscriptionId, user } = options;
+
+    const skuId = resolveSKUId(sku);
+
+    if (!skuId) throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'sku', 'SKUResolvable');
+
+    if (subscriptionId) {
+      const subscription = await this.client.rest.get(Routes.skuSubscription(skuId, subscriptionId));
+
+      return this._add(subscription, cache);
+    }
+
+    const query = makeURLSearchParams({
+      limit,
+      user_id: this.client.users.resolveId(user) ?? undefined,
+      sku_id: skuId,
+      before,
+      after,
+    });
+
+    const subscriptions = await this.client.rest.get(Routes.skuSubscriptions(skuId), { query });
+
+    return subscriptions.reduce(
+      (coll, subscription) => coll.set(subscription.id, this._add(subscription, cache)),
+      new Collection(),
+    );
+  }
+}
+
+exports.SubscriptionManager = SubscriptionManager;

package/src/structures/ClientApplication.js

@@ -9,6 +9,7 @@ const Application = require('./interfaces/Application');
 const ApplicationCommandManager = require('../managers/ApplicationCommandManager');
 const ApplicationEmojiManager = require('../managers/ApplicationEmojiManager');
 const { EntitlementManager } = require('../managers/EntitlementManager');
+const { SubscriptionManager } = require('../managers/SubscriptionManager');
 const ApplicationFlagsBitField = require('../util/ApplicationFlagsBitField');
 const { resolveImage } = require('../util/DataResolver');
 const PermissionsBitField = require('../util/PermissionsBitField');
@@ -44,6 +45,12 @@ class ClientApplication extends Application {
      * @type {EntitlementManager}
      */
     this.entitlements = new EntitlementManager(this.client);
+
+    /**
+     * The subscription manager for this application
+     * @type {SubscriptionManager}
+     */
+    this.subscriptions = new SubscriptionManager(this.client);
   }
 
   _patch(data) {

package/src/structures/Entitlement.js

@@ -73,10 +73,9 @@ class Entitlement extends Base {
     if ('starts_at' in data) {
       /**
        * The timestamp at which this entitlement is valid
-       * <info>This is only `null` for test entitlements</info>
        * @type {?number}
        */
-      this.startsTimestamp = Date.parse(data.starts_at);
+      this.startsTimestamp = data.starts_at ? Date.parse(data.starts_at) : null;
     } else {
       this.startsTimestamp ??= null;
     }
@@ -84,10 +83,9 @@ class Entitlement extends Base {
     if ('ends_at' in data) {
       /**
        * The timestamp at which this entitlement is no longer valid
-       * <info>This is only `null` for test entitlements</info>
        * @type {?number}
        */
-      this.endsTimestamp = Date.parse(data.ends_at);
+      this.endsTimestamp = data.ends_at ? Date.parse(data.ends_at) : null;
     } else {
       this.endsTimestamp ??= null;
     }
@@ -114,7 +112,6 @@ class Entitlement extends Base {
 
   /**
    * The start date at which this entitlement is valid
-   * <info>This is only `null` for test entitlements</info>
    * @type {?Date}
    */
   get startsAt() {
@@ -123,7 +120,6 @@ class Entitlement extends Base {
 
   /**
    * The end date at which this entitlement is no longer valid
-   * <info>This is only `null` for test entitlements</info>
    * @type {?Date}
    */
   get endsAt() {

package/src/structures/InteractionCallback.js

@@ -0,0 +1,74 @@
+'use strict';
+
+const { DiscordSnowflake } = require('@sapphire/snowflake');
+
+/**
+ * Represents an interaction callback response from Discord
+ */
+class InteractionCallback {
+  constructor(client, data) {
+    /**
+     * The client that instantiated this.
+     * @name InteractionCallback#client
+     * @type {Client}
+     * @readonly
+     */
+    Object.defineProperty(this, 'client', { value: client });
+
+    /**
+     * The id of the original interaction response
+     * @type {Snowflake}
+     */
+    this.id = data.id;
+
+    /**
+     * The type of the original interaction
+     * @type {InteractionType}
+     */
+    this.type = data.type;
+
+    /**
+     * The instance id of the Activity if one was launched or joined
+     * @type {?string}
+     */
+    this.activityInstanceId = data.activity_instance_id ?? null;
+
+    /**
+     * The id of the message that was created by the interaction
+     * @type {?Snowflake}
+     */
+    this.responseMessageId = data.response_message_id ?? null;
+
+    /**
+     * Whether the message is in a loading state
+     * @type {?boolean}
+     */
+    this.responseMessageLoading = data.response_message_loading ?? null;
+
+    /**
+     * Whether the response message was ephemeral
+     * @type {?boolean}
+     */
+    this.responseMessageEphemeral = data.response_message_ephemeral ?? null;
+  }
+
+  /**
+   * The timestamp the original interaction was created at
+   * @type {number}
+   * @readonly
+   */
+  get createdTimestamp() {
+    return DiscordSnowflake.timestampFrom(this.id);
+  }
+
+  /**
+   * The time the original interaction was created at
+   * @type {Date}
+   * @readonly
+   */
+  get createdAt() {
+    return new Date(this.createdTimestamp);
+  }
+}
+
+module.exports = InteractionCallback;

package/src/structures/InteractionCallbackResource.js

@@ -0,0 +1,52 @@
+'use strict';
+
+const { lazy } = require('@discordjs/util');
+
+const getMessage = lazy(() => require('./Message').Message);
+
+/**
+ * Represents the resource that was created by the interaction response.
+ */
+class InteractionCallbackResource {
+  constructor(client, data) {
+    /**
+     * The client that instantiated this
+     * @name InteractionCallbackResource#client
+     * @type {Client}
+     * @readonly
+     */
+    Object.defineProperty(this, 'client', { value: client });
+
+    /**
+     * The interaction callback type
+     * @type {InteractionResponseType}
+     */
+    this.type = data.type;
+
+    /**
+     * The Activity launched by an interaction
+     * @typedef {Object} ActivityInstance
+     * @property {string} id The instance id of the Activity
+     */
+
+    /**
+     * Represents the Activity launched by this interaction
+     * @type {?ActivityInstance}
+     */
+    this.activityInstance = data.activity_instance ?? null;
+
+    if ('message' in data) {
+      /**
+       * The message created by the interaction
+       * @type {?Message}
+       */
+      this.message =
+        this.client.channels.cache.get(data.message.channel_id)?.messages._add(data.message) ??
+        new (getMessage())(client, data.message);
+    } else {
+      this.message = null;
+    }
+  }
+}
+
+module.exports = InteractionCallbackResource;

package/src/structures/InteractionCallbackResponse.js

@@ -0,0 +1,33 @@
+'use strict';
+
+const InteractionCallback = require('./InteractionCallback');
+const InteractionCallbackResource = require('./InteractionCallbackResource');
+
+/**
+ * Represents an interaction's response
+ */
+class InteractionCallbackResponse {
+  constructor(client, data) {
+    /**
+     * The client that instantiated this
+     * @name InteractionCallbackResponse#client
+     * @type {Client}
+     * @readonly
+     */
+    Object.defineProperty(this, 'client', { value: client });
+
+    /**
+     * The interaction object associated with the interaction callback response
+     * @type {InteractionCallback}
+     */
+    this.interaction = new InteractionCallback(client, data.interaction);
+
+    /**
+     * The resource that was created by the interaction response
+     * @type {?InteractionCallbackResource}
+     */
+    this.resource = data.resource ? new InteractionCallbackResource(client, data.resource) : null;
+  }
+}
+
+module.exports = InteractionCallbackResponse;

package/src/structures/Subscription.js

@@ -0,0 +1,109 @@
+'use strict';
+
+const Base = require('./Base');
+
+/**
+ * Represents a Subscription
+ * @extends {Base}
+ */
+class Subscription extends Base {
+  constructor(client, data) {
+    super(client);
+
+    /**
+     * The id of the subscription
+     * @type {Snowflake}
+     */
+    this.id = data.id;
+
+    /**
+     * The id of the user who subscribed
+     * @type {Snowflake}
+     */
+    this.userId = data.user_id;
+
+    this._patch(data);
+  }
+
+  _patch(data) {
+    /**
+     * The SKU ids subscribed to
+     * @type {Snowflake[]}
+     */
+    this.skuIds = data.sku_ids;
+
+    /**
+     * The entitlement ids granted for this subscription
+     * @type {Snowflake[]}
+     */
+    this.entitlementIds = data.entitlement_ids;
+
+    /**
+     * The timestamp the current subscription period will start at
+     * @type {number}
+     */
+    this.currentPeriodStartTimestamp = Date.parse(data.current_period_start);
+
+    /**
+     * The timestamp the current subscription period will end at
+     * @type {number}
+     */
+    this.currentPeriodEndTimestamp = Date.parse(data.current_period_end);
+
+    /**
+     * The current status of the subscription
+     * @type {SubscriptionStatus}
+     */
+    this.status = data.status;
+
+    if ('canceled_at' in data) {
+      /**
+       * The timestamp of when the subscription was canceled
+       * @type {?number}
+       */
+      this.canceledTimestamp = data.canceled_at ? Date.parse(data.canceled_at) : null;
+    } else {
+      this.canceledTimestamp ??= null;
+    }
+
+    if ('country' in data) {
+      /**
+       * ISO 3166-1 alpha-2 country code of the payment source used to purchase the subscription.
+       * Missing unless queried with a private OAuth scope.
+       * @type {?string}
+       */
+      this.country = data.country;
+    } else {
+      this.country ??= null;
+    }
+  }
+
+  /**
+   * The time the subscription was canceled
+   * @type {?Date}
+   * @readonly
+   */
+  get canceledAt() {
+    return this.canceledTimestamp && new Date(this.canceledTimestamp);
+  }
+
+  /**
+   * The time the current subscription period will start at
+   * @type {Date}
+   * @readonly
+   */
+  get currentPeriodStartAt() {
+    return new Date(this.currentPeriodStartTimestamp);
+  }
+
+  /**
+   * The time the current subscription period will end at
+   * @type {Date}
+   * @readonly
+   */
+  get currentPeriodEndAt() {
+    return new Date(this.currentPeriodEndTimestamp);
+  }
+}
+
+exports.Subscription = Subscription;