Merge pull request #38 from dalbodeule/develop

some fix WSSongListRoutes.kt
This commit is contained in:
JinU Choi 2024-08-05 18:33:48 +09:00 committed by GitHub
commit 4c5fa5742f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 20 additions and 5 deletions

View File

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

View File

@ -241,6 +241,7 @@ class MessageHandler(
video.name, video.name,
video.author, video.author,
video.length, video.length,
video.url
)) ))
} }

View File

@ -16,6 +16,7 @@ class SongEvent(
val name: String?, val name: String?,
val author: String?, val author: String?,
val time: Int?, val time: Int?,
val url: String?
): Event { ): Event {
var TAG = javaClass.simpleName var TAG = javaClass.simpleName
} }

View File

@ -60,9 +60,11 @@ fun Routing.wsSongListRoutes() {
null, null,
null, null,
null, null,
null,
null null
)) ))
} }
removeSession(sid, this)
} }
try { try {
@ -87,7 +89,8 @@ fun Routing.wsSongListRoutes() {
user.username, user.username,
youtubeVideo.name, youtubeVideo.name,
youtubeVideo.author, youtubeVideo.author,
youtubeVideo.length youtubeVideo.length,
youtubeVideo.url
)) ))
} }
} }
@ -106,7 +109,8 @@ fun Routing.wsSongListRoutes() {
user.username, user.username,
song.name, song.name,
song.author, song.author,
0 0,
song.url
) )
) )
} }
@ -121,6 +125,7 @@ fun Routing.wsSongListRoutes() {
null, null,
null, null,
null, null,
null
)) ))
} }
} }
@ -151,7 +156,8 @@ fun Routing.wsSongListRoutes() {
it.reqUid, it.reqUid,
it.name, it.name,
it.author, it.author,
it.time it.time,
it.url
) )
) )
} }
@ -174,8 +180,10 @@ fun Routing.wsSongListRoutes() {
null, null,
null, null,
null, null,
null
) )
) )
removeSession(session.token ?: "", ws)
} }
} }
} }

View File

@ -53,6 +53,7 @@ fun Routing.wsSongRoutes() {
null, null,
null, null,
null, null,
null,
null null
)) ))
} }
@ -89,7 +90,8 @@ fun Routing.wsSongRoutes() {
it.reqUid, it.reqUid,
it.name, it.name,
it.author, it.author,
it.time it.time,
it.url
)) ))
} }
} }
@ -105,6 +107,7 @@ fun Routing.wsSongRoutes() {
null, null,
null, null,
null, null,
null
)) ))
} }
} }
@ -119,5 +122,6 @@ data class SongResponse(
val reqUid: String?, val reqUid: String?,
val name: String?, val name: String?,
val author: String?, val author: String?,
val time: Int? val time: Int?,
val url: String?
) )