github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-13 06:30:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Avoid using kotlin.time.Duration API in a binary-sensitive way, fix #1066"

Browse Source 
...since 2.5 targets Kotlin 1.4.30

This reverts commit cedb239f
This commit is contained in:
Him188 2021-03-03 09:27:37 +08:00
parent a8f3bc876d
commit 2b6eddd0d7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core/src/commonMain/kotlin/network/handler/QQAndroidBotNetworkHandler.kt
View File

@ -272,7 +272,7 @@ internal class QQAndroidBotNetworkHandler(coroutineContext: CoroutineContext, bo
bot.client.wLoginSigInfo.sKey.run {
val delay = (expireTime - creationTime).seconds - 5.minutes
logger.info { "Scheduled key refresh in ${delay.toHumanReadableString()}." }
delay(delay.toLongMilliseconds()) // avoid delay(Duration) to keep binary compatibility
delay(delay)
}
runCatching {
refreshKeys()

4
mirai-core/src/commonMain/kotlin/utils/ScheduledJob.kt
View File

@ -33,7 +33,7 @@ internal class ScheduledJob(
private val channel = Channel<Unit>(Channel.CONFLATED)
fun notice() {
if (interval.toLongMilliseconds() != 0L) { // Avoid Duration.ZERO for binary compatibility
if (interval == Duration.ZERO) {
launch { task() }
} else channel.offer(Unit)
}
@ -47,7 +47,7 @@ internal class ScheduledJob(
}
init {
if (interval.toLongMilliseconds() != 0L) { // Avoid Duration.ZERO for binary compatibility
if (interval != Duration.ZERO) {
launch {
channel.receiveAsFlow()
.runCatching {