From 3ac188bb6406de13bc86e88fdddb247a8320ea94 Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 24 Dec 2020 13:14:07 +0800 Subject: [PATCH] Internal optimizations --- .../src/commonMain/kotlin/message/data/CustomMessage.kt | 6 ++++-- .../src/commonMain/kotlin/message/data/HummerMessage.kt | 5 +++-- mirai-core/src/commonMain/kotlin/message/conversions.kt | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mirai-core-api/src/commonMain/kotlin/message/data/CustomMessage.kt b/mirai-core-api/src/commonMain/kotlin/message/data/CustomMessage.kt index d5c5fadd0..4ec8c4bda 100644 --- a/mirai-core-api/src/commonMain/kotlin/message/data/CustomMessage.kt +++ b/mirai-core-api/src/commonMain/kotlin/message/data/CustomMessage.kt @@ -137,7 +137,8 @@ public sealed class CustomMessage : SingleMessage { public class CustomMessageFullDataDeserializeUserException(public val body: ByteArray, cause: Throwable?) : RuntimeException(cause) - internal fun load(fullData: ByteReadPacket): CustomMessage? { + @MiraiInternalApi + public fun load(fullData: ByteReadPacket): CustomMessage? { val msg = kotlin.runCatching { val length = fullData.readInt() if (fullData.remaining != length.toLong()) { @@ -157,7 +158,8 @@ public sealed class CustomMessage : SingleMessage { } } - internal fun dump(factory: Factory, message: M): ByteArray = buildPacket { + @MiraiInternalApi + public fun dump(factory: Factory, message: M): ByteArray = buildPacket { ProtoBuf.encodeToByteArray( CustomMessageFullData.serializer(), CustomMessageFullData( miraiVersionFlag = 1, diff --git a/mirai-core-api/src/commonMain/kotlin/message/data/HummerMessage.kt b/mirai-core-api/src/commonMain/kotlin/message/data/HummerMessage.kt index e7f87c61f..305d6aed5 100644 --- a/mirai-core-api/src/commonMain/kotlin/message/data/HummerMessage.kt +++ b/mirai-core-api/src/commonMain/kotlin/message/data/HummerMessage.kt @@ -17,6 +17,7 @@ import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable import net.mamoe.mirai.message.code.CodableMessage import net.mamoe.mirai.message.data.VipFace.Kind +import net.mamoe.mirai.utils.MiraiInternalApi import net.mamoe.mirai.utils.PlannedRemoval import net.mamoe.mirai.utils.castOrNull import net.mamoe.mirai.utils.safeCast @@ -47,7 +48,7 @@ public sealed class HummerMessage : MessageContent, ConstrainSingle { * @see PokeMessage.Companion 使用伴生对象中的常量 */ @Serializable -public data class PokeMessage internal constructor( +public data class PokeMessage @MiraiInternalApi constructor( /** * 仅 mirai, 显示的名称 */ @@ -196,7 +197,7 @@ public data class PokeMessage internal constructor( * @see VipFace.Key 使用伴生对象中的常量 */ @Serializable -public data class VipFace internal constructor( +public data class VipFace @MiraiInternalApi constructor( /** * 使用 [Companion] 中常量. */ diff --git a/mirai-core/src/commonMain/kotlin/message/conversions.kt b/mirai-core/src/commonMain/kotlin/message/conversions.kt index cd473edaf..3d894bc0c 100644 --- a/mirai-core/src/commonMain/kotlin/message/conversions.kt +++ b/mirai-core/src/commonMain/kotlin/message/conversions.kt @@ -380,7 +380,6 @@ internal inline fun Iterable<*>.firstIsInstanceOrNull(): R? { internal val MIRAI_CUSTOM_ELEM_TYPE = "mirai".hashCode() // 103904510 -@Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") internal fun List.joinToMessageChain(groupIdOrZero: Long, botId: Long, list: MessageChainBuilder) { // (this._miraiContentToString().soutv()) this.forEach { element ->