dalbodeule/chibot-chzzk-bot
1
0
Fork 0
mirror of https://github.com/dalbodeule/chibot-chzzk-bot.git synced 2025-08-07 21:01:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

managers relation is fixed (4x)

Browse Source
This commit is contained in:
dalbodeule
2024-08-28 17:24:02 +09:00
parent 5d9b6a7e5e
commit 3e0f63a3d1
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiCommandRoutes.kt
View File

@@ -54,7 +54,7 @@ fun Routing.apiCommandRoutes() {
return@put return@put
} }
if(!user.managers.any { it.naverId == session?.id } && user.naverId != session?.id) { if(!user.managers?.any { it.naverId == session?.id }!! ?: true && user.naverId != session?.id) {
call.respond(HttpStatusCode.BadRequest, "User does not exist") call.respond(HttpStatusCode.BadRequest, "User does not exist")
return@put return@put
} }
@@ -84,7 +84,7 @@ fun Routing.apiCommandRoutes() {
return@post return@post
} }
if(!user.managers.any { it.naverId == session?.id } && user.naverId != session?.id) { if(!user.managers?.any { it.naverId == session?.id }!! ?: true && user.naverId != session?.id) {
call.respond(HttpStatusCode.BadRequest, "User does not exist") call.respond(HttpStatusCode.BadRequest, "User does not exist")
return@post return@post
} }
@@ -119,7 +119,7 @@ fun Routing.apiCommandRoutes() {
return@delete return@delete
} }
if(!user.managers.any { it.naverId == session?.id } && user.naverId != session?.id) { if(!user.managers?.any { it.naverId == session?.id }!! ?: true && user.naverId != session?.id) {
call.respond(HttpStatusCode.BadRequest, "User does not exist") call.respond(HttpStatusCode.BadRequest, "User does not exist")
return@delete return@delete
} }

4
webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiDiscordRoutes.kt
View File

@@ -29,7 +29,7 @@ fun Route.apiDiscordRoutes() {
call.respond(HttpStatusCode.BadRequest, "User does not exist") call.respond(HttpStatusCode.BadRequest, "User does not exist")
return@get return@get
} }
if(!user.managers.any { it.naverId == session?.id } && user.naverId != session?.id) { if(!user.managers?.any { it.naverId == session?.id }!! ?: true && user.naverId != session?.id) {
call.respond(HttpStatusCode.BadRequest, "User does not exist") call.respond(HttpStatusCode.BadRequest, "User does not exist")
return@get return@get
} }
@@ -58,7 +58,7 @@ fun Route.apiDiscordRoutes() {
call.respond(HttpStatusCode.BadRequest, "User does not exist") call.respond(HttpStatusCode.BadRequest, "User does not exist")
return@post return@post
} }
if(!user.managers.any { it.naverId == session?.id } && user.naverId != session?.id) { if(!user.managers?.any { it.naverId == session?.id }!! ?: true && user.naverId != session?.id) {
call.respond(HttpStatusCode.BadRequest, "User does not exist") call.respond(HttpStatusCode.BadRequest, "User does not exist")
return@post return@post
} }

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

@@ -116,8 +116,8 @@ fun Routing.apiRoutes() {
songConfig.streamerOnly, songConfig.streamerOnly,
songConfig.disabled songConfig.disabled
)) ))
val subordinates = user.subordinates ?: emptyList()
returnUsers.addAll(user.subordinates.map { returnUsers.addAll(subordinates.map {
val subStatus = user.token?.let { it1 -> getStreamInfo(it1) } val subStatus = user.token?.let { it1 -> getStreamInfo(it1) }
return@map if (it.token == null || subStatus?.content == null) { return@map if (it.token == null || subStatus?.content == null) {
null null

4
webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiTimerRoutes.kt
View File

@@ -27,7 +27,7 @@ fun Routing.apiTimerRoutes() {
return@get return@get
} }
if(!user.managers.any { it.naverId == session?.id } && user.naverId != session?.id) { if(!user.managers?.any { it.naverId == session?.id }!! ?: true && user.naverId != session?.id) {
call.respond(HttpStatusCode.BadRequest, "User does not exist") call.respond(HttpStatusCode.BadRequest, "User does not exist")
return@get return@get
} }
@@ -51,7 +51,7 @@ fun Routing.apiTimerRoutes() {
return@put return@put
} }
if(!user.managers.any { it.naverId == session?.id } && user.naverId != session?.id) { if(!user.managers?.any { it.naverId == session?.id }!! ?: true && user.naverId != session?.id) {
call.respond(HttpStatusCode.BadRequest, "User does not exist") call.respond(HttpStatusCode.BadRequest, "User does not exist")
return@put return@put
} }