From 778fe8df341405ddbba40fb1f2d47a2584b74397 Mon Sep 17 00:00:00 2001
From: dalbodeule <11470513+dalbodeule@users.noreply.github.com>
Date: Mon, 5 Aug 2024 20:45:34 +0900
Subject: [PATCH] =?UTF-8?q?some=20fix=20-=20!=EB=85=B8=EB=9E=98=EC=8B=9C?=
 =?UTF-8?q?=EC=9E=91=20command=20URL=20typo.=20-=20SongEvent(SongType.REMO?=
 =?UTF-8?q?VE)=20debug=20in=20WSSongListRoutes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chzzk_bot/chatbot/chzzk/MessageHandler.kt |  2 +-
 .../webserver/routes/WSSongListRoutes.kt      | 31 +++++++------------
 2 files changed, 13 insertions(+), 20 deletions(-)

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 7d10dc3..14a3843 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
@@ -265,7 +265,7 @@ class MessageHandler(
 
         bot.retrieveUserById(user.discord).queue { discordUser ->
             discordUser?.openPrivateChannel()?.queue { channel ->
-                channel.sendMessage("여기로 접속해주세요! ||https://nabot,mori.space/songlist/${session}||.\n주소가 노출될 경우 방송을 다시 켜셔야 합니다!")
+                channel.sendMessage("여기로 접속해주세요! ||https://nabot.mori.space/songlist/${session}||.\n주소가 노출될 경우 방송을 다시 켜셔야 합니다!")
                     .queue()
             }
         }
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 82be840..aff8e14 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
@@ -12,6 +12,7 @@ import kotlinx.serialization.json.Json
 import org.koin.java.KoinJavaComponent.inject
 import org.slf4j.LoggerFactory
 import space.mori.chzzk_bot.common.events.*
+import space.mori.chzzk_bot.common.models.Counters.withDefinition
 import space.mori.chzzk_bot.common.services.SongConfigService
 import space.mori.chzzk_bot.common.services.SongListService
 import space.mori.chzzk_bot.common.services.UserService
@@ -95,25 +96,17 @@ fun Routing.wsSongListRoutes() {
                                 }
                             }
                         }
-                        else if(data.type == SongType.REMOVE.value && data.remove != null && data.remove > 0) {
-                            val songs = SongListService.getSong(user)
-                            if(songs.size < data.remove) {
-                                val song = songs[data.remove]
-                                SongListService.deleteSong(user, song.uid, song.name)
-
-                                dispatcher.post(
-                                    SongEvent(
-                                        user.token,
-                                        SongType.REMOVE,
-                                        user.token,
-                                        user.username,
-                                        song.name,
-                                        song.author,
-                                        0,
-                                        song.url
-                                    )
-                                )
-                            }
+                        else if(data.type == SongType.REMOVE.value && data.url != null) {
+                            dispatcher.post(SongEvent(
+                                user.token,
+                                SongType.REMOVE,
+                                null,
+                                null,
+                                null,
+                                null,
+                                0,
+                                data.url
+                            ))
                         } else if(data.type == SongType.NEXT.value) {
                             val song = SongListService.getSong(user)[0]
                             SongListService.deleteSong(user, song.uid, song.name)