From 3e1925e2fc49612d550c3a6af5a6876c1bf7130c Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Tue, 24 Mar 2020 16:39:06 +0800
Subject: [PATCH] Correct `JavaHappy` to `JavaFriendly`

---
 mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt  | 4 ++--
 .../mirai/{BotJavaHappyAPI.kt => BotJavaFriendlyAPI.kt}   | 4 ++--
 .../androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt | 4 ++--
 .../net/mamoe/mirai/contact/ContactJavaFriendlyAPI.kt     | 6 +++---
 .../androidMain/kotlin/net/mamoe/mirai/contact/Member.kt  | 4 ++--
 .../kotlin/net/mamoe/mirai/message/MessageReceipt.kt      | 8 ++++----
 .../commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt  | 4 ++--
 .../commonMain/kotlin/net.mamoe.mirai/contact/Member.kt   | 4 ++--
 .../commonMain/kotlin/net.mamoe.mirai/contact/jvmHappy.kt | 6 +++---
 .../net.mamoe.mirai/{javaHappy.kt => javaFriendly.kt}     | 4 ++--
 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt      | 6 +++---
 .../mirai/{BotJavaHappyAPI.kt => BotJavaFriendlyAPI.kt}   | 4 ++--
 .../src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt | 4 ++--
 .../net/mamoe/mirai/contact/ContactJavaFriendlyAPI.kt     | 6 +++---
 .../src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt  | 4 ++--
 .../kotlin/net/mamoe/mirai/message/MessageReceipt.kt      | 8 ++++----
 16 files changed, 40 insertions(+), 40 deletions(-)
 rename mirai-core/src/androidMain/kotlin/net/mamoe/mirai/{BotJavaHappyAPI.kt => BotJavaFriendlyAPI.kt} (98%)
 rename mirai-core/src/commonMain/kotlin/net.mamoe.mirai/{javaHappy.kt => javaFriendly.kt} (89%)
 rename mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/{BotJavaHappyAPI.kt => BotJavaFriendlyAPI.kt} (98%)

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 8e1a41537..a6ad7ddd6 100644
--- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt
+++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt
@@ -25,9 +25,9 @@ import net.mamoe.mirai.utils.*
  */
 @Suppress("INAPPLICABLE_JVM_NAME")
 @OptIn(
-    MiraiInternalAPI::class, LowLevelAPI::class, MiraiExperimentalAPI::class, JavaHappyAPI::class
+    MiraiInternalAPI::class, LowLevelAPI::class, MiraiExperimentalAPI::class, JavaFriendlyAPI::class
 )
