dalbodeule/chibot-chzzk-bot
1
0
Fork 0
mirror of https://github.com/dalbodeule/chibot-chzzk-bot.git synced 2025-06-09 15:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40 from dalbodeule/develop

Browse Source 
some fix
This commit is contained in:
JinU Choi 2024-08-05 20:59:30 +09:00 committed by GitHub
commit 3e3a283a16
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/MessageHandler.kt
View File

@ -117,6 +117,7 @@ class MessageHandler(
val content = parts[2] val content = parts[2]
CommandService.updateCommand(user, command, content, "") CommandService.updateCommand(user, command, content, "")
listener.sendChat("명령어 '$command' 수정되었습니다.") listener.sendChat("명령어 '$command' 수정되었습니다.")
ChzzkHandler.reloadCommand(channel)
} }
private fun manageRemoveCommand(msg: ChatMessage, user: User) { private fun manageRemoveCommand(msg: ChatMessage, user: User) {
@ -133,6 +134,7 @@ class MessageHandler(
val command = parts[1] val command = parts[1]
CommandService.removeCommand(user, command) CommandService.removeCommand(user, command)
listener.sendChat("명령어 '$command' 삭제되었습니다.") listener.sendChat("명령어 '$command' 삭제되었습니다.")
ChzzkHandler.reloadCommand(channel)
} }
private fun timerCommand(msg: ChatMessage, user: User) { private fun timerCommand(msg: ChatMessage, user: User) {

19
webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiRoutes.kt
View File

@ -10,10 +10,21 @@ import space.mori.chzzk_bot.common.utils.getStreamInfo
@Serializable @Serializable
data class GetUserDTO( data class GetUserDTO(
val uid: String,
val nickname: String,
val isStreamOn: Boolean,
val avatarUrl: String
)
@Serializable
data class GetSessionDTO(
val uid: String, val uid: String,
val nickname: String, val nickname: String,
val isStreamOn: Boolean, val isStreamOn: Boolean,
val avatarUrl: String, val avatarUrl: String,
val maxQueueSize: Int,
val maxUserSize: Int,
val isStreamerOnly: Boolean,
) )
fun Routing.apiRoutes() { fun Routing.apiRoutes() {
@ -63,16 +74,20 @@ fun Routing.apiRoutes() {
return@get return@get
} }
val user = SongConfigService.getUserByToken(sid) val user = SongConfigService.getUserByToken(sid)
val session = SongConfigService.getConfig(sid)
if(user == null) { if(user == null) {
call.respondText("User not found", status = HttpStatusCode.NotFound) call.respondText("User not found", status = HttpStatusCode.NotFound)
return@get return@get
} else { } else {
val chzzkUser = getStreamInfo(user.token) val chzzkUser = getStreamInfo(user.token)
call.respond(HttpStatusCode.OK, GetUserDTO( call.respond(HttpStatusCode.OK, GetSessionDTO(
chzzkUser.content!!.channel.channelId, chzzkUser.content!!.channel.channelId,
chzzkUser.content!!.channel.channelName, chzzkUser.content!!.channel.channelName,
chzzkUser.content!!.status == "OPEN", chzzkUser.content!!.status == "OPEN",
chzzkUser.content!!.channel.channelImageUrl chzzkUser.content!!.channel.channelImageUrl,
session!!.queueLimit,
session.personalLimit,
session.streamerOnly
)) ))
} }
} }