Merge pull request #136 from dalbodeule/debug

[hotfix] token claim fixed. (2x)

README.md

@@ -1,6 +1,6 @@
-# chibot_chzzk_bot
+# nabot_chzzk_bot
 
-[![Discord](https://img.shields.io/discord/1250093195870867577)](https://discord.gg/up8ANZegmy)   [![Build Status](https://teamcity.mori.space/app/rest/builds/buildType:NabotChzzkBot_Build/statusIcon)](https://teamcity.mori.space/project/NabotChzzkBot)
+[![Discord](https://img.shields.io/discord/1250093195870867577)](https://discord.gg/up8ANZegmy)   [![Build Status](https://teamcity.mori.space/app/rest/builds/buildType:NabotChzzkBot_Build/statusIcon)](https://teamcity.mori.space/project/NabotChzzkBot)   [![Docker Image Version](https://img.shields.io/docker/v/dalbodeule/chzzkbot)](https://hub.docker.com/repository/docker/dalbodeule/chzzkbot/general)
 
 ## Chzzk Chatbot with [JDA5](https://github.com/discord-jda/JDA), [chzzk4j](https://github.com/R2turnTrue/chzzk4j)
 
@@ -17,6 +17,17 @@
 - [x] \<daily_counter:counter_name>
 - [x] \<days:yyyy-mm-dd>
 
+### 관리 명령어 (on Discord)
+- [x] /hook token: \[디스코드 연동 페이지에서 받은 Token]
+- [x] /alert channel: \[디스코드 Channel ID] content: \[알림 내용]
+- [x] /add label: \[명령어] content: \[내용]
+- [ ] /list
+- [x] /update label: \[명령어] content: \[내용]
+- [x] /delete label: \[명령어]
+### 매니저 명령어 (on Discord)
+- [x] /addmanager user: \[Discord user]
+- [x] /listmanager
+- [x] /removemanager user: \[Discord user]
 ### 관리 명령어 (on Chzzk chat)
 - [x] !명령어추가 \[명령어] \[내용]
 - [x] !명령어수정 \[명령어] \[내용]
@@ -31,6 +42,32 @@
 - [ ] !노래삭제 \[번호]
 - [ ] !노래설정 \[내용] \[켜기/끄기]
 
+### Envs
+- DISCORD_TOKEN
+- DB_URL
+- DB_USER
+- DB_PASS
+- RUN_AGENT = `false`
+- NID_AUT
+- NID_SES
+
+### 사용 예시
+- 팔로우
+  - `/add label: !팔로우 content: <name>님은 오늘로 <following>일째 팔로우네요!`
+- 출첵
+  - `/add label: !출첵 content: <name>님의 <daily_counter:attendance>번째 출석! fail_content: <name>님은 오늘 이미 출석했어요! <daily_counter:attendance>번 했네요?`
+  - `/add label: ? content: <name>님이 <counter:hook>개째 갈고리 수집`
+- ㄱㅇㅇ
+  - `/add label: ㄱㅇㅇ content: <counter:cute>번째 ㄱㅇㅇ`
+  - `/add label: ㄱㅇㅇ content:  나누 귀여움 +<counter:cute>`
+- 풉
+  - `/add label: 풉 content: <counter:poop>번째 비웃음?`
+  - `/add label: 풉키풉키 content: <counter:poop>번째 비웃음?`
+- 바보
+  - `/add label: 바보 content: 나 바보 아니다?`
+  - `/add label: 바보 content: <counter:fool> 번째 바보? 나 바보 아니다?`
+- 첫방송
+  - `/add label: 첫방송 content: 24년 7월 23일부터 <days:2024-07-23>일 째 방송중!`
 
 ## 사용 기술스택
 - [Exposed](https://github.com/JetBrains/Exposed)

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

@@ -1,7 +1,11 @@
 package space.mori.chzzk_bot.chatbot.chzzk
 
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.future.await
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import org.koin.java.KoinJavaComponent.inject
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -13,8 +17,7 @@ import space.mori.chzzk_bot.common.models.User
 import space.mori.chzzk_bot.common.services.LiveStatusService
 import space.mori.chzzk_bot.common.services.TimerConfigService
 import space.mori.chzzk_bot.common.services.UserService
-import space.mori.chzzk_bot.common.utils.getChzzkChannelId
+import space.mori.chzzk_bot.common.utils.*
-import space.mori.chzzk_bot.common.utils.getUptime
 import xyz.r2turntrue.chzzk4j.ChzzkClient
 import xyz.r2turntrue.chzzk4j.session.ChzzkSessionBuilder
 import xyz.r2turntrue.chzzk4j.session.ChzzkSessionSubscriptionType
@@ -22,11 +25,10 @@ import xyz.r2turntrue.chzzk4j.session.ChzzkUserSession
 import xyz.r2turntrue.chzzk4j.session.event.SessionChatMessageEvent
 import xyz.r2turntrue.chzzk4j.types.channel.ChzzkChannel
 import xyz.r2turntrue.chzzk4j.types.channel.live.ChzzkLiveDetail
-import java.lang.Runnable
+import java.lang.Exception
-import java.lang.Thread
 import java.net.SocketTimeoutException
-import java.nio.charset.Charset
 import java.time.LocalDateTime
+import java.nio.charset.Charset
 
 object ChzzkHandler {
     private val handlers = mutableListOf<UserHandler>()
@@ -44,7 +46,7 @@ object ChzzkHandler {
         UserService.getAllUsers().map {
             if(!it.isDisabled)
                 try {
-                    getChannel(it.token)?.let { token -> addUser(token, it) }
+                    Connector.getChannel(it.token)?.let { token -> addUser(token, it) }
                 } catch(e: Exception) {
                     logger.info("Exception: ${it.token}(${it.username}) not found. ${e.stackTraceToString()}")
                 }
@@ -81,12 +83,10 @@ object ChzzkHandler {
     }
 
     fun disable() {
-        CoroutineScope(Dispatchers.Default).launch {
         handlers.forEach { handler ->
             handler.disable()
         }
     }
-    }
 
     internal fun reloadCommand(chzzkChannel: ChzzkChannel) {
         val handler = handlers.firstOrNull { it.channel.channelId == chzzkChannel.channelId }
@@ -118,7 +118,7 @@ object ChzzkHandler {
                             try {
                                 it.isActive(true, streamInfo)
                             } catch(e: Exception) {
-                                logger.info("Thread 1 Exception: ${e.stackTraceToString()}")
+                                logger.info("Exception: ${e.stackTraceToString()}")
                             }
                         }
                         if (streamInfo?.isOnline == false && it.isActive) it.isActive(false, streamInfo)
@@ -146,14 +146,14 @@ object ChzzkHandler {
                             try {
                                 it.isActive(true, streamInfo)
                             } catch(e: Exception) {
-                                logger.info("Thread 2 Exception: ${e.stackTraceToString()}")
+                                logger.info("Exception: ${e.stackTraceToString()}")
                             }
                         }
                         if (streamInfo?.isOnline == false && it.isActive) it.isActive(false, streamInfo)
                     } catch (e: SocketTimeoutException) {
-                        logger.info("Thread 2 Timeout: ${it.channel.channelName} / ${e.stackTraceToString()}")
+                        logger.info("Thread 1 Timeout: ${it.channel.channelName} / ${e.stackTraceToString()}")
                     } catch (e: Exception) {
-                        logger.info("Thread 2 Exception: ${it.channel.channelName} / ${e.stackTraceToString()}")
+                        logger.info("Thread 1 Exception: ${it.channel.channelName} / ${e.stackTraceToString()}")
                     } finally {
                         Thread.sleep(5000)
                     }
@@ -204,10 +204,10 @@ class UserHandler(
     private var user: User,
     var streamStartTime: LocalDateTime?,
 ) {
-    lateinit var messageHandler: MessageHandler
+    var messageHandler: MessageHandler
-    lateinit var client: ChzzkClient
+    var client: ChzzkClient
-    lateinit var listener: ChzzkUserSession
+    var listener: ChzzkUserSession
-    lateinit var chatChannelId: String
+    var chatChannelId: String?
 
     private val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
     private var _isActive: Boolean
@@ -216,31 +216,31 @@ class UserHandler(
             LiveStatusService.updateOrCreate(user, value)
         }
 
-    private suspend fun connect() {
+    init {
         val user = UserService.getUser(channel.channelId)
 
         if(user?.accessToken == null || user.refreshToken == null) {
             throw RuntimeException("AccessToken or RefreshToken is not valid.")
         }
-
+        try {
-        val tokens = user.refreshToken?.let { token -> Connector.client.refreshAccessToken(token)}
+            val tokens = user.refreshToken?.let { token -> Connector.client.refreshAccessToken(token) }
             if(tokens == null) {
                 throw RuntimeException("AccessToken is not valid.")
             }
             client = Connector.getClient(tokens.first, tokens.second)
             UserService.setRefreshToken(user, tokens.first, tokens.second)
-        chatChannelId = getChzzkChannelId(channel.channelId) ?: throw RuntimeException("Chat Channel ID is not found.")
+            chatChannelId = getChzzkChannelId(channel.channelId)
 
-        client.loginAsync().await()
+            client.loginAsync().join()
             listener = ChzzkSessionBuilder(client).buildUserSession()
-        listener.createAndConnectAsync().await()
+            listener.createAndConnectAsync().join()
-
+            messageHandler = MessageHandler(this@UserHandler)
-        delay(1000L)
 
             listener.on(SessionChatMessageEvent::class.java) {
                 messageHandler.handle(it.message, user)
             }
 
+            GlobalScope.launch {
                 val timer = TimerConfigService.getConfig(user)
                 if (timer?.option == TimerType.UPTIME.value)
                     dispatcher.post(
@@ -257,12 +257,16 @@ class UserHandler(
                         null
                     )
                 )
-
-        messageHandler = MessageHandler(this@UserHandler)
             }
             
-    internal suspend fun disable() {
+        } catch(e: Exception) {
-        listener.disconnectAsync().await()
+            logger.error("Exception(${user.username}): ${e.stackTraceToString()}")
+            throw RuntimeException("Exception: ${e.stackTraceToString()}")
+        }
+    }
+
+    internal fun disable() {
+        listener.disconnectAsync().join()
         _isActive = false
     }
 
@@ -280,8 +284,6 @@ class UserHandler(
     internal fun isActive(value: Boolean, status: ChzzkLiveDetail) {
         if(value) {
             CoroutineScope(Dispatchers.Default).launch {
-                connect()
-
                 logger.info("${user.username} is live.")
 
                 reloadUser(UserService.getUser(user.id.value)!!)

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

@@ -11,8 +11,10 @@ import space.mori.chzzk_bot.common.services.*
 import space.mori.chzzk_bot.common.utils.getFollowDate
 import space.mori.chzzk_bot.common.utils.getUptime
 import space.mori.chzzk_bot.common.utils.getYoutubeVideo
+import xyz.r2turntrue.chzzk4j.chat.ChatMessage
+import xyz.r2turntrue.chzzk4j.chat.ChzzkChat
+import xyz.r2turntrue.chzzk4j.session.ChzzkUserSession
 import xyz.r2turntrue.chzzk4j.session.message.SessionChatMessage
-import xyz.r2turntrue.chzzk4j.types.channel.live.ChzzkLiveSettings
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
@@ -60,7 +62,6 @@ class MessageHandler(
             "!신청곡" to this::songAddCommand,
             "!노래목록" to this::songListCommand,
             "!노래시작" to this::songStartCommand,
-            "!카테고리" to this::categoryChangeCommand,
         )
 
         manageCommands.forEach { (commandName, command) ->
@@ -83,11 +84,11 @@ class MessageHandler(
     }
 
     private fun commandListCommand(msg: SessionChatMessage, user: User) {
-        handler.sendChat("리스트는 여기입니다. https://chibot.mori.space/commands/${user.token}")
+        handler.sendChat("리스트는 여기입니다. https://nabot.mori.space/commands/${user.token}")
     }
 
     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.imageUrl.contains("manager") }) {
             handler.sendChat("매니저만 명령어를 추가할 수 있습니다.")
             return
         }
@@ -108,7 +109,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.imageUrl.contains("manager") }) {
             handler.sendChat("매니저만 명령어를 추가할 수 있습니다.")
             return
         }
@@ -130,7 +131,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.imageUrl.contains("manager") }) {
             handler.sendChat("매니저만 명령어를 삭제할 수 있습니다.")
             return
         }
@@ -147,7 +148,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.imageUrl.contains("manager") }) {
             handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
             return
         }
@@ -226,7 +227,7 @@ class MessageHandler(
 
         val config = SongConfigService.getConfig(user)
 
-        if(config.streamerOnly && msg.profile.badges.none { it.imageUrl.contains("manager") || it.imageUrl.contains("streamer") }) {
+        if(config.streamerOnly && msg.profile.badges.none { it.imageUrl.contains("manager") }) {
             handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
             return
         }
@@ -293,11 +294,11 @@ class MessageHandler(
             return
         }
         
-        handler.sendChat("리스트는 여기입니다. https://chibot.mori.space/songs/${user.token}")
+        handler.sendChat("리스트는 여기입니다. https://nabot.mori.space/songs/${user.token}")
     }
 
     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.imageUrl.contains("manager") }) {
             handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
             return
         }
@@ -306,7 +307,7 @@ class MessageHandler(
         if(user.discord != null) {
             bot.retrieveUserById(user.discord!!).queue { discordUser ->
                 discordUser?.openPrivateChannel()?.queue { channel ->
-                    channel.sendMessage("여기로 접속해주세요! ||https://chibot.mori.space/songlist||.")
+                    channel.sendMessage("여기로 접속해주세요! ||https://nabot.mori.space/songlist||.")
                         .queue()
                 }
             }
@@ -315,39 +316,6 @@ class MessageHandler(
         }
     }
 
-    private fun categoryChangeCommand(msg: SessionChatMessage, user: User) {
-        if (msg.profile.badges.none { it.imageUrl.contains("manager") || it.imageUrl.contains("streamer") }) {
-            handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
-            return
-        }
-
-        val parts = msg.content.split(" ", limit = 2)
-        if(parts.size <= 1) {
-            handler.sendChat("카테고리가 없습니다.")
-            return
-        }
-        val category = parts[1].let {
-            return@let when(it) {
-                "저챗", "토크", "JustChatting", "Just Chatting", "" -> "talk"
-                else -> it
-            }
-        }
-        handler.sendChat("$category 카테고리로 수정을 시도해볼게요!")
-        handler.client.searchCategories(category).handle { result, _ ->
-            if(result.size == 0) {
-                handler.sendChat("$category 카테고리는 없습니다.")
-                return@handle
-            }
-            val settings = ChzzkLiveSettings()
-            settings.category = result.first {
-                it.categoryValue == category
-            } ?: result[0]
-
-            handler.client.modifyLiveSettings(settings)
-            handler.sendChat("$category 로 수정했어요!")
-        }
-    }
-
     internal fun handle(msg: SessionChatMessage, user: User) {
         if(msg.senderChannelId == ChzzkHandler.botUid) return
 

chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/utils/accessTokenRefresh.kt

@@ -1,15 +1,27 @@
 package space.mori.chzzk_bot.chatbot.utils
 
-import com.google.gson.reflect.TypeToken
+import com.google.gson.Gson
+import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import space.mori.chzzk_bot.chatbot.chzzk.dotenv
-import space.mori.chzzk_bot.common.utils.IData
 import space.mori.chzzk_bot.common.utils.client
 import xyz.r2turntrue.chzzk4j.ChzzkClient
 import java.io.IOException
 
+val client = OkHttpClient.Builder()
+    .addNetworkInterceptor { chain ->
+        chain.proceed(
+            chain.request()
+                .newBuilder()
+                .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36")
+                .build()
+        )
+    }
+    .build()
+val gson = Gson()
 
 data class RefreshTokenResponse(
     val accessToken: String,
@@ -36,9 +48,9 @@ fun ChzzkClient.refreshAccessToken(refreshToken: String): Pair<String, String> {
         try {
             if(!response.isSuccessful) throw IOException("Unexpected code ${response.code}")
             val body = response.body?.string()
-            val data = gson.fromJson(body, object: TypeToken<IData<RefreshTokenResponse>>() {})
+            val data = gson.fromJson(body, RefreshTokenResponse::class.java)
 
-            return Pair(data.content.accessToken, data.content.refreshToken)
+            return Pair(data.accessToken, data.refreshToken)
         } catch(e: Exception) {
             throw e
         }

webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/Main.kt

@@ -228,7 +228,8 @@ val server = embeddedServer(Netty, port = 8080, ) {
             // common: logout
             get("/logout") {
                 call.sessions.clear<UserSession>()
-                call.respondRedirect(getFrontendURL(""))
+                call.response.status(HttpStatusCode.OK)
+                return@get
             }
         }