diff --git a/src/helpers/guilds/guildIconUrl.ts b/src/helpers/guilds/guildIconUrl.ts index ca7a29c76..fcd4d89c5 100644 --- a/src/helpers/guilds/guildIconUrl.ts +++ b/src/helpers/guilds/guildIconUrl.ts @@ -6,20 +6,20 @@ import type { Bot } from "../../bot.ts"; export function guildIconURL( bot: Bot, id: bigint, - options: { - icon?: string | bigint; + icon: bigint | undefined, + options?: { size?: ImageSize; format?: ImageFormat; } ) { - return options.icon + return icon ? bot.utils.formatImageURL( bot.constants.endpoints.GUILD_ICON( id, - typeof options.icon === "string" ? options.icon : bot.utils.iconBigintToHash(options.icon) + typeof icon === "string" ? icon : bot.utils.iconBigintToHash(icon) ), - options.size || 128, - options.format + options?.size || 128, + options?.format ) : undefined; } diff --git a/src/helpers/guilds/guildSplashUrl.ts b/src/helpers/guilds/guildSplashUrl.ts index d9f28209b..defaa4930 100644 --- a/src/helpers/guilds/guildSplashUrl.ts +++ b/src/helpers/guilds/guildSplashUrl.ts @@ -6,20 +6,20 @@ import type { Bot } from "../../bot.ts"; export function guildSplashURL( bot: Bot, id: bigint, - options: { - splash?: string | bigint; + splash: bigint | undefined, + options?: { size?: ImageSize; format?: ImageFormat; } ) { - return options.splash + return splash ? bot.utils.formatImageURL( bot.constants.endpoints.GUILD_SPLASH( id, - typeof options.splash === "string" ? options.splash : bot.utils.iconBigintToHash(options.splash) + typeof splash === "string" ? splash : bot.utils.iconBigintToHash(splash) ), - options.size || 128, - options.format + options?.size || 128, + options?.format ) : undefined; } diff --git a/src/helpers/members/avatarUrl.ts b/src/helpers/members/avatarUrl.ts index 0114d497a..4bbd15d87 100644 --- a/src/helpers/members/avatarUrl.ts +++ b/src/helpers/members/avatarUrl.ts @@ -7,20 +7,20 @@ export function avatarURL( bot: Bot, userId: bigint, discriminator: number, - options: { - avatar?: string | bigint; + options?: { + avatar: bigint | undefined; size?: ImageSize; format?: ImageFormat; } ) { - return options.avatar + return options?.avatar ? bot.utils.formatImageURL( bot.constants.endpoints.USER_AVATAR( userId, - typeof options.avatar === "string" ? options.avatar : bot.utils.iconBigintToHash(options.avatar) + typeof options?.avatar === "string" ? options.avatar : bot.utils.iconBigintToHash(options?.avatar) ), - options.size || 128, - options.format + options?.size || 128, + options?.format ) : bot.constants.endpoints.USER_DEFAULT_AVATAR(Number(discriminator) % 5); }