Merge pull request #848 from InsanusMokrassar/13.0.0

13.0.0
InsanusMokrassar · May 10, 2024 · 1e679ce · 1e679ce
2 parents 31c1055 + fe4be69
commit 1e679ce
Show file tree

Hide file tree

Showing 41 changed files with 3,514 additions and 940 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # TelegramBotAPI changelog
 
+## 13.0.0
+
+**Add support of [Telegram Bots API 7.3](https://core.telegram.org/bots/api-changelog#may-6-2024)**
+
+**THIS UPDATE CONTAINS BREAKING CHANGES**
+
+* `Core`:
+  * For polls, `textSources` now means `question` text sources. For `QuizPoll` there are `explanation` and `explanationTextSources`
+  for hinting
+* `API`:
+  * A lot of API related to `Poll`s has been changed to include opportunity to pass `ParseMode` and `TextSource`s list
+
 ## 12.0.1
 
 * `Version`:

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-7.2-blue)](https://core.telegram.org/bots/api-changelog#march-31-2024)
+# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-7.3-blue)](https://core.telegram.org/bots/api-changelog#may-6-2024)
 
 |          Docs          |                                   [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue&logo=kotlin)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Mk&message=Docs&color=blue&logo=mkdocs)](https://docs.inmo.dev/tgbotapi/index.html)                                    |
 |:----------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|

diff --git a/gradle.properties b/gradle.properties
@@ -6,4 +6,4 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 library_group=dev.inmo
-library_version=12.0.1
+library_version=13.0.0
diff --git a/tgbotapi.api/api/tgbotapi.api.api b/tgbotapi.api/api/tgbotapi.api.api
diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveFlowLocation.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveFlowLocation.kt
@@ -50,22 +50,30 @@ suspend fun TelegramBot.handleLiveLocation(
     sentMessageFlow: FlowCollector<ContentMessage<LocationContent>>? = null
 ) {
     var currentLiveLocationMessage: ContentMessage<LocationContent>? = null
-    val updateMessageJob = CoroutineScope(currentCoroutineContext().LinkedSupervisorJob()).launchSafelyWithoutExceptions(start = CoroutineStart.LAZY) {
-        while (isActive) {
-            delay(liveTimeMillis)
-            // Remove previous location message info to resend live location message
-            currentLiveLocationMessage = null
+    val updateMessageJob = if (liveTimeMillis == indefiniteLivePeriodDelayMillis) { // do not launch refreshing of message for indefinite live locations
+        null
+    } else {
+        CoroutineScope(currentCoroutineContext().LinkedSupervisorJob()).launchSafelyWithoutExceptions(start = CoroutineStart.LAZY) {
+            while (isActive) {
+                delay(liveTimeMillis)
+                // Remove previous location message info to resend live location message
+                currentLiveLocationMessage = null
+            }
         }
     }
     locationsFlow.collect {
         val capturedLiveLocationMessage = currentLiveLocationMessage
         if (capturedLiveLocationMessage == null) {
-            updateMessageJob.start()
+            updateMessageJob ?.start()
             currentLiveLocationMessage = send(
                 chatId,
                 it.latitude,
                 it.longitude,
-                ceil(liveTimeMillis.toDouble() / 1000).toInt(),
+                if (liveTimeMillis == indefiniteLivePeriodDelayMillis) {
+                    LiveLocation.INDEFINITE_LIVE_PERIOD
+                } else {
+                    ceil(liveTimeMillis.toDouble() / 1000).toInt()
+                },
                 it.horizontalAccuracy,
                 it.heading,
                 it.proximityAlertRadius,
@@ -80,13 +88,13 @@ suspend fun TelegramBot.handleLiveLocation(
             }
         } else {
             edit(
-                capturedLiveLocationMessage,
-                it.latitude,
-                it.longitude,
-                it.horizontalAccuracy,
-                it.heading,
-                it.proximityAlertRadius,
-                it.replyMarkup
+                message = capturedLiveLocationMessage,
+                latitude = it.latitude,
+                longitude = it.longitude,
+                horizontalAccuracy = it.horizontalAccuracy,
+                heading = it.heading,
+                proximityAlertRadius = it.proximityAlertRadius,
+                replyMarkup = it.replyMarkup
             ).also {
                 sentMessageFlow ?.emit(it)
             }

diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveLocationProvider.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveLocationProvider.kt
@@ -23,7 +23,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlin.math.ceil
 
-val defaultLivePeriodDelayMillis = (livePeriodLimit.last - 60L) * 1000L
+const val indefiniteLivePeriodDelayMillis = LiveLocation.INDEFINITE_LIVE_PERIOD * 1000L
+const val defaultLivePeriodDelayMillis = indefiniteLivePeriodDelayMillis
 
 /**
  * @see startLiveLocation

diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/Edits.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/Edits.kt
@@ -55,11 +55,12 @@ suspend fun TelegramBot.edit(
     messageId: MessageId,
     latitude: Double,
     longitude: Double,
+    livePeriod: Seconds? = null,
     horizontalAccuracy: Meters? = null,
     heading: Degrees? = null,
     proximityAlertRadius: Meters? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chatId, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
+) = editLiveLocation(chatId, messageId, latitude, longitude, livePeriod, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -70,11 +71,12 @@ suspend fun TelegramBot.edit(
     messageId: MessageId,
     latitude: Double,
     longitude: Double,
+    livePeriod: Seconds? = null,
     horizontalAccuracy: Meters? = null,
     heading: Degrees? = null,
     proximityAlertRadius: Meters? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chat, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
+) = editLiveLocation(chat, messageId, latitude, longitude, livePeriod, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -84,11 +86,12 @@ suspend fun TelegramBot.edit(
     message: ContentMessage<LocationContent>,
     latitude: Double,
     longitude: Double,
+    livePeriod: Seconds? = null,
     horizontalAccuracy: Meters? = null,
     heading: Degrees? = null,
     proximityAlertRadius: Meters? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(message, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
+) = editLiveLocation(message, latitude, longitude, livePeriod, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]

diff --git a/...kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/EditChatMessageLiveLocation.kt b/...kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/EditChatMessageLiveLocation.kt
@@ -18,13 +18,14 @@ suspend fun TelegramBot.editLiveLocation(
     messageId: MessageId,
     latitude: Double,
     longitude: Double,
+    livePeriod: Seconds? = null,
     horizontalAccuracy: Meters? = null,
     heading: Degrees? = null,
     proximityAlertRadius: Meters? = null,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(
     EditChatMessageLiveLocation(
-        chatId, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup
+        chatId, messageId, latitude, longitude, livePeriod, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup
     )
 )
 
@@ -37,11 +38,12 @@ suspend fun TelegramBot.editLiveLocation(
     messageId: MessageId,
     latitude: Double,
     longitude: Double,
+    livePeriod: Seconds? = null,
     horizontalAccuracy: Meters? = null,
     heading: Degrees? = null,
     proximityAlertRadius: Meters? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chat.id, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
+) = editLiveLocation(chat.id, messageId, latitude, longitude, livePeriod, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -51,11 +53,12 @@ suspend fun TelegramBot.editLiveLocation(
     message: ContentMessage<LocationContent>,
     latitude: Double,
     longitude: Double,
+    livePeriod: Seconds? = null,
     horizontalAccuracy: Meters? = null,
     heading: Degrees? = null,
     proximityAlertRadius: Meters? = null,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(message.chat, message.messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
+) = editLiveLocation(message.chat, message.messageId, latitude, longitude, livePeriod, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -68,7 +71,7 @@ suspend fun TelegramBot.editLiveLocation(
     replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(
     EditChatMessageLiveLocation(
-        chatId, messageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup
+        chatId, messageId, location.latitude, location.longitude, location.livePeriod, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup
     )
 )
 
@@ -81,7 +84,7 @@ suspend fun TelegramBot.editLiveLocation(
     messageId: MessageId,
     location: LiveLocation,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chat.id, messageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)
+) = editLiveLocation(chat.id, messageId, location.latitude, location.longitude, location.livePeriod, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)
 
 /**
  * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -91,4 +94,4 @@ suspend fun TelegramBot.editLiveLocation(
     message: ContentMessage<LocationContent>,
     location: LiveLocation,
     replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(message.chat, message.messageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)
+) = editLiveLocation(message.chat, message.messageId, location.latitude, location.longitude, location.livePeriod, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)