From 668278216896fc1369f6a952f3fa4e0aa31a6750 Mon Sep 17 00:00:00 2001
From: StageGuard <1355416608@qq.com>
Date: Sun, 3 Sep 2023 13:27:57 +0800
Subject: [PATCH] [core] cleanup
---
.../compatibility-validation/android/api/android.api | 6 ++----
mirai-core-api/compatibility-validation/jvm/api/jvm.api | 6 ++----
mirai-core-api/src/commonMain/kotlin/Bot.kt | 4 ++--
mirai-core-mock/src/internal/MockBotImpl.kt | 2 +-
mirai-core/src/commonMain/kotlin/QQAndroidBot.kt | 2 +-
5 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/mirai-core-api/compatibility-validation/android/api/android.api b/mirai-core-api/compatibility-validation/android/api/android.api
index edd1beae2..0fa4a16d7 100644
--- a/mirai-core-api/compatibility-validation/android/api/android.api
+++ b/mirai-core-api/compatibility-validation/android/api/android.api
@@ -26,10 +26,8 @@ public abstract interface class net/mamoe/mirai/Bot : kotlinx/coroutines/Corouti
public static fun getInstances ()Ljava/util/List;
public static fun getInstancesSequence ()Lkotlin/sequences/Sequence;
public abstract fun getLogger ()Lnet/mamoe/mirai/utils/MiraiLogger;
- public fun getNewFriendRequestList (Z)Ljava/util/List;
- public abstract fun getNewFriendRequestList (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
- public static synthetic fun getNewFriendRequestList$default (Lnet/mamoe/mirai/Bot;ZILjava/lang/Object;)Ljava/util/List;
- public static synthetic fun getNewFriendRequestList$default (Lnet/mamoe/mirai/Bot;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+ public fun getNewFriendRequestList ()Ljava/util/List;
+ public abstract fun getNewFriendRequestList (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public abstract fun getOtherClients ()Lnet/mamoe/mirai/contact/ContactList;
public fun getStranger (J)Lnet/mamoe/mirai/contact/Stranger;
public fun getStrangerOrFail (J)Lnet/mamoe/mirai/contact/Stranger;
diff --git a/mirai-core-api/compatibility-validation/jvm/api/jvm.api b/mirai-core-api/compatibility-validation/jvm/api/jvm.api
index 5112e007d..b5ec757d4 100644
--- a/mirai-core-api/compatibility-validation/jvm/api/jvm.api
+++ b/mirai-core-api/compatibility-validation/jvm/api/jvm.api
@@ -26,10 +26,8 @@ public abstract interface class net/mamoe/mirai/Bot : kotlinx/coroutines/Corouti
public static fun getInstances ()Ljava/util/List;
public static fun getInstancesSequence ()Lkotlin/sequences/Sequence;
public abstract fun getLogger ()Lnet/mamoe/mirai/utils/MiraiLogger;
- public fun getNewFriendRequestList (Z)Ljava/util/List;
- public abstract fun getNewFriendRequestList (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
- public static synthetic fun getNewFriendRequestList$default (Lnet/mamoe/mirai/Bot;ZILjava/lang/Object;)Ljava/util/List;
- public static synthetic fun getNewFriendRequestList$default (Lnet/mamoe/mirai/Bot;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+ public fun getNewFriendRequestList ()Ljava/util/List;
+ public abstract fun getNewFriendRequestList (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public abstract fun getOtherClients ()Lnet/mamoe/mirai/contact/ContactList;
public fun getStranger (J)Lnet/mamoe/mirai/contact/Stranger;
public fun getStrangerOrFail (J)Lnet/mamoe/mirai/contact/Stranger;
diff --git a/mirai-core-api/src/commonMain/kotlin/Bot.kt b/mirai-core-api/src/commonMain/kotlin/Bot.kt
index f38ce4b3d..6ae905c3e 100644
--- a/mirai-core-api/src/commonMain/kotlin/Bot.kt
+++ b/mirai-core-api/src/commonMain/kotlin/Bot.kt
@@ -175,9 +175,9 @@ public interface Bot : CoroutineScope, ContactOrBot, UserOrBot {
* 获取未处理的好友请求
*
* @see RequestEventData.NewFriendRequest
- * @since 2.16
+ * @since 2.17
*/
- public suspend fun getNewFriendRequestList(broadcast: Boolean = false): List<RequestEventData.NewFriendRequest>
+ public suspend fun getNewFriendRequestList(): List<RequestEventData.NewFriendRequest>
/**
* 关闭这个 [Bot], 立即取消 [Bot] 的 [SupervisorJob], 取消与这个 [Bot] 相关的所有有协程联系的任务.
diff --git a/mirai-core-mock/src/internal/MockBotImpl.kt b/mirai-core-mock/src/internal/MockBotImpl.kt
index e04be930e..c2a8f7c84 100644
--- a/mirai-core-mock/src/internal/MockBotImpl.kt
+++ b/mirai-core-mock/src/internal/MockBotImpl.kt
@@ -121,7 +121,7 @@ internal class MockBotImpl(
}
}
- override suspend fun getNewFriendRequestList(broadcast: Boolean): List<RequestEventData.NewFriendRequest> {
+ override suspend fun getNewFriendRequestList(): List<RequestEventData.NewFriendRequest> {
return listOf()
}
diff --git a/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt b/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
index e3d344479..4a7bf2c84 100644
--- a/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
+++ b/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
@@ -322,7 +322,7 @@ internal open class QQAndroidBot constructor(
) // We can move the factory to configuration but this is not necessary for now.
}
- override suspend fun getNewFriendRequestList(broadcast: Boolean): List<RequestEventData.NewFriendRequest> {
+ override suspend fun getNewFriendRequestList(): List<RequestEventData.NewFriendRequest> {
return Mirai.getNewFriendRequestList(this)
}
}