From 49924ea35e34a4b87fe147a9f0f5af49db7cf3ad Mon Sep 17 00:00:00 2001 From: ryoii Date: Mon, 29 Jun 2020 10:07:00 +0800 Subject: [PATCH] Close #398 --- .../kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt | 6 ++++++ mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt | 4 +++- .../commonMain/kotlin/net.mamoe.mirai/event/events/group.kt | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt index 0f8e93afc..46a334ea8 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt @@ -144,6 +144,12 @@ internal class QQAndroidBot constructor( ) } + @Suppress("DuplicatedCode") + @OptIn(LowLevelAPI::class) + override suspend fun rejectMemberJoinRequest(event: MemberJoinRequestEvent, blackList: Boolean) { + rejectMemberJoinRequest(event, blackList,"") + } + @Suppress("DuplicatedCode") @OptIn(LowLevelAPI::class) override suspend fun rejectMemberJoinRequest(event: MemberJoinRequestEvent, blackList: Boolean, message: String) { diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt index 54f187f41..142a78324 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt @@ -292,8 +292,10 @@ abstract class Bot internal constructor( @Deprecated( "use member function.", replaceWith = ReplaceWith("event.reject(blackList)"), - level = DeprecationLevel.ERROR + level = DeprecationLevel.HIDDEN ) + abstract suspend fun rejectMemberJoinRequest(event: MemberJoinRequestEvent, blackList: Boolean = false) + @JvmSynthetic abstract suspend fun rejectMemberJoinRequest(event: MemberJoinRequestEvent, blackList: Boolean = false, message: String = "") diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/group.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/group.kt index 700e769e6..98247941c 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/group.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/group.kt @@ -353,6 +353,7 @@ data class MemberJoinRequestEvent internal constructor( suspend fun accept() = bot.acceptMemberJoinRequest(this) @JvmSynthetic + @JvmOverloads suspend fun reject(blackList: Boolean = false, message: String = "") = bot.rejectMemberJoinRequest(this, blackList, message) @JvmSynthetic