Refactor getMemberRolesFromCluster method

Author: WinG4merBR

foxy/src/main/kotlin/net/cakeyfox/foxy/profile/ProfileRender.kt

@@ -12,7 +12,7 @@ import net.cakeyfox.foxy.profile.ProfileUtils.getOrFetchFromCache
 import net.cakeyfox.foxy.profile.badge.BadgeUtils
 import net.cakeyfox.foxy.profile.config.ProfileConfig
 import net.cakeyfox.foxy.database.data.*
-import net.cakeyfox.foxy.utils.ClusterUtils.getMemberRolesFromCluster
+import net.cakeyfox.foxy.utils.ClusterUtils.getMemberRolesFromGuildOrCluster
 import net.dv8tion.jda.api.entities.User
 import java.awt.Color
 import java.awt.Graphics2D
@@ -219,20 +219,13 @@ class ProfileRender(
         val defaultBadges = getOrFetchFromCache(
             ProfileCacheManager.badgesCache,
             "default"
-        ) {
-            context.database.profile.getBadges()
-        }
-
-        val roles = try {
-            context.foxy.shardManager.getGuildById(Constants.SUPPORT_SERVER_ID)
-                ?.retrieveMember(user)
-                ?.await()
-                ?.roles
-                ?.map { it.id }
-        } catch (_: Exception) {
-            null
-        } ?: context.foxy.getMemberRolesFromCluster(context.foxy, Constants.SUPPORT_SERVER_ID.toLong(), user.idLong) ?: emptyList()
+        ) { context.database.profile.getBadges() }
 
+        val roles = context.foxy.getMemberRolesFromGuildOrCluster(
+            context.foxy,
+            Constants.SUPPORT_SERVER_ID.toLong(),
+            user.idLong
+        )
 
         val userBadges = roles.let { BadgeUtils.getBadges(context, it, defaultBadges, data) }
 

foxy/src/main/kotlin/net/cakeyfox/foxy/profile/ProfileUtils.kt

@@ -1,7 +1,6 @@
 package net.cakeyfox.foxy.profile
 
 import com.github.benmanes.caffeine.cache.Cache
-import dev.minn.jda.ktx.coroutines.await
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import net.cakeyfox.common.Constants
@@ -10,7 +9,7 @@ import net.cakeyfox.foxy.database.data.FoxyUser
 import net.cakeyfox.foxy.database.data.Layout
 import net.cakeyfox.foxy.interactions.commands.CommandContext
 import net.cakeyfox.foxy.profile.badge.BadgeUtils
-import net.cakeyfox.foxy.utils.ClusterUtils.getMemberRolesFromCluster
+import net.cakeyfox.foxy.utils.ClusterUtils.getMemberRolesFromGuildOrCluster
 import net.dv8tion.jda.api.entities.User
 
 object ProfileUtils {
@@ -25,28 +24,21 @@ object ProfileUtils {
         }
     }
 
-     suspend fun getBadgeAssets(data: FoxyUser, user: User, context: CommandContext): List<Badge> {
+    suspend fun getBadgeAssets(data: FoxyUser, user: User, context: CommandContext): List<Badge> {
         val defaultBadges = getOrFetchFromCache(
             ProfileCacheManager.badgesCache,
             "default"
         ) {
             context.database.profile.getBadges()
         }
 
-        val roles = try {
-            context.foxy.shardManager.getGuildById(Constants.SUPPORT_SERVER_ID)
-                ?.retrieveMember(user)
-                ?.await()
-                ?.roles
-                ?.map { it.id } ?: run {
-                context.foxy.getMemberRolesFromCluster(context.foxy, Constants.SUPPORT_SERVER_ID.toLong(), user.idLong)
-            }
-        } catch (_: Exception) {
-            null
-        }
+        val roles = context.foxy.getMemberRolesFromGuildOrCluster(
+            context.foxy,
+            Constants.SUPPORT_SERVER_ID.toLong(),
+            user.idLong
+        )
 
-        val userBadges = roles?.let { BadgeUtils.getBadges(context, it, defaultBadges, data) }
-            ?: BadgeUtils.getFallbackBadges(defaultBadges, data)
+        val userBadges = roles.let { BadgeUtils.getBadges(context, it, defaultBadges, data) }
 
         if (userBadges.isEmpty()) {
             return emptyList()

foxy/src/main/kotlin/net/cakeyfox/foxy/utils/ClusterUtils.kt

@@ -115,10 +115,25 @@ object ClusterUtils {
         }
     }
 
-    suspend fun FoxyInstance.getMemberRolesFromCluster(foxy: FoxyInstance, guildId: Long, memberId: Long): List<String> {
+    suspend fun FoxyInstance.getMemberRolesFromGuildOrCluster(foxy: FoxyInstance, guildId: Long, memberId: Long): List<String> {
         val shardId = getShardIdFromGuildId(guildId, foxy.config.discord.totalShards)
         val cluster = getClusterByShardId(foxy, shardId)
         val rolesResponse = cachedRoles.getIfPresent(memberId)
+        val guildShardId = getShardIdFromGuildId(guildId, foxy.config.discord.totalShards)
+        val guildCluster = getClusterByShardId(foxy, guildShardId)
+
+        if (guildCluster.id == foxy.currentCluster.id) {
+            logger.debug { "Fetching member roles from current cluster for guild $guildId and member $memberId" }
+            val guild = foxy.shardManager.getGuildById(guildId)
+            if (guild != null) {
+                val member = guild.retrieveMemberById(memberId).await()
+                val roles = member.roles.map { it.id }
+                cachedRoles.put(memberId, roles)
+                return roles
+            } else {
+                return emptyList()
+            }
+        }
 
         if (rolesResponse != null) {
             // Return cached roles to avoid unnecessary API calls
@@ -189,14 +204,21 @@ object ClusterUtils {
         }
     }
 
-    suspend fun testGetMemberFromGuild(foxy: FoxyInstance, guildId: String?, memberId: Long): CustomMemberResponse? {
+    suspend fun testGetMemberRolesFromGuild(
+        foxy: FoxyInstance,
+        guildId: String?,
+        memberId: Long
+    ): List<String> {
+        println("Testing fetching member roles from guild $guildId and member $memberId")
         val cluster = foxy.currentCluster
-        val fetchedInfo = getFromAnotherCluster(foxy, cluster, "/api/v1/guilds/$guildId/$memberId")
-        println(fetchedInfo)
-        return if (fetchedInfo == null) {
-            null
+        val fetchedRoles = getFromAnotherCluster(foxy, cluster, "/api/v1/guilds/$guildId/users/$memberId/roles")
+
+        println(fetchedRoles)
+
+        return if (fetchedRoles == null) {
+            emptyList()
         } else {
-            json.decodeFromString(fetchedInfo)
+            json.decodeFromString(fetchedRoles)
         }
     }
 }