github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-03 02:04:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix VerifyError

Browse Source
This commit is contained in:
Him188 2020-05-11 11:34:08 +08:00
parent 8cb8adc478
commit 45f00b4651
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Message.kt
View File

@ -10,7 +10,7 @@
@file:Suppress(
"MemberVisibilityCanBePrivate", "unused", "EXPERIMENTAL_API_USAGE",
"NOTHING_TO_INLINE", "INVISIBLE_MEMBER", "INVISIBLE_REFERENCE",
"INAPPLICABLE_JVM_NAME", "WRONG_MODIFIER_CONTAINING_DECLARATION"
"INAPPLICABLE_JVM_NAME"
)
@file:JvmMultifileClass
@file:JvmName("MessageUtils")
@ -166,7 +166,7 @@ interface Message { // must be interface. Don't consider any changes.
*
* @sample net.mamoe.mirai.message.data.ContentEqualsTest
*/
final fun contentEquals(another: Message, ignoreCase: Boolean = false): Boolean =
/* final */ fun contentEquals(another: Message, ignoreCase: Boolean = false): Boolean =
contentEqualsImpl(another, ignoreCase)
/**
@ -178,7 +178,7 @@ interface Message { // must be interface. Don't consider any changes.
*
* @sample net.mamoe.mirai.message.data.ContentEqualsTest
*/
final fun contentEquals(another: String, ignoreCase: Boolean = false): Boolean {
/* final */ fun contentEquals(another: String, ignoreCase: Boolean = false): Boolean {
if (!this.contentToString().equals(another, ignoreCase = ignoreCase)) return false
return when (this) {
is SingleMessage -> true
@ -187,19 +187,19 @@ interface Message { // must be interface. Don't consider any changes.
}
}
final operator fun plus(another: MessageChain): MessageChain = this + another as Message
final operator fun plus(another: Message): MessageChain = this.followedBy(another)
final operator fun plus(another: SingleMessage): MessageChain = this.followedBy(another)
final operator fun plus(another: String): MessageChain = this.followedBy(another.toMessage())
final operator fun plus(another: CharSequence): MessageChain = this.followedBy(another.toString().toMessage())
final operator fun plus(another: Iterable<Message>): MessageChain =
/* final */ operator fun plus(another: MessageChain): MessageChain = this + another as Message
/* final */ operator fun plus(another: Message): MessageChain = this.followedBy(another)
/* final */ operator fun plus(another: SingleMessage): MessageChain = this.followedBy(another)
/* final */ operator fun plus(another: String): MessageChain = this.followedBy(another.toMessage())
/* final */ operator fun plus(another: CharSequence): MessageChain = this.followedBy(another.toString().toMessage())
/* final */ operator fun plus(another: Iterable<Message>): MessageChain =
another.fold(this, Message::plus).asMessageChain()
@JvmName("plusIterableString")
final operator fun plus(another: Iterable<String>): MessageChain =
/* final */ operator fun plus(another: Iterable<String>): MessageChain =
another.fold(this, Message::plus).asMessageChain()
final operator fun plus(another: Sequence<Message>): MessageChain =
/* final */ operator fun plus(another: Sequence<Message>): MessageChain =
another.fold(this, Message::plus).asMessageChain()
}
@ -312,7 +312,7 @@ interface MessageMetadata : SingleMessage {
/**
* 返回空字符串
*/
final override fun contentToString(): String = ""
/* final */ override fun contentToString(): String = ""
}
/**

3
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/data/Image.kt
View File

@ -9,7 +9,6 @@
@file:JvmMultifileClass
@file:JvmName("MessageUtils")
@file:Suppress("WRONG_MODIFIER_CONTAINING_DECLARATION")
package net.mamoe.mirai.message.data
@ -78,7 +77,7 @@ actual interface Image : Message, MessageContent {
@Deprecated("""
不要自行实现 OnlineGroupImage, 它必须由协议模块实现, 否则会无法发送也无法解析.
""", level = DeprecationLevel.HIDDEN)
@Suppress( "PropertyName", "unused")
@Suppress("WRONG_MODIFIER_CONTAINING_DECLARATION", "PropertyName", "unused")
@get:JvmSynthetic
internal actual val DoNotImplementThisClass: Nothing?
}