InsanusMokrassar/tgbotapi
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/TelegramBotAPI.git synced 2025-09-12 19:54:05 +00:00
Code Releases Activity

fixes

Browse Source
This commit is contained in:
InsanusMokrassar
2020-05-16 20:43:09 +06:00
parent 85317a510e
commit 7008f312dc
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/SetWebhook.kt
View File

@@ -7,6 +7,12 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
import kotlinx.serialization.*
import kotlinx.serialization.builtins.serializer
private fun correctWebhookUrl(sourceUrl: String) = if (sourceUrl.contains("://")) {
sourceUrl
} else {
"https://$sourceUrl"
}
fun SetWebhook(
url: String,
certificate: MultipartFile,
@@ -14,7 +20,7 @@ fun SetWebhook(
allowedUpdates: List<String>? = null
): MultipartRequestImpl<SetWebhook, Map<String, MultipartFile>, Boolean> = MultipartRequestImpl(
SetWebhook(
url,
correctWebhookUrl(url),
null,
maxAllowedConnections,
allowedUpdates
@@ -28,7 +34,7 @@ fun SetWebhook(
maxAllowedConnections: Int? = null,
allowedUpdates: List<String>? = null
): SetWebhook = SetWebhook(
url,
correctWebhookUrl(url),
certificate.fileId,
maxAllowedConnections,
allowedUpdates
@@ -40,8 +46,8 @@ fun SetWebhook(
maxAllowedConnections: Int? = null,
allowedUpdates: List<String>? = null
): Request<Boolean> = when (certificate) {
is MultipartFile -> SetWebhook(url, certificate as MultipartFile, maxAllowedConnections, allowedUpdates)
is FileId -> SetWebhook(url, certificate as FileId, maxAllowedConnections, allowedUpdates)
is MultipartFile -> SetWebhook(correctWebhookUrl(url), certificate as MultipartFile, maxAllowedConnections, allowedUpdates)
is FileId -> SetWebhook(correctWebhookUrl(url), certificate as FileId, maxAllowedConnections, allowedUpdates)
}
fun SetWebhook(
@@ -49,7 +55,7 @@ fun SetWebhook(
maxAllowedConnections: Int? = null,
allowedUpdates: List<String>? = null
) = SetWebhook(
url,
correctWebhookUrl(url),
null,
maxAllowedConnections,
allowedUpdates