diff --git a/structures/User.ts b/structures/User.ts index 5f5091b..da8c5ee 100644 --- a/structures/User.ts +++ b/structures/User.ts @@ -4,7 +4,7 @@ import type { Session } from "../session/Session.ts"; import type { DiscordUser } from "../vendor/external.ts"; import type { ImageFormat, ImageSize } from "../util/shared/images.ts"; import { iconBigintToHash, iconHashToBigInt } from "../util/hash.ts"; -import { formatImageUrl } from "../util/shared/images.ts"; +import { formatImageURL } from "../util/shared/images.ts"; import * as Routes from "../util/Routes.ts"; /** @@ -51,7 +51,7 @@ export class User implements Model { url = Routes.USER_AVATAR(this.id, iconBigintToHash(this.avatarHash)); } - return formatImageUrl(url, options.size, options.format); + return formatImageURL(url, options.size, options.format); } toString() { diff --git a/structures/guilds/AnonymousGuild.ts b/structures/guilds/AnonymousGuild.ts index c53308e..995078b 100644 --- a/structures/guilds/AnonymousGuild.ts +++ b/structures/guilds/AnonymousGuild.ts @@ -3,7 +3,7 @@ import type { Session } from "../../session/Session.ts"; import type { DiscordGuild, GuildNsfwLevel, VerificationLevels } from "../../vendor/external.ts"; import type { ImageFormat, ImageSize } from "../../util/shared/images.ts"; import { iconBigintToHash, iconHashToBigInt } from "../../util/hash.ts"; -import { formatImageUrl } from "../../util/shared/images.ts"; +import { formatImageURL } from "../../util/shared/images.ts"; import BaseGuild from "./BaseGuild.ts"; import * as Routes from "../../util/Routes.ts"; @@ -31,9 +31,9 @@ export class AnonymousGuild extends BaseGuild implements Model { description?: string; premiumSubscriptionCount?: number; - splashUrl(options: { size?: ImageSize; format?: ImageFormat } = { size: 128 }) { + splashURL(options: { size?: ImageSize; format?: ImageFormat } = { size: 128 }) { if (this.splashHash) { - return formatImageUrl( + return formatImageURL( Routes.GUILD_SPLASH(this.id, iconBigintToHash(this.splashHash)), options.size, options.format, @@ -41,9 +41,9 @@ export class AnonymousGuild extends BaseGuild implements Model { } } - bannerUrl(options: { size?: ImageSize; format?: ImageFormat } = { size: 128 }) { + bannerURL(options: { size?: ImageSize; format?: ImageFormat } = { size: 128 }) { if (this.bannerHash) { - return formatImageUrl( + return formatImageURL( Routes.GUILD_BANNER(this.id, iconBigintToHash(this.bannerHash)), options.size, options.format, diff --git a/structures/guilds/BaseGuild.ts b/structures/guilds/BaseGuild.ts index c396516..24fd67c 100644 --- a/structures/guilds/BaseGuild.ts +++ b/structures/guilds/BaseGuild.ts @@ -2,7 +2,7 @@ import type { Model } from "../Base.ts"; import type { Session } from "../../session/Session.ts"; import type { DiscordGuild } from "../../vendor/external.ts"; import type { ImageFormat, ImageSize } from "../../util/shared/images.ts"; -import { formatImageUrl } from "../../util/shared/images.ts"; +import { formatImageURL } from "../../util/shared/images.ts"; import { iconBigintToHash, iconHashToBigInt } from "../../util/hash.ts"; import { GuildFeatures } from "../../vendor/external.ts"; import { Snowflake } from "../../util/Snowflake.ts"; @@ -45,9 +45,9 @@ export abstract class BaseGuild implements Model { return this.features.includes(GuildFeatures.Verified); } - iconUrl(options: { size?: ImageSize; format?: ImageFormat } = { size: 128 }) { + iconURL(options: { size?: ImageSize; format?: ImageFormat } = { size: 128 }) { if (this.iconHash) { - return formatImageUrl( + return formatImageURL( Routes.GUILD_BANNER(this.id, iconBigintToHash(this.iconHash)), options.size, options.format, diff --git a/util/shared/images.ts b/util/shared/images.ts index 06ba7aa..f5a0524 100644 --- a/util/shared/images.ts +++ b/util/shared/images.ts @@ -9,6 +9,6 @@ export type ImageFormat = "jpg" | "jpeg" | "png" | "webp" | "gif" | "json"; export type ImageSize = 16 | 32 | 64 | 128 | 256 | 512 | 1024 | 2048 | 4096; /** Help format an image url */ -export function formatImageUrl(url: string, size: ImageSize = 128, format?: ImageFormat) { +export function formatImageURL(url: string, size: ImageSize = 128, format?: ImageFormat) { return `${url}.${format || (url.includes("/a_") ? "gif" : "jpg")}?size=${size}`; }