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
e7a691dc
Commit
e7a691dc
authored
Mar 29, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust name
parent
a7e9b151
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
8 deletions
+6
-8
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
...mmonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
+5
-7
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/MultiMsg.kt
.../mirai/qqandroid/network/protocol/packet/chat/MultiMsg.kt
+1
-1
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
View file @
e7a691dc
...
@@ -370,7 +370,7 @@ internal abstract class QQAndroidBotBase constructor(
...
@@ -370,7 +370,7 @@ internal abstract class QQAndroidBotBase constructor(
@MiraiExperimentalAPI
@MiraiExperimentalAPI
override
suspend
fun
_lowLevelSendLongMessage
(
groupCode
:
Long
,
message
:
Message
)
{
override
suspend
fun
_lowLevelSendLongMessage
(
groupCode
:
Long
,
message
:
Message
)
{
val
chain
=
message
.
asMessageChain
()
val
chain
=
message
.
asMessageChain
()
check
(
chain
.
toString
().
length
<=
3000
&&
chain
.
count
{
it
is
Image
}
<=
1
0
)
{
"message is too large"
}
check
(
chain
.
toString
().
length
<=
4500
&&
chain
.
count
{
it
is
Image
}
<=
5
0
)
{
"message is too large"
}
val
group
=
getGroup
(
groupCode
)
val
group
=
getGroup
(
groupCode
)
val
source
=
MessageSourceFromSendFriend
(
val
source
=
MessageSourceFromSendFriend
(
...
@@ -385,9 +385,9 @@ internal abstract class QQAndroidBotBase constructor(
...
@@ -385,9 +385,9 @@ internal abstract class QQAndroidBotBase constructor(
)
)
// TODO: 2020/3/26 util 方法来添加单例元素
// TODO: 2020/3/26 util 方法来添加单例元素
val
toSend
=
buildMessageChain
(
chain
)
{
val
toSend
=
buildMessageChain
(
chain
.
size
)
{
source
.
originalMessage
.
forEach
{
source
.
originalMessage
.
forEach
{
if
(
it
!
is
MessageSource
){
if
(
it
!
is
MessageSource
)
{
add
(
it
)
add
(
it
)
}
}
}
}
...
@@ -398,7 +398,7 @@ internal abstract class QQAndroidBotBase constructor(
...
@@ -398,7 +398,7 @@ internal abstract class QQAndroidBotBase constructor(
val
data
=
toSend
.
calculateValidationDataForGroup
(
group
)
val
data
=
toSend
.
calculateValidationDataForGroup
(
group
)
val
response
=
val
response
=
MultiMsg
.
ApplyUp
.
createForLongMessage
(
MultiMsg
.
ApplyUp
.
createFor
Group
LongMessage
(
client
=
this
@QQAndroidBotBase
.
client
,
client
=
this
@QQAndroidBotBase
.
client
,
messageData
=
data
,
messageData
=
data
,
dstUin
=
Group
.
calculateGroupUinByGroupCode
(
groupCode
)
dstUin
=
Group
.
calculateGroupUinByGroupCode
(
groupCode
)
...
@@ -446,7 +446,7 @@ internal abstract class QQAndroidBotBase constructor(
...
@@ -446,7 +446,7 @@ internal abstract class QQAndroidBotBase constructor(
group
.
sendMessage
(
group
.
sendMessage
(
RichMessage
.
longMessage
(
RichMessage
.
longMessage
(
brief
=
toSend
.
joinToString
{
brief
=
toSend
.
joinToString
(
limit
=
30
)
{
when
(
it
)
{
when
(
it
)
{
is
PlainText
->
it
.
stringValue
is
PlainText
->
it
.
stringValue
is
At
->
it
.
toString
()
is
At
->
it
.
toString
()
...
@@ -457,8 +457,6 @@ internal abstract class QQAndroidBotBase constructor(
...
@@ -457,8 +457,6 @@ internal abstract class QQAndroidBotBase constructor(
timeSeconds
=
source
.
time
timeSeconds
=
source
.
time
)
)
)
)
println
(
response
.
_miraiContentToString
())
}
}
}
}
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/MultiMsg.kt
View file @
e7a691dc
...
@@ -177,7 +177,7 @@ internal class MultiMsg {
...
@@ -177,7 +177,7 @@ internal class MultiMsg {
}
}
// captured from group
// captured from group
fun
createForLongMessage
(
fun
createFor
Group
LongMessage
(
client
:
QQAndroidClient
,
client
:
QQAndroidClient
,
messageData
:
MessageValidationData
,
messageData
:
MessageValidationData
,
dstUin
:
Long
// group uin
dstUin
:
Long
// group uin
...
...
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