fix in changelog

update ktor
webhook fixes
2025-11-28 10:30:46 +00:00 · 2020-11-10 21:45:07 +06:00 · 2020-11-10 20:56:11 +06:00 · 2020-11-10 20:44:39 +06:00 · 2020-11-10 20:01:22 +06:00 · 2020-11-09 15:16:26 +06:00
6 changed files with 67 additions and 81 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # TelegramBotAPI changelog

+## 0.30.2
+
+* `Common`:
+    * `Version`:
+        * `Ktor`: `1.4.1` -> `1.4.2`
+* `Core`:
+    * New sealed class `SetWebhookRequest` which can be used in `SetWebhook` requests
+* `Utils`:
+    * Extensions `setWebhookInfoAndStartListenWebhooks` has been united in one extension with `SetWebhookRequest`
+    incoming parameter
+
 ## 0.30.1

 * `Common`:
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 | Common info                           | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI.svg?branch=master)](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI) [Small survey](https://forms.gle/2Hex2ynbHWHhi1KY7)|
 | -------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Useful links | [![Chat in Telegram](badges/chat.svg)](https://t.me/InMoTelegramBotAPI) [![KDocs](badges/kdocs.svg)](https://tgbotapi.inmo.dev/docs/index.html) [Examples](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/), [Mini tutorial](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
+| Useful links | [![Chat in Telegram](badges/chat.svg)](https://t.me/InMoTelegramBotAPI) [![Create bot](badges/template.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![KDocs](badges/kdocs.svg)](https://tgbotapi.inmo.dev/docs/index.html) [Examples](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/), [Mini tutorial](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
 | TelegramBotAPI Core status                 | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.core/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.core/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core) |
 | TelegramBotAPI Extensions status      | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api) |
 | TelegramBotAPI Util Extensions status | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils) |
--- a/badges/template.svg
+++ b/badges/template.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="104" height="20">
+    <linearGradient id="b" x2="0" y2="100%">
+        <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+        <stop offset="1" stop-opacity=".1"/>
+    </linearGradient>
+    <clipPath id="a">
+        <rect width="104" height="20" rx="3" fill="#fff"/>
+    </clipPath>
+    <g clip-path="url(#a)">
+        <path fill="#555" d="M0 0h65v20H0z"/>
+        <path fill="#007ec6" d="M35 0h69v20H35z"/>
+        <path fill="url(#b)" d="M0 0h104v20H0z"/>
+    </g>
+    <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110">
+        <text x="175" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)">Bot</text>
+        <text x="175" y="140" transform="scale(.1)">Bot</text>
+        <text x="690" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)">Template</text>
+        <text x="690" y="140" transform="scale(.1)">Template</text>
+    </g>
+</svg>
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,14 +10,14 @@ kotlin_coroutines_version=1.4.1
 kotlin_serialisation_runtime_version=1.0.1
 klock_version=1.12.1
 uuid_version=0.2.2
-ktor_version=1.4.1
+ktor_version=1.4.2

 micro_utils_version=0.3.0

 javax_activation_version=1.1.1

 library_group=dev.inmo
-library_version=0.30.1
+library_version=0.30.2

 gradle_bintray_plugin_version=1.8.5
 github_release_plugin_version=2.2.12
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/SetWebhook.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/SetWebhook.kt
@@ -1,8 +1,7 @@
 package dev.inmo.tgbotapi.requests.webhook

 import dev.inmo.tgbotapi.requests.abstracts.*
-import dev.inmo.tgbotapi.requests.send.media.base.DataRequest
-import dev.inmo.tgbotapi.requests.send.media.base.MultipartRequestImpl
+import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
@@ -13,14 +12,15 @@ private fun correctWebhookUrl(sourceUrl: String) = if (sourceUrl.contains("://")
    "https://$sourceUrl"
 }

