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: try fix #214

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

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

@ -335,7 +335,7 @@ internal object GroupSvc: BaseSvc() {
sendOidb("OidbSvc.0x570_8", 1392, 8, array) sendOidb("OidbSvc.0x570_8", 1392, 8, array)
} }
fun kickMember(groupId: Long, rejectAddRequest: Boolean, vararg memberUin: Long) { fun kickMember(groupId: Long, rejectAddRequest: Boolean, kickMsg: String, vararg memberUin: Long) {
val reqBody = oidb_0x8a0.ReqBody() val reqBody = oidb_0x8a0.ReqBody()
reqBody.opt_uint64_group_code.set(groupId) reqBody.opt_uint64_group_code.set(groupId)
@ -346,6 +346,7 @@ 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()))
sendOidb("OidbSvc.0x8a0_0", 2208, 0, reqBody.toByteArray()) sendOidb("OidbSvc.0x8a0_0", 2208, 0, reqBody.toByteArray())
} }

7
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/KickTroopMember.kt
View File

@ -12,13 +12,14 @@ internal object KickTroopMember: IActionHandler() {
override suspend fun internalHandle(session: ActionSession): String { override suspend fun internalHandle(session: ActionSession): String {
val groupId = session.getLong("group_id") val groupId = session.getLong("group_id")
val userId = session.getLong("user_id") val userId = session.getLong("user_id")
val kickMsg = session.getStringOrNull("kick_msg") ?: ""
val rejectAddRequest = session.getBooleanOrDefault("reject_add_request", false) val rejectAddRequest = session.getBooleanOrDefault("reject_add_request", false)
return invoke(groupId, userId, rejectAddRequest, session.echo) return invoke(groupId, userId, rejectAddRequest, kickMsg, session.echo)
} }
operator fun invoke(groupId: Long, userId: Long, rejectAddRequest: Boolean = false, echo: JsonElement = EmptyJsonString): String { operator fun invoke(groupId: Long, userId: Long, rejectAddRequest: Boolean = false, kickMsg: String, echo: JsonElement = EmptyJsonString): String {
GroupSvc.kickMember(groupId, rejectAddRequest, userId) GroupSvc.kickMember(groupId, rejectAddRequest, kickMsg, userId)
return ok("成功", echo) return ok("成功", echo)
} }

7
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/api/GroupAction.kt
View File

@ -120,7 +120,12 @@ fun Routing.troopAction() {
getOrPost("/set_group_kick") { getOrPost("/set_group_kick") {
val userId = fetchOrThrow("user_id").toLong() val userId = fetchOrThrow("user_id").toLong()
val groupId = fetchOrThrow("group_id").toLong() val groupId = fetchOrThrow("group_id").toLong()
call.respondText(KickTroopMember(groupId, userId), ContentType.Application.Json) val kickMsg = fetchOrNull("kick_msg") ?: ""
val rejectAddRequest = when(fetchGetOrNull("reject_add_request")) {
"1", "true" -> true
else -> false
}
call.respondText(KickTroopMember(groupId, userId, rejectAddRequest, kickMsg), ContentType.Application.Json)
} }
getOrPost("/set_essence_msg") { getOrPost("/set_essence_msg") {