update live/static locations

2025-12-02 04:15:43 +00:00 · 2024-07-15 02:19:50 +06:00
parent f767362c41
commit 8a6e06bbf0
13 changed files with 240 additions and 121 deletions
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/location/live/EditChatMessageLiveLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/location/live/EditChatMessageLiveLocation.kt
@@ -7,11 +7,12 @@ 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.LiveLocationContent
 import dev.inmo.tgbotapi.types.message.content.LocationContent
 import dev.inmo.tgbotapi.utils.throwRangeError
 import kotlinx.serialization.*

-private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<LocationContent>>()
+private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<LiveLocationContent>>()
 const val editMessageLiveLocationMethod = "editMessageLiveLocation"

@Serializable
@@ -36,9 +37,9 @@ data class EditChatMessageLiveLocation(
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    @SerialName(replyMarkupField)
    override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditChatMessage<LocationContent>, EditReplyMessage, EditLocationMessage {
+) : EditChatMessage<LiveLocationContent>, EditReplyMessage, EditLocationMessage {
    override fun method(): String = editMessageLiveLocationMethod
-    override val resultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<LiveLocationContent>>
        get() = commonResultDeserializer
    override val requestSerializer: SerializationStrategy<*>
        get() = serializer()
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/location/live/StopChatMessageLiveLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/location/live/StopChatMessageLiveLocation.kt
@@ -8,9 +8,10 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
 import dev.inmo.tgbotapi.types.message.content.LocationContent
+import dev.inmo.tgbotapi.types.message.content.StaticLocationContent
 import kotlinx.serialization.*

-private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<LocationContent>>()
+private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<StaticLocationContent>>()
 const val stopMessageLiveLocationMethod = "stopMessageLiveLocation"

@Serializable
@@ -23,9 +24,9 @@ data class StopChatMessageLiveLocation(
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    @SerialName(replyMarkupField)
    override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditChatMessage<LocationContent>, EditReplyMessage {
+) : EditChatMessage<StaticLocationContent>, EditReplyMessage {
    override fun method(): String = stopMessageLiveLocationMethod
-    override val resultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<StaticLocationContent>>
        get() = commonResultDeserializer
    override val requestSerializer: SerializationStrategy<*>
        get() = serializer()
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendLocation.kt
@@ -5,6 +5,7 @@ import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
+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.*
@@ -15,6 +16,12 @@ import kotlinx.serialization.*
 private val commonResultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
    = TelegramBotAPIMessageDeserializationStrategyClass()

+private val liveResultDeserializer: DeserializationStrategy<ContentMessage<LiveLocationContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
+private val staticResultDeserializer: DeserializationStrategy<ContentMessage<StaticLocationContent>>
+    = TelegramBotAPIMessageDeserializationStrategyClass()
+
 fun SendLocation(
    chatId: ChatIdentifier,
    latitude: Double,
@@ -26,14 +33,10 @@ fun SendLocation(
    effectId: EffectId? = null,
    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
-) = SendLocation(
+) = SendLocation.Static(
    chatId,
    latitude,
    longitude,
-    null,
-    null,
-    null,
-    null,
    threadId,
    businessConnectionId,
    disableNotification,
@@ -54,7 +57,7 @@ fun SendStaticLocation(
    effectId: EffectId? = null,
    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
-) = SendLocation(
+) = SendLocation.Static(
    chatId = chatId,
    latitude = latitude,
    longitude = longitude,
@@ -82,7 +85,7 @@ fun SendLiveLocation(
    effectId: EffectId? = null,
    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
-) = SendLocation(
+) = SendLocation.Live(
    chatId = chatId,
    latitude = latitude,
    longitude = longitude,
@@ -100,55 +103,95 @@ fun SendLiveLocation(
 )

@Serializable
-data class SendLocation internal constructor(
-    @SerialName(chatIdField)
-    override val chatId: ChatIdentifier,
-    @SerialName(latitudeField)
-    override val latitude: Double,
-    @SerialName(longitudeField)
-    override val longitude: Double,
-    @SerialName(livePeriodField)
-    override val livePeriod: Seconds? = null,
-    @SerialName(horizontalAccuracyField)
-    override val horizontalAccuracy: Meters? = null,
-    @SerialName(headingField)
-    override val heading: Degrees? = null,
-    @SerialName(proximityAlertRadiusField)
-    override val proximityAlertRadius: Meters? = null,
-    @SerialName(messageThreadIdField)
-    override val threadId: MessageThreadId? = chatId.threadId,
-    @SerialName(businessConnectionIdField)
-    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
-    @SerialName(disableNotificationField)
-    override val disableNotification: Boolean = false,
-    @SerialName(protectContentField)
-    override val protectContent: Boolean = false,
-    @SerialName(messageEffectIdField)
-    override val effectId: EffectId? = null,
-    @SerialName(replyParametersField)
-    override val replyParameters: ReplyParameters? = null,
-    @SerialName(replyMarkupField)
-    override val replyMarkup: KeyboardMarkup? = null
-) : SendContentMessageRequest<ContentMessage<LocationContent>>,
-    ReplyingMarkupSendMessageRequest<ContentMessage<LocationContent>>,
-    PositionedSendMessageRequest<ContentMessage<LocationContent>>,
+sealed interface SendLocation<T : LocationContent> : SendContentMessageRequest<ContentMessage<T>>,
+    ReplyingMarkupSendMessageRequest<ContentMessage<T>>,
+    PositionedSendMessageRequest<ContentMessage<T>>,
    HorizontallyAccured,
    Livable,
    ProximityAlertable,
-    Headed
-{
+    Headed {
    override fun method(): String = "sendLocation"
-    override val resultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
-        get() = commonResultDeserializer
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()

-    init {
-        if (livePeriod != null && livePeriod !in livePeriodLimit) {
-            error("Live period for sending location must be in $livePeriodLimit, but was $livePeriod")
-        }
-        if (horizontalAccuracy != null && horizontalAccuracy !in horizontalAccuracyLimit) {
-            throwRangeError("horizontalAccuracy", horizontalAccuracyLimit, horizontalAccuracy)
+    @Serializable
+    data class Live internal constructor(
+        @SerialName(chatIdField)
+        override val chatId: ChatIdentifier,
+        @SerialName(latitudeField)
+        override val latitude: Double,
+        @SerialName(longitudeField)
+        override val longitude: Double,
+        @SerialName(livePeriodField)
+        override val livePeriod: Seconds = LiveLocation.INDEFINITE_LIVE_PERIOD,
+        @SerialName(horizontalAccuracyField)
+        override val horizontalAccuracy: Meters? = null,
+        @SerialName(headingField)
+        override val heading: Degrees? = null,
+        @SerialName(proximityAlertRadiusField)
+        override val proximityAlertRadius: Meters? = null,
+        @SerialName(messageThreadIdField)
+        override val threadId: MessageThreadId? = chatId.threadId,
+        @SerialName(businessConnectionIdField)
+        override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
+        @SerialName(disableNotificationField)
+        override val disableNotification: Boolean = false,
+        @SerialName(protectContentField)
+        override val protectContent: Boolean = false,
+        @SerialName(messageEffectIdField)
+        override val effectId: EffectId? = null,
+        @SerialName(replyParametersField)
+        override val replyParameters: ReplyParameters? = null,
+        @SerialName(replyMarkupField)
+        override val replyMarkup: KeyboardMarkup? = null
+    ) : SendLocation<LiveLocationContent> {
+        override val resultDeserializer: DeserializationStrategy<ContentMessage<LiveLocationContent>>
+            get() = liveResultDeserializer
+        override val requestSerializer: SerializationStrategy<*>
+            get() = Live.serializer()
+
+        init {
+            if (livePeriod !in livePeriodLimit) {
+                error("Live period for sending location must be in $livePeriodLimit, but was $livePeriod")
+            }
+            if (horizontalAccuracy != null && horizontalAccuracy !in horizontalAccuracyLimit) {
+                throwRangeError("horizontalAccuracy", horizontalAccuracyLimit, horizontalAccuracy)
+            }
        }
    }
+
+    @Serializable
+    data class Static internal constructor(
+        @SerialName(chatIdField)
+        override val chatId: ChatIdentifier,
+        @SerialName(latitudeField)
+        override val latitude: Double,
+        @SerialName(longitudeField)
+        override val longitude: Double,
+        @SerialName(messageThreadIdField)
+        override val threadId: MessageThreadId? = chatId.threadId,
+        @SerialName(businessConnectionIdField)
+        override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
+        @SerialName(disableNotificationField)
+        override val disableNotification: Boolean = false,
+        @SerialName(protectContentField)
+        override val protectContent: Boolean = false,
+        @SerialName(messageEffectIdField)
+        override val effectId: EffectId? = null,
+        @SerialName(replyParametersField)
+        override val replyParameters: ReplyParameters? = null,
+        @SerialName(replyMarkupField)
+        override val replyMarkup: KeyboardMarkup? = null
+    ) : SendLocation<StaticLocationContent> {
+        override val livePeriod: Seconds?
+            get() = null
+        override val horizontalAccuracy: Meters?
+            get() = null
+        override val heading: Degrees?
+            get() = null
+        override val proximityAlertRadius: Meters?
+            get() = null
+        override val resultDeserializer: DeserializationStrategy<ContentMessage<StaticLocationContent>>
+            get() = staticResultDeserializer
+        override val requestSerializer: SerializationStrategy<*>
+            get() = serializer()
+    }
 }