-fun SetWebhook(
+sealed class SetWebhookRequest : Request<Boolean>
+class MultipartSetWebhookRequest(
    url: String,
    certificate: MultipartFile,
    ipAddress: String? = null,
    maxAllowedConnections: Int? = null,
    allowedUpdates: List<String>? = null,
    dropPendingUpdates: Boolean? = null
-): MultipartRequestImpl<SetWebhook, Map<String, MultipartFile>, Boolean> = MultipartRequestImpl(
+) : SetWebhookRequest(), MultipartRequest<Boolean> by MultipartRequestImpl(
    SetWebhook(
        correctWebhookUrl(url),
        null as String?,
@@ -32,6 +32,22 @@ fun SetWebhook(
    mapOf(certificateField to certificate)
 )

+fun SetWebhook(
+    url: String,
+    certificate: MultipartFile,
+    ipAddress: String? = null,
+    maxAllowedConnections: Int? = null,
+    allowedUpdates: List<String>? = null,
+    dropPendingUpdates: Boolean? = null
+): MultipartSetWebhookRequest = MultipartSetWebhookRequest(
+    correctWebhookUrl(url),
+    certificate,
+    ipAddress,
+    maxAllowedConnections,
+    allowedUpdates,
+    dropPendingUpdates
+)
+
 fun SetWebhook(
    url: String,
    certificate: FileId,
@@ -63,7 +79,7 @@ fun SetWebhook(
    maxAllowedConnections: Int? = null,
    allowedUpdates: List<String>? = null,
    dropPendingUpdates: Boolean? = null
-): Request<Boolean> = when (certificate) {
+) = when (certificate) {
    is MultipartFile -> SetWebhook(correctWebhookUrl(url), certificate as MultipartFile, ipAddress, maxAllowedConnections, allowedUpdates, dropPendingUpdates)
    is FileId -> SetWebhook(correctWebhookUrl(url), certificate as FileId, ipAddress, maxAllowedConnections, allowedUpdates, dropPendingUpdates)
 }
@@ -82,7 +98,7 @@ fun SetWebhook(
    maxAllowedConnections: Int? = null,
    allowedUpdates: List<String>? = null,
    dropPendingUpdates: Boolean? = null
-): Request<Boolean> = SetWebhook(
+) = SetWebhook(
    correctWebhookUrl(url),
    null,
    ipAddress,
@@ -112,7 +128,7 @@ data class SetWebhook internal constructor(
    val allowedUpdates: List<String>? = null,
    @SerialName(dropPendingUpdatesField)
    val dropPendingUpdates: Boolean? = null
-) : DataRequest<Boolean> {
+) : SetWebhookRequest(), DataRequest<Boolean> {
    override fun method(): String = "setWebhook"
    override val resultDeserializer: DeserializationStrategy<Boolean>
        get() = Boolean.serializer()
--- a/tgbotapi.extensions.utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/Webhook.kt
+++ b/tgbotapi.extensions.utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/Webhook.kt
@@ -5,10 +5,7 @@ import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.RequestsExecutor
 import dev.inmo.tgbotapi.extensions.utils.nonstrictJsonFormat
 import dev.inmo.tgbotapi.extensions.utils.updates.flowsUpdatesFilter
-import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.requests.send.media.base.MultipartRequestImpl
-import dev.inmo.tgbotapi.requests.webhook.SetWebhook
+import dev.inmo.tgbotapi.requests.webhook.SetWebhookRequest
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.types.update.abstracts.UpdateDeserializationStrategy
 import dev.inmo.tgbotapi.updateshandlers.*
@@ -67,7 +64,7 @@ fun Route.includeWebhookHandlingInRouteWithFlows(
 )

 /**
- * Setting up ktor server, set webhook info via [SetWebhook] request.
+ * Setting up ktor server
 *
 * @param listenPort port which will be listen by bot
 * @param listenRoute address to listen by bot. If null - will be set up in root of host
@@ -119,27 +116,8 @@ fun startListenWebhooks(
    }
 }

-private suspend fun RequestsExecutor.internalSetWebhookInfoAndStartListenWebhooks(
-    listenPort: Int,
-    engineFactory: ApplicationEngineFactory<*, *>,
-    setWebhookRequest: Request<Boolean>,
-    exceptionsHandler: ExceptionHandler<Unit> = {},
-    listenHost: String = "0.0.0.0",
-    listenRoute: String? = null,
-    privateKeyConfig: WebhookPrivateKeyConfig? = null,
-    scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
-    block: UpdateReceiver<Update>
-): ApplicationEngine {
-    return try {
-        execute(setWebhookRequest)
-        startListenWebhooks(listenPort, engineFactory, exceptionsHandler, listenHost, listenRoute, privateKeyConfig, scope, block)
-    } catch (e: Exception) {
-        throw e
-    }
-}
-
 /**
- * Setting up ktor server, set webhook info via [SetWebhook] request.
+ * Setting up ktor server, set webhook info via [SetWebhookRequest] request.
 *
 * @param listenPort port which will be listen by bot
 * @param listenRoute address to listen by bot
@@ -153,55 +131,16 @@ private suspend fun RequestsExecutor.internalSetWebhookInfoAndStartListenWebhook
 suspend fun RequestsExecutor.setWebhookInfoAndStartListenWebhooks(
    listenPort: Int,
    engineFactory: ApplicationEngineFactory<*, *>,
-    setWebhookRequest: SetWebhook,
+    setWebhookRequest: SetWebhookRequest,
    exceptionsHandler: ExceptionHandler<Unit> = {},
    listenHost: String = "0.0.0.0",
    listenRoute: String = "/",
    privateKeyConfig: WebhookPrivateKeyConfig? = null,
    scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
    block: UpdateReceiver<Update>
-): ApplicationEngine = internalSetWebhookInfoAndStartListenWebhooks(
-    listenPort,
-    engineFactory,
-    setWebhookRequest as Request<Boolean>,
-    exceptionsHandler,
-    listenHost,
-    listenRoute,
-    privateKeyConfig,
-    scope,
-    block
-)
-
-/**
- * Setting up ktor server, set webhook info via [SetWebhook] request.
- *
- * @param listenPort port which will be listen by bot
- * @param listenRoute address to listen by bot
- * @param scope Scope which will be used for
- *
- * @see dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
- * @see UpdatesFilter
- * @see UpdatesFilter.asUpdateReceiver
- */
-@Suppress("unused")
-suspend fun RequestsExecutor.setWebhookInfoAndStartListenWebhooks(
-    listenPort: Int,
-    engineFactory: ApplicationEngineFactory<*, *>,
-    setWebhookRequest: MultipartRequestImpl<SetWebhook, Map<String, MultipartFile>, Boolean>,
-    exceptionsHandler: ExceptionHandler<Unit> = {},
-    listenHost: String = "0.0.0.0",
-    listenRoute: String? = null,
-    privateKeyConfig: WebhookPrivateKeyConfig? = null,
-    scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
-    block: UpdateReceiver<Update>
-): ApplicationEngine = internalSetWebhookInfoAndStartListenWebhooks(
-    listenPort,
-    engineFactory,
-    setWebhookRequest as Request<Boolean>,
-    exceptionsHandler,
-    listenHost,
-    listenRoute,
-    privateKeyConfig,
-    scope,
-    block
-)
+): ApplicationEngine = try {
+    execute(setWebhookRequest)
+    startListenWebhooks(listenPort, engineFactory, exceptionsHandler, listenHost, listenRoute, privateKeyConfig, scope, block)
+} catch (e: Exception) {
+    throw e
+}
Author	SHA1	Message	Date
InsanusMokrassar	f8ea5f9515	fix in changelog	2020-11-10 21:45:07 +06:00
InsanusMokrassar	9f11c4f1c4	update ktor	2020-11-10 20:56:11 +06:00
InsanusMokrassar	9c91980d5d	webhook fixes	2020-11-10 20:44:39 +06:00
InsanusMokrassar	7376eb5b10	start 0.30.2	2020-11-10 20:01:22 +06:00
InsanusMokrassar	6654f27f9d	Merge pull request #202 from InsanusMokrassar/0.30.1 0.30.1	2020-11-09 15:16:26 +06:00
InsanusMokrassar	83edda2dfe	add link to bot template	2020-11-08 18:58:52 +06:00