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

统一发送图片时的参数 (#276)

Browse Source 
* 统一发送图片时的请求参数

* 修改另一个 ElemMaker
This commit is contained in:
huan_kong 2024-03-04 01:13:21 +08:00 committed by GitHub
parent 27f837adbe
commit d92d1daffb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/maker/ElemMaker.kt
View File

@ -216,7 +216,8 @@ internal class ElemMaker {
peerId: String, peerId: String,
data: JsonObject data: JsonObject
) { ) {
val isOriginal = data["original"].asBooleanOrNull ?: true val type = data["type"].asStringOrNull ?: "original"
val isOriginal = type == "original"
val filePath = data["file"].asStringOrNull val filePath = data["file"].asStringOrNull
val url = data["url"].asStringOrNull val url = data["url"].asStringOrNull
var file: File? = null var file: File? = null
@ -713,4 +714,4 @@ internal class ElemMaker {
if (!containsKey(it)) throw ParamsException(it) if (!containsKey(it)) throw ParamsException(it)
} }
} }
} }

5
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/maker/NtMsgElementMaker.kt
View File

@ -992,8 +992,9 @@ internal object NtMsgElementMaker {
peerId: String, peerId: String,
data: JsonObject data: JsonObject
): Result<MsgElement> { ): Result<MsgElement> {
val isOriginal = data["original"].asBooleanOrNull ?: true val type = data["type"].asStringOrNull ?: ""
val isFlash = data["flash"].asBooleanOrNull ?: false val isOriginal = type == "original"
val isFlash = type == "flash"
val filePath = data["file"].asStringOrNull val filePath = data["file"].asStringOrNull
val url = data["url"].asStringOrNull val url = data["url"].asStringOrNull
var file: File? = null var file: File? = null