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

Http api fix MessageSource lost and ignore Unknown type message

Browse Source
This commit is contained in:
ryoii 2020-02-22 17:47:38 +08:00
parent 63c3a64ceb
commit bebcf1aacb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/MessageDTO.kt
View File

@ -64,7 +64,7 @@ data class XmlDTO(val xml: String) : MessageDTO()
@Serializable
@SerialName("Unknown")
data class UnknownMessageDTO(val text: String) : MessageDTO()
object UnknownMessageDTO : MessageDTO()
/*
* Abstract Class
@ -88,9 +88,12 @@ fun MessagePacket<*, *>.toDTO() = when (this) {
is GroupMessage -> GroupMessagePacketDTO(MemberDTO(sender))
else -> IgnoreEventDTO
}.apply {
if (this is MessagePacketDTO) {
messageChain = mutableListOf<MessageDTO>().also { ls -> message.foreachContent { ls.add(it.toDTO()) } }
}
if (this is MessagePacketDTO) { messageChain = message.toDTOChain() }
// else: `this` is bot event
}
fun MessageChain.toDTOChain() = mutableListOf(this[MessageSource].toDTO()).apply {
foreachContent { content -> content.toDTO().takeUnless { it == UnknownMessageDTO }?.let(::add) }
}
fun MessageChainDTO.toMessageChain(contact: Contact) =
@ -105,7 +108,7 @@ fun Message.toDTO() = when (this) {
is PlainText -> PlainDTO(stringValue)
is Image -> ImageDTO(imageId)
is XMLMessage -> XmlDTO(stringValue)
else -> UnknownMessageDTO("未知消息类型")
else -> UnknownMessageDTO
}
@UseExperimental(ExperimentalUnsignedTypes::class, MiraiInternalAPI::class)