add live_period in editing of live location

12.0.1

CHANGELOG.md

@@ -1,5 +1,14 @@
 # TelegramBotAPI changelog
 
+## 12.1.0
+
+## 12.0.1
+
+* `Version`:
+  * `Ktor`: `2.3.9` -> `2.3.10`
+  * `MicroUtils`: `0.20.39` -> `0.20.45`
+  * `UUID`: `0.8.2` -> `0.8.4`
+
 ## 12.0.0
 
 **Add support of [Telegram Bots API 7.2](https://core.telegram.org/bots/api-changelog#march-31-2024)**

gradle.properties

@@ -6,4 +6,4 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 library_group=dev.inmo
-library_version=12.0.0
+library_version=12.1.0

gradle/libs.versions.toml

@@ -7,13 +7,13 @@ kotlin-coroutines = "1.8.0"
 javax-activation = "1.1.1"
 
 korlibs = "5.4.0"
-uuid = "0.8.2"
-ktor = "2.3.9"
+uuid = "0.8.4"
+ktor = "2.3.10"
 
-ksp = "1.9.23-1.0.19"
+ksp = "1.9.23-1.0.20"
 kotlin-poet = "1.16.0"
 
-microutils = "0.20.39"
+microutils = "0.20.45"
 kslog = "1.3.3"
 
 versions = "0.51.0"

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/Edits.kt

@@ -55,6 +55,7 @@ suspend fun TelegramBot.edit(
     messageId: MessageId,
     latitude: Double,
     longitude: Double,
+    livePeriod: Seconds? = null,
     horizontalAccuracy: Meters? = null,
     heading: Degrees? = null,
     proximityAlertRadius: Meters? = null,
@@ -70,6 +71,7 @@ suspend fun TelegramBot.edit(
     messageId: MessageId,
     latitude: Double,
     longitude: Double,
+    livePeriod: Seconds? = null,
     horizontalAccuracy: Meters? = null,
     heading: Degrees? = null,
     proximityAlertRadius: Meters? = null,
@@ -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]

tgbotapi.api/src/commonMain/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)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/location/live/EditChatMessageLiveLocation.kt

@@ -3,6 +3,7 @@ package dev.inmo.tgbotapi.requests.edit.location.live
 import dev.inmo.tgbotapi.requests.edit.abstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
+import dev.inmo.tgbotapi.types.location.LiveLocation
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
 import dev.inmo.tgbotapi.types.message.content.LocationContent
@@ -22,6 +23,8 @@ data class EditChatMessageLiveLocation(
     override val latitude: Double,
     @SerialName(longitudeField)
     override val longitude: Double,
+    @SerialName(livePeriodField)
+    val livePeriod: Seconds? = null,
     @SerialName(horizontalAccuracyField)
     override val horizontalAccuracy: Meters? = null,
     @SerialName(headingField)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt

@@ -234,6 +234,7 @@ const val isAnimatedField = "is_animated"
 const val isVideoField = "is_video"
 const val inviteLinkField = "invite_link"
 const val viaChatFolderInviteLinkField = "via_chat_folder_invite_link"
+const val viaJoinRequestField = "via_join_request"
 const val pinnedMessageField = "pinned_message"
 const val activeUsernamesField = "active_usernames"
 const val customTitleField = "custom_title"

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated.kt

@@ -24,5 +24,7 @@ data class ChatMemberUpdated(
     @SerialName(inviteLinkField)
     val inviteLink: ChatInviteLink? = null,
     @SerialName(viaChatFolderInviteLinkField)
-    val viaChatFolderInviteLink: Boolean? = false
+    val viaChatFolderInviteLink: Boolean? = false,
+    @SerialName(viaJoinRequestField)
+    val viaJoinRequest: Boolean? = false
 ) : WithPreviewChat, WithUser

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/location/Location.kt

@@ -41,12 +41,16 @@ data class LiveLocation(
     @SerialName(horizontalAccuracyField)
     override val horizontalAccuracy: Meters? = null,
     @SerialName(livePeriodField)
-    override val livePeriod: Seconds,
+    override val livePeriod: Seconds = INDEFINITE_LIVE_PERIOD,
     @SerialName(headingField)
     override val heading: Degrees? = null,
     @SerialName(proximityAlertRadiusField)
     override val proximityAlertRadius: Meters? = null
-) : Location, Livable, ProximityAlertable, Headed
+) : Location, Livable, ProximityAlertable, Headed {
+    companion object {
+        const val INDEFINITE_LIVE_PERIOD: Seconds = 0x7FFFFFFF
+    }
+}
 
 object LocationSerializer : KSerializer<Location> {
     private val internalSerializer = JsonObject.serializer()