add drafts

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendMessageDraft.kt

@@ -1,13 +1,11 @@
 package dev.inmo.tgbotapi.requests.send
 
-import dev.inmo.tgbotapi.abstracts.types.LinkPreviewOptionsContainer
+import dev.inmo.tgbotapi.abstracts.TextedOutput
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
 import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.message.ParseMode
 import dev.inmo.tgbotapi.types.message.parseModeField
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.*
 import dev.inmo.tgbotapi.types.message.RawMessageEntity
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
@@ -17,80 +15,44 @@ import dev.inmo.tgbotapi.types.message.toRawMessageEntities
 import dev.inmo.tgbotapi.utils.extensions.makeString
 import dev.inmo.tgbotapi.utils.throwRangeError
 import kotlinx.serialization.*
-
-internal val TextContentMessageDraftResultDeserializer: DeserializationStrategy<ContentMessage<TextContent>>
-    = TelegramBotAPIMessageDeserializationStrategyClass()
+import kotlinx.serialization.builtins.serializer
 
 fun SendMessageDraft(
-    chatId: ChatIdentifier,
+    chatId: IdChatIdentifier,
+    draftId: DraftId,
     text: String,
     parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowPaidBroadcast: Boolean = false,
-    effectId: EffectId? = null,
-    suggestedPostParameters: SuggestedPostParameters? = null,
-    replyParameters: ReplyParameters? = null,
-    replyMarkup: KeyboardMarkup? = null
+    threadId: MessageThreadId? = chatId.threadId
 ) = SendMessageDraft(
     chatId = chatId,
+    draftId = draftId,
     text = text,
     parseMode = parseMode,
     rawEntities = null,
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    businessConnectionId = businessConnectionId,
-    linkPreviewOptions = linkPreviewOptions,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    allowPaidBroadcast = allowPaidBroadcast,
-    effectId = effectId,
-    suggestedPostParameters = suggestedPostParameters,
-    replyParameters = replyParameters,
-    replyMarkup = replyMarkup
+    threadId = threadId
 )
 
 fun SendMessageDraft(
-    chatId: ChatIdentifier,
+    chatId: IdChatIdentifier,
+    draftId: DraftId,
     entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowPaidBroadcast: Boolean = false,
-    effectId: EffectId? = null,
-    suggestedPostParameters: SuggestedPostParameters? = null,
-    replyParameters: ReplyParameters? = null,
-    replyMarkup: KeyboardMarkup? = null
+    threadId: MessageThreadId? = chatId.threadId
 ) = SendMessageDraft(
     chatId = chatId,
+    draftId = draftId,
     text = entities.makeString(),
     parseMode = null,
     rawEntities = entities.toRawMessageEntities(),
-    threadId = threadId,
-    directMessageThreadId = directMessageThreadId,
-    businessConnectionId = businessConnectionId,
-    linkPreviewOptions = linkPreviewOptions,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    allowPaidBroadcast = allowPaidBroadcast,
-    effectId = effectId,
-    suggestedPostParameters = suggestedPostParameters,
-    replyParameters = replyParameters,
-    replyMarkup = replyMarkup
+    threadId = threadId
 )
 
 @ConsistentCopyVisibility
 @Serializable
 data class SendMessageDraft internal constructor(
     @SerialName(chatIdField)
-    override val chatId: ChatIdentifier,
+    override val chatId: IdChatIdentifier,
+    @SerialName(draftIdField)
+    val draftId: DraftId,
     @SerialName(textField)
     override val text: String,
     @SerialName(parseModeField)
@@ -100,33 +62,10 @@ data class SendMessageDraft internal constructor(
     @OptIn(ExperimentalSerializationApi::class)
     @SerialName(messageThreadIdField)
     @EncodeDefault
-    override val threadId: MessageThreadId? = chatId.threadId,
-    @OptIn(ExperimentalSerializationApi::class)
-    @EncodeDefault
-    @SerialName(directMessagesTopicIdField)
-    override val directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
-    @SerialName(businessConnectionIdField)
-    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
-    @SerialName(linkPreviewOptionsField)
-    override val linkPreviewOptions: LinkPreviewOptions? = null,
-    @SerialName(disableNotificationField)
-    override val disableNotification: Boolean = false,
-    @SerialName(protectContentField)
-    override val protectContent: Boolean = false,
-    @SerialName(allowPaidBroadcastField)
-    override val allowPaidBroadcast: Boolean = false,
-    @SerialName(messageEffectIdField)
-    override val effectId: EffectId? = null,
-    @SerialName(suggestedPostParametersField)
-    override val suggestedPostParameters: SuggestedPostParameters? = null,
-    @SerialName(replyParametersField)
-    override val replyParameters: ReplyParameters? = null,
-    @SerialName(replyMarkupField)
-    override val replyMarkup: KeyboardMarkup? = null
-) : SendContentMessageRequest<ContentMessage<TextContent>>,
-    ReplyingMarkupSendMessageRequest<ContentMessage<TextContent>>,
-    TextableSendMessageRequest<ContentMessage<TextContent>>,
-    LinkPreviewOptionsContainer
+    override val threadId: MessageThreadId? = chatId.threadId
+) : SendChatMessageRequest<Boolean>,
+    TextedOutput,
+    OptionallyMessageThreadRequest
 {
     override val textSources: TextSourcesList? by lazy {
         rawEntities ?.asTextSources(text)
@@ -139,8 +78,8 @@ data class SendMessageDraft internal constructor(
     }
 
     override fun method(): String = "sendMessageDraft"
-    override val resultDeserializer: DeserializationStrategy<ContentMessage<TextContent>>
-        get() = TextContentMessageDraftResultDeserializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt

@@ -533,6 +533,7 @@ const val subscriptionPeriodField = "subscription_period"
 const val subscriptionPriceField = "subscription_price"
 const val copyTextField = "copy_text"
 const val topicIdField = "topic_id"
+const val draftIdField = "draft_id"
 
 const val isPublicField = "is_public"
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/DraftId.kt

@@ -0,0 +1,18 @@
+package dev.inmo.tgbotapi.types
+
+import dev.inmo.kslog.common.w
+import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
+import kotlinx.serialization.Serializable
+import kotlin.jvm.JvmInline
+
+@Serializable
+@JvmInline
+value class DraftId(
+    val long: Long
+) {
+    init {
+        if (long == 0L) {
+            DefaultKTgBotAPIKSLog.w("DraftId", "In DraftId has been passed 0. According to the documentation it must not be 0")
+        }
+    }
+}