deprecations removed

2025-11-16 12:00:18 +00:00 · 2021-05-29 14:31:44 +06:00
parent 7825ec3010
commit fe1831fc19
24 changed files with 26 additions and 176 deletions
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt
@@ -1,20 +0,0 @@
-package dev.inmo.tgbotapi.CommonAbstracts
-
-const val CaptionDeprecation = "Captioned interface and others will be removed soon and not recommended to use"
-
-@Deprecated(CaptionDeprecation)
-interface Captioned : Texted {
-    @Deprecated(CaptionDeprecation)
-    val caption: String?
-        get() = text
-}
-
-@Deprecated(CaptionDeprecation)
-interface CaptionedInput : Captioned, TextedInput {
-    /**
-     * Full list of entities. This list WILL contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
-     */
-    @Deprecated(CaptionDeprecation)
-    val captionEntities: List<TextPart>
-        get() = textEntities
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt
@@ -1,26 +0,0 @@
-package dev.inmo.tgbotapi.CommonAbstracts
-
-@Deprecated("Will be removed soon")
-interface Explained : Texted {
-    val explanation: String?
-        get() = text
-}
-
-@Deprecated("Will be removed soon")
-interface ParsableExplainedOutput : Explained, TextedOutput
-
-@Deprecated("Will be removed soon")
-interface EntitiesExplainedOutput : Explained, EntitiesOutput
-
-@Deprecated("Will be removed soon")
-interface ExplainedOutput : ParsableExplainedOutput, EntitiesExplainedOutput
-
-@Deprecated("Will be removed soon")
-interface ExplainedInput : Explained {
-    val textSources: TextSourcesList
-    /**
-     * Full list of entities. This list WILL contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
-     */
-    val explanationEntities: List<TextPart>
-        get() = textSources.toTextParts()
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt
@@ -66,7 +66,7 @@ fun List<dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource>.separateF
    "Replaced",
    ReplaceWith("separateForCaption", "dev.inmo.tgbotapi.types.MessageEntity.textsources.separateForCaption")
 )
-fun List<dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource>.separateForCaption() = separateForCaption()
+fun List<TextSource>.separateForCaption() = separateForCaption()

 /**
 * This method will prepare [TextSource]s list for messages with [textLength]
--- 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
@@ -356,7 +356,7 @@ data class SendQuizPoll internal constructor(
    override val allowSendingWithoutReply: Boolean? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
-) : SendPoll(), ExplainedOutput, TextedOutput {
+) : SendPoll(), TextedOutput {
    override val type: String = quizPollType
    override val requestSerializer: SerializationStrategy<*>
        get() = serializer()
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/LeftChatMemberImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/LeftChatMemberImpl.kt
@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.ChatMember

 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.LeftChatMember
 import kotlinx.serialization.*

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InlineQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InlineQuery.kt
@@ -1,9 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.abstracts

 import dev.inmo.tgbotapi.types.InlineQueries.query.InlineQuery
-import dev.inmo.tgbotapi.types.InlineQueryIdentifier
-import dev.inmo.tgbotapi.types.User
-import dev.inmo.tgbotapi.types.chat.ChatType

@Deprecated("Replaced", ReplaceWith("InlineQuery", "dev.inmo.tgbotapi.types.InlineQueries.query.InlineQuery"))
 typealias InlineQuery = InlineQuery
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InputMessageContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InputMessageContent.kt
@@ -1,8 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.abstracts

 import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
-import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContentSerializer
-import kotlinx.serialization.Serializable

@Deprecated("Replaced", ReplaceWith("InputMessageContent", "dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent"))
 typealias InputMessageContent = InputMessageContent
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/actions/BotAction.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/actions/BotAction.kt
@@ -28,8 +28,6 @@ internal object BotActionSerializer: KSerializer<BotAction> {
            UploadPhotoAction.actionName -> UploadPhotoAction
            RecordVideoAction.actionName -> RecordVideoAction
            UploadVideoAction.actionName -> UploadVideoAction
-            RecordAudioAction.actionName -> RecordAudioAction
-            UploadAudioAction.actionName -> UploadAudioAction
            RecordVoiceAction.actionName -> RecordVoiceAction
            UploadVoiceAction.actionName -> UploadVoiceAction
            UploadDocumentAction.actionName -> UploadDocumentAction
@@ -85,52 +83,6 @@ inline val uploadVideo
    get() = UploadVideoAction
 inline fun BotAction.asUploadVideo() = this as? UploadVideoAction

-/**
- * Will notify user that bot is recording some audio
- */
-@Serializable(BotActionSerializer::class)
-@Deprecated(
-    "Deprecated according to https://core.telegram.org/bots/api-changelog#april-26-2021",
-    ReplaceWith("RecordVoiceAction", "dev.inmo.tgbotapi.types.actions.RecordVoiceAction")
-)
-object RecordAudioAction : BotAction {
-    override val actionName: String = "record_audio"
-}
-@Deprecated(
-    "Deprecated according to https://core.telegram.org/bots/api-changelog#april-26-2021",
-    ReplaceWith("recordVoice", "dev.inmo.tgbotapi.types.actions.recordVoice")
-)
-inline val recordAudio
-    get() = RecordAudioAction
-@Deprecated(
-    "Deprecated according to https://core.telegram.org/bots/api-changelog#april-26-2021",
-    ReplaceWith("asRecordVoice", "dev.inmo.tgbotapi.types.actions.asRecordVoice")
-)
-inline fun BotAction.asRecordAudio() = this as? RecordAudioAction
-
-/**
- * Will notify user that bot is uploading some audio
- */
-@Serializable(BotActionSerializer::class)
-@Deprecated(
-    "Deprecated according to https://core.telegram.org/bots/api-changelog#april-26-2021",
-    ReplaceWith("UploadVoiceAction", "dev.inmo.tgbotapi.types.actions.UploadVoiceAction")
-)
-object UploadAudioAction : BotAction {
-    override val actionName: String = "upload_audio"
-}
-@Deprecated(
-    "Deprecated according to https://core.telegram.org/bots/api-changelog#april-26-2021",
-    ReplaceWith("uploadVoice", "dev.inmo.tgbotapi.types.actions.uploadVoice")
-)
-inline val uploadAudio
-    get() = UploadAudioAction
-@Deprecated(
-    "Deprecated according to https://core.telegram.org/bots/api-changelog#april-26-2021",
-    ReplaceWith("asUploadVoice", "dev.inmo.tgbotapi.types.actions.asUploadVoice")
-)
-inline fun BotAction.asUploadAudio() = this as? UploadAudioAction
-
 /**
 * Will notify user that bot is recording some audio
 */
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoFile.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoFile.kt
@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.files

-import dev.inmo.tgbotapi.CommonAbstracts.TextSourcesList
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InputMedia.InputMediaVideo
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/Game.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/Game.kt
@@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.types.games

 import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.files.AnimationFile
 import dev.inmo.tgbotapi.types.files.Photo

@@ -11,4 +12,4 @@ data class Game(
    override val text: String? = null,
    override val textSources: TextSourcesList = emptyList(),
    val animation: AnimationFile? = null
-) : Titled, CaptionedInput, TextedInput
+) : Titled, TextedInput
--- 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
@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.message.content

