Commit 3575e802 authored by Him188's avatar Him188

Deprecate CombinedMessage.constructor for future plan

parent 00522f41
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
package net.mamoe.mirai.message.data package net.mamoe.mirai.message.data
import net.mamoe.mirai.utils.MiraiExperimentalAPI
import net.mamoe.mirai.utils.MiraiInternalAPI
import kotlin.jvm.JvmMultifileClass import kotlin.jvm.JvmMultifileClass
import kotlin.jvm.JvmName import kotlin.jvm.JvmName
...@@ -25,12 +27,17 @@ import kotlin.jvm.JvmName ...@@ -25,12 +27,17 @@ import kotlin.jvm.JvmName
* *
* Left-biased list * Left-biased list
*/ */
class CombinedMessage( class CombinedMessage
@Deprecated(message = "use Message.plus", level = DeprecationLevel.ERROR)
@MiraiInternalAPI("CombinedMessage 构造器可能会在将来被改动") constructor(
@MiraiExperimentalAPI("CombinedMessage.left 可能会在将来被改动")
val left: Message, val left: Message,
@MiraiExperimentalAPI("CombinedMessage.tail 可能会在将来被改动")
val tail: Message val tail: Message
) : Iterable<Message>, Message { ) : Iterable<Message>, Message {
// 不要把它用作 local function, 会编译错误 // 不要把它用作 local function, 会编译错误
@OptIn(MiraiExperimentalAPI::class)
private suspend fun SequenceScope<Message>.yieldCombinedOrElements(message: Message) { private suspend fun SequenceScope<Message>.yieldCombinedOrElements(message: Message) {
when (message) { when (message) {
is CombinedMessage -> { is CombinedMessage -> {
...@@ -68,10 +75,16 @@ class CombinedMessage( ...@@ -68,10 +75,16 @@ class CombinedMessage(
return asSequence().iterator() return asSequence().iterator()
} }
@OptIn(MiraiExperimentalAPI::class)
override fun toString(): String { override fun toString(): String {
return tail.toString() + left.toString() return tail.toString() + left.toString()
} }
override fun contentToString(): String {
return toString()
}
@OptIn(MiraiExperimentalAPI::class)
fun isFlat(): Boolean { fun isFlat(): Boolean {
return tail is SingleMessage && left is SingleMessage return tail is SingleMessage && left is SingleMessage
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment