Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-16 19:43:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: replace internal calls to Emoji#url (#10025)

Browse Source
This commit is contained in:
Ryan Munro
2023-12-04 09:53:02 +11:00
committed by GitHub
parent 54453b04e5
commit 941642ad2f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/discord.js/src/managers/RoleManager.js
View File

@@ -139,7 +139,7 @@ class RoleManager extends CachedManager {
color &&= resolveColor(color); color &&= resolveColor(color);
if (permissions !== undefined) permissions = new PermissionsBitField(permissions); if (permissions !== undefined) permissions = new PermissionsBitField(permissions);
if (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); icon = guildEmojiURL ? await DataResolver.resolveImage(guildEmojiURL) : await DataResolver.resolveImage(icon);
if (typeof icon !== 'string') icon = undefined; if (typeof icon !== 'string') icon = undefined;
} }
@@ -191,7 +191,7 @@ class RoleManager extends CachedManager {
let icon = options.icon; let icon = options.icon;
if (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); icon = guildEmojiURL ? await DataResolver.resolveImage(guildEmojiURL) : await DataResolver.resolveImage(icon);
if (typeof icon !== 'string') icon = undefined; if (typeof icon !== 'string') icon = undefined;
} }

5
packages/discord.js/src/structures/Emoji.js
View File

@@ -102,12 +102,13 @@ class Emoji extends Base {
} }
toJSON() { toJSON() {
return super.toJSON({ const json = super.toJSON({
guild: 'guildId', guild: 'guildId',
createdTimestamp: true, createdTimestamp: true,
url: true,
identifier: true, identifier: true,
}); });
json.imageURL = this.imageURL();
return json;
} }
} }