diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetFile.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetFile.kt index b8cc36a..a2e2a4f 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetFile.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetFile.kt @@ -3,10 +3,8 @@ package moe.fuqiuluo.shamrock.remote.action.handlers import kotlinx.serialization.json.JsonElement import moe.fuqiuluo.shamrock.remote.action.ActionSession import moe.fuqiuluo.shamrock.remote.action.IActionHandler -import moe.fuqiuluo.shamrock.remote.service.data.OutResource import moe.fuqiuluo.shamrock.remote.service.data.OutResourceByBase64 import moe.fuqiuluo.shamrock.tools.EmptyJsonString -import moe.fuqiuluo.shamrock.utils.AudioUtils import moe.fuqiuluo.shamrock.utils.FileUtils import moe.fuqiuluo.symbols.OneBotHandler import java.util.Base64 @@ -17,7 +15,7 @@ import java.util.Base64 .replace(regex = "[{}\\-]".toRegex(), replacement = "") .replace(" ", "") .split(".")[0].lowercase() - val fileType = session.getString("file_type") + val fileType = session.getString("type") return invoke(file, fileType, session.echo) } diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/api/ResourceAction.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/api/ResourceAction.kt index 5e6629f..f553edb 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/api/ResourceAction.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/api/ResourceAction.kt @@ -26,6 +26,12 @@ fun Routing.fetchRes() { call.respondText(GetRecord(file, format), ContentType.Application.Json) } + getOrPost("/get_file") { + val file = formatFileName( fetchGetOrThrow("file") ) + val fileType = fetchOrThrow("file_type") + call.respondText(GetFile(file, fileType), ContentType.Application.Json) + } + getOrPost("/get_image") { val file = formatFileName( fetchGetOrThrow("file") ) call.respondText(GetImage(file), ContentType.Application.Json)