From ff59284cb4e7bb237ac248c60584ef886e27df8d Mon Sep 17 00:00:00 2001 From: WinG4merBR <68250074+WinG4merBR@users.noreply.github.com> Date: Sun, 5 Jan 2025 17:29:18 -0300 Subject: [PATCH] Update ImageUtils --- .../net/cakeyfox/foxy/utils/image/ImageUtils.kt | 2 +- .../net/cakeyfox/foxy/utils/profile/ProfileRender.kt | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/utils/image/ImageUtils.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/utils/image/ImageUtils.kt index 34cab688..5c893292 100644 --- a/foxy/src/main/kotlin/net/cakeyfox/foxy/utils/image/ImageUtils.kt +++ b/foxy/src/main/kotlin/net/cakeyfox/foxy/utils/image/ImageUtils.kt @@ -33,7 +33,7 @@ object ImageUtils { } } - suspend fun loadImageFromURL(url: String): BufferedImage { + suspend fun loadProfileAssetFromURL(url: String): BufferedImage { return withContext(Dispatchers.IO) { try { ProfileCacheManager.imageCache.get(url) { diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/utils/profile/ProfileRender.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/utils/profile/ProfileRender.kt index 72dc9a94..8816ecf4 100644 --- a/foxy/src/main/kotlin/net/cakeyfox/foxy/utils/profile/ProfileRender.kt +++ b/foxy/src/main/kotlin/net/cakeyfox/foxy/utils/profile/ProfileRender.kt @@ -121,7 +121,7 @@ class ProfileRender( } val userAboutMe = - ProfileUtils.formatAboutMe(userData.userProfile.aboutme ?: context.locale["profile.defaultAbouMe"], layout) + ProfileUtils.formatAboutMe(userData.userProfile.aboutme ?: context.locale["profile.defaultAboutMe"], layout) graphics.drawTextWithFont(config.profileWidth, config.profileHeight) { text = userAboutMe @@ -137,12 +137,12 @@ class ProfileRender( val avatarDeferred = async { val avatarUrl = user.avatarUrl ?: user.defaultAvatarUrl val avatarWithSize = avatarUrl.plus("?size=1024") - ImageUtils.loadImageFromURL(avatarWithSize) + ImageUtils.loadProfileAssetFromURL(avatarWithSize) } val decorationDeferred = async { data.userProfile.decoration?.let { - ImageUtils.loadImageFromURL(Constants.PROFILE_DECORATION(it)) + ImageUtils.loadProfileAssetFromURL(Constants.PROFILE_DECORATION(it)) } } @@ -181,7 +181,7 @@ class ProfileRender( private suspend fun drawDecoration(data: FoxyUser, layoutInfo: Layout) { data.userProfile.decoration?.let { - val decorationImage = ImageUtils.loadImageFromURL(Constants.PROFILE_DECORATION(it)) + val decorationImage = ImageUtils.loadProfileAssetFromURL(Constants.PROFILE_DECORATION(it)) graphics.drawImage( decorationImage, (config.profileWidth / layoutInfo.profileSettings.positions.decorationPosition.x).toInt(), @@ -218,7 +218,7 @@ class ProfileRender( var y = layoutInfo.profileSettings.positions.badgesPosition.y for (badge in userBadges) { - val badgeImage = ImageUtils.loadImageFromURL(Constants.PROFILE_BADGES(badge.asset)) + val badgeImage = ImageUtils.loadProfileAssetFromURL(Constants.PROFILE_BADGES(badge.asset)) graphics.drawImage(badgeImage, x.toInt(), y.toInt(), 50, 50, null) x += 60 @@ -231,7 +231,7 @@ class ProfileRender( private suspend fun drawMarryInfo(userData: FoxyUser, layout: Layout) { val marriedDateFormatted = context.utils.convertToHumanReadableDate(userData.marryStatus.marriedDate!!) - val marriedOverlay = ImageUtils.loadImageFromURL(Constants.MARRIED_OVERLAY(layout.id)) + val marriedOverlay = ImageUtils.loadProfileAssetFromURL(Constants.MARRIED_OVERLAY(layout.id)) val color = if (layout.darkText) Color.BLACK else Color.WHITE val partnerUser = context.jda.retrieveUserById(userData.marryStatus.marriedWith!!).await()