Commit 3be9968b authored by ryoii's avatar ryoii

fix #79

parent a0843c1d
...@@ -70,7 +70,7 @@ sealed class MessagePacketDTO : DTO { ...@@ -70,7 +70,7 @@ sealed class MessagePacketDTO : DTO {
lateinit var messageChain : MessageChainDTO lateinit var messageChain : MessageChainDTO
} }
typealias MessageChainDTO = Array<MessageDTO> typealias MessageChainDTO = List<MessageDTO>
@Serializable @Serializable
sealed class MessageDTO : DTO sealed class MessageDTO : DTO
...@@ -83,7 +83,7 @@ fun MessagePacket<*, *>.toDTO(): MessagePacketDTO = when (this) { ...@@ -83,7 +83,7 @@ fun MessagePacket<*, *>.toDTO(): MessagePacketDTO = when (this) {
is FriendMessage -> FriendMessagePacketDTO(QQDTO(sender)) is FriendMessage -> FriendMessagePacketDTO(QQDTO(sender))
is GroupMessage -> GroupMessagePacketDTO(MemberDTO(sender)) is GroupMessage -> GroupMessagePacketDTO(MemberDTO(sender))
else -> UnKnownMessagePacketDTO("UnKnown Message Packet") else -> UnKnownMessagePacketDTO("UnKnown Message Packet")
}.apply { messageChain = Array(message.size){ message[it].toDTO() }} }.apply { messageChain = mutableListOf<MessageDTO>().also{ ls -> message.foreachContent { ls.add(it.toDTO()) }}}
fun MessageChainDTO.toMessageChain(contact: Contact) = fun MessageChainDTO.toMessageChain(contact: Contact) =
MessageChain().apply { this@toMessageChain.forEach { add(it.toMessage(contact)) } } MessageChain().apply { this@toMessageChain.forEach { add(it.toMessage(contact)) } }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment