This commit is contained in:
Him188 2020-05-06 12:46:25 +08:00
parent 07004311f4
commit cdb188cd42

View File

@ -9,7 +9,7 @@
@file:JvmMultifileClass @file:JvmMultifileClass
@file:JvmName("MessageUtils") @file:JvmName("MessageUtils")
@file:Suppress("unused", "NOTHING_TO_INLINE") @file:Suppress("unused", "NOTHING_TO_INLINE", "WRONG_MODIFIER_CONTAINING_DECLARATION", "INAPPLICABLE_JVM_NAME")
@file:OptIn(MiraiInternalAPI::class) @file:OptIn(MiraiInternalAPI::class)
package net.mamoe.mirai.message.data package net.mamoe.mirai.message.data
@ -17,6 +17,7 @@ package net.mamoe.mirai.message.data
import net.mamoe.mirai.JavaFriendlyAPI import net.mamoe.mirai.JavaFriendlyAPI
import net.mamoe.mirai.utils.MiraiExperimentalAPI import net.mamoe.mirai.utils.MiraiExperimentalAPI
import net.mamoe.mirai.utils.MiraiInternalAPI import net.mamoe.mirai.utils.MiraiInternalAPI
import net.mamoe.mirai.utils.PlannedRemoval
import kotlin.js.JsName import kotlin.js.JsName
import kotlin.jvm.JvmMultifileClass import kotlin.jvm.JvmMultifileClass
import kotlin.jvm.JvmName import kotlin.jvm.JvmName
@ -51,7 +52,6 @@ interface MessageChain : Message, Iterable<SingleMessage> {
* *
* @param key 由各个类型消息的伴生对象持有. [PlainText.Key] * @param key 由各个类型消息的伴生对象持有. [PlainText.Key]
*/ */
@Suppress("WRONG_MODIFIER_CONTAINING_DECLARATION", "INAPPLICABLE_JVM_NAME")
@JvmName("first") @JvmName("first")
final operator fun <M : Message> get(key: Message.Key<M>): M? = firstOrNull(key) final operator fun <M : Message> get(key: Message.Key<M>): M? = firstOrNull(key)
@ -59,7 +59,7 @@ interface MessageChain : Message, Iterable<SingleMessage> {
* 遍历每一个有内容的消息, [At], [AtAll], [PlainText], [Image], [Face] * 遍历每一个有内容的消息, [At], [AtAll], [PlainText], [Image], [Face]
* 仅供 `Java` 使用 * 仅供 `Java` 使用
*/ */
@Suppress("WRONG_MODIFIER_CONTAINING_DECLARATION", "FunctionName", "INAPPLICABLE_JVM_NAME") @Suppress("FunctionName")
@JsName("forEachContent") @JsName("forEachContent")
@JvmName("forEachContent") @JvmName("forEachContent")
@JavaFriendlyAPI @JavaFriendlyAPI
@ -71,7 +71,7 @@ interface MessageChain : Message, Iterable<SingleMessage> {
* 遍历每一个消息, [MessageSource] [At], [AtAll], [PlainText], [Image], [QuoteReply] * 遍历每一个消息, [MessageSource] [At], [AtAll], [PlainText], [Image], [QuoteReply]
* 仅供 `Java` 使用 * 仅供 `Java` 使用
*/ */
@Suppress("WRONG_MODIFIER_CONTAINING_DECLARATION", "FunctionName", "INAPPLICABLE_JVM_NAME") @Suppress("FunctionName")
@JsName("forEach") @JsName("forEach")
@JvmName("forEach") @JvmName("forEach")
@JavaFriendlyAPI @JavaFriendlyAPI
@ -85,7 +85,7 @@ interface MessageChain : Message, Iterable<SingleMessage> {
* *
* @param key 由各个类型消息的伴生对象持有. [PlainText.Key] * @param key 由各个类型消息的伴生对象持有. [PlainText.Key]
*/ */
@Suppress("WRONG_MODIFIER_CONTAINING_DECLARATION", "INAPPLICABLE_JVM_NAME") @PlannedRemoval("1.2.0")
@JvmName("firstOrNull") @JvmName("firstOrNull")
@Deprecated("use get", ReplaceWith("get(key)")) @Deprecated("use get", ReplaceWith("get(key)"))
final fun <M : Message> getOrNull(key: Message.Key<M>): M? = get(key) final fun <M : Message> getOrNull(key: Message.Key<M>): M? = get(key)