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

MarketFace should not implement CodableMessage

Browse Source
This commit is contained in:
Him188 2020-12-31 17:33:31 +08:00
parent 59b4bdfa8d
commit c82eb29769
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mirai-core-api/src/commonMain/kotlin/message/data/HummerMessage.kt
View File

@ -186,11 +186,8 @@ public data class PokeMessage @MiraiInternalApi constructor(
* 商城表情 * 商城表情
* *
* 目前不支持直接发送，可支持转发，但其取决于表情是否可使用. * 目前不支持直接发送，可支持转发，但其取决于表情是否可使用.
*
* ## mirai 码支持
* 格式: [mirai:marketface:*[id]*,*[name]*]
*/ */
public interface MarketFace : CodableMessage, HummerMessage { public interface MarketFace : HummerMessage {
public val name: String public val name: String
public val id: Int public val id: Int

7
mirai-core/src/commonMain/kotlin/message/faceImpl.kt
View File

@ -15,10 +15,8 @@ import kotlinx.serialization.Transient
import net.mamoe.mirai.internal.network.protocol.data.proto.HummerCommelem import net.mamoe.mirai.internal.network.protocol.data.proto.HummerCommelem
import net.mamoe.mirai.internal.network.protocol.data.proto.ImMsgBody import net.mamoe.mirai.internal.network.protocol.data.proto.ImMsgBody
import net.mamoe.mirai.internal.utils.io.serialization.toByteArray import net.mamoe.mirai.internal.utils.io.serialization.toByteArray
import net.mamoe.mirai.message.code.internal.appendAsMiraiCode
import net.mamoe.mirai.message.data.Face import net.mamoe.mirai.message.data.Face
import net.mamoe.mirai.message.data.MarketFace import net.mamoe.mirai.message.data.MarketFace
import net.mamoe.mirai.utils.MiraiExperimentalApi
import net.mamoe.mirai.utils.hexToBytes import net.mamoe.mirai.utils.hexToBytes
import net.mamoe.mirai.utils.toByteArray import net.mamoe.mirai.utils.toByteArray
@ -54,10 +52,5 @@ internal data class MarketFaceImpl internal constructor(
@Transient @Transient
override val id: Int = delegate.tabId override val id: Int = delegate.tabId
@MiraiExperimentalApi
override fun appendMiraiCode(builder: StringBuilder) {
builder.append("[mirai:marketface:").append(id).append(",").appendAsMiraiCode(name).append(']')
}
override fun toString() = "[mirai:marketface:$id,$name]" override fun toString() = "[mirai:marketface:$id,$name]"
} }