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

Fix #187

Browse Source
This commit is contained in:
Him188 2020-04-04 14:50:53 +08:00
parent c3be191db0
commit eb482a4303
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/builder.kt
View File

@ -9,6 +9,7 @@
@file:JvmMultifileClass
@file:JvmName("MessageUtils")
@file:Suppress("unused")
package net.mamoe.mirai.message.data
@ -44,7 +45,7 @@ inline fun buildMessageChain(initialSize: Int, block: MessageChainBuilder.() ->
*/
@JvmSynthetic
inline fun buildMessageChain(
container: MutableCollection<Message>,
container: MutableCollection<SingleMessage>,
block: MessageChainBuilder.() -> Unit
): MessageChain {
return MessageChainBuilder(container).apply(block).asMessageChain()
@ -59,18 +60,34 @@ inline fun buildMessageChain(
*/
class MessageChainBuilder
@JvmOverloads constructor(
private val container: MutableCollection<Message> = mutableListOf()
) : MutableCollection<Message> by container, Appendable {
constructor(initialSize: Int) : this(ArrayList<Message>(initialSize))
private val container: MutableCollection<SingleMessage> = mutableListOf()
) : MutableCollection<SingleMessage> by container, Appendable {
constructor(initialSize: Int) : this(ArrayList<SingleMessage>(initialSize))
override fun add(element: Message): Boolean {
override fun add(element: SingleMessage): Boolean {
flushCache()
return container.add(element)
}
override fun addAll(elements: Collection<Message>): Boolean {
fun add(element: Message): Boolean {
flushCache()
return container.addAll(elements)
@Suppress("UNCHECKED_CAST")
return when (element) {
is SingleMessage -> container.add(element)
is Iterable<*> -> this.addAll(element.flatten())
else -> error("stub")
}
}
override fun addAll(elements: Collection<SingleMessage>): Boolean {
flushCache()
return container.addAll(elements.flatten())
}
@JvmName("addAllFlatten") // erased generic type cause declaration clash
fun addAll(elements: Collection<Message>): Boolean {
flushCache()
return container.addAll(elements.flatten())
}
operator fun Message.unaryPlus() {
@ -78,6 +95,7 @@ class MessageChainBuilder
add(this)
}
operator fun String.unaryPlus() {
add(this)
}
@ -91,6 +109,11 @@ class MessageChainBuilder
this.add(message)
}
operator fun plusAssign(message: SingleMessage) { // avoid resolution ambiguity
flushCache()
this.add(message)
}
fun add(plain: String) {
withCache { append(plain) }
}
@ -123,6 +146,6 @@ class MessageChainBuilder
fun asMessageChain(): MessageChain {
this.flushCache()
return (this as MutableCollection<Message>).asMessageChain()
return (this as MutableCollection<SingleMessage>).asMessageChain()
}
}