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
5b80ccf4
Commit
5b80ccf4
authored
Jul 08, 2020
by
mzdluo123
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix can't receive voice sent from tim pc
parent
a174f174
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
14 deletions
+17
-14
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/conversions.kt
...n/kotlin/net/mamoe/mirai/qqandroid/message/conversions.kt
+16
-13
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.PbPushGroupMsg.kt
...protocol/packet/chat/receive/OnlinePush.PbPushGroupMsg.kt
+1
-1
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/conversions.kt
View file @
5b80ccf4
...
...
@@ -32,7 +32,7 @@ import kotlin.contracts.contract
private
val
UNSUPPORTED_MERGED_MESSAGE_PLAIN
=
PlainText
(
"你的QQ暂不支持查看[转发多条消息],请期待后续版本。"
)
private
val
UNSUPPORTED_POKE_MESSAGE_PLAIN
=
PlainText
(
"[戳一戳]请使用最新版手机QQ体验新功能。"
)
private
val
UNSUPPORTED_FLASH_MESSAGE_PLAIN
=
PlainText
(
"[闪照]请使用新版手机QQ查看闪照。"
)
private
val
UNSUPPORTED_VOICE_MESSAGE_PLAIN
=
PlainText
(
"收到语音消息,你需要升级到最新版QQ才能接收,升级地址https://im.qq.com"
)
@OptIn
(
ExperimentalStdlibApi
::
class
)
@Suppress
(
"INVISIBLE_MEMBER"
,
"INVISIBLE_REFERENCE"
)
...
...
@@ -161,14 +161,16 @@ internal fun MessageChain.toRichTextElems(forGroup: Boolean, withGeneralFlags: B
is
PttMessage
->
{
elements
.
add
(
ImMsgBody
.
Elem
(
extraInfo
=
ImMsgBody
.
ExtraInfo
(
flags
=
16
,
groupMask
=
1
)
extraInfo
=
ImMsgBody
.
ExtraInfo
(
flags
=
16
,
groupMask
=
1
)
)
)
elements
.
add
(
ImMsgBody
.
Elem
(
elemFlags2
=
ImMsgBody
.
ElemFlags2
(
vipStatus
=
1
elements
.
add
(
ImMsgBody
.
Elem
(
elemFlags2
=
ImMsgBody
.
ElemFlags2
(
vipStatus
=
1
)
)
)
)
)
}
is
ForwardMessage
,
is
MessageSource
,
// mirai metadata only
...
...
@@ -231,10 +233,11 @@ internal fun MsgComm.Msg.toMessageChain(
val
ptt
=
this
.
msgBody
.
richText
.
ptt
val
pptMsg
=
ptt
?.
run
{
when
(
fileType
)
{
4
->
Voice
(
String
(
fileName
),
fileMd5
,
fileSize
.
toLong
(),
String
(
downPara
))
else
->
null
}
// when (fileType) {
// 4 -> Voice(String(fileName), fileMd5, fileSize.toLong(),String(downPara))
// else -> null
// }
Voice
(
String
(
fileName
),
fileMd5
,
fileSize
.
toLong
(),
String
(
downPara
))
}
return
buildMessageChain
(
elements
.
size
+
1
+
if
(
pptMsg
==
null
)
0
else
1
)
{
...
...
@@ -287,13 +290,13 @@ private fun MessageChain.cleanupRubbishMessageElements(): MessageChain {
return
@
forEach
}
}
if
(
last
is
FlashImage
&&
element
is
PlainText
)
{
if
(
element
==
UNSUPPORTED_FLASH_MESSAGE_PLAIN
)
{
// 解决tim发送的语音无法正常识别
if
(
element
is
PlainText
)
{
if
(
element
==
UNSUPPORTED_VOICE_MESSAGE_PLAIN
)
{
last
=
element
return
@
forEach
}
}
add
(
element
)
last
=
element
}
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.PbPushGroupMsg.kt
View file @
5b80ccf4
...
...
@@ -53,7 +53,7 @@ internal object OnlinePushPbPushGroupMsg : IncomingPacketFactory<Packet?>("Onlin
// 00 00 02 E4 0A D5 05 0A 4F 08 A2 FF 8C F0 03 10 DD F1 92 B7 07 18 52 20 00 28 BC 3D 30 8C 82 AB F1 05 38 D2 80 E0 8C 80 80 80 80 02 4A 21 08 E7 C1 AD B8 02 10 01 18 BA 05 22 09 48 69 6D 31 38 38 6D 6F 65 30 06 38 02 42 05 4D 69 72 61 69 50 01 58 01 60 00 88 01 08 12 06 08 01 10 00 18 00 1A F9 04 0A F6 04 0A 26 08 00 10 87 82 AB F1 05 18 B7 B4 BF 30 20 00 28 0C 30 00 38 86 01 40 22 4A 0C E5 BE AE E8 BD AF E9 9B 85 E9 BB 91 12 E6 03 42 E3 03 12 2A 7B 34 45 31 38 35 38 32 32 2D 30 45 37 42 2D 46 38 30 46 2D 43 35 42 31 2D 33 34 34 38 38 33 37 34 44 33 39 43 7D 2E 6A 70 67 22 00 2A 04 03 00 00 00 32 60 15 36 20 39 36 6B 45 31 41 38 35 32 32 39 64 63 36 39 38 34 37 39 37 37 62 20 20 20 20 20 20 35 30 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 7B 34 45 31 38 35 38 32 32 2D 30 45 37 42 2D 46 38 30 46 2D 43 35 42 31 2D 33 34 34 38 38 33 37 34 44 33 39 43 7D 2E 6A 70 67 31 32 31 32 41 38 C6 BB 8A A9 08 40 FB AE 9E C2 09 48 50 50 41 5A 00 60 01 6A 10 4E 18 58 22 0E 7B F8 0F C5 B1 34 48 83 74 D3 9C 72 59 2F 67 63 68 61 74 70 69 63 5F 6E 65 77 2F 31 30 34 30 34 30 30 32 39 30 2F 36 35 35 30 35 37 31 32 37 2D 32 32 33 33 36 33 38 33 34 32 2D 34 45 31 38 35 38 32 32 30 45 37 42 46 38 30 46 43 35 42 31 33 34 34 38 38 33 37 34 44 33 39 43 2F 31 39 38 3F 74 65 72 6D 3D 32 82 01 57 2F 67 63 68 61 74 70 69 63 5F 6E 65 77 2F 31 30 34 30 34 30 30 32 39 30 2F 36 35 35 30 35 37 31 32 37 2D 32 32 33 33 36 33 38 33 34 32 2D 34 45 31 38 35 38 32 32 30 45 37 42 46 38 30 46 43 35 42 31 33 34 34 38 38 33 37 34 44 33 39 43 2F 30 3F 74 65 72 6D 3D 32 B0 01 4D B8 01 2E C8 01 FF 05 D8 01 4D E0 01 2E FA 01 59 2F 67 63 68 61 74 70 69 63 5F 6E 65 77 2F 31 30 34 30 34 30 30 32 39 30 2F 36 35 35 30 35 37 31 32 37 2D 32 32 33 33 36 33 38 33 34 32 2D 34 45 31 38 35 38 32 32 30 45 37 42 46 38 30 46 43 35 42 31 33 34 34 38 38 33 37 34 44 33 39 43 2F 34 30 30 3F 74 65 72 6D 3D 32 80 02 4D 88 02 2E 12 45 AA 02 42 50 03 60 00 68 00 9A 01 39 08 09 20 BF 50 80 01 01 C8 01 00 F0 01 00 F8 01 00 90 02 00 98 03 00 A0 03 20 B0 03 00 C0 03 00 D0 03 00 E8 03 00 8A 04 04 08 02 08 01 90 04 80 80 80 10 B8 04 00 C0 04 00 12 06 4A 04 08 00 40 01 12 14 82 01 11 0A 09 48 69 6D 31 38 38 6D 6F 65 18 06 20 08 28 03 10 8A CA 9D A1 07 1A 00
if
(!
bot
.
firstLoginSucceed
)
return
null
val
pbPushMsg
=
readProtoBuf
(
MsgOnlinePush
.
PbPushMsg
.
serializer
())
//
bot.logger.debug(pbPushMsg._miraiContentToString())
//
bot.logger.debug(pbPushMsg._miraiContentToString())
if
(
pbPushMsg
.
msg
.
msgHead
.
fromUin
==
bot
.
id
)
{
return
SendGroupMessageReceipt
(
...
...
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