使用更好的方式支持表单提交（主要针对包含 InputFile 的类型）

simple-robot · Apr 12, 2024 · f1bd9c8 · f1bd9c8
1 parent 3e02e0c
commit f1bd9c8
Show file tree

Hide file tree

Showing 6 changed files with 598 additions and 18 deletions.
diff --git a/simbot-component-telegram-api/build.gradle.kts b/simbot-component-telegram-api/build.gradle.kts
@@ -87,6 +87,7 @@ kotlin {
             implementation(libs.kotlinx.coroutines.test)
             // https://ktor.io/docs/http-client-testing.html
             implementation(libs.ktor.client.mock)
+            implementation(libs.kotlinx.serialization.properties)
         }
 
         jvmMain.dependencies {

diff --git a/...telegram-api/src/commonMain/kotlin/love/forte/simbot/telegram/api/update/SetWebhookApi.kt b/...telegram-api/src/commonMain/kotlin/love/forte/simbot/telegram/api/update/SetWebhookApi.kt
@@ -20,10 +20,16 @@ package love.forte.simbot.telegram.api.update
 import io.ktor.client.request.forms.*
 import io.ktor.http.*
 import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.serializer
 import love.forte.simbot.common.ktor.inputfile.InputFile
 import love.forte.simbot.telegram.api.FormBodyTelegramApi
+import love.forte.simbot.telegram.api.Telegram
 import love.forte.simbot.telegram.api.TelegramApiResult
+import love.forte.simbot.telegram.api.utils.FormParamHeaderHandler
+import love.forte.simbot.telegram.api.utils.KtorFormSerializer
+import kotlin.jvm.JvmStatic
 
 
 /**
@@ -55,29 +61,39 @@ import love.forte.simbot.telegram.api.TelegramApiResult
 public class SetWebhookApi private constructor(params: Params) : FormBodyTelegramApi<Boolean>() {
     public companion object Factory {
         private const val NAME = "setWebhook"
+        private val formSerializer = KtorFormSerializer(
+            Params.serializer(),
+            Telegram.DefaultJson,
+            FormParamHeaderHandler.isInputFileAndNotStringValueInputFileWithoutParams {
+                headers {
+                    append(HttpHeaders.ContentType, "image/png")
+                    append(HttpHeaders.ContentDisposition, "filename=\"file\"")
+                }
+            }
+        )
+
         private fun Params.toForm(): MultiPartFormDataContent {
             return MultiPartFormDataContent(
-                formData {
-                    append("url", url)
-                    ipAddress?.also { append("ip_address", it) }
-                    maxConnections?.also { append("max_connections", it) }
-                    allowedUpdates?.also { append("allowed_updates", it) }
-                    dropPendingUpdates?.also { append("drop_pending_updates", it) }
-                    secretToken?.also { append("secret_token", it) }
-
-                    // upload file
-                    certificate?.includeTo(
-                        "certificate",
-                        headers {
-                            append(HttpHeaders.ContentType, "image/png")
-                            append(HttpHeaders.ContentDisposition, "filename=\"file\"")
-                        },
-                        this
-                    )
-                }
+                formData(values = formSerializer.serialize(this).toTypedArray())
             )
         }
 
+        /**
+         * Create [SetWebhookApi].
+         */
+        @JvmStatic
+        public fun create(params: Params): SetWebhookApi {
+            return SetWebhookApi(params)
+        }
+
+        /**
+         * Create [SetWebhookApi].
+         */
+        @JvmStatic
+        public fun create(url: String): SetWebhookApi {
+            return create(Params(url = url))
+        }
+
     }
 
     override val name: String
@@ -124,13 +140,19 @@ public class SetWebhookApi private constructor(params: Params) : FormBodyTelegra
      * The header is useful to ensure that the request comes from a webhook set by you.
      *
      */
+    @Serializable
     public data class Params(
         var url: String,
         var certificate: InputFile? = null,
+        @SerialName("ip_address")
         var ipAddress: String? = null,
+        @SerialName("max_connections")
         var maxConnections: Int? = null,
+        @SerialName("allowed_updates")
         var allowedUpdates: Collection<String>? = null,
+        @SerialName("drop_pending_updates")
         var dropPendingUpdates: String? = null,
+        @SerialName("secret_token")
         var secretToken: String? = null,
     ) {
         public constructor(urlValue: String) : this(url = urlValue)