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 #39 from dalbodeule/develop

Browse Source 
some fix
This commit is contained in:
JinU Choi 2024-08-05 20:46:52 +09:00 committed by GitHub
commit 7df2b68a5f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,7 +265,7 @@ class MessageHandler(
bot.retrieveUserById(user.discord).queue { discordUser -> bot.retrieveUserById(user.discord).queue { discordUser ->
discordUser?.openPrivateChannel()?.queue { channel -> discordUser?.openPrivateChannel()?.queue { channel ->
channel.sendMessage("여기로 접속해주세요! ||https://nabot,mori.space/songlist/${session}||.\n주소가 노출될 경우 방송을 다시 켜셔야 합니다!") channel.sendMessage("여기로 접속해주세요! ||https://nabot.mori.space/songlist/${session}||.\n주소가 노출될 경우 방송을 다시 켜셔야 합니다!")
.queue() .queue()
} }
} }

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

@ -12,6 +12,7 @@ import kotlinx.serialization.json.Json
import org.koin.java.KoinJavaComponent.inject import org.koin.java.KoinJavaComponent.inject
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import space.mori.chzzk_bot.common.events.* 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.SongConfigService
import space.mori.chzzk_bot.common.services.SongListService import space.mori.chzzk_bot.common.services.SongListService
import space.mori.chzzk_bot.common.services.UserService 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) { else if(data.type == SongType.REMOVE.value && data.url != null) {
val songs = SongListService.getSong(user) dispatcher.post(SongEvent(
if(songs.size < data.remove) { user.token,
val song = songs[data.remove] SongType.REMOVE,
SongListService.deleteSong(user, song.uid, song.name) null,
null,
dispatcher.post( null,
SongEvent( null,
user.token, 0,
SongType.REMOVE, data.url
user.token, ))
user.username,
song.name,
song.author,
0,
song.url
)
)
}
} else if(data.type == SongType.NEXT.value) { } else if(data.type == SongType.NEXT.value) {
val song = SongListService.getSong(user)[0] val song = SongListService.getSong(user)[0]
SongListService.deleteSong(user, song.uid, song.name) SongListService.deleteSong(user, song.uid, song.name)