InlineMessageId is value class now

2026-03-04 01:42:23 +00:00 · 2024-03-16 20:36:48 +06:00
parent ceff85fcfd
commit dd7a3ced4d
35 changed files with 218 additions and 185 deletions
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/InlineMessageAction.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/InlineMessageAction.kt
@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.abstracts.types

-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
+import dev.inmo.tgbotapi.types.InlineMessageId

 interface InlineMessageAction {
-    val inlineMessageId: InlineMessageIdentifier
+    val inlineMessageId: InlineMessageId
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditInlineMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditInlineMessage.kt
@@ -1,12 +1,12 @@
 package dev.inmo.tgbotapi.requests.edit.abstracts

 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
+import dev.inmo.tgbotapi.types.InlineMessageId
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.builtins.serializer

 interface EditInlineMessage : SimpleRequest<Boolean> {
-    val inlineMessageId: InlineMessageIdentifier
+    val inlineMessageId: InlineMessageId
    override val resultDeserializer: DeserializationStrategy<Boolean>
        get() = Boolean.serializer()
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditInlineMessageCaption.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditInlineMessageCaption.kt
@@ -13,7 +13,7 @@ import dev.inmo.tgbotapi.utils.extensions.makeString
 import kotlinx.serialization.*

 fun EditInlineMessageCaption(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    text: String,
    parseMode: ParseMode? = null,
    replyMarkup: InlineKeyboardMarkup? = null
@@ -26,7 +26,7 @@ fun EditInlineMessageCaption(
 )

 fun EditInlineMessageCaption(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = EditInlineMessageCaption(
@@ -40,7 +40,7 @@ fun EditInlineMessageCaption(
@Serializable
 data class EditInlineMessageCaption internal constructor(
    @SerialName(inlineMessageIdField)
-    override val inlineMessageId: InlineMessageIdentifier,
+    override val inlineMessageId: InlineMessageId,
    @SerialName(captionField)
    override val text: String,
    @SerialName(parseModeField)
--- 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
@@ -9,7 +9,7 @@ import kotlinx.serialization.*
@Serializable
 data class EditInlineMessageLiveLocation(
    @SerialName(inlineMessageIdField)
-    override val inlineMessageId: InlineMessageIdentifier,
+    override val inlineMessageId: InlineMessageId,
    @SerialName(latitudeField)
    override val latitude: Double,
    @SerialName(longitudeField)
--- 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
@@ -9,7 +9,7 @@ import kotlinx.serialization.*
@Serializable
 data class StopInlineMessageLiveLocation(
    @SerialName(inlineMessageIdField)
-    override val inlineMessageId: InlineMessageIdentifier,
+    override val inlineMessageId: InlineMessageId,
    @SerialName(replyMarkupField)
    override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditReplyMessage {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditInlineMessageMedia.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditInlineMessageMedia.kt
@@ -10,7 +10,7 @@ import kotlinx.serialization.*
@Serializable
 data class EditInlineMessageMedia(
    @SerialName(inlineMessageIdField)
-    override val inlineMessageId: InlineMessageIdentifier,
+    override val inlineMessageId: InlineMessageId,
    @SerialName(mediaField)
    override val media: TelegramMedia,
    @SerialName(replyMarkupField)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/reply_markup/EditInlineMessageReplyMarkup.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/reply_markup/EditInlineMessageReplyMarkup.kt
@@ -9,7 +9,7 @@ import kotlinx.serialization.*
@Serializable
 data class EditInlineMessageReplyMarkup(
    @SerialName(inlineMessageIdField)
-    override val inlineMessageId: InlineMessageIdentifier,
+    override val inlineMessageId: InlineMessageId,
    @SerialName(replyMarkupField)
    override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditReplyMessage {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt
@@ -13,7 +13,7 @@ import dev.inmo.tgbotapi.utils.extensions.makeString
 import kotlinx.serialization.*

 fun EditInlineMessageText(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    text: String,
    parseMode: ParseMode? = null,
    linkPreviewOptions: LinkPreviewOptions? = null,
@@ -28,7 +28,7 @@ fun EditInlineMessageText(
 )

 fun EditInlineMessageText(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    entities: TextSourcesList,
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null
@@ -44,7 +44,7 @@ fun EditInlineMessageText(
@Serializable
 data class EditInlineMessageText internal constructor(
    @SerialName(inlineMessageIdField)
-    override val inlineMessageId: InlineMessageIdentifier,
+    override val inlineMessageId: InlineMessageId,
    @SerialName(textField)
    override val text: String,
    @SerialName(parseModeField)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/GetGameHighScoresByInlineMessageId.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/GetGameHighScoresByInlineMessageId.kt
@@ -10,7 +10,7 @@ data class GetGameHighScoresByInlineMessageId (
    @SerialName(userIdField)
    override val userId: UserId,
    @SerialName(inlineMessageIdField)
-    override val inlineMessageId: InlineMessageIdentifier
+    override val inlineMessageId: InlineMessageId
 ) : GetGameHighScores, InlineMessageAction {
    override val requestSerializer: SerializationStrategy<*>
        get() = serializer()
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/SetGameScoreByInlineMessageId.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/SetGameScoreByInlineMessageId.kt
@@ -12,7 +12,7 @@ data class SetGameScoreByInlineMessageId (
    @SerialName(scoreField)
    override val score: Long,
    @SerialName(inlineMessageIdField)
-    override val inlineMessageId: InlineMessageIdentifier,
+    override val inlineMessageId: InlineMessageId,
    @SerialName(forceField)
    override val force: Boolean = false,
    @SerialName(disableEditMessageField)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt
@@ -19,7 +19,6 @@ typealias ShippingQueryIdentifier = String
 typealias InvoicePayload = String
 typealias ShippingOptionIdentifier = String
 typealias StartParameter = String
-typealias InlineMessageIdentifier = String
 typealias PollIdentifier = String
 typealias StickerSetName = String
 typealias DiceResult = Int
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineMessageIdentifier.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineMessageIdentifier.kt
@@ -0,0 +1,12 @@
+package dev.inmo.tgbotapi.types
+
+import kotlinx.serialization.Serializable
+import kotlin.jvm.JvmInline
+
+@Serializable
+@JvmInline
+value class InlineMessageId(
+    val string: String
+)
+@Deprecated("Renamed", ReplaceWith("InlineMessageId", "dev.inmo.tgbotapi.types.InlineMessageId"))
+typealias InlineMessageIdentifier = InlineMessageId
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/BaseChosenInlineResult.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/BaseChosenInlineResult.kt
@@ -10,6 +10,6 @@ data class BaseChosenInlineResult(
    override val resultId: InlineQueryIdentifier,
    @SerialName(fromField)
    override val from: User,
-    override val inlineMessageId: InlineMessageIdentifier?,
+    override val inlineMessageId: InlineMessageId?,
    override val query: String
 ) : ChosenInlineResult
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/ChosenInlineResult.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/ChosenInlineResult.kt
@@ -1,11 +1,11 @@
 package dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult

 import dev.inmo.tgbotapi.abstracts.FromUser
-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
+import dev.inmo.tgbotapi.types.InlineMessageId
 import dev.inmo.tgbotapi.types.InlineQueryIdentifier

 sealed interface ChosenInlineResult : FromUser {
    val resultId: InlineQueryIdentifier //chosen temporary, can be changed
-    val inlineMessageId: InlineMessageIdentifier?
+    val inlineMessageId: InlineMessageId?
    val query: String
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/LocationChosenInlineResult.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/LocationChosenInlineResult.kt
@@ -12,6 +12,6 @@ data class LocationChosenInlineResult(
    @SerialName(fromField)
    override val from: User,
    val location: StaticLocation,
-    override val inlineMessageId: InlineMessageIdentifier?,
+    override val inlineMessageId: InlineMessageId?,
    override val query: String
 ) : ChosenInlineResult
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/RawChosenInlineResult.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/RawChosenInlineResult.kt
@@ -17,7 +17,7 @@ internal data class RawChosenInlineResult(
    @SerialName(locationField)
    val location: StaticLocation? = null,
    @SerialName(inlineMessageIdField)
-    val inlineMessageId: InlineMessageIdentifier? = null
+    val inlineMessageId: InlineMessageId? = null
 ) {
    val asChosenInlineResult: ChosenInlineResult by lazy {
        location ?.let {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InlineMessageIdCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InlineMessageIdCallbackQuery.kt
@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.types.queries.callback

-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
+import dev.inmo.tgbotapi.types.InlineMessageId

 sealed interface InlineMessageIdCallbackQuery : CallbackQuery {
-    val inlineMessageId: InlineMessageIdentifier
+    val inlineMessageId: InlineMessageId
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InlineMessageIdDataCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InlineMessageIdDataCallbackQuery.kt
@@ -2,7 +2,6 @@ package dev.inmo.tgbotapi.types.queries.callback

 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.chat.User
 import kotlinx.serialization.Serializable

@Serializable
@@ -10,6 +9,6 @@ data class InlineMessageIdDataCallbackQuery(
    override val id: CallbackQueryIdentifier,
    override val from: CommonUser,
    override val chatInstance: String,
-    override val inlineMessageId: InlineMessageIdentifier,
+    override val inlineMessageId: InlineMessageId,
    override val data: String
 ) : DataCallbackQuery, InlineMessageIdCallbackQuery
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InlineMessageIdGameShortNameCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/InlineMessageIdGameShortNameCallbackQuery.kt
@@ -2,12 +2,11 @@ package dev.inmo.tgbotapi.types.queries.callback

 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.chat.User

 data class InlineMessageIdGameShortNameCallbackQuery(
    override val id: CallbackQueryIdentifier,
    override val from: CommonUser,
    override val chatInstance: String,
-    override val inlineMessageId: InlineMessageIdentifier,
+    override val inlineMessageId: InlineMessageId,
    override val gameShortName: String
 ) : GameShortNameCallbackQuery, InlineMessageIdCallbackQuery
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/RawCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/RawCallbackQuery.kt
@@ -2,10 +2,8 @@ package dev.inmo.tgbotapi.types.queries.callback

 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer
-import dev.inmo.tgbotapi.types.message.content.MessageContent
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

@@ -18,7 +16,7 @@ internal data class RawCallbackQuery(
    @Serializable(TelegramBotAPIMessageDeserializeOnlySerializer::class)
    val message: Message? = null,
    @SerialName(inlineMessageIdField)
-    val inlineMessageId: InlineMessageIdentifier? = null,
+    val inlineMessageId: InlineMessageId? = null,
    @SerialName("chat_instance")
    val chatInstance: String,
    val data: String? = null,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/webapps/query/SentWebAppMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/webapps/query/SentWebAppMessage.kt
@@ -1,9 +1,9 @@
 package dev.inmo.tgbotapi.types.webapps.query

-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
+import dev.inmo.tgbotapi.types.InlineMessageId
 import kotlinx.serialization.Serializable

@Serializable
 data class SentWebAppMessage(
-    val inlineMessageId: InlineMessageIdentifier? = null
+    val inlineMessageId: InlineMessageId? = null
 )