Merge remote-tracking branch 'origin/dev' into dev

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt

@@ -141,6 +141,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) {

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt

@@ -291,8 +291,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 = "")
 

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/group.kt

@@ -355,6 +355,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