mirror of
https://github.com/dalbodeule/chibot-chzzk-bot.git
synced 2025-06-08 14:58:21 +00:00
[hotfix] coroutine related fixed. (4x)
This commit is contained in:
parent
95676e9b39
commit
593b98b7fb
@ -81,8 +81,10 @@ object ChzzkHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun disable() {
|
fun disable() {
|
||||||
handlers.forEach { handler ->
|
CoroutineScope(Dispatchers.Default).launch {
|
||||||
handler.disable()
|
handlers.forEach { handler ->
|
||||||
|
handler.disable()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -214,44 +216,13 @@ class UserHandler(
|
|||||||
LiveStatusService.updateOrCreate(user, value)
|
LiveStatusService.updateOrCreate(user, value)
|
||||||
}
|
}
|
||||||
|
|
||||||
init {
|
private suspend fun connect() {
|
||||||
val user = UserService.getUser(channel.channelId)
|
val user = UserService.getUser(channel.channelId)
|
||||||
|
|
||||||
if(user?.accessToken == null || user.refreshToken == null) {
|
if(user?.accessToken == null || user.refreshToken == null) {
|
||||||
throw RuntimeException("AccessToken or RefreshToken is not valid.")
|
throw RuntimeException("AccessToken or RefreshToken is not valid.")
|
||||||
}
|
}
|
||||||
try {
|
|
||||||
CoroutineScope(Dispatchers.Default).launch {
|
|
||||||
connect()
|
|
||||||
|
|
||||||
listener.on(SessionChatMessageEvent::class.java) {
|
|
||||||
messageHandler.handle(it.message, user)
|
|
||||||
}
|
|
||||||
|
|
||||||
val timer = TimerConfigService.getConfig(user)
|
|
||||||
if (timer?.option == TimerType.UPTIME.value)
|
|
||||||
dispatcher.post(
|
|
||||||
TimerEvent(
|
|
||||||
channel.channelId,
|
|
||||||
TimerType.UPTIME,
|
|
||||||
getUptime(streamStartTime!!)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
else dispatcher.post(
|
|
||||||
TimerEvent(
|
|
||||||
channel.channelId,
|
|
||||||
TimerType.entries.firstOrNull { it.value == timer?.option } ?: TimerType.REMOVE,
|
|
||||||
null
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
} catch(e: Exception) {
|
|
||||||
logger.error("Exception(${user.username}): ${e.stackTraceToString()}")
|
|
||||||
throw RuntimeException("Exception: ${e.stackTraceToString()}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun connect() {
|
|
||||||
val tokens = user.refreshToken?.let { token -> Connector.client.refreshAccessToken(token)}
|
val tokens = user.refreshToken?.let { token -> Connector.client.refreshAccessToken(token)}
|
||||||
if(tokens == null) {
|
if(tokens == null) {
|
||||||
throw RuntimeException("AccessToken is not valid.")
|
throw RuntimeException("AccessToken is not valid.")
|
||||||
@ -266,11 +237,32 @@ class UserHandler(
|
|||||||
|
|
||||||
delay(1000L)
|
delay(1000L)
|
||||||
|
|
||||||
|
listener.on(SessionChatMessageEvent::class.java) {
|
||||||
|
messageHandler.handle(it.message, user)
|
||||||
|
}
|
||||||
|
|
||||||
|
val timer = TimerConfigService.getConfig(user)
|
||||||
|
if (timer?.option == TimerType.UPTIME.value)
|
||||||
|
dispatcher.post(
|
||||||
|
TimerEvent(
|
||||||
|
channel.channelId,
|
||||||
|
TimerType.UPTIME,
|
||||||
|
getUptime(streamStartTime!!)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
else dispatcher.post(
|
||||||
|
TimerEvent(
|
||||||
|
channel.channelId,
|
||||||
|
TimerType.entries.firstOrNull { it.value == timer?.option } ?: TimerType.REMOVE,
|
||||||
|
null
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
messageHandler = MessageHandler(this@UserHandler)
|
messageHandler = MessageHandler(this@UserHandler)
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun disable() {
|
internal suspend fun disable() {
|
||||||
listener.disconnectAsync().join()
|
listener.disconnectAsync().await()
|
||||||
_isActive = false
|
_isActive = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user