almost add reply parameters

2025-09-16 13:49:26 +00:00 · 2024-01-07 22:42:46 +06:00
parent 60e50f9492
commit a692ed65f3
68 changed files with 852 additions and 1319 deletions
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/ReplyMessageId.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/ReplyMessageId.kt
@@ -1,8 +0,0 @@
-package dev.inmo.tgbotapi.abstracts.types
-
-import dev.inmo.tgbotapi.types.MessageId
-
-interface ReplyMessageId {
-    val replyToMessageId: MessageId?
-    val allowSendingWithoutReply: Boolean?
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/WithReplyParameters.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/WithReplyParameters.kt
@@ -0,0 +1,19 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+import dev.inmo.tgbotapi.types.MessageId
+import dev.inmo.tgbotapi.types.ReplyParameters
+
+@Deprecated("Renamed", ReplaceWith("WithReplyParameters", "dev.inmo.tgbotapi.abstracts.types.WithReplyParameters"))
+interface ReplyMessageId {
+    val replyToMessageId: MessageId?
+    val allowSendingWithoutReply: Boolean?
+}
+
+interface WithReplyParameters : ReplyMessageId {
+    val replyParameters: ReplyParameters?
+
+    override val replyToMessageId: MessageId?
+        get() = replyParameters ?.messageId
+    override val allowSendingWithoutReply: Boolean?
+        get() = replyParameters ?.allowSendingWithoutReply
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessage.kt
@@ -30,8 +30,7 @@ fun CopyMessage(
    threadId: MessageThreadId? = toChatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = CopyMessage(
    toChatId,
@@ -43,8 +42,7 @@ fun CopyMessage(
    threadId,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )

@@ -56,8 +54,7 @@ fun CopyMessage(
    threadId: MessageThreadId? = toChatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = CopyMessage(
    toChatId,
@@ -69,8 +66,7 @@ fun CopyMessage(
    threadId,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )

@@ -83,8 +79,7 @@ fun CopyMessage(
    threadId: MessageThreadId? = toChatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = CopyMessage(
    toChatId,
@@ -96,8 +91,7 @@ fun CopyMessage(
    threadId,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )

@@ -109,8 +103,7 @@ fun CopyMessage(
    threadId: MessageThreadId? = toChatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = CopyMessage(
    toChatId,
@@ -122,8 +115,7 @@ fun CopyMessage(
    threadId,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )

@@ -147,10 +139,8 @@ data class CopyMessage internal constructor(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ): SimpleRequest<MessageId>,
--- 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
@@ -28,10 +28,8 @@ data class SendContact(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : SendMessageRequest<ContentMessage<ContactContent>>,
@@ -43,8 +41,7 @@ data class SendContact(
        threadId: MessageThreadId? = chatId.threadId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
-        replyToMessageId: MessageId? = null,
-        allowSendingWithoutReply: Boolean? = null,
+        replyParameters: ReplyParameters? = null,
        replyMarkup: KeyboardMarkup? = null
    ): this(
        chatId,
@@ -54,8 +51,7 @@ data class SendContact(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

@@ -71,8 +67,7 @@ fun Contact.toRequest(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): SendContact = SendContact(
    chatId,
@@ -80,7 +75,6 @@ fun Contact.toRequest(
    threadId,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendDice.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendDice.kt
@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.requests.send

 import dev.inmo.tgbotapi.abstracts.types.DisableNotification
-import dev.inmo.tgbotapi.abstracts.types.ReplyMessageId
+import dev.inmo.tgbotapi.abstracts.types.WithReplyParameters
 import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@@ -26,13 +26,11 @@ data class SendDice(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
-) : ReplyingMarkupSendMessageRequest<ContentMessage<DiceContent>>, ReplyMessageId, DisableNotification {
+) : ReplyingMarkupSendMessageRequest<ContentMessage<DiceContent>>, WithReplyParameters, DisableNotification {
    override val requestSerializer: SerializationStrategy<*>
        get() = serializer()

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendLocation.kt
@@ -21,8 +21,7 @@ fun SendLocation(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = SendLocation(
    chatId,
@@ -35,8 +34,7 @@ fun SendLocation(
    threadId,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )

@@ -47,10 +45,9 @@ fun SendStaticLocation(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
-) = SendLocation(chatId, latitude, longitude, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = SendLocation(chatId, latitude, longitude, threadId, disableNotification, protectContent, replyParameters, replyMarkup)

 fun SendLiveLocation(
    chatId: ChatIdentifier,
@@ -63,8 +60,7 @@ fun SendLiveLocation(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = SendLocation(
    chatId,
@@ -77,8 +73,7 @@ fun SendLiveLocation(
    threadId,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )

@@ -104,10 +99,8 @@ data class SendLocation internal constructor(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : SendMessageRequest<ContentMessage<LocationContent>>,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendMessage.kt
@@ -28,8 +28,7 @@ fun SendTextMessage(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = SendTextMessage(
    chatId,
@@ -40,8 +39,7 @@ fun SendTextMessage(
    linkPreviewOptions,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )

@@ -52,8 +50,7 @@ fun SendTextMessage(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = SendTextMessage(
    chatId,
@@ -64,8 +61,7 @@ fun SendTextMessage(
    linkPreviewOptions,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )

@@ -87,10 +83,8 @@ data class SendTextMessage internal constructor(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : SendMessageRequest<ContentMessage<TextContent>>,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendVenue.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendVenue.kt
@@ -38,10 +38,8 @@ data class SendVenue(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : SendMessageRequest<ContentMessage<VenueContent>>,
@@ -55,8 +53,7 @@ data class SendVenue(
        threadId: MessageThreadId? = chatId.threadId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
-        replyToMessageId: MessageId? = null,
-        allowSendingWithoutReply: Boolean? = null,
+        replyParameters: ReplyParameters? = null,
        replyMarkup: KeyboardMarkup? = null
    ): this(
        chatId = chatId,
@@ -71,8 +68,7 @@ data class SendVenue(
        threadId = threadId,
        disableNotification = disableNotification,
        protectContent = protectContent,
-        replyToMessageId = replyToMessageId,
-        allowSendingWithoutReply = allowSendingWithoutReply,
+        replyParameters = replyParameters,
        replyMarkup = replyMarkup
    )

@@ -88,8 +84,7 @@ fun Venue.toRequest(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): SendVenue = SendVenue(
    chatId,
@@ -97,7 +92,6 @@ fun Venue.toRequest(
    threadId,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/SendMessageRequest.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/SendMessageRequest.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.requests.send.abstracts
 import dev.inmo.tgbotapi.abstracts.types.*

 interface SendMessageRequest<T: Any> : SendChatMessageRequest<T>,
-    ReplyMessageId,
+    WithReplyParameters,
    DisableNotification,
    ProtectContent,
    OptionallyMessageThreadRequest
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/games/SendGame.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/games/SendGame.kt
@@ -24,10 +24,8 @@ data class SendGame (
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : SendMessageRequest<ContentMessage<GameContent>>,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAnimation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAnimation.kt
@@ -33,8 +33,7 @@ fun SendAnimation(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<AnimationContent>> {
    val animationAsFile = animation as? MultipartFile
@@ -54,8 +53,7 @@ fun SendAnimation(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

@@ -81,8 +79,7 @@ fun SendAnimation(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<AnimationContent>> {
    val animationAsFile = animation as? MultipartFile
@@ -102,8 +99,7 @@ fun SendAnimation(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

@@ -148,10 +144,8 @@ data class SendAnimationData internal constructor(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : DataRequest<ContentMessage<AnimationContent>>,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAudio.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAudio.kt
@@ -33,8 +33,7 @@ fun SendAudio(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<AudioContent>> {
    val audioAsFile = audio as? MultipartFile
@@ -53,8 +52,7 @@ fun SendAudio(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

@@ -79,8 +77,7 @@ fun SendAudio(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<AudioContent>> {
    val audioAsFile = audio as? MultipartFile
@@ -99,8 +96,7 @@ fun SendAudio(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

@@ -143,10 +139,8 @@ data class SendAudioData internal constructor(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : DataRequest<ContentMessage<AudioContent>>,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendDocument.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendDocument.kt
@@ -38,8 +38,7 @@ fun SendDocument(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null,
    disableContentTypeDetection: Boolean? = null
 ): Request<ContentMessage<DocumentContent>> {
@@ -56,8 +55,7 @@ fun SendDocument(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup,
        disableContentTypeDetection
    )
@@ -89,8 +87,7 @@ fun SendDocument(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null,
    disableContentTypeDetection: Boolean? = null
 ): Request<ContentMessage<DocumentContent>> {
@@ -107,8 +104,7 @@ fun SendDocument(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup,
        disableContentTypeDetection
    )
@@ -155,10 +151,8 @@ data class SendDocumentData internal constructor(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null,
    @SerialName(disableContentTypeDetectionField)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendMediaGroup.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendMediaGroup.kt
@@ -22,10 +22,7 @@ import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonArray
-import kotlinx.serialization.json.jsonPrimitive

 const val rawSendingMediaGroupsWarning = "Media groups contains restrictions related to combinations of media" +
    " types. Currently it is possible to combine photo + video OR audio OR documents"
@@ -37,7 +34,7 @@ fun <T : MediaGroupPartContent> SendMediaGroup(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
+    replyParameters: ReplyParameters? = null,
    allowSendingWithoutReply: Boolean? = null
 ): Request<ContentMessage<MediaGroupContent<T>>> {
    if (media.size !in mediaCountInMediaGroup) {
@@ -61,8 +58,7 @@ fun <T : MediaGroupPartContent> SendMediaGroup(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply
+        replyParameters
    )

    return (if (files.isEmpty()) {
@@ -87,9 +83,9 @@ inline fun SendPlaylist(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
+    replyParameters: ReplyParameters? = null,
    allowSendingWithoutReply: Boolean? = null
-) = SendMediaGroup<AudioContent>(chatId, media, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply)
+) = SendMediaGroup<AudioContent>(chatId, media, threadId, disableNotification, protectContent, replyParameters, allowSendingWithoutReply)

 /**
 * Use this method to be sure that you are correctly sending documents media group
@@ -103,9 +99,9 @@ inline fun SendDocumentsGroup(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
+    replyParameters: ReplyParameters? = null,
    allowSendingWithoutReply: Boolean? = null
-) = SendMediaGroup<DocumentContent>(chatId, media, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply)
+) = SendMediaGroup<DocumentContent>(chatId, media, threadId, disableNotification, protectContent, replyParameters, allowSendingWithoutReply)

 /**
 * Use this method to be sure that you are correctly sending visual media group
@@ -120,9 +116,9 @@ inline fun SendVisualMediaGroup(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
+    replyParameters: ReplyParameters? = null,
    allowSendingWithoutReply: Boolean? = null
-) = SendMediaGroup<VisualMediaGroupPartContent>(chatId, media, threadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply)
+) = SendMediaGroup<VisualMediaGroupPartContent>(chatId, media, threadId, disableNotification, protectContent, replyParameters, allowSendingWithoutReply)

 private object MessagesListSerializer: KSerializer<PossiblySentViaBotCommonMessage<MediaGroupContent<MediaGroupPartContent>>> {
    private val serializer = ListSerializer(TelegramBotAPIMessageDeserializeOnlySerializerClass<PossiblySentViaBotCommonMessage<MediaGroupPartContent>>())
@@ -150,10 +146,8 @@ data class SendMediaGroupData internal constructor(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
 ) : DataRequest<PossiblySentViaBotCommonMessage<MediaGroupContent<MediaGroupPartContent>>>,
    SendMessageRequest<PossiblySentViaBotCommonMessage<MediaGroupContent<MediaGroupPartContent>>> {
    @SerialName(mediaField)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendPhoto.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendPhoto.kt
@@ -28,8 +28,7 @@ fun SendPhoto(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<PhotoContent>> {
    val data = SendPhotoData(
@@ -42,8 +41,7 @@ fun SendPhoto(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )
    return if (photo is MultipartFile) {
@@ -64,8 +62,7 @@ fun SendPhoto(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<PhotoContent>> {
    val data = SendPhotoData(
@@ -78,8 +75,7 @@ fun SendPhoto(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

@@ -116,10 +112,8 @@ data class SendPhotoData internal constructor(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : DataRequest<ContentMessage<PhotoContent>>,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendSticker.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendSticker.kt
@@ -9,13 +9,7 @@ import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
 import dev.inmo.tgbotapi.types.message.content.StickerContent
-import dev.inmo.tgbotapi.utils.mapOfNotNull
-import dev.inmo.tgbotapi.utils.toJsonWithoutNulls
 import kotlinx.serialization.*
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.put

 fun SendSticker(
    chatId: ChatIdentifier,
@@ -24,8 +18,7 @@ fun SendSticker(
    emoji: String? = null,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<StickerContent>> = SendStickerByFileId(
    chatId,
@@ -33,8 +26,7 @@ fun SendSticker(
    threadId,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 ).let {
    when (sticker) {
@@ -61,10 +53,8 @@ data class SendStickerByFileId internal constructor(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : SendMessageRequest<ContentMessage<StickerContent>>, ReplyingMarkupSendMessageRequest<ContentMessage<StickerContent>> {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideo.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideo.kt
@@ -34,8 +34,7 @@ fun SendVideo(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<VideoContent>> {
    val videoAsFile = video as? MultipartFile
@@ -56,8 +55,7 @@ fun SendVideo(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

@@ -84,8 +82,7 @@ fun SendVideo(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<VideoContent>> {
    val videoAsFile = video as? MultipartFile
@@ -106,8 +103,7 @@ fun SendVideo(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

@@ -154,10 +150,8 @@ data class SendVideoData internal constructor(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : DataRequest<ContentMessage<VideoContent>>,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideoNote.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideoNote.kt
@@ -21,8 +21,7 @@ fun SendVideoNote(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<VideoNoteContent>> {
    val videoNoteAsFile = videoNote as? MultipartFile
@@ -37,8 +36,7 @@ fun SendVideoNote(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

@@ -73,10 +71,8 @@ data class SendVideoNoteData internal constructor(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : DataRequest<ContentMessage<VideoNoteContent>>,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVoice.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVoice.kt
@@ -29,8 +29,7 @@ fun SendVoice(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<VoiceContent>> {
    val voiceAsFile = voice as? MultipartFile
@@ -45,8 +44,7 @@ fun SendVoice(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

@@ -68,8 +66,7 @@ fun SendVoice(
    duration: Long? = null,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ): Request<ContentMessage<VoiceContent>> {
    val voiceAsFile = voice as? MultipartFile
@@ -84,8 +81,7 @@ fun SendVoice(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

@@ -122,10 +118,8 @@ data class SendVoiceData internal constructor(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : DataRequest<ContentMessage<VoiceContent>>,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt
@@ -64,16 +64,14 @@ data class SendInvoice(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: InlineKeyboardMarkup? = null
 ) : CommonSendInvoiceData,
    ChatRequest,
    DisableNotification,
-    ReplyMessageId,
+    WithReplyParameters,
    WithReplyMarkup,
    SendMessageRequest<ContentMessage<InvoiceContent>> {
    override fun method(): String = "sendInvoice"
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt
@@ -53,8 +53,7 @@ fun SendPoll(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = SendRegularPoll(
    chatId,
@@ -64,9 +63,8 @@ fun SendPoll(
    isClosed,
    threadId = threadId,
    protectContent = protectContent,
-    allowSendingWithoutReply = allowSendingWithoutReply,
    disableNotification = disableNotification,
-    replyToMessageId = replyToMessageId,
+    replyParameters = replyParameters,
    replyMarkup = replyMarkup
 )

@@ -79,8 +77,7 @@ fun Poll.createRequest(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = when (this) {
    is RegularPoll -> SendRegularPoll(
@@ -94,8 +91,7 @@ fun Poll.createRequest(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )
    is QuizPoll -> correctOptionId ?.let { correctOptionId ->
@@ -111,8 +107,7 @@ fun Poll.createRequest(
            threadId,
            disableNotification,
            protectContent,
-            replyToMessageId,
-            allowSendingWithoutReply,
+            replyParameters,
            replyMarkup
        )
    } ?: SendRegularPoll(
@@ -126,8 +121,7 @@ fun Poll.createRequest(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )
    is UnknownPollType -> SendRegularPoll(
@@ -141,8 +135,7 @@ fun Poll.createRequest(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )
 }
@@ -209,10 +202,8 @@ data class SendRegularPoll(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : SendPoll() {
@@ -237,8 +228,7 @@ fun SendRegularPoll(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = SendRegularPoll(
    chatId,
@@ -252,8 +242,7 @@ fun SendRegularPoll(
    threadId,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )

@@ -270,8 +259,7 @@ fun SendQuizPoll(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = SendQuizPoll(
    chatId,
@@ -287,8 +275,7 @@ fun SendQuizPoll(
    threadId,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )

@@ -304,8 +291,7 @@ fun SendQuizPoll(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = SendQuizPoll(
    chatId,
@@ -321,8 +307,7 @@ fun SendQuizPoll(
    threadId,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )

@@ -340,8 +325,7 @@ internal fun SendQuizPoll(
    threadId: MessageThreadId? = chatId.threadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyToMessageId: MessageId? = null,
-    allowSendingWithoutReply: Boolean? = null,
+    replyParameters: ReplyParameters? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = SendQuizPoll(
    chatId,
@@ -358,8 +342,7 @@ internal fun SendQuizPoll(
    threadId,
    disableNotification,
    protectContent,
-    replyToMessageId,
-    allowSendingWithoutReply,
+    replyParameters,
    replyMarkup
 )

@@ -393,10 +376,8 @@ data class SendQuizPoll internal constructor(
    override val disableNotification: Boolean = false,
    @SerialName(protectContentField)
    override val protectContent: Boolean = false,
-    @SerialName(replyToMessageIdField)
-    override val replyToMessageId: MessageId? = null,
-    @SerialName(allowSendingWithoutReplyField)
-    override val allowSendingWithoutReply: Boolean? = null,
+    @SerialName(replyParametersField)
+    override val replyParameters: ReplyParameters? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
 ) : SendPoll(), TextedOutput {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt
@@ -219,6 +219,7 @@ const val disableNotificationField = "disable_notification"
 const val protectContentField = "protect_content"
 const val removeCaptionField = "remove_caption"
 const val replyToMessageIdField = "reply_to_message_id"
+const val replyParametersField = "reply_parameters"
 const val allowSendingWithoutReplyField = "allow_sending_without_reply"
 const val quoteField = "quote"
 const val quoteParseModeField = "quote_parse_mode"
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ReplyParameters.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ReplyParameters.kt
@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types

 import dev.inmo.tgbotapi.abstracts.TextedInput
-import dev.inmo.tgbotapi.abstracts.TextedWithTextSources
 import dev.inmo.tgbotapi.abstracts.WithMessageId
 import dev.inmo.tgbotapi.types.message.ParseMode
 import dev.inmo.tgbotapi.types.message.RawMessageEntity
@@ -64,6 +63,17 @@ data class ReplyParameters internal constructor(
        allowSendingWithoutReply,
        quotePosition
    )
+    constructor(
+        message: Message,
+        entities: TextSourcesList,
+        allowSendingWithoutReply: Boolean = false,
+        quotePosition: Int? = null
+    ) : this(
+        message.metaInfo,
+        entities,
+        allowSendingWithoutReply,
+        quotePosition
+    )
    constructor(
        chatIdentifier: ChatIdentifier,
        messageId: MessageId,
@@ -94,6 +104,19 @@ data class ReplyParameters internal constructor(
        allowSendingWithoutReply,
        quotePosition
    )
+    constructor(
+        message: Message,
+        quote: String,
+        quoteParseMode: ParseMode,
+        allowSendingWithoutReply: Boolean = false,
+        quotePosition: Int? = null
+    ) : this(
+        message.metaInfo,
+        quote,
+        quoteParseMode,
+        allowSendingWithoutReply,
+        quotePosition
+    )
    constructor(
        chatIdentifier: ChatIdentifier,
        messageId: MessageId,
@@ -118,4 +141,13 @@ data class ReplyParameters internal constructor(
        allowSendingWithoutReply,
        quotePosition
    )
+    constructor(
+        message: Message,
+        allowSendingWithoutReply: Boolean = false,
+        quotePosition: Int? = null
+    ) : this(
+        message.metaInfo,
+        allowSendingWithoutReply,
+        quotePosition
+    )
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/Abstracts.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/Abstracts.kt
@@ -4,14 +4,11 @@ import dev.inmo.tgbotapi.abstracts.SpoilerableData
 import dev.inmo.tgbotapi.abstracts.TextedInput
 import dev.inmo.tgbotapi.utils.internal.ClassCastsIncluded
 import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.MessageThreadId
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.TelegramMediaFile
 import dev.inmo.tgbotapi.types.media.TelegramMedia
 import dev.inmo.tgbotapi.types.message.abstracts.*
-import dev.inmo.tgbotapi.types.threadId
 import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.modules.*
@@ -152,8 +149,30 @@ sealed interface ResendableContent {
        messageThreadId: MessageThreadId? = chatId.threadId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
-        replyToMessageId: MessageId? = null,
-        allowSendingWithoutReply: Boolean? = null,
+        replyParameters: ReplyParameters? = null,
        replyMarkup: KeyboardMarkup? = null
    ): Request<out AccessibleMessage>
+
+    fun createResend(
+        chatId: ChatIdentifier,
+        messageThreadId: MessageThreadId? = chatId.threadId,
+        disableNotification: Boolean = false,
+        protectContent: Boolean = false,
+        replyToMessageId: MessageId?,
+        allowSendingWithoutReply: Boolean? = null,
+        replyMarkup: KeyboardMarkup? = null
+    ): Request<out AccessibleMessage> = createResend(
+        chatId = chatId,
+        messageThreadId = messageThreadId,
+        disableNotification = disableNotification,
+        protectContent = protectContent,
+        replyParameters = replyToMessageId ?.let {
+            ReplyParameters(
+                chatId,
+                replyToMessageId,
+                allowSendingWithoutReply = allowSendingWithoutReply == true
+            )
+        },
+        replyMarkup = replyMarkup
+    )
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/AnimationContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/AnimationContent.kt
@@ -2,12 +2,9 @@ package dev.inmo.tgbotapi.types.message.content

 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.media.SendAnimation
-import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.media.TelegramMediaAnimation
 import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.TextQuote
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.AnimationFile
 import dev.inmo.tgbotapi.types.files.DocumentFile
@@ -28,8 +25,7 @@ data class AnimationContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<AnimationContent>> = SendAnimation(
        chatId,
@@ -43,8 +39,7 @@ data class AnimationContent(
        messageThreadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/AudioContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/AudioContent.kt
@@ -2,13 +2,10 @@ package dev.inmo.tgbotapi.types.message.content

 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.media.SendAudio
-import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.media.TelegramMediaAudio
 import dev.inmo.tgbotapi.types.media.toTelegramMediaAudio
 import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.TextQuote
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.AudioFile
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
@@ -26,8 +23,7 @@ data class AudioContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<AudioContent>> = SendAudio(
        chatId,
@@ -40,8 +36,7 @@ data class AudioContent(
        messageThreadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/ContactContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/ContactContent.kt
@@ -16,10 +16,9 @@ data class ContactContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<ContactContent>> = SendContact(
-        chatId, contact, messageThreadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
+        chatId, contact, messageThreadId, disableNotification, protectContent, replyParameters, replyMarkup
    )
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/DiceContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/DiceContent.kt
@@ -5,6 +5,7 @@ import dev.inmo.tgbotapi.requests.send.SendDice
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.MessageThreadId
+import dev.inmo.tgbotapi.types.ReplyParameters
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.dice.Dice
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
@@ -19,8 +20,7 @@ data class DiceContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<DiceContent>> = SendDice(
        chatId,
@@ -28,8 +28,7 @@ data class DiceContent(
        messageThreadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/DocumentContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/DocumentContent.kt
@@ -3,13 +3,10 @@ package dev.inmo.tgbotapi.types.message.content
 import dev.inmo.tgbotapi.abstracts.TextedInput
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.media.SendDocument
-import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.media.TelegramMediaDocument
 import dev.inmo.tgbotapi.types.media.toTelegramMediaDocument
 import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.TextQuote
 import dev.inmo.tgbotapi.types.abstracts.WithOptionalQuoteInfo
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.DocumentFile
@@ -29,8 +26,7 @@ data class DocumentContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<DocumentContent>> = SendDocument(
        chatId,
@@ -40,8 +36,7 @@ data class DocumentContent(
        messageThreadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/GameContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/GameContent.kt
@@ -5,6 +5,7 @@ import dev.inmo.tgbotapi.requests.send.games.SendGame
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.MessageThreadId
+import dev.inmo.tgbotapi.types.ReplyParameters
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.games.Game
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
@@ -19,8 +20,7 @@ data class GameContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<GameContent>> = SendGame(
        chatId,
@@ -28,8 +28,7 @@ data class GameContent(
        messageThreadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/GiveawayPublicResultsContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/GiveawayPublicResultsContent.kt
@@ -17,8 +17,7 @@ data class GiveawayPublicResultsContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<out AccessibleMessage> {
        return ForwardMessage(
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/InvoiceContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/InvoiceContent.kt
@@ -4,6 +4,7 @@ import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.MessageThreadId
+import dev.inmo.tgbotapi.types.ReplyParameters
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.payments.Invoice
@@ -18,8 +19,7 @@ data class InvoiceContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<InvoiceContent>> {
        error("Unfortunately, currently InvoiceOfPayment can not be resend due to requirement of additional parameters," +
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/LocationContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/LocationContent.kt
@@ -7,6 +7,7 @@ import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.MessageThreadId
+import dev.inmo.tgbotapi.types.ReplyParameters
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.location.*
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
@@ -101,8 +102,7 @@ data class LiveLocationContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<LiveLocationContent>> = SendLiveLocation(
        chatId,
@@ -115,8 +115,7 @@ data class LiveLocationContent(
        messageThreadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    ) as SendMessageRequest<ContentMessage<LiveLocationContent>>
 }
@@ -134,8 +133,7 @@ data class StaticLocationContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<StaticLocationContent>> = SendStaticLocation(
        chatId,
@@ -144,8 +142,7 @@ data class StaticLocationContent(
        messageThreadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    ) as SendMessageRequest<ContentMessage<StaticLocationContent>>
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/MediaGroupContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/MediaGroupContent.kt
@@ -35,8 +35,7 @@ data class MediaGroupContent<T : MediaGroupPartContent>(
        threadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<MediaGroupContent<MediaGroupPartContent>>> = SendMediaGroup<MediaGroupPartContent>(
        chatId,
@@ -44,7 +43,6 @@ data class MediaGroupContent<T : MediaGroupPartContent>(
        threadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply
+        replyParameters,
    )
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/PhotoContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/PhotoContent.kt
@@ -2,13 +2,10 @@ package dev.inmo.tgbotapi.types.message.content

 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.media.SendPhoto
-import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.media.TelegramMediaPhoto
 import dev.inmo.tgbotapi.types.media.toTelegramMediaPhoto
 import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.TextQuote
 import dev.inmo.tgbotapi.types.abstracts.WithOptionalQuoteInfo
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.*
@@ -30,8 +27,7 @@ data class PhotoContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<PhotoContent>> = SendPhoto(
        chatId,
@@ -41,8 +37,7 @@ data class PhotoContent(
        messageThreadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/PollContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/PollContent.kt
@@ -5,6 +5,7 @@ import dev.inmo.tgbotapi.requests.send.polls.createRequest
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.MessageThreadId
+import dev.inmo.tgbotapi.types.ReplyParameters
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.polls.Poll
@@ -19,16 +20,14 @@ data class PollContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<PollContent>> = poll.createRequest(
        chatId,
        messageThreadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/ScheduledGiveawayContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/ScheduledGiveawayContent.kt
@@ -24,8 +24,7 @@ data class ScheduledGiveawayContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<out AccessibleMessage> {
        return ForwardMessage(
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/StickerContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/StickerContent.kt
@@ -6,6 +6,7 @@ import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.media.TelegramMediaDocument
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.MessageThreadId
+import dev.inmo.tgbotapi.types.ReplyParameters
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.Sticker
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
@@ -20,8 +21,7 @@ data class StickerContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<StickerContent>> = SendSticker(
        chatId,
@@ -30,8 +30,7 @@ data class StickerContent(
        media.emoji,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/StoryContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/StoryContent.kt
@@ -5,6 +5,7 @@ import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.MessageThreadId
+import dev.inmo.tgbotapi.types.ReplyParameters
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.PossiblyForwardedMessage
@@ -22,8 +23,7 @@ data class StoryContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<PossiblyForwardedMessage> {
        return ForwardMessage(
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt
@@ -22,8 +22,7 @@ data class TextContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<TextContent>> = SendTextMessage(
        chatId,
@@ -32,8 +31,7 @@ data class TextContent(
        messageThreadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VenueContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VenueContent.kt
@@ -5,6 +5,7 @@ import dev.inmo.tgbotapi.requests.send.SendVenue
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.MessageThreadId
+import dev.inmo.tgbotapi.types.ReplyParameters
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.venue.Venue
@@ -19,10 +20,9 @@ data class VenueContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<VenueContent>> = SendVenue(
-        chatId, venue, messageThreadId, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup
+        chatId, venue, messageThreadId, disableNotification, protectContent, replyParameters, replyMarkup
    )
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VideoContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VideoContent.kt
@@ -2,12 +2,9 @@ package dev.inmo.tgbotapi.types.message.content

 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.media.SendVideo
-import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.media.TelegramMediaVideo
 import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.TextQuote
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.VideoFile
 import dev.inmo.tgbotapi.types.files.toTelegramMediaVideo
@@ -27,8 +24,7 @@ data class VideoContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<VideoContent>> = SendVideo(
        chatId,
@@ -43,8 +39,7 @@ data class VideoContent(
        messageThreadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VideoNoteContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VideoNoteContent.kt
@@ -6,6 +6,7 @@ import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.media.TelegramMediaVideo
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.MessageThreadId
+import dev.inmo.tgbotapi.types.ReplyParameters
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.VideoNoteFile
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
@@ -20,8 +21,7 @@ data class VideoNoteContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<VideoNoteContent>> = SendVideoNote(
        chatId,
@@ -32,8 +32,7 @@ data class VideoNoteContent(
        messageThreadId,
        disableNotification,
        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
+        replyParameters,
        replyMarkup
    )

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VoiceContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VoiceContent.kt
@@ -23,8 +23,7 @@ data class VoiceContent(
        messageThreadId: MessageThreadId?,
        disableNotification: Boolean,
        protectContent: Boolean,
-        replyToMessageId: MessageId?,
-        allowSendingWithoutReply: Boolean?,
+        replyParameters: ReplyParameters?,
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<VoiceContent>> = SendVoice(
        chatId = chatId,
@@ -34,8 +33,7 @@ data class VoiceContent(
        duration = media.duration,
        disableNotification = disableNotification,
        protectContent = protectContent,
-        replyToMessageId = replyToMessageId,
-        allowSendingWithoutReply = allowSendingWithoutReply,
+        replyParameters = replyParameters,
        replyMarkup = replyMarkup
    )