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 QuickOperation

Browse Source
This commit is contained in:
whitechi73 2024-01-30 00:38:14 +08:00
parent 328e656859
commit e0a4aad3cd
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt
View File

@ -346,7 +346,9 @@ internal object GroupSvc: BaseSvc() {
memberInfo.opt_uint32_flag.set(if (rejectAddRequest) 1 else 0) memberInfo.opt_uint32_flag.set(if (rejectAddRequest) 1 else 0)
reqBody.rpt_msg_kick_list.add(memberInfo) 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()) sendOidb("OidbSvc.0x8a0_0", 2208, 0, reqBody.toByteArray())
} }

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

@ -96,7 +96,7 @@ internal object QuickOperation: IActionHandler() {
MsgSvc.recallMsg(msgHash) MsgSvc.recallMsg(msgHash)
} }
if (MsgConstant.KCHATTYPEGROUP == record.chatType && operation.containsKey("kick") && operation["kick"].asBoolean) { 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) { if (MsgConstant.KCHATTYPEGROUP == record.chatType && operation.containsKey("ban") && operation["ban"].asBoolean) {
val banTime = operation["ban_duration"].asIntOrNull ?: (30 * 60) val banTime = operation["ban_duration"].asIntOrNull ?: (30 * 60)

2
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/HttpService.kt
View File

@ -113,7 +113,7 @@ internal object HttpService: HttpTransmitServlet() {
MsgSvc.recallMsg(msgHash) MsgSvc.recallMsg(msgHash)
} }
if (MsgConstant.KCHATTYPEGROUP == record.chatType && data.containsKey("kick") && data["kick"].asBoolean) { 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) { if (MsgConstant.KCHATTYPEGROUP == record.chatType && data.containsKey("ban") && data["ban"].asBoolean) {
val banTime = data["ban_duration"].asIntOrNull ?: (30 * 60) val banTime = data["ban_duration"].asIntOrNull ?: (30 * 60)