From 552d596c111cd75e6bb0f60ce3709e3fcb9970cf Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Fri, 8 Nov 2019 20:01:56 +0800
Subject: [PATCH] Override toString
---
.../network/protocol/tim/TIMBotNetworkHandler.kt | 2 +-
.../net.mamoe.mirai/network/protocol/tim/packet/PacketId.kt | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/TIMBotNetworkHandler.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/TIMBotNetworkHandler.kt
index ddda68b98..af9842299 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/TIMBotNetworkHandler.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/TIMBotNetworkHandler.kt
@@ -296,7 +296,7 @@ internal class TIMBotNetworkHandler internal constructor(override inline val bot
it::class.annotations.filterIsInstance<NoLog>().any()
}
}?.let {
- bot.logger.verbose("Packet sent: ${it::class.simpleName ?: "[OutgoingPacket]"}")
+ bot.logger.verbose("Packet sent: ${it.packetId}")
}
PacketSentEvent(bot, packet).broadcast()
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/PacketId.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/PacketId.kt
index 1f5d29210..c3099b644 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/PacketId.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/PacketId.kt
@@ -6,6 +6,7 @@ import net.mamoe.mirai.network.protocol.tim.packet.action.*
import net.mamoe.mirai.network.protocol.tim.packet.event.EventPacketFactory
import net.mamoe.mirai.network.protocol.tim.packet.event.FriendOnlineStatusChangedPacket
import net.mamoe.mirai.network.protocol.tim.packet.login.*
+import net.mamoe.mirai.utils.io.toUHexString
/**
@@ -29,6 +30,7 @@ interface PacketId {
object NullPacketId : PacketId {
override val factory: PacketFactory<*, *> get() = error("uninitialized")
override val value: UShort get() = error("uninitialized")
+ override fun toString(): String = "NullPacketId"
}
/**
@@ -36,6 +38,7 @@ object NullPacketId : PacketId {
*/
inline class UnknownPacketId(override inline val value: UShort) : PacketId {
override val factory: PacketFactory<*, *> get() = UnknownPacketFactory
+ override fun toString(): String = "UnknownPacketId(${value.toUHexString()})"
}
object IgnoredPacketIds : List<IgnoredPacketId> by {
@@ -45,6 +48,7 @@ object IgnoredPacketIds : List<IgnoredPacketId> by {
inline class IgnoredPacketId constructor(override val value: UShort) : PacketId {
override val factory: PacketFactory<*, *> get() = IgnoredPacketFactory
+ override fun toString(): String = "IgnoredPacketId(${value.toUHexString()})"
}
/**
@@ -78,5 +82,5 @@ enum class KnownPacketId(override inline val value: UShort, override inline val
;
- override fun toString(): String = factory.let { it::class.simpleName } ?: this.name
+ override fun toString(): String = factory::class.simpleName ?: this.name
}