github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-12 05:50:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move NormalMember.isMuted from extension to member function. fix #1037

Browse Source
This commit is contained in:
Him188 2021-04-10 12:56:40 +08:00
parent 3bfd2a274a
commit 455ed6fbeb
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
binary-compatibility-validator/android/api/binary-compatibility-validator-android.api
View File

@ -480,6 +480,7 @@ public abstract interface class net/mamoe/mirai/contact/NormalMember : net/mamoe
public abstract fun getMuteTimeRemaining ()I
public abstract fun getNameCard ()Ljava/lang/String;
public abstract fun getSpecialTitle ()Ljava/lang/String;
public fun isMuted ()Z
public synthetic fun kick (Ljava/lang/String;)Lkotlin/Unit;
public fun kick (Ljava/lang/String;)V
public abstract fun kick (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

1
binary-compatibility-validator/api/binary-compatibility-validator.api
View File

@ -480,6 +480,7 @@ public abstract interface class net/mamoe/mirai/contact/NormalMember : net/mamoe
public abstract fun getMuteTimeRemaining ()I
public abstract fun getNameCard ()Ljava/lang/String;
public abstract fun getSpecialTitle ()Ljava/lang/String;
public fun isMuted ()Z
public synthetic fun kick (Ljava/lang/String;)Lkotlin/Unit;
public fun kick (Ljava/lang/String;)V
public abstract fun kick (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

21
mirai-core-api/src/commonMain/kotlin/contact/NormalMember.kt
View File

@ -64,6 +64,12 @@ public interface NormalMember : Member {
*/
public val muteTimeRemaining: Int
/**
* 当该群员处于禁言状态时返回 `true`.
* @since 2.6
*/
public val isMuted: Boolean get() = muteTimeRemaining != 0
/**
* 入群时间. 单位为秒.
*
@ -160,12 +166,6 @@ public val UserOrBot.nameCardOrNick: String
else -> this.nick
}
/**
* 判断群成员是否处于禁言状态.
*/
public val NormalMember.isMuted: Boolean
get() = muteTimeRemaining != 0 && muteTimeRemaining != 0xFFFFFFFF.toInt()
/**
* @see Member.mute
*/
@ -182,3 +182,12 @@ public suspend inline fun NormalMember.mute(duration: Duration) {
public suspend inline fun NormalMember.mute00(duration: Duration) {
return mute(duration)
}
/**
* 判断群成员是否处于禁言状态.
* @suppress 在 2.6 移入了 [NormalMember] 成员函数. 保留二进制兼容.
*/
@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "EXTENSION_SHADOWED_BY_MEMBER")
@kotlin.internal.LowPriorityInOverloadResolution
public val NormalMember.isMuted: Boolean
get() = muteTimeRemaining != 0 && muteTimeRemaining != 0xFFFFFFFF.toInt()