Merge pull request #103 from dalbodeule/develop

asdf3
This commit is contained in:
JinU Choi 2024-08-15 19:54:22 +09:00 committed by GitHub
commit 97b29ad76b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -70,17 +70,26 @@ fun Routing.wsSongListRoutes() {
for (frame in incoming) { for (frame in incoming) {
when(frame) { when(frame) {
is Frame.Text -> { is Frame.Text -> {
if(frame.readText() == "ping") { if (frame.readText() == "ping") {
send("pong") send("pong")
} } else {
val data = frame.readText().let { Json.decodeFromString<SongRequest>(it) } val data = frame.readText().let { Json.decodeFromString<SongRequest>(it) }
if(data.maxQueue != null && data.maxQueue > 0) SongConfigService.updateQueueLimit(user, data.maxQueue) if (data.maxQueue != null && data.maxQueue > 0) SongConfigService.updateQueueLimit(
if(data.maxUserLimit != null && data.maxUserLimit > 0) SongConfigService.updatePersonalLimit(user, data.maxUserLimit) user,
if(data.isStreamerOnly != null) SongConfigService.updateStreamerOnly(user, data.isStreamerOnly) data.maxQueue
if(data.isDisabled != null) SongConfigService.updateDisabled(user, data.isDisabled) )
if (data.maxUserLimit != null && data.maxUserLimit > 0) SongConfigService.updatePersonalLimit(
user,
data.maxUserLimit
)
if (data.isStreamerOnly != null) SongConfigService.updateStreamerOnly(
user,
data.isStreamerOnly
)
if (data.isDisabled != null) SongConfigService.updateDisabled(user, data.isDisabled)
if(data.type == SongType.ADD.value && data.url != null) { if (data.type == SongType.ADD.value && data.url != null) {
try { try {
val youtubeVideo = getYoutubeVideo(data.url) val youtubeVideo = getYoutubeVideo(data.url)
if (youtubeVideo != null) { if (youtubeVideo != null) {
@ -108,12 +117,12 @@ fun Routing.wsSongListRoutes() {
) )
} }
} }
} catch(e: Exception) { } catch (e: Exception) {
logger.debug("SongType.ADD Error: $uid $e") logger.debug("SongType.ADD Error: $uid $e")
} }
} } else if (data.type == SongType.REMOVE.value && data.url != null) {
else if(data.type == SongType.REMOVE.value && data.url != null) { dispatcher.post(
dispatcher.post(SongEvent( SongEvent(
user.token!!, user.token!!,
SongType.REMOVE, SongType.REMOVE,
null, null,
@ -122,15 +131,17 @@ fun Routing.wsSongListRoutes() {
null, null,
0, 0,
data.url data.url
)) )
} else if(data.type == SongType.NEXT.value) { )
} else if (data.type == SongType.NEXT.value) {
val songList = SongListService.getSong(user) val songList = SongListService.getSong(user)
if(songList.isNotEmpty()) { if (songList.isNotEmpty()) {
val song = songList[0] val song = songList[0]
SongListService.deleteSong(user, song.uid, song.name) SongListService.deleteSong(user, song.uid, song.name)
} }
dispatcher.post(SongEvent( dispatcher.post(
SongEvent(
user.token!!, user.token!!,
SongType.NEXT, SongType.NEXT,
null, null,
@ -139,7 +150,9 @@ fun Routing.wsSongListRoutes() {
null, null,
null, null,
null null
)) )
)
}
} }
} }
is Frame.Ping -> send(Frame.Pong(frame.data)) is Frame.Ping -> send(Frame.Pong(frame.data))