diff --git a/CHANGELOG.md b/CHANGELOG.md index eb90f1c7d6..adf3a1ebd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,37 @@ # TelegramBotAPI changelog +## 0.29.0 + +* **THIS VERSION CONTAINS BREAKING CHANGES** +* ***PROJECT PACKAGES WERE CHANGED*** + * Packages in the whole project were changed `com.github.insanusmokrassar.TelegramBotAPI` -> `dev.inmo.tgbotapi` + * Project group in repositories were changed: `com.github.insanusmokrassar` -> `dev.inmo` + * Migration ([Examples migration](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/pull/11)): + 1. Change implementation in your gradle files: + * `implementation "com.github.insanusmokrassar:TelegramBotAPI-core:*"` -> `implementation "dev.inmo:tgbotapi.core:*"` + * `implementation "com.github.insanusmokrassar:TelegramBotAPI-extensions-utils:*"` -> `implementation "dev.inmo:tgbotapi.extensions.utils:*"` + * `implementation "com.github.insanusmokrassar:TelegramBotAPI-extensions-api:*"` -> `implementation "dev.inmo:tgbotapi.extensions.api:*"` + * `implementation "com.github.insanusmokrassar:TelegramBotAPI:*"` -> `implementation "dev.inmo:tgbotapi:*"` + 2. Replace packages `com.github.insanusmokrassar.TelegramBotAPI` in the whole project by `dev.inmo.tgbotapi` + + +* `TelegramBotAPI-core`: + * Now in forward info you can get `ForwardFromSupergroupInfo` + * **BREAKING CHANGE** `SendVoice` factory function has changed its signature: now it have now `thumb` + (according to the [documentation](https://core.telegram.org/bots/api#sendvoice)) +* `TelegramBotAPI-extensions-api`: + * ALL REQUESTS EXECUTOR USAGES WERE REPLACED WITH `TelegramBot` TYPEALIAS. It should not bring any break changes + * Internal changes of `sendRegularPoll` and `sendQuizPoll` extensions + * Variable `defaultLivePeriodDelayMillis` now is public + * All `send` extensions for `TelegramBot` got their `reply` variations (issue [#144](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/144)) + * A lot of `send` extensions for `TelegramBot` got their variation with `Chat` instead of `ChatIdentifier` + ## 0.28.0 -**THIS VERSION CONTAINS BREAKING CHANGES** - -***PROJECT PACKAGES WERE CHANGED*** - -* Project `TelegramBotAPI` -> `TelegramBotAPI-core` -* Project `TelegramBotAPI-all` -> `TelegramBotAPI` +* **THIS VERSION CONTAINS BREAKING CHANGES** +* ***PROJECT PACKAGES WERE CHANGED*** + * Project `TelegramBotAPI` -> `TelegramBotAPI-core` + * Project `TelegramBotAPI-all` -> `TelegramBotAPI` * `Common`: * Version updates: diff --git a/README.md b/README.md index ad5356f899..e7c09fe64d 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ | Common info | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI.svg?branch=master)](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI) [Small survey](https://forms.gle/2Hex2ynbHWHhi1KY7)| | -------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | Useful links | [![Chat in Telegram](badges/chat.svg)](https://t.me/InMoTelegramBotAPI) [![KDocs](badges/kdocs.svg)](https://tgbotapi.inmo.dev/docs/index.html) [Examples](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/), [Mini tutorial](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) | -| TelegramBotAPI Core status | [![Download](https://api.bintray.com/packages/insanusmokrassar/StandardRepository/TelegramBotAPI-core/images/download.svg)](https://bintray.com/insanusmokrassar/StandardRepository/TelegramBotAPI-core/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI) | -| TelegramBotAPI Extensions status | [![Download](https://api.bintray.com/packages/insanusmokrassar/StandardRepository/TelegramBotAPI-extensions-api/images/download.svg)](https://bintray.com/insanusmokrassar/StandardRepository/TelegramBotAPI-extensions-api/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI-extensions-api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI-extensions-api) | -| TelegramBotAPI Util Extensions status | [![Download](https://api.bintray.com/packages/insanusmokrassar/StandardRepository/TelegramBotAPI-extensions-utils/images/download.svg)](https://bintray.com/insanusmokrassar/StandardRepository/TelegramBotAPI-extensions-utils/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI-extensions-utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI-extensions-utils) | -| TelegramBotAPI All status | [![Download](https://api.bintray.com/packages/insanusmokrassar/StandardRepository/TelegramBotAPI/images/download.svg)](https://bintray.com/insanusmokrassar/StandardRepository/TelegramBotAPI/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI-all) | +| TelegramBotAPI Core status | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.core/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.core/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core) | +| TelegramBotAPI Extensions status | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api) | +| TelegramBotAPI Util Extensions status | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils) | +| TelegramBotAPI All status | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) | **At the time of publication of version `0.28.0` there are errors in serialization plugins like [kotlinx.serialization#1004](https://github.com/Kotlin/kotlinx.serialization/issues/1004). It is possible, that both JVM @@ -16,13 +16,13 @@ and JS version may work improperly in some cases with `kotlinx.serialization` ve It is a complex of libraries for working with `TelegramBotAPI` in type-safe and strict way as much as it possible. In the list of this complex currently next projects: -* [TelegramBotAPI-core](TelegramBotAPI-core/README.md) - core of library. In fact it is independent library and can be used alone +* [TelegramBotAPI Core](tgbotapi.core/README.md) - core of library. In fact it is independent library and can be used alone without any additional library -* [TelegramBotAPI Extensions](TelegramBotAPI-extensions-api/README.md) - contains extensions (mostly for +* [TelegramBotAPI API Extensions](tgbotapi.extensions.api/README.md) - contains extensions (mostly for `RequestsExecutor`), which allows to use the core library in more pleasant way -* [TelegramBotAPI Util Extensions](TelegramBotAPI-extensions-utils/README.md) - contains extensions for more comfortable +* [TelegramBotAPI Util Extensions](tgbotapi.extensions.utils/README.md) - contains extensions for more comfortable work with commands, updates and other different things -* [TelegramBotAPI](TelegramBotAPI/README.md) - concentration of all previously mentioned libraries +* [TelegramBotAPI](tgbotapi/README.md) - concentration of all previously mentioned libraries Most part of some specific solves or unuseful moments are describing by official [Telegram Bot API](https://core.telegram.org/bots/api). @@ -76,19 +76,19 @@ kotlin { In most cases, the most simple way will be to implement [TelegramBotAPI](TelegramBotAPI/README.md) - it contains all necessary tools for comfort usage of this library. If you want to exclude some libraries, you can implement just -[TelegramBotAPI API Extensions](TelegramBotAPI-extensions-api/README.md), -[TelegramBotAPI Util Extensions](TelegramBotAPI-extensions-utils/README.md) or even -[TelegramBotAPI-core](TelegramBotAPI-core/README.md). +[TelegramBotAPI API Extensions](tgbotapi.extensions.api/README.md), +[TelegramBotAPI Util Extensions](tgbotapi.extensions.utils/README.md) or even +[TelegramBotAPI Core](tgbotapi.core/README.md). If you want to dive deeper in the core of library or develop something for it - welcome to learn more from -[TelegramBotAPI-core](TelegramBotAPI-core/README.md) and our [Telegram Chat](https://teleg.one/InMoTelegramBotAPIChat). +[TelegramBotAPI Core](tgbotapi.core/README.md) and our [Telegram Chat](https://teleg.one/InMoTelegramBotAPIChat). Anyway, all libraries are very typical inside of them. Examples: * In `TelegramBotAPI` common request look like `requestsExecutor.execute(SomeRequest())` -* `TelegramBotAPI-extensions-api` typical syntax look like `requestsExecutor.someRequest()` (in most cases it would be +* `tgbotapi.extensions.api` typical syntax look like `requestsExecutor.someRequest()` (in most cases it would be better to use `bot` name instead of `requestsExecutor`) -* `TelegramBotAPI-extensions-utils` will look like `filter.filterBaseMessageUpdates(chatId).filterExactCommands(Regex("^.*$"))...` +* `tgbotapi.extensions.utils` will look like `filter.filterBaseMessageUpdates(chatId).filterExactCommands(Regex("^.*$"))...` ## Build instruction diff --git a/TelegramBotAPI-core/mpp_publish_template.kpsb b/TelegramBotAPI-core/mpp_publish_template.kpsb deleted file mode 100644 index f94c1f0d0f..0000000000 --- a/TelegramBotAPI-core/mpp_publish_template.kpsb +++ /dev/null @@ -1 +0,0 @@ -{"bintrayConfig":{"repo":"StandardRepository","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Core","description":"Library for Object-Oriented and type-safe work with Telegram Bot API","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Captioned.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Captioned.kt deleted file mode 100644 index bca0bb2f49..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Captioned.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.utils.fullListOfSubSource - -interface Captioned { - val caption: String? -} - -interface CaptionedOutput : Captioned { - val parseMode: ParseMode? -} - -interface CaptionedInput : Captioned { - /** - * Not full list of entities. This list WILL NOT contain [TextPart]s with [com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource] - * @see [CaptionedInput.fullEntitiesList] - */ - val captionEntities: List -} - -/** - * Convert its [CaptionedInput.captionEntities] to list of [com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource] - * with [com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource] - */ -fun CaptionedInput.fullEntitiesList(): FullTextSourcesList = caption ?.fullListOfSubSource(captionEntities) ?.map { it.source } ?: emptyList() diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/MimeTyped.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/MimeTyped.kt deleted file mode 100644 index 0ff4cac7af..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/MimeTyped.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts - -import com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType - -interface MimeTyped { - val mimeType: MimeType? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Performerable.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Performerable.kt deleted file mode 100644 index f001348d98..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Performerable.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts - -interface Performerable { - val performer: String? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Titled.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Titled.kt deleted file mode 100644 index e7532355a4..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Titled.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts - -interface Titled { - val title: String? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ChatRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ChatRequest.kt deleted file mode 100644 index 8add2db69b..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ChatRequest.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types - -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier - -interface ChatRequest { - val chatId: ChatIdentifier -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/DisableNotification.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/DisableNotification.kt deleted file mode 100644 index a07ec1055a..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/DisableNotification.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types - -interface DisableNotification { - val disableNotification: Boolean -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/InlineMessageAction.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/InlineMessageAction.kt deleted file mode 100644 index fa0a1ad1ae..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/InlineMessageAction.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier - -interface InlineMessageAction { - val inlineMessageId: InlineMessageIdentifier -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/MessageAction.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/MessageAction.kt deleted file mode 100644 index 51323f9b59..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/MessageAction.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types - -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier - -interface MessageAction: ChatRequest { - val messageId: MessageIdentifier -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ReplyMarkup.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ReplyMarkup.kt deleted file mode 100644 index 9536f7c2a9..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ReplyMarkup.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types - -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup - -interface ReplyMarkup { - val replyMarkup: KeyboardMarkup? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ReplyMessageId.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ReplyMessageId.kt deleted file mode 100644 index 785c5b6392..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ReplyMessageId.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types - -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier - -interface ReplyMessageId { - val replyToMessageId: MessageIdentifier? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/UntilDate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/UntilDate.kt deleted file mode 100644 index 7be9229808..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/UntilDate.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types - -import com.github.insanusmokrassar.TelegramBotAPI.types.TelegramDate - -interface UntilDate { - val untilDate: TelegramDate? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/BaseRequestsExecutor.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/BaseRequestsExecutor.kt deleted file mode 100644 index a971a939ae..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/BaseRequestsExecutor.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot - -import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper - -abstract class BaseRequestsExecutor( - protected val telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper -) : RequestsExecutor diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/RequestsExecutor.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/RequestsExecutor.kt deleted file mode 100644 index 2eba982739..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/RequestsExecutor.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import io.ktor.utils.io.core.Closeable - -/** - * Interface for making requests to Telegram Bot API. Currently, there is only one built-in implementation - - * [com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorRequestsExecutor] - * - * @see Request - * @see com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorRequestsExecutor - */ -interface RequestsExecutor : Closeable { - /** - * Unsafe execution of incoming [request]. Can throw almost any exception. So, it is better to use - * something like [com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.shortcuts.executeAsync] or - * [com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.shortcuts.executeUnsafe] - * - * @throws Exception - */ - suspend fun execute(request: Request): T -} - -typealias TelegramBot = RequestsExecutor diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/abstracts/ChatMemberRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/abstracts/ChatMemberRequest.kt deleted file mode 100644 index 951323ec38..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/abstracts/ChatMemberRequest.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.UserId - -interface ChatMemberRequest : ChatRequest, SimpleRequest { - val userId: UserId -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChat.kt deleted file mode 100644 index fb0decdbad..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChat.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ExtendedChatSerializer -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat -import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField -import kotlinx.serialization.* - -@Serializable -data class GetChat( - @SerialName(chatIdField) - override val chatId: ChatIdentifier -): ChatRequest, SimpleRequest { - override fun method(): String = "getChat" - override val resultDeserializer: DeserializationStrategy - get() = ExtendedChatSerializer - override val requestSerializer: SerializationStrategy<*> - get() = serializer() -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditChatMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditChatMessage.kt deleted file mode 100644 index 8736c10eaa..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditChatMessage.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent - -interface EditChatMessage : SimpleRequest>, MessageAction diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditMediaMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditMediaMessage.kt deleted file mode 100644 index 8f1cb3be3c..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditMediaMessage.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia - -interface EditMediaMessage { - val media: InputMedia -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditReplyMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditReplyMessage.kt deleted file mode 100644 index 9cfe3b6718..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditReplyMessage.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup - -interface EditReplyMessage : ReplyMarkup { - override val replyMarkup: InlineKeyboardMarkup? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditTextChatMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditTextChatMessage.kt deleted file mode 100644 index 028f5694a6..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditTextChatMessage.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode - -interface EditTextChatMessage { - val text: String - val parseMode: ParseMode? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/ReplyingMarkupSendMessageRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/ReplyingMarkupSendMessageRequest.kt deleted file mode 100644 index 85a7d41746..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/ReplyingMarkupSendMessageRequest.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMarkup - -interface ReplyingMarkupSendMessageRequest: SendMessageRequest, ReplyMarkup \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/SendChatMessageRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/SendChatMessageRequest.kt deleted file mode 100644 index 303ffc446c..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/SendChatMessageRequest.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest - -interface SendChatMessageRequest : SimpleRequest, ChatRequest \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/SendMessageRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/SendMessageRequest.kt deleted file mode 100644 index 7ace010c70..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/SendMessageRequest.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.DisableNotification -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMessageId - -interface SendMessageRequest : SendChatMessageRequest, ReplyMessageId, DisableNotification diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/TextableSendMessageRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/TextableSendMessageRequest.kt deleted file mode 100644 index a34f8df3d8..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/TextableSendMessageRequest.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode - -interface TextableSendMessageRequest: SendMessageRequest { - val text: String? - val parseMode: ParseMode? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/DataRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/DataRequest.kt deleted file mode 100644 index 342d7addb8..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/DataRequest.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest - -interface DataRequest : SimpleRequest diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/Files.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/Files.kt deleted file mode 100644 index e94cf03d33..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/Files.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile - -typealias Files = Map diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/abstracts/StandardStickerSetAction.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/abstracts/StandardStickerSetAction.kt deleted file mode 100644 index a4720e4a6c..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/abstracts/StandardStickerSetAction.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition - -interface StandardStickerSetAction : StickerSetAction { - val emojis: String // must be more than one - val maskPosition: MaskPosition? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/DataCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/DataCallbackQuery.kt deleted file mode 100644 index 8f85fb2ff9..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/DataCallbackQuery.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery - -interface DataCallbackQuery : CallbackQuery { - val data: String -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/InlineMessageIdCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/InlineMessageIdCallbackQuery.kt deleted file mode 100644 index b2d7acf5b2..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/InlineMessageIdCallbackQuery.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier - -interface InlineMessageIdCallbackQuery : CallbackQuery { - val inlineMessageId: InlineMessageIdentifier -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/MessageCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/MessageCallbackQuery.kt deleted file mode 100644 index c5e7dba7a2..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/MessageCallbackQuery.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message - -interface MessageCallbackQuery : CallbackQuery { - val message: Message -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/MessageDataCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/MessageDataCallbackQuery.kt deleted file mode 100644 index 40130dc649..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/MessageDataCallbackQuery.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery - -import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQueryIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.User -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message - -data class MessageDataCallbackQuery( - override val id: CallbackQueryIdentifier, - override val user: User, - override val chatInstance: String, - override val message: Message, - override val data: String -) : DataCallbackQuery, MessageCallbackQuery diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/MessageGameShortNameCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/MessageGameShortNameCallbackQuery.kt deleted file mode 100644 index dd304d7ef9..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/MessageGameShortNameCallbackQuery.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery - -import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQueryIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.User -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message - -data class MessageGameShortNameCallbackQuery( - override val id: CallbackQueryIdentifier, - override val user: User, - override val chatInstance: String, - override val message: Message, - override val gameShortName: String -) : GameShortNameCallbackQuery, MessageCallbackQuery diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/KickedChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/KickedChatMember.kt deleted file mode 100644 index ad94b7ba24..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/KickedChatMember.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember - -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.BannedChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.TelegramDate -import com.github.insanusmokrassar.TelegramBotAPI.types.User - -data class KickedChatMember( - override val user: User, - override val untilDate: TelegramDate? -) : BannedChatMember \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/LeftChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/LeftChatMember.kt deleted file mode 100644 index aa90a9627b..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/LeftChatMember.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember - -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.User - -data class LeftChatMember(override val user: User) : - ChatMember diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/MemberChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/MemberChatMember.kt deleted file mode 100644 index 7230eef218..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/MemberChatMember.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember - -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.User - -data class MemberChatMember(override val user: User) : - ChatMember diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/BannedChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/BannedChatMember.kt deleted file mode 100644 index 7cb1a3f79d..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/BannedChatMember.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.UntilDate - -interface BannedChatMember : ChatMember, UntilDate \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/ChosenInlineResult/BaseChosenInlineResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/ChosenInlineResult/BaseChosenInlineResult.kt deleted file mode 100644 index df975d8d30..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/ChosenInlineResult/BaseChosenInlineResult.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.ChosenInlineResult - -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.ChosenInlineResult - -data class BaseChosenInlineResult( - override val resultId: InlineQueryIdentifier, - override val user: User, - override val inlineMessageId: InlineMessageIdentifier?, - override val query: String -) : ChosenInlineResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioCachedImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioCachedImpl.kt deleted file mode 100644 index e1d6899200..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioCachedImpl.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.audio.InlineQueryResultAudioCached -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.audio.inlineQueryResultAudioType -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class InlineQueryResultAudioCachedImpl( - @SerialName(idField) - override val id: InlineQueryIdentifier, - @SerialName(audioFileIdField) - override val fileId: FileId, - @SerialName(captionField) - override val caption: String? = null, - @SerialName(parseModeField) - override val parseMode: ParseMode? = null, - @SerialName(replyMarkupField) - override val replyMarkup: InlineKeyboardMarkup? = null, - @SerialName(inputMessageContentField) - override val inputMessageContent: InputMessageContent? = null -) : InlineQueryResultAudioCached { - override val type: String = inlineQueryResultAudioType -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultGame.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultGame.kt deleted file mode 100644 index eb2b4265fe..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultGame.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueryIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.gameShortNameField -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -class InlineQueryResultGame( - override val id: InlineQueryIdentifier, - @SerialName(gameShortNameField) - val gameShortName: String, - override val replyMarkup: InlineKeyboardMarkup? = null -) : InlineQueryResult { - override val type: String = "game" -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultGifCachedImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultGifCachedImpl.kt deleted file mode 100644 index c6227515e3..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultGifCachedImpl.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.gif.InlineQueryResultGifCached -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.gif.inlineQueryResultGifType -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class InlineQueryResultGifCachedImpl( - @SerialName(idField) - override val id: InlineQueryIdentifier, - @SerialName(gifFileIdField) - override val fileId: FileId, - @SerialName(titleField) - override val title: String? = null, - @SerialName(captionField) - override val caption: String? = null, - @SerialName(parseModeField) - override val parseMode: ParseMode? = null, - @SerialName(replyMarkupField) - override val replyMarkup: InlineKeyboardMarkup? = null, - @SerialName(inputMessageContentField) - override val inputMessageContent: InputMessageContent? = null -) : InlineQueryResultGifCached { - override val type: String = inlineQueryResultGifType -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifCachedImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifCachedImpl.kt deleted file mode 100644 index 2b23a7c1ba..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifCachedImpl.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.InlineQueryResultMpeg4GifCached -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.inlineQueryResultMpeg4GifType -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class InlineQueryResultMpeg4GifCachedImpl( - @SerialName(idField) - override val id: InlineQueryIdentifier, - @SerialName(mpeg4GifFileIdField) - override val fileId: FileId, - @SerialName(titleField) - override val title: String? = null, - @SerialName(captionField) - override val caption: String? = null, - @SerialName(parseModeField) - override val parseMode: ParseMode? = null, - @SerialName(replyMarkupField) - override val replyMarkup: InlineKeyboardMarkup? = null, - @SerialName(inputMessageContentField) - override val inputMessageContent: InputMessageContent? = null -) : InlineQueryResultMpeg4GifCached { - override val type: String = inlineQueryResultMpeg4GifType -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceCachedImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceCachedImpl.kt deleted file mode 100644 index 7c6c414ca8..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceCachedImpl.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.voice.InlineQueryResultVoiceCached -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.voice.inlineQueryResultVoiceType -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class InlineQueryResultVoiceCachedImpl( - @SerialName(idField) - override val id: InlineQueryIdentifier, - @SerialName(voiceFileIdField) - override val fileId: FileId, - @SerialName(titleField) - override val title: String, - @SerialName(captionField) - override val caption: String? = null, - @SerialName(parseModeField) - override val parseMode: ParseMode? = null, - @SerialName(replyMarkupField) - override val replyMarkup: InlineKeyboardMarkup? = null, - @SerialName(inputMessageContentField) - override val inputMessageContent: InputMessageContent? = null -) : InlineQueryResultVoiceCached { - override val type: String = inlineQueryResultVoiceType -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/DescribedInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/DescribedInlineQueryResult.kt deleted file mode 100644 index 4e24811179..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/DescribedInlineQueryResult.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts - -interface DescribedInlineQueryResult : InlineQueryResult { - val description: String? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/DuratedInlineResultQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/DuratedInlineResultQuery.kt deleted file mode 100644 index a86254f568..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/DuratedInlineResultQuery.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts - -interface DuratedInlineResultQuery { - val duration: Int? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/FileInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/FileInlineQueryResult.kt deleted file mode 100644 index ee381456d6..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/FileInlineQueryResult.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId - -interface FileInlineQueryResult: InlineQueryResult { - val fileId: FileId -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/InlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/InlineQueryResult.kt deleted file mode 100644 index 1e3406e967..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/InlineQueryResult.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.serializers.InlineQueryResultSerializer -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueryIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import kotlinx.serialization.Serializable - -@Serializable(InlineQueryResultSerializer::class) -interface InlineQueryResult { - val type: String - val id: InlineQueryIdentifier - val replyMarkup: InlineKeyboardMarkup? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/OptionallyTitledInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/OptionallyTitledInlineQueryResult.kt deleted file mode 100644 index 7669699c45..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/OptionallyTitledInlineQueryResult.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Titled - -interface OptionallyTitledInlineQueryResult : InlineQueryResult, Titled diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/UrlInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/UrlInlineQueryResult.kt deleted file mode 100644 index 7ce2183d48..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/UrlInlineQueryResult.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts - -interface UrlInlineQueryResult : InlineQueryResult { - val url: String? -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/WithFileIdInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/WithFileIdInlineQueryResult.kt deleted file mode 100644 index b2b1cac02d..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/WithFileIdInlineQueryResult.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId - -interface WithFileIdInlineQueryResult { - val fileId: FileId -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/WithInputMessageContentInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/WithInputMessageContentInlineQueryResult.kt deleted file mode 100644 index ef24fc0b13..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/WithInputMessageContentInlineQueryResult.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent - -interface WithInputMessageContentInlineQueryResult : InlineQueryResult { - val inputMessageContent: InputMessageContent? -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudio.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudio.kt deleted file mode 100644 index 636110e70c..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudio.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.audio - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Performerable -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* - -interface InlineQueryResultAudio : InlineQueryResultAudioCommon, UrlInlineQueryResult, DuratedInlineResultQuery, Performerable, TitledInlineQueryResult \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCached.kt deleted file mode 100644 index d9865cec6c..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCached.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.audio - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult - -interface InlineQueryResultAudioCached : InlineQueryResultAudioCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCommon.kt deleted file mode 100644 index c5d27e259e..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCommon.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.audio - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedOutput -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.WithInputMessageContentInlineQueryResult - -const val inlineQueryResultAudioType = "audio" - -interface InlineQueryResultAudioCommon : InlineQueryResult, - CaptionedOutput, - WithInputMessageContentInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocument.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocument.kt deleted file mode 100644 index 95280e3ff5..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocument.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.document - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MimeTyped -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* - -interface InlineQueryResultDocument : InlineQueryResultDocumentCommon, UrlInlineQueryResult, ThumbedInlineQueryResult, ThumbSizedInlineQueryResult, MimeTyped \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCached.kt deleted file mode 100644 index d22ff9126e..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCached.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.document - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult - -interface InlineQueryResultDocumentCached : InlineQueryResultDocumentCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCommon.kt deleted file mode 100644 index e4a5f7f81b..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCommon.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.document - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedOutput -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* - -const val inlineQueryResultDocumentType = "document" - -interface InlineQueryResultDocumentCommon : InlineQueryResult, - TitledInlineQueryResult, - DescribedInlineQueryResult, - CaptionedOutput, - WithInputMessageContentInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGif.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGif.kt deleted file mode 100644 index ed547b05b7..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGif.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.gif - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* - -interface InlineQueryResultGif : InlineQueryResultGifCommon, UrlInlineQueryResult, ThumbedWithMimeTypeInlineQueryResult, SizedInlineQueryResult, DuratedInlineResultQuery \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCached.kt deleted file mode 100644 index da2d5c7027..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCached.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.gif - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult - -interface InlineQueryResultGifCached : InlineQueryResultGifCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCommon.kt deleted file mode 100644 index 6dc1a7abb8..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCommon.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.gif - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedOutput -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* - -const val inlineQueryResultGifType = "gif" - -interface InlineQueryResultGifCommon : InlineQueryResult, - OptionallyTitledInlineQueryResult, - CaptionedOutput, - WithInputMessageContentInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4Gif.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4Gif.kt deleted file mode 100644 index e5d1f07287..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4Gif.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* - -interface InlineQueryResultMpeg4Gif : InlineQueryResultMpeg4GifCommon, UrlInlineQueryResult, ThumbedWithMimeTypeInlineQueryResult, SizedInlineQueryResult, DuratedInlineResultQuery \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCached.kt deleted file mode 100644 index d11f688e75..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCached.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult - -interface InlineQueryResultMpeg4GifCached : InlineQueryResultMpeg4GifCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCommon.kt deleted file mode 100644 index e1eda2c3a5..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCommon.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedOutput -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* - -const val inlineQueryResultMpeg4GifType = "mpeg4_gif" - -interface InlineQueryResultMpeg4GifCommon : InlineQueryResult, - OptionallyTitledInlineQueryResult, - CaptionedOutput, - WithInputMessageContentInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhoto.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhoto.kt deleted file mode 100644 index d6469e4a20..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhoto.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.photo - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* - -interface InlineQueryResultPhoto : InlineQueryResultPhotoCommon, UrlInlineQueryResult, ThumbedInlineQueryResult, SizedInlineQueryResult \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCached.kt deleted file mode 100644 index 07a2a3dc49..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCached.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.photo - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult - -interface InlineQueryResultPhotoCached : InlineQueryResultPhotoCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCommon.kt deleted file mode 100644 index dc3eb814c6..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCommon.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.photo - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedOutput -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* - -const val inlineQueryResultPhotoType = "photo" - -interface InlineQueryResultPhotoCommon : InlineQueryResult, - OptionallyTitledInlineQueryResult, - DescribedInlineQueryResult, - CaptionedOutput, - WithInputMessageContentInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideo.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideo.kt deleted file mode 100644 index 81dfcfa602..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideo.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.video - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MimeTyped -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* - -interface InlineQueryResultVideo : InlineQueryResultVideoCommon, UrlInlineQueryResult, ThumbedInlineQueryResult, MimeTyped, SizedInlineQueryResult, DuratedInlineResultQuery \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCached.kt deleted file mode 100644 index 35812b63a0..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCached.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.video - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult - -interface InlineQueryResultVideoCached : InlineQueryResultVideoCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCommon.kt deleted file mode 100644 index e553cdae76..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCommon.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.video - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedOutput -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* - -const val inlineQueryResultVideoType = "video" - -interface InlineQueryResultVideoCommon : InlineQueryResult, - TitledInlineQueryResult, - DescribedInlineQueryResult, - CaptionedOutput, - WithInputMessageContentInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoice.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoice.kt deleted file mode 100644 index 9d1326dc4c..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoice.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.voice - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.DuratedInlineResultQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.UrlInlineQueryResult - -interface InlineQueryResultVoice : InlineQueryResultVoiceCommon, UrlInlineQueryResult, DuratedInlineResultQuery \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCached.kt deleted file mode 100644 index a64b3bac2e..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCached.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.voice - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult - -interface InlineQueryResultVoiceCached : InlineQueryResultVoiceCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCommon.kt deleted file mode 100644 index a7fddfe1a8..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCommon.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.voice - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedOutput -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* - -const val inlineQueryResultVoiceType = "voice" - -interface InlineQueryResultVoiceCommon : InlineQueryResult, - CaptionedOutput, - WithInputMessageContentInlineQueryResult, - TitledInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContent/InputLocationMessageContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContent/InputLocationMessageContent.kt deleted file mode 100644 index c2b6f0110d..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContent/InputLocationMessageContent.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InputMessageContent - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Livable -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Locationed -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class InputLocationMessageContent( - @SerialName(latitudeField) - override val latitude: Double, - @SerialName(longitudeField) - override val longitude: Double, - @SerialName(livePeriodField) - override val livePeriod: Int? = null -) : Locationed, Livable, InputMessageContent \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContent/InputTextMessageContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContent/InputTextMessageContent.kt deleted file mode 100644 index 1e5b51f5aa..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContent/InputTextMessageContent.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InputMessageContent - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedOutput -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.DisableWebPagePreview -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.disableWebPagePreviewField -import com.github.insanusmokrassar.TelegramBotAPI.types.messageTextField -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class InputTextMessageContent( - @SerialName(messageTextField) - override val caption: String, - @SerialName(parseModeField) - override val parseMode: ParseMode? = null, - @SerialName(disableWebPagePreviewField) - override val disableWebPagePreview: Boolean? = null -) : CaptionedOutput, DisableWebPagePreview, InputMessageContent \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/abstracts/InlineQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/abstracts/InlineQuery.kt deleted file mode 100644 index 9f1e4d978c..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/abstracts/InlineQuery.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueryIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.User - -interface InlineQuery { - val id: InlineQueryIdentifier - val from: User - val query: String - val offset: String -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/abstracts/InputMessageContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/abstracts/InputMessageContent.kt deleted file mode 100644 index 4b7ad7902a..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/abstracts/InputMessageContent.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InputMessageContentSerializer -import kotlinx.serialization.Serializable - -@Serializable(InputMessageContentSerializer::class) -interface InputMessageContent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/query/BaseInlineQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/query/BaseInlineQuery.kt deleted file mode 100644 index 6c7ba5b77d..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/query/BaseInlineQuery.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.query - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InlineQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueryIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.User - -data class BaseInlineQuery( - override val id: InlineQueryIdentifier, - override val from: User, - override val query: String, - override val offset: String -) : InlineQuery diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/query/LocationInlineQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/query/LocationInlineQuery.kt deleted file mode 100644 index 4d1c6a27be..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/query/LocationInlineQuery.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.query - -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InlineQuery - -data class LocationInlineQuery( - override val id: InlineQueryIdentifier, - override val from: User, - override val query: String, - override val offset: String, - val location: Location -) : InlineQuery diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/DuratedInputMedia.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/DuratedInputMedia.kt deleted file mode 100644 index 0162eecf42..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/DuratedInputMedia.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia - -interface DuratedInputMedia : InputMedia { - val duration: Long? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/Common.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/Common.kt deleted file mode 100644 index f01fc81609..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/Common.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.buttons - -typealias Matrix = List> diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/ChannelChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/ChannelChat.kt deleted file mode 100644 index 43c612ac1e..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/ChannelChat.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts - -interface ChannelChat : SuperPublicChat diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/Chat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/Chat.kt deleted file mode 100644 index 7e1c0c31d7..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/Chat.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatId -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.PreviewChatSerializer -import kotlinx.serialization.Serializable - -@Serializable(PreviewChatSerializer::class) -interface Chat { - val id: ChatId -} - -data class UnknownChatType( - override val id: ChatId, - val raw: String -) : Chat diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/GroupChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/GroupChat.kt deleted file mode 100644 index 06efb55190..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/GroupChat.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts - -interface GroupChat : PublicChat diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/PublicChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/PublicChat.kt deleted file mode 100644 index d72876149b..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/PublicChat.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts - -interface PublicChat : Chat { - val title: String -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/SuperPublicChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/SuperPublicChat.kt deleted file mode 100644 index 236af28116..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/SuperPublicChat.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts - -interface SuperPublicChat : PublicChat, UsernameChat diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/SupergroupChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/SupergroupChat.kt deleted file mode 100644 index 52c0ea464e..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/SupergroupChat.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts - -interface SupergroupChat : GroupChat, SuperPublicChat diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/UsernameChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/UsernameChat.kt deleted file mode 100644 index 724f4704e7..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/UsernameChat.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.Username - -interface UsernameChat : Chat { - val username: Username? -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedChannelChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedChannelChat.kt deleted file mode 100644 index 5601782e7c..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedChannelChat.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended - -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.ChannelChat - -interface ExtendedChannelChat : ChannelChat, ExtendedPublicChat diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedChat.kt deleted file mode 100644 index c67932e602..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedChat.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended - -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatPhoto -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ExtendedChatSerializer -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import kotlinx.serialization.Serializable - -@Serializable(ExtendedChatSerializer::class) -interface ExtendedChat : Chat { - val chatPhoto: ChatPhoto? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedGroupChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedGroupChat.kt deleted file mode 100644 index 283b89d96b..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedGroupChat.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended - -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ChatPermissions -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.GroupChat - -interface ExtendedGroupChat : GroupChat, ExtendedPublicChat { - val permissions: ChatPermissions -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedPrivateChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedPrivateChat.kt deleted file mode 100644 index 67e00a46d7..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedPrivateChat.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended - -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PrivateChat - -interface ExtendedPrivateChat : PrivateChat, ExtendedChat diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedPublicChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedPublicChat.kt deleted file mode 100644 index 2e7bcefc0d..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedPublicChat.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended - -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer -import kotlinx.serialization.Serializable - -interface ExtendedPublicChat : ExtendedChat, PublicChat { - val description: String - val inviteLink: String? - @Serializable(TelegramBotAPIMessageDeserializeOnlySerializer::class) - val pinnedMessage: Message? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedSupergroupChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedSupergroupChat.kt deleted file mode 100644 index 4979a0bd5c..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/extended/ExtendedSupergroupChat.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended - -import com.github.insanusmokrassar.TelegramBotAPI.types.StickerSetName -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.SupergroupChat - -interface ExtendedSupergroupChat : SupergroupChat, ExtendedGroupChat { - val slowModeDelay: Long? - val stickerSetName: StickerSetName? - val canSetStickerSet: Boolean -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/File.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/File.kt deleted file mode 100644 index 812daa78b7..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/File.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.types.FileUniqueId -import com.github.insanusmokrassar.TelegramBotAPI.types.fileUniqueIdField -import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.* -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class File( - @SerialName(fileIdField) - override val fileId: FileId, - @SerialName(fileUniqueIdField) - override val fileUniqueId: FileUniqueId, - @SerialName(fileSizeField) - override val fileSize: Long? = null -): TelegramMediaFile diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/MimedMediaFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/MimedMediaFile.kt deleted file mode 100644 index 0bc4b4e350..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/MimedMediaFile.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MimeTyped - -internal const val mimeTypeField = "mime_type" - -interface MimedMediaFile : TelegramMediaFile, MimeTyped \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/ThumbedMediaFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/ThumbedMediaFile.kt deleted file mode 100644 index 4c185377a7..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/ThumbedMediaFile.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.files.PhotoSize - -interface ThumbedMediaFile : TelegramMediaFile { - val thumb: PhotoSize? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/TitledMediaFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/TitledMediaFile.kt deleted file mode 100644 index 2f63e0d6af..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/TitledMediaFile.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts - -interface TitledMediaFile { - val title: String? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelEventMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelEventMessage.kt deleted file mode 100644 index a9598b5f48..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelEventMessage.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message - -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.ChannelChat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.ChannelEvent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ChatEventMessage -import com.soywiz.klock.DateTime - -data class ChannelEventMessage( - override val messageId: MessageIdentifier, - override val chat: ChannelChat, - override val chatEvent: ChannelEvent, - override val date: DateTime -) : ChatEventMessage diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMediaGroupMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMediaGroupMessage.kt deleted file mode 100644 index dffb332367..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMediaGroupMessage.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message - -import com.github.insanusmokrassar.TelegramBotAPI.types.MediaGroupIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent -import com.soywiz.klock.DateTime - -data class ChannelMediaGroupMessage( - override val messageId: MessageIdentifier, - override val chat: Chat, - override val date: DateTime, - override val mediaGroupId: MediaGroupIdentifier, - override val content: MediaGroupContent, - override val editDate: DateTime?, - override val forwardInfo: ForwardInfo?, - override val replyTo: Message?, - override val replyMarkup: InlineKeyboardMarkup? -) : MediaGroupMessage diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMessage.kt deleted file mode 100644 index 3d1ecb22f1..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMessage.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message - -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.PossiblySentViaBotCommonMessage -import com.soywiz.klock.DateTime - -data class ChannelMessage( - override val messageId: MessageIdentifier, - override val chat: Chat, - override val content: T, - override val date: DateTime, - override val editDate: DateTime?, - override val forwardInfo: ForwardInfo?, - override val replyTo: Message?, - override val replyMarkup: InlineKeyboardMarkup?, - override val senderBot: CommonBot?, - val authorSignature: AuthorSignature? -) : PossiblySentViaBotCommonMessage diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/ChannelChatCreated.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/ChannelChatCreated.kt deleted file mode 100644 index bd07b39c8b..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/ChannelChatCreated.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.ChannelEvent - -class ChannelChatCreated: ChannelEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/DeleteChatPhoto.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/DeleteChatPhoto.kt deleted file mode 100644 index c94bf5d8a9..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/DeleteChatPhoto.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.CommonEvent - -class DeleteChatPhoto: CommonEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/GroupChatCreated.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/GroupChatCreated.kt deleted file mode 100644 index bedeca44fe..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/GroupChatCreated.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents - -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.GroupEvent - -class GroupChatCreated( - val migratedTo: ChatIdentifier? -): GroupEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/LeftChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/LeftChatMember.kt deleted file mode 100644 index 79c75254ab..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/LeftChatMember.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents - -import com.github.insanusmokrassar.TelegramBotAPI.types.User -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.CommonEvent - -data class LeftChatMember( - val user: User -): CommonEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/NewChatMembers.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/NewChatMembers.kt deleted file mode 100644 index 182fe3c7ea..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/NewChatMembers.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents - -import com.github.insanusmokrassar.TelegramBotAPI.types.User -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.GroupEvent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.SupergroupEvent - -data class NewChatMembers( - val members: List -): GroupEvent, SupergroupEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/NewChatPhoto.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/NewChatPhoto.kt deleted file mode 100644 index 1d5552096c..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/NewChatPhoto.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents - -import com.github.insanusmokrassar.TelegramBotAPI.types.files.Photo -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.CommonEvent - -data class NewChatPhoto( - val photo: Photo -): CommonEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/NewChatTitle.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/NewChatTitle.kt deleted file mode 100644 index 69fdcd826c..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/NewChatTitle.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.CommonEvent - -data class NewChatTitle( - val title: String -): CommonEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/PinnedMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/PinnedMessage.kt deleted file mode 100644 index d4890bb1fa..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/PinnedMessage.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.CommonEvent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message - -data class PinnedMessage( - val message: Message -): CommonEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/SupergroupChatCreated.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/SupergroupChatCreated.kt deleted file mode 100644 index 676bf05ba3..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/SupergroupChatCreated.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents - -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.SupergroupEvent - -class SupergroupChatCreated( - val migratedFrom: ChatIdentifier? -): SupergroupEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/ChannelEvent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/ChannelEvent.kt deleted file mode 100644 index 4acfd4b283..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/ChannelEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts - -interface ChannelEvent: ChatEvent \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/ChatEvent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/ChatEvent.kt deleted file mode 100644 index f5fa1558af..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/ChatEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts - -interface ChatEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/CommonEvent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/CommonEvent.kt deleted file mode 100644 index 8878d1a239..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/CommonEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts - -interface CommonEvent : ChannelEvent, GroupEvent, SupergroupEvent \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/GroupEvent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/GroupEvent.kt deleted file mode 100644 index 2a3a35de96..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/GroupEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts - -interface GroupEvent: ChatEvent \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/SupergroupEvent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/SupergroupEvent.kt deleted file mode 100644 index b428fa279e..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChatEvents/abstracts/SupergroupEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts - -interface SupergroupEvent: ChatEvent \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonGroupEventMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonGroupEventMessage.kt deleted file mode 100644 index eef3be7f87..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonGroupEventMessage.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message - -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.User -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.GroupChat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.GroupEvent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.GroupEventMessage -import com.soywiz.klock.DateTime - -@Deprecated("Renamed", ReplaceWith("CommonGroupEventMessage")) -typealias GroupEventMessage = CommonGroupEventMessage - -data class CommonGroupEventMessage( - override val messageId: MessageIdentifier, - override val user: User, - override val chat: GroupChat, - override val chatEvent: GroupEvent, - override val date: DateTime -) : GroupEventMessage diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMessageImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMessageImpl.kt deleted file mode 100644 index 357aa57d97..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMessageImpl.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message - -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.FromUserMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.PossiblySentViaBotCommonMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.payments.SuccessfulPaymentInfo -import com.soywiz.klock.DateTime - -data class CommonMessageImpl( - override val messageId: MessageIdentifier, - override val user: User, - override val chat: Chat, - override val content: T, - override val date: DateTime, - override val editDate: DateTime?, - override val forwardInfo: ForwardInfo?, - override val replyTo: Message?, - override val replyMarkup: InlineKeyboardMarkup?, - override val senderBot: CommonBot?, - val paymentInfo: SuccessfulPaymentInfo? -) : PossiblySentViaBotCommonMessage, FromUserMessage \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonSupergroupEventMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonSupergroupEventMessage.kt deleted file mode 100644 index 4333d1e0ad..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonSupergroupEventMessage.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message - -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.User -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.SupergroupChat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.SupergroupEvent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.SupergroupEventMessage -import com.soywiz.klock.DateTime - -@Deprecated("Renamed", ReplaceWith("CommonSupergroupEventMessage")) -typealias SupergroupEventMessage = CommonSupergroupEventMessage - -data class CommonSupergroupEventMessage( - override val messageId: MessageIdentifier, - override val user: User, - override val chat: SupergroupChat, - override val chatEvent: SupergroupEvent, - override val date: DateTime -) : SupergroupEventMessage diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/ChatEventMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/ChatEventMessage.kt deleted file mode 100644 index 83c1b4bb0b..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/ChatEventMessage.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.ChatEvent - -interface ChatEventMessage : Message { - val chatEvent: ChatEvent -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/ContentMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/ContentMessage.kt deleted file mode 100644 index e46d31fa86..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/ContentMessage.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent - -interface ContentMessage: Message { - val content: T -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/FromUserMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/FromUserMessage.kt deleted file mode 100644 index 5145e00383..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/FromUserMessage.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.User - -interface FromUserMessage { - val user: User -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/GroupEventMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/GroupEventMessage.kt deleted file mode 100644 index 9ab76cbb50..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/GroupEventMessage.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts - -interface GroupEventMessage : ChatEventMessage, FromUserMessage diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/MediaGroupMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/MediaGroupMessage.kt deleted file mode 100644 index 56d76252b1..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/MediaGroupMessage.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.MediaGroupIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent - -interface MediaGroupMessage : CommonMessage { - val mediaGroupId: MediaGroupIdentifier -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyForwardedMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyForwardedMessage.kt deleted file mode 100644 index 225de5af71..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyForwardedMessage.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ForwardInfo - -interface PossiblyForwardedMessage : Message { - val forwardInfo: ForwardInfo? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyMarkedUp.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyMarkedUp.kt deleted file mode 100644 index 7e2e89ee42..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyMarkedUp.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup - -interface PossiblyMarkedUp { - val replyMarkup: InlineKeyboardMarkup? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyPaymentMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyPaymentMessage.kt deleted file mode 100644 index ab2a5d5b29..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyPaymentMessage.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.payments.abstracts.PaymentInfo - -interface PossiblyPaymentMessage : Message { - val paymentInfo: PaymentInfo? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyReplyMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyReplyMessage.kt deleted file mode 100644 index a68494790e..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyReplyMessage.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts - -interface PossiblyReplyMessage { - val replyTo: Message? -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblySentViaBot.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblySentViaBot.kt deleted file mode 100644 index c1580b2a6b..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblySentViaBot.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.CommonBot - -interface PossiblySentViaBot { - val senderBot: CommonBot? -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/SupergroupEventMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/SupergroupEventMessage.kt deleted file mode 100644 index c88bcabbbe..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/SupergroupEventMessage.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts - -interface SupergroupEventMessage : GroupEventMessage diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/ContactContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/ContactContent.kt deleted file mode 100644 index 9067b0c583..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/ContactContent.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendContact -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent - -data class ContactContent( - val contact: Contact -) : MessageContent { - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> = SendContact( - chatId, contact, disableNotification, replyToMessageId, replyMarkup - ) -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/DiceContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/DiceContent.kt deleted file mode 100644 index 3093a7b42d..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/DiceContent.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendDice -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.dice.Dice -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent - -data class DiceContent( - val dice: Dice -) : MessageContent { - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> = SendDice( - chatId, - dice.animationType, - disableNotification, - replyToMessageId, - replyMarkup - ) -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/GameContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/GameContent.kt deleted file mode 100644 index 58961cde29..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/GameContent.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.games.SendGame -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.games.Game -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent - -data class GameContent( - val game: Game -) : MessageContent { - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> = SendGame( - chatId, - game.title, - disableNotification, - replyToMessageId, - replyMarkup - ) -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/LocationContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/LocationContent.kt deleted file mode 100644 index b707ab31a1..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/LocationContent.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendLocation -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent - -data class LocationContent( - val location: Location -) : MessageContent { - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> = SendLocation( - chatId, - location.latitude, - location.longitude, - null, - disableNotification, - replyToMessageId, - replyMarkup - ) -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/PollContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/PollContent.kt deleted file mode 100644 index f6eb394734..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/PollContent.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.polls.createRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.polls.Poll - -data class PollContent( - val poll: Poll -) : MessageContent { - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> = poll.createRequest( - chatId, - disableNotification, - replyToMessageId, - replyMarkup - ) -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/VenueContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/VenueContent.kt deleted file mode 100644 index a95e1797c9..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/VenueContent.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendVenue -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.venue.Venue - -data class VenueContent( - val venue: Venue -) : MessageContent { - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> = SendVenue( - chatId, venue, disableNotification, replyToMessageId, replyMarkup - ) -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/MediaCollectionContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/MediaCollectionContent.kt deleted file mode 100644 index 9ee62114d8..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/MediaCollectionContent.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.TelegramMediaFile - -interface MediaCollectionContent: MessageContent, MediaContent { - val mediaCollection: List -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/MediaContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/MediaContent.kt deleted file mode 100644 index d163813030..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/MediaContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.TelegramMediaFile - -interface MediaContent: MessageContent { - val media: TelegramMediaFile - fun asInputMedia(): InputMedia -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/MediaGroupContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/MediaGroupContent.kt deleted file mode 100644 index 746befe2eb..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/MediaGroupContent.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedInput -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.MediaGroupMemberInputMedia - -interface MediaGroupContent : MediaContent, CaptionedInput { - fun toMediaGroupMemberInputMedia(): MediaGroupMemberInputMedia -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/MessageContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/MessageContent.kt deleted file mode 100644 index 35c2c2e052..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/MessageContent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts - -interface MessageContent: ResendableContent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/PossiblySentViaBotCommonMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/PossiblySentViaBotCommonMessage.kt deleted file mode 100644 index c13c9548c6..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/PossiblySentViaBotCommonMessage.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.CommonMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.PossiblySentViaBot - -interface PossiblySentViaBotCommonMessage : CommonMessage, PossiblySentViaBot diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/AnimationContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/AnimationContent.kt deleted file mode 100644 index 923bceb301..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/AnimationContent.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedInput -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendAnimation -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMediaAnimation -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.HTMLParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.MarkdownV2 -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.files.AnimationFile -import com.github.insanusmokrassar.TelegramBotAPI.types.files.DocumentFile -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.toHtmlCaptions -import com.github.insanusmokrassar.TelegramBotAPI.utils.toMarkdownV2Captions - -data class AnimationContent( - override val media: AnimationFile, - val includedDocument: DocumentFile?, - override val caption: String?, - override val captionEntities: List -) : MediaContent, CaptionedInput { - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> = SendAnimation( - chatId, - media.fileId, - media.thumb ?.fileId, - toHtmlCaptions().firstOrNull(), - HTMLParseMode, - media.duration, - media.width, - media.height, - disableNotification, - replyToMessageId, - replyMarkup - ) - - override fun asInputMedia(): InputMediaAnimation = InputMediaAnimation( - media.fileId, - toMarkdownV2Captions().firstOrNull(), - MarkdownV2, - media.width, - media.height, - media.duration, - media.thumb ?.fileId - ) -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/AudioContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/AudioContent.kt deleted file mode 100644 index 857a8c708d..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/AudioContent.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedInput -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendAudio -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMediaAudio -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.HTMLParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.MarkdownV2 -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.files.AudioFile -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.toHtmlCaptions -import com.github.insanusmokrassar.TelegramBotAPI.utils.toMarkdownV2Captions - -data class AudioContent( - override val media: AudioFile, - override val caption: String? = null, - override val captionEntities: List = emptyList() -) : MediaContent, CaptionedInput { - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> = SendAudio( - chatId, - media.fileId, - media.thumb ?.fileId, - toHtmlCaptions().firstOrNull(), - HTMLParseMode, - media.duration, - media.performer, - media.title, - disableNotification, - replyToMessageId, - replyMarkup - ) - - override fun asInputMedia(): InputMediaAudio = InputMediaAudio( - media.fileId, - toMarkdownV2Captions().firstOrNull(), - MarkdownV2, - media.duration, - media.performer, - media.title, - media.thumb ?.fileId - ) -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/DocumentContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/DocumentContent.kt deleted file mode 100644 index 7f31d02f1b..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/DocumentContent.kt +++ /dev/null @@ -1,46 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedInput -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendDocument -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMediaDocument -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.HTMLParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.MarkdownV2 -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.files.DocumentFile -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.toHtmlCaptions -import com.github.insanusmokrassar.TelegramBotAPI.utils.toMarkdownV2Captions - -data class DocumentContent( - override val media: DocumentFile, - override val caption: String? = null, - override val captionEntities: List = emptyList() -) : MediaContent, CaptionedInput { - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> = SendDocument( - chatId, - media.fileId, - media.thumb ?.fileId, - toHtmlCaptions().firstOrNull(), - HTMLParseMode, - disableNotification, - replyToMessageId, - replyMarkup - ) - - override fun asInputMedia(): InputMediaDocument = InputMediaDocument( - media.fileId, - toMarkdownV2Captions().firstOrNull(), - MarkdownV2, - media.thumb ?.fileId - ) -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/PhotoContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/PhotoContent.kt deleted file mode 100644 index 9363a9f8f0..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/PhotoContent.kt +++ /dev/null @@ -1,53 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendPhoto -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMediaPhoto -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.MediaGroupMemberInputMedia -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.HTMLParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.MarkdownV2 -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.files.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaCollectionContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.toHtmlCaptions -import com.github.insanusmokrassar.TelegramBotAPI.utils.toMarkdownV2Captions - -data class PhotoContent( - override val mediaCollection: Photo, - override val caption: String? = null, - override val captionEntities: List = emptyList() -) : MediaCollectionContent, MediaGroupContent { - override val media: PhotoSize = mediaCollection.biggest() ?: throw IllegalStateException("Can't locate any photo size for this content") - - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> = SendPhoto( - chatId, - media.fileId, - toHtmlCaptions().firstOrNull(), - HTMLParseMode, - disableNotification, - replyToMessageId, - replyMarkup - ) - - override fun toMediaGroupMemberInputMedia(): MediaGroupMemberInputMedia = InputMediaPhoto( - media.fileId, - toHtmlCaptions().firstOrNull(), - HTMLParseMode - ) - - override fun asInputMedia(): InputMediaPhoto = InputMediaPhoto( - media.fileId, - toMarkdownV2Captions().firstOrNull(), - MarkdownV2 - ) -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/StickerContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/StickerContent.kt deleted file mode 100644 index 30faf969c2..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/StickerContent.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendSticker -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMediaDocument -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent - -data class StickerContent( - override val media: Sticker -) : MediaContent { - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> = SendSticker( - chatId, - media.fileId, - disableNotification, - replyToMessageId, - replyMarkup - ) - - override fun asInputMedia(): InputMediaDocument = InputMediaDocument( - media.fileId, - null, - thumb = media.thumb ?.fileId - ) -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/VideoContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/VideoContent.kt deleted file mode 100644 index 87dc0e1397..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/VideoContent.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendVideo -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMediaVideo -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.MediaGroupMemberInputMedia -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.HTMLParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.MarkdownV2 -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.files.VideoFile -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.toHtmlCaptions -import com.github.insanusmokrassar.TelegramBotAPI.utils.toMarkdownV2Captions - -data class VideoContent( - override val media: VideoFile, - override val caption: String? = null, - override val captionEntities: List = emptyList() -) : MediaGroupContent { - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> = SendVideo( - chatId, - media.fileId, - media.thumb ?.fileId, - toHtmlCaptions().firstOrNull(), - HTMLParseMode, - media.duration, - media.width, - media.height, - null, - disableNotification, - replyToMessageId, - replyMarkup - ) - - override fun toMediaGroupMemberInputMedia(): MediaGroupMemberInputMedia = InputMediaVideo( - media.fileId, - toHtmlCaptions().firstOrNull(), - HTMLParseMode, - media.width, - media.height, - media.duration, - media.thumb ?.fileId - ) - - override fun asInputMedia(): InputMediaVideo = InputMediaVideo( - media.fileId, - toMarkdownV2Captions().firstOrNull(), - MarkdownV2, - media.width, - media.height, - media.duration, - media.thumb ?.fileId - ) -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/VoiceContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/VoiceContent.kt deleted file mode 100644 index bb0119119b..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/VoiceContent.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedInput -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendVoice -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMediaAudio -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.HTMLParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.MarkdownV2 -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.files.VoiceFile -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.toHtmlCaptions -import com.github.insanusmokrassar.TelegramBotAPI.utils.toMarkdownV2Captions - -data class VoiceContent( - override val media: VoiceFile, - override val caption: String? = null, - override val captionEntities: List = emptyList() -) : MediaContent, CaptionedInput { - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> = SendVoice( - chatId, - media.fileId, - null, - toHtmlCaptions().firstOrNull(), - HTMLParseMode, - media.duration, - disableNotification, - replyToMessageId, - replyMarkup - ) - - override fun asInputMedia(): InputMediaAudio = InputMediaAudio( - media.fileId, - toMarkdownV2Captions().firstOrNull(), - MarkdownV2, - media.duration - ) -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/payments/InvoiceContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/payments/InvoiceContent.kt deleted file mode 100644 index f40983184a..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/payments/InvoiceContent.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.payments - -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.Invoice - -data class InvoiceContent( - val invoice: Invoice -) : MessageContent { - override fun createResend( - chatId: ChatIdentifier, - disableNotification: Boolean, - replyToMessageId: MessageIdentifier?, - replyMarkup: KeyboardMarkup? - ): Request> { - error("Unfortunately, currently InvoiceOfPayment can not be resend due to requirement of additional parameters," + - " which can't be provided during the call of this method") - } -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/payments/SuccessfulPaymentInfo.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/payments/SuccessfulPaymentInfo.kt deleted file mode 100644 index f769e02fa4..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/payments/SuccessfulPaymentInfo.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.payments - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.payments.abstracts.PaymentInfo -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.SuccessfulPayment - -data class SuccessfulPaymentInfo( - val payment: SuccessfulPayment -) : PaymentInfo diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/payments/abstracts/PaymentInfo.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/payments/abstracts/PaymentInfo.kt deleted file mode 100644 index d526310e13..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/payments/abstracts/PaymentInfo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.payments.abstracts - -interface PaymentInfo diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/LabeledPrice.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/LabeledPrice.kt deleted file mode 100644 index 86617e825a..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/LabeledPrice.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.payments - -import com.github.insanusmokrassar.TelegramBotAPI.types.amountField -import com.github.insanusmokrassar.TelegramBotAPI.types.labelField -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.abstracts.Amounted -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class LabeledPrice( - @SerialName(labelField) - val label: String, - @SerialName(amountField) - override val amount: Long -) : Amounted diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/abstracts/Priced.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/abstracts/Priced.kt deleted file mode 100644 index d836470a82..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/abstracts/Priced.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.payments.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.LabeledPrice - -interface Priced { - val prices: List -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/CallbackQueryUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/CallbackQueryUpdate.kt deleted file mode 100644 index a17dd76254..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/CallbackQueryUpdate.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update - -import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery.CallbackQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update - -data class CallbackQueryUpdate( - override val updateId: UpdateIdentifier, - override val data: CallbackQuery -) : Update diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/ChannelPostUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/ChannelPostUpdate.kt deleted file mode 100644 index 43030af744..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/ChannelPostUpdate.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update - -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseSentMessageUpdate - -data class ChannelPostUpdate( - override val updateId: UpdateIdentifier, - override val data: Message -) : BaseSentMessageUpdate diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/ChosenInlineResultUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/ChosenInlineResultUpdate.kt deleted file mode 100644 index 6dbcde4ff9..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/ChosenInlineResultUpdate.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.ChosenInlineResult -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update - -data class ChosenInlineResultUpdate( - override val updateId: UpdateIdentifier, - override val data: ChosenInlineResult -) : Update \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/EditChannelPostUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/EditChannelPostUpdate.kt deleted file mode 100644 index 6d07ed5db5..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/EditChannelPostUpdate.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update - -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.CommonMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseEditMessageUpdate - -data class EditChannelPostUpdate( - override val updateId: UpdateIdentifier, - override val data: CommonMessage<*> -) : BaseEditMessageUpdate diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/EditMessageUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/EditMessageUpdate.kt deleted file mode 100644 index 6062b9d672..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/EditMessageUpdate.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update - -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.CommonMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseEditMessageUpdate - -data class EditMessageUpdate( - override val updateId: UpdateIdentifier, - override val data: CommonMessage<*> -) : BaseEditMessageUpdate diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/InlineQueryUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/InlineQueryUpdate.kt deleted file mode 100644 index 2bb00ce4bc..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/InlineQueryUpdate.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update - -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InlineQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update - -data class InlineQueryUpdate( - override val updateId: UpdateIdentifier, - override val data: InlineQuery -) : Update diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/ChannelPostMediaGroupUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/ChannelPostMediaGroupUpdate.kt deleted file mode 100644 index 28f93496c6..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/ChannelPostMediaGroupUpdate.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates - -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseMessageUpdate - -data class ChannelPostMediaGroupUpdate( - override val origins: List -) : SentMediaGroupUpdate { - override val updateId: UpdateIdentifier = origins.last().updateId - override val data: List = origins.mapNotNull { it.data as? MediaGroupMessage } -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/EditChannelPostMediaGroupUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/EditChannelPostMediaGroupUpdate.kt deleted file mode 100644 index e2a56e4514..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/EditChannelPostMediaGroupUpdate.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates - -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.update.EditChannelPostUpdate - -data class EditChannelPostMediaGroupUpdate( - override val origin: EditChannelPostUpdate -) : EditMediaGroupUpdate { - override val updateId: UpdateIdentifier = origin.updateId - override val data: MediaGroupMessage = origin.data as MediaGroupMessage -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/EditMessageMediaGroupUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/EditMessageMediaGroupUpdate.kt deleted file mode 100644 index be1364dc32..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/EditMessageMediaGroupUpdate.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates - -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.update.EditMessageUpdate - -data class EditMessageMediaGroupUpdate( - override val origin: EditMessageUpdate -) : EditMediaGroupUpdate { - override val updateId: UpdateIdentifier = origin.updateId - override val data: MediaGroupMessage = origin.data as MediaGroupMessage -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/MediaGroupUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/MediaGroupUpdate.kt deleted file mode 100644 index 6a9936cfcf..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/MediaGroupUpdate.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.* - -/** - * By default there is no instances of objects which could be deserialized from raw updates. If you want to get objects - * with this type, you should use something like [com.github.insanusmokrassar.TelegramBotAPI.extensions.api.SetWebhookKt.includeWebhookInRoute] - * - * @see com.github.insanusmokrassar.TelegramBotAPI.extensions.api.SetWebhookKt.includeWebhookInRoute - * @see com.github.insanusmokrassar.TelegramBotAPI.extensions.api.updates.UpdatesPollingKt.startGettingOfUpdates - */ -interface MediaGroupUpdate : Update - -interface SentMediaGroupUpdate: MediaGroupUpdate { - override val data: List - val origins: List -} - -interface EditMediaGroupUpdate : BaseEditMessageUpdate, MediaGroupUpdate { - override val data: MediaGroupMessage - val origin: BaseMessageUpdate -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/MessageMediaGroupUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/MessageMediaGroupUpdate.kt deleted file mode 100644 index c1139bc944..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/MessageMediaGroupUpdate.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates - -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseMessageUpdate - -data class MessageMediaGroupUpdate( - override val origins: List -) : SentMediaGroupUpdate { - override val updateId: UpdateIdentifier = origins.last().updateId - override val data: List = origins.mapNotNull { it.data as? MediaGroupMessage } -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MessageUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MessageUpdate.kt deleted file mode 100644 index a6b938bc9d..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MessageUpdate.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update - -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseSentMessageUpdate - -data class MessageUpdate( - override val updateId: UpdateIdentifier, - override val data: Message -) : BaseSentMessageUpdate diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/PollAnswerUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/PollAnswerUpdate.kt deleted file mode 100644 index 680ee33ad8..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/PollAnswerUpdate.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update - -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.polls.PollAnswer -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update - -data class PollAnswerUpdate( - override val updateId: UpdateIdentifier, - override val data: PollAnswer -) : Update diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/PollUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/PollUpdate.kt deleted file mode 100644 index 49a6e9131f..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/PollUpdate.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update - -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.polls.Poll -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update - -data class PollUpdate( - override val updateId: UpdateIdentifier, - override val data: Poll -) : Update diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/PreCheckoutQueryUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/PreCheckoutQueryUpdate.kt deleted file mode 100644 index 259eba0e75..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/PreCheckoutQueryUpdate.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update - -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.PreCheckoutQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update - -data class PreCheckoutQueryUpdate( - override val updateId: UpdateIdentifier, - override val data: PreCheckoutQuery -) : Update diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/ShippingQueryUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/ShippingQueryUpdate.kt deleted file mode 100644 index ee172c6b53..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/ShippingQueryUpdate.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update - -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.ShippingQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update - -data class ShippingQueryUpdate( - override val updateId: UpdateIdentifier, - override val data: ShippingQuery -) : Update diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/BaseEditMessageUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/BaseEditMessageUpdate.kt deleted file mode 100644 index 9b1ab9cf9d..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/BaseEditMessageUpdate.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.CommonMessage - -interface BaseEditMessageUpdate : BaseMessageUpdate { - override val data: CommonMessage<*> -} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/BaseMessageUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/BaseMessageUpdate.kt deleted file mode 100644 index 2387a8b2a8..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/BaseMessageUpdate.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts - -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message - -interface BaseMessageUpdate : Update { - override val data: Message -} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/BaseSentMessageUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/BaseSentMessageUpdate.kt deleted file mode 100644 index ee25277a9f..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/BaseSentMessageUpdate.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts - -interface BaseSentMessageUpdate : BaseMessageUpdate diff --git a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/Currencied.kt b/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/Currencied.kt deleted file mode 100644 index aa8a0a4037..0000000000 --- a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/Currencied.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.payments - -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.abstracts.Currencied -import java.util.* - -fun Currencied.javaCurrency(): Currency = Currency.getInstance(currency) diff --git a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/AsReference.kt b/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/AsReference.kt deleted file mode 100644 index b8cb0b5eae..0000000000 --- a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/AsReference.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils.extensions - -import java.lang.ref.WeakReference - -fun T.asReference() = WeakReference(this) \ No newline at end of file diff --git a/TelegramBotAPI-extensions-api/mpp_publish_template.kpsb b/TelegramBotAPI-extensions-api/mpp_publish_template.kpsb deleted file mode 100644 index f78f3eab9f..0000000000 --- a/TelegramBotAPI-extensions-api/mpp_publish_template.kpsb +++ /dev/null @@ -1 +0,0 @@ -{"bintrayConfig":{"repo":"StandardRepository","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Extensions for API","description":"API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"} \ No newline at end of file diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/DeleteMessage.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/DeleteMessage.kt deleted file mode 100644 index 70039acd22..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/DeleteMessage.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.DeleteMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message - -suspend fun RequestsExecutor.deleteMessage( - chatId: ChatIdentifier, - messageId: MessageIdentifier -) = execute( - DeleteMessage(chatId, messageId) -) - -suspend fun RequestsExecutor.deleteMessage( - chat: Chat, - messageId: MessageIdentifier -) = deleteMessage(chat.id, messageId) - -suspend fun RequestsExecutor.deleteMessage( - message: Message -) = deleteMessage(message.chat, message.messageId) - -suspend fun Message.delete( - requestsExecutor: RequestsExecutor -) = requestsExecutor.deleteMessage(this) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/DownloadFile.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/DownloadFile.kt deleted file mode 100644 index 2f9e6debf9..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/DownloadFile.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api - -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.get.getFileAdditionalInfo -import com.github.insanusmokrassar.TelegramBotAPI.requests.DownloadFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.types.files.PathedFile -import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.TelegramMediaFile - -suspend fun TelegramBot.downloadFile( - filePath: String -): ByteArray = execute( - DownloadFile(filePath) -) - -suspend fun TelegramBot.downloadFile( - pathedFile: PathedFile -): ByteArray = execute( - DownloadFile(pathedFile.filePath) -) - -suspend fun TelegramBot.downloadFile( - fileId: FileId -): ByteArray = downloadFile( - getFileAdditionalInfo(fileId) -) - -suspend fun TelegramBot.downloadFile( - file: TelegramMediaFile -): ByteArray = downloadFile( - getFileAdditionalInfo(file) -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/StopPoll.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/StopPoll.kt deleted file mode 100644 index 668f716b38..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/StopPoll.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.StopPoll -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message - -suspend fun RequestsExecutor.stopPoll( - chatId: ChatIdentifier, - messageId: MessageIdentifier, - replyMarkup: InlineKeyboardMarkup? = null -) = execute( - StopPoll(chatId, messageId, replyMarkup) -) - -suspend fun RequestsExecutor.stopPoll( - chat: Chat, - messageId: MessageIdentifier, - replyMarkup: InlineKeyboardMarkup? = null -) = stopPoll(chat.id, messageId, replyMarkup) - -suspend fun RequestsExecutor.stopPoll( - chatId: ChatId, - message: Message, - replyMarkup: InlineKeyboardMarkup? = null -) = stopPoll(chatId, message.messageId, replyMarkup) - -suspend fun RequestsExecutor.stopPoll( - chat: Chat, - message: Message, - replyMarkup: InlineKeyboardMarkup? = null -) = stopPoll(chat.id, message.messageId, replyMarkup) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/answers/AnswerCallbackQuery.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/answers/AnswerCallbackQuery.kt deleted file mode 100644 index c3bc33741a..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/answers/AnswerCallbackQuery.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.answers - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.AnswerCallbackQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery.CallbackQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQueryIdentifier - -suspend fun RequestsExecutor.answerCallbackQuery( - callbackQueryId: CallbackQueryIdentifier, - text: String? = null, - showAlert: Boolean? = null, - url: String? = null, - cachedTimeSeconds: Int? = null -) = execute(AnswerCallbackQuery(callbackQueryId, text, showAlert, url, cachedTimeSeconds)) - -suspend fun RequestsExecutor.answerCallbackQuery( - callbackQuery: CallbackQuery, - text: String? = null, - showAlert: Boolean? = null, - url: String? = null, - cachedTimeSeconds: Int? = null -) = answerCallbackQuery(callbackQuery.id, text, showAlert, url, cachedTimeSeconds) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/answers/payments/AnswerPreCheckoutQuery.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/answers/payments/AnswerPreCheckoutQuery.kt deleted file mode 100644 index 0bdf7e3c30..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/answers/payments/AnswerPreCheckoutQuery.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.answers.payments - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.AnswerPreCheckoutQueryError -import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.AnswerPreCheckoutQueryOk -import com.github.insanusmokrassar.TelegramBotAPI.types.PreCheckoutQueryId -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.PreCheckoutQuery - -suspend fun RequestsExecutor.answerPreCheckoutQueryOk( - id: PreCheckoutQueryId -) = execute(AnswerPreCheckoutQueryOk(id)) -suspend fun RequestsExecutor.answerPreCheckoutQueryOk( - preCheckoutQuery: PreCheckoutQuery -) = answerPreCheckoutQueryOk(preCheckoutQuery.id) - -suspend fun RequestsExecutor.answerPreCheckoutQueryError( - id: PreCheckoutQueryId, - error: String -) = execute(AnswerPreCheckoutQueryError(id, error)) -suspend fun RequestsExecutor.answerPreCheckoutQueryError( - preCheckoutQuery: PreCheckoutQuery, - error: String -) = answerPreCheckoutQueryError(preCheckoutQuery.id, error) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/answers/payments/AnswerShippingQuery.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/answers/payments/AnswerShippingQuery.kt deleted file mode 100644 index c154230a59..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/answers/payments/AnswerShippingQuery.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.answers.payments - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.AnswerShippingQueryError -import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.AnswerShippingQueryOk -import com.github.insanusmokrassar.TelegramBotAPI.types.ShippingQueryIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.ShippingOption -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.ShippingQuery - -suspend fun RequestsExecutor.answerShippingQueryOk( - id: ShippingQueryIdentifier, - shippingOptions: List -) = execute(AnswerShippingQueryOk(id, shippingOptions)) -suspend fun RequestsExecutor.answerShippingQueryOk( - shippingQuery: ShippingQuery, - shippingOptions: List -) = answerShippingQueryOk(shippingQuery.id, shippingOptions) - -suspend fun RequestsExecutor.answerShippingQueryError( - id: ShippingQueryIdentifier, - error: String -) = execute(AnswerShippingQueryError(id, error)) -suspend fun RequestsExecutor.answerShippingQueryError( - shippingQuery: ShippingQuery, - error: String -) = answerShippingQueryError(shippingQuery.id, error) - - diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/bot/GetMe.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/bot/GetMe.kt deleted file mode 100644 index 66d9b4512d..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/bot/GetMe.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.bot - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.bot.GetMe - -suspend fun RequestsExecutor.getMe() = execute(GetMe) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/bot/GetMyCommands.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/bot/GetMyCommands.kt deleted file mode 100644 index 41a9bef0f7..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/bot/GetMyCommands.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.bot - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.bot.GetMyCommands - -suspend fun RequestsExecutor.getMyCommands() = execute(GetMyCommands) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/bot/SetMyCommands.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/bot/SetMyCommands.kt deleted file mode 100644 index 860f0d8a3b..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/bot/SetMyCommands.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.bot - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.bot.SetMyCommands -import com.github.insanusmokrassar.TelegramBotAPI.types.BotCommand - -suspend fun RequestsExecutor.setMyCommands( - commands: List -) = execute(SetMyCommands(commands)) - -suspend fun RequestsExecutor.setMyCommands( - vararg commands: BotCommand -) = setMyCommands(commands.toList()) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/ExportChatInviteLink.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/ExportChatInviteLink.kt deleted file mode 100644 index a3051466f1..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/ExportChatInviteLink.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.ExportChatInviteLink -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.exportChatInviteLink( - chatId: ChatIdentifier -) = execute(ExportChatInviteLink(chatId)) - -suspend fun RequestsExecutor.exportChatInviteLink( - chat: PublicChat -) = exportChatInviteLink(chat.id) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/LeaveChat.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/LeaveChat.kt deleted file mode 100644 index 2523ad5034..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/LeaveChat.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.LeaveChat -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.leaveChat( - chatId: ChatIdentifier -) = execute(LeaveChat(chatId)) - -suspend fun RequestsExecutor.leaveChat( - chat: PublicChat -) = leaveChat(chat.id) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/get/GetChat.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/get/GetChat.kt deleted file mode 100644 index 528bedb4b3..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/get/GetChat.kt +++ /dev/null @@ -1,132 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.get - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get.GetChat -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.extended.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.PreviewFeature - -suspend fun RequestsExecutor.getChat( - chatId: ChatIdentifier -) = execute(GetChat(chatId)) - -suspend fun RequestsExecutor.getChat( - chat: Chat -) = getChat(chat.id) - -/** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a - * [ExtendedPublicChat] with unsafe operator "as" - * - * @throws ClassCastException - */ -@PreviewFeature -suspend fun RequestsExecutor.getChat( - chat: PublicChat -) = getChat(chat.id) as ExtendedPublicChat - - -/** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a - * [ExtendedChannelChat] with unsafe operator "as" - * - * @throws ClassCastException - */ -@PreviewFeature -suspend fun RequestsExecutor.getChat( - chat: ChannelChat -) = getChat(chat.id) as ExtendedChannelChat - -/** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a - * [ExtendedChannelChatImpl] with unsafe operator "as" - * - * @throws ClassCastException - */ -@PreviewFeature -suspend fun RequestsExecutor.getChat( - chat: ChannelChatImpl -) = getChat(chat.id) as ExtendedChannelChatImpl - - -/** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a - * [ExtendedGroupChat] with unsafe operator "as" - * - * @throws ClassCastException - */ -@PreviewFeature -suspend fun RequestsExecutor.getChat( - chat: GroupChat -) = getChat(chat.id) as ExtendedGroupChat - -/** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a - * [ExtendedGroupChatImpl] with unsafe operator "as" - * - * @throws ClassCastException - */ -@PreviewFeature -suspend fun RequestsExecutor.getChat( - chat: GroupChatImpl -) = getChat(chat.id) as ExtendedGroupChatImpl - - -/** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a - * [ExtendedSupergroupChat] with unsafe operator "as" - * - * @throws ClassCastException - */ -@PreviewFeature -suspend fun RequestsExecutor.getChat( - chat: SupergroupChat -) = getChat(chat.id) as ExtendedSupergroupChat - -/** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a - * [ExtendedSupergroupChatImpl] with unsafe operator "as" - * - * @throws ClassCastException - */ -@PreviewFeature -suspend fun RequestsExecutor.getChat( - chat: SupergroupChatImpl -) = getChat(chat.id) as ExtendedSupergroupChatImpl - - -/** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a - * [ExtendedPrivateChat] with unsafe operator "as" - * - * @throws ClassCastException - */ -@PreviewFeature -suspend fun RequestsExecutor.getChat( - chat: PrivateChat -) = getChat(chat.id) as ExtendedPrivateChat - -/** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a - * [ExtendedPrivateChatImpl] with unsafe operator "as" - * - * @throws ClassCastException - */ -@PreviewFeature -suspend fun RequestsExecutor.getChat( - chat: PrivateChatImpl -) = getChat(chat.id) as ExtendedPrivateChatImpl - -/** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a - * [ExtendedUser] with unsafe operator "as" - * - * @throws ClassCastException - */ -@PreviewFeature -suspend fun RequestsExecutor.getChat( - chat: CommonUser -) = getChat(chat.id) as ExtendedUser diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/get/GetChatAdministrators.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/get/GetChatAdministrators.kt deleted file mode 100644 index 35b7197060..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/get/GetChatAdministrators.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.get - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get.GetChatAdministrators -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.getChatAdministrators( - chatId: ChatIdentifier -) = execute(GetChatAdministrators(chatId)) - -suspend fun RequestsExecutor.getChatAdministrators( - chat: PublicChat -) = getChatAdministrators(chat.id) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/get/GetChatMembersCount.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/get/GetChatMembersCount.kt deleted file mode 100644 index 3c93f12c84..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/get/GetChatMembersCount.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.get - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get.GetChatMembersCount -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.getChatMembersCount( - chatId: ChatIdentifier -) = execute(GetChatMembersCount(chatId)) - -suspend fun RequestsExecutor.getChatMembersCount( - chat: PublicChat -) = getChatMembersCount(chat.id) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/GetChatMember.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/GetChatMember.kt deleted file mode 100644 index 0297d92d9c..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/GetChatMember.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.members - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.GetChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.getChatMember( - chatId: ChatIdentifier, - userId: UserId -) = execute(GetChatMember(chatId, userId)) - -suspend fun RequestsExecutor.getChatMember( - chat: PublicChat, - userId: UserId -) = getChatMember(chat.id, userId) - -suspend fun RequestsExecutor.getChatMember( - chatId: ChatId, - user: User -) = getChatMember(chatId, user.id) - -suspend fun RequestsExecutor.getChatMember( - chat: PublicChat, - user: User -) = getChatMember(chat.id, user.id) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/KickChatMember.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/KickChatMember.kt deleted file mode 100644 index 1f0aa9c32e..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/KickChatMember.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.members - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.KickChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.kickChatMember( - chatId: ChatIdentifier, - userId: UserId, - untilDate: TelegramDate? = null -) = execute(KickChatMember(chatId, userId, untilDate)) - -suspend fun RequestsExecutor.kickChatMember( - chat: PublicChat, - userId: UserId, - untilDate: TelegramDate? = null -) = kickChatMember(chat.id, userId, untilDate) - -suspend fun RequestsExecutor.kickChatMember( - chatId: ChatId, - user: User, - untilDate: TelegramDate? = null -) = kickChatMember(chatId, user.id, untilDate) - -suspend fun RequestsExecutor.kickChatMember( - chat: PublicChat, - user: User, - untilDate: TelegramDate? = null -) = kickChatMember(chat.id, user.id, untilDate) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/SetChatAdministratorCustomTitle.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/SetChatAdministratorCustomTitle.kt deleted file mode 100644 index 2f545eeae7..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/SetChatAdministratorCustomTitle.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.members - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.SetChatAdministratorCustomTitle -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.setChatAdministratorCustomTitle( - chatId: ChatId, - userId: UserId, - customTitle: String -) = execute(SetChatAdministratorCustomTitle(chatId, userId, customTitle)) - -suspend fun RequestsExecutor.setChatAdministratorCustomTitle( - chat: PublicChat, - userId: UserId, - customTitle: String -) = setChatAdministratorCustomTitle(chat.id, userId, customTitle) - -suspend fun RequestsExecutor.setChatAdministratorCustomTitle( - chatId: ChatId, - user: User, - customTitle: String -) = setChatAdministratorCustomTitle(chatId, user.id, customTitle) - -suspend fun RequestsExecutor.setChatAdministratorCustomTitle( - chat: PublicChat, - user: User, - customTitle: String -) = setChatAdministratorCustomTitle(chat.id, user.id, customTitle) \ No newline at end of file diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/UnbanChatMember.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/UnbanChatMember.kt deleted file mode 100644 index 35c1f26f25..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/UnbanChatMember.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.members - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.UnbanChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.unbanChatMember( - chatId: ChatIdentifier, - userId: UserId -) = execute(UnbanChatMember(chatId, userId)) - -suspend fun RequestsExecutor.unbanChatMember( - chat: PublicChat, - userId: UserId -) = unbanChatMember(chat.id, userId) - -suspend fun RequestsExecutor.unbanChatMember( - chatId: ChatId, - user: User -) = unbanChatMember(chatId, user.id) - -suspend fun RequestsExecutor.unbanChatMember( - chat: PublicChat, - user: User -) = unbanChatMember(chat.id, user.id) - diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/DeleteChatPhoto.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/DeleteChatPhoto.kt deleted file mode 100644 index 919f91b3fb..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/DeleteChatPhoto.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.DeleteChatPhoto -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.deleteChatPhoto( - chatId: ChatIdentifier -) = execute(DeleteChatPhoto(chatId)) - -suspend fun RequestsExecutor.deleteChatPhoto( - chat: PublicChat -) = deleteChatPhoto(chat.id) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/PinChatMessage.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/PinChatMessage.kt deleted file mode 100644 index d678a95c1d..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/PinChatMessage.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.PinChatMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message - -suspend fun RequestsExecutor.pinChatMessage( - chatId: ChatIdentifier, - messageId: MessageIdentifier, - disableNotification: Boolean = false -) = execute(PinChatMessage(chatId, messageId, disableNotification)) - -suspend fun RequestsExecutor.pinChatMessage( - chat: PublicChat, - messageId: MessageIdentifier, - disableNotification: Boolean = false -) = pinChatMessage(chat.id, messageId, disableNotification) - -suspend fun RequestsExecutor.pinChatMessage( - message: Message, - disableNotification: Boolean = false -) = if (message.chat is PublicChat) { - pinChatMessage(message.chat.id, message.messageId, disableNotification) -} else { - error("It is possible to pin messages only in non one-to-one chats") -} diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatDescription.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatDescription.kt deleted file mode 100644 index c20234ceed..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatDescription.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.SetChatDescription -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.setChatDescription( - chatId: ChatIdentifier, - description: String -) = execute(SetChatDescription(chatId, description)) - -suspend fun RequestsExecutor.setChatDescription( - chat: PublicChat, - description: String -) = setChatDescription(chat.id, description) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatPermissions.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatPermissions.kt deleted file mode 100644 index b10f4bf27d..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatPermissions.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.SetChatPermissions -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ChatPermissions -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.setDefaultChatMembersPermissions( - chatId: ChatIdentifier, - permissions: ChatPermissions -) = execute(SetChatPermissions(chatId, permissions)) - -suspend fun RequestsExecutor.setDefaultChatMembersPermissions( - chat: PublicChat, - permissions: ChatPermissions -) = setDefaultChatMembersPermissions(chat.id, permissions) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatPhoto.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatPhoto.kt deleted file mode 100644 index 19f3ab0683..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatPhoto.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.SetChatPhoto -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.setChatPhoto( - chatId: ChatIdentifier, - photo: MultipartFile -) = execute(SetChatPhoto(chatId, photo)) - -suspend fun RequestsExecutor.setChatPhoto( - chat: PublicChat, - photo: MultipartFile -) = setChatPhoto(chat.id, photo) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatTitle.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatTitle.kt deleted file mode 100644 index 130495aeaf..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatTitle.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.SetChatTitle -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.setChatTitle( - chatId: ChatIdentifier, - title: String -) = execute(SetChatTitle(chatId, title)) - -suspend fun RequestsExecutor.setChatTitle( - chat: PublicChat, - title: String -) = setChatTitle(chat.id, title) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/UnpinChatMessage.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/UnpinChatMessage.kt deleted file mode 100644 index dc542e9a21..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/UnpinChatMessage.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.UnpinChatMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat - -suspend fun RequestsExecutor.unpinChatMessage( - chatId: ChatIdentifier -) = execute(UnpinChatMessage(chatId)) - -suspend fun RequestsExecutor.unpinChatMessage( - chat: PublicChat -) = unpinChatMessage(chat.id) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/stickers/DeleteChatStickerSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/stickers/DeleteChatStickerSet.kt deleted file mode 100644 index 6fd6969b51..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/stickers/DeleteChatStickerSet.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.stickers - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.stickers.DeleteChatStickerSet -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.SupergroupChat - -suspend fun RequestsExecutor.deleteChatStickerSet( - chatId: ChatIdentifier -) = execute(DeleteChatStickerSet(chatId)) - -suspend fun RequestsExecutor.deleteChatStickerSet( - chat: SupergroupChat -) = deleteChatStickerSet(chat.id) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/stickers/SetChatStickerSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/stickers/SetChatStickerSet.kt deleted file mode 100644 index c1ca61482f..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/stickers/SetChatStickerSet.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.stickers - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.stickers.SetChatStickerSet -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.StickerSetName -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.SupergroupChat - -suspend fun RequestsExecutor.setChatStickerSet( - chatId: ChatIdentifier, - stickerSetName: StickerSetName -) = execute(SetChatStickerSet(chatId, stickerSetName)) - -suspend fun RequestsExecutor.setChatStickerSet( - chat: SupergroupChat, - stickerSetName: StickerSetName -) = setChatStickerSet(chat.id, stickerSetName) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/LiveLocation/EditInlineMessageLiveLocation.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/LiveLocation/EditInlineMessageLiveLocation.kt deleted file mode 100644 index c48fe51212..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/LiveLocation/EditInlineMessageLiveLocation.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.LiveLocation - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.EditInlineMessageLiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.Location -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup - -suspend fun RequestsExecutor.editLiveLocation( - inlineMessageId: InlineMessageIdentifier, - latitude: Double, - longitude: Double, - replyMarkup: InlineKeyboardMarkup? = null -) = execute( - EditInlineMessageLiveLocation( - inlineMessageId, latitude, longitude, replyMarkup - ) -) -suspend fun RequestsExecutor.editLiveLocation( - inlineMessageId: InlineMessageIdentifier, - location: Location, - replyMarkup: InlineKeyboardMarkup? = null -) = editLiveLocation(inlineMessageId, location.latitude, location.longitude, replyMarkup) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/LiveLocation/StopChatMessageLiveLocation.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/LiveLocation/StopChatMessageLiveLocation.kt deleted file mode 100644 index 0835dd90e1..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/LiveLocation/StopChatMessageLiveLocation.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.LiveLocation - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.StopChatMessageLiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.LocationContent - -suspend fun RequestsExecutor.stopLiveLocation( - chatId: ChatIdentifier, - messageId: MessageIdentifier, - replyMarkup: InlineKeyboardMarkup? = null -) = execute( - StopChatMessageLiveLocation( - chatId, messageId, replyMarkup - ) -) - -suspend fun RequestsExecutor.stopLiveLocation( - chat: Chat, - messageId: MessageIdentifier, - replyMarkup: InlineKeyboardMarkup? = null -) = stopLiveLocation(chat.id, messageId, replyMarkup) - -suspend fun RequestsExecutor.stopLiveLocation( - message: ContentMessage, - replyMarkup: InlineKeyboardMarkup? = null -) = stopLiveLocation(message.chat, message.messageId, replyMarkup) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/LiveLocation/StopInlineMessageLiveLocation.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/LiveLocation/StopInlineMessageLiveLocation.kt deleted file mode 100644 index b1a25409ed..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/LiveLocation/StopInlineMessageLiveLocation.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.LiveLocation - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.StopInlineMessageLiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup - -suspend fun RequestsExecutor.stopLiveLocation( - inlineMessageId: InlineMessageIdentifier, - replyMarkup: InlineKeyboardMarkup? = null -) = execute( - StopInlineMessageLiveLocation( - inlineMessageId, replyMarkup - ) -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt deleted file mode 100644 index d02884f5b1..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.ReplyMarkup - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.ReplyMarkup.EditChatMessageReplyMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message - -suspend fun RequestsExecutor.editMessageReplyMarkup( - chatId: ChatIdentifier, - messageId: MessageIdentifier, - replyMarkup: InlineKeyboardMarkup? = null -) = execute( - EditChatMessageReplyMarkup(chatId, messageId, replyMarkup) -) - -suspend fun RequestsExecutor.editMessageReplyMarkup( - chat: Chat, - messageId: MessageIdentifier, - replyMarkup: InlineKeyboardMarkup? = null -) = editMessageReplyMarkup(chat.id, messageId, replyMarkup) - -suspend fun RequestsExecutor.editMessageReplyMarkup( - message: Message, - replyMarkup: InlineKeyboardMarkup? = null -) = editMessageReplyMarkup(message.chat.id, message.messageId, replyMarkup) - diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt deleted file mode 100644 index 66f7df4730..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.ReplyMarkup - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.ReplyMarkup.EditInlineMessageReplyMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup - -suspend fun RequestsExecutor.editMessageReplyMarkup( - inlineMessageId: InlineMessageIdentifier, - replyMarkup: InlineKeyboardMarkup? = null -) = execute(EditInlineMessageReplyMarkup(inlineMessageId, replyMarkup)) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/caption/EditChatMessageCaption.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/caption/EditChatMessageCaption.kt deleted file mode 100644 index e448ad2324..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/caption/EditChatMessageCaption.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.caption - -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedInput -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.caption.EditChatMessageCaption -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent - -suspend fun RequestsExecutor.editMessageCaption( - chatId: ChatIdentifier, - messageId: MessageIdentifier, - text: String, - parseMode: ParseMode? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = execute( - EditChatMessageCaption(chatId, messageId, text, parseMode, replyMarkup) -) - -suspend fun RequestsExecutor.editMessageCaption( - chat: Chat, - messageId: MessageIdentifier, - text: String, - parseMode: ParseMode? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = editMessageCaption(chat.id, messageId, text, parseMode, replyMarkup) - -suspend fun RequestsExecutor.editMessageCaption( - message: ContentMessage, - text: String, - parseMode: ParseMode? = null, - replyMarkup: InlineKeyboardMarkup? = null -): ContentMessage where T : CaptionedInput, T : MediaContent { - return editMessageCaption(message.chat.id, message.messageId, text, parseMode, replyMarkup) -} diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/caption/EditInlineMessageCaption.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/caption/EditInlineMessageCaption.kt deleted file mode 100644 index a561699e6e..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/caption/EditInlineMessageCaption.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.caption - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.caption.EditInlineMessageCaption -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup - -suspend fun RequestsExecutor.editMessageCaption( - inlineMessageId: InlineMessageIdentifier, - text: String, - parseMode: ParseMode? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = execute(EditInlineMessageCaption(inlineMessageId, text, parseMode, replyMarkup)) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/media/EditChatMessageMedia.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/media/EditChatMessageMedia.kt deleted file mode 100644 index 5406985cbf..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/media/EditChatMessageMedia.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.media - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.EditChatMessageMedia -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent - -suspend fun RequestsExecutor.editMessageMedia( - chatId: ChatIdentifier, - messageId: MessageIdentifier, - media: InputMedia, - replyMarkup: InlineKeyboardMarkup? = null -) = execute( - EditChatMessageMedia(chatId, messageId, media, replyMarkup) -) - -suspend fun RequestsExecutor.editMessageMedia( - chat: Chat, - messageId: MessageIdentifier, - media: InputMedia, - replyMarkup: InlineKeyboardMarkup? = null -) = editMessageMedia(chat.id, messageId, media, replyMarkup) - -suspend fun RequestsExecutor.editMessageMedia( - message: ContentMessage, - media: InputMedia, - replyMarkup: InlineKeyboardMarkup? = null -) = editMessageMedia(message.chat.id, message.messageId, media, replyMarkup) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/media/EditInlineMessageMedia.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/media/EditInlineMessageMedia.kt deleted file mode 100644 index 1768ac1f15..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/media/EditInlineMessageMedia.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.media - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.EditInlineMessageMedia -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup - -suspend fun RequestsExecutor.editMessageCaption( - inlineMessageId: InlineMessageIdentifier, - media: InputMedia, - replyMarkup: InlineKeyboardMarkup? = null -) = execute(EditInlineMessageMedia(inlineMessageId, media, replyMarkup)) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/text/EditChatMessageText.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/text/EditChatMessageText.kt deleted file mode 100644 index 18320bc153..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/text/EditChatMessageText.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.text - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text.EditChatMessageText -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.TextContent - -suspend fun RequestsExecutor.editMessageText( - chatId: ChatIdentifier, - messageId: MessageIdentifier, - text: String, - parseMode: ParseMode? = null, - disableWebPagePreview: Boolean? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = execute( - EditChatMessageText(chatId, messageId, text, parseMode, disableWebPagePreview, replyMarkup) -) - -suspend fun RequestsExecutor.editMessageText( - chat: Chat, - messageId: MessageIdentifier, - text: String, - parseMode: ParseMode? = null, - disableWebPagePreview: Boolean? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = editMessageText(chat.id, messageId, text, parseMode, disableWebPagePreview, replyMarkup) - -suspend fun RequestsExecutor.editMessageText( - message: ContentMessage, - text: String, - parseMode: ParseMode? = null, - disableWebPagePreview: Boolean? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = editMessageText(message.chat.id, message.messageId, text, parseMode, disableWebPagePreview, replyMarkup) \ No newline at end of file diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/text/EditInlineMessageText.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/text/EditInlineMessageText.kt deleted file mode 100644 index 2d0521d73a..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/text/EditInlineMessageText.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.text - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text.EditInlineMessageText -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup - -suspend fun RequestsExecutor.editMessageText( - inlineMessageId: InlineMessageIdentifier, - text: String, - parseMode: ParseMode? = null, - disableWebPagePreview: Boolean? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = execute(EditInlineMessageText(inlineMessageId, text, parseMode, disableWebPagePreview, replyMarkup)) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/games/GetGameHighScoresByChat.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/games/GetGameHighScoresByChat.kt deleted file mode 100644 index 9253f8d27c..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/games/GetGameHighScoresByChat.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.games - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.games.GetGameHighScoresByChat -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.GameContent - -suspend fun RequestsExecutor.getGameScore( - userId: UserId, - chatId: ChatId, - messageId: MessageIdentifier -) = execute( - GetGameHighScoresByChat(userId, chatId, messageId) -) - -suspend fun RequestsExecutor.getGameScore( - user: CommonUser, - chatId: ChatId, - messageId: MessageIdentifier -) = getGameScore( - user.id, chatId, messageId -) - -suspend fun RequestsExecutor.getGameScore( - userId: UserId, - chat: Chat, - messageId: MessageIdentifier -) = getGameScore( - userId, chat.id, messageId -) - -suspend fun RequestsExecutor.getGameScore( - user: CommonUser, - chat: Chat, - messageId: MessageIdentifier -) = getGameScore( - user.id, chat.id, messageId -) - -suspend fun RequestsExecutor.getGameScore( - userId: UserId, - message: ContentMessage -) = getGameScore( - userId, message.chat.id, message.messageId -) - -suspend fun RequestsExecutor.getGameScore( - user: CommonUser, - message: ContentMessage -) = getGameScore( - user.id, message.chat.id, message.messageId -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/games/GetGameHighScoresByInlineMessageId.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/games/GetGameHighScoresByInlineMessageId.kt deleted file mode 100644 index a1ea482a94..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/games/GetGameHighScoresByInlineMessageId.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.games - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.games.GetGameHighScoresByInlineMessageId -import com.github.insanusmokrassar.TelegramBotAPI.types.* - -suspend fun RequestsExecutor.getGameScore( - userId: UserId, - inlineMessageId: InlineMessageIdentifier -) = execute( - GetGameHighScoresByInlineMessageId( - userId, inlineMessageId - ) -) - -suspend fun RequestsExecutor.getGameScore( - user: CommonUser, - inlineMessageId: InlineMessageIdentifier -) = getGameScore(user.id, inlineMessageId) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/get/GetFile.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/get/GetFile.kt deleted file mode 100644 index 1fde6e92ea..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/get/GetFile.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.get - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.get.GetFile -import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.TelegramMediaFile - -suspend fun RequestsExecutor.getFileAdditionalInfo( - fileId: FileId -) = execute( - GetFile(fileId) -) - -suspend fun RequestsExecutor.getFileAdditionalInfo( - file: TelegramMediaFile -) = getFileAdditionalInfo(file.fileId) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/get/GetStickerSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/get/GetStickerSet.kt deleted file mode 100644 index 0fce1971cd..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/get/GetStickerSet.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.get - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.get.GetStickerSet -import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker - -suspend fun RequestsExecutor.getStickerSet( - name: String -) = execute( - GetStickerSet(name) -) - -suspend fun RequestsExecutor.getStickerSet( - sticker: Sticker -) = getStickerSet( - sticker.stickerSetName ?: error("Sticker must contains stickerSetName to be correctly used in getStickerSet method") -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/get/GetUserProfilePhotos.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/get/GetUserProfilePhotos.kt deleted file mode 100644 index a3f613e543..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/get/GetUserProfilePhotos.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.get - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.get.GetUserProfilePhotos -import com.github.insanusmokrassar.TelegramBotAPI.types.CommonUser -import com.github.insanusmokrassar.TelegramBotAPI.types.UserId - -suspend fun RequestsExecutor.getUserProfilePhotos( - userId: UserId, - offset: Int? = null, - limit: Int? = null -) = execute( - GetUserProfilePhotos( - userId, offset, limit - ) -) - -suspend fun RequestsExecutor.getUserProfilePhotos( - user: CommonUser, - offset: Int? = null, - limit: Int? = null -) = getUserProfilePhotos(user.id, offset, limit) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/SendAction.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/SendAction.kt deleted file mode 100644 index a2366ab56a..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/SendAction.kt +++ /dev/null @@ -1,102 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendAction -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.actions.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat - -suspend fun RequestsExecutor.sendBotAction( - chatId: ChatIdentifier, - action: BotAction -) = execute( - SendAction(chatId, action) -) - -suspend fun RequestsExecutor.sendBotAction( - chat: Chat, - action: BotAction -) = sendBotAction(chat.id, action) - - -suspend fun RequestsExecutor.sendActionTyping( - chatId: ChatIdentifier -) = sendBotAction(chatId, TypingAction) - -suspend fun RequestsExecutor.sendActionUploadPhoto( - chatId: ChatIdentifier -) = sendBotAction(chatId, UploadPhotoAction) - -suspend fun RequestsExecutor.sendActionRecordVideo( - chatId: ChatIdentifier -) = sendBotAction(chatId, RecordVideoAction) - -suspend fun RequestsExecutor.sendActionUploadVideo( - chatId: ChatIdentifier -) = sendBotAction(chatId, UploadVideoAction) - -suspend fun RequestsExecutor.sendActionRecordAudio( - chatId: ChatIdentifier -) = sendBotAction(chatId, RecordAudioAction) - -suspend fun RequestsExecutor.sendActionUploadAudio( - chatId: ChatIdentifier -) = sendBotAction(chatId, UploadAudioAction) - -suspend fun RequestsExecutor.sendActionUploadDocument( - chatId: ChatIdentifier -) = sendBotAction(chatId, UploadDocumentAction) - -suspend fun RequestsExecutor.sendActionFindLocation( - chatId: ChatIdentifier -) = sendBotAction(chatId, FindLocationAction) - -suspend fun RequestsExecutor.sendActionRecordVideoNote( - chatId: ChatIdentifier -) = sendBotAction(chatId, RecordVideoNoteAction) - -suspend fun RequestsExecutor.sendActionUploadVideoNote( - chatId: ChatIdentifier -) = sendBotAction(chatId, UploadVideoNoteAction) - - -suspend fun RequestsExecutor.sendActionTyping( - chat: Chat -) = sendBotAction(chat, TypingAction) - -suspend fun RequestsExecutor.sendActionUploadPhoto( - chat: Chat -) = sendBotAction(chat, UploadPhotoAction) - -suspend fun RequestsExecutor.sendActionRecordVideo( - chat: Chat -) = sendBotAction(chat, RecordVideoAction) - -suspend fun RequestsExecutor.sendActionUploadVideo( - chat: Chat -) = sendBotAction(chat, UploadVideoAction) - -suspend fun RequestsExecutor.sendActionRecordAudio( - chat: Chat -) = sendBotAction(chat, RecordAudioAction) - -suspend fun RequestsExecutor.sendActionUploadAudio( - chat: Chat -) = sendBotAction(chat, UploadAudioAction) - -suspend fun RequestsExecutor.sendActionUploadDocument( - chat: Chat -) = sendBotAction(chat, UploadDocumentAction) - -suspend fun RequestsExecutor.sendActionFindLocation( - chat: Chat -) = sendBotAction(chat, FindLocationAction) - -suspend fun RequestsExecutor.sendActionRecordVideoNote( - chat: Chat -) = sendBotAction(chat, RecordVideoNoteAction) - -suspend fun RequestsExecutor.sendActionUploadVideoNote( - chat: Chat -) = sendBotAction(chat, UploadVideoNoteAction) - diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/SendDice.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/SendDice.kt deleted file mode 100644 index d82e1c6293..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/SendDice.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendDice -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.dice.DiceAnimationType - -suspend fun RequestsExecutor.sendDice( - chatId: ChatIdentifier, - animationType: DiceAnimationType? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendDice(chatId, animationType, disableNotification, replyToMessageId, replyMarkup) -) - -suspend fun RequestsExecutor.sendDice( - chat: Chat, - animationType: DiceAnimationType? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendDice(chat.id, animationType, disableNotification, replyToMessageId, replyMarkup) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/games/SendGame.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/games/SendGame.kt deleted file mode 100644 index fc1bc641d6..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/games/SendGame.kt +++ /dev/null @@ -1,51 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.games - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.games.SendGame -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.games.Game - -suspend fun RequestsExecutor.sendGame( - chatId: ChatIdentifier, - gameShortName: String, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendGame( - chatId, gameShortName, disableNotification, replyToMessageId, replyMarkup - ) -) - -suspend fun RequestsExecutor.sendGame( - chat: Chat, - gameShortName: String, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendGame( - chat.id, gameShortName, disableNotification, replyToMessageId, replyMarkup -) - -suspend fun RequestsExecutor.sendGame( - chatId: ChatIdentifier, - game: Game, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendGame( - chatId, game.title, disableNotification, replyToMessageId, replyMarkup -) - -suspend fun RequestsExecutor.sendGame( - chat: Chat, - game: Game, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendGame( - chat.id, game.title, disableNotification, replyToMessageId, replyMarkup -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendAnimation.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendAnimation.kt deleted file mode 100644 index 28a3471007..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendAnimation.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.media - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.InputFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendAnimation -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.files.AnimationFile - -suspend fun RequestsExecutor.sendAnimation( - chatId: ChatIdentifier, - animation: InputFile, - thumb: InputFile? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - width: Int? = null, - height: Int? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendAnimation( - chatId, - animation, - thumb, - text, - parseMode, - duration, - width, - height, - disableNotification, - replyToMessageId, - replyMarkup - ) -) - -suspend fun RequestsExecutor.sendAnimation( - chatId: ChatIdentifier, - animation: AnimationFile, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - width: Int? = null, - height: Int? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendAnimation( - chatId, animation.fileId, animation.thumb ?.fileId, text, parseMode, duration, width, height, disableNotification, replyToMessageId, replyMarkup -) - diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendAudio.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendAudio.kt deleted file mode 100644 index afcbd0983d..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendAudio.kt +++ /dev/null @@ -1,51 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.media - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.InputFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendAudio -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.files.AudioFile - -suspend fun RequestsExecutor.sendAudio( - chatId: ChatIdentifier, - audio: InputFile, - thumb: InputFile? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - performer: String? = null, - title: String? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendAudio( - chatId, - audio, - thumb, - text, - parseMode, - duration, - performer, - title, - disableNotification, - replyToMessageId, - replyMarkup - ) -) - -suspend fun RequestsExecutor.sendAudio( - chatId: ChatIdentifier, - audio: AudioFile, - text: String? = null, - parseMode: ParseMode? = null, - title: String? = audio.title, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendAudio( - chatId, audio.fileId, audio.thumb ?.fileId, text, parseMode, audio.duration, audio.performer, title, disableNotification, replyToMessageId, replyMarkup -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendDocument.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendDocument.kt deleted file mode 100644 index 0e583adabc..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendDocument.kt +++ /dev/null @@ -1,44 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.media - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.InputFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendDocument -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.files.DocumentFile - -suspend fun RequestsExecutor.sendDocument( - chatId: ChatIdentifier, - document: InputFile, - thumb: InputFile? = null, - text: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendDocument( - chatId, - document, - thumb, - text, - parseMode, - disableNotification, - replyToMessageId, - replyMarkup - ) -) - -suspend fun RequestsExecutor.sendDocument( - chatId: ChatIdentifier, - document: DocumentFile, - text: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendDocument( - chatId, document.fileId, document.thumb ?.fileId, text, parseMode, disableNotification, replyToMessageId, replyMarkup -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendMediaGroup.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendMediaGroup.kt deleted file mode 100644 index 3c8448f445..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendMediaGroup.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.media - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendMediaGroup -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.MediaGroupMemberInputMedia -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat - -suspend fun RequestsExecutor.sendMediaGroup( - chatId: ChatIdentifier, - media: List, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null -) = execute( - SendMediaGroup( - chatId, media, disableNotification, replyToMessageId - ) -) - -suspend fun RequestsExecutor.sendMediaGroup( - chat: Chat, - media: List, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null -) = sendMediaGroup( - chat.id, media, disableNotification, replyToMessageId -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendPhoto.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendPhoto.kt deleted file mode 100644 index c42d4d8a0d..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendPhoto.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.media - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.InputFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendPhoto -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup - -suspend fun RequestsExecutor.sendPhoto( - chatId: ChatIdentifier, - fileId: InputFile, - caption: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendPhoto( - chatId, - fileId, - caption, - parseMode, - disableNotification, - replyToMessageId, - replyMarkup - ) -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendSticker.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendSticker.kt deleted file mode 100644 index 2235b2a960..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendSticker.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.media - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.InputFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendSticker -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup - -suspend fun RequestsExecutor.sendSticker( - chatId: ChatIdentifier, - sticker: InputFile, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendSticker(chatId, sticker, disableNotification, replyToMessageId, replyMarkup) -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendVideo.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendVideo.kt deleted file mode 100644 index 38c9062991..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendVideo.kt +++ /dev/null @@ -1,51 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.media - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.InputFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendVideo -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.files.VideoFile - -suspend fun RequestsExecutor.sendVideo( - chatId: ChatIdentifier, - video: InputFile, - thumb: InputFile? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - width: Int? = null, - height: Int? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendVideo( - chatId, - video, - thumb, - text, - parseMode, - duration, - width, - height, - null, - disableNotification, - replyToMessageId, - replyMarkup - ) -) - -suspend fun RequestsExecutor.sendVideo( - chatId: ChatIdentifier, - video: VideoFile, - text: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendVideo( - chatId, video.fileId, video.thumb ?.fileId, text, parseMode, video.duration, video.width, video.height, disableNotification, replyToMessageId, replyMarkup -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendVideoNote.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendVideoNote.kt deleted file mode 100644 index 21b3060189..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendVideoNote.kt +++ /dev/null @@ -1,48 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.media - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.InputFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendVideoNote -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.files.VideoFile - -suspend fun RequestsExecutor.sendVideoNote( - chatId: ChatIdentifier, - videoNote: InputFile, - thumb: InputFile? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - size: Int? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendVideoNote( - chatId, - videoNote, - thumb, - text, - parseMode, - duration, - size, - disableNotification, - replyToMessageId, - replyMarkup - ) -) - -suspend fun RequestsExecutor.sendVideoNote( - chatId: ChatIdentifier, - videoNote: VideoFile, - text: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendVideoNote( - chatId, videoNote.fileId, videoNote.thumb ?.fileId, text, parseMode, videoNote.duration, videoNote.width, disableNotification, replyToMessageId, replyMarkup -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendVoice.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendVoice.kt deleted file mode 100644 index 91e8e70ed2..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/media/SendVoice.kt +++ /dev/null @@ -1,46 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.media - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.InputFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendVoice -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.files.AudioFile - -suspend fun RequestsExecutor.sendVoice( - chatId: ChatIdentifier, - voice: InputFile, - thumb: InputFile? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendVoice( - chatId, - voice, - thumb, - text, - parseMode, - duration, - disableNotification, - replyToMessageId, - replyMarkup - ) -) - -suspend fun RequestsExecutor.sendVoice( - chatId: ChatIdentifier, - voice: AudioFile, - text: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendVoice( - chatId, voice.fileId, voice.thumb ?.fileId, text, parseMode, voice.duration, disableNotification, replyToMessageId, replyMarkup -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/stickers/DeleteStickerFromSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/stickers/DeleteStickerFromSet.kt deleted file mode 100644 index 3206463af1..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/stickers/DeleteStickerFromSet.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.stickers - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.DeleteStickerFromSet -import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker - -suspend fun RequestsExecutor.deleteStickerFromSet( - sticker: FileId -) = execute( - DeleteStickerFromSet( - sticker - ) -) - -suspend fun RequestsExecutor.deleteStickerFromSet( - sticker: Sticker -) = deleteStickerFromSet( - sticker.fileId -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/stickers/SetStickerPositionInSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/stickers/SetStickerPositionInSet.kt deleted file mode 100644 index 553d131ab3..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/stickers/SetStickerPositionInSet.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.stickers - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.SetStickerPositionInSet -import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker - -suspend fun RequestsExecutor.setStickerPositionInSet( - sticker: FileId, - position: Int -) = execute( - SetStickerPositionInSet( - sticker, - position - ) -) - -suspend fun RequestsExecutor.setStickerPositionInSet( - sticker: Sticker, - position: Int -) = setStickerPositionInSet( - sticker.fileId, - position -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/stickers/UploadStickerFile.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/stickers/UploadStickerFile.kt deleted file mode 100644 index e61ace8cce..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/stickers/UploadStickerFile.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.stickers - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.UploadStickerFile -import com.github.insanusmokrassar.TelegramBotAPI.types.CommonUser -import com.github.insanusmokrassar.TelegramBotAPI.types.UserId - -suspend fun RequestsExecutor.uploadStickerFile( - userId: UserId, - sticker: MultipartFile -) = execute( - UploadStickerFile(userId, sticker) -) - -suspend fun RequestsExecutor.uploadStickerFile( - user: CommonUser, - sticker: MultipartFile -) = execute( - UploadStickerFile(user.id, sticker) -) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/webhook/DeleteWebhook.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/webhook/DeleteWebhook.kt deleted file mode 100644 index 24ae2bb00a..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/webhook/DeleteWebhook.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.webhook - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.webhook.DeleteWebhook - -suspend fun RequestsExecutor.deleteWebhook() = execute(DeleteWebhook()) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/webhook/GetWebhookInfo.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/webhook/GetWebhookInfo.kt deleted file mode 100644 index e8547f44d6..0000000000 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/webhook/GetWebhookInfo.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.webhook - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.webhook.GetWebhookInfo - -suspend fun RequestsExecutor.getWebhookInfo() = execute(GetWebhookInfo()) diff --git a/TelegramBotAPI-extensions-utils/mpp_publish_template.kpsb b/TelegramBotAPI-extensions-utils/mpp_publish_template.kpsb deleted file mode 100644 index 9e43483fe6..0000000000 --- a/TelegramBotAPI-extensions-utils/mpp_publish_template.kpsb +++ /dev/null @@ -1 +0,0 @@ -{"bintrayConfig":{"repo":"StandardRepository","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Utility Extensions","description":"Util extensions for more useful work with updates and other things","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-utils","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"} \ No newline at end of file diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/types/buttons/InlineKeyboardMarkup.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/types/buttons/InlineKeyboardMarkup.kt deleted file mode 100644 index af50542ebf..0000000000 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/types/buttons/InlineKeyboardMarkup.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.types.buttons - -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardButtons.InlineKeyboardButton -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.utils.flatMatrix - -fun InlineKeyboardMarkup( - vararg buttons: InlineKeyboardButton -): InlineKeyboardMarkup = InlineKeyboardMarkup( - flatMatrix { buttons.forEach { +it } } -) diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/updates/UpdateDeserialization.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/updates/UpdateDeserialization.kt deleted file mode 100644 index b8c889e624..0000000000 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/updates/UpdateDeserialization.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates - -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.nonstrictJsonFormat -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UpdateDeserializationStrategy -import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonElement - -/** - * @return Deserialize [source] as [com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update] - */ -fun Json.toTelegramUpdate(source: String) = decodeFromString(UpdateDeserializationStrategy, source) -/** - * @return Deserialize [source] as [com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update] - */ -fun Json.toTelegramUpdate(source: JsonElement) = decodeFromJsonElement(UpdateDeserializationStrategy, source) - -/** - * @return Deserialize [this] as [com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update]. In fact, - * it is must be JSON - * - * @see Json.toTelegramUpdate - */ -fun String.toTelegramUpdate() = nonstrictJsonFormat.toTelegramUpdate(this) -/** - * @return Deserialize [this] as [com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update] - * - * @see Json.toTelegramUpdate - */ -fun JsonElement.toTelegramUpdate() = nonstrictJsonFormat.toTelegramUpdate(this) - - diff --git a/TelegramBotAPI.minder b/TelegramBotAPI.minder index 464b9c0203..fc9d92ae8b 100644 --- a/TelegramBotAPI.minder +++ b/TelegramBotAPI.minder @@ -1,81 +1,125 @@ - + -