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

Fix commit 'Don't mark failed if received MessageSvcPushForceOffline

Browse Source 
' (332e03377c)

The original commit was to fix the problem when receiving MessageSvcPushForceOffline on first login, which calls `setLoginHalted`, and stops the login process.
This commit is contained in:
Him188 2022-04-13 11:50:32 +01:00
parent efd864449e
commit b4bb1696de
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mirai-core/src/commonMain/kotlin/network/components/BotInitProcessor.kt
View File

@ -51,6 +51,9 @@ internal interface BotInitProcessor {
* *
* This is called in [MessageSvcPushForceOffline], which is in case connection is closed by server during the [NetworkHandler.State.LOADING] state. * This is called in [MessageSvcPushForceOffline], which is in case connection is closed by server during the [NetworkHandler.State.LOADING] state.
* *
* This function only marks current initialization work has failed. It has nothing to do with result of login.
* To update that result, update `bot.components[SsoProcessor].firstLoginResult`.
*
* See [BotInitProcessorImpl.state]. * See [BotInitProcessorImpl.state].
*/ */
fun setLoginHalted() fun setLoginHalted()
@ -104,6 +107,7 @@ internal class BotInitProcessorImpl(
bot.components[SsoProcessor].firstLoginResult.compareAndSet(null, FirstLoginResult.PASSED) bot.components[SsoProcessor].firstLoginResult.compareAndSet(null, FirstLoginResult.PASSED)
} catch (e: Throwable) { } catch (e: Throwable) {
setLoginHalted() setLoginHalted()
bot.components[SsoProcessor].firstLoginResult.compareAndSet(null, FirstLoginResult.OTHER_FAILURE)
throw e throw e
} }
} }