From a1d2ebb4dc95f2d72b2fcdb16b5702be07aebf77 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 20 Jul 2026 12:05:18 +0600 Subject: [PATCH] Add EphemeralChatId and identifier-sourced ephemeral defaults New EphemeralChatId inheritor of IdChatIdentifier carrying receiverUser and ephemeralMessageId (mirroring ChatIdWithThreadId), with ChatIdentifier.receiverUser/ ephemeralMessageId extensions like ChatIdentifier.threadId. Every send/reply/edit/ delete method that takes receiverUserId/ephemeralMessageId now defaults them from the chat identifier, so passing an EphemeralChatId auto-fills them the same way a ChatIdWithThreadId fills threadId. Co-Authored-By: Claude Opus 4.8 (1M context) --- CHANGELOG.md | 2 + tgbotapi.api/api/tgbotapi.api.api | 2 + .../extensions/api/DeleteEphemeralMessage.kt | 10 +- .../caption/EditEphemeralMessageCaption.kt | 16 +-- .../edit/media/EditEphemeralMessageMedia.kt | 8 +- .../EditEphemeralMessageReplyMarkup.kt | 8 +- .../api/edit/text/EditEphemeralMessageText.kt | 32 ++--- .../tgbotapi/extensions/api/send/Replies.kt | 96 +++++++------- .../api/send/RepliesWithChatsAndMessages.kt | 96 +++++++------- .../extensions/api/send/ReplyToEphemeral.kt | 56 ++++---- .../extensions/api/send/SendContact.kt | 8 +- .../extensions/api/send/SendLiveLocation.kt | 16 +-- .../extensions/api/send/SendMessage.kt | 32 ++--- .../extensions/api/send/SendStaticLocation.kt | 16 +-- .../tgbotapi/extensions/api/send/SendVenue.kt | 12 +- .../tgbotapi/extensions/api/send/Sends.kt | 124 +++++++++--------- .../api/send/media/SendAnimation.kt | 16 +-- .../extensions/api/send/media/SendAudio.kt | 16 +-- .../extensions/api/send/media/SendDocument.kt | 16 +-- .../api/send/media/SendLivePhoto.kt | 16 +-- .../extensions/api/send/media/SendPhoto.kt | 24 ++-- .../extensions/api/send/media/SendSticker.kt | 8 +- .../extensions/api/send/media/SendVideo.kt | 16 +-- .../api/send/media/SendVideoNote.kt | 8 +- .../extensions/api/send/media/SendVoice.kt | 16 +-- tgbotapi.core/api/tgbotapi.core.api | 60 +++++++++ .../requests/DeleteEphemeralMessage.kt | 8 +- .../caption/EditEphemeralMessageCaption.kt | 16 ++- .../edit/media/EditEphemeralMessageMedia.kt | 8 +- .../EditEphemeralMessageReplyMarkup.kt | 8 +- .../edit/text/EditEphemeralMessageText.kt | 16 ++- .../tgbotapi/requests/send/SendContact.kt | 6 +- .../tgbotapi/requests/send/SendLocation.kt | 12 +- .../tgbotapi/requests/send/SendMessage.kt | 6 +- .../inmo/tgbotapi/requests/send/SendVenue.kt | 6 +- .../requests/send/media/SendAnimation.kt | 6 +- .../tgbotapi/requests/send/media/SendAudio.kt | 6 +- .../requests/send/media/SendDocument.kt | 6 +- .../requests/send/media/SendLivePhoto.kt | 6 +- .../tgbotapi/requests/send/media/SendPhoto.kt | 6 +- .../requests/send/media/SendSticker.kt | 4 +- .../tgbotapi/requests/send/media/SendVideo.kt | 6 +- .../requests/send/media/SendVideoNote.kt | 4 +- .../tgbotapi/requests/send/media/SendVoice.kt | 6 +- .../dev/inmo/tgbotapi/types/ChatIdentifier.kt | 45 +++++++ .../tgbotapi/types/ChatIdentifierTests.kt | 27 ++++ tgbotapi.utils/api/tgbotapi.utils.api | 3 + .../extensions/utils/ClassCastsNew.kt | 7 + 48 files changed, 560 insertions(+), 388 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c8a8ba8ab..66a0843c75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ * (`Ephemeral Messages`) `ReplyParameters` gained the `ephemeralMessageId` field and a new `(EphemeralMessageId, allowSendingWithoutReply)` constructor for replying to an ephemeral message; added the `Message.ephemeralReplyParametersOrNull()`/`Message.ephemeralReplyReceiverUserIdOrNull` helpers used by the `reply(to = ...)` smart-branch * (`Ephemeral Messages`) Added `receiverUserId`/`callbackQueryId` params (via the new `OptionallyEphemeralSendRequest`) to the 13 ephemeral-capable send requests: `SendTextMessage`, `SendContact`, `SendLocation` (`Static`/`Live`), `SendVenue`, `SendPhotoData`, `SendLivePhotoData`, `SendAudioData`, `SendDocumentData`, `SendVideoData`, `SendAnimationData`, `SendVoiceData`, `SendVideoNoteData`, `SendStickerByFileId` * (`Ephemeral Messages`) Added `EditEphemeralMessageText`/`EditEphemeralMessageMedia`/`EditEphemeralMessageCaption`/`EditEphemeralMessageReplyMarkup` and `DeleteEphemeralMessage` requests (all return `Unit`, mirroring the inline-message edit family); `EditEphemeralMessageMedia` rejects `MultipartFile` media (new file upload is not supported for ephemeral edits) + * (`Ephemeral Messages`) Added `EphemeralChatId` (`IdChatIdentifier`, carrying `chatId`/`receiverUser`/`ephemeralMessageId`) and the `ChatIdentifier.receiverUser`/`ChatIdentifier.ephemeralMessageId` extensions (mirroring `ChatIdentifier.threadId`); `FullChatIdentifierSerializer` gained the `chatId/eph/receiverUserChatId/ephemeralMessageId` string format. Every `receiverUserId`/`ephemeralMessageId` parameter across the send/edit/delete/reply request family now defaults from the passed `chatId`/`chat.id`/`replyInChatId` when it is an `EphemeralChatId`, instead of requiring it to be passed explicitly on every call * (`Communities`) Added `CommunityId` value class and `Community` type (`id`/`name`) * (`Communities`) Added `CommunityChatAdded` (`community`) and `CommunityChatRemoved` (fieldless) chat events (`CommonEvent`); `RawMessage` parses `community_chat_added`/`community_chat_removed` * (`Communities`) Added `community` field to `ExtendedChat` (`ChatFullInfo.community`), parsed for `ExtendedChannelChatImpl`, `ExtendedGroupChatImpl`, `ExtendedSupergroupChatImpl`, `ExtendedForumChatImpl`, `ExtendedChannelDirectMessagesChatImpl` and `ExtendedBot` @@ -34,6 +35,7 @@ * (`Ephemeral Messages`) Threaded `receiverUserId`/`callbackQueryId` through the `sendXxx`/`send`/`reply`/`replyWithXxx` extensions for the 13 ephemeral-capable senders (`send/Sends.kt`, `send/Replies.kt`, `send/RepliesWithChatsAndMessages.kt` and their per-type extension files); `reply(to = ...)` now automatically sends an ephemeral reply when `to` is itself ephemeral (see Breaking changes) * (`Ephemeral Messages`) Added `editEphemeralMessageText`/`editEphemeralMessageMedia`/`editEphemeralMessageCaption`/`editEphemeralMessageReplyMarkup` and `deleteEphemeralMessage` `TelegramBot` extensions (the latter also accepts a `PossiblyEphemeralMessage` directly) * (`Ephemeral Messages`) Added explicit `replyToEphemeral`/`replyToEphemeralWithXxx` `TelegramBot` extensions for the 13 ephemeral-capable senders, replying to an ephemeral message by `chatId`/`ephemeralMessageId` without requiring the original `Message` object + * (`Ephemeral Messages`) `receiverUserId`/`ephemeralMessageId` params of the edit/delete/`replyToEphemeral*` extensions now default from `chatId`/`chat.id` (`EphemeralChatId`) instead of being required on every call, throwing `IllegalArgumentException` if neither the parameter nor an `EphemeralChatId`-sourced default is available; `Replies.kt`'s `receiverUserId` default now also checks `replyInChatId.receiverUser` before falling back to `to.ephemeralReplyReceiverUserIdOrNull` * (`Ephemeral Messages`) Not covered by this iteration (follow-up): `createResend`/`ResendMessage` do not carry ephemeral fields (a resend is always a regular message); `handleLiveLocation` and the generic `reply(mediaFile = ...)`/`reply(content = ...)` dispatchers in `RepliesWithChatsAndMessages.kt`'s `copyMessage`/live-location branches are unaffected; `behaviour_builder` triggers/waiters gained no ephemeral-specific helpers * `BehaviourBuilder`: * (`Communities`) Added `onCommunityChatAdded`/`onCommunityChatRemoved` triggers diff --git a/tgbotapi.api/api/tgbotapi.api.api b/tgbotapi.api/api/tgbotapi.api.api index 1d3023c3e6..c163e7ff41 100644 --- a/tgbotapi.api/api/tgbotapi.api.api +++ b/tgbotapi.api/api/tgbotapi.api.api @@ -45,6 +45,8 @@ public final class dev/inmo/tgbotapi/extensions/api/DeleteEphemeralMessageKt { public static final fun deleteEphemeralMessage (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/message/abstracts/PossiblyEphemeralMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public static final fun deleteEphemeralMessage-5cqYris (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/ChatIdentifier;Ldev/inmo/tgbotapi/types/IdChatIdentifier;JLkotlin/coroutines/Continuation;)Ljava/lang/Object; public static final fun deleteEphemeralMessage-5cqYris (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/Chat;Ldev/inmo/tgbotapi/types/IdChatIdentifier;JLkotlin/coroutines/Continuation;)Ljava/lang/Object; + public static synthetic fun deleteEphemeralMessage-5cqYris$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/ChatIdentifier;Ldev/inmo/tgbotapi/types/IdChatIdentifier;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; + public static synthetic fun deleteEphemeralMessage-5cqYris$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/Chat;Ldev/inmo/tgbotapi/types/IdChatIdentifier;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; } public final class dev/inmo/tgbotapi/extensions/api/DeleteMessageKt { diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DeleteEphemeralMessage.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DeleteEphemeralMessage.kt index ca78053c7b..aacc578633 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DeleteEphemeralMessage.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DeleteEphemeralMessage.kt @@ -5,21 +5,23 @@ import dev.inmo.tgbotapi.requests.DeleteEphemeralMessage import dev.inmo.tgbotapi.types.ChatIdentifier import dev.inmo.tgbotapi.types.EphemeralMessageId import dev.inmo.tgbotapi.types.UserId +import dev.inmo.tgbotapi.types.ephemeralMessageId +import dev.inmo.tgbotapi.types.receiverUser import dev.inmo.tgbotapi.types.chat.Chat import dev.inmo.tgbotapi.types.message.abstracts.PossiblyEphemeralMessage public suspend fun TelegramBot.deleteEphemeralMessage( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" } ): Unit = execute( DeleteEphemeralMessage(chatId, receiverUserId, ephemeralMessageId) ) public suspend fun TelegramBot.deleteEphemeralMessage( chat: Chat, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId + receiverUserId: UserId = requireNotNull(chat.id.receiverUser) { "receiverUserId was not provided and chat.id (${chat.id}) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chat.id.ephemeralMessageId) { "ephemeralMessageId was not provided and chat.id (${chat.id}) does not carry an ephemeralMessageId" } ): Unit = deleteEphemeralMessage(chat.id, receiverUserId, ephemeralMessageId) /** diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditEphemeralMessageCaption.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditEphemeralMessageCaption.kt index cf105cea92..366ec6b282 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditEphemeralMessageCaption.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditEphemeralMessageCaption.kt @@ -14,8 +14,8 @@ import dev.inmo.tgbotapi.types.chat.Chat */ public suspend fun TelegramBot.editEphemeralMessageCaption( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, caption: String? = null, parseMode: ParseMode? = null, replyMarkup: InlineKeyboardMarkup? = null @@ -29,8 +29,8 @@ public suspend fun TelegramBot.editEphemeralMessageCaption( */ public suspend fun TelegramBot.editEphemeralMessageCaption( chat: Chat, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chat.id.receiverUser) { "receiverUserId was not provided and chat.id (${chat.id}) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chat.id.ephemeralMessageId) { "ephemeralMessageId was not provided and chat.id (${chat.id}) does not carry an ephemeralMessageId" }, caption: String? = null, parseMode: ParseMode? = null, replyMarkup: InlineKeyboardMarkup? = null @@ -42,8 +42,8 @@ public suspend fun TelegramBot.editEphemeralMessageCaption( */ public suspend fun TelegramBot.editEphemeralMessageCaption( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, entities: TextSourcesList, replyMarkup: InlineKeyboardMarkup? = null ): Unit = execute( @@ -56,8 +56,8 @@ public suspend fun TelegramBot.editEphemeralMessageCaption( */ public suspend fun TelegramBot.editEphemeralMessageCaption( chat: Chat, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chat.id.receiverUser) { "receiverUserId was not provided and chat.id (${chat.id}) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chat.id.ephemeralMessageId) { "ephemeralMessageId was not provided and chat.id (${chat.id}) does not carry an ephemeralMessageId" }, entities: TextSourcesList, replyMarkup: InlineKeyboardMarkup? = null ): Unit = editEphemeralMessageCaption(chat.id, receiverUserId, ephemeralMessageId, entities, replyMarkup) diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditEphemeralMessageMedia.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditEphemeralMessageMedia.kt index ffd0f7cac5..07c5ed6b39 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditEphemeralMessageMedia.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditEphemeralMessageMedia.kt @@ -13,8 +13,8 @@ import dev.inmo.tgbotapi.types.chat.Chat */ public suspend fun TelegramBot.editEphemeralMessageMedia( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, media: TelegramFreeMedia, replyMarkup: InlineKeyboardMarkup? = null ): Unit = execute( @@ -27,8 +27,8 @@ public suspend fun TelegramBot.editEphemeralMessageMedia( */ public suspend fun TelegramBot.editEphemeralMessageMedia( chat: Chat, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chat.id.receiverUser) { "receiverUserId was not provided and chat.id (${chat.id}) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chat.id.ephemeralMessageId) { "ephemeralMessageId was not provided and chat.id (${chat.id}) does not carry an ephemeralMessageId" }, media: TelegramFreeMedia, replyMarkup: InlineKeyboardMarkup? = null ): Unit = editEphemeralMessageMedia(chat.id, receiverUserId, ephemeralMessageId, media, replyMarkup) diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/reply_markup/EditEphemeralMessageReplyMarkup.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/reply_markup/EditEphemeralMessageReplyMarkup.kt index 14be9751fb..8b4bd0147f 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/reply_markup/EditEphemeralMessageReplyMarkup.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/reply_markup/EditEphemeralMessageReplyMarkup.kt @@ -12,8 +12,8 @@ import dev.inmo.tgbotapi.types.chat.Chat */ public suspend fun TelegramBot.editEphemeralMessageReplyMarkup( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, replyMarkup: InlineKeyboardMarkup? = null ): Unit = execute( EditEphemeralMessageReplyMarkup(chatId, receiverUserId, ephemeralMessageId, replyMarkup) @@ -25,7 +25,7 @@ public suspend fun TelegramBot.editEphemeralMessageReplyMarkup( */ public suspend fun TelegramBot.editEphemeralMessageReplyMarkup( chat: Chat, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chat.id.receiverUser) { "receiverUserId was not provided and chat.id (${chat.id}) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chat.id.ephemeralMessageId) { "ephemeralMessageId was not provided and chat.id (${chat.id}) does not carry an ephemeralMessageId" }, replyMarkup: InlineKeyboardMarkup? = null ): Unit = editEphemeralMessageReplyMarkup(chat.id, receiverUserId, ephemeralMessageId, replyMarkup) diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditEphemeralMessageText.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditEphemeralMessageText.kt index e9327ea085..36ecc9c749 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditEphemeralMessageText.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditEphemeralMessageText.kt @@ -17,8 +17,8 @@ import dev.inmo.tgbotapi.utils.buildEntities */ public suspend fun TelegramBot.editEphemeralMessageText( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, text: String, parseMode: ParseMode? = null, linkPreviewOptions: LinkPreviewOptions? = null, @@ -33,8 +33,8 @@ public suspend fun TelegramBot.editEphemeralMessageText( */ public suspend fun TelegramBot.editEphemeralMessageText( chat: Chat, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chat.id.receiverUser) { "receiverUserId was not provided and chat.id (${chat.id}) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chat.id.ephemeralMessageId) { "ephemeralMessageId was not provided and chat.id (${chat.id}) does not carry an ephemeralMessageId" }, text: String, parseMode: ParseMode? = null, linkPreviewOptions: LinkPreviewOptions? = null, @@ -47,8 +47,8 @@ public suspend fun TelegramBot.editEphemeralMessageText( */ public suspend fun TelegramBot.editEphemeralMessageText( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, entities: TextSourcesList, linkPreviewOptions: LinkPreviewOptions? = null, replyMarkup: InlineKeyboardMarkup? = null @@ -62,8 +62,8 @@ public suspend fun TelegramBot.editEphemeralMessageText( */ public suspend fun TelegramBot.editEphemeralMessageText( chat: Chat, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chat.id.receiverUser) { "receiverUserId was not provided and chat.id (${chat.id}) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chat.id.ephemeralMessageId) { "ephemeralMessageId was not provided and chat.id (${chat.id}) does not carry an ephemeralMessageId" }, entities: TextSourcesList, linkPreviewOptions: LinkPreviewOptions? = null, replyMarkup: InlineKeyboardMarkup? = null @@ -75,8 +75,8 @@ public suspend fun TelegramBot.editEphemeralMessageText( */ public suspend fun TelegramBot.editEphemeralMessageText( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, separator: TextSource? = null, linkPreviewOptions: LinkPreviewOptions? = null, replyMarkup: InlineKeyboardMarkup? = null, @@ -89,8 +89,8 @@ public suspend fun TelegramBot.editEphemeralMessageText( */ public suspend fun TelegramBot.editEphemeralMessageText( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, separator: String, linkPreviewOptions: LinkPreviewOptions? = null, replyMarkup: InlineKeyboardMarkup? = null, @@ -103,8 +103,8 @@ public suspend fun TelegramBot.editEphemeralMessageText( */ public suspend fun TelegramBot.editEphemeralMessageText( chat: Chat, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chat.id.receiverUser) { "receiverUserId was not provided and chat.id (${chat.id}) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chat.id.ephemeralMessageId) { "ephemeralMessageId was not provided and chat.id (${chat.id}) does not carry an ephemeralMessageId" }, separator: TextSource? = null, linkPreviewOptions: LinkPreviewOptions? = null, replyMarkup: InlineKeyboardMarkup? = null, @@ -117,8 +117,8 @@ public suspend fun TelegramBot.editEphemeralMessageText( */ public suspend fun TelegramBot.editEphemeralMessageText( chat: Chat, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chat.id.receiverUser) { "receiverUserId was not provided and chat.id (${chat.id}) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chat.id.ephemeralMessageId) { "ephemeralMessageId was not provided and chat.id (${chat.id}) does not carry an ephemeralMessageId" }, separator: String, linkPreviewOptions: LinkPreviewOptions? = null, replyMarkup: InlineKeyboardMarkup? = null, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt index 2eb586afce..ec6dae927e 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt @@ -58,7 +58,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -104,7 +104,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -346,7 +346,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -391,7 +391,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -440,7 +440,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -487,7 +487,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -533,7 +533,7 @@ public suspend fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -578,7 +578,7 @@ public suspend fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -632,7 +632,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -685,7 +685,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -732,7 +732,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -892,7 +892,7 @@ public suspend inline fun TelegramBot.replyWithAnimation( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -947,7 +947,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1001,7 +1001,7 @@ public suspend inline fun TelegramBot.replyWithAnimation( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1054,7 +1054,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1109,7 +1109,7 @@ public suspend inline fun TelegramBot.replyWithAudio( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1158,7 +1158,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1206,7 +1206,7 @@ public suspend inline fun TelegramBot.replyWithAudio( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1253,7 +1253,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1301,7 +1301,7 @@ public suspend inline fun TelegramBot.replyWithDocument( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1348,7 +1348,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1394,7 +1394,7 @@ public suspend inline fun TelegramBot.replyWithDocument( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1439,7 +1439,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1629,7 +1629,7 @@ public suspend inline fun TelegramBot.replyWithPhoto( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1677,7 +1677,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1725,7 +1725,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1773,7 +1773,7 @@ public suspend inline fun TelegramBot.replyWithPhoto( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1819,7 +1819,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1865,7 +1865,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1912,7 +1912,7 @@ public suspend inline fun TelegramBot.replyWithSticker( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1954,7 +1954,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2007,7 +2007,7 @@ public suspend inline fun TelegramBot.replyWithVideo( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2061,7 +2061,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2114,7 +2114,7 @@ public suspend inline fun TelegramBot.replyWithVideo( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2166,7 +2166,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2218,7 +2218,7 @@ public suspend inline fun TelegramBot.replyWithLivePhoto( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2267,7 +2267,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2315,7 +2315,7 @@ public suspend inline fun TelegramBot.replyWithLivePhoto( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2362,7 +2362,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2411,7 +2411,7 @@ public suspend inline fun TelegramBot.replyWithVideoNote( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2449,7 +2449,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2490,7 +2490,7 @@ public suspend inline fun TelegramBot.replyWithVoice( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2530,7 +2530,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2570,7 +2570,7 @@ public suspend inline fun TelegramBot.replyWithVoice( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2608,7 +2608,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3741,7 +3741,7 @@ public suspend fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3957,7 +3957,7 @@ public suspend fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -4129,7 +4129,7 @@ public suspend fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = to.ephemeralReplyReceiverUserIdOrNull, + receiverUserId: UserId? = replyInChatId.receiverUser ?: to.ephemeralReplyReceiverUserIdOrNull, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/RepliesWithChatsAndMessages.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/RepliesWithChatsAndMessages.kt index c7f54e2a0d..2991d80e5b 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/RepliesWithChatsAndMessages.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/RepliesWithChatsAndMessages.kt @@ -58,7 +58,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -100,7 +100,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -282,7 +282,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -323,7 +323,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -368,7 +368,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -411,7 +411,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -453,7 +453,7 @@ public suspend fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -498,7 +498,7 @@ public suspend fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -552,7 +552,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -601,7 +601,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -644,7 +644,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -794,7 +794,7 @@ public suspend inline fun TelegramBot.replyWithAnimation( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -845,7 +845,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -895,7 +895,7 @@ public suspend inline fun TelegramBot.replyWithAnimation( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -944,7 +944,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -995,7 +995,7 @@ public suspend inline fun TelegramBot.replyWithAudio( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1040,7 +1040,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1084,7 +1084,7 @@ public suspend inline fun TelegramBot.replyWithAudio( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1127,7 +1127,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1171,7 +1171,7 @@ public suspend inline fun TelegramBot.replyWithDocument( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1214,7 +1214,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1256,7 +1256,7 @@ public suspend inline fun TelegramBot.replyWithDocument( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1297,7 +1297,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1467,7 +1467,7 @@ public suspend inline fun TelegramBot.replyWithPhoto( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1511,7 +1511,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1555,7 +1555,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1599,7 +1599,7 @@ public suspend inline fun TelegramBot.replyWithPhoto( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1641,7 +1641,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1683,7 +1683,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1725,7 +1725,7 @@ public suspend inline fun TelegramBot.replyWithSticker( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, emoji: String? = null, disableNotification: Boolean = false, @@ -1763,7 +1763,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, emoji: String? = null, disableNotification: Boolean = false, @@ -1812,7 +1812,7 @@ public suspend inline fun TelegramBot.replyWithVideo( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1860,7 +1860,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1907,7 +1907,7 @@ public suspend inline fun TelegramBot.replyWithVideo( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1953,7 +1953,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2000,7 +2000,7 @@ public suspend inline fun TelegramBot.replyWithLivePhoto( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2045,7 +2045,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2089,7 +2089,7 @@ public suspend inline fun TelegramBot.replyWithLivePhoto( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2132,7 +2132,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2177,7 +2177,7 @@ public suspend inline fun TelegramBot.replyWithVideoNote( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2216,7 +2216,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2258,7 +2258,7 @@ public suspend inline fun TelegramBot.replyWithVoice( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2299,7 +2299,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2340,7 +2340,7 @@ public suspend inline fun TelegramBot.replyWithVoice( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2379,7 +2379,7 @@ public suspend inline fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3494,7 +3494,7 @@ public suspend fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3720,7 +3720,7 @@ public suspend fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3899,7 +3899,7 @@ public suspend fun TelegramBot.reply( replyInThreadId: MessageThreadId? = replyInChatId.threadId, replyInDirectMessageThreadId: DirectMessageThreadId? = replyInChatId.directMessageThreadId, replyInBusinessConnectionId: BusinessConnectionId? = replyInChatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = replyInChatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/ReplyToEphemeral.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/ReplyToEphemeral.kt index 0bd5af490b..1623228c33 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/ReplyToEphemeral.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/ReplyToEphemeral.kt @@ -17,6 +17,10 @@ import dev.inmo.tgbotapi.types.message.content.* * [dev.inmo.tgbotapi.types.message.abstracts.PossiblyEphemeralMessage] target automatically). The outgoing message * is itself sent as ephemeral, addressed to the same [receiverUserId] as the message being replied to. * + * Both `receiverUserId` and `ephemeralMessageId` default from [chatId] when it is (or carries) an + * [dev.inmo.tgbotapi.types.EphemeralChatId] (see [dev.inmo.tgbotapi.types.receiverUser] and + * [dev.inmo.tgbotapi.types.ephemeralMessageId]); otherwise they must be passed explicitly. + * * @see dev.inmo.tgbotapi.types.ephemeralReplyParametersOrNull */ @@ -26,8 +30,8 @@ import dev.inmo.tgbotapi.types.message.content.* */ public suspend fun TelegramBot.replyToEphemeral( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, text: String, parseMode: ParseMode? = null, allowSendingWithoutReply: Boolean? = null, @@ -43,8 +47,8 @@ public suspend fun TelegramBot.replyToEphemeral( public suspend fun TelegramBot.replyToEphemeralWithPhoto( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, photo: InputFile, text: String? = null, parseMode: ParseMode? = null, @@ -62,8 +66,8 @@ public suspend fun TelegramBot.replyToEphemeralWithPhoto( public suspend fun TelegramBot.replyToEphemeralWithLivePhoto( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, livePhoto: InputFile, photo: InputFile, text: String? = null, @@ -83,8 +87,8 @@ public suspend fun TelegramBot.replyToEphemeralWithLivePhoto( public suspend fun TelegramBot.replyToEphemeralWithAudio( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, audio: InputFile, text: String? = null, parseMode: ParseMode? = null, @@ -102,8 +106,8 @@ public suspend fun TelegramBot.replyToEphemeralWithAudio( public suspend fun TelegramBot.replyToEphemeralWithDocument( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, document: InputFile, text: String? = null, parseMode: ParseMode? = null, @@ -121,8 +125,8 @@ public suspend fun TelegramBot.replyToEphemeralWithDocument( public suspend fun TelegramBot.replyToEphemeralWithVideo( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, video: InputFile, text: String? = null, parseMode: ParseMode? = null, @@ -140,8 +144,8 @@ public suspend fun TelegramBot.replyToEphemeralWithVideo( public suspend fun TelegramBot.replyToEphemeralWithAnimation( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, animation: InputFile, text: String? = null, parseMode: ParseMode? = null, @@ -159,8 +163,8 @@ public suspend fun TelegramBot.replyToEphemeralWithAnimation( public suspend fun TelegramBot.replyToEphemeralWithVoice( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, voice: InputFile, text: String? = null, parseMode: ParseMode? = null, @@ -178,8 +182,8 @@ public suspend fun TelegramBot.replyToEphemeralWithVoice( public suspend fun TelegramBot.replyToEphemeralWithVideoNote( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, videoNote: InputFile, allowSendingWithoutReply: Boolean? = null, replyMarkup: KeyboardMarkup? = null @@ -193,8 +197,8 @@ public suspend fun TelegramBot.replyToEphemeralWithVideoNote( public suspend fun TelegramBot.replyToEphemeralWithSticker( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, sticker: InputFile, allowSendingWithoutReply: Boolean? = null, replyMarkup: KeyboardMarkup? = null @@ -211,8 +215,8 @@ public suspend fun TelegramBot.replyToEphemeralWithSticker( */ public suspend fun TelegramBot.replyToEphemeralWithLocation( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, latitude: Double, longitude: Double, allowSendingWithoutReply: Boolean? = null, @@ -228,8 +232,8 @@ public suspend fun TelegramBot.replyToEphemeralWithLocation( public suspend fun TelegramBot.replyToEphemeralWithVenue( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, latitude: Double, longitude: Double, title: String, @@ -249,8 +253,8 @@ public suspend fun TelegramBot.replyToEphemeralWithVenue( public suspend fun TelegramBot.replyToEphemeralWithContact( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, phoneNumber: String, firstName: String, lastName: String? = null, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendContact.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendContact.kt index e42ce338fb..3235efd27b 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendContact.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendContact.kt @@ -24,7 +24,7 @@ public suspend fun TelegramBot.sendContact( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -64,7 +64,7 @@ public suspend fun TelegramBot.sendContact( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -104,7 +104,7 @@ public suspend fun TelegramBot.sendContact( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -142,7 +142,7 @@ public suspend fun TelegramBot.sendContact( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendLiveLocation.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendLiveLocation.kt index 34e060019f..741369515b 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendLiveLocation.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendLiveLocation.kt @@ -27,7 +27,7 @@ public suspend fun TelegramBot.sendLocation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -74,7 +74,7 @@ public suspend fun TelegramBot.sendLocation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -120,7 +120,7 @@ public suspend fun TelegramBot.sendLocation( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -165,7 +165,7 @@ public suspend fun TelegramBot.sendLocation( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -211,7 +211,7 @@ public suspend fun TelegramBot.sendLiveLocation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -256,7 +256,7 @@ public suspend fun TelegramBot.sendLiveLocation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -302,7 +302,7 @@ public suspend fun TelegramBot.sendLiveLocation( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -347,7 +347,7 @@ public suspend fun TelegramBot.sendLiveLocation( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendMessage.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendMessage.kt index d0e7a1c9fd..9c3b0263c9 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendMessage.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendMessage.kt @@ -29,7 +29,7 @@ public suspend fun TelegramBot.sendMessage( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -71,7 +71,7 @@ public suspend fun TelegramBot.sendTextMessage( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -111,7 +111,7 @@ public suspend fun TelegramBot.sendTextMessage( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -152,7 +152,7 @@ public suspend fun TelegramBot.sendMessage( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -191,7 +191,7 @@ public suspend fun TelegramBot.sendMessage( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -231,7 +231,7 @@ public suspend fun TelegramBot.sendMessage( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -271,7 +271,7 @@ public suspend fun TelegramBot.sendMessage( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -310,7 +310,7 @@ public suspend fun TelegramBot.sendTextMessage( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -348,7 +348,7 @@ public suspend fun TelegramBot.sendTextMessage( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -388,7 +388,7 @@ public suspend fun TelegramBot.sendTextMessage( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -427,7 +427,7 @@ public suspend fun TelegramBot.sendMessage( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -465,7 +465,7 @@ public suspend fun TelegramBot.sendMessage( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -505,7 +505,7 @@ public suspend fun TelegramBot.sendMessage( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -545,7 +545,7 @@ public suspend fun TelegramBot.sendTextMessage( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -583,7 +583,7 @@ public suspend fun TelegramBot.sendTextMessage( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -623,7 +623,7 @@ public suspend fun TelegramBot.sendTextMessage( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendStaticLocation.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendStaticLocation.kt index 5411f3f7c2..fb9d7edaa0 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendStaticLocation.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendStaticLocation.kt @@ -25,7 +25,7 @@ public suspend fun TelegramBot.sendLocation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -64,7 +64,7 @@ public suspend fun TelegramBot.sendLocation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -102,7 +102,7 @@ public suspend fun TelegramBot.sendLocation( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -139,7 +139,7 @@ public suspend fun TelegramBot.sendLocation( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -177,7 +177,7 @@ public suspend fun TelegramBot.sendStaticLocation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -214,7 +214,7 @@ public suspend fun TelegramBot.sendStaticLocation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -252,7 +252,7 @@ public suspend fun TelegramBot.sendStaticLocation( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -289,7 +289,7 @@ public suspend fun TelegramBot.sendStaticLocation( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt index 94fd56683b..5f107e11a4 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt @@ -31,7 +31,7 @@ public suspend fun TelegramBot.sendVenue( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -83,7 +83,7 @@ public suspend fun TelegramBot.sendVenue( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -132,7 +132,7 @@ public suspend fun TelegramBot.sendVenue( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -181,7 +181,7 @@ public suspend fun TelegramBot.sendVenue( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -224,7 +224,7 @@ public suspend fun TelegramBot.sendVenue( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -262,7 +262,7 @@ public suspend fun TelegramBot.sendVenue( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Sends.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Sends.kt index c4f395e9c2..1ddeec497b 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Sends.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Sends.kt @@ -71,7 +71,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -122,7 +122,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -172,7 +172,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -221,7 +221,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -267,7 +267,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -310,7 +310,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -352,7 +352,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -393,7 +393,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -434,7 +434,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -473,7 +473,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -512,7 +512,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -551,7 +551,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -700,7 +700,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -743,7 +743,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -785,7 +785,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -826,7 +826,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1055,7 +1055,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1093,7 +1093,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1131,7 +1131,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1169,7 +1169,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1208,7 +1208,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1249,7 +1249,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1289,7 +1289,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1327,7 +1327,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1367,7 +1367,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1408,7 +1408,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1578,7 +1578,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1618,7 +1618,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1661,7 +1661,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1866,7 +1866,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1911,7 +1911,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -1956,7 +1956,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2000,7 +2000,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2043,7 +2043,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2086,7 +2086,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -2129,7 +2129,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3306,7 +3306,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, emoji: String? = null, disableNotification: Boolean = false, @@ -3345,7 +3345,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, emoji: String? = null, disableNotification: Boolean = false, @@ -3390,7 +3390,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3436,7 +3436,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3482,7 +3482,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3528,7 +3528,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3576,7 +3576,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3627,7 +3627,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3677,7 +3677,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3726,7 +3726,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3769,7 +3769,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3806,7 +3806,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3848,7 +3848,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3895,7 +3895,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3941,7 +3941,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -3986,7 +3986,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -4031,7 +4031,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -4076,7 +4076,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -4120,7 +4120,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -4163,7 +4163,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -4203,7 +4203,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -4240,7 +4240,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -4279,7 +4279,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -4320,7 +4320,7 @@ public suspend fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -4360,7 +4360,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -4399,7 +4399,7 @@ public suspend inline fun TelegramBot.send( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAnimation.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAnimation.kt index 9f2801f29b..f4b0541833 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAnimation.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAnimation.kt @@ -34,7 +34,7 @@ public suspend fun TelegramBot.sendAnimation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -87,7 +87,7 @@ public suspend fun TelegramBot.sendAnimation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -139,7 +139,7 @@ public suspend fun TelegramBot.sendAnimation( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -190,7 +190,7 @@ public suspend fun TelegramBot.sendAnimation( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -241,7 +241,7 @@ public suspend fun TelegramBot.sendAnimation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -292,7 +292,7 @@ public suspend fun TelegramBot.sendAnimation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -342,7 +342,7 @@ public suspend fun TelegramBot.sendAnimation( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -391,7 +391,7 @@ public suspend fun TelegramBot.sendAnimation( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAudio.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAudio.kt index e3fa4866e5..74bbc33605 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAudio.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAudio.kt @@ -30,7 +30,7 @@ public suspend fun TelegramBot.sendAudio( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -80,7 +80,7 @@ public suspend fun TelegramBot.sendAudio( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -125,7 +125,7 @@ public suspend fun TelegramBot.sendAudio( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -170,7 +170,7 @@ public suspend fun TelegramBot.sendAudio( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -215,7 +215,7 @@ public suspend inline fun TelegramBot.sendAudio( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -263,7 +263,7 @@ public suspend inline fun TelegramBot.sendAudio( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -306,7 +306,7 @@ public suspend inline fun TelegramBot.sendAudio( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -349,7 +349,7 @@ public suspend inline fun TelegramBot.sendAudio( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendDocument.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendDocument.kt index f41d5b3218..3695b85408 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendDocument.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendDocument.kt @@ -27,7 +27,7 @@ public suspend fun TelegramBot.sendDocument( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -73,7 +73,7 @@ public suspend fun TelegramBot.sendDocument( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -116,7 +116,7 @@ public suspend fun TelegramBot.sendDocument( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -159,7 +159,7 @@ public suspend fun TelegramBot.sendDocument( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -201,7 +201,7 @@ public suspend inline fun TelegramBot.sendDocument( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -245,7 +245,7 @@ public suspend inline fun TelegramBot.sendDocument( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -286,7 +286,7 @@ public suspend inline fun TelegramBot.sendDocument( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -327,7 +327,7 @@ public suspend inline fun TelegramBot.sendDocument( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendLivePhoto.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendLivePhoto.kt index 6e8d600916..5d45032238 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendLivePhoto.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendLivePhoto.kt @@ -31,7 +31,7 @@ public suspend fun TelegramBot.sendLivePhoto( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -78,7 +78,7 @@ public suspend fun TelegramBot.sendLivePhoto( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -124,7 +124,7 @@ public suspend fun TelegramBot.sendLivePhoto( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -169,7 +169,7 @@ public suspend fun TelegramBot.sendLivePhoto( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -213,7 +213,7 @@ public suspend inline fun TelegramBot.sendLivePhoto( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -258,7 +258,7 @@ public suspend inline fun TelegramBot.sendLivePhoto( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -302,7 +302,7 @@ public suspend inline fun TelegramBot.sendLivePhoto( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -345,7 +345,7 @@ public suspend inline fun TelegramBot.sendLivePhoto( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendPhoto.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendPhoto.kt index bcf28c551c..e158dcc32a 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendPhoto.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendPhoto.kt @@ -30,7 +30,7 @@ public suspend fun TelegramBot.sendPhoto( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -76,7 +76,7 @@ public suspend fun TelegramBot.sendPhoto( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -120,7 +120,7 @@ public suspend fun TelegramBot.sendPhoto( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -164,7 +164,7 @@ public suspend fun TelegramBot.sendPhoto( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -208,7 +208,7 @@ public suspend fun TelegramBot.sendPhoto( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -252,7 +252,7 @@ public suspend fun TelegramBot.sendPhoto( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -296,7 +296,7 @@ public suspend inline fun TelegramBot.sendPhoto( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -340,7 +340,7 @@ public suspend inline fun TelegramBot.sendPhoto( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -382,7 +382,7 @@ public suspend inline fun TelegramBot.sendPhoto( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -424,7 +424,7 @@ public suspend inline fun TelegramBot.sendPhoto( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -466,7 +466,7 @@ public suspend inline fun TelegramBot.sendPhoto( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -508,7 +508,7 @@ public suspend inline fun TelegramBot.sendPhoto( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendSticker.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendSticker.kt index 021fcb6912..03e4fdbf73 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendSticker.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendSticker.kt @@ -24,7 +24,7 @@ public suspend fun TelegramBot.sendSticker( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, emoji: String? = null, disableNotification: Boolean = false, @@ -64,7 +64,7 @@ public suspend fun TelegramBot.sendSticker( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, emoji: String? = null, disableNotification: Boolean = false, @@ -102,7 +102,7 @@ public suspend fun TelegramBot.sendSticker( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, emoji: String? = null, disableNotification: Boolean = false, @@ -140,7 +140,7 @@ public suspend fun TelegramBot.sendSticker( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, emoji: String? = null, disableNotification: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideo.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideo.kt index 8b9f922daf..6361479727 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideo.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideo.kt @@ -37,7 +37,7 @@ public suspend fun TelegramBot.sendVideo( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -91,7 +91,7 @@ public suspend fun TelegramBot.sendVideo( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -149,7 +149,7 @@ public suspend fun TelegramBot.sendVideo( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -202,7 +202,7 @@ public suspend fun TelegramBot.sendVideo( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -253,7 +253,7 @@ public suspend inline fun TelegramBot.sendVideo( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -305,7 +305,7 @@ public suspend inline fun TelegramBot.sendVideo( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -361,7 +361,7 @@ public suspend inline fun TelegramBot.sendVideo( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -412,7 +412,7 @@ public suspend inline fun TelegramBot.sendVideo( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideoNote.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideoNote.kt index c6ac66b450..3e0b6ccd1b 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideoNote.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideoNote.kt @@ -25,7 +25,7 @@ public suspend fun TelegramBot.sendVideoNote( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -66,7 +66,7 @@ public suspend fun TelegramBot.sendVideoNote( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -108,7 +108,7 @@ public suspend fun TelegramBot.sendVideoNote( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -147,7 +147,7 @@ public suspend fun TelegramBot.sendVideoNote( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVoice.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVoice.kt index 2f3083b371..c3a9204a12 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVoice.kt +++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVoice.kt @@ -27,7 +27,7 @@ public suspend fun TelegramBot.sendVoice( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -71,7 +71,7 @@ public suspend fun TelegramBot.sendVoice( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -112,7 +112,7 @@ public suspend fun TelegramBot.sendVoice( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -153,7 +153,7 @@ public suspend fun TelegramBot.sendVoice( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -194,7 +194,7 @@ public suspend inline fun TelegramBot.sendVoice( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -236,7 +236,7 @@ public suspend inline fun TelegramBot.sendVoice( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -275,7 +275,7 @@ public suspend inline fun TelegramBot.sendVoice( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -313,7 +313,7 @@ public suspend inline fun TelegramBot.sendVoice( threadId: MessageThreadId? = chat.id.threadId, directMessageThreadId: DirectMessageThreadId? = chat.id.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chat.id.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git a/tgbotapi.core/api/tgbotapi.core.api b/tgbotapi.core/api/tgbotapi.core.api index 9f0e5f53cc..19ac36e58f 100644 --- a/tgbotapi.core/api/tgbotapi.core.api +++ b/tgbotapi.core/api/tgbotapi.core.api @@ -747,6 +747,7 @@ public final class dev/inmo/tgbotapi/bot/settings/limiters/RequestLimiter$Defaul public final class dev/inmo/tgbotapi/requests/DeleteEphemeralMessage : dev/inmo/tgbotapi/abstracts/types/EphemeralMessageAction, dev/inmo/tgbotapi/requests/abstracts/SimpleRequest { public static final field Companion Ldev/inmo/tgbotapi/requests/DeleteEphemeralMessage$Companion; + public synthetic fun (Ldev/inmo/tgbotapi/types/ChatIdentifier;Ldev/inmo/tgbotapi/types/IdChatIdentifier;JILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (Ldev/inmo/tgbotapi/types/ChatIdentifier;Ldev/inmo/tgbotapi/types/IdChatIdentifier;JLkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ldev/inmo/tgbotapi/types/ChatIdentifier; public final fun component2 ()Ldev/inmo/tgbotapi/types/IdChatIdentifier; @@ -11004,6 +11005,10 @@ public final class dev/inmo/tgbotapi/types/BusinessChatId : dev/inmo/tgbotapi/ty public final fun getChatIdWithBusinessConnectionId ()Lkotlin/Pair; public fun getDirectMessageThreadId-1osv_qQ ()Ldev/inmo/tgbotapi/types/DirectMessageThreadId; public static fun getDirectMessageThreadId-1osv_qQ (Lkotlin/Pair;)Ldev/inmo/tgbotapi/types/DirectMessageThreadId; + public fun getEphemeralMessageId-lUwSvXo ()Ldev/inmo/tgbotapi/types/EphemeralMessageId; + public static fun getEphemeralMessageId-lUwSvXo (Lkotlin/Pair;)Ldev/inmo/tgbotapi/types/EphemeralMessageId; + public fun getReceiverUser ()Ldev/inmo/tgbotapi/types/IdChatIdentifier; + public static fun getReceiverUser-impl (Lkotlin/Pair;)Ldev/inmo/tgbotapi/types/IdChatIdentifier; public fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId; public static fun getThreadId-S3HF-10 (Lkotlin/Pair;)Ldev/inmo/tgbotapi/types/MessageThreadId; public fun hashCode ()I @@ -11059,6 +11064,10 @@ public final class dev/inmo/tgbotapi/types/ChatId : dev/inmo/tgbotapi/types/IdCh public fun getChatId-iyD94Bc ()J public fun getDirectMessageThreadId-1osv_qQ ()Ldev/inmo/tgbotapi/types/DirectMessageThreadId; public static fun getDirectMessageThreadId-1osv_qQ (J)Ldev/inmo/tgbotapi/types/DirectMessageThreadId; + public fun getEphemeralMessageId-lUwSvXo ()Ldev/inmo/tgbotapi/types/EphemeralMessageId; + public static fun getEphemeralMessageId-lUwSvXo (J)Ldev/inmo/tgbotapi/types/EphemeralMessageId; + public fun getReceiverUser ()Ldev/inmo/tgbotapi/types/IdChatIdentifier; + public static fun getReceiverUser-impl (J)Ldev/inmo/tgbotapi/types/IdChatIdentifier; public fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId; public static fun getThreadId-S3HF-10 (J)Ldev/inmo/tgbotapi/types/MessageThreadId; public fun hashCode ()I @@ -11088,6 +11097,10 @@ public final class dev/inmo/tgbotapi/types/ChatIdWithChannelDirectMessageThreadI public synthetic fun getDirectMessageThreadId-1osv_qQ ()Ldev/inmo/tgbotapi/types/DirectMessageThreadId; public fun getDirectMessageThreadId-_JBF_Q4 ()J public static fun getDirectMessageThreadId-_JBF_Q4 (Lkotlin/Pair;)J + public fun getEphemeralMessageId-lUwSvXo ()Ldev/inmo/tgbotapi/types/EphemeralMessageId; + public static fun getEphemeralMessageId-lUwSvXo (Lkotlin/Pair;)Ldev/inmo/tgbotapi/types/EphemeralMessageId; + public fun getReceiverUser ()Ldev/inmo/tgbotapi/types/IdChatIdentifier; + public static fun getReceiverUser-impl (Lkotlin/Pair;)Ldev/inmo/tgbotapi/types/IdChatIdentifier; public fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId; public static fun getThreadId-S3HF-10 (Lkotlin/Pair;)Ldev/inmo/tgbotapi/types/MessageThreadId; public fun hashCode ()I @@ -11116,6 +11129,10 @@ public final class dev/inmo/tgbotapi/types/ChatIdWithThreadId : dev/inmo/tgbotap public final fun getChatIdWithThreadId ()Lkotlin/Pair; public fun getDirectMessageThreadId-1osv_qQ ()Ldev/inmo/tgbotapi/types/DirectMessageThreadId; public static fun getDirectMessageThreadId-1osv_qQ (Lkotlin/Pair;)Ldev/inmo/tgbotapi/types/DirectMessageThreadId; + public fun getEphemeralMessageId-lUwSvXo ()Ldev/inmo/tgbotapi/types/EphemeralMessageId; + public static fun getEphemeralMessageId-lUwSvXo (Lkotlin/Pair;)Ldev/inmo/tgbotapi/types/EphemeralMessageId; + public fun getReceiverUser ()Ldev/inmo/tgbotapi/types/IdChatIdentifier; + public static fun getReceiverUser-impl (Lkotlin/Pair;)Ldev/inmo/tgbotapi/types/IdChatIdentifier; public synthetic fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId; public fun getThreadId-hDmiKeI ()J public static fun getThreadId-hDmiKeI (Lkotlin/Pair;)J @@ -11145,6 +11162,8 @@ public final class dev/inmo/tgbotapi/types/ChatIdentifierKt { public static final field managedBotNewBotUsername Ljava/lang/String; public static final fun getBusinessConnectionId (Ldev/inmo/tgbotapi/types/ChatIdentifier;)Ljava/lang/String; public static final fun getDirectMessageThreadId (Ldev/inmo/tgbotapi/types/ChatIdentifier;)Ldev/inmo/tgbotapi/types/DirectMessageThreadId; + public static final fun getEphemeralMessageId (Ldev/inmo/tgbotapi/types/ChatIdentifier;)Ldev/inmo/tgbotapi/types/EphemeralMessageId; + public static final fun getReceiverUser (Ldev/inmo/tgbotapi/types/ChatIdentifier;)Ldev/inmo/tgbotapi/types/IdChatIdentifier; public static final fun getThreadId (Ldev/inmo/tgbotapi/types/ChatIdentifier;)Ldev/inmo/tgbotapi/types/MessageThreadId; public static final fun getUserLink (Ldev/inmo/tgbotapi/types/IdChatIdentifier;)Ljava/lang/String; public static final fun getUserLink (Ldev/inmo/tgbotapi/types/chat/User;)Ljava/lang/String; @@ -11157,6 +11176,8 @@ public final class dev/inmo/tgbotapi/types/ChatIdentifierKt { public static final fun toChatId-0218hRU (J)J public static final fun toChatIdWithChannelDirectMessageThreadId-KSqvWnI (Ldev/inmo/tgbotapi/types/IdChatIdentifier;J)Lkotlin/Pair; public static final fun toChatWithThreadId-krPZAoY (Ldev/inmo/tgbotapi/types/IdChatIdentifier;J)Lkotlin/Pair; + public static final fun toEphemeralChatId-oQsLJhk (Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ldev/inmo/tgbotapi/types/EphemeralMessageId;)Lkotlin/Triple; + public static synthetic fun toEphemeralChatId-oQsLJhk$default (Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ldev/inmo/tgbotapi/types/EphemeralMessageId;ILjava/lang/Object;)Lkotlin/Triple; public static final fun toUsername (Ljava/lang/String;)Ljava/lang/String; } @@ -12506,6 +12527,39 @@ public final class dev/inmo/tgbotapi/types/EffectId$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } +public final class dev/inmo/tgbotapi/types/EphemeralChatId : dev/inmo/tgbotapi/types/IdChatIdentifier { + public static final field Companion Ldev/inmo/tgbotapi/types/EphemeralChatId$Companion; + public static final synthetic fun box-impl (Lkotlin/Triple;)Ldev/inmo/tgbotapi/types/EphemeralChatId; + public static fun constructor-impl (JLdev/inmo/tgbotapi/types/IdChatIdentifier;Ldev/inmo/tgbotapi/types/EphemeralMessageId;)Lkotlin/Triple; + public static fun constructor-impl (Lkotlin/Triple;)Lkotlin/Triple; + public static synthetic fun constructor-impl$default (JLdev/inmo/tgbotapi/types/IdChatIdentifier;Ldev/inmo/tgbotapi/types/EphemeralMessageId;ILkotlin/jvm/internal/DefaultConstructorMarker;)Lkotlin/Triple; + public fun equals (Ljava/lang/Object;)Z + public static fun equals-impl (Lkotlin/Triple;Ljava/lang/Object;)Z + public static final fun equals-impl0 (Lkotlin/Triple;Lkotlin/Triple;)Z + public fun getBusinessConnectionId-nXr5wdE ()Ljava/lang/String; + public static fun getBusinessConnectionId-nXr5wdE (Lkotlin/Triple;)Ljava/lang/String; + public fun getChatId-iyD94Bc ()J + public static fun getChatId-iyD94Bc (Lkotlin/Triple;)J + public final fun getChatIdWithReceiverUserAndEphemeralMessageId ()Lkotlin/Triple; + public fun getDirectMessageThreadId-1osv_qQ ()Ldev/inmo/tgbotapi/types/DirectMessageThreadId; + public static fun getDirectMessageThreadId-1osv_qQ (Lkotlin/Triple;)Ldev/inmo/tgbotapi/types/DirectMessageThreadId; + public fun getEphemeralMessageId-lUwSvXo ()Ldev/inmo/tgbotapi/types/EphemeralMessageId; + public static fun getEphemeralMessageId-lUwSvXo (Lkotlin/Triple;)Ldev/inmo/tgbotapi/types/EphemeralMessageId; + public fun getReceiverUser ()Ldev/inmo/tgbotapi/types/IdChatIdentifier; + public static fun getReceiverUser-impl (Lkotlin/Triple;)Ldev/inmo/tgbotapi/types/IdChatIdentifier; + public fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId; + public static fun getThreadId-S3HF-10 (Lkotlin/Triple;)Ldev/inmo/tgbotapi/types/MessageThreadId; + public fun hashCode ()I + public static fun hashCode-impl (Lkotlin/Triple;)I + public fun toString ()Ljava/lang/String; + public static fun toString-impl (Lkotlin/Triple;)Ljava/lang/String; + public final synthetic fun unbox-impl ()Lkotlin/Triple; +} + +public final class dev/inmo/tgbotapi/types/EphemeralChatId$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + public final class dev/inmo/tgbotapi/types/EphemeralMessageId { public static final field Companion Ldev/inmo/tgbotapi/types/EphemeralMessageId$Companion; public static final synthetic fun box-impl (J)Ldev/inmo/tgbotapi/types/EphemeralMessageId; @@ -12656,6 +12710,8 @@ public abstract interface class dev/inmo/tgbotapi/types/IdChatIdentifier : dev/i public fun getBusinessConnectionId-nXr5wdE ()Ljava/lang/String; public abstract fun getChatId-iyD94Bc ()J public fun getDirectMessageThreadId-1osv_qQ ()Ldev/inmo/tgbotapi/types/DirectMessageThreadId; + public fun getEphemeralMessageId-lUwSvXo ()Ldev/inmo/tgbotapi/types/EphemeralMessageId; + public fun getReceiverUser ()Ldev/inmo/tgbotapi/types/IdChatIdentifier; public fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId; } @@ -12664,12 +12720,16 @@ public final class dev/inmo/tgbotapi/types/IdChatIdentifier$Companion { public static synthetic fun invoke-2eCI0EE$default (Ldev/inmo/tgbotapi/types/IdChatIdentifier$Companion;JLdev/inmo/tgbotapi/types/MessageThreadId;Ljava/lang/String;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/IdChatIdentifier; public final fun invoke-8eqqXtU (JJ)Lkotlin/Pair; public final fun invoke-bxO6wVA (JLjava/lang/String;)Lkotlin/Pair; + public final fun invoke-qw8KcVY (JLdev/inmo/tgbotapi/types/IdChatIdentifier;Ldev/inmo/tgbotapi/types/EphemeralMessageId;)Lkotlin/Triple; + public static synthetic fun invoke-qw8KcVY$default (Ldev/inmo/tgbotapi/types/IdChatIdentifier$Companion;JLdev/inmo/tgbotapi/types/IdChatIdentifier;Ldev/inmo/tgbotapi/types/EphemeralMessageId;ILjava/lang/Object;)Lkotlin/Triple; public final fun serializer ()Lkotlinx/serialization/KSerializer; } public final class dev/inmo/tgbotapi/types/IdChatIdentifier$DefaultImpls { public static fun getBusinessConnectionId-nXr5wdE (Ldev/inmo/tgbotapi/types/IdChatIdentifier;)Ljava/lang/String; public static fun getDirectMessageThreadId-1osv_qQ (Ldev/inmo/tgbotapi/types/IdChatIdentifier;)Ldev/inmo/tgbotapi/types/DirectMessageThreadId; + public static fun getEphemeralMessageId-lUwSvXo (Ldev/inmo/tgbotapi/types/IdChatIdentifier;)Ldev/inmo/tgbotapi/types/EphemeralMessageId; + public static fun getReceiverUser (Ldev/inmo/tgbotapi/types/IdChatIdentifier;)Ldev/inmo/tgbotapi/types/IdChatIdentifier; public static fun getThreadId-S3HF-10 (Ldev/inmo/tgbotapi/types/IdChatIdentifier;)Ldev/inmo/tgbotapi/types/MessageThreadId; } diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/DeleteEphemeralMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/DeleteEphemeralMessage.kt index 28887bc417..bf0a946d02 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/DeleteEphemeralMessage.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/DeleteEphemeralMessage.kt @@ -11,10 +11,14 @@ import kotlinx.serialization.builtins.serializer data class DeleteEphemeralMessage( @SerialName(chatIdField) override val chatId: ChatIdentifier, + @OptIn(ExperimentalSerializationApi::class) @SerialName(receiverUserIdField) - override val receiverUserId: UserId, + @EncodeDefault + override val receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + @OptIn(ExperimentalSerializationApi::class) @SerialName(ephemeralMessageIdField) - override val ephemeralMessageId: EphemeralMessageId + @EncodeDefault + override val ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" } ) : SimpleRequest, EphemeralMessageAction { override fun method(): String = "deleteEphemeralMessage" diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditEphemeralMessageCaption.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditEphemeralMessageCaption.kt index 8244f1419d..6bc90abfb1 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditEphemeralMessageCaption.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditEphemeralMessageCaption.kt @@ -16,8 +16,8 @@ const val editEphemeralMessageCaptionMethod = "editEphemeralMessageCaption" fun EditEphemeralMessageCaption( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, caption: String? = null, parseMode: ParseMode? = null, replyMarkup: InlineKeyboardMarkup? = null @@ -33,8 +33,8 @@ fun EditEphemeralMessageCaption( fun EditEphemeralMessageCaption( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, entities: TextSourcesList, replyMarkup: InlineKeyboardMarkup? = null ) = EditEphemeralMessageCaption( @@ -52,10 +52,14 @@ fun EditEphemeralMessageCaption( data class EditEphemeralMessageCaption internal constructor( @SerialName(chatIdField) override val chatId: ChatIdentifier, + @OptIn(ExperimentalSerializationApi::class) @SerialName(receiverUserIdField) - override val receiverUserId: UserId, + @EncodeDefault + override val receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + @OptIn(ExperimentalSerializationApi::class) @SerialName(ephemeralMessageIdField) - override val ephemeralMessageId: EphemeralMessageId, + @EncodeDefault + override val ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, @SerialName(captionField) override val text: String? = null, @SerialName(parseModeField) diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditEphemeralMessageMedia.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditEphemeralMessageMedia.kt index f264790f1f..83ce24e1b4 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditEphemeralMessageMedia.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditEphemeralMessageMedia.kt @@ -13,10 +13,14 @@ const val editEphemeralMessageMediaMethod = "editEphemeralMessageMedia" data class EditEphemeralMessageMedia( @SerialName(chatIdField) override val chatId: ChatIdentifier, + @OptIn(ExperimentalSerializationApi::class) @SerialName(receiverUserIdField) - override val receiverUserId: UserId, + @EncodeDefault + override val receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + @OptIn(ExperimentalSerializationApi::class) @SerialName(ephemeralMessageIdField) - override val ephemeralMessageId: EphemeralMessageId, + @EncodeDefault + override val ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, @Suppress("SERIALIZER_TYPE_INCOMPATIBLE") @SerialName(mediaField) override val media: TelegramFreeMedia, diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/reply_markup/EditEphemeralMessageReplyMarkup.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/reply_markup/EditEphemeralMessageReplyMarkup.kt index acc9fcff49..215181aea4 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/reply_markup/EditEphemeralMessageReplyMarkup.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/reply_markup/EditEphemeralMessageReplyMarkup.kt @@ -12,10 +12,14 @@ const val editEphemeralMessageReplyMarkupMethod = "editEphemeralMessageReplyMark data class EditEphemeralMessageReplyMarkup( @SerialName(chatIdField) override val chatId: ChatIdentifier, + @OptIn(ExperimentalSerializationApi::class) @SerialName(receiverUserIdField) - override val receiverUserId: UserId, + @EncodeDefault + override val receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + @OptIn(ExperimentalSerializationApi::class) @SerialName(ephemeralMessageIdField) - override val ephemeralMessageId: EphemeralMessageId, + @EncodeDefault + override val ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, @SerialName(replyMarkupField) override val replyMarkup: InlineKeyboardMarkup? = null ) : EditEphemeralMessage, EditReplyMessage { diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditEphemeralMessageText.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditEphemeralMessageText.kt index 29eaf50850..9d52de5584 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditEphemeralMessageText.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditEphemeralMessageText.kt @@ -17,8 +17,8 @@ const val editEphemeralMessageTextMethod = "editEphemeralMessageText" fun EditEphemeralMessageText( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, text: String, parseMode: ParseMode? = null, linkPreviewOptions: LinkPreviewOptions? = null, @@ -36,8 +36,8 @@ fun EditEphemeralMessageText( fun EditEphemeralMessageText( chatId: ChatIdentifier, - receiverUserId: UserId, - ephemeralMessageId: EphemeralMessageId, + receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, entities: TextSourcesList, linkPreviewOptions: LinkPreviewOptions? = null, replyMarkup: InlineKeyboardMarkup? = null @@ -57,10 +57,14 @@ fun EditEphemeralMessageText( data class EditEphemeralMessageText internal constructor( @SerialName(chatIdField) override val chatId: ChatIdentifier, + @OptIn(ExperimentalSerializationApi::class) @SerialName(receiverUserIdField) - override val receiverUserId: UserId, + @EncodeDefault + override val receiverUserId: UserId = requireNotNull(chatId.receiverUser) { "receiverUserId was not provided and chatId ($chatId) is not an EphemeralChatId" }, + @OptIn(ExperimentalSerializationApi::class) @SerialName(ephemeralMessageIdField) - override val ephemeralMessageId: EphemeralMessageId, + @EncodeDefault + override val ephemeralMessageId: EphemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "ephemeralMessageId was not provided and chatId ($chatId) does not carry an ephemeralMessageId" }, @SerialName(textField) override val text: String, @SerialName(parseModeField) diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendContact.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendContact.kt index c25f3d2c80..f7bfeb49dc 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendContact.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendContact.kt @@ -38,7 +38,7 @@ data class SendContact( @SerialName(businessConnectionIdField) override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, @SerialName(receiverUserIdField) - override val receiverUserId: UserId? = null, + override val receiverUserId: UserId? = chatId.receiverUser, @SerialName(callbackQueryIdField) override val callbackQueryId: CallbackQueryId? = null, @SerialName(disableNotificationField) @@ -65,7 +65,7 @@ data class SendContact( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -105,7 +105,7 @@ fun Contact.toRequest( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, diff --git 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 index 22d4a06710..5742b64efb 100644 --- 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 @@ -34,7 +34,7 @@ fun SendLocation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -68,7 +68,7 @@ fun SendStaticLocation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -111,7 +111,7 @@ fun SendLiveLocation( threadId: MessageThreadId? = chatId.threadId, directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId, businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId, - receiverUserId: UserId? = null, + receiverUserId: UserId? = chatId.receiverUser, callbackQueryId: CallbackQueryId? = null, disableNotification: Boolean = false, protectContent: Boolean = false, @@ -189,7 +189,7 @@ sealed interface SendLocation : SendContentMessageRequest : SendContentMessageRequest : SendContentMessageRequest +) : IdChatIdentifier { + override val chatId: RawChatId + get() = chatIdWithReceiverUserAndEphemeralMessageId.first + override val receiverUser: UserId + get() = chatIdWithReceiverUserAndEphemeralMessageId.second + override val ephemeralMessageId: EphemeralMessageId? + get() = chatIdWithReceiverUserAndEphemeralMessageId.third + + constructor(chatId: RawChatId, receiverUser: UserId, ephemeralMessageId: EphemeralMessageId? = null): this(Triple(chatId, receiverUser, ephemeralMessageId)) +} + val ChatIdentifier.threadId: MessageThreadId? get() = (this as? IdChatIdentifier) ?.threadId @@ -100,16 +125,24 @@ val ChatIdentifier.directMessageThreadId: DirectMessageThreadId? val ChatIdentifier.businessConnectionId: BusinessConnectionId? get() = (this as? IdChatIdentifier) ?.businessConnectionId +val ChatIdentifier.receiverUser: UserId? + get() = (this as? IdChatIdentifier) ?.receiverUser + +val ChatIdentifier.ephemeralMessageId: EphemeralMessageId? + get() = (this as? IdChatIdentifier) ?.ephemeralMessageId + fun IdChatIdentifier.toChatId() = when (this) { is ChatId -> this is ChatIdWithThreadId -> ChatId(chatId) is ChatIdWithChannelDirectMessageThreadId -> ChatId(chatId) is BusinessChatId -> ChatId(chatId) + is EphemeralChatId -> ChatId(chatId) } fun IdChatIdentifier.toChatWithThreadId(threadId: MessageThreadId) = IdChatIdentifier(chatId, threadId) fun IdChatIdentifier.toChatIdWithChannelDirectMessageThreadId(threadId: DirectMessageThreadId) = ChatIdWithChannelDirectMessageThreadId(chatId, threadId) fun IdChatIdentifier.toBusinessChatId(businessConnectionId: BusinessConnectionId) = IdChatIdentifier(chatId, businessConnectionId) +fun IdChatIdentifier.toEphemeralChatId(receiverUser: UserId, ephemeralMessageId: EphemeralMessageId? = null) = IdChatIdentifier(chatId, receiverUser, ephemeralMessageId) /** * https://core.telegram.org/bots/api#formatting-options @@ -256,6 +289,17 @@ object FullChatIdentifierSerializer : KSerializer { ) } } + 4 -> { + val (chatId, intermediateDelimiter, receiverUserChatId, ephemeralMessageId) = splitted + when (intermediateDelimiter) { + "eph" -> EphemeralChatId( + chatId.toLongOrNull() ?.let(::RawChatId) ?: return@let null, + receiverUserChatId.toLongOrNull() ?.let { ChatId(RawChatId(it)) } ?: return@let null, + ephemeralMessageId.toLongOrNull() ?.let(::EphemeralMessageId) + ) + else -> null + } + } else -> null } } ?: id.content.let { @@ -269,6 +313,7 @@ object FullChatIdentifierSerializer : KSerializer { is ChatIdWithThreadId -> encoder.encodeString("${value.chatId}/${value.threadId}") is BusinessChatId -> encoder.encodeString("${value.chatId}//${value.businessConnectionId}") is ChatIdWithChannelDirectMessageThreadId -> encoder.encodeString("${value.chatId}/cdm/${value.directMessageThreadId}") + is EphemeralChatId -> encoder.encodeString("${value.chatId}/eph/${value.receiverUser.chatId}/${value.ephemeralMessageId?.long ?: ""}") is Username -> encoder.encodeString(value.full) } } diff --git a/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ChatIdentifierTests.kt b/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ChatIdentifierTests.kt index 5473bb23d0..8ab3fff1d1 100644 --- a/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ChatIdentifierTests.kt +++ b/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ChatIdentifierTests.kt @@ -69,4 +69,31 @@ class ChatIdentifierTests { assertEquals(withUsername, deserialized) } } + + @Test + fun `EphemeralChatId_is_serialized_as_bare_long_by_ChatIdentifierSerializer`() { + val ephemeralChatId = EphemeralChatId(chatIdentifierChatId, ChatId(RawChatId(456L))) + val stringified = TestsJsonFormat.encodeToString(ChatIdentifierSerializer, ephemeralChatId as ChatIdentifier) + assertEquals("$chatIdentifierChatId", stringified) + val deserialized = TestsJsonFormat.decodeFromString(ChatIdentifierSerializer, stringified) + assertEquals(ChatId(chatIdentifierChatId), deserialized) + } + + @Test + fun `EphemeralChatId_round_trips_through_FullChatIdentifierSerializer_with_ephemeralMessageId`() { + val ephemeralChatId = EphemeralChatId(chatIdentifierChatId, ChatId(RawChatId(456L)), EphemeralMessageId(789L)) + val stringified = TestsJsonFormat.encodeToString(FullChatIdentifierSerializer, ephemeralChatId as ChatIdentifier) + assertEquals("\"$chatIdentifierChatId/eph/456/789\"", stringified) + val deserialized = TestsJsonFormat.decodeFromString(FullChatIdentifierSerializer, stringified) + assertEquals(ephemeralChatId, deserialized) + } + + @Test + fun `EphemeralChatId_round_trips_through_FullChatIdentifierSerializer_without_ephemeralMessageId`() { + val ephemeralChatId = EphemeralChatId(chatIdentifierChatId, ChatId(RawChatId(456L))) + val stringified = TestsJsonFormat.encodeToString(FullChatIdentifierSerializer, ephemeralChatId as ChatIdentifier) + assertEquals("\"$chatIdentifierChatId/eph/456/\"", stringified) + val deserialized = TestsJsonFormat.decodeFromString(FullChatIdentifierSerializer, stringified) + assertEquals(ephemeralChatId, deserialized) + } } diff --git a/tgbotapi.utils/api/tgbotapi.utils.api b/tgbotapi.utils/api/tgbotapi.utils.api index f837185a28..64a3529b00 100644 --- a/tgbotapi.utils/api/tgbotapi.utils.api +++ b/tgbotapi.utils/api/tgbotapi.utils.api @@ -1439,6 +1439,8 @@ public final class dev/inmo/tgbotapi/extensions/utils/ClassCastsNewKt { public static final fun encryptedPassportElementWithTranslatableIDDocumentOrThrow (Ldev/inmo/tgbotapi/types/passport/encrypted/abstracts/EncryptedPassportElement;)Ldev/inmo/tgbotapi/types/passport/encrypted/EncryptedPassportElementWithTranslatableIDDocument; public static final fun encryptedPersonalDetailsOrNull (Ldev/inmo/tgbotapi/types/passport/encrypted/abstracts/EncryptedPassportElement;)Ldev/inmo/tgbotapi/types/passport/encrypted/EncryptedPersonalDetails; public static final fun encryptedPersonalDetailsOrThrow (Ldev/inmo/tgbotapi/types/passport/encrypted/abstracts/EncryptedPassportElement;)Ldev/inmo/tgbotapi/types/passport/encrypted/EncryptedPersonalDetails; + public static final fun ephemeralChatIdOrNull (Ldev/inmo/tgbotapi/types/ChatIdentifier;)Lkotlin/Triple; + public static final fun ephemeralChatIdOrThrow (Ldev/inmo/tgbotapi/types/ChatIdentifier;)Lkotlin/Triple; public static final fun exactScheduledCloseInfoOrNull (Ldev/inmo/tgbotapi/types/polls/ScheduledCloseInfo;)Ldev/inmo/tgbotapi/types/polls/ExactScheduledCloseInfo; public static final fun exactScheduledCloseInfoOrThrow (Ldev/inmo/tgbotapi/types/polls/ScheduledCloseInfo;)Ldev/inmo/tgbotapi/types/polls/ExactScheduledCloseInfo; public static final fun expandableBlockquoteTextSourceOrNull (Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/ExpandableBlockquoteTextSource; @@ -1794,6 +1796,7 @@ public final class dev/inmo/tgbotapi/extensions/utils/ClassCastsNewKt { public static final fun ifEncryptedPassportElementWithTranslatableFilesCollection (Ldev/inmo/tgbotapi/types/passport/encrypted/abstracts/EncryptedPassportElement;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; public static final fun ifEncryptedPassportElementWithTranslatableIDDocument (Ldev/inmo/tgbotapi/types/passport/encrypted/abstracts/EncryptedPassportElement;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; public static final fun ifEncryptedPersonalDetails (Ldev/inmo/tgbotapi/types/passport/encrypted/abstracts/EncryptedPassportElement;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; + public static final fun ifEphemeralChatId (Ldev/inmo/tgbotapi/types/ChatIdentifier;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; public static final fun ifExactScheduledCloseInfo (Ldev/inmo/tgbotapi/types/polls/ScheduledCloseInfo;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; public static final fun ifExpandableBlockquoteTextSource (Ldev/inmo/tgbotapi/types/message/textsources/TextSource;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; public static final fun ifExtendedBot (Ldev/inmo/tgbotapi/types/chat/Chat;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; diff --git a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCastsNew.kt b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCastsNew.kt index 2a9ec14e43..18ba059b69 100644 --- a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCastsNew.kt +++ b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCastsNew.kt @@ -43,6 +43,7 @@ import dev.inmo.tgbotapi.types.ChatInviteLinkUnlimited import dev.inmo.tgbotapi.types.ChatInviteLinkWithJoinRequest import dev.inmo.tgbotapi.types.ChatInviteLinkWithLimitedMembers import dev.inmo.tgbotapi.types.DirectMessagesConfigurationChanged +import dev.inmo.tgbotapi.types.EphemeralChatId import dev.inmo.tgbotapi.types.IdChatIdentifier import dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.BaseChosenInlineResult import dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.ChosenInlineResult @@ -3126,6 +3127,12 @@ public inline fun ChatIdentifier.businessChatIdOrThrow(): BusinessChatId = this public inline fun ChatIdentifier.ifBusinessChatId(block: (BusinessChatId) -> T): T? = businessChatIdOrNull() ?.let(block) +public inline fun ChatIdentifier.ephemeralChatIdOrNull(): EphemeralChatId? = this as? dev.inmo.tgbotapi.types.EphemeralChatId + +public inline fun ChatIdentifier.ephemeralChatIdOrThrow(): EphemeralChatId = this as dev.inmo.tgbotapi.types.EphemeralChatId + +public inline fun ChatIdentifier.ifEphemeralChatId(block: (EphemeralChatId) -> T): T? = ephemeralChatIdOrNull() ?.let(block) + public inline fun ChatIdentifier.usernameOrNull(): Username? = this as? dev.inmo.tgbotapi.types.Username public inline fun ChatIdentifier.usernameOrThrow(): Username = this as dev.inmo.tgbotapi.types.Username