diff --git a/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/dto/ContactDTO.kt b/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/dto/ContactDTO.kt index 812411c04..2410a8ef9 100644 --- a/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/dto/ContactDTO.kt +++ b/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/dto/ContactDTO.kt @@ -25,12 +25,12 @@ data class QQDTO( @Serializable data class MemberDTO( override val id: Long, - val memberName: String = "", + val memberName: String, val permission: MemberPermission, val group: GroupDTO ) : ContactDTO() { - constructor(member: Member, name: String = "") : this ( - member.id, name, member.permission, GroupDTO(member.group) + constructor(member: Member) : this ( + member.id, member.groupCard, member.permission, GroupDTO(member.group) ) } diff --git a/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/dto/MessageDTO.kt b/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/dto/MessageDTO.kt index 13b14b05b..20fe11758 100644 --- a/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/dto/MessageDTO.kt +++ b/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/dto/MessageDTO.kt @@ -64,7 +64,7 @@ sealed class MessageDTO : DTO */ suspend fun MessagePacket<*, *>.toDTO(): MessagePacketDTO = when (this) { is FriendMessage -> FriendMessagePacketDTO(QQDTO(sender)) - is GroupMessage -> GroupMessagePacketDTO(MemberDTO(sender, senderName)) + is GroupMessage -> GroupMessagePacketDTO(MemberDTO(sender)) else -> UnKnownMessagePacketDTO("UnKnown Message Packet") }.apply { messageChain = Array(message.size){ message[it].toDTO() }}