From 64980e066fb99815d740cd7b29e87e1d7f97e617 Mon Sep 17 00:00:00 2001
From: ryoii <ryoii@foxmail.com>
Date: Thu, 6 Feb 2020 17:01:22 +0800
Subject: [PATCH] http-api add botPermission property for group
---
.../kotlin/net/mamoe/mirai/api/http/dto/ContactDTO.kt | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
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 5550ad079..ce87ea576 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,16 +25,17 @@ suspend fun QQDTO(qq: QQ): QQDTO = QQDTO(qq.id, "", "")
data class MemberDTO(
override val id: Long,
val memberName: String = "",
- val group: GroupDTO,
- val permission: MemberPermission
+ val permission: MemberPermission,
+ val group: GroupDTO
) : ContactDTO()
-fun MemberDTO(member: Member, name: String = ""): MemberDTO = MemberDTO(member.id, name, GroupDTO(member.group), member.permission)
+fun MemberDTO(member: Member, name: String = ""): MemberDTO = MemberDTO(member.id, name, member.permission, GroupDTO(member.group))
@Serializable
data class GroupDTO(
override val id: Long,
- val name: String
+ val name: String,
+ val permission: MemberPermission
) : ContactDTO()
-fun GroupDTO(group: Group): GroupDTO = GroupDTO(group.id, group.name)
\ No newline at end of file
+fun GroupDTO(group: Group): GroupDTO = GroupDTO(group.id, group.name, group.botPermission)
\ No newline at end of file