github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-09 02:10:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ambiguous DefaultLoginSolver

Browse Source
This commit is contained in:
Him188 2020-12-01 12:43:04 +08:00
parent 5d04017666
commit 66ec1ab76a
1 changed files with 10 additions and 12 deletions

22
mirai-core-api/src/commonMain/kotlin/utils/LoginSolver.kt
View File

@ -21,6 +21,7 @@ import net.mamoe.mirai.Bot
import net.mamoe.mirai.network.LoginFailedException
import net.mamoe.mirai.network.NoStandardInputForCaptchaException
import utils.SwingSolver
import utils.WindowHelperJvm
import java.awt.Image
import java.awt.image.BufferedImage
import java.io.File
@ -62,8 +63,13 @@ public abstract class LoginSolver {
public abstract suspend fun onSolveUnsafeDeviceLoginVerify(bot: Bot, url: String): String?
public companion object {
public val Default: LoginSolver =
DefaultLoginSolver({ readLine() ?: throw NoStandardInputForCaptchaException(null) })
public val Default: LoginSolver = kotlin.run {
if (WindowHelperJvm.isDesktopSupported) {
SwingSolver
} else {
DefaultLoginSolver({ readLine() ?: throw NoStandardInputForCaptchaException(null) })
}
}
}
}
@ -74,17 +80,9 @@ public abstract class LoginSolver {
@MiraiExperimentalApi
public class DefaultLoginSolver(
public val input: suspend () -> String,
public val overrideLogger: MiraiLogger? = null
overrideLogger: MiraiLogger? = null
) : LoginSolver() {
private val delegate: LoginSolver
init {
if (WindowHelperJvm.isDesktopSupported) {
delegate = SwingSolver
} else {
delegate = StandardCharImageLoginSolver(input, overrideLogger)
}
}
private val delegate: LoginSolver = StandardCharImageLoginSolver(input, overrideLogger)
override suspend fun onSolvePicCaptcha(bot: Bot, data: ByteArray): String? {
return delegate.onSolvePicCaptcha(bot, data)