From 3572a5c5db598e1057c2680c5f3d1df5ceb7ac30 Mon Sep 17 00:00:00 2001
From: dalbodeule <11470513+dalbodeule@users.noreply.github.com>
Date: Thu, 15 Aug 2024 06:33:52 +0900
Subject: [PATCH] apiDiscordRoutes fix. - add respond to /discord endpoints. -
 fix /guild/{gid} endpoints.

---
 .../webserver/routes/ApiDiscordRoutes.kt      | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiDiscordRoutes.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiDiscordRoutes.kt
index 594b093..0fbae73 100644
--- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiDiscordRoutes.kt
+++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiDiscordRoutes.kt
@@ -41,23 +41,9 @@ fun Route.apiDiscordRoutes() {
             return@get
         }
         get("/guild/{gid}") {
+            val gid = call.parameters["gid"]
             val session = call.sessions.get<UserSession>()
-            if(session == null) {
-                call.respond(HttpStatusCode.BadRequest, "Session is required")
-                return@get
-            }
-            val user = UserService.getUserWithNaverId(session.id)
-            if(user == null) {
-                call.respond(HttpStatusCode.BadRequest, "User does not exist")
-                return@get
-            }
-
-
-        }
-        get {
-            val uid = call.parameters["gid"]
-            val session = call.sessions.get<UserSession>()
-            if(uid == null) {
+            if(gid == null) {
                 call.respond(HttpStatusCode.BadRequest, "GID is required")
                 return@get
             }
@@ -71,7 +57,27 @@ fun Route.apiDiscordRoutes() {
                 return@get
             }
 
+            val guild = DiscordGuildCache.getCachedGuilds(gid)
+            if(guild == null) {
+                call.respond(HttpStatusCode.NotFound)
+                return@get
+            }
+            call.respond(HttpStatusCode.OK, guild)
+            return@get
+        }
+        get {
+            val session = call.sessions.get<UserSession>()
+            if(session == null) {
+                call.respond(HttpStatusCode.BadRequest, "Session is required")
+                return@get
+            }
+            val user = UserService.getUserWithNaverId(session.id)
+            if(user == null) {
+                call.respond(HttpStatusCode.BadRequest, "User does not exist")
+                return@get
+            }
 
+            call.respond(HttpStatusCode.OK, DiscordGuildCache.getCachedGuilds(session.discordGuildList))
             return@get
         }
     }