From 4d2510d0e7840e104db7f187084c9907fb813474 Mon Sep 17 00:00:00 2001 From: Him188 Date: Fri, 7 Feb 2020 10:18:33 +0800 Subject: [PATCH] Replace "\r" with "" --- .../mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt | 2 +- .../kotlin/net.mamoe.mirai/data/ConnectionOccupiedEvent.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt index 007d8b53c..4ebb977a9 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt @@ -366,7 +366,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler if (packet is Cancellable && packet.cancelled) return } - bot.logger.info("Received packet: ${packet.toString().replace("\n", """\n""")}") + bot.logger.info("Received packet: ${packet.toString().replace("\n", """\n""").replace("\r", "")}") packetFactory?.run { when (this) { diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/ConnectionOccupiedEvent.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/ConnectionOccupiedEvent.kt index a43a05140..bcd342d87 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/ConnectionOccupiedEvent.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/ConnectionOccupiedEvent.kt @@ -4,5 +4,5 @@ package net.mamoe.mirai.data * 被挤下线. 只能获取到中文的消息 */ inline class ConnectionOccupiedEvent(val message: String) : EventPacket { - override fun toString(): String = "ConnectionOccupiedEvent(${message.replace("\n", "")})" + override fun toString(): String = "ConnectionOccupiedEvent(${message.replace("\n", "").replace("\r", "")})" }