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

Inline NetworkHandler.isOk

Browse Source
This commit is contained in:
Him188 2021-07-28 12:17:18 +08:00
parent 394f45fa9e
commit c19265b954
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mirai-core/src/commonMain/kotlin/AbstractBot.kt
View File

@ -23,6 +23,7 @@ import net.mamoe.mirai.internal.contact.uin
import net.mamoe.mirai.internal.network.component.ComponentStorage import net.mamoe.mirai.internal.network.component.ComponentStorage
import net.mamoe.mirai.internal.network.components.SsoProcessor import net.mamoe.mirai.internal.network.components.SsoProcessor
import net.mamoe.mirai.internal.network.handler.NetworkHandler import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.handler.NetworkHandler.State
import net.mamoe.mirai.internal.network.handler.selector.NetworkException import net.mamoe.mirai.internal.network.handler.selector.NetworkException
import net.mamoe.mirai.internal.network.impl.netty.asCoroutineExceptionHandler import net.mamoe.mirai.internal.network.impl.netty.asCoroutineExceptionHandler
import net.mamoe.mirai.network.LoginFailedException import net.mamoe.mirai.network.LoginFailedException
@ -85,7 +86,7 @@ internal abstract class AbstractBot constructor(
*/ */
abstract val components: ComponentStorage abstract val components: ComponentStorage
final override val isOnline: Boolean get() = network.isOk() final override val isOnline: Boolean get() = network.state == State.OK
final override val eventChannel: EventChannel<BotEvent> = final override val eventChannel: EventChannel<BotEvent> =
GlobalEventChannel.filterIsInstance<BotEvent>().filter { it.bot === this@AbstractBot } GlobalEventChannel.filterIsInstance<BotEvent>().filter { it.bot === this@AbstractBot }

2
mirai-core/src/commonMain/kotlin/network/handler/NetworkHandler.kt
View File

@ -38,8 +38,6 @@ import net.mamoe.mirai.utils.MiraiLogger
internal interface NetworkHandler : CoroutineScope { internal interface NetworkHandler : CoroutineScope {
val context: NetworkHandlerContext val context: NetworkHandlerContext
fun isOk() = state == State.OK
/** /**
* Current state of this handler. This is volatile. * Current state of this handler. This is volatile.
*/ */