replaces of live location editing requests

2025-09-14 21:00:15 +00:00 · 2022-05-01 21:20:31 +06:00
parent 19ddff2999
commit dd893b14d3
13 changed files with 145 additions and 122 deletions
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt
@@ -1,45 +1,7 @@
 package dev.inmo.tgbotapi.requests.edit.LiveLocation

-import dev.inmo.tgbotapi.requests.edit.abstracts.*
-import dev.inmo.tgbotapi.types.*
-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.utils.throwRangeError
-import kotlinx.serialization.*
+@Deprecated("Replaced", ReplaceWith("editMessageLiveLocationMethod", "dev.inmo.tgbotapi.requests.edit.location.live.editMessageLiveLocationMethod"))
+const val editMessageLiveLocationMethod = dev.inmo.tgbotapi.requests.edit.location.live.editMessageLiveLocationMethod

-private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<LocationContent>>()
-const val editMessageLiveLocationMethod = "editMessageLiveLocation"
-
-@Serializable
-data class EditChatMessageLiveLocation(
-    @SerialName(chatIdField)
-    override val chatId: ChatIdentifier,
-    @SerialName(messageIdField)
-    override val messageId: MessageIdentifier,
-    @SerialName(latitudeField)
-    override val latitude: Double,
-    @SerialName(longitudeField)
-    override val longitude: Double,
-    @SerialName(horizontalAccuracyField)
-    override val horizontalAccuracy: Meters? = null,
-    @SerialName(headingField)
-    override val heading: Degrees? = null,
-    @SerialName(proximityAlertRadiusField)
-    override val proximityAlertRadius: Meters? = null,
-    @SerialName(replyMarkupField)
-    override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditChatMessage<LocationContent>, EditReplyMessage, EditLocationMessage {
-    override fun method(): String = editMessageLiveLocationMethod
-    override val resultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
-        get() = commonResultDeserializer
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()
-
-    init {
-        if (horizontalAccuracy != null && horizontalAccuracy !in horizontalAccuracyLimit) {
-            throwRangeError("horizontalAccuracy", horizontalAccuracyLimit, horizontalAccuracy)
-        }
-    }
-}
+@Deprecated("Replaced", ReplaceWith("EditChatMessageLiveLocation", "dev.inmo.tgbotapi.requests.edit.location.live.EditChatMessageLiveLocation"))
+typealias EditChatMessageLiveLocation = dev.inmo.tgbotapi.requests.edit.location.live.EditChatMessageLiveLocation
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt
@@ -1,35 +1,4 @@
 package dev.inmo.tgbotapi.requests.edit.LiveLocation

-import dev.inmo.tgbotapi.requests.edit.abstracts.*
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.utils.throwRangeError
-import kotlinx.serialization.*
-
-@Serializable
-data class EditInlineMessageLiveLocation(
-    @SerialName(inlineMessageIdField)
-    override val inlineMessageId: InlineMessageIdentifier,
-    @SerialName(latitudeField)
-    override val latitude: Double,
-    @SerialName(longitudeField)
-    override val longitude: Double,
-    @SerialName(horizontalAccuracyField)
-    override val horizontalAccuracy: Meters? = null,
-    @SerialName(headingField)
-    override val heading: Degrees? = null,
-    @SerialName(proximityAlertRadiusField)
-    override val proximityAlertRadius: Meters? = null,
-    @SerialName(replyMarkupField)
-    override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditInlineMessage, EditReplyMessage, EditLocationMessage {
-    override fun method(): String = editMessageLiveLocationMethod
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()
-
-    init {
-        if (horizontalAccuracy != null && horizontalAccuracy !in horizontalAccuracyLimit) {
-            throwRangeError("horizontalAccuracy", horizontalAccuracyLimit, horizontalAccuracy)
-        }
-    }
-}
+@Deprecated("Replaced", ReplaceWith("EditInlineMessageLiveLocation", "dev.inmo.tgbotapi.requests.edit.location.live.EditInlineMessageLiveLocation"))
+typealias EditInlineMessageLiveLocation = dev.inmo.tgbotapi.requests.edit.location.live.EditInlineMessageLiveLocation
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt
@@ -1,29 +1,7 @@
 package dev.inmo.tgbotapi.requests.edit.LiveLocation

-import dev.inmo.tgbotapi.requests.edit.abstracts.EditChatMessage
-import dev.inmo.tgbotapi.requests.edit.abstracts.EditReplyMessage
-import dev.inmo.tgbotapi.types.*
-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 kotlinx.serialization.*
+@Deprecated("Replaced", ReplaceWith("stopMessageLiveLocationMethod", "dev.inmo.tgbotapi.requests.edit.location.live.stopMessageLiveLocationMethod"))
+const val stopMessageLiveLocationMethod = dev.inmo.tgbotapi.requests.edit.location.live.stopMessageLiveLocationMethod

-private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<LocationContent>>()
-const val stopMessageLiveLocationMethod = "stopMessageLiveLocation"
-
-@Serializable
-data class StopChatMessageLiveLocation(
-    @SerialName(chatIdField)
-    override val chatId: ChatIdentifier,
-    @SerialName(messageIdField)
-    override val messageId: MessageIdentifier,
-    @SerialName(replyMarkupField)
-    override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditChatMessage<LocationContent>, EditReplyMessage {
-    override fun method(): String = stopMessageLiveLocationMethod
-    override val resultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
-        get() = commonResultDeserializer
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()
-}
+@Deprecated("Replaced", ReplaceWith("StopChatMessageLiveLocation", "dev.inmo.tgbotapi.requests.edit.location.live.StopChatMessageLiveLocation"))
+typealias StopChatMessageLiveLocation = dev.inmo.tgbotapi.requests.edit.location.live.StopChatMessageLiveLocation
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt
@@ -1,19 +1,4 @@
 package dev.inmo.tgbotapi.requests.edit.LiveLocation

-import dev.inmo.tgbotapi.requests.edit.abstracts.EditInlineMessage
-import dev.inmo.tgbotapi.requests.edit.abstracts.EditReplyMessage
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import kotlinx.serialization.*
-
-@Serializable
-data class StopInlineMessageLiveLocation(
-    @SerialName(inlineMessageIdField)
-    override val inlineMessageId: InlineMessageIdentifier,
-    @SerialName(replyMarkupField)
-    override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditInlineMessage, EditReplyMessage {
-    override fun method(): String = stopMessageLiveLocationMethod
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()
-}
+@Deprecated("Replaced", ReplaceWith("StopInlineMessageLiveLocation", "dev.inmo.tgbotapi.requests.edit.location.live.StopInlineMessageLiveLocation"))
+typealias StopInlineMessageLiveLocation = dev.inmo.tgbotapi.requests.edit.location.live.StopInlineMessageLiveLocation
--- 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
@@ -0,0 +1,45 @@
+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.message.abstracts.ContentMessage
+import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
+import dev.inmo.tgbotapi.types.message.content.LocationContent
+import dev.inmo.tgbotapi.utils.throwRangeError
+import kotlinx.serialization.*
+
+private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<LocationContent>>()
+const val editMessageLiveLocationMethod = "editMessageLiveLocation"
+
+@Serializable
+data class EditChatMessageLiveLocation(
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier,
+    @SerialName(messageIdField)
+    override val messageId: MessageIdentifier,
+    @SerialName(latitudeField)
+    override val latitude: Double,
+    @SerialName(longitudeField)
+    override val longitude: Double,
+    @SerialName(horizontalAccuracyField)
+    override val horizontalAccuracy: Meters? = null,
+    @SerialName(headingField)
+    override val heading: Degrees? = null,
+    @SerialName(proximityAlertRadiusField)
+    override val proximityAlertRadius: Meters? = null,
+    @SerialName(replyMarkupField)
+    override val replyMarkup: InlineKeyboardMarkup? = null
+) : EditChatMessage<LocationContent>, EditReplyMessage, EditLocationMessage {
+    override fun method(): String = editMessageLiveLocationMethod
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
+        get() = commonResultDeserializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    init {
+        if (horizontalAccuracy != null && horizontalAccuracy !in horizontalAccuracyLimit) {
+            throwRangeError("horizontalAccuracy", horizontalAccuracyLimit, horizontalAccuracy)
+        }
+    }
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/location/live/EditInlineMessageLiveLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/location/live/EditInlineMessageLiveLocation.kt
@@ -0,0 +1,35 @@
+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.utils.throwRangeError
+import kotlinx.serialization.*
+
+@Serializable
+data class EditInlineMessageLiveLocation(
+    @SerialName(inlineMessageIdField)
+    override val inlineMessageId: InlineMessageIdentifier,
+    @SerialName(latitudeField)
+    override val latitude: Double,
+    @SerialName(longitudeField)
+    override val longitude: Double,
+    @SerialName(horizontalAccuracyField)
+    override val horizontalAccuracy: Meters? = null,
+    @SerialName(headingField)
+    override val heading: Degrees? = null,
+    @SerialName(proximityAlertRadiusField)
+    override val proximityAlertRadius: Meters? = null,
+    @SerialName(replyMarkupField)
+    override val replyMarkup: InlineKeyboardMarkup? = null
+) : EditInlineMessage, EditReplyMessage, EditLocationMessage {
+    override fun method(): String = editMessageLiveLocationMethod
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    init {
+        if (horizontalAccuracy != null && horizontalAccuracy !in horizontalAccuracyLimit) {
+            throwRangeError("horizontalAccuracy", horizontalAccuracyLimit, horizontalAccuracy)
+        }
+    }
+}
--- 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
@@ -0,0 +1,29 @@
+package dev.inmo.tgbotapi.requests.edit.location.live
+
+import dev.inmo.tgbotapi.requests.edit.abstracts.EditChatMessage
+import dev.inmo.tgbotapi.requests.edit.abstracts.EditReplyMessage
+import dev.inmo.tgbotapi.types.*
+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 kotlinx.serialization.*
+
+private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<LocationContent>>()
+const val stopMessageLiveLocationMethod = "stopMessageLiveLocation"
+
+@Serializable
+data class StopChatMessageLiveLocation(
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier,
+    @SerialName(messageIdField)
+    override val messageId: MessageIdentifier,
+    @SerialName(replyMarkupField)
+    override val replyMarkup: InlineKeyboardMarkup? = null
+) : EditChatMessage<LocationContent>, EditReplyMessage {
+    override fun method(): String = stopMessageLiveLocationMethod
+    override val resultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
+        get() = commonResultDeserializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/location/live/StopInlineMessageLiveLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/location/live/StopInlineMessageLiveLocation.kt
@@ -0,0 +1,19 @@
+package dev.inmo.tgbotapi.requests.edit.location.live
+
+import dev.inmo.tgbotapi.requests.edit.abstracts.EditInlineMessage
+import dev.inmo.tgbotapi.requests.edit.abstracts.EditReplyMessage
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class StopInlineMessageLiveLocation(
+    @SerialName(inlineMessageIdField)
+    override val inlineMessageId: InlineMessageIdentifier,
+    @SerialName(replyMarkupField)
+    override val replyMarkup: InlineKeyboardMarkup? = null
+) : EditInlineMessage, EditReplyMessage {
+    override fun method(): String = stopMessageLiveLocationMethod
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}