Skip to content

M
Mirai
Commit 1e1785f4 authored by Him188's avatar Him188
Browse files
Options

Add `ForwardMessage`, support decoding, fix `LongMessage` decoding

parent 239b8bcc
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 26 deletions
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/convension.kt
View file @ 1e1785f4
...@@ -20,9 +20,12 @@ import net.mamoe.mirai.message.data.* ...@@ -20,9 +20,12 @@ import net.mamoe.mirai.message.data.*
import net.mamoe.mirai.qqandroid.network.protocol.data.proto.HummerCommelem import net.mamoe.mirai.qqandroid.network.protocol.data.proto.HummerCommelem
import net.mamoe.mirai.qqandroid.network.protocol.data.proto.ImMsgBody import net.mamoe.mirai.qqandroid.network.protocol.data.proto.ImMsgBody
import net.mamoe.mirai.qqandroid.network.protocol.data.proto.MsgComm import net.mamoe.mirai.qqandroid.network.protocol.data.proto.MsgComm
import net.mamoe.mirai.qqandroid.utils.* import net.mamoe.mirai.qqandroid.utils.MiraiPlatformUtils
import net.mamoe.mirai.qqandroid.utils.encodeToString
import net.mamoe.mirai.qqandroid.utils.hexToBytes
import net.mamoe.mirai.qqandroid.utils.io.serialization.loadAs import net.mamoe.mirai.qqandroid.utils.io.serialization.loadAs
import net.mamoe.mirai.qqandroid.utils.io.serialization.toByteArray import net.mamoe.mirai.qqandroid.utils.io.serialization.toByteArray
import net.mamoe.mirai.qqandroid.utils.read
import net.mamoe.mirai.utils.MiraiExperimentalAPI import net.mamoe.mirai.utils.MiraiExperimentalAPI
import net.mamoe.mirai.utils.MiraiInternalAPI import net.mamoe.mirai.utils.MiraiInternalAPI
import net.mamoe.mirai.utils.MiraiLogger import net.mamoe.mirai.utils.MiraiLogger
...@@ -236,15 +239,6 @@ private fun MessageChain.cleanupRubbishMessageElements(): MessageChain { ...@@ -236,15 +239,6 @@ private fun MessageChain.cleanupRubbishMessageElements(): MessageChain {
} }
} }
internal inline fun <reified R> Iterable<*>.firstIsInstance(): R {
for (it in this) {
if (it is R) {
return it
}
}
throw NoSuchElementException("Collection contains no element is ${R::class}")
}
internal inline fun <reified R> Iterable<*>.firstIsInstanceOrNull(): R? { internal inline fun <reified R> Iterable<*>.firstIsInstanceOrNull(): R? {
for (it in this) { for (it in this) {
if (it is R) { if (it is R) {
...@@ -297,22 +291,85 @@ internal fun List<ImMsgBody.Elem>.joinToMessageChain(groupIdOrZero: Long, bot: B ...@@ -297,22 +291,85 @@ internal fun List<ImMsgBody.Elem>.joinToMessageChain(groupIdOrZero: Long, bot: B
1 -> message.add(JsonMessage(content)) 1 -> message.add(JsonMessage(content))
60 -> message.add(XmlMessage(content)) 60 -> message.add(XmlMessage(content))
35 -> { 35 -> {
val resId = this.firstIsInstanceOrNull<ImMsgBody.GeneralFlags>()?.longTextResid ?: null.also { /*
@Suppress("DEPRECATION") Mirai 19:09:29 : cannot find longTextResid. isGroup=false elems=
MiraiLogger.error( [Elem#2041089331 {
"cannot find longTextResid. isGroup=${groupIdOrZero == 0L} elems=" + richMsg=RichMsg#1822931063 {
"\n${this._miraiContentToString()}. Please report this to mirai maintainer. " + flags=0x00000000(0)
"\n------------------------------" + msgResid=<Empty ByteArray>
"\n请完整截图或复制此日志并报告给 mirai 维护者以帮助解决问题" rand=0x00000000(0)
) seq=0x00000000(0)
} serviceId=0x00000023(35)
template1=01 78 9C A5 91 C1 6E D3 40 14 45 7F E5 69 36 5E 15 DB D8 A6 11 B2 5D 51 85 8A 22 05 55 0D 4D 52 AA 0A 4D EC 17 67 C8 8C 1D 66 C6 29 59 76 05 B4 8B AA 8B 6E 0A 08 21 95 45 A5 0A 58 B1 2B 7F E3 34 9F C1 D8 01 F1 01 EC 66 E6 8E DE 3B F7 DE 70 E3 8D E0 30 43 A9 58 91 47 96 7B CF B1 00 F3 A4 48 59 9E 45 D6 DE F3 AD B5 96 05 4A D3 3C A5 BC C8 31 B2 E6 A8 2C D8 88 43 A1 32 50 28 67 2C C1 ED 76 44 BC 80 80 46 31 E5 54 37 77 97 00 4D 74 3D 93 CC 18 1E 75 4A AE 59 47 65 04 86 92 E1 28 22 07 CB DB 9B EA EC BC BA BA 5C 7C FA B2 F8 F9 6E 71 FC FD 90 80 78 29 51 B1 34 22 FB 03 87 1F 15 4F 53 D5 DF 79 D1 6B 0F 86 F7 BB 3D DE F7 65 87 ED 04 FE AB 5E 2B 79 3D 50 E5 7E 32 7C B2 97 EC 6E E2 44 79 8F C4 66 B7 3D 9E 60 DF 5F 0F 1E 7B C3 71 3D 6A C4 38 3E A3 02 23 F2 A0 E5 FA 8E D7 0A 5C C7 0B 9C 75 3F F0 3D 8F 80 2A 4A 99 A0 61 DA 36 FB 1C 02 A5 E4 11 21 30 E2 34 33 76 0C 7E 6A 52 E9 B2 2C 6F 54 F1 C7 C0 56 23 3B 24 0E 99 B1 0B 9C CE 8B 52 D7 76 E3 50 33 CD 31 9E 14 05 CA 87 00 07 D5 87 5F 77 EF DF 1E 86 F6 EA FD 3F E5 B1 84 31 4B 53 34 34 23 CA 15 1A 7E 3D E7 D8 B0 D9 71 A8 4A 21 A8 9C C7 8B CF 5F EF 3E 9E FA 26 D3 55 BE AB 64 43 FB AF 1E DA 35 B6 F9 DF 98 87 BC 89 67 79 7C 52 5D 5D 2F BF FD A8 6E 2F 08 B0 A4 2E ED 5F 7D E6 34 9D D6 9D AC B9 CD 2A DB 34 1F FF 06 A5 57 D1 F0
}
}, Elem#2041089331 {
text=Text#677417722 {
attr6Buf=<Empty ByteArray>
attr7Buf=<Empty ByteArray>
buf=<Empty ByteArray>
link=
pbReserve=<Empty ByteArray>
str=你的TIM暂不支持查看[转发多条消息]，请期待后续版本。
}
}, Elem#2041089331 {
elemFlags2=ElemFlags2#1722087666 {
colorTextId=0x00000000(0)
compatibleId=0x00000000(0)
crmFlags=0x00000000(0)
customFont=0x00000000(0)
latitude=0x00000000(0)
longtitude=0x00000000(0)
msgId=0x0000000000000000(0)
msgRptCnt=0x00000000(0)
pttChangeBit=0x00000000(0)
vipStatus=0x00000000(0)
whisperSessionId=0x00000000(0)
}
}, Elem#2041089331 {
generalFlags=GeneralFlags#707534137 {
babyqGuideMsgCookie=<Empty ByteArray>
bubbleDiyTextId=0x00000000(0)
bubbleSubId=0x00000000(0)
glamourLevel=0x00000002(2)
groupFlagNew=0x00000000(0)
groupRankSeq=0x0000000000000000(0)
groupType=0x00000000(0)
longTextFlag=0x00000000(0)
longTextResid=
memberLevel=0x00000000(0)
olympicTorch=0x00000000(0)
pbReserve=08 08 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 02 08 03 90 04 80 09 B8 04 00 C0 04 00
pendantId=0x0000000000000000(0)
prpFold=0x00000000(0)
rpId=<Empty ByteArray>
rpIndex=<Empty ByteArray>
toUinFlag=0x00000000(0)
uin=0x0000000000000000(0)
uin32ExpertFlag=0x00000000(0)
}
}, Elem#2041089331 {
extraInfo=ExtraInfo#913448337 {
apnsSoundType=0x00000000(0)
apnsTips=<Empty ByteArray>
flags=0x00000008(8)
groupCard=E3 81 82 E3 81 BE E3 81 A4 E6 A7 98 E5 8D 95 E6 8E A8 E4 BA BA EF BC 88 E4 B8 93 E4 B8 9A E6 8F 92 E7 94 BB E5 B8 88 EF BC 89
groupMask=0x00000001(1)
level=0x00000004(4)
msgStateFlag=0x00000000(0)
msgTailId=0x00000000(0)
newGroupFlag=0x00000000(0)
nick=<Empty ByteArray>
senderTitle=<Empty ByteArray>
uin=0x0000000000000000(0)
}
}]
*/
val resId = this.firstIsInstanceOrNull<ImMsgBody.GeneralFlags>()?.longTextResid
if (resId != null) { if (resId != null) {
message.add( message.add(LongMessage(content, resId))
LongMessage( } else {
content, resId message.add(ForwardMessage(content))
)
)
} }
} }
else -> { else -> {
......
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
View file @ 1e1785f4
...@@ -453,7 +453,6 @@ internal class OnlinePush { ...@@ -453,7 +453,6 @@ internal class OnlinePush {
override suspend fun ByteReadPacket.decode(bot: QQAndroidBot, sequenceId: Int): Response { override suspend fun ByteReadPacket.decode(bot: QQAndroidBot, sequenceId: Int): Response {
val reqPushMsg = decodeUniPacket(OnlinePushPack.SvcReqPushMsg.serializer(), "req") val reqPushMsg = decodeUniPacket(OnlinePushPack.SvcReqPushMsg.serializer(), "req")
println(reqPushMsg._miraiContentToString())
val packets: Sequence<Packet> = reqPushMsg.vMsgInfos.deco { msgInfo -> val packets: Sequence<Packet> = reqPushMsg.vMsgInfos.deco { msgInfo ->
when (msgInfo.shMsgType.toInt()) { when (msgInfo.shMsgType.toInt()) {
732 -> { 732 -> {
...@@ -500,7 +499,7 @@ internal class OnlinePush { ...@@ -500,7 +499,7 @@ internal class OnlinePush {
internal data class Response(val uin: Long, val svrip: Int, val sequence: Sequence<Packet>) : internal data class Response(val uin: Long, val svrip: Int, val sequence: Sequence<Packet>) :
MultiPacketBySequence<Packet>(sequence) { MultiPacketBySequence<Packet>(sequence) {
override fun toString(): String { override fun toString(): String {
return "OnlinePush.ReqPush.Response(sequence=" return "OnlinePush.ReqPush.Response"
} }
} }
......
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/RichMessage.kt
View file @ 1e1785f4
...@@ -174,6 +174,20 @@ class LongMessage(override val content: String, val resId: String) : RichMessage ...@@ -174,6 +174,20 @@ class LongMessage(override val content: String, val resId: String) : RichMessage
override fun toString(): String = "[mirai:long:$content]" override fun toString(): String = "[mirai:long:$content]"
} }
/**
* 合并转发消息
*/
@SinceMirai("0.36.0")
@MiraiExperimentalAPI
class ForwardMessage(override val content: String) : RichMessage {
companion object Key : Message.Key<XmlMessage> {
override val typeName: String
get() = "ForwardMessage"
}
// serviceId = 35
override fun toString(): String = "[mirai:forward:$content]"
}
/* /*
commonElem=CommonElem#750141174 { commonElem=CommonElem#750141174 {
businessType=0x00000001(1) businessType=0x00000001(1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment