From 869cb81f7e8d7ad1295090f8d5cfafe73a3bda4e Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Tue, 24 Mar 2020 16:41:42 +0800
Subject: [PATCH] Remove Bot.contains

---
 mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt  | 8 --------
 .../kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt          | 1 +
 mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt   | 5 -----
 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt      | 8 --------
 .../jvmMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt  | 1 +
 5 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt
index a6ad7ddd6..fd61cac27 100644
--- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt
+++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt
@@ -82,14 +82,6 @@ actual abstract class Bot actual constructor() : CoroutineScope, LowLevelBotAPIA
      */
     actual abstract val friends: ContactList<QQ>
 
-    /**
-     * 判断是否有这个 id 的好友或群.
-     * 在一些情况下这可能会造成歧义. 请考虑后使用.
-     */
-    actual operator fun contains(id: Long): Boolean {
-        return this.friends.contains(id) || this.groups.contains(id)
-    }
-
     /**
      * 获取一个好友对象. 若没有这个好友, 则会抛出异常 [NoSuchElementException]
      */
diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt
index d8ade135e..5e0d51757 100644
--- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt
+++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt
@@ -126,6 +126,7 @@ actual abstract class BotJavaFriendlyAPI actual constructor() {
      * @param message 若需要验证请求时的验证消息.
      * @param remark 好友备注
      */
+    @OptIn(MiraiExperimentalAPI::class)
     @JvmName("addFriend")
     fun __addFriendBlockingForJava__(
         id: Long,
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 100a169de..917d932f5 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
@@ -103,11 +103,6 @@ expect abstract class Bot() : CoroutineScope, LowLevelBotAPIAccessor {
      */
     abstract val friends: ContactList<QQ>
 
-    /**
-     * 判断是否有这个 id 的好友或群.
-     */
-    operator fun contains(id: Long): Boolean
-
     /**
      * 获取一个好友对象. 若没有这个好友, 则会抛出异常 [NoSuchElementException]
      */
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt
index 7151e2817..f5f9a80bb 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt
@@ -92,14 +92,6 @@ actual abstract class Bot actual constructor() : CoroutineScope, LowLevelBotAPIA
      */
     actual abstract val friends: ContactList<QQ>
 
-    /**
-     * 判断是否有这个 id 的好友或群.
-     * 在一些情况下这可能会造成歧义. 请考虑后使用.
-     */
-    actual operator fun contains(id: Long): Boolean {
-        return this.friends.contains(id) || this.groups.contains(id)
-    }
-
     /**
      * 获取一个好友对象. 若没有这个好友, 则会抛出异常 [NoSuchElementException]
      */
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt
index 91216dec3..2958730af 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt
@@ -126,6 +126,7 @@ actual abstract class BotJavaFriendlyAPI actual constructor() {
      * @param message 若需要验证请求时的验证消息.
      * @param remark 好友备注
      */
+    @OptIn(MiraiExperimentalAPI::class)
     @JvmName("addFriend")
     fun __addFriendBlockingForJava__(
         id: Long,