From 83ad66d27c37686e611f2251ffba5fbb40bf3627 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Fri, 28 Apr 2023 14:21:05 +0800
Subject: [PATCH] Fix responseBody builder dsl name

---
 .../java/com/hippo/ehviewer/client/EhEngine.kt     | 14 +++++++-------
 .../com/hippo/ehviewer/client/EhRequestBuilder.kt  |  4 ++--
 2 files changed, 9 insertions(+), 9 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 d4e7211c6..1e044a090 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt
@@ -202,7 +202,7 @@ object EhEngine {
         val url = EhUrl.API_SIGN_IN
         val origin = "https://forums.e-hentai.org"
         return ehRequest(url, referer, origin) {
-            form {
+            formBody {
                 add("referer", referer)
                 add("b", "")
                 add("bt", "")
@@ -214,7 +214,7 @@ object EhEngine {
     }
 
     suspend fun commentGallery(url: String, comment: String, id: String?) = ehRequest(url, url, EhUrl.origin) {
-        form {
+        formBody {
             if (id == null) {
                 add("commenttext_new", comment)
             } else {
@@ -248,7 +248,7 @@ object EhEngine {
         }
         val url = EhUrl.getAddFavorites(gid, token)
         return ehRequest(url, url, EhUrl.origin) {
-            form {
+            formBody {
                 add("favcat", catStr)
                 add("favnote", note ?: "")
                 // submit=Add+to+Favorites is not necessary, just use submit=Apply+Changes all the time
@@ -274,7 +274,7 @@ object EhEngine {
         val url = EhUrl.getDownloadArchive(gid, token, or)
         val referer = EhUrl.getGalleryDetailUrl(gid, token)
         val request = ehRequest(url, referer, EhUrl.origin) {
-            form {
+            formBody {
                 if (isHAtH) {
                     add("hathdl_xres", res)
                 } else {
@@ -304,7 +304,7 @@ object EhEngine {
 
     suspend fun resetImageLimits(): HomeParser.Limits? {
         return ehRequest(EhUrl.URL_HOME) {
-            form {
+            formBody {
                 add("act", "limits")
                 add("reset", "Reset Limit")
             }
@@ -318,7 +318,7 @@ object EhEngine {
             else -> throw EhException("Invalid dstCat: $dstCat")
         }
         return ehRequest(url, url, EhUrl.origin) {
-            form {
+            formBody {
                 add("ddact", catStr)
                 gidArray.forEach { add("modifygids[]", it.toString()) }
                 add("apply", "Apply")
@@ -415,7 +415,7 @@ object EhEngine {
      * @param image Must be jpeg
      */
     suspend fun imageSearch(image: File, uss: Boolean, osc: Boolean) = ehRequest(EhUrl.imageSearchUrl, EhUrl.referer, EhUrl.origin) {
-        multipart {
+        multipartBody {
             setType(MultipartBody.FORM)
             addFormDataPart("sfile", "a.jpg", image.asRequestBody(MEDIA_TYPE_JPEG))
             if (uss) addFormDataPart("fs_similar", "on")
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 d4373a35f..d6def3fee 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.kt
@@ -33,9 +33,9 @@ inline fun ehRequest(url: String, referer: String? = null, origin: String? = nul
     origin?.let { addHeader("Origin", it) }
 }.apply(builder).build()
 
-inline fun Request.Builder.form(builder: FormBody.Builder.() -> Unit) = post(FormBody.Builder().apply(builder).build())
+inline fun Request.Builder.formBody(builder: FormBody.Builder.() -> Unit) = post(FormBody.Builder().apply(builder).build())
 
-inline fun Request.Builder.multipart(builder: MultipartBody.Builder.() -> Unit) = post(MultipartBody.Builder().apply(builder).build())
+inline fun Request.Builder.multipartBody(builder: MultipartBody.Builder.() -> Unit) = post(MultipartBody.Builder().apply(builder).build())
 
 val MEDIA_TYPE_JSON: MediaType = "application/json; charset=utf-8".toMediaType()