From b87cf8cbfba333316b954dd80f15f8f519d1b0d9 Mon Sep 17 00:00:00 2001 From: dalbodeule <11470513+dalbodeule@users.noreply.github.com> Date: Sat, 24 Aug 2024 15:08:05 +0900 Subject: [PATCH 1/2] some fix on wsSongListRoutes - song remove from list(database) logic add --- .../space/mori/chzzk_bot/common/events/SongEvents.kt | 1 - .../chzzk_bot/webserver/routes/WSSongListRoutes.kt | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/src/main/kotlin/space/mori/chzzk_bot/common/events/SongEvents.kt b/common/src/main/kotlin/space/mori/chzzk_bot/common/events/SongEvents.kt index 5e1f81c..cbe27f9 100644 --- a/common/src/main/kotlin/space/mori/chzzk_bot/common/events/SongEvents.kt +++ b/common/src/main/kotlin/space/mori/chzzk_bot/common/events/SongEvents.kt @@ -14,7 +14,6 @@ class SongEvent( val uid: String, val type: SongType, val reqUid: String?, - val reqName: String?, val current: YoutubeVideo? = null, val next: YoutubeVideo? = null, val delUrl: String? = null, diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt index 2e07ac1..187e148 100644 --- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt +++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt @@ -140,8 +140,7 @@ fun Routing.wsSongListRoutes() { user.token!!, SongType.ADD, user.token, - user.username, - null, + CurrentSong.getSong(user), youtubeVideo ) ) @@ -151,6 +150,13 @@ fun Routing.wsSongListRoutes() { logger.debug("SongType.ADD Error: $uid $e") } } else if (data.type == SongType.REMOVE.value && data.url != null) { + val songs = SongListService.getSong(user) + + val exactSong = songs.firstOrNull { it.url == data.url } + if (exactSong != null) { + SongListService.deleteSong(user, exactSong.uid, exactSong.name) + } + dispatcher.post( SongEvent( user.token!!, @@ -158,7 +164,6 @@ fun Routing.wsSongListRoutes() { null, null, null, - null, data.url ) ) @@ -185,7 +190,6 @@ fun Routing.wsSongListRoutes() { user.token!!, SongType.NEXT, song?.uid, - song?.reqName, youtubeVideo ) ) From 1186f647d20e37cb42646c9e68e986155cf0113a Mon Sep 17 00:00:00 2001 From: dalbodeule <11470513+dalbodeule@users.noreply.github.com> Date: Sat, 24 Aug 2024 15:10:44 +0900 Subject: [PATCH 2/2] some fix on songList logics --- .../kotlin/space/mori/chzzk_bot/chatbot/chzzk/ChzzkHandler.kt | 1 - .../kotlin/space/mori/chzzk_bot/chatbot/chzzk/MessageHandler.kt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/ChzzkHandler.kt b/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/ChzzkHandler.kt index 38d0f92..4c76852 100644 --- a/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/ChzzkHandler.kt +++ b/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/ChzzkHandler.kt @@ -294,7 +294,6 @@ class UserHandler( null, null, null, - null, ) ) 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 4525585..8b1bd5b 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 @@ -270,7 +270,7 @@ class MessageHandler( user.token!!, SongType.ADD, msg.userId, - msg.profile?.nickname ?: "", + null, video, ) )