From 941642ad2ff31017cfe0419fda55f1f2a1f12286 Mon Sep 17 00:00:00 2001 From: Ryan Munro Date: Mon, 4 Dec 2023 09:53:02 +1100 Subject: [PATCH] fix: replace internal calls to Emoji#url (#10025) --- packages/discord.js/src/managers/RoleManager.js | 4 ++-- packages/discord.js/src/structures/Emoji.js | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/discord.js/src/managers/RoleManager.js b/packages/discord.js/src/managers/RoleManager.js index 288bd8b35..63b76faa2 100644 --- a/packages/discord.js/src/managers/RoleManager.js +++ b/packages/discord.js/src/managers/RoleManager.js @@ -139,7 +139,7 @@ class RoleManager extends CachedManager { color &&= resolveColor(color); if (permissions !== undefined) permissions = new PermissionsBitField(permissions); if (icon) { - const guildEmojiURL = this.guild.emojis.resolve(icon)?.url; + const guildEmojiURL = this.guild.emojis.resolve(icon)?.imageURL(); icon = guildEmojiURL ? await DataResolver.resolveImage(guildEmojiURL) : await DataResolver.resolveImage(icon); if (typeof icon !== 'string') icon = undefined; } @@ -191,7 +191,7 @@ class RoleManager extends CachedManager { let icon = options.icon; if (icon) { - const guildEmojiURL = this.guild.emojis.resolve(icon)?.url; + const guildEmojiURL = this.guild.emojis.resolve(icon)?.imageURL(); icon = guildEmojiURL ? await DataResolver.resolveImage(guildEmojiURL) : await DataResolver.resolveImage(icon); if (typeof icon !== 'string') icon = undefined; } diff --git a/packages/discord.js/src/structures/Emoji.js b/packages/discord.js/src/structures/Emoji.js index 92232f9dc..1be75179b 100644 --- a/packages/discord.js/src/structures/Emoji.js +++ b/packages/discord.js/src/structures/Emoji.js @@ -102,12 +102,13 @@ class Emoji extends Base { } toJSON() { - return super.toJSON({ + const json = super.toJSON({ guild: 'guildId', createdTimestamp: true, - url: true, identifier: true, }); + json.imageURL = this.imageURL(); + return json; } }