dalbodeule/chibot-chzzk-bot
1
0
Fork 0
mirror of https://github.com/dalbodeule/chibot-chzzk-bot.git synced 2025-08-07 04:41:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[hotfix] refactor badge checks; adjust listener initialization logic.

Browse Source
This commit is contained in:
dalbodeule
2025-06-24 16:46:46 +09:00
parent bd31039f2b
commit af9c3a2cf5
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,9 +233,17 @@ class UserHandler(
client.loginAsync().await()
listener = ChzzkSessionBuilder(client).buildUserSession()
listener.createAndConnectAsync()?.await()
listener.createAndConnectAsync().await()
listener.subscribeAsync(ChzzkSessionSubscriptionType.CHAT)?.await()
delay(1000L)
delay(5000L)
messageHandler = MessageHandler(this@UserHandler)
logger.info("${user.username} message handler init.")
listener.on(SessionChatMessageEvent::class.java) {
messageHandler.handle(it.message, user)
}
logger.info("${user.username} is connected.")
val timer = TimerConfigService.getConfig(user)
if (timer?.option == TimerType.UPTIME.value)
@@ -253,11 +261,6 @@ class UserHandler(
null
)
)
messageHandler = MessageHandler(this@UserHandler)
listener.on(SessionChatMessageEvent::class.java) {
messageHandler.handle(it.message, user)
}
}
internal suspend fun disable() {

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

@@ -37,11 +37,13 @@ class MessageHandler(
init {
reloadCommand()
dispatcher.subscribe(SongEvent::class) {
if(it.type == SongType.STREAM_OFF) {
val user = UserService.getUser(channel.channelId)
if(! user?.let { usr -> SongListService.getSong(usr) }.isNullOrEmpty()) {
SongListService.deleteUser(user)
CoroutineScope(Dispatchers.Default).launch {
dispatcher.subscribe(SongEvent::class) {
if(it.type == SongType.STREAM_OFF) {
val user = UserService.getUser(channel.channelId)
if(! user?.let { usr -> SongListService.getSong(usr) }.isNullOrEmpty()) {
SongListService.deleteUser(user)
}
}
}
}
@@ -87,7 +89,7 @@ class MessageHandler(
}
private fun manageAddCommand(msg: SessionChatMessage, user: User) {
if (msg.profile.badges.none { it.imageUrl.contains("manager") || it.imageUrl.contains("streamer") }) {
if (msg.profile.badges.none { it.isModerator() }) {
handler.sendChat("매니저만 명령어를 추가할 수 있습니다.")
return
}
@@ -108,7 +110,7 @@ class MessageHandler(
}
private fun manageUpdateCommand(msg: SessionChatMessage, user: User) {
if (msg.profile.badges.none { it.imageUrl.contains("manager") || it.imageUrl.contains("streamer") }) {
if (msg.profile.badges.none { it.isModerator() }) {
handler.sendChat("매니저만 명령어를 추가할 수 있습니다.")
return
}
@@ -130,7 +132,7 @@ class MessageHandler(
}
private fun manageRemoveCommand(msg: SessionChatMessage, user: User) {
if (msg.profile.badges.none { it.imageUrl.contains("manager") || it.imageUrl.contains("streamer") }) {
if (msg.profile.badges.none { it.isModerator() }) {
handler.sendChat("매니저만 명령어를 삭제할 수 있습니다.")
return
}
@@ -147,7 +149,7 @@ class MessageHandler(
}
private fun timerCommand(msg: SessionChatMessage, user: User) {
if (msg.profile.badges.none { it.imageUrl.contains("manager") || it.imageUrl.contains("streamer") }) {
if (msg.profile.badges.none { it.isModerator() }) {
handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
return
}
@@ -297,7 +299,7 @@ class MessageHandler(
}
private fun songStartCommand(msg: SessionChatMessage, user: User) {
if (msg.profile.badges.none { it.imageUrl.contains("manager") || it.imageUrl.contains("streamer") }) {
if (msg.profile.badges.none { it.isModerator() }) {
handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
return
}
@@ -316,7 +318,7 @@ class MessageHandler(
}
private fun categoryChangeCommand(msg: SessionChatMessage, user: User) {
if (msg.profile.badges.none { it.imageUrl.contains("manager") || it.imageUrl.contains("streamer") }) {
if (msg.profile.badges.none { it.isModerator() }) {
handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
return
}
@@ -430,3 +432,7 @@ class MessageHandler(
return result
}
}
fun SessionChatMessage.Profile.Badge.isManager() = imageUrl.contains("manager")
fun SessionChatMessage.Profile.Badge.isStreamer() = imageUrl.contains("streamer")
fun SessionChatMessage.Profile.Badge.isModerator() = isManager() || isStreamer()