From c5f8ce7528d0bf4d75752cac788cffeb1f9a8a16 Mon Sep 17 00:00:00 2001 From: dalbodeule <11470513+dalbodeule@users.noreply.github.com> Date: Mon, 5 Aug 2024 20:55:18 +0900 Subject: [PATCH] =?UTF-8?q?some=20fix=20-=20"!=EB=AA=85=EB=A0=B9=EC=96=B4?= =?UTF-8?q?=EC=B6=94=EA=B0=80",=20"!=EB=AA=85=EB=A0=B9=EC=96=B4=EC=88=98?= =?UTF-8?q?=EC=A0=95",=20"!=EB=AA=85=EB=A0=B9=EC=96=B4=EC=82=AD=EC=A0=9C"?= =?UTF-8?q?=20command=20fix.=20(is=20able=20reload)=20-=20on=20/session/{s?= =?UTF-8?q?id}=20endpoint,=20add=20streamer=20configs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chzzk_bot/chatbot/chzzk/MessageHandler.kt | 2 ++ .../chzzk_bot/webserver/routes/ApiRoutes.kt | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/MessageHandler.kt b/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/MessageHandler.kt index 14a3843..8b0a9d2 100644 --- a/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/MessageHandler.kt +++ b/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/MessageHandler.kt @@ -117,6 +117,7 @@ class MessageHandler( val content = parts[2] CommandService.updateCommand(user, command, content, "") listener.sendChat("명령어 '$command' 수정되었습니다.") + ChzzkHandler.reloadCommand(channel) } private fun manageRemoveCommand(msg: ChatMessage, user: User) { @@ -133,6 +134,7 @@ class MessageHandler( val command = parts[1] CommandService.removeCommand(user, command) listener.sendChat("명령어 '$command' 삭제되었습니다.") + ChzzkHandler.reloadCommand(channel) } private fun timerCommand(msg: ChatMessage, user: User) { diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiRoutes.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiRoutes.kt index 466ae65..fd0c8cf 100644 --- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiRoutes.kt +++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiRoutes.kt @@ -10,10 +10,21 @@ import space.mori.chzzk_bot.common.utils.getStreamInfo @Serializable data class GetUserDTO( + val uid: String, + val nickname: String, + val isStreamOn: Boolean, + val avatarUrl: String +) + +@Serializable +data class GetSessionDTO( val uid: String, val nickname: String, val isStreamOn: Boolean, val avatarUrl: String, + val maxQueueSize: Int, + val maxUserSize: Int, + val isStreamerOnly: Boolean, ) fun Routing.apiRoutes() { @@ -63,16 +74,20 @@ fun Routing.apiRoutes() { return@get } val user = SongConfigService.getUserByToken(sid) + val session = SongConfigService.getConfig(sid) if(user == null) { call.respondText("User not found", status = HttpStatusCode.NotFound) return@get } else { val chzzkUser = getStreamInfo(user.token) - call.respond(HttpStatusCode.OK, GetUserDTO( + call.respond(HttpStatusCode.OK, GetSessionDTO( chzzkUser.content!!.channel.channelId, chzzkUser.content!!.channel.channelName, chzzkUser.content!!.status == "OPEN", - chzzkUser.content!!.channel.channelImageUrl + chzzkUser.content!!.channel.channelImageUrl, + session!!.queueLimit, + session.personalLimit, + session.streamerOnly )) } }