diff --git a/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/internal/action/group.kt b/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/internal/action/group.kt index c46ff208..68b4c4ed 100644 --- a/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/internal/action/group.kt +++ b/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/internal/action/group.kt @@ -81,9 +81,9 @@ internal suspend fun onSetEssence(essenceDTO: IntTargetDTO): StateCode { /** * 获取群设置(需要相关权限) */ -internal fun onGetGroupConfig(dto: LongTargetDTO): GroupDetailDTO { +internal fun onGetGroupConfig(dto: LongTargetDTO): GroupDetail { val group = dto.session.bot.getGroupOrFail(dto.target) - return GroupDetailDTO(group) + return GroupDetail(data = GroupDetailDTO(group)) } /** @@ -105,9 +105,9 @@ internal fun onUpdateGroupConfig(dto: GroupConfigDTO): StateCode { /** * 获取群员信息 */ -internal fun onGetMemberInfo(dto: MemberTargetDTO): MemberDTO { +internal fun onGetMemberInfo(dto: MemberTargetDTO): MemberDetail { val member = dto.session.bot.getGroupOrFail(dto.target).getOrFail(dto.memberId) - return MemberDTO(member) + return MemberDetail(data = MemberDTO(member)) } /** diff --git a/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/internal/action/infomation.kt b/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/internal/action/infomation.kt index a48d9a94..60ce1271 100644 --- a/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/internal/action/infomation.kt +++ b/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/internal/action/infomation.kt @@ -10,11 +10,13 @@ package net.mamoe.mirai.api.http.adapter.internal.action import net.mamoe.mirai.api.http.adapter.internal.dto.* +import net.mamoe.mirai.api.http.adapter.internal.dto.parameter.* import net.mamoe.mirai.api.http.adapter.internal.dto.parameter.FriendList import net.mamoe.mirai.api.http.adapter.internal.dto.parameter.GroupList import net.mamoe.mirai.api.http.adapter.internal.dto.parameter.LongTargetDTO import net.mamoe.mirai.api.http.adapter.internal.dto.parameter.MemberList import net.mamoe.mirai.api.http.adapter.internal.dto.parameter.MemberTargetDTO +import net.mamoe.mirai.api.http.adapter.internal.dto.parameter.UserProfile /** * 查询好友列表 @@ -44,17 +46,17 @@ internal fun onGetMemberList(dto: LongTargetDTO): MemberList { /** * 查询 Bot 个人信息 */ -internal suspend fun onGetBotProfile(dto: EmptyAuthedDTO): ProfileDTO = - ProfileDTO(dto.session.bot.asFriend.queryProfile()) +internal suspend fun onGetBotProfile(dto: EmptyAuthedDTO): UserProfile = + UserProfile(data = ProfileDTO(dto.session.bot.asFriend.queryProfile())) /** * 查询好友个人信息 */ -internal suspend fun onGetFriendProfile(dto: LongTargetDTO): ProfileDTO = - ProfileDTO(dto.session.bot.getFriendOrFail(dto.target).queryProfile()) +internal suspend fun onGetFriendProfile(dto: LongTargetDTO): UserProfile = + UserProfile(data = ProfileDTO(dto.session.bot.getFriendOrFail(dto.target).queryProfile())) /** * 查询QQ群成员个人信息 */ -internal suspend fun onGetMemberProfile(dto: MemberTargetDTO): ProfileDTO = - ProfileDTO(dto.session.bot.getGroupOrFail(dto.target).getOrFail(dto.memberId).queryProfile()) +internal suspend fun onGetMemberProfile(dto: MemberTargetDTO): UserProfile = + UserProfile(data = ProfileDTO(dto.session.bot.getGroupOrFail(dto.target).getOrFail(dto.memberId).queryProfile())) diff --git a/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/internal/dto/parameter/common.kt b/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/internal/dto/parameter/common.kt index f5da55ff..e1be2bd7 100644 --- a/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/internal/dto/parameter/common.kt +++ b/mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/internal/dto/parameter/common.kt @@ -68,3 +68,25 @@ internal class MemberList( internal class RemoteFileList( val data: List ) : RestfulResult() + + +// user profile + +@Serializable +internal class UserProfile( + val data: ProfileDTO +) : RestfulResult() + +// group config + +@Serializable +internal class GroupDetail( + val data: GroupDetailDTO +) : RestfulResult() + +// member info + +@Serializable +internal class MemberDetail( + val data: MemberDTO +) : RestfulResult()