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

* 统一发送图片时的请求参数 * 修改另一个 ElemMaker
whitechi73 · Mar 3, 2024 · d92d1da · d92d1da
1 parent 27f837a
commit d92d1da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/maker/ElemMaker.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/maker/ElemMaker.kt
@@ -216,7 +216,8 @@ internal class ElemMaker {
         peerId: String,
         data: JsonObject
     ) {
-        val isOriginal = data["original"].asBooleanOrNull ?: true
+        val type = data["type"].asStringOrNull ?: "original"
+        val isOriginal = type == "original"
         val filePath = data["file"].asStringOrNull
         val url = data["url"].asStringOrNull
         var file: File? = null
@@ -713,4 +714,4 @@ internal class ElemMaker {
             if (!containsKey(it)) throw ParamsException(it)
         }
     }
-}
+}
diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/maker/NtMsgElementMaker.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/maker/NtMsgElementMaker.kt
@@ -992,8 +992,9 @@ internal object NtMsgElementMaker {
         peerId: String,
         data: JsonObject
     ): Result<MsgElement> {
-        val isOriginal = data["original"].asBooleanOrNull ?: true
-        val isFlash = data["flash"].asBooleanOrNull ?: false
+        val type = data["type"].asStringOrNull ?: ""
+        val isOriginal = type == "original"
+        val isFlash = type == "flash"
         val filePath = data["file"].asStringOrNull
         val url = data["url"].asStringOrNull
         var file: File? = null