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

Fix

Browse Source
This commit is contained in:
Him188 2019-10-25 21:21:38 +08:00
parent 354321dedc
commit d786f59f5c
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,6 +212,8 @@ object NullMessageChain : MessageChain {
override val stringValue: String override val stringValue: String
get() = "" get() = ""
override fun toString(): String = stringValue
override fun contains(sub: String): Boolean = false override fun contains(sub: String): Boolean = false
override fun contains(element: Message): Boolean = false override fun contains(element: Message): Boolean = false
override fun concat(tail: Message): MessageChain = MessageChainImpl(tail) override fun concat(tail: Message): MessageChain = MessageChainImpl(tail)
@ -271,6 +273,8 @@ internal inline class MessageChainImpl constructor(
// region Message override // region Message override
override val stringValue: String get() = this.delegate.joinToString("") { it.stringValue } override val stringValue: String get() = this.delegate.joinToString("") { it.stringValue }
override fun toString(): String = stringValue
override operator fun contains(sub: String): Boolean = delegate.any { it.contains(sub) } override operator fun contains(sub: String): Boolean = delegate.any { it.contains(sub) }
override fun concat(tail: Message): MessageChain { override fun concat(tail: Message): MessageChain {
if (tail is MessageChain) tail.forEach { child -> this.concat(child) } if (tail is MessageChain) tail.forEach { child -> this.concat(child) }
@ -324,6 +328,7 @@ internal inline class SingleMessageChainImpl(
return this return this
} }
override fun toString(): String = stringValue
// endregion // endregion
// region MutableList override // region MutableList override
override fun containsAll(elements: Collection<Message>): Boolean = elements.all { it === delegate } override fun containsAll(elements: Collection<Message>): Boolean = elements.all { it === delegate }
@ -339,23 +344,28 @@ internal inline class SingleMessageChainImpl(
override fun clear() = throw UnsupportedOperationException() override fun clear() = throw UnsupportedOperationException()
override fun listIterator(): MutableListIterator<Message> = object : MutableListIterator<Message> { override fun listIterator(): MutableListIterator<Message> = object : MutableListIterator<Message> {
private var hasNext = true private var hasNext = true
override fun hasPrevious(): Boolean = false override fun hasPrevious(): Boolean = !hasNext
override fun nextIndex(): Int = if (hasNext) 0 else -1 override fun nextIndex(): Int = if (hasNext) 0 else -1
override fun previous(): Message = throw NoSuchElementException() override fun previous(): Message =
override fun previousIndex(): Int = -1 if (hasPrevious()) {
hasNext = true
delegate
} else throw NoSuchElementException()
override fun previousIndex(): Int = if (!hasNext) 0 else -1
override fun add(element: Message) = throw UnsupportedOperationException() override fun add(element: Message) = throw UnsupportedOperationException()
override fun hasNext(): Boolean = !hasNext override fun hasNext(): Boolean = hasNext
override fun next(): Message = override fun next(): Message =
if (hasNext) { if (hasNext) {
hasNext = false hasNext = false
this@SingleMessageChainImpl delegate
} else throw NoSuchElementException() } else throw NoSuchElementException()
override fun remove() = throw UnsupportedOperationException() override fun remove() = throw UnsupportedOperationException()
override fun set(element: Message) = throw UnsupportedOperationException() override fun set(element: Message) = throw UnsupportedOperationException()
} }
override fun listIterator(index: Int): MutableListIterator<Message> = throw UnsupportedOperationException() override fun listIterator(index: Int): MutableListIterator<Message> = if (index == 0) listIterator() else throw UnsupportedOperationException()
override fun remove(element: Message): Boolean = throw UnsupportedOperationException() override fun remove(element: Message): Boolean = throw UnsupportedOperationException()
override fun removeAll(elements: Collection<Message>): Boolean = throw UnsupportedOperationException() override fun removeAll(elements: Collection<Message>): Boolean = throw UnsupportedOperationException()
override fun removeAt(index: Int): Message = throw UnsupportedOperationException() override fun removeAt(index: Int): Message = throw UnsupportedOperationException()
@ -372,11 +382,11 @@ internal inline class SingleMessageChainImpl(
override fun iterator(): MutableIterator<Message> = object : MutableIterator<Message> { override fun iterator(): MutableIterator<Message> = object : MutableIterator<Message> {
private var hasNext = true private var hasNext = true
override fun hasNext(): Boolean = !hasNext override fun hasNext(): Boolean = hasNext
override fun next(): Message = override fun next(): Message =
if (hasNext) { if (hasNext) {
hasNext = false hasNext = false
this@SingleMessageChainImpl delegate
} else throw NoSuchElementException() } else throw NoSuchElementException()
override fun remove() = throw UnsupportedOperationException() override fun remove() = throw UnsupportedOperationException()

2
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/internal/MessageDataInternal.kt
View File

@ -249,7 +249,7 @@ fun MessageChain.toPacket(forGroup: Boolean): ByteReadPacket = buildPacket {
} }
} }
else -> throw UnsupportedOperationException("${this::class.simpleName} is not supported") else -> throw UnsupportedOperationException("${this::class.simpleName} is not supported(Full MessageChain=${this@toPacket})")
} }
}) })
} }