From e0a4aad3cd7a00362ee89f2cf22b2ee84b90c99e Mon Sep 17 00:00:00 2001 From: whitechi73 Date: Tue, 30 Jan 2024 00:38:14 +0800 Subject: [PATCH] `Shamrock`: fix QuickOperation --- .../main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt | 4 +++- .../shamrock/remote/action/handlers/QuickOperation.kt | 2 +- .../java/moe/fuqiuluo/shamrock/remote/service/HttpService.kt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt index 3f66a2f..6bdb93c 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt @@ -346,7 +346,9 @@ internal object GroupSvc: BaseSvc() { memberInfo.opt_uint32_flag.set(if (rejectAddRequest) 1 else 0) reqBody.rpt_msg_kick_list.add(memberInfo) } - reqBody.bytes_kick_msg.set(ByteStringMicro.copyFrom(kickMsg.toByteArray())) + if (kickMsg.isNotEmpty()) { + reqBody.bytes_kick_msg.set(ByteStringMicro.copyFrom(kickMsg.toByteArray())) + } sendOidb("OidbSvc.0x8a0_0", 2208, 0, reqBody.toByteArray()) } diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/QuickOperation.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/QuickOperation.kt index abad22b..7b300ed 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/QuickOperation.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/QuickOperation.kt @@ -96,7 +96,7 @@ internal object QuickOperation: IActionHandler() { MsgSvc.recallMsg(msgHash) } if (MsgConstant.KCHATTYPEGROUP == record.chatType && operation.containsKey("kick") && operation["kick"].asBoolean) { - GroupSvc.kickMember(record.peerUin, false, record.senderUin) + GroupSvc.kickMember(record.peerUin, false, "", record.senderUin) } if (MsgConstant.KCHATTYPEGROUP == record.chatType && operation.containsKey("ban") && operation["ban"].asBoolean) { val banTime = operation["ban_duration"].asIntOrNull ?: (30 * 60) diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/HttpService.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/HttpService.kt index 2083442..7245723 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/HttpService.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/HttpService.kt @@ -113,7 +113,7 @@ internal object HttpService: HttpTransmitServlet() { MsgSvc.recallMsg(msgHash) } if (MsgConstant.KCHATTYPEGROUP == record.chatType && data.containsKey("kick") && data["kick"].asBoolean) { - GroupSvc.kickMember(record.peerUin, false, record.senderUin) + GroupSvc.kickMember(record.peerUin, false, "", record.senderUin) } if (MsgConstant.KCHATTYPEGROUP == record.chatType && data.containsKey("ban") && data["ban"].asBoolean) { val banTime = data["ban_duration"].asIntOrNull ?: (30 * 60)