diff --git a/CHANGELOG.md b/CHANGELOG.md index 022ae2d1ba..2474fb4b88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -246,7 +246,7 @@ * `TelegramBotAPI`: * `UnknownUpdateType` was renamed to `UnknownUpdate` * Refactoring and optimization of `FlowsUpdatesFilter` - * `Venue` type was replaced to a new package: `com.github.insanusmokrassar.TelegramBotAPI.types.venue.Venue` + * `Venue` type was replaced to a new package: `dev.inmo.tgbotapi.types.venue.Venue` * `Venue` type now implements `Locationed` and delegate realisation to its `location` field * `FoursquareId` and `FoursquareType` typealiases were added * `TelegramBotAPI-extensions-utils`: @@ -410,7 +410,7 @@ * `GetMyCommands` request was added * `SetMyCommands` request was added * `GetMe` now is object instead of class - * `GetMe` was replaced into package `com.github.insanusmokrassar.TelegramBotAPI.requests.bot.GetMe` + * `GetMe` was replaced into package `dev.inmo.tgbotapi.requests.bot.GetMe` * `CreateNewStickerSet` renamed to `CreateStaticNewStickerSet` * `CreateNewAnimatedStickerSet` request was added (it handle work with `tgs_sticker`) * `StickerSet#thumb` was added @@ -425,7 +425,7 @@ * Extensions `sendDice` was added * Extension `getMyCommands` request was added * Extension `setMyCommands` request was added - * Extension `getMe` was replaced into package `com.github.insanusmokrassar.TelegramBotAPI.extensions.api.bot.GetMeKt.getMe` + * Extension `getMe` was replaced into package `dev.inmo.tgbotapi.extensions.api.bot.GetMeKt.getMe` * **All extensions `createNewStickerSet` was renamed to `createNewStaticStickerSet`** * Extensions `createNewAnimatedStickerSet` was added * **All extensions `addStickerToSet` was renamed to `addStaticStickerToSet`** @@ -546,8 +546,8 @@ ### 0.24.1 * `TelegramBotAPI`: - * `UpdateReceiver` was replaced to the package `com.github.insanusmokrassar.TelegramBotAPI.updateshandlers` - * All functions inside `com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.UpdatesPolling` are deprecated + * `UpdateReceiver` was replaced to the package `dev.inmo.tgbotapi.updateshandlers` + * All functions inside `dev.inmo.tgbotapi.utils.extensions.UpdatesPolling` are deprecated and will be removed in some soon versions. Their replacement are able inside `TelegramBotAPI-extensions-api` * `UpdatesFilter` is interface for now * Previous `UpdatesFilter` class was renamed to `SimpleUpdatesFilter` and for backward compatibility was added @@ -563,8 +563,8 @@ * `KtorRequestsExecutor` now is using a copy of incoming `HttpClient` object and install `HttpTimeout` feature * `AbstractRequestCallFactory` now setting up a custom delay in case if request is `GetUpdates` * `TelegramBotAPI-extensions-api`: - * All functions from `com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.UpdatesPolling` now available - in package `com.github.insanusmokrassar.TelegramBotAPI.extensions.api.updates.UpdatesPolling` + * All functions from `dev.inmo.tgbotapi.utils.extensions.UpdatesPolling` now available + in package `dev.inmo.tgbotapi.extensions.api.updates.UpdatesPolling` * Now new method of getting updates available: `startGettingUpdates` with `UpdatesFilter` as incoming first parameter * `startGettingUpdates` with `receiver` and `allowedUpdates` parameters now will handle updates by itself @@ -797,29 +797,29 @@ bot. * `requestSerializer` - field, which must provide serializer of current type * `resultDeserializer` - field, which must provide opportunity to deserializer result. Previously it was a function * Removed deprecations: - * `com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.WebhookPrivateKeyConfig` - * `com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.UpdatesFilter` - * `com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.createSimpleUpdateFilter` - * `com.github.insanusmokrassar.TelegramBotAPI.utils.createMarkdownText` - * `com.github.insanusmokrassar.TelegramBotAPI.utils.toMarkdownCaption` - * `com.github.insanusmokrassar.TelegramBotAPI.utils.toMarkdownText` - * `com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.KtorUpdatesPoller` - * `com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.CaptionedMediaContent` - * `com.github.insanusmokrassar.TelegramBotAPI.types.message.CommonForwardedMessage` - * `com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.CaptionedInputMedia` - * `com.github.insanusmokrassar.TelegramBotAPI.types.games.Game#text` - * `com.github.insanusmokrassar.TelegramBotAPI.types.games.Game#textEntities` - * `com.github.insanusmokrassar.TelegramBotAPI.types.files.PathedFileKt.makeFileUrl` - * `com.github.insanusmokrassar.TelegramBotAPI.types.files.PathedFileKt.downloadingFilesBaseUrl` - * `com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.Data` - * `com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ByInlineMessageId` - * `com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ByMessageId` - * `com.github.insanusmokrassar.TelegramBotAPI.bot.RequestException` - * `com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.ReplyMessageNotFound` - * `com.github.insanusmokrassar.TelegramBotAPI.bot.BaseRequestsExecutor#baseUrl` - * `com.github.insanusmokrassar.TelegramBotAPI.bot.BaseRequestsExecutor#constructor(token, hostUrl)` - * `com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorRequestsExecutor#constructor(token, client, hostUrl, callsFactories, excludeDefaultFactories, requestsLimiter, jsonFormatter)` - * `com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorRequestsExecutor#constructor(token, engine, hostUrl)` + * `dev.inmo.tgbotapi.utils.extensions.WebhookPrivateKeyConfig` + * `dev.inmo.tgbotapi.utils.extensions.UpdatesFilter` + * `dev.inmo.tgbotapi.utils.extensions.createSimpleUpdateFilter` + * `dev.inmo.tgbotapi.utils.createMarkdownText` + * `dev.inmo.tgbotapi.utils.toMarkdownCaption` + * `dev.inmo.tgbotapi.utils.toMarkdownText` + * `dev.inmo.tgbotapi.updateshandlers.KtorUpdatesPoller` + * `dev.inmo.tgbotapi.types.message.content.abstracts.CaptionedMediaContent` + * `dev.inmo.tgbotapi.types.message.CommonForwardedMessage` + * `dev.inmo.tgbotapi.types.InputMedia.CaptionedInputMedia` + * `dev.inmo.tgbotapi.types.games.Game#text` + * `dev.inmo.tgbotapi.types.games.Game#textEntities` + * `dev.inmo.tgbotapi.types.files.PathedFileKt.makeFileUrl` + * `dev.inmo.tgbotapi.types.files.PathedFileKt.downloadingFilesBaseUrl` + * `dev.inmo.tgbotapi.requests.send.media.base.Data` + * `dev.inmo.tgbotapi.CommonAbstracts.types.ByInlineMessageId` + * `dev.inmo.tgbotapi.CommonAbstracts.types.ByMessageId` + * `dev.inmo.tgbotapi.bot.RequestException` + * `dev.inmo.tgbotapi.bot.exceptions.ReplyMessageNotFound` + * `dev.inmo.tgbotapi.bot.BaseRequestsExecutor#baseUrl` + * `dev.inmo.tgbotapi.bot.BaseRequestsExecutor#constructor(token, hostUrl)` + * `dev.inmo.tgbotapi.bot.Ktor.KtorRequestsExecutor#constructor(token, client, hostUrl, callsFactories, excludeDefaultFactories, requestsLimiter, jsonFormatter)` + * `dev.inmo.tgbotapi.bot.Ktor.KtorRequestsExecutor#constructor(token, engine, hostUrl)` ## 0.18.0 Raws cleaning @@ -955,7 +955,7 @@ some default library by their parents * `StopPoll` implemented * All current `Chat` abstractions are deprecated and rewritten as typealiases. Use `Chat` abstractions from -`com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts` package +`dev.inmo.tgbotapi.types.chat.abstracts` package * Common Groups now may have pinned message * `is_member` field added into `RestrictedChatMember` * **BREAK CHANGES** Now `ForwardedMessages` can be `AnonymousForwardedMessage` and `PublicForwardedMessage`. Old @@ -1084,7 +1084,7 @@ work with media groups lists ## 0.9.0 * Old extension `OkHttpClient.Builder#useWith` now deprecated and must be replaced by the same in -`com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor` package +`dev.inmo.tgbotapi.bot.Ktor` package * Replace `ProxySettings` data class in `settings` package, deprecate old link * `BaseRequestsExecutor` now have no it's own scope * Add `RequestLimiter` and base realisations 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/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 5680a0e843..0000000000 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/VoiceContent.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.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, - 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/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt new file mode 100644 index 0000000000..e9145102ab --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt @@ -0,0 +1,26 @@ +package dev.inmo.tgbotapi.CommonAbstracts + +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.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 [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource] + * @see [CaptionedInput.fullEntitiesList] + */ + val captionEntities: List +} + +/** + * Convert its [CaptionedInput.captionEntities] to list of [dev.inmo.tgbotapi.CommonAbstracts.TextSource] + * with [dev.inmo.tgbotapi.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/CommonContactData.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/CommonContactData.kt similarity index 72% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/CommonContactData.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/CommonContactData.kt index 0a7d4b09fc..760f7c6183 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/CommonContactData.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/CommonContactData.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts +package dev.inmo.tgbotapi.CommonAbstracts interface CommonContactData { val phoneNumber: String diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/CommonVenueData.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/CommonVenueData.kt similarity index 74% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/CommonVenueData.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/CommonVenueData.kt index fa5dbd0cf2..6ee7716366 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/CommonVenueData.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/CommonVenueData.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts +package dev.inmo.tgbotapi.CommonAbstracts interface CommonVenueData : Titled { override val title: String diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Explained.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt similarity index 52% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Explained.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt index 4cebc2ed29..ef79db3bb2 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Explained.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts +package dev.inmo.tgbotapi.CommonAbstracts -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.utils.fullListOfSubSource +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.utils.fullListOfSubSource interface Explained { val explanation: String? @@ -13,14 +13,14 @@ interface ExplainedOutput : Explained { interface ExplainedInput : Explained { /** - * Not full list of entities. This list WILL NOT contain [TextPart]s with [com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource] + * Not full list of entities. This list WILL NOT contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource] * @see [ExplainedInput.fullEntitiesList] */ val explanationEntities: List } /** - * Convert its [ExplainedInput.explanationEntities] to list of [com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource] - * with [com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource] + * Convert its [ExplainedInput.explanationEntities] to list of [dev.inmo.tgbotapi.CommonAbstracts.TextSource] + * with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource] */ fun ExplainedInput.fullEntitiesList(): FullTextSourcesList = explanation ?.fullListOfSubSource(explanationEntities) ?.map { it.source } ?: emptyList() diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Livable.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Livable.kt similarity index 56% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Livable.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Livable.kt index d0f268a2d9..228adeb9f8 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Livable.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Livable.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts +package dev.inmo.tgbotapi.CommonAbstracts interface Livable { /** diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Locationed.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Locationed.kt similarity index 53% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Locationed.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Locationed.kt index 0544a94e0c..3e415bfeef 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Locationed.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Locationed.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts +package dev.inmo.tgbotapi.CommonAbstracts interface Locationed { val latitude: Double diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/MimeTyped.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/MimeTyped.kt new file mode 100644 index 0000000000..189c60a938 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/MimeTyped.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.CommonAbstracts + +import dev.inmo.tgbotapi.utils.MimeType + +interface MimeTyped { + val mimeType: MimeType? +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Performerable.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Performerable.kt new file mode 100644 index 0000000000..c06b741171 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Performerable.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.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/TextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt similarity index 87% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/TextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt index 828c494c7b..95bbd565b8 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/TextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts +package dev.inmo.tgbotapi.CommonAbstracts typealias FullTextSourcesList = List typealias FullTextPartsList = List diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Titled.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Titled.kt new file mode 100644 index 0000000000..debf9fd34c --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Titled.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.CommonAbstracts + +interface Titled { + val title: String? +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ChatRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ChatRequest.kt new file mode 100644 index 0000000000..bdf3ba4e1b --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ChatRequest.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.CommonAbstracts.types + +import dev.inmo.tgbotapi.types.ChatIdentifier + +interface ChatRequest { + val chatId: ChatIdentifier +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/DisableNotification.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/DisableNotification.kt new file mode 100644 index 0000000000..76a5f02333 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/DisableNotification.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.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/DisableWebPagePreview.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/DisableWebPagePreview.kt similarity index 51% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/DisableWebPagePreview.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/DisableWebPagePreview.kt index 34636ed4b0..baf255c9d5 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/DisableWebPagePreview.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/DisableWebPagePreview.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types +package dev.inmo.tgbotapi.CommonAbstracts.types interface DisableWebPagePreview { val disableWebPagePreview: Boolean? diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/InlineMessageAction.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/InlineMessageAction.kt new file mode 100644 index 0000000000..635c3d3f2f --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/InlineMessageAction.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.CommonAbstracts.types + +import dev.inmo.tgbotapi.types.InlineMessageIdentifier + +interface InlineMessageAction { + val inlineMessageId: InlineMessageIdentifier +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/MessageAction.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/MessageAction.kt new file mode 100644 index 0000000000..1dc9d05386 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/MessageAction.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.CommonAbstracts.types + +import dev.inmo.tgbotapi.types.MessageIdentifier + +interface MessageAction: ChatRequest { + val messageId: MessageIdentifier +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ReplyMarkup.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ReplyMarkup.kt new file mode 100644 index 0000000000..54aeae97df --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ReplyMarkup.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.CommonAbstracts.types + +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup + +interface ReplyMarkup { + val replyMarkup: KeyboardMarkup? +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ReplyMessageId.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ReplyMessageId.kt new file mode 100644 index 0000000000..4acaca76f2 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ReplyMessageId.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.CommonAbstracts.types + +import dev.inmo.tgbotapi.types.MessageIdentifier + +interface ReplyMessageId { + val replyToMessageId: MessageIdentifier? +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/UntilDate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/UntilDate.kt new file mode 100644 index 0000000000..515e56159a --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/UntilDate.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.CommonAbstracts.types + +import dev.inmo.tgbotapi.types.TelegramDate + +interface UntilDate { + val untilDate: TelegramDate? +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/BaseRequestsExecutor.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/BaseRequestsExecutor.kt new file mode 100644 index 0000000000..2c433bed4c --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/BaseRequestsExecutor.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.bot + +import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper + +abstract class BaseRequestsExecutor( + protected val telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper +) : RequestsExecutor diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/KtorCallFactory.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorCallFactory.kt similarity index 56% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/KtorCallFactory.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorCallFactory.kt index 7b7b33e32b..859f7a4113 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/KtorCallFactory.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorCallFactory.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor +package dev.inmo.tgbotapi.bot.Ktor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper import io.ktor.client.HttpClient import kotlinx.serialization.json.Json diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/KtorRequestsExecutor.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorRequestsExecutor.kt similarity index 77% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/KtorRequestsExecutor.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorRequestsExecutor.kt index 4c48ebc69b..909f3a72ad 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/KtorRequestsExecutor.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorRequestsExecutor.kt @@ -1,13 +1,13 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor +package dev.inmo.tgbotapi.bot.Ktor -import com.github.insanusmokrassar.TelegramBotAPI.bot.BaseRequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.base.* -import com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.newRequestException -import com.github.insanusmokrassar.TelegramBotAPI.bot.settings.limiters.EmptyLimiter -import com.github.insanusmokrassar.TelegramBotAPI.bot.settings.limiters.RequestLimiter -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.types.Response -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.bot.BaseRequestsExecutor +import dev.inmo.tgbotapi.bot.Ktor.base.* +import dev.inmo.tgbotapi.bot.exceptions.newRequestException +import dev.inmo.tgbotapi.bot.settings.limiters.EmptyLimiter +import dev.inmo.tgbotapi.bot.settings.limiters.RequestLimiter +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.types.Response +import dev.inmo.tgbotapi.utils.* import io.ktor.client.HttpClient import io.ktor.client.features.* import io.ktor.client.statement.HttpStatement diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/AbstractRequestCallFactory.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/AbstractRequestCallFactory.kt similarity index 81% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/AbstractRequestCallFactory.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/AbstractRequestCallFactory.kt index 1aff3d8a98..a925ed38c2 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/AbstractRequestCallFactory.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/AbstractRequestCallFactory.kt @@ -1,12 +1,12 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.base +package dev.inmo.tgbotapi.bot.Ktor.base -import com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorCallFactory -import com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.newRequestException -import com.github.insanusmokrassar.TelegramBotAPI.requests.GetUpdates -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.types.Response -import com.github.insanusmokrassar.TelegramBotAPI.types.RetryAfterError -import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper +import dev.inmo.tgbotapi.bot.Ktor.KtorCallFactory +import dev.inmo.tgbotapi.bot.exceptions.newRequestException +import dev.inmo.tgbotapi.requests.GetUpdates +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.types.Response +import dev.inmo.tgbotapi.types.RetryAfterError +import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper import io.ktor.client.HttpClient import io.ktor.client.call.receive import io.ktor.client.features.timeout diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/DownloadFileRequestCallFactory.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/DownloadFileRequestCallFactory.kt similarity index 56% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/DownloadFileRequestCallFactory.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/DownloadFileRequestCallFactory.kt index 31ac3f7c11..80a11d0912 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/DownloadFileRequestCallFactory.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/DownloadFileRequestCallFactory.kt @@ -1,11 +1,11 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.base +package dev.inmo.tgbotapi.bot.Ktor.base -import com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorCallFactory -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.DownloadFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper -import com.github.insanusmokrassar.TelegramBotAPI.utils.handleSafely +import dev.inmo.tgbotapi.bot.Ktor.KtorCallFactory +import dev.inmo.tgbotapi.bot.RequestsExecutor +import dev.inmo.tgbotapi.requests.DownloadFile +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper +import dev.inmo.tgbotapi.utils.handleSafely import io.ktor.client.HttpClient import io.ktor.client.request.* import io.ktor.client.statement.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/MultipartRequestCallFactory.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/MultipartRequestCallFactory.kt similarity index 82% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/MultipartRequestCallFactory.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/MultipartRequestCallFactory.kt index 6ec311d1f4..ed440617ad 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/MultipartRequestCallFactory.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/MultipartRequestCallFactory.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.base +package dev.inmo.tgbotapi.bot.Ktor.base -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper -import com.github.insanusmokrassar.TelegramBotAPI.utils.mapWithCommonValues +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper +import dev.inmo.tgbotapi.utils.mapWithCommonValues import io.ktor.client.HttpClient import io.ktor.client.request.forms.MultiPartFormDataContent import io.ktor.client.request.forms.formData diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/SimpleRequestCallFactory.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/SimpleRequestCallFactory.kt similarity index 70% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/SimpleRequestCallFactory.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/SimpleRequestCallFactory.kt index 4b21b32879..8dba9b73e5 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/SimpleRequestCallFactory.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/SimpleRequestCallFactory.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.base +package dev.inmo.tgbotapi.bot.Ktor.base -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper import io.ktor.client.HttpClient import io.ktor.http.ContentType import io.ktor.http.content.TextContent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/RequestsExecutor.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/RequestsExecutor.kt new file mode 100644 index 0000000000..bd56503202 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/RequestsExecutor.kt @@ -0,0 +1,24 @@ +package dev.inmo.tgbotapi.bot + +import dev.inmo.tgbotapi.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 - + * [dev.inmo.tgbotapi.bot.Ktor.KtorRequestsExecutor] + * + * @see Request + * @see dev.inmo.tgbotapi.bot.Ktor.KtorRequestsExecutor + */ +interface RequestsExecutor : Closeable { + /** + * Unsafe execution of incoming [request]. Can throw almost any exception. So, it is better to use + * something like [dev.inmo.tgbotapi.extensions.utils.shortcuts.executeAsync] or + * [dev.inmo.tgbotapi.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/bot/exceptions/RequestException.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/exceptions/RequestException.kt similarity index 94% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/exceptions/RequestException.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/exceptions/RequestException.kt index 594771cdd5..de4d1d0480 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/exceptions/RequestException.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/exceptions/RequestException.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions +package dev.inmo.tgbotapi.bot.exceptions -import com.github.insanusmokrassar.TelegramBotAPI.types.Response +import dev.inmo.tgbotapi.types.Response import io.ktor.utils.io.errors.IOException fun newRequestException( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/ProxySettings.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/ProxySettings.kt similarity index 77% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/ProxySettings.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/ProxySettings.kt index ba83791ef3..ef43649d2f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/ProxySettings.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/ProxySettings.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot.settings +package dev.inmo.tgbotapi.bot.settings import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/CommonLimiter.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/CommonLimiter.kt similarity index 96% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/CommonLimiter.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/CommonLimiter.kt index c148c333e5..4910440856 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/CommonLimiter.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/CommonLimiter.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot.settings.limiters +package dev.inmo.tgbotapi.bot.settings.limiters import com.soywiz.klock.DateTime import kotlinx.coroutines.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/EmptyLimiter.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/EmptyLimiter.kt similarity index 60% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/EmptyLimiter.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/EmptyLimiter.kt index c0a24f1885..d643aa1d9d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/EmptyLimiter.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/EmptyLimiter.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot.settings.limiters +package dev.inmo.tgbotapi.bot.settings.limiters object EmptyLimiter : RequestLimiter { override suspend fun limit(block: suspend () -> T): T = block() diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/PowLimiter.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/PowLimiter.kt similarity index 96% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/PowLimiter.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/PowLimiter.kt index 5a7f97c950..910cc03988 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/PowLimiter.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/PowLimiter.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot.settings.limiters +package dev.inmo.tgbotapi.bot.settings.limiters import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/RequestLimiter.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/RequestLimiter.kt similarity index 71% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/RequestLimiter.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/RequestLimiter.kt index 8abc707151..a23ed0b97c 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/RequestLimiter.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/RequestLimiter.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot.settings.limiters +package dev.inmo.tgbotapi.bot.settings.limiters interface RequestLimiter { /** diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/DeleteMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/DeleteMessage.kt similarity index 66% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/DeleteMessage.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/DeleteMessage.kt index 42a12caa77..aab60bae65 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/DeleteMessage.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/DeleteMessage.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests +package dev.inmo.tgbotapi.requests -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/DownloadFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/DownloadFile.kt similarity index 71% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/DownloadFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/DownloadFile.kt index 28787e39f0..5acf1a49b1 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/DownloadFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/DownloadFile.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests +package dev.inmo.tgbotapi.requests -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.abstracts.Request import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.builtins.ByteArraySerializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/ForwardMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/ForwardMessage.kt similarity index 64% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/ForwardMessage.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/ForwardMessage.kt index 21c92f71cd..5428305ec6 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/ForwardMessage.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/ForwardMessage.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests +package dev.inmo.tgbotapi.requests -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.PossiblyForwardedMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.message.abstracts.PossiblyForwardedMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass import kotlinx.serialization.* private val AbleToBeForwardedMessageDeserializer = TelegramBotAPIMessageDeserializationStrategyClass() diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/GetUpdates.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/GetUpdates.kt similarity index 52% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/GetUpdates.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/GetUpdates.kt index 792664a3e4..e603a53d1c 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/GetUpdates.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/GetUpdates.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests +package dev.inmo.tgbotapi.requests -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UpdateSerializerWithoutSerialization +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.update.abstracts.Update +import dev.inmo.tgbotapi.types.update.abstracts.UpdateSerializerWithoutSerialization import kotlinx.serialization.* import kotlinx.serialization.builtins.ListSerializer @@ -13,12 +13,12 @@ private val updatesListSerializer = ListSerializer( /** * Request updates from Telegram Bot API system. It is important, that the result updates WILL NOT include - * [com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.MediaGroupUpdate] objects due to the fact, - * that it is internal abstraction and in fact any [com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage] - * is just a common [com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message] + * [dev.inmo.tgbotapi.types.update.MediaGroupUpdates.MediaGroupUpdate] objects due to the fact, + * that it is internal abstraction and in fact any [dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage] + * is just a common [dev.inmo.tgbotapi.types.message.abstracts.Message] * - * @see com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.retrieving.updateHandlerWithMediaGroupsAdaptation - * @see com.github.insanusmokrassar.TelegramBotAPI.utils.convertWithMediaGroupUpdates + * @see dev.inmo.tgbotapi.extensions.utils.updates.retrieving.updateHandlerWithMediaGroupsAdaptation + * @see dev.inmo.tgbotapi.utils.convertWithMediaGroupUpdates */ @Serializable data class GetUpdates( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/StopPoll.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/StopPoll.kt similarity index 53% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/StopPoll.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/StopPoll.kt index 9b8b83166b..307fe0dda2 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/StopPoll.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/StopPoll.kt @@ -1,11 +1,11 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests +package dev.inmo.tgbotapi.requests -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMarkup -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.polls.Poll +import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction +import dev.inmo.tgbotapi.CommonAbstracts.types.ReplyMarkup +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.polls.Poll import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/InputFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFile.kt similarity index 86% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/InputFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFile.kt index 400b65d425..653d09f957 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/InputFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFile.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts +package dev.inmo.tgbotapi.requests.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.toInputMediaFileAttachmentName -import com.github.insanusmokrassar.TelegramBotAPI.utils.StorageFile +import dev.inmo.tgbotapi.types.InputMedia.toInputMediaFileAttachmentName +import dev.inmo.tgbotapi.utils.StorageFile import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.Decoder diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/MultipartRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/MultipartRequest.kt similarity index 71% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/MultipartRequest.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/MultipartRequest.kt index 33199b0a07..4e4385866f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/MultipartRequest.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/MultipartRequest.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts +package dev.inmo.tgbotapi.requests.abstracts import kotlinx.serialization.json.JsonObject diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/Request.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/Request.kt similarity index 70% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/Request.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/Request.kt index de65338005..1cc88f15f6 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/Request.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/Request.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts +package dev.inmo.tgbotapi.requests.abstracts import kotlinx.serialization.DeserializationStrategy diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/SimpleRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/SimpleRequest.kt similarity index 71% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/SimpleRequest.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/SimpleRequest.kt index 89ba8af5b5..9ce8def523 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/SimpleRequest.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/SimpleRequest.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts +package dev.inmo.tgbotapi.requests.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.utils.toJsonWithoutNulls +import dev.inmo.tgbotapi.utils.toJsonWithoutNulls import kotlinx.serialization.SerializationStrategy import kotlinx.serialization.json.JsonObject diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/AnswerCallbackQuery.kt similarity index 77% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerCallbackQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/AnswerCallbackQuery.kt index 077255c52c..ecb76c60a9 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerCallbackQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/AnswerCallbackQuery.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.answers +package dev.inmo.tgbotapi.requests.answers -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery.CallbackQuery +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.CallbackQuery.CallbackQuery import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerInlineQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/AnswerInlineQuery.kt similarity index 74% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerInlineQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/AnswerInlineQuery.kt index 039c038243..ef5a9aeb0c 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerInlineQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/AnswerInlineQuery.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.answers +package dev.inmo.tgbotapi.requests.answers -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.serializers.InlineQueryResultSerializer -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InlineQuery +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.serializers.InlineQueryResultSerializer +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery import kotlinx.serialization.* import kotlinx.serialization.builtins.ListSerializer import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerPreCheckoutQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/AnswerPreCheckoutQuery.kt similarity index 75% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerPreCheckoutQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/AnswerPreCheckoutQuery.kt index ff7d297270..ba67aeb669 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerPreCheckoutQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/AnswerPreCheckoutQuery.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments +package dev.inmo.tgbotapi.requests.answers.payments -import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.abstracts.AnswerPreCheckoutQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.PreCheckoutQuery +import dev.inmo.tgbotapi.requests.answers.payments.abstracts.AnswerPreCheckoutQuery +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.payments.PreCheckoutQuery import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerShippingQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/AnswerShippingQuery.kt similarity index 77% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerShippingQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/AnswerShippingQuery.kt index 5e61840797..468e81a323 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerShippingQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/AnswerShippingQuery.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments +package dev.inmo.tgbotapi.requests.answers.payments -import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.abstracts.AnswerShippingQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.ShippingOption -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.ShippingQuery +import dev.inmo.tgbotapi.requests.answers.payments.abstracts.AnswerShippingQuery +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.payments.ShippingOption +import dev.inmo.tgbotapi.types.payments.ShippingQuery import kotlinx.serialization.* import kotlinx.serialization.builtins.ListSerializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/abstracts/AnswerPreCheckoutQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/abstracts/AnswerPreCheckoutQuery.kt similarity index 60% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/abstracts/AnswerPreCheckoutQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/abstracts/AnswerPreCheckoutQuery.kt index 4fcca89ae9..9dbde3d8b0 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/abstracts/AnswerPreCheckoutQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/abstracts/AnswerPreCheckoutQuery.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.abstracts +package dev.inmo.tgbotapi.requests.answers.payments.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.PreCheckoutQueryId +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.PreCheckoutQueryId import kotlinx.serialization.KSerializer import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/abstracts/AnswerShippingQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/abstracts/AnswerShippingQuery.kt similarity index 61% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/abstracts/AnswerShippingQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/abstracts/AnswerShippingQuery.kt index 49dcba9c5e..eb92ae7e27 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/abstracts/AnswerShippingQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/abstracts/AnswerShippingQuery.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.abstracts +package dev.inmo.tgbotapi.requests.answers.payments.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.ShippingQueryIdentifier +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.ShippingQueryIdentifier import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/bot/GetMe.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMe.kt similarity index 61% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/bot/GetMe.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMe.kt index b200c34dbd..96bff01892 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/bot/GetMe.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMe.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.bot +package dev.inmo.tgbotapi.requests.bot -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.ExtendedBot +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.ExtendedBot import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/bot/GetMyCommands.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyCommands.kt similarity index 69% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/bot/GetMyCommands.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyCommands.kt index a7a3c764bb..ebb3ee54d2 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/bot/GetMyCommands.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyCommands.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.bot +package dev.inmo.tgbotapi.requests.bot -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.BotCommand +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.BotCommand import kotlinx.serialization.* import kotlinx.serialization.builtins.ListSerializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/bot/SetMyCommands.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyCommands.kt similarity index 76% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/bot/SetMyCommands.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyCommands.kt index 44456d5787..1e8e068328 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/bot/SetMyCommands.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyCommands.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.bot +package dev.inmo.tgbotapi.requests.bot -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/ExportChatInviteLink.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/ExportChatInviteLink.kt similarity index 57% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/ExportChatInviteLink.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/ExportChatInviteLink.kt index 67bcb3b17a..e6ea3b66ca 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/ExportChatInviteLink.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/ExportChatInviteLink.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat +package dev.inmo.tgbotapi.requests.chat -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.chatIdField +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chatIdField import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/LeaveChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/LeaveChat.kt similarity index 56% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/LeaveChat.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/LeaveChat.kt index 5148f965ca..fb2c6f6103 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/LeaveChat.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/LeaveChat.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat +package dev.inmo.tgbotapi.requests.chat -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.chatIdField +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chatIdField import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/abstracts/ChatMemberRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/abstracts/ChatMemberRequest.kt new file mode 100644 index 0000000000..aeec27c5de --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/abstracts/ChatMemberRequest.kt @@ -0,0 +1,9 @@ +package dev.inmo.tgbotapi.requests.chat.abstracts + +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.UserId + +interface ChatMemberRequest : ChatRequest, SimpleRequest { + val userId: UserId +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChat.kt new file mode 100644 index 0000000000..1fb8cc79e7 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChat.kt @@ -0,0 +1,21 @@ +package dev.inmo.tgbotapi.requests.chat.get + +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chat.ExtendedChatSerializer +import dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat +import dev.inmo.tgbotapi.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/chat/get/GetChatAdministrators.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatAdministrators.kt similarity index 52% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatAdministrators.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatAdministrators.kt index 28853f1f74..413e71d424 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatAdministrators.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatAdministrators.kt @@ -1,11 +1,11 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get +package dev.inmo.tgbotapi.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.ChatMember.abstracts.AdministratorChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.AdministratorChatMemberSerializerWithoutDeserialization -import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember +import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMemberSerializerWithoutDeserialization +import dev.inmo.tgbotapi.types.chatIdField import kotlinx.serialization.* import kotlinx.serialization.builtins.ListSerializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatMembersCount.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatMembersCount.kt similarity index 56% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatMembersCount.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatMembersCount.kt index 247f55b303..9a7c11c0ff 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatMembersCount.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatMembersCount.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get +package dev.inmo.tgbotapi.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.chatIdField +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chatIdField import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/GetChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/GetChatMember.kt similarity index 54% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/GetChatMember.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/GetChatMember.kt index 7ec1b18bab..1a6ab610ca 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/GetChatMember.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/GetChatMember.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members +package dev.inmo.tgbotapi.requests.chat.members -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMemberDeserializationStrategy +import dev.inmo.tgbotapi.requests.chat.abstracts.ChatMemberRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember +import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMemberDeserializationStrategy import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/KickChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/KickChatMember.kt similarity index 67% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/KickChatMember.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/KickChatMember.kt index 5037ab339f..6074de0d79 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/KickChatMember.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/KickChatMember.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members +package dev.inmo.tgbotapi.requests.chat.members -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.UntilDate -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.CommonAbstracts.types.UntilDate +import dev.inmo.tgbotapi.requests.chat.abstracts.ChatMemberRequest +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/PromoteChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/PromoteChatMember.kt similarity index 81% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/PromoteChatMember.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/PromoteChatMember.kt index 1be36db1fd..0489a54374 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/PromoteChatMember.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/PromoteChatMember.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members +package dev.inmo.tgbotapi.requests.chat.members -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.UntilDate -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.CommonAbstracts.types.UntilDate +import dev.inmo.tgbotapi.requests.chat.abstracts.ChatMemberRequest +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/RestrictChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/RestrictChatMember.kt similarity index 65% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/RestrictChatMember.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/RestrictChatMember.kt index 8c6d255e76..0e8e96d691 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/RestrictChatMember.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/RestrictChatMember.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members +package dev.inmo.tgbotapi.requests.chat.members -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.UntilDate -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ChatPermissions +import dev.inmo.tgbotapi.CommonAbstracts.types.UntilDate +import dev.inmo.tgbotapi.requests.chat.abstracts.ChatMemberRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.ChatPermissions import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/SetChatAdministratorCustomTitle.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/SetChatAdministratorCustomTitle.kt similarity index 79% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/SetChatAdministratorCustomTitle.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/SetChatAdministratorCustomTitle.kt index c914522a27..1adafd2c34 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/SetChatAdministratorCustomTitle.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/SetChatAdministratorCustomTitle.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members +package dev.inmo.tgbotapi.requests.chat.members -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.requests.chat.abstracts.ChatMemberRequest +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/UnbanChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/UnbanChatMember.kt similarity index 70% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/UnbanChatMember.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/UnbanChatMember.kt index 3c82edcb31..6aef8178e3 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/UnbanChatMember.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/UnbanChatMember.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members +package dev.inmo.tgbotapi.requests.chat.members -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.requests.chat.abstracts.ChatMemberRequest +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/DeleteChatPhoto.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/DeleteChatPhoto.kt similarity index 56% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/DeleteChatPhoto.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/DeleteChatPhoto.kt index e3370a1efd..8a54a38e49 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/DeleteChatPhoto.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/DeleteChatPhoto.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify +package dev.inmo.tgbotapi.requests.chat.modify -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.chatIdField +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chatIdField import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/PinChatMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/PinChatMessage.kt similarity index 70% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/PinChatMessage.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/PinChatMessage.kt index 41af62b0c3..e3ea186dcc 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/PinChatMessage.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/PinChatMessage.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify +package dev.inmo.tgbotapi.requests.chat.modify -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.CommonAbstracts.types.* +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatDescription.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatDescription.kt similarity index 71% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatDescription.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatDescription.kt index 011d4680e0..991aef059d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatDescription.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatDescription.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify +package dev.inmo.tgbotapi.requests.chat.modify -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPermissions.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatPermissions.kt similarity index 60% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPermissions.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatPermissions.kt index e0e075c75a..c4dc462708 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPermissions.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatPermissions.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify +package dev.inmo.tgbotapi.requests.chat.modify -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ChatPermissions +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.ChatPermissions import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPhoto.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatPhoto.kt similarity index 61% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPhoto.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatPhoto.kt index 6af5b3cfbb..f439f7e80a 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPhoto.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatPhoto.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify +package dev.inmo.tgbotapi.requests.chat.modify -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.toJson +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.abstracts.MultipartRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.utils.toJson import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer import kotlinx.serialization.json.JsonObject diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatTitle.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatTitle.kt similarity index 70% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatTitle.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatTitle.kt index ac88f69f25..4d9f1a9b90 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatTitle.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatTitle.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify +package dev.inmo.tgbotapi.requests.chat.modify -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/UnpinChatMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/UnpinChatMessage.kt similarity index 56% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/UnpinChatMessage.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/UnpinChatMessage.kt index 8e9c2772c4..456d0649b9 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/UnpinChatMessage.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/UnpinChatMessage.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify +package dev.inmo.tgbotapi.requests.chat.modify -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.chatIdField +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chatIdField import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/stickers/DeleteChatStickerSet.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/stickers/DeleteChatStickerSet.kt similarity index 56% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/stickers/DeleteChatStickerSet.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/stickers/DeleteChatStickerSet.kt index e44237b1fa..f70cf62aa5 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/stickers/DeleteChatStickerSet.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/stickers/DeleteChatStickerSet.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.stickers +package dev.inmo.tgbotapi.requests.chat.stickers -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.chatIdField +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chatIdField import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/stickers/SetChatStickerSet.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/stickers/SetChatStickerSet.kt similarity index 65% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/stickers/SetChatStickerSet.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/stickers/SetChatStickerSet.kt index 17f4b485a3..4e8bf65a65 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/stickers/SetChatStickerSet.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/stickers/SetChatStickerSet.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.stickers +package dev.inmo.tgbotapi.requests.chat.stickers -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/common/CommonMultipartFileRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/common/CommonMultipartFileRequest.kt similarity index 67% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/common/CommonMultipartFileRequest.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/common/CommonMultipartFileRequest.kt index 723661b011..280d8017a4 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/common/CommonMultipartFileRequest.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/common/CommonMultipartFileRequest.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.common +package dev.inmo.tgbotapi.requests.common -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* +import dev.inmo.tgbotapi.requests.abstracts.* import kotlinx.serialization.json.JsonObject internal data class CommonMultipartFileRequest( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt similarity index 61% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt index dcdc143392..0bc1869d0d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt @@ -1,11 +1,11 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation +package dev.inmo.tgbotapi.requests.edit.LiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.LocationContent +import dev.inmo.tgbotapi.requests.edit.abstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.LocationContent import kotlinx.serialization.* private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass>() diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt similarity index 67% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt index 26b974cb3c..60bcf9a122 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation +package dev.inmo.tgbotapi.requests.edit.LiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.requests.edit.abstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt similarity index 53% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt index a0f1c3d9fe..128a95390b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt @@ -1,12 +1,12 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation +package dev.inmo.tgbotapi.requests.edit.LiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditChatMessage -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.LocationContent +import dev.inmo.tgbotapi.requests.edit.abstracts.EditChatMessage +import dev.inmo.tgbotapi.requests.edit.abstracts.EditReplyMessage +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.LocationContent import kotlinx.serialization.* private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass>() diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt similarity index 54% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt index dbe0667ab1..dbfdcdd319 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation +package dev.inmo.tgbotapi.requests.edit.LiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditInlineMessage -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.requests.edit.abstracts.EditInlineMessage +import dev.inmo.tgbotapi.requests.edit.abstracts.EditReplyMessage +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt similarity index 54% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt index 702e233ea7..03a15e1b1b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt @@ -1,12 +1,12 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.ReplyMarkup +package dev.inmo.tgbotapi.requests.edit.ReplyMarkup -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditChatMessage -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent +import dev.inmo.tgbotapi.requests.edit.abstracts.EditChatMessage +import dev.inmo.tgbotapi.requests.edit.abstracts.EditReplyMessage +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent import kotlinx.serialization.* const val editMessageReplyMarkupMethod = "editMessageReplyMarkup" diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt similarity index 54% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt index 15a51074af..01abbe33fe 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.ReplyMarkup +package dev.inmo.tgbotapi.requests.edit.ReplyMarkup -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditInlineMessage -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.requests.edit.abstracts.EditInlineMessage +import dev.inmo.tgbotapi.requests.edit.abstracts.EditReplyMessage +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditChatMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditChatMessage.kt new file mode 100644 index 0000000000..0dcfbb23cb --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditChatMessage.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.requests.edit.abstracts + +import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent + +interface EditChatMessage : SimpleRequest>, MessageAction diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditDisableWebPagePreviewMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditDisableWebPagePreviewMessage.kt similarity index 53% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditDisableWebPagePreviewMessage.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditDisableWebPagePreviewMessage.kt index 0dd745574c..3cb0160c0d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditDisableWebPagePreviewMessage.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditDisableWebPagePreviewMessage.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts +package dev.inmo.tgbotapi.requests.edit.abstracts interface EditDisableWebPagePreviewMessage { val disableWebPagePreview: Boolean? diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditInlineMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditInlineMessage.kt similarity index 57% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditInlineMessage.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditInlineMessage.kt index ae90e47c59..447c7ed7de 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditInlineMessage.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditInlineMessage.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts +package dev.inmo.tgbotapi.requests.edit.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.InlineMessageIdentifier import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditLocationMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditLocationMessage.kt similarity index 53% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditLocationMessage.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditLocationMessage.kt index a7b8cc8a9b..b41276c47d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditLocationMessage.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditLocationMessage.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts +package dev.inmo.tgbotapi.requests.edit.abstracts interface EditLocationMessage { val latitude: Double diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditMediaMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditMediaMessage.kt new file mode 100644 index 0000000000..aaaceea53e --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditMediaMessage.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.requests.edit.abstracts + +import dev.inmo.tgbotapi.types.InputMedia.InputMedia + +interface EditMediaMessage { + val media: InputMedia +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditReplyMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditReplyMessage.kt new file mode 100644 index 0000000000..3b6e9a7488 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditReplyMessage.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.requests.edit.abstracts + +import dev.inmo.tgbotapi.CommonAbstracts.types.ReplyMarkup +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup + +interface EditReplyMessage : ReplyMarkup { + override val replyMarkup: InlineKeyboardMarkup? +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditTextChatMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditTextChatMessage.kt new file mode 100644 index 0000000000..0c09216c1f --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditTextChatMessage.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.requests.edit.abstracts + +import dev.inmo.tgbotapi.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/edit/caption/EditChatMessageCaption.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditChatMessageCaption.kt similarity index 54% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditChatMessageCaption.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditChatMessageCaption.kt index 855366a788..ac53971139 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditChatMessageCaption.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditChatMessageCaption.kt @@ -1,13 +1,13 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.caption +package dev.inmo.tgbotapi.requests.edit.caption -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.MediaContentMessageResultDeserializer -import com.github.insanusmokrassar.TelegramBotAPI.types.* -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 com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent +import dev.inmo.tgbotapi.requests.edit.abstracts.* +import dev.inmo.tgbotapi.requests.edit.media.MediaContentMessageResultDeserializer +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent import kotlinx.serialization.* const val editMessageCaptionMethod = "editMessageCaption" diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditInlineMessageCaption.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditInlineMessageCaption.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditInlineMessageCaption.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditInlineMessageCaption.kt index b918ae79fd..4cd418ab54 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditInlineMessageCaption.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditInlineMessageCaption.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.caption +package dev.inmo.tgbotapi.requests.edit.caption -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -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 dev.inmo.tgbotapi.requests.edit.abstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditChatMessageMedia.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditChatMessageMedia.kt similarity index 60% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditChatMessageMedia.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditChatMessageMedia.kt index af97409eda..4516afdfd3 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditChatMessageMedia.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditChatMessageMedia.kt @@ -1,13 +1,13 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media +package dev.inmo.tgbotapi.requests.edit.media -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.edit.abstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InputMedia.InputMedia +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent import kotlinx.serialization.* const val editMessageMediaMethod = "editMessageMedia" diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditInlineMessageMedia.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditInlineMessageMedia.kt similarity index 62% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditInlineMessageMedia.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditInlineMessageMedia.kt index fed5b7c66c..1a9246cb06 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditInlineMessageMedia.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditInlineMessageMedia.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media +package dev.inmo.tgbotapi.requests.edit.media -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.edit.abstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InputMedia.InputMedia +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditChatMessageText.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditChatMessageText.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditChatMessageText.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditChatMessageText.kt index 1596f45cfc..b327d18645 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditChatMessageText.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditChatMessageText.kt @@ -1,13 +1,13 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text +package dev.inmo.tgbotapi.requests.edit.text -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.TextContentMessageResultDeserializer -import com.github.insanusmokrassar.TelegramBotAPI.types.* -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 com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.TextContent +import dev.inmo.tgbotapi.requests.edit.abstracts.* +import dev.inmo.tgbotapi.requests.send.TextContentMessageResultDeserializer +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.TextContent import kotlinx.serialization.* const val editMessageTextMethod = "editMessageText" diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditInlineMessageText.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditInlineMessageText.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt index 9219cd0949..00a714fa55 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditInlineMessageText.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt @@ -1,11 +1,11 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text +package dev.inmo.tgbotapi.requests.edit.text -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.editMessageMediaMethod -import com.github.insanusmokrassar.TelegramBotAPI.types.* -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 dev.inmo.tgbotapi.requests.edit.abstracts.* +import dev.inmo.tgbotapi.requests.edit.media.editMessageMediaMethod +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/GetGameHighScoresByChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/GetGameHighScoresByChat.kt similarity index 57% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/GetGameHighScoresByChat.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/GetGameHighScoresByChat.kt index d1cd6effd5..8b17b25d94 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/GetGameHighScoresByChat.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/GetGameHighScoresByChat.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.games +package dev.inmo.tgbotapi.requests.games -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction -import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.GetGameHighScores -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction +import dev.inmo.tgbotapi.requests.games.abstracts.GetGameHighScores +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/GetGameHighScoresByInlineMessageId.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/GetGameHighScoresByInlineMessageId.kt similarity index 55% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/GetGameHighScoresByInlineMessageId.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/GetGameHighScoresByInlineMessageId.kt index 7e35cbce06..7512c23b4b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/GetGameHighScoresByInlineMessageId.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/GetGameHighScoresByInlineMessageId.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.games +package dev.inmo.tgbotapi.requests.games -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.InlineMessageAction -import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.GetGameHighScores -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.CommonAbstracts.types.InlineMessageAction +import dev.inmo.tgbotapi.requests.games.abstracts.GetGameHighScores +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/SetGameScoreByChatId.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/SetGameScoreByChatId.kt similarity index 67% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/SetGameScoreByChatId.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/SetGameScoreByChatId.kt index 7cb00e4dc8..0063be5c4d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/SetGameScoreByChatId.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/SetGameScoreByChatId.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.games +package dev.inmo.tgbotapi.requests.games -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction -import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.SetGameScore -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction +import dev.inmo.tgbotapi.requests.games.abstracts.SetGameScore +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/SetGameScoreByInlineMessageId.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/SetGameScoreByInlineMessageId.kt similarity index 66% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/SetGameScoreByInlineMessageId.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/SetGameScoreByInlineMessageId.kt index 23deee5967..6305f12c1b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/SetGameScoreByInlineMessageId.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/SetGameScoreByInlineMessageId.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.games +package dev.inmo.tgbotapi.requests.games -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.InlineMessageAction -import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.SetGameScore -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.CommonAbstracts.types.InlineMessageAction +import dev.inmo.tgbotapi.requests.games.abstracts.SetGameScore +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/GetGameHighScores.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/abstracts/GetGameHighScores.kt similarity index 64% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/GetGameHighScores.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/abstracts/GetGameHighScores.kt index a4017a85fa..fe7ea58aca 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/GetGameHighScores.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/abstracts/GetGameHighScores.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts +package dev.inmo.tgbotapi.requests.games.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.UserId -import com.github.insanusmokrassar.TelegramBotAPI.types.games.GameHighScore +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.UserId +import dev.inmo.tgbotapi.types.games.GameHighScore import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.KSerializer import kotlinx.serialization.builtins.ListSerializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/SetGameScore.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/abstracts/SetGameScore.kt similarity index 65% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/SetGameScore.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/abstracts/SetGameScore.kt index 3b0d258af9..9d6640012f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/SetGameScore.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/abstracts/SetGameScore.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts +package dev.inmo.tgbotapi.requests.games.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.UserId +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.UserId import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/get/GetFile.kt similarity index 51% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/get/GetFile.kt index 54e5e00a1f..8388488113 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/get/GetFile.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.get +package dev.inmo.tgbotapi.requests.get -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.files.PathedFile -import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.fileIdField +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.files.PathedFile +import dev.inmo.tgbotapi.types.files.abstracts.fileIdField import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetStickerSet.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/get/GetStickerSet.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetStickerSet.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/get/GetStickerSet.kt index 41fc2f031a..a9262458ef 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetStickerSet.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/get/GetStickerSet.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.get +package dev.inmo.tgbotapi.requests.get -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.stickerSetNameField -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.StickerSet +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.stickerSetNameField +import dev.inmo.tgbotapi.types.stickers.StickerSet import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetUserProfilePhotos.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/get/GetUserProfilePhotos.kt similarity index 81% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetUserProfilePhotos.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/get/GetUserProfilePhotos.kt index f9270a7571..0151627ddc 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetUserProfilePhotos.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/get/GetUserProfilePhotos.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.get +package dev.inmo.tgbotapi.requests.get -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendAction.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendAction.kt similarity index 68% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendAction.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendAction.kt index 01be3ad029..5b9e3396da 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendAction.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendAction.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send +package dev.inmo.tgbotapi.requests.send -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendChatMessageRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.actions.BotAction +import dev.inmo.tgbotapi.requests.send.abstracts.SendChatMessageRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.actions.BotAction import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendContact.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendContact.kt similarity index 72% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendContact.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendContact.kt index 51dff056f3..2124808ed7 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendContact.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendContact.kt @@ -1,12 +1,12 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send +package dev.inmo.tgbotapi.requests.send -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.ReplyingMarkupSendMessageRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest -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.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.ContactContent +import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest +import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.ContactContent import kotlinx.serialization.* private val commonResultDeserializer: DeserializationStrategy> diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendDice.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendDice.kt similarity index 54% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendDice.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendDice.kt index c29bdd4e83..248984de66 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendDice.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendDice.kt @@ -1,14 +1,14 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send +package dev.inmo.tgbotapi.requests.send -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.DisableNotification -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMessageId -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.ReplyingMarkupSendMessageRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.dice.DiceAnimationType -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.DiceContent +import dev.inmo.tgbotapi.CommonAbstracts.types.DisableNotification +import dev.inmo.tgbotapi.CommonAbstracts.types.ReplyMessageId +import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.dice.DiceAnimationType +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.DiceContent import kotlinx.serialization.* internal val DiceContentMessageResultDeserializer: DeserializationStrategy> diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendLocation.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendLocation.kt similarity index 71% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendLocation.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendLocation.kt index 2c4f72c1b6..9a765ca175 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendLocation.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendLocation.kt @@ -1,11 +1,11 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send +package dev.inmo.tgbotapi.requests.send -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.* -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.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.LocationContent +import dev.inmo.tgbotapi.requests.send.abstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.LocationContent import kotlinx.serialization.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendMessage.kt similarity index 61% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendMessage.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendMessage.kt index 9c5ced8cba..f6b8ef20e0 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendMessage.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendMessage.kt @@ -1,15 +1,15 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send +package dev.inmo.tgbotapi.requests.send -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.DisableWebPagePreview -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.TextContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.throwRangeError +import dev.inmo.tgbotapi.CommonAbstracts.types.DisableWebPagePreview +import dev.inmo.tgbotapi.requests.send.abstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.TextContent +import dev.inmo.tgbotapi.utils.throwRangeError import kotlinx.serialization.* internal val TextContentMessageResultDeserializer: DeserializationStrategy> diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendVenue.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendVenue.kt similarity index 77% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendVenue.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendVenue.kt index 1ca4c91d01..81cc758590 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendVenue.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendVenue.kt @@ -1,12 +1,12 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send +package dev.inmo.tgbotapi.requests.send -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.* -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.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.VenueContent -import com.github.insanusmokrassar.TelegramBotAPI.types.venue.Venue +import dev.inmo.tgbotapi.requests.send.abstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.VenueContent +import dev.inmo.tgbotapi.types.venue.Venue import kotlinx.serialization.* private val commonResultDeserializer: DeserializationStrategy> diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/DuratedSendMessageRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/DuratedSendMessageRequest.kt similarity index 67% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/DuratedSendMessageRequest.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/DuratedSendMessageRequest.kt index 200eefdba2..46bf7bc0f6 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/DuratedSendMessageRequest.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/DuratedSendMessageRequest.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts +package dev.inmo.tgbotapi.requests.send.abstracts interface DuratedSendMessageRequest: SendMessageRequest { /** diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/PositionedSendMessageRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/PositionedSendMessageRequest.kt similarity index 62% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/PositionedSendMessageRequest.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/PositionedSendMessageRequest.kt index f538b7e378..e2823f307e 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/PositionedSendMessageRequest.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/PositionedSendMessageRequest.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts +package dev.inmo.tgbotapi.requests.send.abstracts interface PositionedSendMessageRequest: SendMessageRequest { val latitude: Double diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/ReplyingMarkupSendMessageRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/ReplyingMarkupSendMessageRequest.kt new file mode 100644 index 0000000000..3690419ca3 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/ReplyingMarkupSendMessageRequest.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.requests.send.abstracts + +import dev.inmo.tgbotapi.CommonAbstracts.types.ReplyMarkup + +interface ReplyingMarkupSendMessageRequest: SendMessageRequest, ReplyMarkup \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/SendChatMessageRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/SendChatMessageRequest.kt new file mode 100644 index 0000000000..5107d6264e --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/SendChatMessageRequest.kt @@ -0,0 +1,6 @@ +package dev.inmo.tgbotapi.requests.send.abstracts + +import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest + +interface SendChatMessageRequest : SimpleRequest, ChatRequest \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/SendMessageRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/SendMessageRequest.kt new file mode 100644 index 0000000000..b6d986b3da --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/SendMessageRequest.kt @@ -0,0 +1,6 @@ +package dev.inmo.tgbotapi.requests.send.abstracts + +import dev.inmo.tgbotapi.CommonAbstracts.types.DisableNotification +import dev.inmo.tgbotapi.CommonAbstracts.types.ReplyMessageId + +interface SendMessageRequest : SendChatMessageRequest, ReplyMessageId, DisableNotification diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/SizedSendMessageRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/SizedSendMessageRequest.kt similarity index 59% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/SizedSendMessageRequest.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/SizedSendMessageRequest.kt index d95b2c5930..6d913f6fa0 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/SizedSendMessageRequest.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/SizedSendMessageRequest.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts +package dev.inmo.tgbotapi.requests.send.abstracts interface SizedSendMessageRequest : SendMessageRequest { val width: Int? diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/TextableSendMessageRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/TextableSendMessageRequest.kt new file mode 100644 index 0000000000..078c94f326 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/TextableSendMessageRequest.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.requests.send.abstracts + +import dev.inmo.tgbotapi.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/abstracts/ThumbedSendMessageRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/ThumbedSendMessageRequest.kt similarity index 55% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/ThumbedSendMessageRequest.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/ThumbedSendMessageRequest.kt index 3597137c56..450c624f69 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/ThumbedSendMessageRequest.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/ThumbedSendMessageRequest.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts +package dev.inmo.tgbotapi.requests.send.abstracts interface ThumbedSendMessageRequest: SendMessageRequest { val thumb: String? diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/TitledSendMessageRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/TitledSendMessageRequest.kt similarity index 55% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/TitledSendMessageRequest.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/TitledSendMessageRequest.kt index 144a234f52..48f53aa0ff 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/TitledSendMessageRequest.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/TitledSendMessageRequest.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts +package dev.inmo.tgbotapi.requests.send.abstracts interface TitledSendMessageRequest: SendMessageRequest { val title: String? diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/games/SendGame.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/games/SendGame.kt similarity index 59% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/games/SendGame.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/games/SendGame.kt index 8b95236ad9..8c901e5e5e 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/games/SendGame.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/games/SendGame.kt @@ -1,12 +1,12 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.games +package dev.inmo.tgbotapi.requests.send.games -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMarkup -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest -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.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.GameContent +import dev.inmo.tgbotapi.CommonAbstracts.types.ReplyMarkup +import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.GameContent import kotlinx.serialization.* private val commonResultDeserializer: DeserializationStrategy> diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAnimation.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAnimation.kt similarity index 76% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAnimation.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAnimation.kt index e094a177b4..de4578c8d0 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAnimation.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAnimation.kt @@ -1,17 +1,17 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media +package dev.inmo.tgbotapi.requests.send.media -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.AnimationContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull -import com.github.insanusmokrassar.TelegramBotAPI.utils.throwRangeError +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.send.abstracts.* +import dev.inmo.tgbotapi.requests.send.media.base.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.media.AnimationContent +import dev.inmo.tgbotapi.utils.mapOfNotNull +import dev.inmo.tgbotapi.utils.throwRangeError import kotlinx.serialization.* fun SendAnimation( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAudio.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAudio.kt similarity index 74% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAudio.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAudio.kt index b222130865..dd06aa2faf 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAudio.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAudio.kt @@ -1,18 +1,18 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media +package dev.inmo.tgbotapi.requests.send.media -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Performerable -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.AudioContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull -import com.github.insanusmokrassar.TelegramBotAPI.utils.throwRangeError +import dev.inmo.tgbotapi.CommonAbstracts.Performerable +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.send.abstracts.* +import dev.inmo.tgbotapi.requests.send.media.base.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.media.AudioContent +import dev.inmo.tgbotapi.utils.mapOfNotNull +import dev.inmo.tgbotapi.utils.throwRangeError import kotlinx.serialization.* fun SendAudio( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendDocument.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendDocument.kt similarity index 73% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendDocument.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendDocument.kt index e7cce4798f..0b2db11bf8 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendDocument.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendDocument.kt @@ -1,17 +1,17 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media +package dev.inmo.tgbotapi.requests.send.media -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.DocumentContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull -import com.github.insanusmokrassar.TelegramBotAPI.utils.throwRangeError +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.send.abstracts.* +import dev.inmo.tgbotapi.requests.send.media.base.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.media.DocumentContent +import dev.inmo.tgbotapi.utils.mapOfNotNull +import dev.inmo.tgbotapi.utils.throwRangeError import kotlinx.serialization.* fun SendDocument( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendMediaGroup.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendMediaGroup.kt similarity index 72% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendMediaGroup.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendMediaGroup.kt index 878cc01a6f..fb458dbd9a 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendMediaGroup.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendMediaGroup.kt @@ -1,15 +1,15 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media +package dev.inmo.tgbotapi.requests.send.media -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializerClass -import com.github.insanusmokrassar.TelegramBotAPI.utils.throwRangeError -import com.github.insanusmokrassar.TelegramBotAPI.utils.toJsonWithoutNulls +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest +import dev.inmo.tgbotapi.requests.send.media.base.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InputMedia.* +import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializerClass +import dev.inmo.tgbotapi.utils.throwRangeError +import dev.inmo.tgbotapi.utils.toJsonWithoutNulls import kotlinx.serialization.* import kotlinx.serialization.builtins.ListSerializer import kotlinx.serialization.json.buildJsonArray diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendPhoto.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendPhoto.kt similarity index 70% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendPhoto.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendPhoto.kt index 27e6be47fe..5ffd41caf2 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendPhoto.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendPhoto.kt @@ -1,16 +1,16 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media +package dev.inmo.tgbotapi.requests.send.media -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.PhotoContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.throwRangeError +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.send.abstracts.* +import dev.inmo.tgbotapi.requests.send.media.base.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.media.PhotoContent +import dev.inmo.tgbotapi.utils.throwRangeError import kotlinx.serialization.* fun SendPhoto( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendSticker.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendSticker.kt similarity index 70% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendSticker.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendSticker.kt index e1f23403d6..afa7f152d5 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendSticker.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendSticker.kt @@ -1,14 +1,14 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media +package dev.inmo.tgbotapi.requests.send.media -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.ReplyingMarkupSendMessageRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest -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.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.StickerContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.toJsonWithoutNulls +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest +import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.media.StickerContent +import dev.inmo.tgbotapi.utils.toJsonWithoutNulls import kotlinx.serialization.* import kotlinx.serialization.json.JsonObject diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideo.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideo.kt similarity index 76% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideo.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideo.kt index 6bd81fe76c..3c2ba65bd3 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideo.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideo.kt @@ -1,17 +1,17 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media +package dev.inmo.tgbotapi.requests.send.media -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.VideoContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull -import com.github.insanusmokrassar.TelegramBotAPI.utils.throwRangeError +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.send.abstracts.* +import dev.inmo.tgbotapi.requests.send.media.base.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.media.VideoContent +import dev.inmo.tgbotapi.utils.mapOfNotNull +import dev.inmo.tgbotapi.utils.throwRangeError import kotlinx.serialization.* fun SendVideo( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideoNote.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideoNote.kt similarity index 76% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideoNote.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideoNote.kt index 93cb292b29..66376e093b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideoNote.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideoNote.kt @@ -1,17 +1,17 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media +package dev.inmo.tgbotapi.requests.send.media -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.VideoNoteContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull -import com.github.insanusmokrassar.TelegramBotAPI.utils.throwRangeError +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.send.abstracts.* +import dev.inmo.tgbotapi.requests.send.media.base.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.media.VideoNoteContent +import dev.inmo.tgbotapi.utils.mapOfNotNull +import dev.inmo.tgbotapi.utils.throwRangeError import kotlinx.serialization.* fun SendVideoNote( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVoice.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVoice.kt similarity index 71% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVoice.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVoice.kt index be510619b3..1429239446 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVoice.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVoice.kt @@ -1,17 +1,17 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media +package dev.inmo.tgbotapi.requests.send.media -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.VoiceContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull -import com.github.insanusmokrassar.TelegramBotAPI.utils.throwRangeError +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.send.abstracts.* +import dev.inmo.tgbotapi.requests.send.media.base.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.media.VoiceContent +import dev.inmo.tgbotapi.utils.mapOfNotNull +import dev.inmo.tgbotapi.utils.throwRangeError import kotlinx.serialization.* fun SendVoice( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/base/DataRequest.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/base/DataRequest.kt new file mode 100644 index 0000000000..e0bea67557 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/base/DataRequest.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.requests.send.media.base + +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest + +interface DataRequest : SimpleRequest diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/base/Files.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/base/Files.kt new file mode 100644 index 0000000000..502179f63e --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/base/Files.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.requests.send.media.base + +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile + +typealias Files = Map diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/MultipartRequestImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/base/MultipartRequestImpl.kt similarity index 77% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/MultipartRequestImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/base/MultipartRequestImpl.kt index c4464466f6..15ba1e02df 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/MultipartRequestImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/base/MultipartRequestImpl.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base +package dev.inmo.tgbotapi.requests.send.media.base -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* +import dev.inmo.tgbotapi.requests.abstracts.* import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.json.JsonObject diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/payments/SendInvoice.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt similarity index 76% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/payments/SendInvoice.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt index 7179f0fd13..ef21eb0930 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/payments/SendInvoice.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt @@ -1,15 +1,15 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.payments +package dev.inmo.tgbotapi.requests.send.payments -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.payments.InvoiceContent -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.LabeledPrice -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.LabeledPricesSerializer -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.abstracts.* +import dev.inmo.tgbotapi.CommonAbstracts.types.* +import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.payments.InvoiceContent +import dev.inmo.tgbotapi.types.payments.LabeledPrice +import dev.inmo.tgbotapi.types.payments.LabeledPricesSerializer +import dev.inmo.tgbotapi.types.payments.abstracts.* import kotlinx.serialization.* private val invoiceMessageSerializer: DeserializationStrategy> diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/polls/SendPoll.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt similarity index 87% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/polls/SendPoll.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt index c0d02096e3..7ded492c21 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/polls/SendPoll.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt @@ -1,18 +1,18 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.send.polls +package dev.inmo.tgbotapi.requests.send.polls -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.ReplyingMarkupSendMessageRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.MarkdownV2 -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.PollContent -import com.github.insanusmokrassar.TelegramBotAPI.types.polls.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.fullListOfSubSource -import com.github.insanusmokrassar.TelegramBotAPI.utils.toMarkdownV2Captions +import dev.inmo.tgbotapi.CommonAbstracts.* +import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest +import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2 +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass +import dev.inmo.tgbotapi.types.message.content.PollContent +import dev.inmo.tgbotapi.types.polls.* +import dev.inmo.tgbotapi.utils.fullListOfSubSource +import dev.inmo.tgbotapi.utils.toMarkdownV2Captions import com.soywiz.klock.DateTime import kotlinx.serialization.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddAnimatedStickerToSet.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/AddAnimatedStickerToSet.kt similarity index 72% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddAnimatedStickerToSet.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/AddAnimatedStickerToSet.kt index 105cf9e12b..d2f3399407 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddAnimatedStickerToSet.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/AddAnimatedStickerToSet.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers +package dev.inmo.tgbotapi.requests.stickers -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.common.CommonMultipartFileRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.abstracts.StandardStickerSetAction -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.common.CommonMultipartFileRequest +import dev.inmo.tgbotapi.requests.stickers.abstracts.StandardStickerSetAction +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.stickers.MaskPosition import kotlinx.serialization.* fun AddAnimatedStickerToSet( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddStaticStickerToSet.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/AddStaticStickerToSet.kt similarity index 72% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddStaticStickerToSet.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/AddStaticStickerToSet.kt index 6deb5916f8..521e6ca245 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddStaticStickerToSet.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/AddStaticStickerToSet.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers +package dev.inmo.tgbotapi.requests.stickers -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.common.CommonMultipartFileRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.abstracts.StandardStickerSetAction -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.common.CommonMultipartFileRequest +import dev.inmo.tgbotapi.requests.stickers.abstracts.StandardStickerSetAction +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.stickers.MaskPosition import kotlinx.serialization.* fun AddStaticStickerToSet( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/CreateNewAnimatedStickerSet.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/CreateNewAnimatedStickerSet.kt similarity index 74% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/CreateNewAnimatedStickerSet.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/CreateNewAnimatedStickerSet.kt index d512b88acf..08aa78a3ec 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/CreateNewAnimatedStickerSet.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/CreateNewAnimatedStickerSet.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers +package dev.inmo.tgbotapi.requests.stickers -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.common.CommonMultipartFileRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.abstracts.StandardStickerSetAction -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.common.CommonMultipartFileRequest +import dev.inmo.tgbotapi.requests.stickers.abstracts.StandardStickerSetAction +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.stickers.MaskPosition import kotlinx.serialization.* fun CreateNewAnimatedStickerSet( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/CreateNewStaticStickerSet.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/CreateNewStaticStickerSet.kt similarity index 77% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/CreateNewStaticStickerSet.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/CreateNewStaticStickerSet.kt index 06801854ea..97c92583ea 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/CreateNewStaticStickerSet.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/CreateNewStaticStickerSet.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers +package dev.inmo.tgbotapi.requests.stickers -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.common.CommonMultipartFileRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.abstracts.StandardStickerSetAction -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.common.CommonMultipartFileRequest +import dev.inmo.tgbotapi.requests.stickers.abstracts.StandardStickerSetAction +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.stickers.MaskPosition import kotlinx.serialization.* fun CreateNewStaticStickerSet( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/DeleteStickerFromSet.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/DeleteStickerFromSet.kt similarity index 61% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/DeleteStickerFromSet.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/DeleteStickerFromSet.kt index 9ff0d9206f..b6d5340fda 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/DeleteStickerFromSet.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/DeleteStickerFromSet.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers +package dev.inmo.tgbotapi.requests.stickers -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.stickerField +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.stickerField import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/SetStickerPositionInSet.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/SetStickerPositionInSet.kt similarity index 64% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/SetStickerPositionInSet.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/SetStickerPositionInSet.kt index 39f84b61a3..7b8bbe0599 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/SetStickerPositionInSet.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/SetStickerPositionInSet.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers +package dev.inmo.tgbotapi.requests.stickers -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.positionField -import com.github.insanusmokrassar.TelegramBotAPI.types.stickerField +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.positionField +import dev.inmo.tgbotapi.types.stickerField import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/SetStickerSetThumb.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/SetStickerSetThumb.kt similarity index 64% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/SetStickerSetThumb.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/SetStickerSetThumb.kt index 5f8cfe7186..7f5d960383 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/SetStickerSetThumb.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/SetStickerSetThumb.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers +package dev.inmo.tgbotapi.requests.stickers -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.common.CommonMultipartFileRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.abstracts.StickerSetAction -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.common.CommonMultipartFileRequest +import dev.inmo.tgbotapi.requests.stickers.abstracts.StickerSetAction +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* fun SetStickerSetThumb( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/UploadStickerFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/UploadStickerFile.kt similarity index 65% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/UploadStickerFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/UploadStickerFile.kt index 967f3682c6..b65910036d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/UploadStickerFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/UploadStickerFile.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers +package dev.inmo.tgbotapi.requests.stickers -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.files.File -import com.github.insanusmokrassar.TelegramBotAPI.utils.toJsonWithoutNulls +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.abstracts.MultipartRequest +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.files.File +import dev.inmo.tgbotapi.utils.toJsonWithoutNulls import kotlinx.serialization.* import kotlinx.serialization.json.JsonObject diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/abstracts/StandardStickerSetAction.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/abstracts/StandardStickerSetAction.kt new file mode 100644 index 0000000000..c829ffc1c3 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/abstracts/StandardStickerSetAction.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.requests.stickers.abstracts + +import dev.inmo.tgbotapi.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/requests/stickers/abstracts/StickerSetAction.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/abstracts/StickerSetAction.kt similarity index 56% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/abstracts/StickerSetAction.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/abstracts/StickerSetAction.kt index 7f051ebfc3..5f2ebb57ae 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/abstracts/StickerSetAction.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/stickers/abstracts/StickerSetAction.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.abstracts +package dev.inmo.tgbotapi.requests.stickers.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.UserId +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.UserId import kotlinx.serialization.KSerializer import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/DeleteWebhook.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/DeleteWebhook.kt similarity index 72% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/DeleteWebhook.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/DeleteWebhook.kt index 27a1df4256..b363289086 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/DeleteWebhook.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/DeleteWebhook.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.webhook +package dev.inmo.tgbotapi.requests.webhook -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/GetWebhookInfo.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/GetWebhookInfo.kt similarity index 62% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/GetWebhookInfo.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/GetWebhookInfo.kt index 607a5aa7fd..ba8b40d816 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/GetWebhookInfo.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/GetWebhookInfo.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.webhook +package dev.inmo.tgbotapi.requests.webhook -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest -import com.github.insanusmokrassar.TelegramBotAPI.types.WebhookInfo +import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest +import dev.inmo.tgbotapi.types.WebhookInfo import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/SetWebhook.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/SetWebhook.kt similarity index 86% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/SetWebhook.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/SetWebhook.kt index e662818d14..5dc0f0841a 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/SetWebhook.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/SetWebhook.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.webhook +package dev.inmo.tgbotapi.requests.webhook -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.DataRequest -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.MultipartRequestImpl -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.requests.send.media.base.DataRequest +import dev.inmo.tgbotapi.requests.send.media.base.MultipartRequestImpl +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/BotCommand.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/BotCommand.kt similarity index 88% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/BotCommand.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/BotCommand.kt index 5f280450de..3ec25bcf3a 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/BotCommand.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/BotCommand.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types -import com.github.insanusmokrassar.TelegramBotAPI.utils.throwRangeError +import dev.inmo.tgbotapi.utils.throwRangeError import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/CallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/CallbackQuery.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/CallbackQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/CallbackQuery.kt index e19cadffbd..9d1fa68bcb 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/CallbackQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/CallbackQuery.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery +package dev.inmo.tgbotapi.types.CallbackQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQueryIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.User +import dev.inmo.tgbotapi.types.CallbackQueryIdentifier +import dev.inmo.tgbotapi.types.User interface CallbackQuery { val id: CallbackQueryIdentifier diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/DataCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/DataCallbackQuery.kt new file mode 100644 index 0000000000..220a1b77ef --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/DataCallbackQuery.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.CallbackQuery + +interface DataCallbackQuery : CallbackQuery { + val data: String +} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/GameShortNameCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/GameShortNameCallbackQuery.kt similarity index 55% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/GameShortNameCallbackQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/GameShortNameCallbackQuery.kt index 644ac332b2..ab5a676363 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/GameShortNameCallbackQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/GameShortNameCallbackQuery.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery +package dev.inmo.tgbotapi.types.CallbackQuery interface GameShortNameCallbackQuery : CallbackQuery { val gameShortName: String diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/InlineMessageIdCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/InlineMessageIdCallbackQuery.kt new file mode 100644 index 0000000000..41f44a2c19 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/InlineMessageIdCallbackQuery.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.CallbackQuery + +import dev.inmo.tgbotapi.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/InlineMessageIdDataCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/InlineMessageIdDataCallbackQuery.kt similarity index 70% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/InlineMessageIdDataCallbackQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/InlineMessageIdDataCallbackQuery.kt index 3af1d0d875..aa4ecf9f70 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/InlineMessageIdDataCallbackQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/InlineMessageIdDataCallbackQuery.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery +package dev.inmo.tgbotapi.types.CallbackQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.types.* data class InlineMessageIdDataCallbackQuery( override val id: CallbackQueryIdentifier, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/InlineMessageIdGameShortNameCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/InlineMessageIdGameShortNameCallbackQuery.kt similarity index 71% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/InlineMessageIdGameShortNameCallbackQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/InlineMessageIdGameShortNameCallbackQuery.kt index b2572bc55a..f54793fcd4 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/InlineMessageIdGameShortNameCallbackQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/InlineMessageIdGameShortNameCallbackQuery.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery +package dev.inmo.tgbotapi.types.CallbackQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.types.* data class InlineMessageIdGameShortNameCallbackQuery( override val id: CallbackQueryIdentifier, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageCallbackQuery.kt new file mode 100644 index 0000000000..f64bda7593 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageCallbackQuery.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.CallbackQuery + +import dev.inmo.tgbotapi.types.message.abstracts.Message + +interface MessageCallbackQuery : CallbackQuery { + val message: Message +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageDataCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageDataCallbackQuery.kt new file mode 100644 index 0000000000..9f6047197f --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageDataCallbackQuery.kt @@ -0,0 +1,13 @@ +package dev.inmo.tgbotapi.types.CallbackQuery + +import dev.inmo.tgbotapi.types.CallbackQueryIdentifier +import dev.inmo.tgbotapi.types.User +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/CallbackQuery/MessageGameShortNameCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageGameShortNameCallbackQuery.kt new file mode 100644 index 0000000000..f026675b13 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageGameShortNameCallbackQuery.kt @@ -0,0 +1,13 @@ +package dev.inmo.tgbotapi.types.CallbackQuery + +import dev.inmo.tgbotapi.types.CallbackQueryIdentifier +import dev.inmo.tgbotapi.types.User +import dev.inmo.tgbotapi.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/CallbackQuery/RawCallbackQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/RawCallbackQuery.kt similarity index 81% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/RawCallbackQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/RawCallbackQuery.kt index 5153c2d71d..4184a8902f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/RawCallbackQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/RawCallbackQuery.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery +package dev.inmo.tgbotapi.types.CallbackQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatIdentifier.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt similarity index 96% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatIdentifier.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt index f65163691c..2babc7b429 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatIdentifier.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types import kotlinx.serialization.* import kotlinx.serialization.encoding.Decoder diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/AdministratorChatMemberImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/AdministratorChatMemberImpl.kt similarity index 69% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/AdministratorChatMemberImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/AdministratorChatMemberImpl.kt index 23662f990e..d4f9727948 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/AdministratorChatMemberImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/AdministratorChatMemberImpl.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember +package dev.inmo.tgbotapi.types.ChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.AdministratorChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.User +import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember +import dev.inmo.tgbotapi.types.User data class AdministratorChatMemberImpl( override val user: User, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/CreatorChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/CreatorChatMember.kt similarity index 71% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/CreatorChatMember.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/CreatorChatMember.kt index d92d84b2d8..153679d274 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/CreatorChatMember.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/CreatorChatMember.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember +package dev.inmo.tgbotapi.types.ChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.AdministratorChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.User +import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember +import dev.inmo.tgbotapi.types.User data class CreatorChatMember( override val user: User, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/KickedChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/KickedChatMember.kt new file mode 100644 index 0000000000..4c74996a96 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/KickedChatMember.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.ChatMember + +import dev.inmo.tgbotapi.types.ChatMember.abstracts.BannedChatMember +import dev.inmo.tgbotapi.types.TelegramDate +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/ChatMember/LeftChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/LeftChatMember.kt new file mode 100644 index 0000000000..e9e70060d2 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/LeftChatMember.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.ChatMember + +import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember +import dev.inmo.tgbotapi.types.User + +data class LeftChatMember(override val user: User) : + ChatMember diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/MemberChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/MemberChatMember.kt new file mode 100644 index 0000000000..03aa9da492 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/MemberChatMember.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.ChatMember + +import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember +import dev.inmo.tgbotapi.types.User + +data class MemberChatMember(override val user: User) : + ChatMember diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/RawChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/RawChatMember.kt similarity index 93% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/RawChatMember.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/RawChatMember.kt index ac40748e8a..5e7e9875a7 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/RawChatMember.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/RawChatMember.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember +package dev.inmo.tgbotapi.types.ChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMember +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/RestrictedChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/RestrictedChatMember.kt similarity index 55% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/RestrictedChatMember.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/RestrictedChatMember.kt index 1f685f9b1b..fcb02d1aff 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/RestrictedChatMember.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/RestrictedChatMember.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember +package dev.inmo.tgbotapi.types.ChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.BannedChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.SpecialRightsChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.TelegramDate -import com.github.insanusmokrassar.TelegramBotAPI.types.User +import dev.inmo.tgbotapi.types.ChatMember.abstracts.BannedChatMember +import dev.inmo.tgbotapi.types.ChatMember.abstracts.SpecialRightsChatMember +import dev.inmo.tgbotapi.types.TelegramDate +import dev.inmo.tgbotapi.types.User data class RestrictedChatMember( override val user: User, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/AdministratorChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/AdministratorChatMember.kt similarity index 79% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/AdministratorChatMember.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/AdministratorChatMember.kt index f99ce2ef25..8b7e7cc18e 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/AdministratorChatMember.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/AdministratorChatMember.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts +package dev.inmo.tgbotapi.types.ChatMember.abstracts interface AdministratorChatMember : SpecialRightsChatMember { val canBeEdited: Boolean diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/BannedChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/BannedChatMember.kt new file mode 100644 index 0000000000..42698eeb89 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/BannedChatMember.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.ChatMember.abstracts + +import dev.inmo.tgbotapi.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/ChatMember/abstracts/ChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/ChatMember.kt similarity index 83% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/ChatMember.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/ChatMember.kt index 6c385e4454..eba29e056f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/ChatMember.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/ChatMember.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts +package dev.inmo.tgbotapi.types.ChatMember.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.RawChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.User +import dev.inmo.tgbotapi.types.ChatMember.RawChatMember +import dev.inmo.tgbotapi.types.User import kotlinx.serialization.* import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/SpecialRightsChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/SpecialRightsChatMember.kt similarity index 65% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/SpecialRightsChatMember.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/SpecialRightsChatMember.kt index 97c51fb5a6..e72f7ed255 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/SpecialRightsChatMember.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/SpecialRightsChatMember.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts +package dev.inmo.tgbotapi.types.ChatMember.abstracts interface SpecialRightsChatMember : ChatMember { val canChangeInfo: Boolean diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatPhoto.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatPhoto.kt similarity index 87% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatPhoto.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatPhoto.kt index 3e2e76811f..839ef438f9 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatPhoto.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatPhoto.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Common.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt similarity index 98% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Common.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt index d66576899c..21c8e1c9df 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Common.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types -import com.github.insanusmokrassar.TelegramBotAPI.utils.BuiltinMimeTypes +import dev.inmo.tgbotapi.utils.BuiltinMimeTypes typealias Identifier = Long typealias MessageIdentifier = Long diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Contact.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Contact.kt similarity index 77% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Contact.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Contact.kt index d15a3c0409..e8ed573d3d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Contact.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Contact.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CommonContactData +import dev.inmo.tgbotapi.CommonAbstracts.CommonContactData import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/BaseChosenInlineResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/BaseChosenInlineResult.kt new file mode 100644 index 0000000000..cee9a023b6 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/BaseChosenInlineResult.kt @@ -0,0 +1,11 @@ +package dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult + +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.ChosenInlineResult + +data class BaseChosenInlineResult( + override val resultId: InlineQueryIdentifier, + 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/ChosenInlineResult/LocationChosenInlineResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/LocationChosenInlineResult.kt similarity index 51% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/ChosenInlineResult/LocationChosenInlineResult.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/LocationChosenInlineResult.kt index 474643a5a2..92623a6402 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/ChosenInlineResult/LocationChosenInlineResult.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/LocationChosenInlineResult.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.ChosenInlineResult +package dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.ChosenInlineResult +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.ChosenInlineResult data class LocationChosenInlineResult( override val resultId: InlineQueryIdentifier, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/ChosenInlineResult/RawChosenInlineResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/RawChosenInlineResult.kt similarity index 75% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/ChosenInlineResult/RawChosenInlineResult.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/RawChosenInlineResult.kt index c0b0bfd915..4900c189b4 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/ChosenInlineResult/RawChosenInlineResult.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/RawChosenInlineResult.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.ChosenInlineResult +package dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.ChosenInlineResult +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.ChosenInlineResult import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultArticle.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultArticle.kt similarity index 72% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultArticle.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultArticle.kt index 3fbe736f22..85d68f304f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultArticle.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultArticle.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.* +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioCachedImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioCachedImpl.kt new file mode 100644 index 0000000000..7d478397ec --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioCachedImpl.kt @@ -0,0 +1,30 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult + +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio.InlineQueryResultAudioCached +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio.inlineQueryResultAudioType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.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/InlineQueryResultAudioImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioImpl.kt similarity index 54% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioImpl.kt index 0607d17ee3..e009ab8f66 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioImpl.kt @@ -1,12 +1,12 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.audio.InlineQueryResultAudio -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 dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio.InlineQueryResultAudio +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio.inlineQueryResultAudioType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultContact.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultContact.kt similarity index 68% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultContact.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultContact.kt index be39cc720b..bd929a4862 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultContact.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultContact.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CommonContactData -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.CommonAbstracts.CommonContactData +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.* +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentCachedImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentCachedImpl.kt similarity index 50% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentCachedImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentCachedImpl.kt index 28fcc63300..85b4cb2644 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentCachedImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentCachedImpl.kt @@ -1,13 +1,13 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.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.document.InlineQueryResultDocumentCached -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.document.inlineQueryResultDocumentType -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 dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document.InlineQueryResultDocumentCached +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document.inlineQueryResultDocumentType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentImpl.kt similarity index 55% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentImpl.kt index cd021cfa73..4043852c3c 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentImpl.kt @@ -1,14 +1,14 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.document.InlineQueryResultDocument -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.document.inlineQueryResultDocumentType -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 com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.mimeTypeField -import com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document.InlineQueryResultDocument +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document.inlineQueryResultDocumentType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.files.abstracts.mimeTypeField +import dev.inmo.tgbotapi.utils.MimeType import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGame.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGame.kt new file mode 100644 index 0000000000..eb93c39615 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGame.kt @@ -0,0 +1,18 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult + +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult +import dev.inmo.tgbotapi.types.InlineQueryIdentifier +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGifCachedImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGifCachedImpl.kt new file mode 100644 index 0000000000..091cc13c2a --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGifCachedImpl.kt @@ -0,0 +1,32 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult + +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif.InlineQueryResultGifCached +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif.inlineQueryResultGifType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.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/InlineQueryResultGifImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGifImpl.kt similarity index 63% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultGifImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGifImpl.kt index b94c6e9fd2..afb8b7215d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultGifImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGifImpl.kt @@ -1,13 +1,13 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.gif.InlineQueryResultGif -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 com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif.InlineQueryResultGif +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif.inlineQueryResultGifType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.utils.MimeType import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultLocation.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultLocation.kt similarity index 66% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultLocation.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultLocation.kt index eaa9327238..e7eebe43ab 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultLocation.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultLocation.kt @@ -1,11 +1,11 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult -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.InlineQueryResult.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.CommonAbstracts.Livable +import dev.inmo.tgbotapi.CommonAbstracts.Locationed +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.* +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifCachedImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifCachedImpl.kt new file mode 100644 index 0000000000..014664fca9 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifCachedImpl.kt @@ -0,0 +1,32 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult + +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.InlineQueryResultMpeg4GifCached +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.inlineQueryResultMpeg4GifType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.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/InlineQueryResultMpeg4GifImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifImpl.kt similarity index 63% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifImpl.kt index 260787fc27..206016a70f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifImpl.kt @@ -1,13 +1,13 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.InlineQueryResultMpeg4Gif -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 com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.InlineQueryResultMpeg4Gif +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.inlineQueryResultMpeg4GifType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.utils.MimeType import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoCachedImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoCachedImpl.kt similarity index 50% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoCachedImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoCachedImpl.kt index 3394e926aa..270fa12fa9 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoCachedImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoCachedImpl.kt @@ -1,13 +1,13 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.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.photo.InlineQueryResultPhotoCached -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.photo.inlineQueryResultPhotoType -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 dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo.InlineQueryResultPhotoCached +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo.inlineQueryResultPhotoType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoImpl.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoImpl.kt index c91d7a0548..bd35faee26 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoImpl.kt @@ -1,12 +1,12 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.photo.InlineQueryResultPhoto -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.photo.inlineQueryResultPhotoType -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 dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo.InlineQueryResultPhoto +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo.inlineQueryResultPhotoType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultStickerCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultStickerCached.kt similarity index 54% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultStickerCached.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultStickerCached.kt index acb9a9a37f..a1defa2d23 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultStickerCached.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultStickerCached.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.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.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.* +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVenue.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVenue.kt similarity index 68% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVenue.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVenue.kt index 3c8def6d1c..30ec5796f2 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVenue.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVenue.kt @@ -1,11 +1,11 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CommonVenueData -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Locationed -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.CommonAbstracts.CommonVenueData +import dev.inmo.tgbotapi.CommonAbstracts.Locationed +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.* +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoCachedImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoCachedImpl.kt similarity index 50% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoCachedImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoCachedImpl.kt index f43ab55624..c5368ae68f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoCachedImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoCachedImpl.kt @@ -1,13 +1,13 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.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.video.InlineQueryResultVideoCached -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.video.inlineQueryResultVideoType -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 dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video.InlineQueryResultVideoCached +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video.inlineQueryResultVideoType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoImpl.kt similarity index 56% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoImpl.kt index 2c7667d8d5..63ca03891b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoImpl.kt @@ -1,14 +1,14 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.video.InlineQueryResultVideo -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.video.inlineQueryResultVideoType -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 com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.mimeTypeField -import com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video.InlineQueryResultVideo +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video.inlineQueryResultVideoType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.files.abstracts.mimeTypeField +import dev.inmo.tgbotapi.utils.MimeType import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceCachedImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceCachedImpl.kt new file mode 100644 index 0000000000..e840e1f444 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceCachedImpl.kt @@ -0,0 +1,32 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult + +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice.InlineQueryResultVoiceCached +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice.inlineQueryResultVoiceType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.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/InlineQueryResultVoiceImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceImpl.kt similarity index 52% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceImpl.kt index c9916096fd..7a8f85efc6 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceImpl.kt @@ -1,12 +1,12 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.voice.InlineQueryResultVoice -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 dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice.InlineQueryResultVoice +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice.inlineQueryResultVoiceType +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/DescribedInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/DescribedInlineQueryResult.kt new file mode 100644 index 0000000000..289ecad089 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/DescribedInlineQueryResult.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts + +interface DescribedInlineQueryResult : InlineQueryResult { + val description: String? +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/DuratedInlineResultQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/DuratedInlineResultQuery.kt new file mode 100644 index 0000000000..49265baeea --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/DuratedInlineResultQuery.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts + +interface DuratedInlineResultQuery { + val duration: Int? +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/FileInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/FileInlineQueryResult.kt new file mode 100644 index 0000000000..0f91071b42 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/FileInlineQueryResult.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts + +import dev.inmo.tgbotapi.requests.abstracts.FileId + +interface FileInlineQueryResult: InlineQueryResult { + val fileId: FileId +} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/InlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/InlineQueryResult.kt new file mode 100644 index 0000000000..9443c09391 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/InlineQueryResult.kt @@ -0,0 +1,13 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts + +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.serializers.InlineQueryResultSerializer +import dev.inmo.tgbotapi.types.InlineQueryIdentifier +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/OptionallyTitledInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/OptionallyTitledInlineQueryResult.kt new file mode 100644 index 0000000000..66a9dae772 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/OptionallyTitledInlineQueryResult.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts + +import dev.inmo.tgbotapi.CommonAbstracts.Titled + +interface OptionallyTitledInlineQueryResult : InlineQueryResult, Titled diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/SizedInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/SizedInlineQueryResult.kt similarity index 50% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/SizedInlineQueryResult.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/SizedInlineQueryResult.kt index 7ea6dda6ea..262150d3c6 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/SizedInlineQueryResult.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/SizedInlineQueryResult.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts interface SizedInlineQueryResult : InlineQueryResult { val width: Int? diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/ThumbSizedInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/ThumbSizedInlineQueryResult.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/ThumbSizedInlineQueryResult.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/ThumbSizedInlineQueryResult.kt index 45a1f7b766..ed49bc5b70 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/ThumbSizedInlineQueryResult.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/ThumbSizedInlineQueryResult.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts interface ThumbSizedInlineQueryResult : InlineQueryResult, ThumbedInlineQueryResult { val thumbWidth: Int? diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/ThumbedInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/ThumbedInlineQueryResult.kt similarity index 54% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/ThumbedInlineQueryResult.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/ThumbedInlineQueryResult.kt index df829a6b4f..c81ae4a9e7 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/ThumbedInlineQueryResult.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/ThumbedInlineQueryResult.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType +import dev.inmo.tgbotapi.utils.MimeType interface ThumbedInlineQueryResult : InlineQueryResult { val thumbUrl: String? diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/TitledInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/TitledInlineQueryResult.kt similarity index 51% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/TitledInlineQueryResult.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/TitledInlineQueryResult.kt index ff5781c058..64f99f1042 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/TitledInlineQueryResult.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/TitledInlineQueryResult.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts interface TitledInlineQueryResult : OptionallyTitledInlineQueryResult { override val title: String diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/UrlInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/UrlInlineQueryResult.kt new file mode 100644 index 0000000000..746c4443c7 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/UrlInlineQueryResult.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts + +interface UrlInlineQueryResult : InlineQueryResult { + val url: String? +} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/WithFileIdInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/WithFileIdInlineQueryResult.kt new file mode 100644 index 0000000000..967a0cd861 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/WithFileIdInlineQueryResult.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts + +import dev.inmo.tgbotapi.requests.abstracts.FileId + +interface WithFileIdInlineQueryResult { + val fileId: FileId +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/WithInputMessageContentInlineQueryResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/WithInputMessageContentInlineQueryResult.kt new file mode 100644 index 0000000000..3205267932 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/WithInputMessageContentInlineQueryResult.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts + +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent + +interface WithInputMessageContentInlineQueryResult : InlineQueryResult { + val inputMessageContent: InputMessageContent? +} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudio.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudio.kt new file mode 100644 index 0000000000..9ad95a8ed8 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudio.kt @@ -0,0 +1,6 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio + +import dev.inmo.tgbotapi.CommonAbstracts.Performerable +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCached.kt new file mode 100644 index 0000000000..8345468d16 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCached.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio + +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult + +interface InlineQueryResultAudioCached : InlineQueryResultAudioCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCommon.kt new file mode 100644 index 0000000000..4d044cb2fa --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCommon.kt @@ -0,0 +1,11 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio + +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.WithInputMessageContentInlineQueryResult + +const val inlineQueryResultAudioType = "audio" + +interface InlineQueryResultAudioCommon : InlineQueryResult, + CaptionedOutput, + WithInputMessageContentInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocument.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocument.kt new file mode 100644 index 0000000000..ca527256b7 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocument.kt @@ -0,0 +1,6 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document + +import dev.inmo.tgbotapi.CommonAbstracts.MimeTyped +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCached.kt new file mode 100644 index 0000000000..fd6ff82157 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCached.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document + +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult + +interface InlineQueryResultDocumentCached : InlineQueryResultDocumentCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCommon.kt new file mode 100644 index 0000000000..6000638253 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCommon.kt @@ -0,0 +1,12 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document + +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.* + +const val inlineQueryResultDocumentType = "document" + +interface InlineQueryResultDocumentCommon : InlineQueryResult, + TitledInlineQueryResult, + DescribedInlineQueryResult, + CaptionedOutput, + WithInputMessageContentInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGif.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGif.kt new file mode 100644 index 0000000000..521f99a174 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGif.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif + +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCached.kt new file mode 100644 index 0000000000..519ee07dc6 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCached.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif + +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult + +interface InlineQueryResultGifCached : InlineQueryResultGifCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCommon.kt new file mode 100644 index 0000000000..6c64ec21b0 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCommon.kt @@ -0,0 +1,11 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif + +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.* + +const val inlineQueryResultGifType = "gif" + +interface InlineQueryResultGifCommon : InlineQueryResult, + OptionallyTitledInlineQueryResult, + CaptionedOutput, + WithInputMessageContentInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4Gif.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4Gif.kt new file mode 100644 index 0000000000..c55e86021c --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4Gif.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif + +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCached.kt new file mode 100644 index 0000000000..57b973774a --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCached.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif + +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult + +interface InlineQueryResultMpeg4GifCached : InlineQueryResultMpeg4GifCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCommon.kt new file mode 100644 index 0000000000..f8649eb7b8 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCommon.kt @@ -0,0 +1,11 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif + +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.* + +const val inlineQueryResultMpeg4GifType = "mpeg4_gif" + +interface InlineQueryResultMpeg4GifCommon : InlineQueryResult, + OptionallyTitledInlineQueryResult, + CaptionedOutput, + WithInputMessageContentInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhoto.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhoto.kt new file mode 100644 index 0000000000..dad3ba3009 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhoto.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo + +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.* + +interface InlineQueryResultPhoto : InlineQueryResultPhotoCommon, UrlInlineQueryResult, ThumbedInlineQueryResult, SizedInlineQueryResult \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCached.kt new file mode 100644 index 0000000000..8dbd0d4d39 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCached.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo + +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult + +interface InlineQueryResultPhotoCached : InlineQueryResultPhotoCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCommon.kt new file mode 100644 index 0000000000..b65989092d --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCommon.kt @@ -0,0 +1,12 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo + +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.* + +const val inlineQueryResultPhotoType = "photo" + +interface InlineQueryResultPhotoCommon : InlineQueryResult, + OptionallyTitledInlineQueryResult, + DescribedInlineQueryResult, + CaptionedOutput, + WithInputMessageContentInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideo.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideo.kt new file mode 100644 index 0000000000..c6b1b80d75 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideo.kt @@ -0,0 +1,6 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video + +import dev.inmo.tgbotapi.CommonAbstracts.MimeTyped +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCached.kt new file mode 100644 index 0000000000..b79c9ad378 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCached.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video + +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult + +interface InlineQueryResultVideoCached : InlineQueryResultVideoCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCommon.kt new file mode 100644 index 0000000000..a82aecbd03 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCommon.kt @@ -0,0 +1,12 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video + +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.* + +const val inlineQueryResultVideoType = "video" + +interface InlineQueryResultVideoCommon : InlineQueryResult, + TitledInlineQueryResult, + DescribedInlineQueryResult, + CaptionedOutput, + WithInputMessageContentInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoice.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoice.kt new file mode 100644 index 0000000000..398c65e1b8 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoice.kt @@ -0,0 +1,6 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice + +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.DuratedInlineResultQuery +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.UrlInlineQueryResult + +interface InlineQueryResultVoice : InlineQueryResultVoiceCommon, UrlInlineQueryResult, DuratedInlineResultQuery \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCached.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCached.kt new file mode 100644 index 0000000000..0d3d2300b7 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCached.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice + +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult + +interface InlineQueryResultVoiceCached : InlineQueryResultVoiceCommon, WithFileIdInlineQueryResult diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCommon.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCommon.kt new file mode 100644 index 0000000000..8ff23d5ea3 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCommon.kt @@ -0,0 +1,11 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice + +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput +import dev.inmo.tgbotapi.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/InlineQueryResult/serializers/InlineQueryResultSerializer.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt similarity index 90% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt index b6282cef69..29a852e5fa 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.serializers +package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.serializers -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.* +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.Decoder diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContent/InputContactMessageContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputContactMessageContent.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContent/InputContactMessageContent.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputContactMessageContent.kt index b327358907..84b23e806c 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContent/InputContactMessageContent.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputContactMessageContent.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InputMessageContent +package dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CommonContactData -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.CommonAbstracts.CommonContactData +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputLocationMessageContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputLocationMessageContent.kt new file mode 100644 index 0000000000..9096ab0eac --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputLocationMessageContent.kt @@ -0,0 +1,18 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent + +import dev.inmo.tgbotapi.CommonAbstracts.Livable +import dev.inmo.tgbotapi.CommonAbstracts.Locationed +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputTextMessageContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputTextMessageContent.kt new file mode 100644 index 0000000000..698608c632 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputTextMessageContent.kt @@ -0,0 +1,21 @@ +package dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent + +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput +import dev.inmo.tgbotapi.CommonAbstracts.types.DisableWebPagePreview +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.disableWebPagePreviewField +import dev.inmo.tgbotapi.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/InputMessageContent/InputVenueMessageContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputVenueMessageContent.kt similarity index 60% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContent/InputVenueMessageContent.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputVenueMessageContent.kt index 53e6e09e3a..f8be7df0c5 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContent/InputVenueMessageContent.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputVenueMessageContent.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InputMessageContent +package dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CommonVenueData -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Locationed -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.CommonAbstracts.CommonVenueData +import dev.inmo.tgbotapi.CommonAbstracts.Locationed +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContentSerializer.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContentSerializer.kt similarity index 82% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContentSerializer.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContentSerializer.kt index 3505235113..58e4c76a13 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContentSerializer.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContentSerializer.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries +package dev.inmo.tgbotapi.types.InlineQueries -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InputMessageContent.* -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent +import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.* +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.Decoder diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/abstracts/ChosenInlineResult.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/ChosenInlineResult.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/abstracts/ChosenInlineResult.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/ChosenInlineResult.kt index 88f4d3f570..1d98928768 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/abstracts/ChosenInlineResult.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/ChosenInlineResult.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts +package dev.inmo.tgbotapi.types.InlineQueries.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.types.* interface ChosenInlineResult { val resultId: InlineQueryIdentifier //chosen temporary, can be changed diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InlineQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InlineQuery.kt new file mode 100644 index 0000000000..c785cf5801 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InlineQuery.kt @@ -0,0 +1,11 @@ +package dev.inmo.tgbotapi.types.InlineQueries.abstracts + +import dev.inmo.tgbotapi.types.InlineQueryIdentifier +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InputMessageContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InputMessageContent.kt new file mode 100644 index 0000000000..77fa368bb3 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InputMessageContent.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.InlineQueries.abstracts + +import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContentSerializer +import kotlinx.serialization.Serializable + +@Serializable(InputMessageContentSerializer::class) +interface InputMessageContent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/BaseInlineQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/BaseInlineQuery.kt new file mode 100644 index 0000000000..ba1e09280a --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/BaseInlineQuery.kt @@ -0,0 +1,12 @@ +package dev.inmo.tgbotapi.types.InlineQueries.query + +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery +import dev.inmo.tgbotapi.types.InlineQueryIdentifier +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/InlineQueries/query/LocationInlineQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/LocationInlineQuery.kt new file mode 100644 index 0000000000..260eb39cc2 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/LocationInlineQuery.kt @@ -0,0 +1,12 @@ +package dev.inmo.tgbotapi.types.InlineQueries.query + +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.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/InlineQueries/query/RawInlineQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/RawInlineQuery.kt similarity index 81% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/query/RawInlineQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/RawInlineQuery.kt index 1979004dfd..2d15827909 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/query/RawInlineQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/RawInlineQuery.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.query +package dev.inmo.tgbotapi.types.InlineQueries.query -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/DuratedInputMedia.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/DuratedInputMedia.kt similarity index 50% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/DuratedInputMedia.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/DuratedInputMedia.kt index 0162eecf42..9b4cd6f25e 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/DuratedInputMedia.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/DuratedInputMedia.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia +package dev.inmo.tgbotapi.types.InputMedia interface DuratedInputMedia : InputMedia { val duration: Long? diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMedia.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMedia.kt similarity index 62% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMedia.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMedia.kt index dbfe3df43e..7942ed7ccf 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMedia.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMedia.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia +package dev.inmo.tgbotapi.types.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.InputFile +import dev.inmo.tgbotapi.requests.abstracts.InputFile import kotlinx.serialization.Serializable fun String.toInputMediaFileAttachmentName() = "attach://$this" diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAnimation.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAnimation.kt similarity index 61% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAnimation.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAnimation.kt index e44b6d64ec..6d96174261 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAnimation.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAnimation.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia +package dev.inmo.tgbotapi.types.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedOutput -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.mediaField +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.mediaField import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAudio.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAudio.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAudio.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAudio.kt index 253a69974c..461d4f217b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAudio.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAudio.kt @@ -1,11 +1,11 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia +package dev.inmo.tgbotapi.types.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedOutput -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Performerable -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.mediaField +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput +import dev.inmo.tgbotapi.CommonAbstracts.Performerable +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.mediaField import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaDocument.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaDocument.kt similarity index 55% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaDocument.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaDocument.kt index e99bffc69e..9d40fa4660 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaDocument.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaDocument.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia +package dev.inmo.tgbotapi.types.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedOutput -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.mediaField +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.mediaField import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaPhoto.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaPhoto.kt similarity index 66% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaPhoto.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaPhoto.kt index e772fb56c9..432fd8a578 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaPhoto.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaPhoto.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia +package dev.inmo.tgbotapi.types.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.files.PhotoSize -import com.github.insanusmokrassar.TelegramBotAPI.types.mediaField +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.files.PhotoSize +import dev.inmo.tgbotapi.types.mediaField import kotlinx.serialization.* import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonObject diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaSerializer.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaSerializer.kt similarity index 94% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaSerializer.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaSerializer.kt index c61c13b8b0..1d29dbb037 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaSerializer.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaSerializer.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia +package dev.inmo.tgbotapi.types.InputMedia import kotlinx.serialization.* import kotlinx.serialization.descriptors.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaVideo.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaVideo.kt similarity index 70% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaVideo.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaVideo.kt index 0bf052921c..8be815907a 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaVideo.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaVideo.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia +package dev.inmo.tgbotapi.types.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField -import com.github.insanusmokrassar.TelegramBotAPI.types.mediaField +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.ParseMode.parseModeField +import dev.inmo.tgbotapi.types.mediaField import kotlinx.serialization.* import kotlinx.serialization.json.JsonElement diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMedia.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMedia.kt similarity index 76% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMedia.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMedia.kt index 5d712d203f..a587f121d5 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMedia.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMedia.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia +package dev.inmo.tgbotapi.types.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedOutput +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput import kotlinx.serialization.* import kotlinx.serialization.json.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt similarity index 86% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt index cd9a86c68d..12faeb251c 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia +package dev.inmo.tgbotapi.types.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.types.typeField -import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat +import dev.inmo.tgbotapi.types.typeField +import dev.inmo.tgbotapi.utils.nonstrictJsonFormat import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.Decoder diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/SizedInputMedia.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/SizedInputMedia.kt similarity index 55% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/SizedInputMedia.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/SizedInputMedia.kt index 010f8c4f72..4048b67d98 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/SizedInputMedia.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/SizedInputMedia.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia +package dev.inmo.tgbotapi.types.InputMedia interface SizedInputMedia : InputMedia { val width: Int? diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/ThumbedInputMedia.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/ThumbedInputMedia.kt similarity index 67% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/ThumbedInputMedia.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/ThumbedInputMedia.kt index f168e6abaa..5588de4677 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/ThumbedInputMedia.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/ThumbedInputMedia.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia +package dev.inmo.tgbotapi.types.InputMedia -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.thumbField +import dev.inmo.tgbotapi.requests.abstracts.* +import dev.inmo.tgbotapi.types.thumbField import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/TitledInputMedia.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/TitledInputMedia.kt similarity index 50% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/TitledInputMedia.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/TitledInputMedia.kt index d6d58540a8..77b9de662f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/TitledInputMedia.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/TitledInputMedia.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia +package dev.inmo.tgbotapi.types.InputMedia interface TitledInputMedia : InputMedia { val title: String? diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Location.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Location.kt similarity index 66% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Location.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Location.kt index 29ab9f3472..0571bfaf1e 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Location.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Location.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Locationed +import dev.inmo.tgbotapi.CommonAbstracts.Locationed import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/LoginURL.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/LoginURL.kt similarity index 87% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/LoginURL.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/LoginURL.kt index 13f223eebf..72b62035f1 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/LoginURL.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/LoginURL.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/RawMessageEntity.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/RawMessageEntity.kt similarity index 92% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/RawMessageEntity.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/RawMessageEntity.kt index 6a2862a2fa..942e6d1704 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/RawMessageEntity.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/RawMessageEntity.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity +package dev.inmo.tgbotapi.types.MessageEntity -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.* -import com.github.insanusmokrassar.TelegramBotAPI.types.User -import com.github.insanusmokrassar.TelegramBotAPI.utils.shiftSourcesToTheLeft +import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.types.MessageEntity.textsources.* +import dev.inmo.tgbotapi.types.User +import dev.inmo.tgbotapi.utils.shiftSourcesToTheLeft import kotlinx.serialization.Serializable @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/BoldTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BoldTextSource.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/BoldTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BoldTextSource.kt index 7d3f83497a..b5c2823022 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/BoldTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BoldTextSource.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.utils.* class BoldTextSource( override val source: String, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/BotCommandTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BotCommandTextSource.kt similarity index 69% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/BotCommandTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BotCommandTextSource.kt index b0fa9a1fa6..eb95d69313 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/BotCommandTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BotCommandTextSource.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.utils.* private val commandRegex = Regex("[/!][^@\\s]*") diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/CashTagTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CashTagTextSource.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/CashTagTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CashTagTextSource.kt index 0186c60e9d..13e490b753 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/CashTagTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CashTagTextSource.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.utils.* class CashTagTextSource( override val source: String, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/CodeTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CodeTextSource.kt similarity index 57% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/CodeTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CodeTextSource.kt index 66616d090d..c47cbbdb91 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/CodeTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CodeTextSource.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.TextSource +import dev.inmo.tgbotapi.utils.* class CodeTextSource( override val source: String diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/EMailTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/EMailTextSource.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/EMailTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/EMailTextSource.kt index c6704af3ed..f5c7450238 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/EMailTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/EMailTextSource.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.utils.* class EMailTextSource( override val source: String, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/HashTagTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/HashTagTextSource.kt similarity index 67% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/HashTagTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/HashTagTextSource.kt index ed3887ea59..2cd398ad47 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/HashTagTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/HashTagTextSource.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.utils.* private val String.withoutSharp get() = if (startsWith("#")){ diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/ItalicTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/ItalicTextSource.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/ItalicTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/ItalicTextSource.kt index 49ae39363f..0c8ed6fa61 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/ItalicTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/ItalicTextSource.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.utils.* class ItalicTextSource( override val source: String, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/MentionTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt similarity index 67% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/MentionTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt index d8f29065fe..bd3ef1efa4 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/MentionTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.utils.* private val String.withoutCommercialAt get() = if (startsWith("@")) { diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/PhoneNumberTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PhoneNumberTextSource.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/PhoneNumberTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PhoneNumberTextSource.kt index f7f4735e6f..6aabef80fa 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/PhoneNumberTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PhoneNumberTextSource.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.utils.* class PhoneNumberTextSource( override val source: String, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/PreTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PreTextSource.kt similarity index 61% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/PreTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PreTextSource.kt index 53fbafca59..efebe3d252 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/PreTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PreTextSource.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.TextSource +import dev.inmo.tgbotapi.utils.* class PreTextSource( override val source: String, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/RegularTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/RegularTextSource.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/RegularTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/RegularTextSource.kt index a3fefb0de3..4439bcaf4d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/RegularTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/RegularTextSource.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.TextSource +import dev.inmo.tgbotapi.utils.* class RegularTextSource( override val source: String diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/StrikethroughTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/StrikethroughTextSource.kt similarity index 59% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/StrikethroughTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/StrikethroughTextSource.kt index 4fb9156f74..63ec29c07f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/StrikethroughTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/StrikethroughTextSource.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.utils.* class StrikethroughTextSource( override val source: String, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/TextLinkTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextLinkTextSource.kt similarity index 60% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/TextLinkTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextLinkTextSource.kt index 0b89463c32..82bc46c3b3 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/TextLinkTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextLinkTextSource.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.TextSource +import dev.inmo.tgbotapi.utils.* class TextLinkTextSource( override val source: String, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/TextMentionTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextMentionTextSource.kt similarity index 57% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/TextMentionTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextMentionTextSource.kt index 5ebac31a50..5109236b1b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/TextMentionTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextMentionTextSource.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.types.User -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.types.User +import dev.inmo.tgbotapi.utils.* class TextMentionTextSource( override val source: String, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/URLTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/URLTextSource.kt similarity index 59% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/URLTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/URLTextSource.kt index dfa2cfeca0..b5763b8538 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/URLTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/URLTextSource.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.TextSource +import dev.inmo.tgbotapi.utils.* class URLTextSource( override val source: String diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/UnderlineTextSource.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/UnderlineTextSource.kt similarity index 59% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/UnderlineTextSource.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/UnderlineTextSource.kt index 13f4c87395..00a195bc0a 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/UnderlineTextSource.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/UnderlineTextSource.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources +package dev.inmo.tgbotapi.types.MessageEntity.textsources -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.utils.* class UnderlineTextSource( override val source: String, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ParseMode/ParseMode.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ParseMode/ParseMode.kt similarity index 95% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ParseMode/ParseMode.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ParseMode/ParseMode.kt index 46d66003c5..8cd2f094d1 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ParseMode/ParseMode.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ParseMode/ParseMode.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode +package dev.inmo.tgbotapi.types.ParseMode import kotlinx.serialization.* import kotlinx.serialization.encoding.Decoder diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/RequestError.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/RequestError.kt similarity index 87% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/RequestError.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/RequestError.kt index f5ad67adad..8ede26681c 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/RequestError.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/RequestError.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types import com.soywiz.klock.DateTime diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Response.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Response.kt similarity index 87% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Response.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Response.kt index 6a5bfa4c62..90aa7cfaef 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Response.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Response.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ResponseParametersRaw.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ResponseParametersRaw.kt similarity index 91% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ResponseParametersRaw.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ResponseParametersRaw.kt index 5934831b72..c5f28ade7f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ResponseParametersRaw.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ResponseParametersRaw.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types import com.soywiz.klock.DateTime import kotlinx.serialization.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/TelegramDate.kt similarity index 94% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDate.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/TelegramDate.kt index 381e08da1d..0be809987d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDate.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/TelegramDate.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types import com.soywiz.klock.DateTime import kotlinx.serialization.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/UpdateTypes.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/UpdateTypes.kt similarity index 93% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/UpdateTypes.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/UpdateTypes.kt index ce3e08b5c4..0c2be08534 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/UpdateTypes.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/UpdateTypes.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types const val UPDATE_MESSAGE = "message" const val UPDATE_EDITED_MESSAGE = "edited_message" diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/User.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/User.kt similarity index 89% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/User.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/User.kt index c885173630..c89704ee63 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/User.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/User.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PrivateChat -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.extended.ExtendedPrivateChatImpl -import com.github.insanusmokrassar.TelegramBotAPI.utils.PreviewFeature -import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat +import dev.inmo.tgbotapi.types.chat.abstracts.PrivateChat +import dev.inmo.tgbotapi.types.chat.extended.ExtendedPrivateChatImpl +import dev.inmo.tgbotapi.utils.PreviewFeature +import dev.inmo.tgbotapi.utils.nonstrictJsonFormat import kotlinx.serialization.* import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/UserProfilePhotos.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/UserProfilePhotos.kt similarity index 65% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/UserProfilePhotos.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/UserProfilePhotos.kt index 21cdc9d9d5..2ccb208d9b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/UserProfilePhotos.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/UserProfilePhotos.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types -import com.github.insanusmokrassar.TelegramBotAPI.types.files.Photo -import com.github.insanusmokrassar.TelegramBotAPI.types.files.PhotoSerializer +import dev.inmo.tgbotapi.types.files.Photo +import dev.inmo.tgbotapi.types.files.PhotoSerializer import kotlinx.serialization.* import kotlinx.serialization.builtins.ListSerializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/WebhookInfo.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/WebhookInfo.kt similarity index 93% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/WebhookInfo.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/WebhookInfo.kt index 037e6e6815..3596d56b12 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/WebhookInfo.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/WebhookInfo.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types import kotlinx.serialization.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/actions/BotAction.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/actions/BotAction.kt similarity index 98% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/actions/BotAction.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/actions/BotAction.kt index da51cab99a..7c405e8c8b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/actions/BotAction.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/actions/BotAction.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.actions +package dev.inmo.tgbotapi.types.actions import kotlinx.serialization.* import kotlinx.serialization.encoding.Decoder diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/Common.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/Common.kt new file mode 100644 index 0000000000..fb42fee8c7 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/Common.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.buttons + +typealias Matrix = List> diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/ForceReply.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/ForceReply.kt similarity index 79% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/ForceReply.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/ForceReply.kt index abf21f1542..c04cdfbd9c 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/ForceReply.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/ForceReply.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.buttons +package dev.inmo.tgbotapi.types.buttons import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButton.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/InlineKeyboardButtons/InlineKeyboardButton.kt similarity index 88% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButton.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/InlineKeyboardButtons/InlineKeyboardButton.kt index cba8a5f2c5..4940bba946 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButton.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/InlineKeyboardButtons/InlineKeyboardButton.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardButtons +package dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.games.CallbackGame +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.games.CallbackGame import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonElement diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt similarity index 88% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt index f45f542aca..8a3ab256e0 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardButtons +package dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.utils.nonstrictJsonFormat import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.Decoder @@ -11,7 +11,7 @@ import kotlinx.serialization.json.* internal object InlineKeyboardButtonSerializer : KSerializer { @InternalSerializationApi override val descriptor: SerialDescriptor = buildSerialDescriptor( - "com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardButtons.InlineKeyboardButton", + "dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.InlineKeyboardButton", PolymorphicKind.SEALED ) diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardMarkup.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup.kt similarity index 67% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardMarkup.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup.kt index 7529c49112..cc3e707e47 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardMarkup.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.buttons +package dev.inmo.tgbotapi.types.buttons -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardButtons.InlineKeyboardButton -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardButtons.PayInlineKeyboardButton -import com.github.insanusmokrassar.TelegramBotAPI.types.inlineKeyboardField +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.InlineKeyboardButton +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.PayInlineKeyboardButton +import dev.inmo.tgbotapi.types.inlineKeyboardField import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardButton.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButton.kt similarity index 94% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardButton.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButton.kt index 6343c50ab5..ec9ce5892b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardButton.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButton.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.buttons +package dev.inmo.tgbotapi.types.buttons -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.utils.nonstrictJsonFormat import kotlinx.serialization.* import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardButtonPollType.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButtonPollType.kt similarity index 93% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardButtonPollType.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButtonPollType.kt index 218f1d4c76..297899d8cf 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardButtonPollType.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButtonPollType.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.buttons +package dev.inmo.tgbotapi.types.buttons -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.* import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardMarkup.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardMarkup.kt similarity index 64% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardMarkup.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardMarkup.kt index a8702a797a..3def9b997b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardMarkup.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardMarkup.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.buttons +package dev.inmo.tgbotapi.types.buttons import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardMarkupSerializer.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardMarkupSerializer.kt similarity index 94% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardMarkupSerializer.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardMarkupSerializer.kt index 931a57912a..13db549506 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/KeyboardMarkupSerializer.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardMarkupSerializer.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.buttons +package dev.inmo.tgbotapi.types.buttons import kotlinx.serialization.* import kotlinx.serialization.descriptors.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/ReplyKeyboardMarkup.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/ReplyKeyboardMarkup.kt similarity index 85% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/ReplyKeyboardMarkup.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/ReplyKeyboardMarkup.kt index a6e9cf6a3d..70ff25aaf1 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/ReplyKeyboardMarkup.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/ReplyKeyboardMarkup.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.buttons +package dev.inmo.tgbotapi.types.buttons import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/ReplyKeyboardRemove.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/ReplyKeyboardRemove.kt similarity index 80% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/ReplyKeyboardRemove.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/ReplyKeyboardRemove.kt index 0acae3fd4a..84b0d7cec3 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/ReplyKeyboardRemove.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/ReplyKeyboardRemove.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.buttons +package dev.inmo.tgbotapi.types.buttons import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/ChannelChatImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChannelChatImpl.kt similarity index 61% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/ChannelChatImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChannelChatImpl.kt index ce5d60655d..f0bf9f6d73 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/ChannelChatImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChannelChatImpl.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat +package dev.inmo.tgbotapi.types.chat -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.ChannelChat +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.ChannelChat import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/ChatPermissions.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatPermissions.kt similarity index 86% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/ChatPermissions.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatPermissions.kt index 8441538255..51b00218d1 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/ChatPermissions.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatPermissions.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat +package dev.inmo.tgbotapi.types.chat -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/ChatSerializers.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatSerializers.kt similarity index 87% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/ChatSerializers.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatSerializers.kt index 8630079737..053e640183 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/ChatSerializers.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatSerializers.kt @@ -1,11 +1,11 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat +package dev.inmo.tgbotapi.types.chat -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.UnknownChatType -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.extended.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.chat.abstracts.UnknownChatType +import dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat +import dev.inmo.tgbotapi.types.chat.extended.* +import dev.inmo.tgbotapi.utils.nonstrictJsonFormat import kotlinx.serialization.* import kotlinx.serialization.builtins.serializer import kotlinx.serialization.descriptors.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/GroupChatImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/GroupChatImpl.kt similarity index 55% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/GroupChatImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/GroupChatImpl.kt index 5a5bf04394..26cff478b6 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/GroupChatImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/GroupChatImpl.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat +package dev.inmo.tgbotapi.types.chat -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.GroupChat +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.GroupChat import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/PrivateChatImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/PrivateChatImpl.kt similarity index 67% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/PrivateChatImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/PrivateChatImpl.kt index 6f083135ce..ba52fc47aa 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/PrivateChatImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/PrivateChatImpl.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat +package dev.inmo.tgbotapi.types.chat -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PrivateChat +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.PrivateChat import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/SupergroupChatImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/SupergroupChatImpl.kt similarity index 62% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/SupergroupChatImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/SupergroupChatImpl.kt index 44c83a9f82..ea8463de05 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/SupergroupChatImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/SupergroupChatImpl.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat +package dev.inmo.tgbotapi.types.chat -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.SupergroupChat +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.SupergroupChat import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/ChannelChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/ChannelChat.kt new file mode 100644 index 0000000000..2a6043809f --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/ChannelChat.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.chat.abstracts + +interface ChannelChat : SuperPublicChat diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/Chat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/Chat.kt new file mode 100644 index 0000000000..65043c55de --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/Chat.kt @@ -0,0 +1,15 @@ +package dev.inmo.tgbotapi.types.chat.abstracts + +import dev.inmo.tgbotapi.types.ChatId +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/chat/abstracts/GroupChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/GroupChat.kt new file mode 100644 index 0000000000..849d6b9e3a --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/GroupChat.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.chat.abstracts + +interface GroupChat : PublicChat diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/PrivateChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/PrivateChat.kt similarity index 57% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/PrivateChat.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/PrivateChat.kt index 0c2286f85d..2459398282 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/abstracts/PrivateChat.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/PrivateChat.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts +package dev.inmo.tgbotapi.types.chat.abstracts interface PrivateChat : Chat, UsernameChat { val firstName: String diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/PublicChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/PublicChat.kt new file mode 100644 index 0000000000..98c70cec84 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/PublicChat.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.chat.abstracts + +interface PublicChat : Chat { + val title: String +} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/SuperPublicChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/SuperPublicChat.kt new file mode 100644 index 0000000000..0403f89fa6 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/SuperPublicChat.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.chat.abstracts + +interface SuperPublicChat : PublicChat, UsernameChat diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/SupergroupChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/SupergroupChat.kt new file mode 100644 index 0000000000..f49d4d144f --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/SupergroupChat.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.chat.abstracts + +interface SupergroupChat : GroupChat, SuperPublicChat diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/UsernameChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/UsernameChat.kt new file mode 100644 index 0000000000..99ced04a6a --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/UsernameChat.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.chat.abstracts + +import dev.inmo.tgbotapi.types.Username + +interface UsernameChat : Chat { + val username: Username? +} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedChannelChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedChannelChat.kt new file mode 100644 index 0000000000..424e9cd9d7 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedChannelChat.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.chat.abstracts.extended + +import dev.inmo.tgbotapi.types.chat.abstracts.ChannelChat + +interface ExtendedChannelChat : ChannelChat, ExtendedPublicChat diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedChat.kt new file mode 100644 index 0000000000..9a888d273c --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedChat.kt @@ -0,0 +1,11 @@ +package dev.inmo.tgbotapi.types.chat.abstracts.extended + +import dev.inmo.tgbotapi.types.ChatPhoto +import dev.inmo.tgbotapi.types.chat.ExtendedChatSerializer +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedGroupChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedGroupChat.kt new file mode 100644 index 0000000000..df9c9e157b --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedGroupChat.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.types.chat.abstracts.extended + +import dev.inmo.tgbotapi.types.chat.ChatPermissions +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedPrivateChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedPrivateChat.kt new file mode 100644 index 0000000000..e88ca5fa9f --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedPrivateChat.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.chat.abstracts.extended + +import dev.inmo.tgbotapi.types.chat.abstracts.PrivateChat + +interface ExtendedPrivateChat : PrivateChat, ExtendedChat diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedPublicChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedPublicChat.kt new file mode 100644 index 0000000000..95d9366a60 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedPublicChat.kt @@ -0,0 +1,13 @@ +package dev.inmo.tgbotapi.types.chat.abstracts.extended + +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedSupergroupChat.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedSupergroupChat.kt new file mode 100644 index 0000000000..f850ac7601 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/extended/ExtendedSupergroupChat.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.chat.abstracts.extended + +import dev.inmo.tgbotapi.types.StickerSetName +import dev.inmo.tgbotapi.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/chat/extended/ExtendedChannelChatImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/extended/ExtendedChannelChatImpl.kt similarity index 62% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/extended/ExtendedChannelChatImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/extended/ExtendedChannelChatImpl.kt index 0dd170eac3..f7a050628b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/extended/ExtendedChannelChatImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/extended/ExtendedChannelChatImpl.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.extended +package dev.inmo.tgbotapi.types.chat.extended -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChannelChat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChannelChat +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/extended/ExtendedGroupChatImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/extended/ExtendedGroupChatImpl.kt similarity index 59% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/extended/ExtendedGroupChatImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/extended/ExtendedGroupChatImpl.kt index e870b1541c..c19b0f4683 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/extended/ExtendedGroupChatImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/extended/ExtendedGroupChatImpl.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.extended +package dev.inmo.tgbotapi.types.chat.extended -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ChatPermissions -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedGroupChat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.ChatPermissions +import dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedGroupChat +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/extended/ExtendedPrivateChatImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/extended/ExtendedPrivateChatImpl.kt similarity index 68% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/extended/ExtendedPrivateChatImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/extended/ExtendedPrivateChatImpl.kt index 3ccc572acd..d507fcfea3 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/extended/ExtendedPrivateChatImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/extended/ExtendedPrivateChatImpl.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.extended +package dev.inmo.tgbotapi.types.chat.extended -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedPrivateChat +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedPrivateChat import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/extended/ExtendedSupergroupChatImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/extended/ExtendedSupergroupChatImpl.kt similarity index 68% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/extended/ExtendedSupergroupChatImpl.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/extended/ExtendedSupergroupChatImpl.kt index 6f906ff566..1e10877159 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/chat/extended/ExtendedSupergroupChatImpl.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/extended/ExtendedSupergroupChatImpl.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.chat.extended +package dev.inmo.tgbotapi.types.chat.extended -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ChatPermissions -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedSupergroupChat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.ChatPermissions +import dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedSupergroupChat +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/dice/Dice.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/Dice.kt similarity index 66% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/dice/Dice.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/Dice.kt index e798bbf23f..834df0c729 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/dice/Dice.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/Dice.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.dice +package dev.inmo.tgbotapi.types.dice -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/dice/DiceAnimationType.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/DiceAnimationType.kt similarity index 96% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/dice/DiceAnimationType.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/DiceAnimationType.kt index 9524bb2d4e..806e43d16f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/dice/DiceAnimationType.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/DiceAnimationType.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.dice +package dev.inmo.tgbotapi.types.dice import kotlinx.serialization.* import kotlinx.serialization.descriptors.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/AnimationFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/AnimationFile.kt similarity index 63% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/AnimationFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/AnimationFile.kt index 81d5d91033..9087f96d7b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/AnimationFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/AnimationFile.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files +package dev.inmo.tgbotapi.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 com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.FileUniqueId +import dev.inmo.tgbotapi.types.fileUniqueIdField +import dev.inmo.tgbotapi.types.files.abstracts.* +import dev.inmo.tgbotapi.utils.MimeType import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/AudioFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/AudioFile.kt similarity index 57% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/AudioFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/AudioFile.kt index 839ef60c09..3e4268ea7f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/AudioFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/AudioFile.kt @@ -1,11 +1,11 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files +package dev.inmo.tgbotapi.types.files -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Performerable -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 com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType +import dev.inmo.tgbotapi.CommonAbstracts.Performerable +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.FileUniqueId +import dev.inmo.tgbotapi.types.fileUniqueIdField +import dev.inmo.tgbotapi.types.files.abstracts.* +import dev.inmo.tgbotapi.utils.MimeType import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/DocumentFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/DocumentFile.kt similarity index 59% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/DocumentFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/DocumentFile.kt index 64b5a8833b..41c0ac7854 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/DocumentFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/DocumentFile.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files +package dev.inmo.tgbotapi.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 com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.FileUniqueId +import dev.inmo.tgbotapi.types.fileUniqueIdField +import dev.inmo.tgbotapi.types.files.abstracts.* +import dev.inmo.tgbotapi.utils.MimeType import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/File.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/File.kt new file mode 100644 index 0000000000..bbfcfa8393 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/File.kt @@ -0,0 +1,18 @@ +package dev.inmo.tgbotapi.types.files + +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.FileUniqueId +import dev.inmo.tgbotapi.types.fileUniqueIdField +import dev.inmo.tgbotapi.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/PathedFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/PathedFile.kt similarity index 62% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/PathedFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/PathedFile.kt index 06c755b2bc..06438895c8 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/PathedFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/PathedFile.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files +package dev.inmo.tgbotapi.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 com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.FileUniqueId +import dev.inmo.tgbotapi.types.fileUniqueIdField +import dev.inmo.tgbotapi.types.files.abstracts.* +import dev.inmo.tgbotapi.utils.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/PhotoSize.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/PhotoSize.kt similarity index 66% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/PhotoSize.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/PhotoSize.kt index 58022354c2..07a76c1d4c 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/PhotoSize.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/PhotoSize.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files +package dev.inmo.tgbotapi.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 dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.FileUniqueId +import dev.inmo.tgbotapi.types.fileUniqueIdField +import dev.inmo.tgbotapi.types.files.abstracts.* import kotlinx.serialization.* import kotlinx.serialization.builtins.ListSerializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/Sticker.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/Sticker.kt similarity index 71% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/Sticker.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/Sticker.kt index 21eeb15cce..358b6a8b68 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/Sticker.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/Sticker.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files +package dev.inmo.tgbotapi.types.files -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.files.abstracts.* +import dev.inmo.tgbotapi.types.stickers.MaskPosition import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/VideoFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoFile.kt similarity index 60% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/VideoFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoFile.kt index 0034e85543..84555e0a76 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/VideoFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoFile.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files +package dev.inmo.tgbotapi.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 com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.FileUniqueId +import dev.inmo.tgbotapi.types.fileUniqueIdField +import dev.inmo.tgbotapi.types.files.abstracts.* +import dev.inmo.tgbotapi.utils.MimeType import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/VideoNoteFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoNoteFile.kt similarity index 62% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/VideoNoteFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoNoteFile.kt index 98b058acfb..528934392a 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/VideoNoteFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoNoteFile.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files +package dev.inmo.tgbotapi.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 dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.FileUniqueId +import dev.inmo.tgbotapi.types.fileUniqueIdField +import dev.inmo.tgbotapi.types.files.abstracts.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/VoiceFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VoiceFile.kt similarity index 61% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/VoiceFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VoiceFile.kt index 389fc542cf..ea79bd61ea 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/VoiceFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VoiceFile.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files +package dev.inmo.tgbotapi.types.files -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.files.abstracts.* +import dev.inmo.tgbotapi.utils.MimeType import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/CustomNamedMediaFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/CustomNamedMediaFile.kt similarity index 59% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/CustomNamedMediaFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/CustomNamedMediaFile.kt index b7e7745c6a..e81488bb43 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/CustomNamedMediaFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/CustomNamedMediaFile.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts +package dev.inmo.tgbotapi.types.files.abstracts internal const val fileNameField = "file_name" diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/MimedMediaFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/MimedMediaFile.kt new file mode 100644 index 0000000000..72eaab3c7a --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/MimedMediaFile.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.files.abstracts + +import dev.inmo.tgbotapi.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/PlayableMediaFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/PlayableMediaFile.kt similarity index 51% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/PlayableMediaFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/PlayableMediaFile.kt index 3755952a49..3211617a56 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/PlayableMediaFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/PlayableMediaFile.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts +package dev.inmo.tgbotapi.types.files.abstracts interface PlayableMediaFile : TelegramMediaFile { val duration: Long? diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/SizedMediaFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/SizedMediaFile.kt similarity index 54% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/SizedMediaFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/SizedMediaFile.kt index 1df6fe7a4e..6aefe5b969 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/SizedMediaFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/SizedMediaFile.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts +package dev.inmo.tgbotapi.types.files.abstracts interface SizedMediaFile : TelegramMediaFile { val width: Int diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/TelegramMediaFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/TelegramMediaFile.kt similarity index 62% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/TelegramMediaFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/TelegramMediaFile.kt index 5a3ae1e393..f0614a5f48 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/TelegramMediaFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/TelegramMediaFile.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts +package dev.inmo.tgbotapi.types.files.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.types.FileUniqueId +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.FileUniqueId internal const val fileIdField = "file_id" internal const val fileSizeField = "file_size" diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/ThumbedMediaFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/ThumbedMediaFile.kt new file mode 100644 index 0000000000..95859cdd60 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/ThumbedMediaFile.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.files.abstracts + +import dev.inmo.tgbotapi.types.files.PhotoSize + +interface ThumbedMediaFile : TelegramMediaFile { + val thumb: PhotoSize? +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/TitledMediaFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/TitledMediaFile.kt new file mode 100644 index 0000000000..cda38a0e84 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/TitledMediaFile.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.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/games/CallbackGame.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/CallbackGame.kt similarity index 55% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/games/CallbackGame.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/CallbackGame.kt index 32da936cf7..8a5e9b901e 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/games/CallbackGame.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/CallbackGame.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.games +package dev.inmo.tgbotapi.types.games import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/games/Game.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/Game.kt similarity index 50% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/games/Game.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/Game.kt index 6fef99c5f6..34043f6ad6 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/games/Game.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/Game.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.games +package dev.inmo.tgbotapi.types.games -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.files.AnimationFile -import com.github.insanusmokrassar.TelegramBotAPI.types.files.Photo +import dev.inmo.tgbotapi.CommonAbstracts.* +import dev.inmo.tgbotapi.types.files.AnimationFile +import dev.inmo.tgbotapi.types.files.Photo data class Game( override val title: String, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/games/GameHighScore.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/GameHighScore.kt similarity index 69% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/games/GameHighScore.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/GameHighScore.kt index c01188affd..0d05b81f0e 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/games/GameHighScore.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/GameHighScore.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.games +package dev.inmo.tgbotapi.types.games -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/games/RawGame.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/RawGame.kt similarity index 68% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/games/RawGame.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/RawGame.kt index 5e740529d7..a48c195f78 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/games/RawGame.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/games/RawGame.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.games +package dev.inmo.tgbotapi.types.games -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.RawMessageEntities -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.asTextParts -import com.github.insanusmokrassar.TelegramBotAPI.types.files.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.MessageEntity.RawMessageEntities +import dev.inmo.tgbotapi.types.MessageEntity.asTextParts +import dev.inmo.tgbotapi.types.files.* import kotlinx.serialization.* @Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelEventMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelEventMessage.kt new file mode 100644 index 0000000000..d0cbd5cf4b --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelEventMessage.kt @@ -0,0 +1,14 @@ +package dev.inmo.tgbotapi.types.message + +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.ChannelChat +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.ChannelEvent +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/ChannelMediaGroupMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMediaGroupMessage.kt new file mode 100644 index 0000000000..d77100871f --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMediaGroupMessage.kt @@ -0,0 +1,22 @@ +package dev.inmo.tgbotapi.types.message + +import dev.inmo.tgbotapi.types.MediaGroupIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/ChannelMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessage.kt new file mode 100644 index 0000000000..bc4e26c60e --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessage.kt @@ -0,0 +1,22 @@ +package dev.inmo.tgbotapi.types.message + +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/ChatEvents/ChannelChatCreated.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/ChannelChatCreated.kt new file mode 100644 index 0000000000..141dd05ecf --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/ChannelChatCreated.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents + +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.ChannelEvent + +class ChannelChatCreated: ChannelEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/DeleteChatPhoto.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/DeleteChatPhoto.kt new file mode 100644 index 0000000000..db88fc3dac --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/DeleteChatPhoto.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents + +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.CommonEvent + +class DeleteChatPhoto: CommonEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/GroupChatCreated.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/GroupChatCreated.kt new file mode 100644 index 0000000000..edecacfd6a --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/GroupChatCreated.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents + +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent + +class GroupChatCreated( + val migratedTo: ChatIdentifier? +): GroupEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/LeftChatMember.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/LeftChatMember.kt new file mode 100644 index 0000000000..dfd71fe71a --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/LeftChatMember.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents + +import dev.inmo.tgbotapi.types.User +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.CommonEvent + +data class LeftChatMember( + val user: User +): CommonEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/NewChatMembers.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/NewChatMembers.kt new file mode 100644 index 0000000000..0c307bfd23 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/NewChatMembers.kt @@ -0,0 +1,9 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents + +import dev.inmo.tgbotapi.types.User +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.SupergroupEvent + +data class NewChatMembers( + val members: List +): GroupEvent, SupergroupEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/NewChatPhoto.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/NewChatPhoto.kt new file mode 100644 index 0000000000..a12f00ec52 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/NewChatPhoto.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents + +import dev.inmo.tgbotapi.types.files.Photo +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.CommonEvent + +data class NewChatPhoto( + val photo: Photo +): CommonEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/NewChatTitle.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/NewChatTitle.kt new file mode 100644 index 0000000000..3b1eaf6533 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/NewChatTitle.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents + +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.CommonEvent + +data class NewChatTitle( + val title: String +): CommonEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/PinnedMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/PinnedMessage.kt new file mode 100644 index 0000000000..7f62ac4b23 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/PinnedMessage.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents + +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.CommonEvent +import dev.inmo.tgbotapi.types.message.abstracts.Message + +data class PinnedMessage( + val message: Message +): CommonEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/SupergroupChatCreated.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/SupergroupChatCreated.kt new file mode 100644 index 0000000000..5ea4ef8247 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/SupergroupChatCreated.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents + +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.SupergroupEvent + +class SupergroupChatCreated( + val migratedFrom: ChatIdentifier? +): SupergroupEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/ChannelEvent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/ChannelEvent.kt new file mode 100644 index 0000000000..49795692bc --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/ChannelEvent.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents.abstracts + +interface ChannelEvent: ChatEvent \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/ChatEvent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/ChatEvent.kt new file mode 100644 index 0000000000..a3873a9305 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/ChatEvent.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents.abstracts + +interface ChatEvent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/CommonEvent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/CommonEvent.kt new file mode 100644 index 0000000000..feb9af40ff --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/CommonEvent.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents.abstracts + +interface CommonEvent : ChannelEvent, GroupEvent, SupergroupEvent \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/GroupEvent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/GroupEvent.kt new file mode 100644 index 0000000000..87404c47c9 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/GroupEvent.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents.abstracts + +interface GroupEvent: ChatEvent \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/SupergroupEvent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/SupergroupEvent.kt new file mode 100644 index 0000000000..d57d4a969f --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/SupergroupEvent.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.message.ChatEvents.abstracts + +interface SupergroupEvent: ChatEvent \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonGroupEventMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonGroupEventMessage.kt new file mode 100644 index 0000000000..6117b923c7 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonGroupEventMessage.kt @@ -0,0 +1,19 @@ +package dev.inmo.tgbotapi.types.message + +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.User +import dev.inmo.tgbotapi.types.chat.abstracts.GroupChat +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent +import dev.inmo.tgbotapi.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/CommonMediaGroupMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonMediaGroupMessage.kt similarity index 52% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMediaGroupMessage.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonMediaGroupMessage.kt index cc4c0307cc..248f7da715 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMediaGroupMessage.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonMediaGroupMessage.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message +package dev.inmo.tgbotapi.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.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.* +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent import com.soywiz.klock.DateTime data class CommonMediaGroupMessage( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonMessageImpl.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonMessageImpl.kt new file mode 100644 index 0000000000..b0f51180ea --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonMessageImpl.kt @@ -0,0 +1,25 @@ +package dev.inmo.tgbotapi.types.message + +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.FromUserMessage +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent +import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/CommonSupergroupEventMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonSupergroupEventMessage.kt new file mode 100644 index 0000000000..36e218907f --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonSupergroupEventMessage.kt @@ -0,0 +1,19 @@ +package dev.inmo.tgbotapi.types.message + +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.User +import dev.inmo.tgbotapi.types.chat.abstracts.SupergroupChat +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.SupergroupEvent +import dev.inmo.tgbotapi.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/ForwardInfo.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ForwardInfo.kt similarity index 69% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ForwardInfo.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ForwardInfo.kt index 09dc713086..7ca6f21d87 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ForwardInfo.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ForwardInfo.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message +package dev.inmo.tgbotapi.types.message -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.ChannelChat -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.SupergroupChat +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.ChannelChat +import dev.inmo.tgbotapi.types.chat.abstracts.SupergroupChat sealed class ForwardInfo { abstract val dateOfOriginal: TelegramDate diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt similarity index 86% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt index 7227cffe15..4ac90d2823 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt @@ -1,26 +1,26 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message +package dev.inmo.tgbotapi.types.message -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.RawMessageEntities -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.asTextParts -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.dice.Dice -import com.github.insanusmokrassar.TelegramBotAPI.types.files.* -import com.github.insanusmokrassar.TelegramBotAPI.types.games.RawGame -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.UnknownMessageType -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.payments.InvoiceContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.payments.SuccessfulPaymentInfo -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.Invoice -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.SuccessfulPayment -import com.github.insanusmokrassar.TelegramBotAPI.types.polls.Poll -import com.github.insanusmokrassar.TelegramBotAPI.types.venue.Venue +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.MessageEntity.RawMessageEntities +import dev.inmo.tgbotapi.types.MessageEntity.asTextParts +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.* +import dev.inmo.tgbotapi.types.dice.Dice +import dev.inmo.tgbotapi.types.files.* +import dev.inmo.tgbotapi.types.games.RawGame +import dev.inmo.tgbotapi.types.message.ChatEvents.* +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.* +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.message.abstracts.UnknownMessageType +import dev.inmo.tgbotapi.types.message.content.* +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent +import dev.inmo.tgbotapi.types.message.content.media.* +import dev.inmo.tgbotapi.types.message.payments.InvoiceContent +import dev.inmo.tgbotapi.types.message.payments.SuccessfulPaymentInfo +import dev.inmo.tgbotapi.types.payments.Invoice +import dev.inmo.tgbotapi.types.payments.SuccessfulPayment +import dev.inmo.tgbotapi.types.polls.Poll +import dev.inmo.tgbotapi.types.venue.Venue import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlin.reflect.KClass diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ChatEventMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ChatEventMessage.kt new file mode 100644 index 0000000000..abef861c5d --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ChatEventMessage.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.message.abstracts + +import dev.inmo.tgbotapi.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/CommonMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/CommonMessage.kt similarity index 51% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/CommonMessage.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/CommonMessage.kt index 80b56bdc20..587ed60f42 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/CommonMessage.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/CommonMessage.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts +package dev.inmo.tgbotapi.types.message.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent interface CommonMessage : Message, PossiblyForwardedMessage, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ContentMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ContentMessage.kt new file mode 100644 index 0000000000..d9db0603c4 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ContentMessage.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.message.abstracts + +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent + +interface ContentMessage: Message { + val content: T +} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/FromUserMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/FromUserMessage.kt new file mode 100644 index 0000000000..5852ffb5d8 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/FromUserMessage.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.message.abstracts + +import dev.inmo.tgbotapi.types.User + +interface FromUserMessage { + val user: User +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupEventMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupEventMessage.kt new file mode 100644 index 0000000000..2cc84379d1 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupEventMessage.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.message.abstracts + +interface GroupEventMessage : ChatEventMessage, FromUserMessage diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/MediaGroupMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/MediaGroupMessage.kt new file mode 100644 index 0000000000..c78ab44f77 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/MediaGroupMessage.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.types.message.abstracts + +import dev.inmo.tgbotapi.types.MediaGroupIdentifier +import dev.inmo.tgbotapi.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/Message.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/Message.kt similarity index 86% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/Message.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/Message.kt index b9eb3b04e3..43e1ac623d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/Message.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/Message.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts +package dev.inmo.tgbotapi.types.message.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.RawMessage import com.soywiz.klock.DateTime import kotlinx.serialization.* import kotlinx.serialization.descriptors.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyEditedMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyEditedMessage.kt similarity index 59% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyEditedMessage.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyEditedMessage.kt index 710889181b..54298d03fc 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyEditedMessage.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyEditedMessage.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts +package dev.inmo.tgbotapi.types.message.abstracts import com.soywiz.klock.DateTime diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyForwardedMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyForwardedMessage.kt new file mode 100644 index 0000000000..be8258d616 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyForwardedMessage.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.message.abstracts + +import dev.inmo.tgbotapi.types.message.ForwardInfo + +interface PossiblyForwardedMessage : Message { + val forwardInfo: ForwardInfo? +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyMarkedUp.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyMarkedUp.kt new file mode 100644 index 0000000000..8f5acf7eb5 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyMarkedUp.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.message.abstracts + +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup + +interface PossiblyMarkedUp { + val replyMarkup: InlineKeyboardMarkup? +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyPaymentMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyPaymentMessage.kt new file mode 100644 index 0000000000..04b8c97387 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyPaymentMessage.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.message.abstracts + +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/abstracts/PossiblyReplyMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyReplyMessage.kt new file mode 100644 index 0000000000..ef6905c0b1 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyReplyMessage.kt @@ -0,0 +1,5 @@ +package dev.inmo.tgbotapi.types.message.abstracts + +interface PossiblyReplyMessage { + val replyTo: Message? +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblySentViaBot.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblySentViaBot.kt new file mode 100644 index 0000000000..5cb4bf88e8 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblySentViaBot.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.message.abstracts + +import dev.inmo.tgbotapi.types.CommonBot + +interface PossiblySentViaBot { + val senderBot: CommonBot? +} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/SupergroupEventMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/SupergroupEventMessage.kt new file mode 100644 index 0000000000..b0fdfd456d --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/SupergroupEventMessage.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.message.abstracts + +interface SupergroupEventMessage : GroupEventMessage diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/ContactContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/ContactContent.kt new file mode 100644 index 0000000000..8802c91830 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/ContactContent.kt @@ -0,0 +1,21 @@ +package dev.inmo.tgbotapi.types.message.content + +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.SendContact +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/content/DiceContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/DiceContent.kt new file mode 100644 index 0000000000..c287d15281 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/DiceContent.kt @@ -0,0 +1,27 @@ +package dev.inmo.tgbotapi.types.message.content + +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.SendDice +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.dice.Dice +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/content/GameContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/GameContent.kt new file mode 100644 index 0000000000..a58505616b --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/GameContent.kt @@ -0,0 +1,27 @@ +package dev.inmo.tgbotapi.types.message.content + +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.games.SendGame +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.games.Game +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/content/LocationContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/LocationContent.kt new file mode 100644 index 0000000000..81f41ef536 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/LocationContent.kt @@ -0,0 +1,27 @@ +package dev.inmo.tgbotapi.types.message.content + +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.SendLocation +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/content/PollContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/PollContent.kt new file mode 100644 index 0000000000..074d7d7896 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/PollContent.kt @@ -0,0 +1,26 @@ +package dev.inmo.tgbotapi.types.message.content + +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.polls.createRequest +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent +import dev.inmo.tgbotapi.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/TextContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt similarity index 58% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/TextContent.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt index 890f308f36..270a6bab3e 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/TextContent.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt @@ -1,21 +1,21 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content +package dev.inmo.tgbotapi.types.message.content -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.FullTextSourcesList -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendTextMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.* -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.utils.* +import dev.inmo.tgbotapi.CommonAbstracts.FullTextSourcesList +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.SendTextMessage +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.* +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent +import dev.inmo.tgbotapi.utils.* data class TextContent( val text: String, /** - * Not full list of entities. This list WILL NOT contain [TextPart]s with [com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource] + * Not full list of entities. This list WILL NOT contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource] * @see [TextContent.fullEntitiesList] */ val entities: List = emptyList() @@ -72,7 +72,7 @@ data class TextContent( } /** - * Convert its [TextContent.entities] to list of [com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource] - * with [com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource] + * Convert its [TextContent.entities] to list of [dev.inmo.tgbotapi.CommonAbstracts.TextSource] + * with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource] */ fun TextContent.fullEntitiesList(): FullTextSourcesList = text.fullListOfSubSource(entities).map { it.source } diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VenueContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VenueContent.kt new file mode 100644 index 0000000000..9b662e8133 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VenueContent.kt @@ -0,0 +1,23 @@ +package dev.inmo.tgbotapi.types.message.content + +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.SendVenue +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/content/abstracts/MediaCollectionContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaCollectionContent.kt new file mode 100644 index 0000000000..a13d66600d --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaCollectionContent.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.message.content.abstracts + +import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile + +interface MediaCollectionContent: MessageContent, MediaContent { + val mediaCollection: List +} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaContent.kt new file mode 100644 index 0000000000..41f8323614 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaContent.kt @@ -0,0 +1,9 @@ +package dev.inmo.tgbotapi.types.message.content.abstracts + +import dev.inmo.tgbotapi.types.InputMedia.InputMedia +import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile + +interface MediaContent: MessageContent { + val media: TelegramMediaFile + fun asInputMedia(): InputMedia +} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaGroupContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaGroupContent.kt new file mode 100644 index 0000000000..18cc8686cd --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaGroupContent.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.types.message.content.abstracts + +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedInput +import dev.inmo.tgbotapi.types.InputMedia.MediaGroupMemberInputMedia + +interface MediaGroupContent : MediaContent, CaptionedInput { + fun toMediaGroupMemberInputMedia(): MediaGroupMemberInputMedia +} \ No newline at end of file diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MessageContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MessageContent.kt new file mode 100644 index 0000000000..96c6d9c83c --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MessageContent.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.message.content.abstracts + +interface MessageContent: ResendableContent diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/PossiblySentViaBotCommonMessage.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/PossiblySentViaBotCommonMessage.kt new file mode 100644 index 0000000000..5e2ba749e3 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/PossiblySentViaBotCommonMessage.kt @@ -0,0 +1,6 @@ +package dev.inmo.tgbotapi.types.message.content.abstracts + +import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage +import dev.inmo.tgbotapi.types.message.abstracts.PossiblySentViaBot + +interface PossiblySentViaBotCommonMessage : CommonMessage, PossiblySentViaBot diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/ResendableContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/ResendableContent.kt similarity index 55% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/ResendableContent.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/ResendableContent.kt index d2fc35ac98..8707e351ee 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/abstracts/ResendableContent.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/ResendableContent.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts +package dev.inmo.tgbotapi.types.message.content.abstracts -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.Message +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.Message interface ResendableContent { fun createResend( diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AnimationContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AnimationContent.kt new file mode 100644 index 0000000000..2d5c4b8ca8 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AnimationContent.kt @@ -0,0 +1,54 @@ +package dev.inmo.tgbotapi.types.message.content.media + +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedInput +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.media.SendAnimation +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.InputMedia.InputMediaAnimation +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.HTMLParseMode +import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2 +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.files.AnimationFile +import dev.inmo.tgbotapi.types.files.DocumentFile +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent +import dev.inmo.tgbotapi.utils.toHtmlCaptions +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/content/media/AudioContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AudioContent.kt new file mode 100644 index 0000000000..dde0d121f2 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AudioContent.kt @@ -0,0 +1,52 @@ +package dev.inmo.tgbotapi.types.message.content.media + +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedInput +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.media.SendAudio +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.InputMedia.InputMediaAudio +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.HTMLParseMode +import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2 +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.files.AudioFile +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent +import dev.inmo.tgbotapi.utils.toHtmlCaptions +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/content/media/DocumentContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/DocumentContent.kt new file mode 100644 index 0000000000..660347256a --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/DocumentContent.kt @@ -0,0 +1,46 @@ +package dev.inmo.tgbotapi.types.message.content.media + +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedInput +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.media.SendDocument +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.InputMedia.InputMediaDocument +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.HTMLParseMode +import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2 +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.files.DocumentFile +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent +import dev.inmo.tgbotapi.utils.toHtmlCaptions +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/content/media/PhotoContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/PhotoContent.kt new file mode 100644 index 0000000000..e691370ab3 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/PhotoContent.kt @@ -0,0 +1,53 @@ +package dev.inmo.tgbotapi.types.message.content.media + +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.media.SendPhoto +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.InputMedia.InputMediaPhoto +import dev.inmo.tgbotapi.types.InputMedia.MediaGroupMemberInputMedia +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.HTMLParseMode +import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2 +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.files.* +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaCollectionContent +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent +import dev.inmo.tgbotapi.utils.toHtmlCaptions +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/content/media/StickerContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/StickerContent.kt new file mode 100644 index 0000000000..68c5edc783 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/StickerContent.kt @@ -0,0 +1,34 @@ +package dev.inmo.tgbotapi.types.message.content.media + +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.media.SendSticker +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.InputMedia.InputMediaDocument +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.files.Sticker +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/content/media/VideoContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VideoContent.kt new file mode 100644 index 0000000000..0461d17a63 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VideoContent.kt @@ -0,0 +1,63 @@ +package dev.inmo.tgbotapi.types.message.content.media + +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.media.SendVideo +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.InputMedia.InputMediaVideo +import dev.inmo.tgbotapi.types.InputMedia.MediaGroupMemberInputMedia +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.HTMLParseMode +import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2 +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.files.VideoFile +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent +import dev.inmo.tgbotapi.utils.toHtmlCaptions +import dev.inmo.tgbotapi.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/VideoNoteContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VideoNoteContent.kt similarity index 57% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/VideoNoteContent.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VideoNoteContent.kt index babf0601f0..4957e19853 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/VideoNoteContent.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VideoNoteContent.kt @@ -1,15 +1,15 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media +package dev.inmo.tgbotapi.types.message.content.media -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendVideoNote -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMediaVideo -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.VideoNoteFile -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.media.SendVideoNote +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.InputMedia.InputMediaVideo +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.files.VideoNoteFile +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent data class VideoNoteContent( override val media: VideoNoteFile diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VoiceContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VoiceContent.kt new file mode 100644 index 0000000000..1aa62d14ef --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VoiceContent.kt @@ -0,0 +1,46 @@ +package dev.inmo.tgbotapi.types.message.content.media + +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedInput +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.media.SendVoice +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.InputMedia.InputMediaAudio +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.HTMLParseMode +import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2 +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.files.VoiceFile +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent +import dev.inmo.tgbotapi.utils.toHtmlCaptions +import dev.inmo.tgbotapi.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, + 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/dev/inmo/tgbotapi/types/message/payments/InvoiceContent.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/payments/InvoiceContent.kt new file mode 100644 index 0000000000..35341e8dc5 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/payments/InvoiceContent.kt @@ -0,0 +1,23 @@ +package dev.inmo.tgbotapi.types.message.payments + +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/message/payments/SuccessfulPaymentInfo.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/payments/SuccessfulPaymentInfo.kt new file mode 100644 index 0000000000..50a1620155 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/payments/SuccessfulPaymentInfo.kt @@ -0,0 +1,8 @@ +package dev.inmo.tgbotapi.types.message.payments + +import dev.inmo.tgbotapi.types.message.payments.abstracts.PaymentInfo +import dev.inmo.tgbotapi.types.payments.SuccessfulPayment + +data class SuccessfulPaymentInfo( + val payment: SuccessfulPayment +) : PaymentInfo diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/payments/abstracts/PaymentInfo.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/payments/abstracts/PaymentInfo.kt new file mode 100644 index 0000000000..f288537b4a --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/payments/abstracts/PaymentInfo.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.message.payments.abstracts + +interface PaymentInfo diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/Invoice.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/Invoice.kt similarity index 69% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/Invoice.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/Invoice.kt index a70fc06e56..03d3c10b64 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/Invoice.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/Invoice.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.payments +package dev.inmo.tgbotapi.types.payments -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.abstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.payments.abstracts.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/LabeledPrice.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/LabeledPrice.kt new file mode 100644 index 0000000000..c28a49722e --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/LabeledPrice.kt @@ -0,0 +1,15 @@ +package dev.inmo.tgbotapi.types.payments + +import dev.inmo.tgbotapi.types.amountField +import dev.inmo.tgbotapi.types.labelField +import dev.inmo.tgbotapi.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/OrderInfo.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/OrderInfo.kt similarity index 74% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/OrderInfo.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/OrderInfo.kt index 29117ffa25..274449cc45 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/OrderInfo.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/OrderInfo.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.payments +package dev.inmo.tgbotapi.types.payments -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/PreCheckoutQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/PreCheckoutQuery.kt similarity index 77% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/PreCheckoutQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/PreCheckoutQuery.kt index d70e187a71..742e184d96 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/PreCheckoutQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/PreCheckoutQuery.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.payments +package dev.inmo.tgbotapi.types.payments -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.abstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.payments.abstracts.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/ShippingAddress.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/ShippingAddress.kt similarity index 80% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/ShippingAddress.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/ShippingAddress.kt index 2d99fd6bb7..356b7a750d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/ShippingAddress.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/ShippingAddress.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.payments +package dev.inmo.tgbotapi.types.payments -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/ShippingOption.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/ShippingOption.kt similarity index 70% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/ShippingOption.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/ShippingOption.kt index 6fe86673e2..bc62f67c2f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/ShippingOption.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/ShippingOption.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.payments +package dev.inmo.tgbotapi.types.payments -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.abstracts.Priced +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.payments.abstracts.Priced import kotlinx.serialization.* import kotlinx.serialization.builtins.ListSerializer diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/ShippingQuery.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/ShippingQuery.kt similarity index 75% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/ShippingQuery.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/ShippingQuery.kt index a51b028e57..dfa1735728 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/ShippingQuery.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/ShippingQuery.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.payments +package dev.inmo.tgbotapi.types.payments -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/SuccessfulPayment.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/SuccessfulPayment.kt similarity index 77% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/SuccessfulPayment.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/SuccessfulPayment.kt index b8059af6be..caf31bae7b 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/SuccessfulPayment.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/SuccessfulPayment.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.payments +package dev.inmo.tgbotapi.types.payments -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.abstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.payments.abstracts.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/abstracts/Amounted.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/abstracts/Amounted.kt similarity index 60% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/abstracts/Amounted.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/abstracts/Amounted.kt index 50e1a05c4c..8f910ff741 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/abstracts/Amounted.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/abstracts/Amounted.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.payments.abstracts +package dev.inmo.tgbotapi.types.payments.abstracts interface Amounted { val amount: Long diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/abstracts/Currencied.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/abstracts/Currencied.kt similarity index 51% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/abstracts/Currencied.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/abstracts/Currencied.kt index 5f91875617..d3c5dd917e 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/payments/abstracts/Currencied.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/abstracts/Currencied.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.payments.abstracts +package dev.inmo.tgbotapi.types.payments.abstracts typealias Currency = String diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/abstracts/Priced.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/abstracts/Priced.kt new file mode 100644 index 0000000000..1eb48fe891 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/abstracts/Priced.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.payments.abstracts + +import dev.inmo.tgbotapi.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/polls/Poll.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/Poll.kt similarity index 95% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/polls/Poll.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/Poll.kt index 318b97030d..4cfdfe19c3 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/polls/Poll.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/Poll.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.polls +package dev.inmo.tgbotapi.types.polls -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat +import dev.inmo.tgbotapi.CommonAbstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.MessageEntity.* +import dev.inmo.tgbotapi.utils.nonstrictJsonFormat import com.soywiz.klock.DateTime import com.soywiz.klock.TimeSpan import kotlinx.serialization.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/polls/PollAnswer.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/PollAnswer.kt similarity index 70% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/polls/PollAnswer.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/PollAnswer.kt index bc8bfaac6e..d0e32260af 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/polls/PollAnswer.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/PollAnswer.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.polls +package dev.inmo.tgbotapi.types.polls -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/polls/PollOption.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/PollOption.kt similarity index 83% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/polls/PollOption.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/PollOption.kt index 3f9119997d..2333b63613 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/polls/PollOption.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/PollOption.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.polls +package dev.inmo.tgbotapi.types.polls -import com.github.insanusmokrassar.TelegramBotAPI.types.textField -import com.github.insanusmokrassar.TelegramBotAPI.types.votesCountField +import dev.inmo.tgbotapi.types.textField +import dev.inmo.tgbotapi.types.votesCountField import kotlinx.serialization.* import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/stickers/MaskPosition.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/stickers/MaskPosition.kt similarity index 72% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/stickers/MaskPosition.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/stickers/MaskPosition.kt index b2084697f0..13b6503f22 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/stickers/MaskPosition.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/stickers/MaskPosition.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.stickers +package dev.inmo.tgbotapi.types.stickers -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/stickers/StickerSet.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/stickers/StickerSet.kt similarity index 65% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/stickers/StickerSet.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/stickers/StickerSet.kt index bee7cfad1c..a7dc53ed3c 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/stickers/StickerSet.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/stickers/StickerSet.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.stickers +package dev.inmo.tgbotapi.types.stickers -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.files.PhotoSize -import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.files.PhotoSize +import dev.inmo.tgbotapi.types.files.Sticker import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/CallbackQueryUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/CallbackQueryUpdate.kt new file mode 100644 index 0000000000..df96895d3e --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/CallbackQueryUpdate.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.update + +import dev.inmo.tgbotapi.types.CallbackQuery.CallbackQuery +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.update.abstracts.Update + +data class CallbackQueryUpdate( + override val updateId: UpdateIdentifier, + override val data: CallbackQuery +) : Update diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/ChannelPostUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/ChannelPostUpdate.kt new file mode 100644 index 0000000000..23a14e9dcf --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/ChannelPostUpdate.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.update + +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate + +data class ChannelPostUpdate( + override val updateId: UpdateIdentifier, + override val data: Message +) : BaseSentMessageUpdate diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/ChosenInlineResultUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/ChosenInlineResultUpdate.kt new file mode 100644 index 0000000000..8aa0d1e825 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/ChosenInlineResultUpdate.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.update + +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.ChosenInlineResult +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/update/EditChannelPostUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/EditChannelPostUpdate.kt new file mode 100644 index 0000000000..309357f774 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/EditChannelPostUpdate.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.update + +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage +import dev.inmo.tgbotapi.types.update.abstracts.BaseEditMessageUpdate + +data class EditChannelPostUpdate( + override val updateId: UpdateIdentifier, + override val data: CommonMessage<*> +) : BaseEditMessageUpdate diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/EditMessageUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/EditMessageUpdate.kt new file mode 100644 index 0000000000..44a429f1f1 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/EditMessageUpdate.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.update + +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage +import dev.inmo.tgbotapi.types.update.abstracts.BaseEditMessageUpdate + +data class EditMessageUpdate( + override val updateId: UpdateIdentifier, + override val data: CommonMessage<*> +) : BaseEditMessageUpdate diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/InlineQueryUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/InlineQueryUpdate.kt new file mode 100644 index 0000000000..10b4e61230 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/InlineQueryUpdate.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.update + +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.update.abstracts.Update + +data class InlineQueryUpdate( + override val updateId: UpdateIdentifier, + override val data: InlineQuery +) : Update diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/ChannelPostMediaGroupUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/ChannelPostMediaGroupUpdate.kt new file mode 100644 index 0000000000..fa4532d80d --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/ChannelPostMediaGroupUpdate.kt @@ -0,0 +1,12 @@ +package dev.inmo.tgbotapi.types.update.MediaGroupUpdates + +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditChannelPostMediaGroupUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditChannelPostMediaGroupUpdate.kt new file mode 100644 index 0000000000..596088bbcb --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditChannelPostMediaGroupUpdate.kt @@ -0,0 +1,12 @@ +package dev.inmo.tgbotapi.types.update.MediaGroupUpdates + +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditMessageMediaGroupUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditMessageMediaGroupUpdate.kt new file mode 100644 index 0000000000..0a88e5c117 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditMessageMediaGroupUpdate.kt @@ -0,0 +1,12 @@ +package dev.inmo.tgbotapi.types.update.MediaGroupUpdates + +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MediaGroupUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MediaGroupUpdate.kt new file mode 100644 index 0000000000..77c7f41f8d --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MediaGroupUpdate.kt @@ -0,0 +1,23 @@ +package dev.inmo.tgbotapi.types.update.MediaGroupUpdates + +import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage +import dev.inmo.tgbotapi.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 [dev.inmo.tgbotapi.extensions.api.SetWebhookKt.includeWebhookInRoute] + * + * @see dev.inmo.tgbotapi.extensions.api.SetWebhookKt.includeWebhookInRoute + * @see dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MessageMediaGroupUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MessageMediaGroupUpdate.kt new file mode 100644 index 0000000000..f5bb8e69e7 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MessageMediaGroupUpdate.kt @@ -0,0 +1,12 @@ +package dev.inmo.tgbotapi.types.update.MediaGroupUpdates + +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/update/MessageUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MessageUpdate.kt new file mode 100644 index 0000000000..86d02a25c4 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MessageUpdate.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.update + +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate + +data class MessageUpdate( + override val updateId: UpdateIdentifier, + override val data: Message +) : BaseSentMessageUpdate diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/PollAnswerUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/PollAnswerUpdate.kt new file mode 100644 index 0000000000..0a93bdfaa7 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/PollAnswerUpdate.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.update + +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.polls.PollAnswer +import dev.inmo.tgbotapi.types.update.abstracts.Update + +data class PollAnswerUpdate( + override val updateId: UpdateIdentifier, + override val data: PollAnswer +) : Update diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/PollUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/PollUpdate.kt new file mode 100644 index 0000000000..040bb95133 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/PollUpdate.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.update + +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.polls.Poll +import dev.inmo.tgbotapi.types.update.abstracts.Update + +data class PollUpdate( + override val updateId: UpdateIdentifier, + override val data: Poll +) : Update diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/PreCheckoutQueryUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/PreCheckoutQueryUpdate.kt new file mode 100644 index 0000000000..2edaada180 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/PreCheckoutQueryUpdate.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.update + +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.payments.PreCheckoutQuery +import dev.inmo.tgbotapi.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/RawUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/RawUpdate.kt similarity index 74% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/RawUpdate.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/RawUpdate.kt index d6f7ada961..60080dac74 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/RawUpdate.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/RawUpdate.kt @@ -1,17 +1,17 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update +package dev.inmo.tgbotapi.types.update -import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery.RawCallbackQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.ChosenInlineResult.RawChosenInlineResult -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.query.RawInlineQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.PreCheckoutQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.ShippingQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.polls.Poll -import com.github.insanusmokrassar.TelegramBotAPI.types.polls.PollAnswer -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UnknownUpdate -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update -import com.github.insanusmokrassar.TelegramBotAPI.types.updateIdField +import dev.inmo.tgbotapi.types.CallbackQuery.RawCallbackQuery +import dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.RawChosenInlineResult +import dev.inmo.tgbotapi.types.InlineQueries.query.RawInlineQuery +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.message.abstracts.* +import dev.inmo.tgbotapi.types.payments.PreCheckoutQuery +import dev.inmo.tgbotapi.types.payments.ShippingQuery +import dev.inmo.tgbotapi.types.polls.Poll +import dev.inmo.tgbotapi.types.polls.PollAnswer +import dev.inmo.tgbotapi.types.update.abstracts.UnknownUpdate +import dev.inmo.tgbotapi.types.update.abstracts.Update +import dev.inmo.tgbotapi.types.updateIdField import kotlinx.serialization.* import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.jsonObject diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/ShippingQueryUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/ShippingQueryUpdate.kt new file mode 100644 index 0000000000..4146449c43 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/ShippingQueryUpdate.kt @@ -0,0 +1,10 @@ +package dev.inmo.tgbotapi.types.update + +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.payments.ShippingQuery +import dev.inmo.tgbotapi.types.update.abstracts.Update + +data class ShippingQueryUpdate( + override val updateId: UpdateIdentifier, + override val data: ShippingQuery +) : Update diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/abstracts/BaseEditMessageUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/abstracts/BaseEditMessageUpdate.kt new file mode 100644 index 0000000000..4f716d93c2 --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/abstracts/BaseEditMessageUpdate.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.update.abstracts + +import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage + +interface BaseEditMessageUpdate : BaseMessageUpdate { + override val data: CommonMessage<*> +} diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/abstracts/BaseMessageUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/abstracts/BaseMessageUpdate.kt new file mode 100644 index 0000000000..5db71be2ea --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/abstracts/BaseMessageUpdate.kt @@ -0,0 +1,7 @@ +package dev.inmo.tgbotapi.types.update.abstracts + +import dev.inmo.tgbotapi.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/dev/inmo/tgbotapi/types/update/abstracts/BaseSentMessageUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/abstracts/BaseSentMessageUpdate.kt new file mode 100644 index 0000000000..bc8493432f --- /dev/null +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/abstracts/BaseSentMessageUpdate.kt @@ -0,0 +1,3 @@ +package dev.inmo.tgbotapi.types.update.abstracts + +interface BaseSentMessageUpdate : BaseMessageUpdate diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/Update.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/abstracts/Update.kt similarity index 84% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/Update.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/abstracts/Update.kt index d8059c667b..06853ce529 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/Update.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/abstracts/Update.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts +package dev.inmo.tgbotapi.types.update.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.update.RawUpdate -import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.update.RawUpdate +import dev.inmo.tgbotapi.utils.nonstrictJsonFormat import kotlinx.serialization.* import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/venue/Venue.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/venue/Venue.kt similarity index 65% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/venue/Venue.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/venue/Venue.kt index 9b3565e05d..415a00e963 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/venue/Venue.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/venue/Venue.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.venue +package dev.inmo.tgbotapi.types.venue -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CommonVenueData -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Locationed -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.CommonAbstracts.CommonVenueData +import dev.inmo.tgbotapi.CommonAbstracts.Locationed +import dev.inmo.tgbotapi.types.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/FlowsUpdatesFilter.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt similarity index 82% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/FlowsUpdatesFilter.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt index dc95e3a6ea..616fa4bfce 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/FlowsUpdatesFilter.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.updateshandlers +package dev.inmo.tgbotapi.updateshandlers -import com.github.insanusmokrassar.TelegramBotAPI.types.ALL_UPDATES_LIST -import com.github.insanusmokrassar.TelegramBotAPI.types.update.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UnknownUpdate -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update +import dev.inmo.tgbotapi.types.ALL_UPDATES_LIST +import dev.inmo.tgbotapi.types.update.* +import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.* +import dev.inmo.tgbotapi.types.update.abstracts.UnknownUpdate +import dev.inmo.tgbotapi.types.update.abstracts.Update import kotlinx.coroutines.channels.BroadcastChannel import kotlinx.coroutines.flow.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/UpdatesFilter.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/UpdatesFilter.kt similarity index 93% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/UpdatesFilter.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/UpdatesFilter.kt index a36789497b..44c2307356 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/UpdatesFilter.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/UpdatesFilter.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.updateshandlers +package dev.inmo.tgbotapi.updateshandlers -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UnknownUpdate -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.update.* +import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.* +import dev.inmo.tgbotapi.types.update.abstracts.UnknownUpdate +import dev.inmo.tgbotapi.types.update.abstracts.Update typealias UpdateReceiver = suspend (T) -> Unit diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/Annotations.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Annotations.kt similarity index 90% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/Annotations.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Annotations.kt index 697092634d..9de1d0cd70 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/Annotations.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Annotations.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils @RequiresOptIn( "It is possible, that behaviour of this thing will be changed later or this feature will be removed", diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/BaseMessageUpdateToMediaGroupUpdate.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/BaseMessageUpdateToMediaGroupUpdate.kt similarity index 76% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/BaseMessageUpdateToMediaGroupUpdate.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/BaseMessageUpdateToMediaGroupUpdate.kt index 0c2f3a8d99..07efbe4b31 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/BaseMessageUpdateToMediaGroupUpdate.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/BaseMessageUpdateToMediaGroupUpdate.kt @@ -1,11 +1,11 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils -import com.github.insanusmokrassar.TelegramBotAPI.types.MediaGroupIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.update.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseMessageUpdate -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update +import dev.inmo.tgbotapi.types.MediaGroupIdentifier +import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage +import dev.inmo.tgbotapi.types.update.* +import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.* +import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate +import dev.inmo.tgbotapi.types.update.abstracts.Update private inline val Pair.message get() = first diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/BuiltinMimeTypes.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/BuiltinMimeTypes.kt similarity index 79% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/BuiltinMimeTypes.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/BuiltinMimeTypes.kt index a3068df617..be0dcb1f2f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/BuiltinMimeTypes.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/BuiltinMimeTypes.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils object BuiltinMimeTypes { object Image { diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/CaptionAndTextSourcesToText.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/CaptionAndTextSourcesToText.kt similarity index 88% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/CaptionAndTextSourcesToText.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/CaptionAndTextSourcesToText.kt index ca75e16968..715c9d41d0 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/CaptionAndTextSourcesToText.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/CaptionAndTextSourcesToText.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.TextContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.fullEntitiesList +import dev.inmo.tgbotapi.CommonAbstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.* +import dev.inmo.tgbotapi.types.message.content.TextContent +import dev.inmo.tgbotapi.types.message.content.fullEntitiesList internal fun createFormattedText( entities: FullTextSourcesList, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/HandleSafely.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/HandleSafely.kt similarity index 92% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/HandleSafely.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/HandleSafely.kt index b136954b55..148d08835d 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/HandleSafely.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/HandleSafely.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.supervisorScope diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/JSON.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/JSON.kt similarity index 96% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/JSON.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/JSON.kt index 1a4e506d12..99778453ef 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/JSON.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/JSON.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils import kotlinx.serialization.SerializationStrategy import kotlinx.serialization.json.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/Map.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Map.kt similarity index 87% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/Map.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Map.kt index dcef012a1b..d5d3d46c70 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/Map.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Map.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils fun mapOfNotNull(vararg pairs: Pair): Map { return HashMap().apply { diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/Matrix.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Matrix.kt similarity index 90% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/Matrix.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Matrix.kt index 2b5edc2af0..8bfe5717da 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/Matrix.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Matrix.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.Matrix +import dev.inmo.tgbotapi.types.buttons.Matrix fun row(block: RowBuilder.() -> Unit): List { return RowBuilder().also(block).row diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MimeType.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/MimeType.kt similarity index 94% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MimeType.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/MimeType.kt index cf99d80639..04ec695668 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MimeType.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/MimeType.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils import kotlinx.serialization.* import kotlinx.serialization.descriptors.* diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MultilevelTextSourceFormatting.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/MultilevelTextSourceFormatting.kt similarity index 89% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MultilevelTextSourceFormatting.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/MultilevelTextSourceFormatting.kt index c0b067dbef..23869d4946 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MultilevelTextSourceFormatting.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/MultilevelTextSourceFormatting.kt @@ -1,12 +1,12 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource -import com.github.insanusmokrassar.TelegramBotAPI.types.UserId -import com.github.insanusmokrassar.TelegramBotAPI.types.link -import com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.escapeMarkdownV2Link -import com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.toHtml +import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource +import dev.inmo.tgbotapi.CommonAbstracts.TextPart +import dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource +import dev.inmo.tgbotapi.types.UserId +import dev.inmo.tgbotapi.types.link +import dev.inmo.tgbotapi.utils.extensions.escapeMarkdownV2Link +import dev.inmo.tgbotapi.utils.extensions.toHtml internal fun String.fullListOfSubSource(sourceList: List): List { val sortedSourceList = sourceList.sortedBy { it.range.first }.toMutableList() diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StorageFile.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StorageFile.kt similarity index 88% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StorageFile.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StorageFile.kt index 7d1cbe6bcf..5ee622b20f 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StorageFile.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StorageFile.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils import com.benasher44.uuid.uuid4 import io.ktor.utils.io.core.Input diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StringFileExtension.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StringFileExtension.kt similarity index 84% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StringFileExtension.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StringFileExtension.kt index 1b9baab853..8ecac49d78 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StringFileExtension.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StringFileExtension.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils private val filenameRegex = Regex("[^/]*$") private val extensionRegex = Regex("[^.]*$") diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StringFormatting.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StringFormatting.kt similarity index 95% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StringFormatting.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StringFormatting.kt index 1431381d95..d9a079d9c6 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StringFormatting.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StringFormatting.kt @@ -1,8 +1,8 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.* +import dev.inmo.tgbotapi.utils.extensions.* const val markdownBoldControl = "*" const val markdownItalicControl = "_" diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/TelegramAPIUrlsKeeper.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/TelegramAPIUrlsKeeper.kt similarity index 77% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/TelegramAPIUrlsKeeper.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/TelegramAPIUrlsKeeper.kt index 2fd7790c31..f6876dbe8e 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/TelegramAPIUrlsKeeper.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/TelegramAPIUrlsKeeper.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils class TelegramAPIUrlsKeeper( token: String, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/ThrowErrorWithRange.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/ThrowErrorWithRange.kt similarity index 75% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/ThrowErrorWithRange.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/ThrowErrorWithRange.kt index 2e2e327002..88c9946627 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/ThrowErrorWithRange.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/ThrowErrorWithRange.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils internal fun throwRangeError( valueName: String, diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/ReceiveChannel.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/ReceiveChannel.kt similarity index 97% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/ReceiveChannel.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/ReceiveChannel.kt index 0cbc0421a9..fe239ed191 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/ReceiveChannel.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/ReceiveChannel.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils.extensions +package dev.inmo.tgbotapi.utils.extensions import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel diff --git a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/String.kt b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/String.kt similarity index 94% rename from TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/String.kt rename to TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/String.kt index 3d8215326f..4ead2814d8 100644 --- a/TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/String.kt +++ b/TelegramBotAPI-core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/String.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils.extensions +package dev.inmo.tgbotapi.utils.extensions fun String.toMarkdown(): String { return replace( diff --git a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/SimpleInputFilesTest.kt b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/SimpleInputFilesTest.kt similarity index 73% rename from TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/SimpleInputFilesTest.kt rename to TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/SimpleInputFilesTest.kt index 22294176ea..e86186f9e4 100644 --- a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/SimpleInputFilesTest.kt +++ b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/SimpleInputFilesTest.kt @@ -1,9 +1,9 @@ -package com.github.insanusmokrassar.TelegramBotAPI +package dev.inmo.tgbotapi -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.toInputFile -import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.MediaGroupMemberInputMediaSerializer -import com.github.insanusmokrassar.TelegramBotAPI.types.files.PhotoSize -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.PhotoContent +import dev.inmo.tgbotapi.requests.abstracts.toInputFile +import dev.inmo.tgbotapi.types.InputMedia.MediaGroupMemberInputMediaSerializer +import dev.inmo.tgbotapi.types.files.PhotoSize +import dev.inmo.tgbotapi.types.message.content.media.PhotoContent import kotlinx.serialization.json.Json import kotlin.test.Test import kotlin.test.assertEquals diff --git a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/TestsJsonFormat.kt b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/TestsJsonFormat.kt similarity index 65% rename from TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/TestsJsonFormat.kt rename to TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/TestsJsonFormat.kt index 913df02bde..da8a10617b 100644 --- a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/TestsJsonFormat.kt +++ b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/TestsJsonFormat.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI +package dev.inmo.tgbotapi import kotlinx.serialization.json.Json diff --git a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/BotActionTests.kt b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/BotActionTests.kt similarity index 91% rename from TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/BotActionTests.kt rename to TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/BotActionTests.kt index 94b7b2994b..a0f688c821 100644 --- a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/BotActionTests.kt +++ b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/BotActionTests.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types -import com.github.insanusmokrassar.TelegramBotAPI.TestsJsonFormat -import com.github.insanusmokrassar.TelegramBotAPI.types.actions.* +import dev.inmo.tgbotapi.TestsJsonFormat +import dev.inmo.tgbotapi.types.actions.* import kotlinx.serialization.Serializable import kotlin.test.Test import kotlin.test.assertEquals diff --git a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatIdentifierTests.kt b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ChatIdentifierTests.kt similarity index 96% rename from TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatIdentifierTests.kt rename to TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ChatIdentifierTests.kt index 07eddca7dd..226357c4b2 100644 --- a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatIdentifierTests.kt +++ b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ChatIdentifierTests.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types -import com.github.insanusmokrassar.TelegramBotAPI.TestsJsonFormat +import dev.inmo.tgbotapi.TestsJsonFormat import kotlinx.serialization.Serializable import kotlin.test.* diff --git a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/TextPartsCreatingTests.kt b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/TextPartsCreatingTests.kt similarity index 94% rename from TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/TextPartsCreatingTests.kt rename to TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/TextPartsCreatingTests.kt index 4ed06dd286..f39a5cfef0 100644 --- a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/TextPartsCreatingTests.kt +++ b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/TextPartsCreatingTests.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity +package dev.inmo.tgbotapi.types.MessageEntity -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.types.MessageEntity.textsources.* +import dev.inmo.tgbotapi.utils.* import kotlin.test.* class TextPartsCreatingTests { diff --git a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ParseModeTests.kt b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ParseModeTests.kt similarity index 84% rename from TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ParseModeTests.kt rename to TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ParseModeTests.kt index 8ba0cc4542..981a7f6abc 100644 --- a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ParseModeTests.kt +++ b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ParseModeTests.kt @@ -1,7 +1,7 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types -import com.github.insanusmokrassar.TelegramBotAPI.TestsJsonFormat -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.* +import dev.inmo.tgbotapi.TestsJsonFormat +import dev.inmo.tgbotapi.types.ParseMode.* import kotlinx.serialization.Serializable import kotlin.test.Test import kotlin.test.assertEquals diff --git a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDateTests.kt b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/TelegramDateTests.kt similarity index 87% rename from TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDateTests.kt rename to TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/TelegramDateTests.kt index 028f56b1cb..77bd43f636 100644 --- a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDateTests.kt +++ b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/TelegramDateTests.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types -import com.github.insanusmokrassar.TelegramBotAPI.TestsJsonFormat +import dev.inmo.tgbotapi.TestsJsonFormat import com.soywiz.klock.DateTime import kotlinx.serialization.Serializable import kotlin.test.Test diff --git a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StringFormattingTests.kt b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/utils/StringFormattingTests.kt similarity index 94% rename from TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StringFormattingTests.kt rename to TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/utils/StringFormattingTests.kt index 48a7db2ccf..7db4187b1c 100644 --- a/TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StringFormattingTests.kt +++ b/TelegramBotAPI-core/src/commonTest/kotlin/dev/inmo/tgbotapi/utils/StringFormattingTests.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils import kotlin.test.Test import kotlin.test.assertEquals diff --git a/TelegramBotAPI-core/src/jsMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MimeTypeActual.kt b/TelegramBotAPI-core/src/jsMain/kotlin/dev/inmo/tgbotapi/utils/MimeTypeActual.kt similarity index 85% rename from TelegramBotAPI-core/src/jsMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MimeTypeActual.kt rename to TelegramBotAPI-core/src/jsMain/kotlin/dev/inmo/tgbotapi/utils/MimeTypeActual.kt index ec54773fda..e668a64f14 100644 --- a/TelegramBotAPI-core/src/jsMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MimeTypeActual.kt +++ b/TelegramBotAPI-core/src/jsMain/kotlin/dev/inmo/tgbotapi/utils/MimeTypeActual.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils import kotlinx.serialization.* import org.w3c.dom.get 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/requests/abstracts/InputFileFromJavaFile.kt b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFileFromJavaFile.kt similarity index 57% rename from TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/InputFileFromJavaFile.kt rename to TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFileFromJavaFile.kt index 58193b52ac..34350831f3 100644 --- a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/InputFileFromJavaFile.kt +++ b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFileFromJavaFile.kt @@ -1,6 +1,6 @@ -package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts +package dev.inmo.tgbotapi.requests.abstracts -import com.github.insanusmokrassar.TelegramBotAPI.utils.StorageFile +import dev.inmo.tgbotapi.utils.StorageFile import java.io.File fun File.toInputFile() = if (exists()) { diff --git a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/UserLocale.kt b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/UserLocale.kt similarity index 66% rename from TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/UserLocale.kt rename to TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/UserLocale.kt index b54e6be14a..33e7b5920b 100644 --- a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/UserLocale.kt +++ b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/UserLocale.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.types +package dev.inmo.tgbotapi.types import java.util.* diff --git a/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/payments/Currencied.kt b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/payments/Currencied.kt new file mode 100644 index 0000000000..2ee2913e5c --- /dev/null +++ b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/payments/Currencied.kt @@ -0,0 +1,6 @@ +package dev.inmo.tgbotapi.types.payments + +import dev.inmo.tgbotapi.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/updateshandlers/webhook/WebhookPrivateKeyConfig.kt b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/updateshandlers/webhook/WebhookPrivateKeyConfig.kt similarity index 89% rename from TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/webhook/WebhookPrivateKeyConfig.kt rename to TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/updateshandlers/webhook/WebhookPrivateKeyConfig.kt index f6e6a7a1b0..8dc2679dc0 100644 --- a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/webhook/WebhookPrivateKeyConfig.kt +++ b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/updateshandlers/webhook/WebhookPrivateKeyConfig.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.webhook +package dev.inmo.tgbotapi.updateshandlers.webhook import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MimeTypeActual.kt b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/MimeTypeActual.kt similarity index 79% rename from TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MimeTypeActual.kt rename to TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/MimeTypeActual.kt index f96206db52..95a7ba5c9a 100644 --- a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MimeTypeActual.kt +++ b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/MimeTypeActual.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils import kotlinx.serialization.* diff --git a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StorageFile.kt b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/StorageFile.kt similarity index 82% rename from TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StorageFile.kt rename to TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/StorageFile.kt index 0f2cbd22b1..8d7ebe5c53 100644 --- a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StorageFile.kt +++ b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/StorageFile.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils +package dev.inmo.tgbotapi.utils import io.ktor.utils.io.streams.asInput import java.io.File diff --git a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/AsReference.kt b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/extensions/AsReference.kt similarity index 54% rename from TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/AsReference.kt rename to TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/extensions/AsReference.kt index b8cb0b5eae..a562096398 100644 --- a/TelegramBotAPI-core/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/AsReference.kt +++ b/TelegramBotAPI-core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/extensions/AsReference.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils.extensions +package dev.inmo.tgbotapi.utils.extensions import java.lang.ref.WeakReference diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotBuilder.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotBuilder.kt index 5ffadaadcc..9e64ded426 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotBuilder.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotBuilder.kt @@ -1,7 +1,7 @@ package dev.inmo.tgbotapi.extensions.api -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper import io.ktor.client.HttpClient import io.ktor.client.HttpClientConfig import io.ktor.client.engine.* diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt index 651760ad21..18f9d0e72e 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt @@ -1,8 +1,8 @@ package dev.inmo.tgbotapi.extensions.api -import com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorRequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper +import dev.inmo.tgbotapi.bot.Ktor.KtorRequestsExecutor +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper import io.ktor.client.HttpClient import io.ktor.client.HttpClientConfig import io.ktor.client.engine.HttpClientEngine diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DeleteMessage.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DeleteMessage.kt index e26bb1d07f..98057cb8d2 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DeleteMessage.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DeleteMessage.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.extensions.api -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.DeleteMessage +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.deleteMessage( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DownloadFile.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DownloadFile.kt index 65cb057820..5d6b5efee7 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DownloadFile.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DownloadFile.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo +import dev.inmo.tgbotapi.requests.DownloadFile +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.types.files.PathedFile +import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile suspend fun TelegramBot.downloadFile( filePath: String diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/ForwardMessage.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/ForwardMessage.kt index ad56d89232..c2052f8a8c 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/ForwardMessage.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/ForwardMessage.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.extensions.api -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.ForwardMessage -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.ForwardMessage +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.forwardMessage( fromChatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/GetUpdates.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/GetUpdates.kt index b122e1190b..cdba967fb4 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/GetUpdates.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/GetUpdates.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.GetUpdates -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.GetUpdates +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.update.abstracts.Update suspend fun TelegramBot.getUpdates( offset: UpdateIdentifier? = null, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt index a520728c9f..42caeeb6b8 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.extensions.api.InternalUtils -import com.github.insanusmokrassar.TelegramBotAPI.types.MediaGroupIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.update.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.* +import dev.inmo.tgbotapi.types.MediaGroupIdentifier +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage +import dev.inmo.tgbotapi.types.update.* +import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.* +import dev.inmo.tgbotapi.types.update.abstracts.* internal fun Update.lastUpdateIdentifier(): UpdateIdentifier { return if (this is SentMediaGroupUpdate) { diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveLocation.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveLocation.kt index e28780aa81..c480c38fe1 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveLocation.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveLocation.kt @@ -1,16 +1,16 @@ package dev.inmo.tgbotapi.extensions.api -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.LiveLocation.editLiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.LiveLocation.stopLiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendLocation -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -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.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.LocationContent +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.extensions.api.edit.LiveLocation.editLiveLocation +import dev.inmo.tgbotapi.extensions.api.edit.LiveLocation.stopLiveLocation +import dev.inmo.tgbotapi.requests.send.SendLocation +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.message.content.LocationContent import com.soywiz.klock.DateTime import com.soywiz.klock.TimeSpan import io.ktor.utils.io.core.Closeable diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/StopPoll.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/StopPoll.kt index ab3e18c8d4..7c535c5233 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/StopPoll.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/StopPoll.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.extensions.api -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.StopPoll +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.stopPoll( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerCallbackQuery.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerCallbackQuery.kt index d4a215046a..7ccc4fc3df 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerCallbackQuery.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerCallbackQuery.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.answers -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.AnswerCallbackQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery.CallbackQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQueryIdentifier +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.answers.AnswerCallbackQuery +import dev.inmo.tgbotapi.types.CallbackQuery.CallbackQuery +import dev.inmo.tgbotapi.types.CallbackQueryIdentifier suspend fun TelegramBot.answerCallbackQuery( callbackQueryId: CallbackQueryIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerInlineQuery.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerInlineQuery.kt index 55d7798021..bee5f5c67b 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerInlineQuery.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerInlineQuery.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.api.answers -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.AnswerInlineQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InlineQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueryIdentifier +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.answers.AnswerInlineQuery +import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult +import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery +import dev.inmo.tgbotapi.types.InlineQueryIdentifier suspend fun TelegramBot.answerInlineQuery( inlineQueryID: InlineQueryIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/payments/AnswerPreCheckoutQuery.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/payments/AnswerPreCheckoutQuery.kt index cd77a52a0c..fccfb36358 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/payments/AnswerPreCheckoutQuery.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/payments/AnswerPreCheckoutQuery.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.api.answers.payments -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.answers.payments.AnswerPreCheckoutQueryError +import dev.inmo.tgbotapi.requests.answers.payments.AnswerPreCheckoutQueryOk +import dev.inmo.tgbotapi.types.PreCheckoutQueryId +import dev.inmo.tgbotapi.types.payments.PreCheckoutQuery suspend fun TelegramBot.answerPreCheckoutQueryOk( id: PreCheckoutQueryId diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/payments/AnswerShippingQuery.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/payments/AnswerShippingQuery.kt index 2090f73d24..19954c89f8 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/payments/AnswerShippingQuery.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/payments/AnswerShippingQuery.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.extensions.api.answers.payments -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.answers.payments.AnswerShippingQueryError +import dev.inmo.tgbotapi.requests.answers.payments.AnswerShippingQueryOk +import dev.inmo.tgbotapi.types.ShippingQueryIdentifier +import dev.inmo.tgbotapi.types.payments.ShippingOption +import dev.inmo.tgbotapi.types.payments.ShippingQuery suspend fun TelegramBot.answerShippingQueryOk( id: ShippingQueryIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMe.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMe.kt index 16f5da8c45..0ff52dfdf7 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMe.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMe.kt @@ -1,6 +1,6 @@ package dev.inmo.tgbotapi.extensions.api.bot -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.bot.GetMe +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.bot.GetMe suspend fun TelegramBot.getMe() = execute(GetMe) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt index 1b65edb081..22995619e7 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt @@ -1,6 +1,6 @@ package dev.inmo.tgbotapi.extensions.api.bot -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.bot.GetMyCommands +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.bot.GetMyCommands suspend fun TelegramBot.getMyCommands() = execute(GetMyCommands) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt index c7519049b5..df5444d62c 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt @@ -1,8 +1,8 @@ package dev.inmo.tgbotapi.extensions.api.bot -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.bot.SetMyCommands -import com.github.insanusmokrassar.TelegramBotAPI.types.BotCommand +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.bot.SetMyCommands +import dev.inmo.tgbotapi.types.BotCommand suspend fun TelegramBot.setMyCommands( commands: List diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/ExportChatInviteLink.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/ExportChatInviteLink.kt index 1eb4e5f11b..48cc86e657 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/ExportChatInviteLink.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/ExportChatInviteLink.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.ExportChatInviteLink -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.ExportChatInviteLink +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.exportChatInviteLink( chatId: ChatIdentifier diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/LeaveChat.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/LeaveChat.kt index 4e45eba89a..c7c0675f88 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/LeaveChat.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/LeaveChat.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.LeaveChat -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.LeaveChat +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.leaveChat( chatId: ChatIdentifier diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChat.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChat.kt index 0201754b2d..467aca360d 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChat.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChat.kt @@ -1,13 +1,13 @@ package dev.inmo.tgbotapi.extensions.api.chat.get -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.get.GetChat +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.* +import dev.inmo.tgbotapi.types.chat.abstracts.* +import dev.inmo.tgbotapi.types.chat.abstracts.extended.* +import dev.inmo.tgbotapi.types.chat.extended.* +import dev.inmo.tgbotapi.utils.PreviewFeature suspend fun TelegramBot.getChat( chatId: ChatIdentifier @@ -18,7 +18,7 @@ suspend fun TelegramBot.getChat( ) = getChat(chat.id) /** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a + * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a * [ExtendedPublicChat] with unsafe operator "as" * * @throws ClassCastException @@ -30,7 +30,7 @@ suspend fun TelegramBot.getChat( /** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a + * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a * [ExtendedChannelChat] with unsafe operator "as" * * @throws ClassCastException @@ -41,7 +41,7 @@ suspend fun TelegramBot.getChat( ) = getChat(chat.id) as ExtendedChannelChat /** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a + * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a * [ExtendedChannelChatImpl] with unsafe operator "as" * * @throws ClassCastException @@ -53,7 +53,7 @@ suspend fun TelegramBot.getChat( /** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a + * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a * [ExtendedGroupChat] with unsafe operator "as" * * @throws ClassCastException @@ -64,7 +64,7 @@ suspend fun TelegramBot.getChat( ) = getChat(chat.id) as ExtendedGroupChat /** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a + * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a * [ExtendedGroupChatImpl] with unsafe operator "as" * * @throws ClassCastException @@ -76,7 +76,7 @@ suspend fun TelegramBot.getChat( /** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a + * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a * [ExtendedSupergroupChat] with unsafe operator "as" * * @throws ClassCastException @@ -87,7 +87,7 @@ suspend fun TelegramBot.getChat( ) = getChat(chat.id) as ExtendedSupergroupChat /** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a + * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a * [ExtendedSupergroupChatImpl] with unsafe operator "as" * * @throws ClassCastException @@ -99,7 +99,7 @@ suspend fun TelegramBot.getChat( /** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a + * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a * [ExtendedPrivateChat] with unsafe operator "as" * * @throws ClassCastException @@ -110,7 +110,7 @@ suspend fun TelegramBot.getChat( ) = getChat(chat.id) as ExtendedPrivateChat /** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a + * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a * [ExtendedPrivateChatImpl] with unsafe operator "as" * * @throws ClassCastException @@ -121,7 +121,7 @@ suspend fun TelegramBot.getChat( ) = getChat(chat.id) as ExtendedPrivateChatImpl /** - * Will cast incoming [com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat] to a + * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a * [ExtendedUser] with unsafe operator "as" * * @throws ClassCastException diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatAdministrators.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatAdministrators.kt index 7053ad4ae6..c971379fca 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatAdministrators.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatAdministrators.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat.get -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.get.GetChatAdministrators +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.getChatAdministrators( chatId: ChatIdentifier diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMembersCount.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMembersCount.kt index ebd778b646..279d2dc3e9 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMembersCount.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMembersCount.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat.get -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.get.GetChatMembersCount +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.getChatMembersCount( chatId: ChatIdentifier diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/GetChatMember.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/GetChatMember.kt index fbe445d234..4ec899c904 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/GetChatMember.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/GetChatMember.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat.members -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.GetChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.members.GetChatMember +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.getChatMember( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/KickChatMember.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/KickChatMember.kt index 3dd56011b2..4fb0049d5c 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/KickChatMember.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/KickChatMember.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat.members -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.KickChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.members.KickChatMember +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.kickChatMember( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatMember.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatMember.kt index 93aa5db48e..8ef88449ad 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatMember.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatMember.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat.members -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.PromoteChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.promoteChatMember( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/RestrictChatMember.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/RestrictChatMember.kt index 5f2d5f1b7e..b918b2d2a6 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/RestrictChatMember.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/RestrictChatMember.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.api.chat.members -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.RestrictChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ChatPermissions -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.members.RestrictChatMember +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.ChatPermissions +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.restrictChatMember( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/SetChatAdministratorCustomTitle.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/SetChatAdministratorCustomTitle.kt index 157e7b84e8..2b690f2788 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/SetChatAdministratorCustomTitle.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/SetChatAdministratorCustomTitle.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat.members -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.SetChatAdministratorCustomTitle -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.members.SetChatAdministratorCustomTitle +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.setChatAdministratorCustomTitle( chatId: ChatId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/UnbanChatMember.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/UnbanChatMember.kt index c6efa32124..74719e7281 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/UnbanChatMember.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/UnbanChatMember.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat.members -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.UnbanChatMember -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.members.UnbanChatMember +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.unbanChatMember( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/DeleteChatPhoto.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/DeleteChatPhoto.kt index 89fc6fb972..74b222fe38 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/DeleteChatPhoto.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/DeleteChatPhoto.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.modify.DeleteChatPhoto +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.deleteChatPhoto( chatId: ChatIdentifier diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/PinChatMessage.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/PinChatMessage.kt index 7d8ed50d59..b2c9f7e06b 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/PinChatMessage.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/PinChatMessage.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.modify.PinChatMessage +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.pinChatMessage( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatDescription.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatDescription.kt index b6f4fee8fa..2d17250e82 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatDescription.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatDescription.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.modify.SetChatDescription +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.setChatDescription( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPermissions.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPermissions.kt index d1cf11563b..e40507ab3a 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPermissions.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPermissions.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.modify.SetChatPermissions +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chat.ChatPermissions +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.setDefaultChatMembersPermissions( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPhoto.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPhoto.kt index 1dd86d1c29..ad232f7da5 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPhoto.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPhoto.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.chat.modify.SetChatPhoto +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.setChatPhoto( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatTitle.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatTitle.kt index 762e85a6f4..8f8ecc6495 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatTitle.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatTitle.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.modify.SetChatTitle +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.setChatTitle( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt index 27b88d423e..de540d19d3 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.modify.UnpinChatMessage +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat suspend fun TelegramBot.unpinChatMessage( chatId: ChatIdentifier diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/DeleteChatStickerSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/DeleteChatStickerSet.kt index 85f7ca3ac8..aaf0261169 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/DeleteChatStickerSet.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/DeleteChatStickerSet.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.chat.stickers -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.stickers.DeleteChatStickerSet +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.SupergroupChat suspend fun TelegramBot.deleteChatStickerSet( chatId: ChatIdentifier diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/SetChatStickerSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/SetChatStickerSet.kt index 835f2fe9ae..a45a3637e0 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/SetChatStickerSet.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/SetChatStickerSet.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.api.chat.stickers -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.chat.stickers.SetChatStickerSet +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.StickerSetName +import dev.inmo.tgbotapi.types.chat.abstracts.SupergroupChat suspend fun TelegramBot.setChatStickerSet( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/EditChatMessageLiveLocation.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/EditChatMessageLiveLocation.kt index c851a522e8..29b62ec4ff 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/EditChatMessageLiveLocation.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/EditChatMessageLiveLocation.kt @@ -1,12 +1,12 @@ package dev.inmo.tgbotapi.extensions.api.edit.LiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.EditChatMessageLiveLocation -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.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.LocationContent +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.edit.LiveLocation.EditChatMessageLiveLocation +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.LocationContent suspend fun TelegramBot.editLiveLocation( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/EditInlineMessageLiveLocation.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/EditInlineMessageLiveLocation.kt index 0d50c10549..fc0520b248 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/EditInlineMessageLiveLocation.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/EditInlineMessageLiveLocation.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.api.edit.LiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.edit.LiveLocation.EditInlineMessageLiveLocation +import dev.inmo.tgbotapi.types.InlineMessageIdentifier +import dev.inmo.tgbotapi.types.Location +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup suspend fun TelegramBot.editLiveLocation( inlineMessageId: InlineMessageIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/StopChatMessageLiveLocation.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/StopChatMessageLiveLocation.kt index 23aa6131e1..5a8d2ead28 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/StopChatMessageLiveLocation.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/StopChatMessageLiveLocation.kt @@ -1,13 +1,13 @@ package dev.inmo.tgbotapi.extensions.api.edit.LiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.edit.LiveLocation.StopChatMessageLiveLocation +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.LocationContent suspend fun TelegramBot.stopLiveLocation( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/StopInlineMessageLiveLocation.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/StopInlineMessageLiveLocation.kt index 60d858d79d..cdba949683 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/StopInlineMessageLiveLocation.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/LiveLocation/StopInlineMessageLiveLocation.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.edit.LiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.StopInlineMessageLiveLocation -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.edit.LiveLocation.StopInlineMessageLiveLocation +import dev.inmo.tgbotapi.types.InlineMessageIdentifier +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup suspend fun TelegramBot.stopLiveLocation( inlineMessageId: InlineMessageIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt index b38fbc5cd5..3a8d089fa5 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt @@ -1,12 +1,12 @@ package dev.inmo.tgbotapi.extensions.api.edit.ReplyMarkup -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.edit.ReplyMarkup.EditChatMessageReplyMarkup +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.editMessageReplyMarkup( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt index 85ee174331..123c168522 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.edit.ReplyMarkup -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.ReplyMarkup.EditInlineMessageReplyMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.edit.ReplyMarkup.EditInlineMessageReplyMarkup +import dev.inmo.tgbotapi.types.InlineMessageIdentifier +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup suspend fun TelegramBot.editMessageReplyMarkup( inlineMessageId: InlineMessageIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditChatMessageCaption.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditChatMessageCaption.kt index 19e6e6ddf1..3ee1097691 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditChatMessageCaption.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditChatMessageCaption.kt @@ -1,15 +1,15 @@ package dev.inmo.tgbotapi.extensions.api.edit.caption -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedInput -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.CommonAbstracts.CaptionedInput +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.edit.caption.EditChatMessageCaption +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent suspend fun TelegramBot.editMessageCaption( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditInlineMessageCaption.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditInlineMessageCaption.kt index 2a6195011f..29ca66bfbb 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditInlineMessageCaption.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditInlineMessageCaption.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.api.edit.caption -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.edit.caption.EditInlineMessageCaption +import dev.inmo.tgbotapi.types.InlineMessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup suspend fun TelegramBot.editMessageCaption( inlineMessageId: InlineMessageIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditChatMessageMedia.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditChatMessageMedia.kt index 3d82908c8e..58c19261c7 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditChatMessageMedia.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditChatMessageMedia.kt @@ -1,14 +1,14 @@ package dev.inmo.tgbotapi.extensions.api.edit.media -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.edit.media.EditChatMessageMedia +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.InputMedia.InputMedia +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent suspend fun TelegramBot.editMessageMedia( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditInlineMessageMedia.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditInlineMessageMedia.kt index 293d6eb881..31128eb6a7 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditInlineMessageMedia.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/media/EditInlineMessageMedia.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.api.edit.media -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.edit.media.EditInlineMessageMedia +import dev.inmo.tgbotapi.types.InlineMessageIdentifier +import dev.inmo.tgbotapi.types.InputMedia.InputMedia +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup suspend fun TelegramBot.editMessageCaption( inlineMessageId: InlineMessageIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditChatMessageText.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditChatMessageText.kt index 0746fb1f83..811a5f33d0 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditChatMessageText.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditChatMessageText.kt @@ -1,14 +1,14 @@ package dev.inmo.tgbotapi.extensions.api.edit.text -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.edit.text.EditChatMessageText +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.TextContent suspend fun TelegramBot.editMessageText( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditInlineMessageText.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditInlineMessageText.kt index 237c458d77..e21c30c03c 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditInlineMessageText.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditInlineMessageText.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.api.edit.text -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.edit.text.EditInlineMessageText +import dev.inmo.tgbotapi.types.InlineMessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup suspend fun TelegramBot.editMessageText( inlineMessageId: InlineMessageIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/GetGameHighScoresByChat.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/GetGameHighScoresByChat.kt index 812e1d0bdc..68257f5e44 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/GetGameHighScoresByChat.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/GetGameHighScoresByChat.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.extensions.api.games -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.games.GetGameHighScoresByChat +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.GameContent suspend fun TelegramBot.getGameScore( userId: UserId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/GetGameHighScoresByInlineMessageId.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/GetGameHighScoresByInlineMessageId.kt index 1d021af276..82fda656b0 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/GetGameHighScoresByInlineMessageId.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/GetGameHighScoresByInlineMessageId.kt @@ -1,8 +1,8 @@ package dev.inmo.tgbotapi.extensions.api.games -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.games.GetGameHighScoresByInlineMessageId -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.games.GetGameHighScoresByInlineMessageId +import dev.inmo.tgbotapi.types.* suspend fun TelegramBot.getGameScore( userId: UserId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/SetGameScoreByChatId.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/SetGameScoreByChatId.kt index 78cac10b0f..f34160fb7b 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/SetGameScoreByChatId.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/SetGameScoreByChatId.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.extensions.api.games -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.games.SetGameScoreByChatId -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.games.SetGameScoreByChatId +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.GameContent suspend fun TelegramBot.setGameScore( userId: UserId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/SetGameScoreByInlineMessageId.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/SetGameScoreByInlineMessageId.kt index 2bc2bfefd3..ec1caac066 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/SetGameScoreByInlineMessageId.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/games/SetGameScoreByInlineMessageId.kt @@ -1,8 +1,8 @@ package dev.inmo.tgbotapi.extensions.api.games -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.games.SetGameScoreByInlineMessageId -import com.github.insanusmokrassar.TelegramBotAPI.types.* +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.games.SetGameScoreByInlineMessageId +import dev.inmo.tgbotapi.types.* suspend fun TelegramBot.setGameScore( userId: UserId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetFile.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetFile.kt index 77cb29eb77..d2515dd8ce 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetFile.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetFile.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.get -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.requests.get.GetFile +import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile suspend fun TelegramBot.getFileAdditionalInfo( fileId: FileId diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetStickerSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetStickerSet.kt index 01e9541e29..94400fa7a9 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetStickerSet.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetStickerSet.kt @@ -1,8 +1,8 @@ package dev.inmo.tgbotapi.extensions.api.get -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.get.GetStickerSet -import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.get.GetStickerSet +import dev.inmo.tgbotapi.types.files.Sticker suspend fun TelegramBot.getStickerSet( name: String diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetUserProfilePhotos.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetUserProfilePhotos.kt index b1c868c45a..1d81bd2ede 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetUserProfilePhotos.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetUserProfilePhotos.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.get -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.get.GetUserProfilePhotos -import com.github.insanusmokrassar.TelegramBotAPI.types.CommonUser -import com.github.insanusmokrassar.TelegramBotAPI.types.UserId +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.get.GetUserProfilePhotos +import dev.inmo.tgbotapi.types.CommonUser +import dev.inmo.tgbotapi.types.UserId suspend fun TelegramBot.getUserProfilePhotos( userId: UserId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendAction.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendAction.kt index 5fafd4ccb3..05ab7eb80f 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendAction.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendAction.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.api.send -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.send.SendAction +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.actions.* +import dev.inmo.tgbotapi.types.chat.abstracts.Chat suspend fun TelegramBot.sendBotAction( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendContact.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendContact.kt index 29068ebbea..9b0f05be68 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendContact.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendContact.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.extensions.api.send -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.send.SendContact +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendContact( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendDice.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendDice.kt index 453175cd0f..b6afbe4374 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendDice.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendDice.kt @@ -1,13 +1,13 @@ package dev.inmo.tgbotapi.extensions.api.send -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.send.SendDice +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.dice.DiceAnimationType +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendDice( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendLocation.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendLocation.kt index 4e2081aeef..b67be97035 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendLocation.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendLocation.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.extensions.api.send -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.send.SendLocation +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendLocation( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendMessage.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendMessage.kt index 43035fc923..2519f6597c 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendMessage.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendMessage.kt @@ -1,13 +1,13 @@ package dev.inmo.tgbotapi.extensions.api.send -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendTextMessage -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.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.send.SendTextMessage +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendMessage( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt index 6f552e7b3f..08495ad015 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt @@ -1,12 +1,12 @@ package dev.inmo.tgbotapi.extensions.api.send -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendVenue -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.venue.Venue +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.send.SendVenue +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.venue.Venue suspend fun TelegramBot.sendVenue( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/games/SendGame.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/games/SendGame.kt index a2abbe35f4..82d17237b7 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/games/SendGame.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/games/SendGame.kt @@ -1,13 +1,13 @@ package dev.inmo.tgbotapi.extensions.api.send.games -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.send.games.SendGame +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.games.Game +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendGame( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAnimation.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAnimation.kt index 135d67cf21..79f9ee41ab 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAnimation.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAnimation.kt @@ -1,15 +1,15 @@ package dev.inmo.tgbotapi.extensions.api.send.media -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.files.AnimationFile -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.InputFile +import dev.inmo.tgbotapi.requests.send.media.SendAnimation +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.files.AnimationFile +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendAnimation( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAudio.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAudio.kt index b43e2dfb03..0c9596f1f0 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAudio.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendAudio.kt @@ -1,16 +1,16 @@ package dev.inmo.tgbotapi.extensions.api.send.media -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.files.AnimationFile -import com.github.insanusmokrassar.TelegramBotAPI.types.files.AudioFile -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.InputFile +import dev.inmo.tgbotapi.requests.send.media.SendAudio +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.files.AnimationFile +import dev.inmo.tgbotapi.types.files.AudioFile +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendAudio( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendDocument.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendDocument.kt index e625dd367f..a1fca68afa 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendDocument.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendDocument.kt @@ -1,15 +1,15 @@ package dev.inmo.tgbotapi.extensions.api.send.media -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.files.DocumentFile -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.InputFile +import dev.inmo.tgbotapi.requests.send.media.SendDocument +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.files.DocumentFile +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendDocument( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt index 95ce7fc3e0..1f0cf52f6a 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt @@ -1,12 +1,12 @@ package dev.inmo.tgbotapi.extensions.api.send.media -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.send.media.SendMediaGroup +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.InputMedia.MediaGroupMemberInputMedia +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendMediaGroup( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendPhoto.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendPhoto.kt index c6cfa1d4ef..6f12590f0d 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendPhoto.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendPhoto.kt @@ -1,16 +1,16 @@ package dev.inmo.tgbotapi.extensions.api.send.media -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.files.Photo -import com.github.insanusmokrassar.TelegramBotAPI.types.files.biggest -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.InputFile +import dev.inmo.tgbotapi.requests.send.media.SendPhoto +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.files.Photo +import dev.inmo.tgbotapi.types.files.biggest +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendPhoto( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendSticker.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendSticker.kt index 26b41493d9..9e4b7aad50 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendSticker.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendSticker.kt @@ -1,14 +1,14 @@ package dev.inmo.tgbotapi.extensions.api.send.media -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.InputFile +import dev.inmo.tgbotapi.requests.send.media.SendSticker +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.files.Sticker +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendSticker( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideo.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideo.kt index 1751334ee7..c58d9ca661 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideo.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideo.kt @@ -1,15 +1,15 @@ package dev.inmo.tgbotapi.extensions.api.send.media -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.files.VideoFile -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.InputFile +import dev.inmo.tgbotapi.requests.send.media.SendVideo +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.files.VideoFile +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendVideo( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideoNote.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideoNote.kt index 5b64b7b698..7eb6b9f4a5 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideoNote.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVideoNote.kt @@ -1,16 +1,16 @@ package dev.inmo.tgbotapi.extensions.api.send.media -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.files.VideoFile -import com.github.insanusmokrassar.TelegramBotAPI.types.files.VideoNoteFile -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.InputFile +import dev.inmo.tgbotapi.requests.send.media.SendVideoNote +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.files.VideoFile +import dev.inmo.tgbotapi.types.files.VideoNoteFile +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendVideoNote( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVoice.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVoice.kt index d50795e1cc..68c63a91fe 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVoice.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendVoice.kt @@ -1,16 +1,16 @@ package dev.inmo.tgbotapi.extensions.api.send.media -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.files.AudioFile -import com.github.insanusmokrassar.TelegramBotAPI.types.files.VoiceFile -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.InputFile +import dev.inmo.tgbotapi.requests.send.media.SendVoice +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.files.AudioFile +import dev.inmo.tgbotapi.types.files.VoiceFile +import dev.inmo.tgbotapi.types.message.abstracts.Message suspend fun TelegramBot.sendVoice( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/payments/SendInvoice.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/payments/SendInvoice.kt index 5cb5a8c0dc..ee04707a50 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/payments/SendInvoice.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/payments/SendInvoice.kt @@ -1,12 +1,12 @@ package dev.inmo.tgbotapi.extensions.api.send.payments -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.payments.SendInvoice -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.LabeledPrice -import com.github.insanusmokrassar.TelegramBotAPI.types.payments.abstracts.Currency +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.send.payments.SendInvoice +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.payments.LabeledPrice +import dev.inmo.tgbotapi.types.payments.abstracts.Currency suspend fun TelegramBot.sendInvoice( chatId: ChatId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/polls/SendPoll.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/polls/SendPoll.kt index d5573b1b02..674214eef0 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/polls/SendPoll.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/polls/SendPoll.kt @@ -1,15 +1,15 @@ package dev.inmo.tgbotapi.extensions.api.send.polls -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.polls.SendQuizPoll -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.polls.SendRegularPoll -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.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message -import com.github.insanusmokrassar.TelegramBotAPI.types.polls.* +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.send.polls.SendQuizPoll +import dev.inmo.tgbotapi.requests.send.polls.SendRegularPoll +import dev.inmo.tgbotapi.types.ChatIdentifier +import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ParseMode.ParseMode +import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.abstracts.Message +import dev.inmo.tgbotapi.types.polls.* suspend fun TelegramBot.sendRegularPoll( chatId: ChatIdentifier, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddAnimatedStickerToSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddAnimatedStickerToSet.kt index f623635d4b..377b75f123 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddAnimatedStickerToSet.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddAnimatedStickerToSet.kt @@ -1,13 +1,13 @@ package dev.inmo.tgbotapi.extensions.api.stickers -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.AddAnimatedStickerToSet -import com.github.insanusmokrassar.TelegramBotAPI.types.CommonUser -import com.github.insanusmokrassar.TelegramBotAPI.types.UserId -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.StickerSet +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.stickers.AddAnimatedStickerToSet +import dev.inmo.tgbotapi.types.CommonUser +import dev.inmo.tgbotapi.types.UserId +import dev.inmo.tgbotapi.types.stickers.MaskPosition +import dev.inmo.tgbotapi.types.stickers.StickerSet suspend fun TelegramBot.addAnimatedStickerToSet( userId: UserId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddStaticStickerToSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddStaticStickerToSet.kt index 963875a2cc..a664aedb5d 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddStaticStickerToSet.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddStaticStickerToSet.kt @@ -1,13 +1,13 @@ package dev.inmo.tgbotapi.extensions.api.stickers -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.AddStaticStickerToSet -import com.github.insanusmokrassar.TelegramBotAPI.types.CommonUser -import com.github.insanusmokrassar.TelegramBotAPI.types.UserId -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.StickerSet +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.stickers.AddStaticStickerToSet +import dev.inmo.tgbotapi.types.CommonUser +import dev.inmo.tgbotapi.types.UserId +import dev.inmo.tgbotapi.types.stickers.MaskPosition +import dev.inmo.tgbotapi.types.stickers.StickerSet suspend fun TelegramBot.addStaticStickerToSet( userId: UserId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewAnimatedStickerSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewAnimatedStickerSet.kt index 37fc869ea5..c5bf76b6f3 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewAnimatedStickerSet.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewAnimatedStickerSet.kt @@ -1,12 +1,12 @@ package dev.inmo.tgbotapi.extensions.api.stickers -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.CreateNewAnimatedStickerSet -import com.github.insanusmokrassar.TelegramBotAPI.types.CommonUser -import com.github.insanusmokrassar.TelegramBotAPI.types.UserId -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.stickers.CreateNewAnimatedStickerSet +import dev.inmo.tgbotapi.types.CommonUser +import dev.inmo.tgbotapi.types.UserId +import dev.inmo.tgbotapi.types.stickers.MaskPosition suspend fun TelegramBot.createNewAnimatedStickerSet( userId: UserId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewStaticStickerSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewStaticStickerSet.kt index d555210184..be70b86597 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewStaticStickerSet.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewStaticStickerSet.kt @@ -1,12 +1,12 @@ package dev.inmo.tgbotapi.extensions.api.stickers -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.CreateNewStaticStickerSet -import com.github.insanusmokrassar.TelegramBotAPI.types.CommonUser -import com.github.insanusmokrassar.TelegramBotAPI.types.UserId -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.stickers.CreateNewStaticStickerSet +import dev.inmo.tgbotapi.types.CommonUser +import dev.inmo.tgbotapi.types.UserId +import dev.inmo.tgbotapi.types.stickers.MaskPosition suspend fun TelegramBot.createNewStaticStickerSet( userId: UserId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/DeleteStickerFromSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/DeleteStickerFromSet.kt index 27393e8e4f..29be658518 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/DeleteStickerFromSet.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/DeleteStickerFromSet.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.stickers -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.DeleteStickerFromSet -import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.requests.stickers.DeleteStickerFromSet +import dev.inmo.tgbotapi.types.files.Sticker suspend fun TelegramBot.deleteStickerFromSet( sticker: FileId diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerPositionInSet.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerPositionInSet.kt index faf0a5ccb6..affe3f2056 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerPositionInSet.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerPositionInSet.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.stickers -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.SetStickerPositionInSet -import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.requests.stickers.SetStickerPositionInSet +import dev.inmo.tgbotapi.types.files.Sticker suspend fun TelegramBot.setStickerPositionInSet( sticker: FileId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerSetThumb.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerSetThumb.kt index 69ffb7f3e3..c5d2261c2a 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerSetThumb.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerSetThumb.kt @@ -1,12 +1,12 @@ -package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.thumbs +package dev.inmo.tgbotapi.extensions.api.thumbs -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.SetStickerSetThumb -import com.github.insanusmokrassar.TelegramBotAPI.types.CommonUser -import com.github.insanusmokrassar.TelegramBotAPI.types.UserId -import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.StickerSet +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.stickers.SetStickerSetThumb +import dev.inmo.tgbotapi.types.CommonUser +import dev.inmo.tgbotapi.types.UserId +import dev.inmo.tgbotapi.types.stickers.StickerSet suspend fun TelegramBot.setStickerSetThumb( userId: UserId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/UploadStickerFile.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/UploadStickerFile.kt index 15ef0d551f..e509307f7c 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/UploadStickerFile.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/UploadStickerFile.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.api.stickers -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -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 +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.stickers.UploadStickerFile +import dev.inmo.tgbotapi.types.CommonUser +import dev.inmo.tgbotapi.types.UserId suspend fun TelegramBot.uploadStickerFile( userId: UserId, diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/utils/UpdatesHandling.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/utils/UpdatesHandling.kt index fa0e719fa4..3f9e249fea 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/utils/UpdatesHandling.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/utils/UpdatesHandling.kt @@ -1,18 +1,18 @@ package dev.inmo.tgbotapi.extensions.api.utils -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.InternalUtils.convertWithMediaGroupUpdates -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseMessageUpdate -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update -import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.UpdateReceiver -import com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.accumulateByKey +import dev.inmo.tgbotapi.extensions.api.InternalUtils.convertWithMediaGroupUpdates +import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage +import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate +import dev.inmo.tgbotapi.types.update.abstracts.Update +import dev.inmo.tgbotapi.updateshandlers.UpdateReceiver +import dev.inmo.tgbotapi.utils.extensions.accumulateByKey import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.launch /** * Create [UpdateReceiver] object which will correctly accumulate updates and send into output updates which INCLUDE - * [com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.MediaGroupUpdate]s. + * [dev.inmo.tgbotapi.types.update.MediaGroupUpdates.MediaGroupUpdate]s. * * @see UpdateReceiver */ diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/webhook/DeleteWebhook.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/webhook/DeleteWebhook.kt index a414ad2210..9f503bc1dc 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/webhook/DeleteWebhook.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/webhook/DeleteWebhook.kt @@ -1,6 +1,6 @@ package dev.inmo.tgbotapi.extensions.api.webhook -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.webhook.DeleteWebhook +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.webhook.DeleteWebhook suspend fun TelegramBot.deleteWebhook() = execute(DeleteWebhook()) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/webhook/GetWebhookInfo.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/webhook/GetWebhookInfo.kt index 7f97930e17..d1fabc7e55 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/webhook/GetWebhookInfo.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/webhook/GetWebhookInfo.kt @@ -1,6 +1,6 @@ package dev.inmo.tgbotapi.extensions.api.webhook -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.webhook.GetWebhookInfo +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.webhook.GetWebhookInfo suspend fun TelegramBot.getWebhookInfo() = execute(GetWebhookInfo()) diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/webhook/SetWebhookInfo.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/webhook/SetWebhookInfo.kt index 1290df8fc1..375d22301c 100644 --- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/webhook/SetWebhookInfo.kt +++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/webhook/SetWebhookInfo.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.api.webhook -import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.webhook.SetWebhook +import dev.inmo.tgbotapi.bot.TelegramBot +import dev.inmo.tgbotapi.requests.abstracts.FileId +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.webhook.SetWebhook /** * Use this method to send information about webhook (like [url]) diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/CallbackQueryConversations.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/CallbackQueryConversations.kt index 1a5c939914..159a22a762 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/CallbackQueryConversations.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/CallbackQueryConversations.kt @@ -1,6 +1,6 @@ package dev.inmo.tgbotapi.extensions.utils -import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery.* +import dev.inmo.tgbotapi.types.CallbackQuery.* import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.mapNotNull diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/CommonMessageConversations.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/CommonMessageConversations.kt index b0c692b581..2909aa9637 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/CommonMessageConversations.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/CommonMessageConversations.kt @@ -1,8 +1,8 @@ package dev.inmo.tgbotapi.extensions.utils -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.PossiblySentViaBotCommonMessage +import dev.inmo.tgbotapi.types.message.abstracts.* +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent +import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage import kotlinx.coroutines.flow.* /** diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ContentMessageConversations.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ContentMessageConversations.kt index c7834148e9..ce980fe93a 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ContentMessageConversations.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ContentMessageConversations.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.utils -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.payments.InvoiceContent +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.* +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent +import dev.inmo.tgbotapi.types.message.content.media.* +import dev.inmo.tgbotapi.types.message.payments.InvoiceContent import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.mapNotNull import kotlin.reflect.KClass diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/SafelyShortcut.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/SafelyShortcut.kt index 697cf9aec7..ad8ab08006 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/SafelyShortcut.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/SafelyShortcut.kt @@ -1,6 +1,6 @@ package dev.inmo.tgbotapi.extensions.utils -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.utils.* import kotlinx.coroutines.CoroutineScope /** diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/chat_events/ChatEventsSourcesConversations.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/chat_events/ChatEventsSourcesConversations.kt index 825d861a62..eabe98cddc 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/chat_events/ChatEventsSourcesConversations.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/chat_events/ChatEventsSourcesConversations.kt @@ -1,7 +1,7 @@ package dev.inmo.tgbotapi.extensions.utils.chat_events -import com.github.insanusmokrassar.TelegramBotAPI.types.message.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ChatEventMessage +import dev.inmo.tgbotapi.types.message.* +import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.mapNotNull import kotlin.reflect.KClass diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/FilesDownloading.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/FilesDownloading.kt index ae3a98fcbe..5713ae8109 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/FilesDownloading.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/FilesDownloading.kt @@ -1,7 +1,7 @@ package dev.inmo.tgbotapi.extensions.utils.extensions -import com.github.insanusmokrassar.TelegramBotAPI.types.files.PathedFile -import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper +import dev.inmo.tgbotapi.types.files.PathedFile +import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper import io.ktor.client.HttpClient import io.ktor.client.request.get diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/FlowsUpdatesFilter.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/FlowsUpdatesFilter.kt index 093f8dbb64..b300a1dace 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/FlowsUpdatesFilter.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/FlowsUpdatesFilter.kt @@ -1,8 +1,8 @@ package dev.inmo.tgbotapi.extensions.utils.extensions -import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.SentMediaGroupUpdate -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseSentMessageUpdate -import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter +import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate +import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate +import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.merge diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquare.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquare.kt index 0b92f8dc1d..091c0fec86 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquare.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquare.kt @@ -1,7 +1,7 @@ package dev.inmo.tgbotapi.extensions.utils.extensions.venue -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.venue.Venue +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.venue.Venue import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt index 53ddc10a88..ccb8857dea 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.utils.formatting -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PrivateChat -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.UsernameChat -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.ExtendedChat +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.* +import dev.inmo.tgbotapi.types.chat.abstracts.PrivateChat +import dev.inmo.tgbotapi.types.chat.abstracts.UsernameChat +import dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat private const val internalLinkBeginning = "https://t.me" diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/ResendingTextFormatting.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/ResendingTextFormatting.kt index e8f4fef11b..68fbaf58fb 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/ResendingTextFormatting.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/ResendingTextFormatting.kt @@ -1,10 +1,10 @@ package dev.inmo.tgbotapi.extensions.utils.formatting -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.TextContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.fullEntitiesList +import dev.inmo.tgbotapi.CommonAbstracts.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.* +import dev.inmo.tgbotapi.types.message.content.TextContent +import dev.inmo.tgbotapi.types.message.content.fullEntitiesList fun createFormattedText( entities: FullTextSourcesList, diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/StringFormatting.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/StringFormatting.kt index ddff903bb3..3368bb37dc 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/StringFormatting.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/StringFormatting.kt @@ -1,8 +1,8 @@ package dev.inmo.tgbotapi.extensions.utils.formatting -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.* +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.ParseMode.* +import dev.inmo.tgbotapi.utils.extensions.* const val markdownBoldControl = "*" const val markdownItalicControl = "_" diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/internal_utils/UpdatesFiltering.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/internal_utils/UpdatesFiltering.kt index 0825ade40a..3d97313af5 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/internal_utils/UpdatesFiltering.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/internal_utils/UpdatesFiltering.kt @@ -1,7 +1,7 @@ package dev.inmo.tgbotapi.extensions.utils.internal_utils -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.update.abstracts.Update import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.mapNotNull diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/CommandsShortcuts.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/CommandsShortcuts.kt index c62137de41..5a8181819e 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/CommandsShortcuts.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/CommandsShortcuts.kt @@ -1,17 +1,17 @@ package dev.inmo.tgbotapi.extensions.utils.shortcuts -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.onlyTextContentMessages -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.asContentMessagesFlow -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.BotCommandTextSource -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.TextContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.fullEntitiesList +import dev.inmo.tgbotapi.CommonAbstracts.TextSource +import dev.inmo.tgbotapi.extensions.utils.onlyTextContentMessages +import dev.inmo.tgbotapi.extensions.utils.updates.asContentMessagesFlow +import dev.inmo.tgbotapi.types.MessageEntity.textsources.BotCommandTextSource +import dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.TextContent +import dev.inmo.tgbotapi.types.message.content.fullEntitiesList import kotlinx.coroutines.flow.* /** - * Convert incoming [com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage.content] of + * Convert incoming [dev.inmo.tgbotapi.types.message.abstracts.ContentMessage.content] of * messages with [fullEntitiesList] and check that incoming message contains ONLY ONE [TextSource] and that is * [BotCommandTextSource]. Besides, it is checking that [BotCommandTextSource.command] [Regex.matches] with incoming * [commandRegex] @@ -31,7 +31,7 @@ fun > Flow.filterExactCommands( } /** - * Convert incoming [com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage.content] of + * Convert incoming [dev.inmo.tgbotapi.types.message.abstracts.ContentMessage.content] of * messages with [fullEntitiesList] and check that incoming message contains [BotCommandTextSource]. Besides, it is * checking that [BotCommandTextSource.command] [Regex.matches] with incoming [commandRegex] * @@ -52,7 +52,7 @@ fun > Flow.filterCommandsInsideTextMessages( } /** - * Convert incoming [com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage.content] of + * Convert incoming [dev.inmo.tgbotapi.types.message.abstracts.ContentMessage.content] of * messages with [fullEntitiesList] and check that incoming message contains first [TextSource] as * [BotCommandTextSource]. Besides, it is checking that [BotCommandTextSource.command] [Regex.matches] with incoming * [commandRegex] and for other [TextSource] objects used next rules: all incoming text sources will be passed as is, diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/FlowsUpdatesFilter.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/FlowsUpdatesFilter.kt index 983e498359..6e08232a35 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/FlowsUpdatesFilter.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/FlowsUpdatesFilter.kt @@ -1,18 +1,18 @@ package dev.inmo.tgbotapi.extensions.utils.shortcuts -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.aggregateFlows -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.flatMap -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.asContentMessagesFlow -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.CommonMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.payments.InvoiceContent -import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.SentMediaGroupUpdate -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseSentMessageUpdate -import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter +import dev.inmo.tgbotapi.extensions.utils.aggregateFlows +import dev.inmo.tgbotapi.extensions.utils.flatMap +import dev.inmo.tgbotapi.extensions.utils.updates.asContentMessagesFlow +import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.* +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent +import dev.inmo.tgbotapi.types.message.content.media.* +import dev.inmo.tgbotapi.types.message.payments.InvoiceContent +import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate +import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate +import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.* diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/MediaGroupsShortcuts.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/MediaGroupsShortcuts.kt index 598d399630..031d187697 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/MediaGroupsShortcuts.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/MediaGroupsShortcuts.kt @@ -1,12 +1,12 @@ package dev.inmo.tgbotapi.extensions.utils.shortcuts -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.SendMediaGroup -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.message.ForwardInfo -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent -import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.SentMediaGroupUpdate +import dev.inmo.tgbotapi.requests.send.media.SendMediaGroup +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.message.ForwardInfo +import dev.inmo.tgbotapi.types.message.abstracts.* +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent +import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate val List>.forwardInfo: ForwardInfo? get() = firstOrNull() ?.forwardInfo diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/PollCloseShortcuts.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/PollCloseShortcuts.kt index 4f644e8f7b..61169cc7f5 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/PollCloseShortcuts.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/PollCloseShortcuts.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.utils.shortcuts -import com.github.insanusmokrassar.TelegramBotAPI.types.LongSeconds -import com.github.insanusmokrassar.TelegramBotAPI.types.Seconds -import com.github.insanusmokrassar.TelegramBotAPI.types.polls.ApproximateScheduledCloseInfo -import com.github.insanusmokrassar.TelegramBotAPI.types.polls.ExactScheduledCloseInfo +import dev.inmo.tgbotapi.types.LongSeconds +import dev.inmo.tgbotapi.types.Seconds +import dev.inmo.tgbotapi.types.polls.ApproximateScheduledCloseInfo +import dev.inmo.tgbotapi.types.polls.ExactScheduledCloseInfo import com.soywiz.klock.DateTime import com.soywiz.klock.TimeSpan diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/RequestsExecutor.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/RequestsExecutor.kt index cb033fb952..aa4d9b225c 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/RequestsExecutor.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/RequestsExecutor.kt @@ -1,8 +1,8 @@ package dev.inmo.tgbotapi.extensions.utils.shortcuts -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.utils.handleSafely +import dev.inmo.tgbotapi.bot.RequestsExecutor +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.utils.handleSafely import kotlinx.coroutines.* fun RequestsExecutor.executeAsync( diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/types/buttons/InlineKeyboardMarkup.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/types/buttons/InlineKeyboardMarkup.kt index 4fc5c0d209..c09e987250 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/types/buttons/InlineKeyboardMarkup.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/types/buttons/InlineKeyboardMarkup.kt @@ -1,8 +1,8 @@ package dev.inmo.tgbotapi.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 +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.InlineKeyboardButton +import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup +import dev.inmo.tgbotapi.utils.flatMatrix fun InlineKeyboardMarkup( vararg buttons: InlineKeyboardButton diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/types/buttons/ReplyKeyboardMarkup.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/types/buttons/ReplyKeyboardMarkup.kt index 4b45d5d57b..8029ee9a8d 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/types/buttons/ReplyKeyboardMarkup.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/types/buttons/ReplyKeyboardMarkup.kt @@ -1,8 +1,8 @@ package dev.inmo.tgbotapi.extensions.utils.types.buttons -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardButton -import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.ReplyKeyboardMarkup -import com.github.insanusmokrassar.TelegramBotAPI.utils.flatMatrix +import dev.inmo.tgbotapi.types.buttons.KeyboardButton +import dev.inmo.tgbotapi.types.buttons.ReplyKeyboardMarkup +import dev.inmo.tgbotapi.utils.flatMatrix fun ReplyKeyboardMarkup( vararg buttons: KeyboardButton, diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/BaseMessagesUpdatesConversations.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/BaseMessagesUpdatesConversations.kt index 3c9163f7a8..395f00cbf8 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/BaseMessagesUpdatesConversations.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/BaseMessagesUpdatesConversations.kt @@ -1,7 +1,7 @@ package dev.inmo.tgbotapi.extensions.utils.updates -import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.* +import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.* +import dev.inmo.tgbotapi.types.update.abstracts.* import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filterIsInstance diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/CallbackQueryUpdatesConversations.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/CallbackQueryUpdatesConversations.kt index 43783bb912..aaf1f49a13 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/CallbackQueryUpdatesConversations.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/CallbackQueryUpdatesConversations.kt @@ -1,7 +1,7 @@ package dev.inmo.tgbotapi.extensions.utils.updates -import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.CallbackQueryUpdate +import dev.inmo.tgbotapi.types.CallbackQuery.* +import dev.inmo.tgbotapi.types.update.CallbackQueryUpdate import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.mapNotNull diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/ChosenInlineResultUpdatesConversations.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/ChosenInlineResultUpdatesConversations.kt index 496675efad..63fe4f4283 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/ChosenInlineResultUpdatesConversations.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/ChosenInlineResultUpdatesConversations.kt @@ -1,12 +1,12 @@ package dev.inmo.tgbotapi.extensions.utils.updates -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.internal_utils.onlySpecifiedTypeOfData -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.internal_utils.onlySpecifiedTypeOfDataWithUpdates -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.ChosenInlineResult.BaseChosenInlineResult -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.ChosenInlineResult.LocationChosenInlineResult -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.update.ChosenInlineResultUpdate -import com.github.insanusmokrassar.TelegramBotAPI.types.update.InlineQueryUpdate +import dev.inmo.tgbotapi.extensions.utils.internal_utils.onlySpecifiedTypeOfData +import dev.inmo.tgbotapi.extensions.utils.internal_utils.onlySpecifiedTypeOfDataWithUpdates +import dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.BaseChosenInlineResult +import dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.LocationChosenInlineResult +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.update.ChosenInlineResultUpdate +import dev.inmo.tgbotapi.types.update.InlineQueryUpdate import kotlinx.coroutines.flow.Flow /** diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/CommandsFilters.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/CommandsFilters.kt index ce0572f3fd..69f4bc69f0 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/CommandsFilters.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/CommandsFilters.kt @@ -1,18 +1,18 @@ package dev.inmo.tgbotapi.extensions.utils.updates -import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.onlyTextContentMessages -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.shortcuts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.BotCommandTextSource -import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.TextContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.fullEntitiesList -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseSentMessageUpdate +import dev.inmo.tgbotapi.CommonAbstracts.TextSource +import dev.inmo.tgbotapi.extensions.utils.onlyTextContentMessages +import dev.inmo.tgbotapi.extensions.utils.shortcuts.* +import dev.inmo.tgbotapi.types.MessageEntity.textsources.BotCommandTextSource +import dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource +import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage +import dev.inmo.tgbotapi.types.message.content.TextContent +import dev.inmo.tgbotapi.types.message.content.fullEntitiesList +import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate import kotlinx.coroutines.flow.* /** - * Convert incoming [com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage.content] of + * Convert incoming [dev.inmo.tgbotapi.types.message.abstracts.ContentMessage.content] of * messages with [fullEntitiesList] and check that incoming message contains ONLY ONE [TextSource] and that is * [BotCommandTextSource]. Besides, it is checking that [BotCommandTextSource.command] [Regex.matches] with incoming * [commandRegex] @@ -29,7 +29,7 @@ fun Flow.filterExactCommands( ) = textMessages().filterExactCommands(commandRegex) /** - * Convert incoming [com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage.content] of + * Convert incoming [dev.inmo.tgbotapi.types.message.abstracts.ContentMessage.content] of * messages with [fullEntitiesList] and check that incoming message contains [BotCommandTextSource]. Besides, it is * checking that [BotCommandTextSource.command] [Regex.matches] with incoming [commandRegex] * @@ -45,7 +45,7 @@ fun Flow.filterCommandsInsideTextMessages( ) = textMessages().filterCommandsInsideTextMessages(commandRegex) /** - * Convert incoming [com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage.content] of + * Convert incoming [dev.inmo.tgbotapi.types.message.abstracts.ContentMessage.content] of * messages with [fullEntitiesList] and check that incoming message contains first [TextSource] as * [BotCommandTextSource]. Besides, it is checking that [BotCommandTextSource.command] [Regex.matches] with incoming * [commandRegex] and for other [TextSource] objects used next rules: all incoming text sources will be passed as is, diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/FlowsUpdatesFactory.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/FlowsUpdatesFactory.kt index 128bb779ba..cc0df7b1d6 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/FlowsUpdatesFactory.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/FlowsUpdatesFactory.kt @@ -1,6 +1,6 @@ package dev.inmo.tgbotapi.extensions.utils.updates -import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter +import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter /** * Non-suspendable function for easy-to-use creating of [FlowsUpdatesFilter] and applying the block to it diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/InlineQueryUpdatesConversations.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/InlineQueryUpdatesConversations.kt index 315d48ed7e..635d677f95 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/InlineQueryUpdatesConversations.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/InlineQueryUpdatesConversations.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.extensions.utils.updates -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.internal_utils.onlySpecifiedTypeOfData -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.internal_utils.onlySpecifiedTypeOfDataWithUpdates -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.query.BaseInlineQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.query.LocationInlineQuery -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.update.InlineQueryUpdate +import dev.inmo.tgbotapi.extensions.utils.internal_utils.onlySpecifiedTypeOfData +import dev.inmo.tgbotapi.extensions.utils.internal_utils.onlySpecifiedTypeOfDataWithUpdates +import dev.inmo.tgbotapi.types.InlineQueries.query.BaseInlineQuery +import dev.inmo.tgbotapi.types.InlineQueries.query.LocationInlineQuery +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.update.InlineQueryUpdate import kotlinx.coroutines.flow.* /** diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/SentMessageUpdatesConversations.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/SentMessageUpdatesConversations.kt index 526ca0a866..1e4549b09f 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/SentMessageUpdatesConversations.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/SentMessageUpdatesConversations.kt @@ -1,7 +1,7 @@ package dev.inmo.tgbotapi.extensions.utils.updates -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseSentMessageUpdate +import dev.inmo.tgbotapi.types.message.abstracts.* +import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.mapNotNull diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdateDeserialization.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdateDeserialization.kt index 29da247f1a..e98336a09c 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdateDeserialization.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdateDeserialization.kt @@ -1,28 +1,28 @@ package dev.inmo.tgbotapi.extensions.utils.updates -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.nonstrictJsonFormat -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UpdateDeserializationStrategy +import dev.inmo.tgbotapi.extensions.utils.nonstrictJsonFormat +import dev.inmo.tgbotapi.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] + * @return Deserialize [source] as [dev.inmo.tgbotapi.types.update.abstracts.Update] */ fun Json.toTelegramUpdate(source: String) = decodeFromString(UpdateDeserializationStrategy, source) /** - * @return Deserialize [source] as [com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update] + * @return Deserialize [source] as [dev.inmo.tgbotapi.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, + * @return Deserialize [this] as [dev.inmo.tgbotapi.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] + * @return Deserialize [this] as [dev.inmo.tgbotapi.types.update.abstracts.Update] * * @see Json.toTelegramUpdate */ diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdatesChatFilters.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdatesChatFilters.kt index c8070f7f14..870031df7e 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdatesChatFilters.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdatesChatFilters.kt @@ -1,9 +1,9 @@ package dev.inmo.tgbotapi.extensions.utils.updates -import com.github.insanusmokrassar.TelegramBotAPI.types.ChatId -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat -import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.SentMediaGroupUpdate -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseMessageUpdate +import dev.inmo.tgbotapi.types.ChatId +import dev.inmo.tgbotapi.types.chat.abstracts.Chat +import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate +import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdatesUtils.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdatesUtils.kt index 9ff4dc6b64..4d0963708f 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdatesUtils.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdatesUtils.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.extensions.utils.updates -import com.github.insanusmokrassar.TelegramBotAPI.types.MediaGroupIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.update.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.* +import dev.inmo.tgbotapi.types.MediaGroupIdentifier +import dev.inmo.tgbotapi.types.UpdateIdentifier +import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage +import dev.inmo.tgbotapi.types.update.* +import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.* +import dev.inmo.tgbotapi.types.update.abstracts.* /** * @return If [this] is [SentMediaGroupUpdate] - [Update.updateId] of [last] element, or its own [Update.updateId] diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt index 5d1e0c5769..03a16b401b 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt @@ -1,16 +1,16 @@ package dev.inmo.tgbotapi.extensions.utils.updates.retrieving -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.RequestException -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.convertWithMediaGroupUpdates -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.lastUpdateIdentifier -import com.github.insanusmokrassar.TelegramBotAPI.requests.GetUpdates -import com.github.insanusmokrassar.TelegramBotAPI.types.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.* -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update -import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.* +import dev.inmo.tgbotapi.bot.RequestsExecutor +import dev.inmo.tgbotapi.bot.exceptions.RequestException +import dev.inmo.tgbotapi.extensions.utils.updates.convertWithMediaGroupUpdates +import dev.inmo.tgbotapi.extensions.utils.updates.lastUpdateIdentifier +import dev.inmo.tgbotapi.requests.GetUpdates +import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.update.* +import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.* +import dev.inmo.tgbotapi.types.update.abstracts.Update +import dev.inmo.tgbotapi.updateshandlers.* +import dev.inmo.tgbotapi.utils.* import kotlinx.coroutines.* fun RequestsExecutor.startGettingOfUpdatesByLongPolling( diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/MediaGroupsIncluder.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/MediaGroupsIncluder.kt index b1d2a2f4bf..75ef278a8d 100644 --- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/MediaGroupsIncluder.kt +++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/MediaGroupsIncluder.kt @@ -1,11 +1,11 @@ package dev.inmo.tgbotapi.extensions.utils.updates.retrieving -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.convertWithMediaGroupUpdates -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseMessageUpdate -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update -import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.UpdateReceiver -import com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.accumulateByKey +import dev.inmo.tgbotapi.extensions.utils.updates.convertWithMediaGroupUpdates +import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage +import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate +import dev.inmo.tgbotapi.types.update.abstracts.Update +import dev.inmo.tgbotapi.updateshandlers.UpdateReceiver +import dev.inmo.tgbotapi.utils.extensions.accumulateByKey import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.launch @@ -13,7 +13,7 @@ import kotlinx.coroutines.launch /** * Create [UpdateReceiver] object which will correctly accumulate updates and send into output updates which INCLUDE - * [com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.MediaGroupUpdate]s. + * [dev.inmo.tgbotapi.types.update.MediaGroupUpdates.MediaGroupUpdate]s. * * @see UpdateReceiver */ @@ -51,7 +51,7 @@ fun CoroutineScope.updateHandlerWithMediaGroupsAdaptation( /** * Create [UpdateReceiver] object which will correctly accumulate updates and send into output updates which INCLUDE - * [com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.MediaGroupUpdate]s. + * [dev.inmo.tgbotapi.types.update.MediaGroupUpdates.MediaGroupUpdate]s. * * @see UpdateReceiver */ diff --git a/TelegramBotAPI-extensions-utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/Webhook.kt b/TelegramBotAPI-extensions-utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/Webhook.kt index f014d9ec6e..68594fca19 100644 --- a/TelegramBotAPI-extensions-utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/Webhook.kt +++ b/TelegramBotAPI-extensions-utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/Webhook.kt @@ -1,18 +1,18 @@ package dev.inmo.tgbotapi.extensions.utils.updates.retrieving -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.nonstrictJsonFormat -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.flowsUpdatesFilter -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.MultipartRequestImpl -import com.github.insanusmokrassar.TelegramBotAPI.requests.webhook.SetWebhook -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UpdateDeserializationStrategy -import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.* -import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.webhook.WebhookPrivateKeyConfig -import com.github.insanusmokrassar.TelegramBotAPI.utils.ExceptionHandler -import com.github.insanusmokrassar.TelegramBotAPI.utils.handleSafely +import dev.inmo.tgbotapi.bot.RequestsExecutor +import dev.inmo.tgbotapi.extensions.utils.nonstrictJsonFormat +import dev.inmo.tgbotapi.extensions.utils.updates.flowsUpdatesFilter +import dev.inmo.tgbotapi.requests.abstracts.MultipartFile +import dev.inmo.tgbotapi.requests.abstracts.Request +import dev.inmo.tgbotapi.requests.send.media.base.MultipartRequestImpl +import dev.inmo.tgbotapi.requests.webhook.SetWebhook +import dev.inmo.tgbotapi.types.update.abstracts.Update +import dev.inmo.tgbotapi.types.update.abstracts.UpdateDeserializationStrategy +import dev.inmo.tgbotapi.updateshandlers.* +import dev.inmo.tgbotapi.updateshandlers.webhook.WebhookPrivateKeyConfig +import dev.inmo.tgbotapi.utils.ExceptionHandler +import dev.inmo.tgbotapi.utils.handleSafely import io.ktor.application.call import io.ktor.request.receiveText import io.ktor.response.respond @@ -28,9 +28,9 @@ import java.util.concurrent.Executors * * @param [scope] Will be used for mapping of media groups * @param [exceptionsHandler] Pass this parameter to set custom exception handler for getting updates - * @param [block] Some receiver block like [com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter] + * @param [block] Some receiver block like [dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter] * - * @see com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter + * @see dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter * @see UpdatesFilter * @see UpdatesFilter.asUpdateReceiver */ @@ -74,7 +74,7 @@ fun Route.includeWebhookHandlingInRouteWithFlows( * @param scope Scope which will be used for * @param privateKeyConfig If configured - server will be created with [sslConnector]. [connector] will be used otherwise * - * @see com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter + * @see dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter * @see UpdatesFilter * @see UpdatesFilter.asUpdateReceiver */ @@ -145,7 +145,7 @@ private suspend fun RequestsExecutor.internalSetWebhookInfoAndStartListenWebhook * @param listenRoute address to listen by bot * @param scope Scope which will be used for * - * @see com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter + * @see dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter * @see UpdatesFilter * @see UpdatesFilter.asUpdateReceiver */ @@ -179,7 +179,7 @@ suspend fun RequestsExecutor.setWebhookInfoAndStartListenWebhooks( * @param listenRoute address to listen by bot * @param scope Scope which will be used for * - * @see com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter + * @see dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter * @see UpdatesFilter * @see UpdatesFilter.asUpdateReceiver */ diff --git a/TelegramBotAPI-extensions-utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/files/PathedFile.kt b/TelegramBotAPI-extensions-utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/files/PathedFile.kt index dde6ef995c..90be566896 100644 --- a/TelegramBotAPI-extensions-utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/files/PathedFile.kt +++ b/TelegramBotAPI-extensions-utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/files/PathedFile.kt @@ -1,7 +1,7 @@ package dev.inmo.tgbotapi.types.files -import com.github.insanusmokrassar.TelegramBotAPI.types.files.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper +import dev.inmo.tgbotapi.types.files.* +import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper import java.io.File import java.io.FileOutputStream import java.io.InputStream