dalbodeule/chibot-chzzk-bot
1
0
Fork 0
mirror of https://github.com/dalbodeule/chibot-chzzk-bot.git synced 2025-06-09 07:18:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #115 from dalbodeule/develop

Browse Source 
some fix on wsSongListRoutes
This commit is contained in:
JinU Choi 2024-08-24 15:13:02 +09:00 committed by GitHub
commit 3cea492563
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/ChzzkHandler.kt
View File

@ -294,7 +294,6 @@ class UserHandler(
null, null,
null, null,
null, null,
null,
) )
) )

2
chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/MessageHandler.kt
View File

@ -270,7 +270,7 @@ class MessageHandler(
user.token!!, user.token!!,
SongType.ADD, SongType.ADD,
msg.userId, msg.userId,
msg.profile?.nickname ?: "", null,
video, video,
) )
) )

1
common/src/main/kotlin/space/mori/chzzk_bot/common/events/SongEvents.kt
View File

@ -14,7 +14,6 @@ class SongEvent(
val uid: String, val uid: String,
val type: SongType, val type: SongType,
val reqUid: String?, val reqUid: String?,
val reqName: String?,
val current: YoutubeVideo? = null, val current: YoutubeVideo? = null,
val next: YoutubeVideo? = null, val next: YoutubeVideo? = null,
val delUrl: String? = null, val delUrl: String? = null,

12
webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt
View File

@ -140,8 +140,7 @@ fun Routing.wsSongListRoutes() {
user.token!!, user.token!!,
SongType.ADD, SongType.ADD,
user.token, user.token,
user.username, CurrentSong.getSong(user),
null,
youtubeVideo youtubeVideo
) )
) )
@ -151,6 +150,13 @@ fun Routing.wsSongListRoutes() {
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) {
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( dispatcher.post(
SongEvent( SongEvent(
user.token!!, user.token!!,
@ -158,7 +164,6 @@ fun Routing.wsSongListRoutes() {
null, null,
null, null,
null, null,
null,
data.url data.url
) )
) )
@ -185,7 +190,6 @@ fun Routing.wsSongListRoutes() {
user.token!!, user.token!!,
SongType.NEXT, SongType.NEXT,
song?.uid, song?.uid,
song?.reqName,
youtubeVideo youtubeVideo
) )
) )