From 94f54b7c6d5b44ba47d2a8a4f306f1c2ecc3956f Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sun, 25 Apr 2021 19:26:20 +0800
Subject: [PATCH] Replace usages of unstable API

---
 backend/mirai-console/src/util/CoroutineScopeUtils.kt |  5 ++---
 .../src/MiraiConsoleTerminalLoader.kt                 | 11 +++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/backend/mirai-console/src/util/CoroutineScopeUtils.kt b/backend/mirai-console/src/util/CoroutineScopeUtils.kt
index 99e760d6c..afd3fc17c 100644
--- a/backend/mirai-console/src/util/CoroutineScopeUtils.kt
+++ b/backend/mirai-console/src/util/CoroutineScopeUtils.kt
@@ -16,7 +16,6 @@ import net.mamoe.mirai.console.internal.util.runIgnoreException
 import net.mamoe.mirai.utils.currentTimeMillis
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
-import kotlin.time.seconds
 
 @ConsoleExperimentalApi
 public object CoroutineScopeUtils {
@@ -70,7 +69,7 @@ internal class TimedTask(
             val current = currentTimeMillis()
             if (last == UNCHANGED) {
                 runIgnoreException<CancellationException> {
-                    delay(3.seconds) // accuracy not necessary
+                    delay(3000) // accuracy not necessary
                 } ?: return@launch
             } else {
                 if (current - last > intervalMillis) {
@@ -78,7 +77,7 @@ internal class TimedTask(
                     action()
                 }
                 runIgnoreException<CancellationException> {
-                    delay(3.seconds) // accuracy not necessary
+                    delay(3000) // accuracy not necessary
                 } ?: return@launch
             }
         }
diff --git a/frontend/mirai-console-terminal/src/MiraiConsoleTerminalLoader.kt b/frontend/mirai-console-terminal/src/MiraiConsoleTerminalLoader.kt
index e22b89ad2..30cbe8194 100644
--- a/frontend/mirai-console-terminal/src/MiraiConsoleTerminalLoader.kt
+++ b/frontend/mirai-console-terminal/src/MiraiConsoleTerminalLoader.kt
@@ -1,10 +1,10 @@
 /*
- * Copyright 2019-2020 Mamoe Technologies and contributors.
+ * Copyright 2019-2021 Mamoe Technologies and contributors.
  *
- * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
- * Use of this source code is governed by the GNU AFFERO GENERAL PUBLIC LICENSE version 3 license that can be found through the following link.
+ *  此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ *  Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
  *
- * https://github.com/mamoe/mirai/blob/master/LICENSE
+ *  https://github.com/mamoe/mirai/blob/master/LICENSE
  */
 
 @file:Suppress(
@@ -36,7 +36,6 @@ import java.io.FileDescriptor
 import java.io.FileOutputStream
 import java.io.PrintStream
 import kotlin.system.exitProcess
-import kotlin.time.minutes
 
 /**
  * mirai-console-terminal CLI 入口点
@@ -159,7 +158,7 @@ object MiraiConsoleTerminalLoader {
 internal object ConsoleDataHolder : AutoSavePluginDataHolder,
     CoroutineScope by MiraiConsole.childScope("ConsoleDataHolder") {
     @ConsoleExperimentalApi
-    override val autoSaveIntervalMillis: LongRange = 1.minutes.toLongMilliseconds()..10.minutes.toLongMilliseconds()
+    override val autoSaveIntervalMillis: LongRange = 60_000L..10.times(60_000)
 
     @ConsoleExperimentalApi
     override val dataHolderName: String