-import dev.inmo.tgbotapi.CommonAbstracts.TextSourcesList
 import dev.inmo.tgbotapi.CommonAbstracts.TextedInput
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.SendTextMessage
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaGroupContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaGroupContent.kt
@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.CommonAbstracts.CaptionedInput
 import dev.inmo.tgbotapi.CommonAbstracts.TextedInput
 import dev.inmo.tgbotapi.types.InputMedia.*

-interface MediaGroupContent : MediaContent, CaptionedInput, TextedInput {
+interface MediaGroupContent : MediaContent, TextedInput {
    fun toMediaGroupMemberInputMedia(): MediaGroupMemberInputMedia
 }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AnimationContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AnimationContent.kt
@@ -5,6 +5,7 @@ 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.InputMedia.InputMediaAnimation
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.AnimationFile
@@ -17,7 +18,7 @@ data class AnimationContent(
    val includedDocument: DocumentFile?,
    override val text: String?,
    override val textSources: TextSourcesList = emptyList()
-) : MediaContent, CaptionedInput, TextedInput {
+) : MediaContent, TextedInput {
    override fun createResend(
        chatId: ChatIdentifier,
        disableNotification: Boolean,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AudioContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AudioContent.kt
@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.message.content.media

-import dev.inmo.tgbotapi.CommonAbstracts.TextSourcesList
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.media.SendAudio
 import dev.inmo.tgbotapi.types.ChatIdentifier
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/DocumentContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/DocumentContent.kt
@@ -1,12 +1,12 @@
 package dev.inmo.tgbotapi.types.message.content.media

-import dev.inmo.tgbotapi.CommonAbstracts.TextSourcesList
 import dev.inmo.tgbotapi.CommonAbstracts.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.InputMedia.InputMediaDocument
 import dev.inmo.tgbotapi.types.InputMedia.toInputMediaDocument
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.DocumentFile
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/PhotoContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/PhotoContent.kt
@@ -1,11 +1,11 @@
 package dev.inmo.tgbotapi.types.message.content.media

-import dev.inmo.tgbotapi.CommonAbstracts.TextSourcesList
 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.InputMedia.InputMediaPhoto
 import dev.inmo.tgbotapi.types.InputMedia.toInputMediaPhoto
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.*
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VideoContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VideoContent.kt
@@ -1,10 +1,10 @@
 package dev.inmo.tgbotapi.types.message.content.media

-import dev.inmo.tgbotapi.CommonAbstracts.TextSourcesList
 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.InputMedia.InputMediaVideo
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.VideoFile
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VoiceContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VoiceContent.kt
@@ -5,6 +5,7 @@ import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.media.SendVoice
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.InputMedia.InputMediaAudio
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.VoiceFile
@@ -15,7 +16,7 @@ data class VoiceContent(
    override val media: VoiceFile,
    override val text: String? = null,
    override val textSources: TextSourcesList = emptyList()
-) : MediaContent, CaptionedInput, TextedInput {
+) : MediaContent, TextedInput {
    override fun createResend(
        chatId: ChatIdentifier,
        disableNotification: Boolean,
--- a/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/BotActionTests.kt
+++ b/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/BotActionTests.kt
@@ -20,8 +20,6 @@ class BotActionTests {
                UploadPhotoAction -> example.botAction.actionName
                RecordVideoAction -> example.botAction.actionName
                UploadVideoAction -> example.botAction.actionName
-                RecordAudioAction -> example.botAction.actionName
-                UploadAudioAction -> example.botAction.actionName
                RecordVoiceAction -> example.botAction.actionName
                UploadVoiceAction -> example.botAction.actionName
                UploadDocumentAction -> example.botAction.actionName
@@ -51,8 +49,6 @@ class BotActionTests {
            UploadPhotoAction.example(),
            RecordVideoAction.example(),
            UploadVideoAction.example(),
-            RecordAudioAction.example(),
-            UploadAudioAction.example(),
            RecordVoiceAction.example(),
            UploadVoiceAction.example(),
            UploadDocumentAction.example(),