shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 05:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: shkong:f030104ff213a43712b52491053c73de106fbb1c
Branches Tags
shkong:master shkong:v1.0.9 shkong:gh-pages shkong:docs
shkong:1.1.1 shkong:1.0.9 shkong:1.1.0-ntrnm shkong:1.1.0 shkong:1.0.8 shkong:1.0.7 shkong:1.0.6 shkong:1.0.5
...
compare: shkong:0cf10eabd6784e932da071ccad40733ed1a08cac
Branches Tags
shkong:v1.0.9 shkong:master shkong:gh-pages shkong:docs
shkong:1.1.1 shkong:1.0.9 shkong:1.1.0-ntrnm shkong:1.1.0 shkong:1.0.8 shkong:1.0.7 shkong:1.0.6 shkong:1.0.5

2 Commits
f030104ff2 ... 0cf10eabd6

Author SHA1 Message Date
ikechan8370
0cf10eabd6 fix: set field file_type not required 2024-03-18 13:34:13 +08:00
tuuz
8c33267887 fileType加入空匹配，可支持空传 2024-03-18 13:30:18 +08:00
1 changed files with 6 additions and 5 deletions
Expand all files Collapse all files

11
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetFile.kt
View File

@ -9,13 +9,14 @@ import moe.fuqiuluo.shamrock.utils.FileUtils
import moe.fuqiuluo.symbols.OneBotHandler import moe.fuqiuluo.symbols.OneBotHandler
import java.util.Base64 import java.util.Base64
@OneBotHandler("get_file") internal object GetFile : IActionHandler() { @OneBotHandler("get_file")
internal object GetFile : IActionHandler() {
override suspend fun internalHandle(session: ActionSession): String { override suspend fun internalHandle(session: ActionSession): String {
val file = session.getString("file") val file = session.getString("file")
.replace(regex = "[{}\\-]".toRegex(), replacement = "") .replace(regex = "[{}\\-]".toRegex(), replacement = "")
.replace(" ", "") .replace(" ", "")
.split(".")[0].lowercase() .split(".")[0].lowercase()
val fileType = session.getString("file_type") val fileType = session.getStringOrNull("file_type") ?: "base64"
return invoke(file, fileType, session.echo) return invoke(file, fileType, session.echo)
} }
@ -23,7 +24,7 @@ import java.util.Base64
val targetFile = FileUtils.getFileByMd5(file) val targetFile = FileUtils.getFileByMd5(file)
return if (targetFile.exists()) { return if (targetFile.exists()) {
when (fileType) { when (fileType) {
"base64" -> ok( "base64", "" -> ok(
OutResourceByBase64( OutResourceByBase64(
"/res/${targetFile.nameWithoutExtension}", "/res/${targetFile.nameWithoutExtension}",
Base64.getEncoder() Base64.getEncoder()
@ -40,5 +41,5 @@ import java.util.Base64
} }
} }
override val requiredParams: Array<String> = arrayOf("file", "file_type") override val requiredParams: Array<String> = arrayOf("file")
} }