mirror of
https://github.com/whitechi73/OpenShamrock.git
synced 2024-08-14 13:12:17 +08:00
Shamrock
: fix #169
This commit is contained in:
parent
89a4912ed7
commit
35c82fcc51
@ -7,6 +7,9 @@ import com.tencent.qqnt.kernel.nativeinterface.MsgRecord
|
||||
import moe.fuqiuluo.qqinterface.servlet.GroupSvc
|
||||
import moe.fuqiuluo.qqinterface.servlet.MsgSvc
|
||||
import io.ktor.client.statement.bodyAsText
|
||||
import io.ktor.http.ContentType
|
||||
import io.ktor.server.application.call
|
||||
import io.ktor.server.response.respondText
|
||||
import kotlinx.coroutines.DelicateCoroutinesApi
|
||||
import kotlinx.coroutines.GlobalScope
|
||||
import kotlinx.coroutines.Job
|
||||
@ -14,6 +17,7 @@ import kotlinx.coroutines.launch
|
||||
import kotlinx.serialization.json.Json
|
||||
import kotlinx.serialization.json.JsonArray
|
||||
import kotlinx.serialization.json.JsonElement
|
||||
import kotlinx.serialization.json.JsonObject
|
||||
import kotlinx.serialization.json.JsonPrimitive
|
||||
import moe.fuqiuluo.qqinterface.servlet.msg.*
|
||||
import moe.fuqiuluo.shamrock.remote.service.api.HttpTransmitServlet
|
||||
@ -21,6 +25,11 @@ import moe.fuqiuluo.shamrock.remote.service.data.push.*
|
||||
import moe.fuqiuluo.shamrock.tools.*
|
||||
import moe.fuqiuluo.shamrock.helper.Level
|
||||
import moe.fuqiuluo.shamrock.helper.LogCenter
|
||||
import moe.fuqiuluo.shamrock.remote.action.ActionManager
|
||||
import moe.fuqiuluo.shamrock.remote.action.ActionSession
|
||||
import moe.fuqiuluo.shamrock.remote.config.ECHO_KEY
|
||||
import moe.fuqiuluo.shamrock.remote.entries.EmptyObject
|
||||
import moe.fuqiuluo.shamrock.remote.entries.Status
|
||||
import moe.fuqiuluo.shamrock.remote.service.api.GlobalEventTransmitter
|
||||
|
||||
internal object HttpService: HttpTransmitServlet() {
|
||||
@ -66,7 +75,9 @@ internal object HttpService: HttpTransmitServlet() {
|
||||
|
||||
private suspend fun handleQuicklyReply(record: MsgRecord, msgHash: Int, jsonText: String) {
|
||||
try {
|
||||
val data = Json.parseToJsonElement(jsonText).asJsonObject
|
||||
val data = Json.parseToJsonElement(jsonText)
|
||||
|
||||
if (data is JsonObject) {
|
||||
if (data.containsKey("reply")) {
|
||||
LogCenter.log({ "quickly reply successfully" }, Level.DEBUG)
|
||||
val autoEscape = data["auto_escape"].asBooleanOrNull ?: false
|
||||
@ -120,11 +131,30 @@ internal object HttpService: HttpTransmitServlet() {
|
||||
if (banTime <= 0) return
|
||||
GroupSvc.banMember(record.peerUin, record.senderUin, banTime)
|
||||
}
|
||||
} else if (data is JsonArray) {
|
||||
data.forEach {
|
||||
handleQuicklyActions(it.asJsonObject)
|
||||
}
|
||||
}
|
||||
} catch (e: Throwable) {
|
||||
LogCenter.log("处理快速操作错误: $e", Level.WARN)
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun handleQuicklyActions(data: JsonObject) {
|
||||
val action = data["action"].asString
|
||||
val echo = data["echo"] ?: EmptyJsonString
|
||||
|
||||
val params = data["params"].asJsonObjectOrNull ?: EmptyJsonObject
|
||||
|
||||
val handler = ActionManager[action]
|
||||
if (handler == null) {
|
||||
LogCenter.log("HTTP快速操作:不支持的Action: $action", Level.WARN)
|
||||
} else {
|
||||
handler.handle(ActionSession(params, echo))
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun quicklyReply(
|
||||
record: MsgRecord,
|
||||
message: JsonArray,
|
||||
|
Loading…
x
Reference in New Issue
Block a user