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

Shamrock: fix #260

Browse Source 
Signed-off-by: 白池 <whitechi73@outlook.com>
This commit is contained in:
白池 2024-02-27 22:35:31 +08:00
parent cb7bf00e17
commit 541422a43e
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,7 @@ internal object MsgSvc : BaseSvc() {
}
continuation.invokeOnCancellation {
continuation.resume(null)
} // 貌似不会被取消，写了也没什么鸟用啊？
}
}
}

2
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetHistoryMsg.kt
View File

@ -70,6 +70,7 @@ internal object GetHistoryMsg : IActionHandler() {
msgType = MessageHelper.obtainDetailTypeByMsgType(msg.chatType),
msgId = msgHash,
msgSeq = msg.msgSeq,
realId = msg.msgSeq,
sender = MessageSender(
msg.senderUin, msg.sendNickName, "unknown", 0, msg.senderUid, msg.senderUid
),
@ -92,6 +93,7 @@ internal object GetHistoryMsg : IActionHandler() {
msgType = MessageHelper.obtainDetailTypeByMsgType(msg.chatType),
msgId = MessageHelper.generateMsgIdHash(msg.chatType, msg.msgId),
msgSeq = msg.msgSeq,
realId = msg.msgSeq,
sender = MessageSender(
msg.senderUin, msg.sendNickName
.ifEmpty { msg.sendMemberName }

1
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetMsg.kt
View File

@ -30,6 +30,7 @@ internal object GetMsg: IActionHandler() {
msgType = MessageHelper.obtainDetailTypeByMsgType(msg.chatType),
msgId = msgHash,
msgSeq = msg.msgSeq,
realId = msg.msgSeq,
sender = MessageSender(
msg.senderUin, msg.sendNickName
.ifEmpty { msg.sendMemberName }

1
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/Message.kt
View File

@ -21,6 +21,7 @@ internal data class MessageDetail(
@SerialName("message_type") val msgType: String,
@SerialName("message_id") val msgId: Int,
@SerialName("message_seq") val msgSeq: Long,
@SerialName("real_id") val realId: Long = msgSeq,
@SerialName("sender") val sender: MessageSender,
@SerialName("message") val message: List<Map<String, JsonElement>>,
@SerialName("group_id") val groupId: Long = 0,