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

Do not kill backend if auto-login failed

Browse Source
This commit is contained in:
Him188 2021-01-12 17:37:56 +08:00
parent 0b957d6475
commit c0531acab7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/mirai-console/src/internal/MiraiConsoleImplementationBridge.kt
View File

@ -16,7 +16,6 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import net.mamoe.mirai.Bot import net.mamoe.mirai.Bot
import net.mamoe.mirai.alsoLogin
import net.mamoe.mirai.console.MalformedMiraiConsoleImplementationError import net.mamoe.mirai.console.MalformedMiraiConsoleImplementationError
import net.mamoe.mirai.console.MiraiConsole import net.mamoe.mirai.console.MiraiConsole
import net.mamoe.mirai.console.MiraiConsoleFrontEndDescription import net.mamoe.mirai.console.MiraiConsoleFrontEndDescription
@ -236,9 +235,10 @@ internal object MiraiConsoleImplementationBridge : CoroutineScope, MiraiConsoleI
} }
} }
} }
when (account.password.kind) {
val bot = when (account.password.kind) {
PLAIN -> { PLAIN -> {
MiraiConsole.addBot(id, account.password.value, BotConfiguration::configBot).alsoLogin() MiraiConsole.addBot(id, account.password.value, BotConfiguration::configBot)
} }
MD5 -> { MD5 -> {
val md5 = kotlin.runCatching { val md5 = kotlin.runCatching {
@ -246,9 +246,13 @@ internal object MiraiConsoleImplementationBridge : CoroutineScope, MiraiConsoleI
}.getOrElse { }.getOrElse {
error("Bad auto-login md5: '${account.password.value}' for account $id") error("Bad auto-login md5: '${account.password.value}' for account $id")
} }
MiraiConsole.addBot(id, md5, BotConfiguration::configBot).alsoLogin() MiraiConsole.addBot(id, md5, BotConfiguration::configBot)
} }
} }
runCatching { bot.login() }.getOrElse {
mainLogger.error(it)
}
} }
} }