InlineMessageId is value class now

2025-09-15 05:09:30 +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.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/InlineEdits.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/InlineEdits.kt
@@ -1,21 +1,15 @@
 package dev.inmo.tgbotapi.extensions.api.edit

-import dev.inmo.tgbotapi.abstracts.TextedWithTextSources
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.caption.editMessageCaption
 import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
 import dev.inmo.tgbotapi.extensions.api.edit.media.editMessageMedia
 import dev.inmo.tgbotapi.extensions.api.edit.reply_markup.editMessageReplyMarkup
 import dev.inmo.tgbotapi.extensions.api.edit.text.editMessageText
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
 import dev.inmo.tgbotapi.types.location.LiveLocation
 import dev.inmo.tgbotapi.types.media.TelegramMedia
 import dev.inmo.tgbotapi.types.message.ParseMode
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.message.textsources.TextSource
 import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
 import dev.inmo.tgbotapi.utils.EntitiesBuilderBody
@@ -26,7 +20,7 @@ import dev.inmo.tgbotapi.utils.buildEntities
 * as a builder for that
 */
 suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
+    messageId: InlineMessageId,
    latitude: Double,
    longitude: Double,
    horizontalAccuracy: Meters? = null,
@@ -40,7 +34,7 @@ suspend fun TelegramBot.edit(
 * as a builder for that
 */
 suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
+    messageId: InlineMessageId,
    location: LiveLocation,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = editLiveLocation(
@@ -52,7 +46,7 @@ suspend fun TelegramBot.edit(
 * as a builder for that
 */
 suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
+    messageId: InlineMessageId,
    media: TelegramMedia,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageMedia(messageId, media, replyMarkup)
@@ -62,7 +56,7 @@ suspend fun TelegramBot.edit(
 * as a builder for that
 */
 suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
+    messageId: InlineMessageId,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageReplyMarkup(messageId, replyMarkup)

@@ -71,7 +65,7 @@ suspend fun TelegramBot.edit(
 * as a builder for that
 */
 suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
+    messageId: InlineMessageId,
    text: String,
    parseMode: ParseMode? = null,
    linkPreviewOptions: LinkPreviewOptions? = null,
@@ -83,7 +77,7 @@ suspend fun TelegramBot.edit(
 * as a builder for that
 */
 suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
+    messageId: InlineMessageId,
    entities: TextSourcesList,
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null
@@ -94,7 +88,7 @@ suspend fun TelegramBot.edit(
 * as a builder for that
 */
 suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
+    messageId: InlineMessageId,
    separator: TextSource? = null,
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null,
@@ -106,7 +100,7 @@ suspend fun TelegramBot.edit(
 * as a builder for that
 */
 suspend fun TelegramBot.edit(
-    messageId: InlineMessageIdentifier,
+    messageId: InlineMessageId,
    separator: String,
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditInlineMessageCaption.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditInlineMessageCaption.kt
@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.extensions.api.edit.caption

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.edit.caption.EditInlineMessageCaption
-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
+import dev.inmo.tgbotapi.types.InlineMessageId
 import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.message.ParseMode
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@@ -12,7 +12,7 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 * as a builder for that
 */
 suspend fun TelegramBot.editMessageCaption(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    text: String,
    parseMode: ParseMode? = null,
    replyMarkup: InlineKeyboardMarkup? = null
@@ -23,7 +23,7 @@ suspend fun TelegramBot.editMessageCaption(
 * as a builder for that
 */
 suspend fun TelegramBot.editMessageCaption(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(EditInlineMessageCaption(inlineMessageId, entities, replyMarkup))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/EditInlineMessageLiveLocation.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/EditInlineMessageLiveLocation.kt
@@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.location.LiveLocation

 suspend fun TelegramBot.editLiveLocation(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    latitude: Double,
    longitude: Double,
    horizontalAccuracy: Meters? = null,
@@ -20,7 +20,7 @@ suspend fun TelegramBot.editLiveLocation(
    )
 )
 suspend fun TelegramBot.editLiveLocation(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    location: LiveLocation,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = editLiveLocation(inlineMessageId, location.latitude, location.longitude, location.horizontalAccuracy, location.heading, location.proximityAlertRadius, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/StopInlineMessageLiveLocation.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/location/live/StopInlineMessageLiveLocation.kt
@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.extensions.api.edit.location.live

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.edit.location.live.StopInlineMessageLiveLocation
-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
+import dev.inmo.tgbotapi.types.InlineMessageId
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup

 /**
@@ -10,7 +10,7 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 * as a builder for that
 */
 suspend fun TelegramBot.stopLiveLocation(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(
    StopInlineMessageLiveLocation(
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditInlineMessageMedia.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditInlineMessageMedia.kt
@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.extensions.api.edit.media

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.edit.media.EditInlineMessageMedia
-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
+import dev.inmo.tgbotapi.types.InlineMessageId
 import dev.inmo.tgbotapi.types.media.TelegramMedia
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 * as a builder for that
 */
 suspend fun TelegramBot.editMessageMedia(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    media: TelegramMedia,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(EditInlineMessageMedia(inlineMessageId, media, replyMarkup))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/reply_markup/EditInlineMessageReplyMarkup.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/reply_markup/EditInlineMessageReplyMarkup.kt
@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.extensions.api.edit.reply_markup

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.edit.reply_markup.EditInlineMessageReplyMarkup
-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
+import dev.inmo.tgbotapi.types.InlineMessageId
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup

 /**
@@ -10,6 +10,6 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 * as a builder for that
 */
 suspend fun TelegramBot.editMessageReplyMarkup(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(EditInlineMessageReplyMarkup(inlineMessageId, replyMarkup))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditInlineMessageText.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditInlineMessageText.kt
@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.extensions.api.edit.text

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.edit.text.EditInlineMessageText
-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
+import dev.inmo.tgbotapi.types.InlineMessageId
 import dev.inmo.tgbotapi.types.LinkPreviewOptions
 import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.message.ParseMode
@@ -16,7 +16,7 @@ import dev.inmo.tgbotapi.utils.buildEntities
 * as a builder for that
 */
 suspend fun TelegramBot.editMessageText(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    text: String,
    parseMode: ParseMode? = null,
    linkPreviewOptions: LinkPreviewOptions? = null,
@@ -28,7 +28,7 @@ suspend fun TelegramBot.editMessageText(
 * as a builder for that
 */
 suspend fun TelegramBot.editMessageText(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    entities: TextSourcesList,
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null
@@ -39,7 +39,7 @@ suspend fun TelegramBot.editMessageText(
 * as a builder for that
 */
 suspend fun TelegramBot.editMessageText(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    separator: TextSource? = null,
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null,
@@ -51,7 +51,7 @@ suspend fun TelegramBot.editMessageText(
 * as a builder for that
 */
 suspend fun TelegramBot.editMessageText(
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    separator: String,
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/GetGameHighScoresByInlineMessageId.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/GetGameHighScoresByInlineMessageId.kt
@@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.types.chat.CommonUser

 suspend fun TelegramBot.getGameScore(
    userId: UserId,
-    inlineMessageId: InlineMessageIdentifier
+    inlineMessageId: InlineMessageId
 ) = execute(
    GetGameHighScoresByInlineMessageId(
        userId, inlineMessageId
@@ -16,5 +16,5 @@ suspend fun TelegramBot.getGameScore(

 suspend fun TelegramBot.getGameScore(
    user: CommonUser,
-    inlineMessageId: InlineMessageIdentifier
+    inlineMessageId: InlineMessageId
 ) = getGameScore(user.id, inlineMessageId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/SetGameScoreByInlineMessageId.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/SetGameScoreByInlineMessageId.kt
@@ -8,7 +8,7 @@ import dev.inmo.tgbotapi.types.chat.CommonUser
 suspend fun TelegramBot.setGameScore(
    userId: UserId,
    score: Long,
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    force: Boolean = false,
    disableEditMessage: Boolean = false
 ) = execute(
@@ -20,7 +20,7 @@ suspend fun TelegramBot.setGameScore(
 suspend fun TelegramBot.setGameScore(
    user: CommonUser,
    score: Long,
-    inlineMessageId: InlineMessageIdentifier,
+    inlineMessageId: InlineMessageId,
    force: Boolean = false,
    disableEditMessage: Boolean = false
 ) = setGameScore(user.id, score, inlineMessageId, force, disableEditMessage)