support Member.muteTimeRemaining (go-cqhttp)

MrXiaoM · Jan 6, 2024 · ef69b62 · ef69b62
1 parent 17c4f38
commit ef69b62
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/onebot/src/main/java/cn/evole/onebot/sdk/response/group/GroupMemberInfoResp.java b/onebot/src/main/java/cn/evole/onebot/sdk/response/group/GroupMemberInfoResp.java
@@ -60,6 +60,7 @@ public class GroupMemberInfoResp {
     @SerializedName("card_changeable")
     public boolean cardChangeable;
 
-
+    @SerializedName("shut_up_timestamp")
+    public long shutUpTimestamp;
 
 }
diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/MemberWrapper.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/MemberWrapper.kt
@@ -54,13 +54,9 @@ class MemberWrapper(
         get() = impl.joinTime
     override val lastSpeakTimestamp: Int
         get() = impl.lastSentTime
-    var _muteTimestamp: Int = 0 // TODO: Onebot 无法获取禁言剩余时间
     override val muteTimeRemaining: Int
-        get() = if (_muteTimestamp == 0 || _muteTimestamp == 0xFFFFFFFF.toInt()) {
-            0
-        } else {
-            (_muteTimestamp - currentTimeSeconds().toInt()).coerceAtLeast(0)
-        }
+        get() = (impl.shutUpTimestamp - currentTimeSeconds()).takeIf { it > 0 }?.toInt() ?: 0
+
     override val coroutineContext: CoroutineContext = CoroutineName("((Bot/${bot.id})Group/${group.id})Member/$id")
     override var nameCard: String
         get() = impl.card ?: ""