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 0c33da36..562c0674 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 4bbc0654..f064e764 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 { - 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