From c1553fd47a8c4750020ee873b912360b0375c26d Mon Sep 17 00:00:00 2001 From: dalbodeule <11470513+dalbodeule@users.noreply.github.com> Date: Wed, 14 Aug 2024 16:56:25 +0900 Subject: [PATCH] add DiscordGuildCache - GET /discord endpoint, return guild information. - GET /discord/{uid} to return null(404) --- .../webserver/routes/ApiDiscordRoutes.kt | 29 ++----------------- 1 file changed, 3 insertions(+), 26 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 c3f11d3..3a82c5c 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 @@ -5,15 +5,9 @@ import io.ktor.server.application.* import io.ktor.server.response.* import io.ktor.server.routing.* import io.ktor.server.sessions.* -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlinx.serialization.Serializable import org.koin.java.KoinJavaComponent.inject import space.mori.chzzk_bot.common.events.CoroutinesEventBus -import space.mori.chzzk_bot.common.events.DiscordRegisterEvent import space.mori.chzzk_bot.common.services.UserService -import space.mori.chzzk_bot.common.utils.getRandomString import space.mori.chzzk_bot.webserver.UserSession import space.mori.chzzk_bot.webserver.utils.DiscordGuildCache @@ -35,23 +29,12 @@ fun Route.apiDiscordRoutes() { } if (user.discord == null) { - val randomString = getRandomString(8) - - CoroutineScope(Dispatchers.Default).launch { - dispatcher.post(DiscordRegisterEvent( - user.token!!, - randomString - )) - } - - call.respond(HttpStatusCode.NotFound, DiscordRequireRegisterDTO( - user.token!!, - randomString - )) + call.respond(HttpStatusCode.NotFound) return@get } call.respond(HttpStatusCode.OK) + return@get } get { val session = call.sessions.get() @@ -69,10 +52,4 @@ fun Route.apiDiscordRoutes() { return@get } } -} - -@Serializable -data class DiscordRequireRegisterDTO( - val user: String, - val token: String -) \ No newline at end of file +} \ No newline at end of file