From 34376ab72041edb056d24651a2a790578b103e64 Mon Sep 17 00:00:00 2001
From: dalbodeule <11470513+dalbodeule@users.noreply.github.com>
Date: Thu, 15 Aug 2024 11:01:21 +0900
Subject: [PATCH] apiDiscordRoutes fix. (15x) - some logic changed.

---
 .../webserver/utils/DiscordGuildCache.kt      | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/DiscordGuildCache.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/DiscordGuildCache.kt
index 7c74278..e685a04 100644
--- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/DiscordGuildCache.kt
+++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/DiscordGuildCache.kt
@@ -30,20 +30,23 @@ object DiscordGuildCache {
                     fetchAllGuilds()
                     guild = cache[guildId]
                 }
-                try {
-                    if(guild == null) { return null }
-                    if (guild!!.guild.roles.isEmpty()) {
-                        guild!!.guild.roles.addAll(fetchGuildRoles(guildId))
-                    }
-                    if (guild!!.guild.channel.isEmpty()) {
-                        guild!!.guild.channel.addAll(fetchGuildChannels(guildId))
-                    }
-                } catch(e: Exception) {
-                    logger.info("guild fetch is failed. ${e.stackTraceToString()}")
-                    return null
-                }
             }
         }
+
+        try {
+            if(guild == null) return null
+            if (guild!!.guild.roles.isEmpty()) {
+                val roles = fetchGuildRoles(guildId)
+                guild!!.guild.roles.addAll(roles)
+            }
+            if (guild!!.guild.channel.isEmpty()) {
+                val channels = fetchGuildChannels(guildId)
+                guild!!.guild.channel.addAll(channels)
+            }
+        } catch(e: Exception) {
+            logger.info("guild fetch is failed. ${e.stackTraceToString()}")
+            return null
+        }
         return cache[guildId]?.guild
     }