diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetTroopMemberList.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetTroopMemberList.kt index d6558b0..2893d67 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetTroopMemberList.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetTroopMemberList.kt @@ -25,7 +25,9 @@ internal object GetTroopMemberList : IActionHandler() { val memberList = GroupSvc.getGroupMemberList(groupId, refresh).onFailure { return error(it.message ?: "unknown error", echo, arrayResult = true) }.getOrThrow() - + val prohibitedMemberList = GroupSvc.getProhibitedMemberList(groupId.toLong()) + .getOrDefault(arrayListOf()) + .associate { it.memberUin to it.shutuptimestap.toLong() } return ok(arrayListOf().apply { memberList.forEach { info -> if (info.memberuin != "0") { @@ -60,7 +62,8 @@ internal object GetTroopMemberList : IActionHandler() { title = info.mUniqueTitle ?: "", titleExpireTime = info.mUniqueTitleExpire, cardChangeable = GroupSvc.isAdmin(groupId), - age = 0 + age = 0, + shutUpTimestamp = prohibitedMemberList[info.memberuin.toLong()] ?: 0L ) ) } diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/TroopData.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/TroopData.kt index b432d68..a9a3e47 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/TroopData.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/TroopData.kt @@ -3,6 +3,7 @@ package moe.fuqiuluo.shamrock.remote.service.data import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import moe.fuqiuluo.shamrock.remote.service.data.push.MemberRole +import java.sql.Timestamp @Serializable internal data class SimpleTroopInfo( @@ -43,6 +44,7 @@ internal data class SimpleTroopMemberInfo( @SerialName("role") val role: MemberRole, @SerialName("unfriendly") val unfriendly: Boolean, @SerialName("card_changeable") val cardChangeable: Boolean, + @SerialName("shut_up_timestamp") val shutUpTimestamp: Long?, ) @Serializable