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
ca0d0969
Commit
ca0d0969
authored
Mar 01, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add fast-paths
parent
49e34f83
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
15 deletions
+17
-15
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/messages.kt
...Main/kotlin/net/mamoe/mirai/qqandroid/message/messages.kt
+15
-15
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt
...nMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt
+2
-0
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/messages.kt
View file @
ca0d0969
...
@@ -334,7 +334,7 @@ internal fun MsgComm.Msg.toMessageChain(): MessageChain {
...
@@ -334,7 +334,7 @@ internal fun MsgComm.Msg.toMessageChain(): MessageChain {
return
buildMessageChain
(
elements
.
size
+
1
)
{
return
buildMessageChain
(
elements
.
size
+
1
)
{
+
MessageSourceFromMsg
(
delegate
=
this
@
toMessageChain
)
+
MessageSourceFromMsg
(
delegate
=
this
@
toMessageChain
)
elements
.
joinToMessageChain
(
this
)
elements
.
joinToMessageChain
(
this
)
}.
removeAt
AfterQuoteReply
().
asMessageChain
()
}.
removeAt
IfHasQuoteReply
()
}
}
// These two functions are not identical, dont combine.
// These two functions are not identical, dont combine.
...
@@ -345,23 +345,23 @@ internal fun ImMsgBody.SourceMsg.toMessageChain(): MessageChain {
...
@@ -345,23 +345,23 @@ internal fun ImMsgBody.SourceMsg.toMessageChain(): MessageChain {
return
buildMessageChain
(
elements
.
size
+
1
)
{
return
buildMessageChain
(
elements
.
size
+
1
)
{
+
MessageSourceFromServer
(
delegate
=
this
@
toMessageChain
)
+
MessageSourceFromServer
(
delegate
=
this
@
toMessageChain
)
elements
.
joinToMessageChain
(
this
)
elements
.
joinToMessageChain
(
this
)
}.
removeAt
AfterQuoteReply
().
asMessageChain
()
}.
removeAt
IfHasQuoteReply
()
}
}
private
fun
MessageChain
.
removeAtAfterQuoteReply
():
List
<
Message
>
{
private
fun
MessageChain
.
removeAtIfHasQuoteReply
():
MessageChain
=
var
last
:
Message
?
=
null
this
return
this
.
filter
{
message
:
Message
->
/*
if
(
message
is
At
)
{
// 筛除因 QuoteReply 导致的多余的 At
if (this.any<QuoteReply>()) {
if
(
last
!=
null
||
last
!
is
QuoteReply
)
{
var removed = false
return
@
filter
true
this.filter {
if (it is At && !removed) {
false
} else {
removed = true
true
}
}
}
else
if
(
message
is
MessageContent
)
{
}.asMessageChain()
return
@
filter
true
} else this*/
}
last
=
message
return
@
filter
false
}
}
@UseExperimental
(
MiraiInternalAPI
::
class
,
ExperimentalUnsignedTypes
::
class
,
MiraiDebugAPI
::
class
,
LowLevelAPI
::
class
)
@UseExperimental
(
MiraiInternalAPI
::
class
,
ExperimentalUnsignedTypes
::
class
,
MiraiDebugAPI
::
class
,
LowLevelAPI
::
class
)
internal
fun
List
<
ImMsgBody
.
Elem
>.
joinToMessageChain
(
message
:
MessageChainBuilder
)
{
internal
fun
List
<
ImMsgBody
.
Elem
>.
joinToMessageChain
(
message
:
MessageChainBuilder
)
{
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt
View file @
ca0d0969
...
@@ -229,6 +229,8 @@ fun Collection<Message>.asMessageChain(): MessageChain = MessageChainImplBySeque
...
@@ -229,6 +229,8 @@ fun Collection<Message>.asMessageChain(): MessageChain = MessageChainImplBySeque
@JvmSynthetic
@JvmSynthetic
fun
Iterable
<
SingleMessage
>.
asMessageChain
():
MessageChain
=
MessageChainImplByIterable
(
this
)
fun
Iterable
<
SingleMessage
>.
asMessageChain
():
MessageChain
=
MessageChainImplByIterable
(
this
)
inline
fun
MessageChain
.
asMessageChain
():
MessageChain
=
this
// 避免套娃
/**
/**
* 将 [this] [扁平化后][flatten] 委托为一个 [MessageChain]
* 将 [this] [扁平化后][flatten] 委托为一个 [MessageChain]
*/
*/
...
...
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