From d92d1daffb05149759e647622c18fca7bbd0a10b Mon Sep 17 00:00:00 2001
From: huan_kong <49610758+huankong233@users.noreply.github.com>
Date: Mon, 4 Mar 2024 01:13:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=8F=91=E9=80=81=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=97=B6=E7=9A=84=E5=8F=82=E6=95=B0=20(#276)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

* 修改另一个 ElemMaker
---
 .../moe/fuqiuluo/qqinterface/servlet/msg/maker/ElemMaker.kt  | 5 +++--
 .../qqinterface/servlet/msg/maker/NtMsgElementMaker.kt       | 5 +++--
 2 files changed, 6 insertions(+), 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
index 0c33da3..562c067 100644
--- 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)
         }
     }
-}
\ No newline at end of file
+}
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
index 4bbc065..f064e76 100644
--- 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