shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug(暂未完成 请勿使用)

Browse Source
This commit is contained in:
Simplxs 2024-02-21 00:08:41 +08:00
parent aa7b241dba
commit e9884a5fa8
No known key found for this signature in database
GPG Key ID: E23537FF14DD6507
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt
View File

@ -239,6 +239,7 @@ internal object MsgSvc : BaseSvc() {
) )
) )
) )
LogCenter.log(ProtoBuf.encodeToByteArray(payload).toHexString(), Level.DEBUG)
val req = LongMsgReq( val req = LongMsgReq(
sendInfo = SendLongMsgInfo( sendInfo = SendLongMsgInfo(
@ -292,7 +293,7 @@ internal object MsgSvc : BaseSvc() {
if (it.command == "MultiMsg") { if (it.command == "MultiMsg") {
return Result.success(it.data?.body?.map { msg -> return Result.success(it.data?.body?.map { msg ->
val chatType = val chatType =
if (msg.content!!.msgType == 1) MsgConstant.KCHATTYPEC2C else MsgConstant.KCHATTYPEGROUP if (msg.content!!.msgType == 82) MsgConstant.KCHATTYPEGROUP else MsgConstant.KCHATTYPEC2C
MessageDetail( MessageDetail(
time = msg.content?.msgTime?.toInt() ?: 0, time = msg.content?.msgTime?.toInt() ?: 0,
msgType = MessageHelper.obtainDetailTypeByMsgType(chatType), msgType = MessageHelper.obtainDetailTypeByMsgType(chatType),

10
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendForwardMessage.kt
View File

@ -107,7 +107,13 @@ internal object SendForwardMessage : IActionHandler() {
) else null ) else null
), ),
content = MessageContent( content = MessageContent(
msgType = record.msgType, msgType = when (record.chatType) {
MsgConstant.KCHATTYPEC2C -> 529
MsgConstant.KCHATTYPEGROUP -> 82
else -> throw UnsupportedOperationException(
"Unsupported chatType: $chatType"
)
},
msgViaRandom = record.msgId, msgViaRandom = record.msgId,
msgSeq = record.msgSeq, msgSeq = record.msgSeq,
msgTime = record.msgTime, msgTime = record.msgTime,
@ -160,7 +166,7 @@ internal object SendForwardMessage : IActionHandler() {
peerUid = data["uid"]?.asString ?: TicketSvc.getUid() peerUid = data["uid"]?.asString ?: TicketSvc.getUid()
), ),
content = MessageContent( content = MessageContent(
msgType = 166, msgType = 529,
msgViaRandom = 4, msgViaRandom = 4,
msgSeq = data["seq"]?.asLong ?: Random.nextLong(), msgSeq = data["seq"]?.asLong ?: Random.nextLong(),
msgTime = data["time"]?.asLong ?: (System.currentTimeMillis() / 1000), msgTime = data["time"]?.asLong ?: (System.currentTimeMillis() / 1000),