discord.js 15.0.0-dev.1748174699-c1f5bb2fb → 15.0.0-dev.1748347538-2c35084ec

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "discord.js",
-  "version": "15.0.0-dev.1748174699-c1f5bb2fb",
+  "version": "15.0.0-dev.1748347538-2c35084ec",
   "description": "A powerful library for interacting with the Discord API",
   "main": "./src/index.js",
   "types": "./typings/index.d.ts",
@@ -61,12 +61,12 @@
     "magic-bytes.js": "^1.10.0",
     "tslib": "^2.8.1",
     "undici": "7.8.0",
-    "@discordjs/formatters": "^0.6.1",
-    "@discordjs/builders": "^1.11.1",
     "@discordjs/collection": "^2.1.1",
-    "@discordjs/rest": "^2.5.0",
+    "@discordjs/builders": "^1.11.1",
+    "@discordjs/formatters": "^0.6.1",
     "@discordjs/ws": "^2.0.2",
-    "@discordjs/util": "^1.1.1"
+    "@discordjs/util": "^1.1.1",
+    "@discordjs/rest": "^2.5.0"
   },
   "devDependencies": {
     "@favware/cliff-jumper": "^4.1.0",

package/src/client/Client.js

@@ -779,6 +779,11 @@ exports.Client = Client;
  * @see {@link https://discord.js.org/docs/packages/rest/stable/ImageURLOptions:Interface}
  */
 
+/**
+ * @external EmojiURLOptions
+ * @see {@link https://discord.js.org/docs/packages/rest/stable/EmojiURLOptions:TypeAlias}
+ */
+
 /**
  * @external BaseImageURLOptions
  * @see {@link https://discord.js.org/docs/packages/rest/stable/BaseImageURLOptions:Interface}

package/src/index.js

@@ -45,7 +45,17 @@ exports.ThreadMemberFlagsBitField = require('./util/ThreadMemberFlagsBitField.js
 exports.UserFlagsBitField = require('./util/UserFlagsBitField.js').UserFlagsBitField;
 
 __exportStar(require('./util/DataResolver.js'), exports);
-__exportStar(require('./util/Util.js'), exports);
+
+exports.cleanCodeBlockContent = require('./util/Util.js').cleanCodeBlockContent;
+exports.cleanContent = require('./util/Util.js').cleanContent;
+exports.discordSort = require('./util/Util.js').discordSort;
+exports.fetchRecommendedShardCount = require('./util/Util.js').fetchRecommendedShardCount;
+exports.flatten = require('./util/Util.js').flatten;
+exports.parseEmoji = require('./util/Util.js').parseEmoji;
+exports.parseWebhookURL = require('./util/Util.js').parseWebhookURL;
+exports.resolveColor = require('./util/Util.js').resolveColor;
+exports.resolveSKUId = require('./util/Util.js').resolveSKUId;
+exports.verifyString = require('./util/Util.js').verifyString;
 
 exports.version = require('../package.json').version;
 

package/src/structures/BaseGuildEmoji.js

@@ -58,7 +58,7 @@ class BaseGuildEmoji extends Emoji {
  * @method imageURL
  * @memberof BaseGuildEmoji
  * @instance
- * @param {ImageURLOptions} [options={}] Options for the image URL
+ * @param {EmojiURLOptions} [options={}] Options for the emoji URL
  * @returns {string}
  */
 

package/src/structures/Emoji.js

@@ -42,11 +42,20 @@ class Emoji extends Base {
 
   /**
    * Returns a URL for the emoji or `null` if this is not a custom emoji.
-   * @param {ImageURLOptions} [options={}] Options for the image URL
+   * @param {EmojiURLOptions} [options={}] Options for the emoji URL
    * @returns {?string}
    */
   imageURL(options = {}) {
-    return this.id && this.client.rest.cdn.emoji(this.id, this.animated, options);
+    if (!this.id) return null;
+
+    // Return a dynamic extension depending on whether the emoji is animated.
+    const resolvedOptions = { extension: options.extension, size: options.size };
+
+    if (!options.extension || options.extension === 'webp') {
+      resolvedOptions.animated = options.animated ?? (this.animated || undefined);
+    }
+
+    return this.client.rest.cdn.emoji(this.id, resolvedOptions);
   }
 
   /**

package/src/util/Util.js

@@ -521,25 +521,28 @@ function resolveSKUId(resolvable) {
   return null;
 }
 
-exports.flatten = flatten;
+// Public
+exports.cleanCodeBlockContent = cleanCodeBlockContent;
+exports.cleanContent = cleanContent;
+exports.discordSort = discordSort;
 exports.fetchRecommendedShardCount = fetchRecommendedShardCount;
+exports.flatten = flatten;
 exports.parseEmoji = parseEmoji;
+exports.parseWebhookURL = parseWebhookURL;
+exports.resolveColor = resolveColor;
+exports.resolveSKUId = resolveSKUId;
+exports.verifyString = verifyString;
+
+// Private
 exports.resolvePartialEmoji = resolvePartialEmoji;
 exports.resolveGuildEmoji = resolveGuildEmoji;
 exports.makeError = makeError;
 exports.makePlainError = makePlainError;
 exports.getSortableGroupTypes = getSortableGroupTypes;
 exports.moveElementInArray = moveElementInArray;
-exports.verifyString = verifyString;
-exports.resolveColor = resolveColor;
-exports.discordSort = discordSort;
 exports.setPosition = setPosition;
 exports.basename = basename;
-exports.cleanContent = cleanContent;
-exports.cleanCodeBlockContent = cleanCodeBlockContent;
-exports.parseWebhookURL = parseWebhookURL;
 exports.transformResolved = transformResolved;
-exports.resolveSKUId = resolveSKUId;
 
 // Fixes Circular
 const { Attachment } = require('../structures/Attachment.js');