From 4f589780b8884e75fd1ffcfb051aaad24d70ee6e Mon Sep 17 00:00:00 2001
From: dalbodeule <11470513+dalbodeule@users.noreply.github.com>
Date: Mon, 5 Aug 2024 18:06:46 +0900
Subject: [PATCH] some fix WSSongListRoutes.kt - add url parameters

---
 .../mori/chzzk_bot/chatbot/chzzk/ChzzkHandler.kt   |  1 +
 .../mori/chzzk_bot/chatbot/chzzk/MessageHandler.kt |  1 +
 .../mori/chzzk_bot/common/events/SongEvents.kt     |  1 +
 .../chzzk_bot/webserver/routes/WSSongListRoutes.kt | 14 +++++++++++---
 .../chzzk_bot/webserver/routes/WSSongRoutes.kt     |  8 ++++++--
 5 files changed, 20 insertions(+), 5 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 8607685..3e478eb 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
@@ -198,6 +198,7 @@ class UserHandler(
                         null,
                         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 9b6a13d..7d10dc3 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
@@ -241,6 +241,7 @@ class MessageHandler(
                 video.name,
                 video.author,
                 video.length,
+                video.url
             ))
         }
 
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 f7eac26..e2961e5 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
@@ -16,6 +16,7 @@ class SongEvent(
     val name: String?,
     val author: String?,
     val time: Int?,
+    val url: String?
 ): Event {
     var TAG = javaClass.simpleName
 }
\ No newline at end of file
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 bb4d2f8..82be840 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
@@ -60,9 +60,11 @@ fun Routing.wsSongListRoutes() {
                     null,
                     null,
                     null,
+                    null,
                     null
                 ))
             }
+            removeSession(sid, this)
         }
 
         try {
@@ -87,7 +89,8 @@ fun Routing.wsSongListRoutes() {
                                         user.username,
                                         youtubeVideo.name,
                                         youtubeVideo.author,
-                                        youtubeVideo.length
+                                        youtubeVideo.length,
+                                        youtubeVideo.url
                                     ))
                                 }
                             }
@@ -106,7 +109,8 @@ fun Routing.wsSongListRoutes() {
                                         user.username,
                                         song.name,
                                         song.author,
-                                        0
+                                        0,
+                                        song.url
                                     )
                                 )
                             }
@@ -121,6 +125,7 @@ fun Routing.wsSongListRoutes() {
                                 null,
                                 null,
                                 null,
+                                null
                             ))
                         }
                     }
@@ -151,7 +156,8 @@ fun Routing.wsSongListRoutes() {
                             it.reqUid,
                             it.name,
                             it.author,
-                            it.time
+                            it.time,
+                            it.url
                         )
                     )
                 }
@@ -174,8 +180,10 @@ fun Routing.wsSongListRoutes() {
                                 null,
                                 null,
                                 null,
+                                null
                             )
                         )
+                        removeSession(session.token ?: "", ws)
                     }
                 }
             }
diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongRoutes.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongRoutes.kt
index 7b60655..dba994f 100644
--- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongRoutes.kt
+++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongRoutes.kt
@@ -53,6 +53,7 @@ fun Routing.wsSongRoutes() {
                     null,
                     null,
                     null,
+                    null,
                     null
                 ))
             }
@@ -89,7 +90,8 @@ fun Routing.wsSongRoutes() {
                     it.reqUid,
                     it.name,
                     it.author,
-                    it.time
+                    it.time,
+                    it.url
                 ))
             }
         }
@@ -105,6 +107,7 @@ fun Routing.wsSongRoutes() {
                         null,
                         null,
                         null,
+                        null
                     ))
                 }
             }
@@ -119,5 +122,6 @@ data class SongResponse(
     val reqUid: String?,
     val name: String?,
     val author: String?,
-    val time: Int?
+    val time: Int?,
+    val url: String?
 )