Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
aa553ebb
Commit
aa553ebb
authored
Mar 29, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add `MessageChain.size`
parent
e7a691dc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
5 deletions
+20
-5
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt
...nMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt
+20
-5
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt
View file @
aa553ebb
...
@@ -16,6 +16,7 @@ package net.mamoe.mirai.message.data
...
@@ -16,6 +16,7 @@ package net.mamoe.mirai.message.data
import
net.mamoe.mirai.message.data.NullMessageChain.equals
import
net.mamoe.mirai.message.data.NullMessageChain.equals
import
net.mamoe.mirai.message.data.NullMessageChain.toString
import
net.mamoe.mirai.message.data.NullMessageChain.toString
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
net.mamoe.mirai.utils.SinceMirai
import
kotlin.js.JsName
import
kotlin.js.JsName
import
kotlin.jvm.JvmMultifileClass
import
kotlin.jvm.JvmMultifileClass
import
kotlin.jvm.JvmName
import
kotlin.jvm.JvmName
...
@@ -45,6 +46,12 @@ interface MessageChain : Message, Iterable<SingleMessage> {
...
@@ -45,6 +46,12 @@ interface MessageChain : Message, Iterable<SingleMessage> {
override
operator
fun
contains
(
sub
:
String
):
Boolean
override
operator
fun
contains
(
sub
:
String
):
Boolean
override
fun
toString
():
String
override
fun
toString
():
String
/**
* 元素数量
*/
@SinceMirai
(
"0.31.1"
)
val
size
:
Int
/**
/**
* 获取第一个类型为 [key] 的 [Message] 实例
* 获取第一个类型为 [key] 的 [Message] 实例
*
*
...
@@ -374,7 +381,6 @@ inline fun MessageChain.flatten(): Sequence<SingleMessage> = this.asSequence() /
...
@@ -374,7 +381,6 @@ inline fun MessageChain.flatten(): Sequence<SingleMessage> = this.asSequence() /
// endregion converters
// endregion converters
// region implementations
/**
/**
* 不含任何元素的 [MessageChain]
* 不含任何元素的 [MessageChain]
...
@@ -389,19 +395,25 @@ object EmptyMessageChain : MessageChain by MessageChainImplByIterable(emptyList(
...
@@ -389,19 +395,25 @@ object EmptyMessageChain : MessageChain by MessageChainImplByIterable(emptyList(
*/
*/
object
NullMessageChain
:
MessageChain
{
object
NullMessageChain
:
MessageChain
{
override
fun
toString
():
String
=
"NullMessageChain"
override
fun
toString
():
String
=
"NullMessageChain"
override
val
size
:
Int
get
()
=
0
override
fun
equals
(
other
:
Any
?):
Boolean
=
other
===
this
override
fun
equals
(
other
:
Any
?):
Boolean
=
other
===
this
override
fun
contains
(
sub
:
String
):
Boolean
=
error
(
"accessing NullMessageChain"
)
override
fun
contains
(
sub
:
String
):
Boolean
=
error
(
"accessing NullMessageChain"
)
override
fun
followedBy
(
tail
:
Message
):
CombinedMessage
=
CombinedMessage
(
left
=
EmptyMessageChain
,
tail
=
tail
)
override
fun
followedBy
(
tail
:
Message
):
CombinedMessage
=
CombinedMessage
(
left
=
EmptyMessageChain
,
tail
=
tail
)
override
fun
iterator
():
MutableIterator
<
SingleMessage
>
=
error
(
"accessing NullMessageChain"
)
override
fun
iterator
():
MutableIterator
<
SingleMessage
>
=
error
(
"accessing NullMessageChain"
)
}
}
// region implementations
/**
/**
* 使用 [Iterable] 作为委托的 [MessageChain]
* 使用 [Iterable] 作为委托的 [MessageChain]
*/
*/
@PublishedApi
@PublishedApi
internal
inline
class
MessageChainImplByIterable
constructor
(
internal
class
MessageChainImplByIterable
constructor
(
private
val
delegate
:
Iterable
<
SingleMessage
>
private
val
delegate
:
Iterable
<
SingleMessage
>
)
:
Message
,
Iterable
<
SingleMessage
>,
MessageChain
{
)
:
Message
,
Iterable
<
SingleMessage
>,
MessageChain
{
override
val
size
:
Int
by
lazy
{
delegate
.
count
()
}
override
fun
iterator
():
Iterator
<
SingleMessage
>
=
delegate
.
iterator
()
override
fun
iterator
():
Iterator
<
SingleMessage
>
=
delegate
.
iterator
()
override
fun
toString
():
String
=
this
.
delegate
.
joinToString
(
""
)
{
it
.
toString
()
}
override
fun
toString
():
String
=
this
.
delegate
.
joinToString
(
""
)
{
it
.
toString
()
}
override
operator
fun
contains
(
sub
:
String
):
Boolean
=
delegate
.
any
{
it
.
contains
(
sub
)
}
override
operator
fun
contains
(
sub
:
String
):
Boolean
=
delegate
.
any
{
it
.
contains
(
sub
)
}
...
@@ -411,9 +423,10 @@ internal inline class MessageChainImplByIterable constructor(
...
@@ -411,9 +423,10 @@ internal inline class MessageChainImplByIterable constructor(
* 使用 [Collection] 作为委托的 [MessageChain]
* 使用 [Collection] 作为委托的 [MessageChain]
*/
*/
@PublishedApi
@PublishedApi
internal
inline
class
MessageChainImplByCollection
constructor
(
internal
class
MessageChainImplByCollection
constructor
(
private
val
delegate
:
Collection
<
SingleMessage
>
private
val
delegate
:
Collection
<
SingleMessage
>
)
:
Message
,
Iterable
<
SingleMessage
>,
MessageChain
{
)
:
Message
,
Iterable
<
SingleMessage
>,
MessageChain
{
override
val
size
:
Int
get
()
=
delegate
.
size
override
fun
iterator
():
Iterator
<
SingleMessage
>
=
delegate
.
iterator
()
override
fun
iterator
():
Iterator
<
SingleMessage
>
=
delegate
.
iterator
()
override
fun
toString
():
String
=
this
.
delegate
.
joinToString
(
""
)
{
it
.
toString
()
}
override
fun
toString
():
String
=
this
.
delegate
.
joinToString
(
""
)
{
it
.
toString
()
}
override
operator
fun
contains
(
sub
:
String
):
Boolean
=
delegate
.
any
{
it
.
contains
(
sub
)
}
override
operator
fun
contains
(
sub
:
String
):
Boolean
=
delegate
.
any
{
it
.
contains
(
sub
)
}
...
@@ -426,11 +439,12 @@ internal inline class MessageChainImplByCollection constructor(
...
@@ -426,11 +439,12 @@ internal inline class MessageChainImplByCollection constructor(
internal
class
MessageChainImplBySequence
constructor
(
internal
class
MessageChainImplBySequence
constructor
(
delegate
:
Sequence
<
SingleMessage
>
delegate
:
Sequence
<
SingleMessage
>
)
:
Message
,
Iterable
<
SingleMessage
>,
MessageChain
{
)
:
Message
,
Iterable
<
SingleMessage
>,
MessageChain
{
override
val
size
:
Int
by
lazy
{
collected
.
size
}
/**
/**
* [Sequence] 可能只能消耗一遍, 因此需要先转为 [List]
* [Sequence] 可能只能消耗一遍, 因此需要先转为 [List]
*/
*/
private
val
collected
:
List
<
SingleMessage
>
by
lazy
{
delegate
.
toList
()
}
private
val
collected
:
List
<
SingleMessage
>
by
lazy
{
delegate
.
toList
()
}
override
fun
iterator
():
Iterator
<
SingleMessage
>
=
collected
.
iterator
()
override
fun
iterator
():
Iterator
<
SingleMessage
>
=
collected
.
iterator
()
override
fun
toString
():
String
=
this
.
collected
.
joinToString
(
""
)
{
it
.
toString
()
}
override
fun
toString
():
String
=
this
.
collected
.
joinToString
(
""
)
{
it
.
toString
()
}
override
operator
fun
contains
(
sub
:
String
):
Boolean
=
collected
.
any
{
it
.
contains
(
sub
)
}
override
operator
fun
contains
(
sub
:
String
):
Boolean
=
collected
.
any
{
it
.
contains
(
sub
)
}
...
@@ -440,9 +454,10 @@ internal class MessageChainImplBySequence constructor(
...
@@ -440,9 +454,10 @@ internal class MessageChainImplBySequence constructor(
* 单个 [SingleMessage] 作为 [MessageChain]
* 单个 [SingleMessage] 作为 [MessageChain]
*/
*/
@PublishedApi
@PublishedApi
internal
inline
class
SingleMessageChainImpl
constructor
(
internal
class
SingleMessageChainImpl
constructor
(
private
val
delegate
:
SingleMessage
private
val
delegate
:
SingleMessage
)
:
Message
,
Iterable
<
SingleMessage
>,
MessageChain
{
)
:
Message
,
Iterable
<
SingleMessage
>,
MessageChain
{
override
val
size
:
Int
get
()
=
1
override
fun
toString
():
String
=
this
.
delegate
.
toString
()
override
fun
toString
():
String
=
this
.
delegate
.
toString
()
override
fun
iterator
():
Iterator
<
SingleMessage
>
=
iterator
{
yield
(
delegate
)
}
override
fun
iterator
():
Iterator
<
SingleMessage
>
=
iterator
{
yield
(
delegate
)
}
override
operator
fun
contains
(
sub
:
String
):
Boolean
=
sub
in
delegate
override
operator
fun
contains
(
sub
:
String
):
Boolean
=
sub
in
delegate
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment