From 8eec3635813b9c5db89e5596d412259c2a3ff8f3 Mon Sep 17 00:00:00 2001 From: tarsin Date: Fri, 28 Apr 2023 10:10:45 +0800 Subject: [PATCH] Cleanup EhEngine --- .../main/java/com/hippo/ehviewer/client/EhEngine.kt | 11 +---------- .../com/hippo/ehviewer/client/EhRequestBuilder.kt | 2 ++ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt index 415991101..d4587955f 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt @@ -218,16 +218,7 @@ object EhEngine { return ehRequest(EhUrl.apiUrl, referer, EhUrl.origin) { jsonBody { put("method", "gdata") - array("gidlist") { - galleryInfoList.forEach { - put( - array { - put(it.gid) - put(it.token) - }, - ) - } - } + array("gidlist") { galleryInfoList.forEach { put(jsonArrayOf(it.gid, it.token)) } } put("namespace", 1) } }.executeAndParsingWith { GalleryApiParser.parse(this, galleryInfoList) } diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.kt b/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.kt index fcc76c494..3f31865b2 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.kt @@ -43,6 +43,8 @@ inline fun JSONObject.array(name: String, builder: JSONArray.() -> Unit): JSONOb inline fun JSONArray.array(builder: JSONArray.() -> Unit): JSONArray = put(JSONArray().apply(builder)) +fun jsonArrayOf(vararg element: Any?) = JSONArray().apply { element.forEach { put(it) } } // Should ensure it is inlined + inline fun Request.Builder.jsonBody(builder: JSONObject.() -> Unit) = post(JSONObject().apply(builder).toString().toRequestBody(MEDIA_TYPE_JSON)) fun HttpMessageBuilder.referer(value: String?): Unit = value?.let { headers.append("Referer", it) } ?: Unit