From 067e36adc6470b8ac9dcb39d4bfe23790e390ea4 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 29 Jun 2021 11:53:36 +0600 Subject: [PATCH] ChosenInlineResult now is sealed --- CHANGELOG.md | 1 + .../ChosenInlineResult/BaseChosenInlineResult.kt | 1 - .../ChosenInlineResult/ChosenInlineResult.kt | 10 ++++++++++ .../ChosenInlineResult/LocationChosenInlineResult.kt | 1 - .../InlineQueries/abstracts/ChosenInlineResult.kt | 10 +++------- 5 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/ChosenInlineResult.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index 56e18fb320..02b37a8993 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ * New interface `MyCommandsRequest` (also see `Bot API 5.3` below) * New extensions `TextSourcesList#make*String` for all parse modes * All `MessageContent` subclasses now serializable + * `ChosenInlineResult` was replaced and modified to be sealed * `Behaviour Builder`: * ❗️ All triggers (`on*` extensions) have been modified to work in parallel by some marker by default (new parameter `markerFactory`, in most cases will work async for different chats) diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/BaseChosenInlineResult.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/BaseChosenInlineResult.kt index cee9a023b6..2594985fb1 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/BaseChosenInlineResult.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/BaseChosenInlineResult.kt @@ -1,7 +1,6 @@ package dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult import dev.inmo.tgbotapi.types.* -import dev.inmo.tgbotapi.types.InlineQueries.abstracts.ChosenInlineResult data class BaseChosenInlineResult( override val resultId: InlineQueryIdentifier, diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/ChosenInlineResult.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/ChosenInlineResult.kt new file mode 100644 index 0000000000..fee3f1df51 --- /dev/null +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/ChosenInlineResult.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult + +import dev.inmo.tgbotapi.types.* + +sealed interface ChosenInlineResult { + val resultId: InlineQueryIdentifier //chosen temporary, can be changed + val user: User + val inlineMessageId: InlineMessageIdentifier? + val query: String +} diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/LocationChosenInlineResult.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/LocationChosenInlineResult.kt index 16324e7e85..3d1e201983 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/LocationChosenInlineResult.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/LocationChosenInlineResult.kt @@ -1,7 +1,6 @@ package dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult import dev.inmo.tgbotapi.types.* -import dev.inmo.tgbotapi.types.InlineQueries.abstracts.ChosenInlineResult import dev.inmo.tgbotapi.types.location.StaticLocation data class LocationChosenInlineResult( diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/ChosenInlineResult.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/ChosenInlineResult.kt index 1d98928768..999d0deba6 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/ChosenInlineResult.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/ChosenInlineResult.kt @@ -1,10 +1,6 @@ package dev.inmo.tgbotapi.types.InlineQueries.abstracts -import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.ChosenInlineResult -interface ChosenInlineResult { - val resultId: InlineQueryIdentifier //chosen temporary, can be changed - val user: User - val inlineMessageId: InlineMessageIdentifier? - val query: String -} \ No newline at end of file +@Deprecated("Replaced", ReplaceWith("ChosenInlineResult", "dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.ChosenInlineResult")) +typealias ChosenInlineResult = ChosenInlineResult