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

Fix a logical mistake

Browse Source
This commit is contained in:
Him188 2019-10-28 21:32:33 +08:00
parent d4dd720e4e
commit f695c9f792
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/TIMBotNetworkHandler.kt
View File

@ -56,17 +56,14 @@ internal class TIMBotNetworkHandler internal constructor(private val bot: Bot) :
}
override suspend fun login(configuration: BotNetworkConfiguration): LoginResult = withContext(this.coroutineContext) {
TIMProtocol.SERVER_IP.forEach {
bot.logger.logInfo("Connecting server $it")
socket = BotSocketAdapter(it, configuration)
TIMProtocol.SERVER_IP.forEach { ip ->
bot.logger.logInfo("Connecting server $ip")
socket = BotSocketAdapter(ip, configuration)
loginResult = CompletableDeferred()
val state = socket.resendTouch()
socket.resendTouch().takeIf { it != LoginResult.TIMEOUT }?.let { return@withContext it }
if (state != LoginResult.TIMEOUT) {
return@withContext state
}
bot.logger.logPurple("Timeout. Retrying next server")
socket.close()
@ -206,7 +203,7 @@ internal class TIMBotNetworkHandler internal constructor(private val bot: Bot) :
// Remove first to release the lock
handlersLock.withLock {
temporaryPacketHandlers.filter { it.filter(session, packet) }
temporaryPacketHandlers.filter { it.filter(session, packet) }.also { temporaryPacketHandlers.removeAll(it) }
}.forEach {
it.doReceiveWithoutExceptions(packet)
}