-actual abstract class Bot actual constructor() : CoroutineScope, LowLevelBotAPIAccessor, BotJavaHappyAPI() {
+actual abstract class Bot actual constructor() : CoroutineScope, LowLevelBotAPIAccessor, BotJavaFriendlyAPI() {
     actual companion object {
         /**
          * 复制一份此时的 [Bot] 实例列表.
diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/BotJavaHappyAPI.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt
similarity index 98%
rename from mirai-core/src/androidMain/kotlin/net/mamoe/mirai/BotJavaHappyAPI.kt
rename to mirai-core/src/androidMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt
index 7fcf98fbb..d8ade135e 100644
--- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/BotJavaHappyAPI.kt
+++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt
@@ -20,14 +20,14 @@ import java.util.concurrent.TimeoutException
  */
 @MiraiInternalAPI
 @Suppress("FunctionName", "INAPPLICABLE_JVM_NAME", "unused")
-actual abstract class BotJavaHappyAPI actual constructor() {
+actual abstract class BotJavaFriendlyAPI actual constructor() {
     init {
         @Suppress("LeakingThis")
         assert(this is Bot)
     }
 
     private inline fun <R> runBlocking(crossinline block: suspend Bot.() -> R): R {
-        return kotlinx.coroutines.runBlocking { block(this@BotJavaHappyAPI as Bot) }
+        return kotlinx.coroutines.runBlocking { block(this@BotJavaFriendlyAPI as Bot) }
     }
 
     private inline fun <R> future(crossinline block: suspend Bot.() -> R): Future<R> {
diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt
index fcca591f4..33350b226 100644
--- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt
+++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt
@@ -11,7 +11,7 @@ package net.mamoe.mirai.contact
 
 import kotlinx.coroutines.CoroutineScope
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.JavaHappyAPI
+import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.event.events.BeforeImageUploadEvent
 import net.mamoe.mirai.event.events.EventCancelledException
 import net.mamoe.mirai.event.events.ImageUploadEvent
@@ -32,7 +32,7 @@ import net.mamoe.mirai.utils.WeakRefProperty
  *
  * @author Him188moe
  */
-@OptIn(MiraiInternalAPI::class, JavaHappyAPI::class)
+@OptIn(MiraiInternalAPI::class, JavaFriendlyAPI::class)
 actual abstract class Contact : CoroutineScope, ContactJavaFriendlyAPI() {
     /**
      * 这个联系人所属 [Bot].
diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/ContactJavaFriendlyAPI.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/ContactJavaFriendlyAPI.kt
index b83210719..14b67b214 100644
--- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/ContactJavaFriendlyAPI.kt
+++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/ContactJavaFriendlyAPI.kt
@@ -13,7 +13,7 @@ import android.graphics.Bitmap
 import kotlinx.coroutines.Dispatchers
 import kotlinx.io.core.Input
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.JavaHappyAPI
+import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
 import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
@@ -31,7 +31,7 @@ import java.net.URL
 import java.util.concurrent.Future
 
 @MiraiInternalAPI
-@JavaHappyAPI
+@JavaFriendlyAPI
 @Suppress("INAPPLICABLE_JVM_NAME", "FunctionName", "unused")
 actual abstract class ContactJavaFriendlyAPI {
 
@@ -206,7 +206,7 @@ actual abstract class ContactJavaFriendlyAPI {
 
 @Suppress("INAPPLICABLE_JVM_NAME", "FunctionName", "unused", "unused")
 @MiraiInternalAPI
-@JavaHappyAPI
+@JavaFriendlyAPI
 actual abstract class MemberJavaFriendlyAPI : QQ() {
     private inline fun <R> runBlocking(crossinline block: suspend Member.() -> R): R {
         @Suppress("CAST_NEVER_SUCCEEDS")
diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt
index 083808cc1..7ae76a4ea 100644
--- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt
+++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt
@@ -12,7 +12,7 @@
 package net.mamoe.mirai.contact
 
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.JavaHappyAPI
+import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
 import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
@@ -25,7 +25,7 @@ import net.mamoe.mirai.utils.WeakRefProperty
  * 群成员.
  */
 @Suppress("INAPPLICABLE_JVM_NAME")
-@OptIn(MiraiInternalAPI::class, JavaHappyAPI::class)
+@OptIn(MiraiInternalAPI::class, JavaFriendlyAPI::class)
 actual abstract class Member : MemberJavaFriendlyAPI() {
     /**
      * 所在的群.
diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/message/MessageReceipt.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/message/MessageReceipt.kt
index eb9f59e2d..4f4b4cb70 100644
--- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/message/MessageReceipt.kt
+++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/message/MessageReceipt.kt
@@ -6,7 +6,7 @@ import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.runBlocking
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.JavaHappyAPI
+import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.LowLevelAPI
 import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.message.data.*
@@ -121,19 +121,19 @@ actual open class MessageReceipt<C : Contact> actual constructor(
     }
 
 
-    @JavaHappyAPI
+    @JavaFriendlyAPI
     @JvmName("quoteReply")
     fun __quoteReplyBlockingForJava__(message: Message) {
         runBlocking { quoteReply(message) }
     }
 
-    @JavaHappyAPI
+    @JavaFriendlyAPI
     @JvmName("recall")
     fun __recallBlockingForJava__() {
         runBlocking { recall() }
     }
 
-    @JavaHappyAPI
+    @JavaFriendlyAPI
     @JvmName("quote")
     fun __quoteBlockingForJava__() {
         runBlocking { quote() }
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt
index 941207161..41e2d4b5d 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt
@@ -14,7 +14,7 @@ package net.mamoe.mirai.contact
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.JavaHappyAPI
+import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.event.events.BeforeImageUploadEvent
 import net.mamoe.mirai.event.events.EventCancelledException
 import net.mamoe.mirai.event.events.ImageUploadEvent
@@ -35,7 +35,7 @@ import kotlin.jvm.JvmSynthetic
  *
  * @author Him188moe
  */ // 不要删除多平台结构 !!! kotlin bug
-@OptIn(MiraiInternalAPI::class, JavaHappyAPI::class)
+@OptIn(MiraiInternalAPI::class, JavaFriendlyAPI::class)
 expect abstract class Contact() : CoroutineScope, ContactJavaFriendlyAPI {
     /**
      * 这个联系人所属 [Bot].
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt
index 2c48dcf8a..faab5e7ea 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt
@@ -12,7 +12,7 @@
 package net.mamoe.mirai.contact
 
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.JavaHappyAPI
+import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.message.MessageReceipt
 import net.mamoe.mirai.message.data.Message
@@ -26,7 +26,7 @@ import kotlin.time.ExperimentalTime
  * 群成员.
  */ // 不要删除多平台结构, kotlin bug
 @Suppress("INAPPLICABLE_JVM_NAME")
-@OptIn(MiraiInternalAPI::class, JavaHappyAPI::class)
+@OptIn(MiraiInternalAPI::class, JavaFriendlyAPI::class)
 expect abstract class Member() : MemberJavaFriendlyAPI {
     /**
      * 所在的群.
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/jvmHappy.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/jvmHappy.kt
index 3bcfe4d26..5b087ed63 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/jvmHappy.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/jvmHappy.kt
@@ -9,19 +9,19 @@
 
 package net.mamoe.mirai.contact
 
-import net.mamoe.mirai.JavaHappyAPI
+import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.utils.MiraiInternalAPI
 
 /**
  * [Contact] 中为了让 `Java` 更容易调用的 API
  */
 @MiraiInternalAPI
-@JavaHappyAPI
+@JavaFriendlyAPI
 expect abstract class ContactJavaFriendlyAPI
 
 /**
  * [Member] 中为了让 `Java` 更容易调用的 API
  */
 @MiraiInternalAPI
-@JavaHappyAPI
+@JavaFriendlyAPI
 expect abstract class MemberJavaFriendlyAPI : QQ
\ No newline at end of file
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/javaHappy.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/javaFriendly.kt
similarity index 89%
rename from mirai-core/src/commonMain/kotlin/net.mamoe.mirai/javaHappy.kt
rename to mirai-core/src/commonMain/kotlin/net.mamoe.mirai/javaFriendly.kt
index 31de9e48c..d43fcc6fb 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/javaHappy.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/javaFriendly.kt
@@ -17,14 +17,14 @@ import net.mamoe.mirai.utils.MiraiInternalAPI
 @MiraiInternalAPI
 @RequiresOptIn(level = RequiresOptIn.Level.ERROR)
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION, AnnotationTarget.TYPE, AnnotationTarget.CLASS)
-annotation class JavaHappyAPI
+annotation class JavaFriendlyAPI
 
 /**
  * [Bot] 中为了让 Java 使用者调用更方便的 API 列表.
  */
 @MiraiInternalAPI
 @Suppress("FunctionName", "INAPPLICABLE_JVM_NAME", "unused")
-expect abstract class BotJavaHappyAPI() { // 不要使用 interface, 会无法添加默认实现
+expect abstract class BotJavaFriendlyAPI() { // 不要使用 interface, 会无法添加默认实现
 }
 
 // 保留多平台结构, 以避免在 Android 和 JVM 都定义这个类 ---- 这会造成代码重复.
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 7a266a180..7151e2817 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt
@@ -25,9 +25,9 @@ import net.mamoe.mirai.utils.*
  */
 @Suppress("INAPPLICABLE_JVM_NAME")
 @OptIn(
-    MiraiInternalAPI::class, LowLevelAPI::class, MiraiExperimentalAPI::class, JavaHappyAPI::class
+    MiraiInternalAPI::class, LowLevelAPI::class, MiraiExperimentalAPI::class, JavaFriendlyAPI::class
 )
-actual abstract class Bot actual constructor() : CoroutineScope, LowLevelBotAPIAccessor, BotJavaHappyAPI() {
+actual abstract class Bot actual constructor() : CoroutineScope, LowLevelBotAPIAccessor, BotJavaFriendlyAPI() {
     actual companion object {
         /**
          * 复制一份此时的 [Bot] 实例列表.
@@ -46,7 +46,7 @@ actual abstract class Bot actual constructor() : CoroutineScope, LowLevelBotAPIA
         /**
          * 遍历每一个 [Bot] 实例
          */
-        @JavaHappyAPI
+        @JavaFriendlyAPI
         @JvmName("forEachInstance")
         @Suppress("FunctionName")
         fun __forEachInstanceForJava__(block: (Bot) -> Unit) = forEachInstance(block)
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaHappyAPI.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt
similarity index 98%
rename from mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaHappyAPI.kt
rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt
index 5f77238e9..91216dec3 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaHappyAPI.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt
@@ -20,14 +20,14 @@ import java.util.concurrent.TimeoutException
  */
 @MiraiInternalAPI
 @Suppress("FunctionName", "INAPPLICABLE_JVM_NAME", "unused")
-actual abstract class BotJavaHappyAPI actual constructor() {
+actual abstract class BotJavaFriendlyAPI actual constructor() {
     init {
         @Suppress("LeakingThis")
         assert(this is Bot)
     }
 
     private inline fun <R> runBlocking(crossinline block: suspend Bot.() -> R): R {
-        return kotlinx.coroutines.runBlocking { block(this@BotJavaHappyAPI as Bot) }
+        return kotlinx.coroutines.runBlocking { block(this@BotJavaFriendlyAPI as Bot) }
     }
 
     private inline fun <R> future(crossinline block: suspend Bot.() -> R): Future<R> {
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt
index 1e6267e86..037f95db2 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt
@@ -11,7 +11,7 @@ package net.mamoe.mirai.contact
 
 import kotlinx.coroutines.CoroutineScope
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.JavaHappyAPI
+import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.event.events.BeforeImageUploadEvent
 import net.mamoe.mirai.event.events.EventCancelledException
 import net.mamoe.mirai.event.events.ImageUploadEvent
@@ -31,7 +31,7 @@ import net.mamoe.mirai.utils.WeakRefProperty
  *
  * @author Him188moe
  */
-@OptIn(MiraiInternalAPI::class, JavaHappyAPI::class)
+@OptIn(MiraiInternalAPI::class, JavaFriendlyAPI::class)
 actual abstract class Contact : CoroutineScope, ContactJavaFriendlyAPI() {
     /**
      * 这个联系人所属 [Bot].
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/ContactJavaFriendlyAPI.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/ContactJavaFriendlyAPI.kt
index 47a8aabba..8bf1de8c2 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/ContactJavaFriendlyAPI.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/ContactJavaFriendlyAPI.kt
@@ -12,7 +12,7 @@ package net.mamoe.mirai.contact
 import kotlinx.coroutines.Dispatchers
 import kotlinx.io.core.Input
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.JavaHappyAPI
+import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
 import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
@@ -31,7 +31,7 @@ import java.net.URL
 import java.util.concurrent.Future
 
 @MiraiInternalAPI
-@JavaHappyAPI
+@JavaFriendlyAPI
 @Suppress("INAPPLICABLE_JVM_NAME", "FunctionName", "unused")
 actual abstract class ContactJavaFriendlyAPI {
 
@@ -204,7 +204,7 @@ actual abstract class ContactJavaFriendlyAPI {
 
 @Suppress("INAPPLICABLE_JVM_NAME", "FunctionName", "unused", "unused")
 @MiraiInternalAPI
-@JavaHappyAPI
+@JavaFriendlyAPI
 actual abstract class MemberJavaFriendlyAPI : QQ() {
     private inline fun <R> runBlocking(crossinline block: suspend Member.() -> R): R {
         @Suppress("CAST_NEVER_SUCCEEDS")
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt
index c785ce53a..2d585bbbc 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt
@@ -12,7 +12,7 @@
 package net.mamoe.mirai.contact
 
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.JavaHappyAPI
+import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
 import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
@@ -24,7 +24,7 @@ import net.mamoe.mirai.utils.WeakRefProperty
 /**
  * 群成员.
  */
-@OptIn(MiraiInternalAPI::class, JavaHappyAPI::class)
+@OptIn(MiraiInternalAPI::class, JavaFriendlyAPI::class)
 @Suppress("INAPPLICABLE_JVM_NAME")
 actual abstract class Member : MemberJavaFriendlyAPI() {
     /**
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/MessageReceipt.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/MessageReceipt.kt
index d18337e0d..58595ccbe 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/MessageReceipt.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/MessageReceipt.kt
@@ -6,7 +6,7 @@ import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.runBlocking
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.JavaHappyAPI
+import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.LowLevelAPI
 import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.message.data.*
@@ -113,19 +113,19 @@ actual open class MessageReceipt<C : Contact> actual constructor(
     }
 
 
-    @JavaHappyAPI
+    @JavaFriendlyAPI
     @JvmName("quoteReply")
     fun __quoteReplyBlockingForJava__(message: Message) {
         runBlocking { quoteReply(message) }
     }
 
-    @JavaHappyAPI
+    @JavaFriendlyAPI
     @JvmName("recall")
     fun __recallBlockingForJava__() {
         runBlocking { recall() }
     }
 
-    @JavaHappyAPI
+    @JavaFriendlyAPI
     @JvmName("quote")
     fun __quoteBlockingForJava__() {
         runBlocking { quote() }