InsanusMokrassar/tgbotapi
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/TelegramBotAPI.git synced 2024-09-19 17:16:08 +00:00
Code Releases Activity

make small improvement in send action dsl

Browse Source
This commit is contained in:
InsanusMokrassar 2024-08-15 00:36:11 +06:00
parent 77158ffecf
commit a56ad7d671
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendActionDSL.kt
View File

@ -1,5 +1,7 @@
package dev.inmo.tgbotapi.extensions.api.send package dev.inmo.tgbotapi.extensions.api.send
import dev.inmo.micro_utils.coroutines.LinkedSupervisorScope
import dev.inmo.micro_utils.coroutines.runCatchingSafely
import dev.inmo.micro_utils.coroutines.safelyWithResult import dev.inmo.micro_utils.coroutines.safelyWithResult
import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions
import dev.inmo.tgbotapi.bot.TelegramBot import dev.inmo.tgbotapi.bot.TelegramBot
@ -22,7 +24,8 @@ public suspend fun <T> TelegramBot.withAction(
contract { contract {
callsInPlace(block, InvocationKind.EXACTLY_ONCE) callsInPlace(block, InvocationKind.EXACTLY_ONCE)
} }
val botActionJob = CoroutineScope(currentCoroutineContext()).launch { val actionScope = currentCoroutineContext().LinkedSupervisorScope(Job())
actionScope.launch {
while (isActive) { while (isActive) {
safelyWithoutExceptions { safelyWithoutExceptions {
execute(actionRequest) execute(actionRequest)
@ -30,8 +33,8 @@ public suspend fun <T> TelegramBot.withAction(
delay(refreshTime) delay(refreshTime)
} }
} }
val result = safelyWithResult { block() } val result = runCatchingSafely { block() }
botActionJob.cancel() actionScope.cancel()
return result.getOrThrow() return result.getOrThrow()
} }