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

Broadcast BotOfflineEvent.Active after state OK -> CLOSED

Browse Source
This commit is contained in:
Him188 2022-06-06 00:36:01 +01:00
parent 3d57f4cb68
commit 92b0cc5787
No known key found for this signature in database
GPG Key ID: BA439CDDCF652375
1 changed files with 4 additions and 15 deletions

19
mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
View File

@ -31,8 +31,11 @@ import net.mamoe.mirai.internal.network.handler.NetworkHandlerSupport.BaseStateI
import net.mamoe.mirai.internal.network.handler.selector.KeepAliveNetworkHandlerSelector
import net.mamoe.mirai.internal.network.handler.selector.NetworkException
import net.mamoe.mirai.internal.network.handler.selector.SelectorNetworkHandler
import net.mamoe.mirai.internal.network.handler.state.*
import net.mamoe.mirai.internal.network.handler.state.CombinedStateObserver.Companion.plus
import net.mamoe.mirai.internal.network.handler.state.LoggingStateObserver
import net.mamoe.mirai.internal.network.handler.state.StateChangedObserver
import net.mamoe.mirai.internal.network.handler.state.StateObserver
import net.mamoe.mirai.internal.network.handler.state.safe
import net.mamoe.mirai.internal.network.impl.ForceOfflineException
import net.mamoe.mirai.internal.network.notice.TraceLoggingNoticeProcessor
import net.mamoe.mirai.internal.network.notice.UnconsumedNoticesAlerter
@ -136,20 +139,6 @@ internal open class QQAndroidBot constructor(
}
cause is BotClosedByEvent -> {
}
else -> {
// handled by BotOfflineEventBroadcasterBefore
}
}
},
BeforeStateChangedObserver("BotOfflineEventBroadcasterBefore", State.OK, State.CLOSED) { new ->
// logging performed by BotOfflineEventMonitor
val cause = new.getCause()
when {
// handled by BotOfflineEventBroadcasterAfter
cause is ForceOfflineException -> {}
cause is StatSvc.ReqMSFOffline.MsfOfflineToken -> {}
cause is NetworkException && cause.recoverable -> {}
cause is BotClosedByEvent -> {}
else -> {
// any other unexpected exceptions considered as an error