diff --git a/CHANGELOG.md b/CHANGELOG.md index 060c8ae8f6..084f9d3807 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ * `File#toInputFile` extension now will throw error when file does not exists * `InlineKeyboardMarkup` will check that `PayInlineKeyboardButton` is the first in case if it is exists in `keyboard` + * `makeLinkToMessage` now is not `PreviewFeature` + * All deprecations was removed ## 0.24.0 diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/UpdatesPoller.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/UpdatesPoller.kt deleted file mode 100644 index f2fb0a61ec..0000000000 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/UpdatesPoller.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.bot - -import io.ktor.utils.io.core.Closeable -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers - -@Deprecated("Deprecated due to more simple way to get updates using TelegramBotAPI-extensions-api") -interface UpdatesPoller : Closeable { - fun start(scope: CoroutineScope = CoroutineScope(Dispatchers.Default)) -} \ No newline at end of file diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChat.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChat.kt index cd257a99f8..d32ecb534b 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChat.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChat.kt @@ -21,13 +21,3 @@ data class GetChat( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getChat( - chatId: ChatIdentifier -) = execute(GetChat(chatId)) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getChat( - chat: Chat -) = getChat(chat.id) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatAdministrators.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatAdministrators.kt index a2ae400d83..434a05f450 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatAdministrators.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatAdministrators.kt @@ -26,13 +26,3 @@ data class GetChatAdministrators( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getChatAdministrators( - chatId: ChatIdentifier -) = execute(GetChatAdministrators(chatId)) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getChatAdministrators( - chat: PublicChat -) = getChatAdministrators(chat.id) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatMembersCount.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatMembersCount.kt index 85b24b0cc0..112ba193e7 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatMembersCount.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatMembersCount.kt @@ -20,13 +20,3 @@ data class GetChatMembersCount( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getChatMembersCount( - chatId: ChatIdentifier -) = execute(GetChatMembersCount(chatId)) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getChatMembersCount( - chat: PublicChat -) = getChatMembersCount(chat.id) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/GetChatMember.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/GetChatMember.kt index cb75a0da7a..deb26c79b1 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/GetChatMember.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/GetChatMember.kt @@ -21,27 +21,3 @@ data class GetChatMember( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getChatMember( - chatId: ChatIdentifier, - userId: UserId -) = execute(GetChatMember(chatId, userId)) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getChatMember( - chat: PublicChat, - userId: UserId -) = getChatMember(chat.id, userId) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getChatMember( - chatId: ChatId, - user: User -) = getChatMember(chatId, user.id) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getChatMember( - chat: PublicChat, - user: User -) = getChatMember(chat.id, user.id) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/RestrictChatMember.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/RestrictChatMember.kt index d7cc099c8b..93b802d2a2 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/RestrictChatMember.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/RestrictChatMember.kt @@ -26,36 +26,3 @@ data class RestrictChatMember( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.restrictChatMember( - chatId: ChatIdentifier, - userId: UserId, - untilDate: TelegramDate? = null, - permissions: ChatPermissions = ChatPermissions() -) = execute(RestrictChatMember(chatId, userId, untilDate, permissions)) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.restrictChatMember( - chat: PublicChat, - userId: UserId, - untilDate: TelegramDate? = null, - permissions: ChatPermissions = ChatPermissions() -) = restrictChatMember(chat.id, userId, untilDate, permissions) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.restrictChatMember( - chatId: ChatId, - user: User, - untilDate: TelegramDate? = null, - permissions: ChatPermissions = ChatPermissions() -) = restrictChatMember(chatId, user.id, untilDate, permissions) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.restrictChatMember( - chat: PublicChat, - user: User, - untilDate: TelegramDate? = null, - permissions: ChatPermissions = ChatPermissions() -) = restrictChatMember(chat.id, user.id, untilDate, permissions) - diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/SetChatAdministratorCustomTitle.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/SetChatAdministratorCustomTitle.kt index c97035fb38..95a490fa92 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/SetChatAdministratorCustomTitle.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/SetChatAdministratorCustomTitle.kt @@ -33,31 +33,3 @@ data class SetChatAdministratorCustomTitle( } } } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.setChatAdministratorCustomTitle( - chatId: ChatId, - userId: UserId, - customTitle: String -) = execute(SetChatAdministratorCustomTitle(chatId, userId, customTitle)) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.setChatAdministratorCustomTitle( - chat: PublicChat, - userId: UserId, - customTitle: String -) = setChatAdministratorCustomTitle(chat.id, userId, customTitle) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.setChatAdministratorCustomTitle( - chatId: ChatId, - user: User, - customTitle: String -) = setChatAdministratorCustomTitle(chatId, user.id, customTitle) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.setChatAdministratorCustomTitle( - chat: PublicChat, - user: User, - customTitle: String -) = setChatAdministratorCustomTitle(chat.id, user.id, customTitle) \ No newline at end of file diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatDescription.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatDescription.kt index 3dc2e89011..fa3f8f91da 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatDescription.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatDescription.kt @@ -27,15 +27,3 @@ data class SetChatDescription ( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.setChatDescription( - chatId: ChatIdentifier, - description: String -) = execute(SetChatDescription(chatId, description)) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.setChatDescription( - chat: PublicChat, - description: String -) = setChatDescription(chat.id, description) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPermissions.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPermissions.kt index 96b5d3b5a5..4d022d4163 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPermissions.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPermissions.kt @@ -22,15 +22,3 @@ data class SetChatPermissions ( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.setDefaultChatMembersPermissions( - chatId: ChatIdentifier, - permissions: ChatPermissions -) = execute(SetChatPermissions(chatId, permissions)) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.setDefaultChatMembersPermissions( - chat: PublicChat, - permissions: ChatPermissions -) = setDefaultChatMembersPermissions(chat.id, permissions) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPhoto.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPhoto.kt index 52a623ca5e..7b63260702 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPhoto.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPhoto.kt @@ -23,15 +23,3 @@ data class SetChatPhoto ( override val mediaMap: Map = mapOf(photoField to photo) override val paramsJson: JsonObject = toJson(serializer()) } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.setChatPhoto( - chatId: ChatIdentifier, - photo: MultipartFile -) = execute(SetChatPhoto(chatId, photo)) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.setChatPhoto( - chat: PublicChat, - photo: MultipartFile -) = setChatPhoto(chat.id, photo) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditChatMessageCaption.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditChatMessageCaption.kt index e818a68484..5f2523d5fb 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditChatMessageCaption.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditChatMessageCaption.kt @@ -35,33 +35,3 @@ data class EditChatMessageCaption( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.editMessageCaption( - chatId: ChatIdentifier, - messageId: MessageIdentifier, - text: String, - parseMode: ParseMode? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = execute( - EditChatMessageCaption(chatId, messageId, text, parseMode, replyMarkup) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.editMessageCaption( - chat: Chat, - messageId: MessageIdentifier, - text: String, - parseMode: ParseMode? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = editMessageCaption(chat.id, messageId, text, parseMode, replyMarkup) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.editMessageCaption( - message: ContentMessage, - text: String, - parseMode: ParseMode? = null, - replyMarkup: InlineKeyboardMarkup? = null -): ContentMessage where T : CaptionedInput, T : MediaContent { - return editMessageCaption(message.chat.id, message.messageId, text, parseMode, replyMarkup) -} diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditInlineMessageCaption.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditInlineMessageCaption.kt index 59688e9763..a75463e1e6 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditInlineMessageCaption.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditInlineMessageCaption.kt @@ -23,11 +23,3 @@ data class EditInlineMessageCaption( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.editMessageCaption( - inlineMessageId: InlineMessageIdentifier, - text: String, - parseMode: ParseMode? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = execute(EditInlineMessageCaption(inlineMessageId, text, parseMode, replyMarkup)) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditChatMessageMedia.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditChatMessageMedia.kt index ef7b97dede..88deaf9e90 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditChatMessageMedia.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditChatMessageMedia.kt @@ -40,28 +40,3 @@ data class EditChatMessageMedia( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.editMessageMedia( - chatId: ChatIdentifier, - messageId: MessageIdentifier, - media: InputMedia, - replyMarkup: InlineKeyboardMarkup? = null -) = execute( - EditChatMessageMedia(chatId, messageId, media, replyMarkup) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.editMessageMedia( - chat: Chat, - messageId: MessageIdentifier, - media: InputMedia, - replyMarkup: InlineKeyboardMarkup? = null -) = editMessageMedia(chat.id, messageId, media, replyMarkup) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.editMessageMedia( - message: ContentMessage, - media: InputMedia, - replyMarkup: InlineKeyboardMarkup? = null -) = editMessageMedia(message.chat.id, message.messageId, media, replyMarkup) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditInlineMessageMedia.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditInlineMessageMedia.kt index 5d90e71ecb..009a418861 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditInlineMessageMedia.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditInlineMessageMedia.kt @@ -28,10 +28,3 @@ data class EditInlineMessageMedia( override fun method(): String = editMessageMediaMethod } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.editMessageCaption( - inlineMessageId: InlineMessageIdentifier, - media: InputMedia, - replyMarkup: InlineKeyboardMarkup? = null -) = execute(EditInlineMessageMedia(inlineMessageId, media, replyMarkup)) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditChatMessageText.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditChatMessageText.kt index 416e75742b..1298dd39bf 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditChatMessageText.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditChatMessageText.kt @@ -36,34 +36,3 @@ data class EditChatMessageText( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.editMessageText( - chatId: ChatIdentifier, - messageId: MessageIdentifier, - text: String, - parseMode: ParseMode? = null, - disableWebPagePreview: Boolean? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = execute( - EditChatMessageText(chatId, messageId, text, parseMode, disableWebPagePreview, replyMarkup) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.editMessageText( - chat: Chat, - messageId: MessageIdentifier, - text: String, - parseMode: ParseMode? = null, - disableWebPagePreview: Boolean? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = editMessageText(chat.id, messageId, text, parseMode, disableWebPagePreview, replyMarkup) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.editMessageText( - message: ContentMessage, - text: String, - parseMode: ParseMode? = null, - disableWebPagePreview: Boolean? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = editMessageText(message.chat.id, message.messageId, text, parseMode, disableWebPagePreview, replyMarkup) \ No newline at end of file diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetFile.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetFile.kt index 74c689a05c..8af8be3e07 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetFile.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetFile.kt @@ -19,15 +19,3 @@ data class GetFile( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getFileAdditionalInfo( - fileId: FileId -) = execute( - GetFile(fileId) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getFileAdditionalInfo( - file: TelegramMediaFile -) = getFileAdditionalInfo(file.fileId) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetStickerSet.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetStickerSet.kt index ccc410e957..8469808cd9 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetStickerSet.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetStickerSet.kt @@ -18,17 +18,3 @@ data class GetStickerSet( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getStickerSet( - name: String -) = execute( - GetStickerSet(name) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getStickerSet( - sticker: Sticker -) = getStickerSet( - sticker.stickerSetName ?: error("Sticker must contains stickerSetName to be correctly used in getStickerSet method") -) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetUserProfilePhotos.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetUserProfilePhotos.kt index 84b12ec02c..ec12767fae 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetUserProfilePhotos.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetUserProfilePhotos.kt @@ -29,21 +29,3 @@ data class GetUserProfilePhotos( override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getUserProfilePhotos( - userId: UserId, - offset: Int? = null, - limit: Int? = null -) = execute( - GetUserProfilePhotos( - userId, offset, limit - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getUserProfilePhotos( - user: CommonUser, - offset: Int? = null, - limit: Int? = null -) = getUserProfilePhotos(user.id, offset, limit) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendVenue.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendVenue.kt index 0bb20b9c4d..4a7df3a869 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendVenue.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendVenue.kt @@ -75,59 +75,3 @@ fun Venue.toRequest( replyToMessageId, replyMarkup ) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVenue( - chatId: ChatIdentifier, - latitude: Double, - longitude: Double, - title: String, - address: String, - foursquareId: String? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendVenue( - chatId, latitude, longitude, title, address, foursquareId, disableNotification, replyToMessageId, replyMarkup - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVenue( - chat: Chat, - latitude: Double, - longitude: Double, - title: String, - address: String, - foursquareId: String? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendVenue( - chat.id, latitude, longitude, title, address, foursquareId, disableNotification, replyToMessageId, replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVenue( - chatId: ChatIdentifier, - venue: Venue, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendVenue( - chatId, venue, disableNotification, replyToMessageId, replyMarkup - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVenue( - chat: Chat, - venue: Venue, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendVenue( - chat.id, venue, disableNotification, replyToMessageId, replyMarkup -) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAnimation.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAnimation.kt index 08140cec76..4d90d13f52 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAnimation.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAnimation.kt @@ -115,144 +115,3 @@ data class SendAnimationFiles internal constructor( animationField to animation, thumbField to thumb ) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendAnimation( - chatId: ChatIdentifier, - animation: FileId, - thumb: FileId? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - width: Int? = null, - height: Int? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendAnimationData( - chatId, - animation.fileId, - thumb ?.fileId, - text, - parseMode, - duration, - width, - height, - disableNotification, - replyToMessageId, - replyMarkup - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendAnimation( - chatId: ChatIdentifier, - animation: AnimationFile, - thumb: PhotoSize? = animation.thumb, - text: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendAnimation( - chatId, animation.fileId, thumb ?.fileId, text, parseMode, animation.duration, animation.width, animation.height, disableNotification, replyToMessageId, replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendAnimation( - chatId: ChatIdentifier, - animation: MultipartFile, - thumb: FileId? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - width: Int? = null, - height: Int? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - MultipartRequestImpl( - SendAnimationData( - chatId, null, thumb ?.fileId, text, parseMode, duration, width, height, disableNotification, replyToMessageId, replyMarkup - ), - SendAnimationFiles(animation) - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendAnimation( - chatId: ChatIdentifier, - animation: MultipartFile, - thumb: MultipartFile? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - width: Int? = null, - height: Int? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - MultipartRequestImpl( - SendAnimationData( - chatId, null, null, text, parseMode, duration, width, height, disableNotification, replyToMessageId, replyMarkup - ), - SendAnimationFiles(animation, thumb) - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendAnimation( - chatId: ChatIdentifier, - animation: FileId, - thumb: MultipartFile, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - width: Int? = null, - height: Int? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - MultipartRequestImpl( - SendAnimationData( - chatId, animation.fileId, null, text, parseMode, duration, width, height, disableNotification, replyToMessageId, replyMarkup - ), - SendAnimationFiles(null, thumb) - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendAnimation( - chatId: ChatIdentifier, - animation: MultipartFile, - thumb: PhotoSize? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - width: Int? = null, - height: Int? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendAnimation( - chatId, animation, thumb ?.fileId , text, parseMode, duration, width, height, disableNotification, replyToMessageId, replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendAnimation( - chatId: ChatIdentifier, - animation: AnimationFile, - thumb: MultipartFile, - text: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendAnimation( - chatId, animation.fileId, thumb, text, parseMode, animation.duration, animation.width, animation.height, disableNotification, replyToMessageId, replyMarkup -) - diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendMediaGroup.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendMediaGroup.kt index f2e2f1b3b5..ab3162ce58 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendMediaGroup.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendMediaGroup.kt @@ -87,25 +87,3 @@ data class SendMediaGroupData internal constructor( data class SendMediaGroupFiles internal constructor( val files: List ) : Files by (files.map { it.fileId to it }.toMap()) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendMediaGroup( - chatId: ChatIdentifier, - media: List, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null -) = execute( - SendMediaGroup( - chatId, media, disableNotification, replyToMessageId - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendMediaGroup( - chat: Chat, - media: List, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null -) = sendMediaGroup( - chat.id, media, disableNotification, replyToMessageId -) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendPhoto.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendPhoto.kt index 289985641c..28b89345b6 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendPhoto.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendPhoto.kt @@ -85,95 +85,3 @@ data class SendPhotoFiles internal constructor( ) : Files by mapOf( photoField to photo ) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendPhoto( - chatId: ChatIdentifier, - fileId: FileId, - caption: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendPhotoData( - chatId, - fileId.fileId, - caption, - parseMode, - disableNotification, - replyToMessageId, - replyMarkup - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendPhoto( - chatId: ChatIdentifier, - file: PhotoSize, - caption: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendPhoto( - chatId, file.fileId, caption, parseMode, disableNotification, replyToMessageId, replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendPhoto( - chatId: ChatIdentifier, - photo: Photo, - caption: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendPhoto( - chatId, photo.biggest() ?: throw IllegalArgumentException("Photo $photo is empty"), caption, parseMode, disableNotification, replyToMessageId, replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendPhoto( - chat: Chat, - fileId: FileId, - caption: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendPhoto( - chat.id, - fileId, - caption, - parseMode, - disableNotification, - replyToMessageId, - replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendPhoto( - chat: Chat, - file: PhotoSize, - caption: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendPhoto( - chat.id, file.fileId, caption, parseMode, disableNotification, replyToMessageId, replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendPhoto( - chat: Chat, - photo: Photo, - caption: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendPhoto( - chat.id, photo.biggest() ?: throw IllegalArgumentException("Photo $photo is empty"), caption, parseMode, disableNotification, replyToMessageId, replyMarkup -) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendSticker.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendSticker.kt index 3fbfd21974..b6db8ee837 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendSticker.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendSticker.kt @@ -65,68 +65,3 @@ data class SendStickerByFile internal constructor( override val mediaMap: Map = mapOf(stickerField to sticker) override val paramsJson: JsonObject = sendStickerByFileId.toJsonWithoutNulls(SendStickerByFileId.serializer()) } - - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendSticker( - chatId: ChatIdentifier, - sticker: FileId, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendStickerByFileId(chatId, sticker, disableNotification, replyToMessageId, replyMarkup) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendSticker( - chatId: ChatIdentifier, - sticker: MultipartFile, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendStickerByFile( - SendStickerByFileId(chatId, null, disableNotification, replyToMessageId, replyMarkup), - sticker - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendSticker( - chat: Chat, - sticker: FileId, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendSticker(chat.id, sticker, disableNotification, replyToMessageId, replyMarkup) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendSticker( - chat: Chat, - sticker: MultipartFile, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendSticker(chat.id, sticker, disableNotification, replyToMessageId, replyMarkup) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendSticker( - chatId: ChatIdentifier, - sticker: Sticker, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendSticker( - chatId, sticker.fileId, disableNotification, replyToMessageId, replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendSticker( - chat: Chat, - sticker: Sticker, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendSticker(chat.id, sticker.fileId, disableNotification, replyToMessageId, replyMarkup) - diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideo.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideo.kt index 0ff86d9ab0..c4b08c8bde 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideo.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideo.kt @@ -119,148 +119,3 @@ data class SendVideoFiles internal constructor( videoField to video, thumbField to thumb ) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVideo( - chatId: ChatIdentifier, - video: FileId, - thumb: FileId? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - width: Int? = null, - height: Int? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendVideoData( - chatId, - video.fileId, - thumb ?.fileId, - text, - parseMode, - duration, - width, - height, - null, - disableNotification, - replyToMessageId, - replyMarkup - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVideo( - chatId: ChatIdentifier, - video: VideoFile, - thumb: PhotoSize? = video.thumb, - text: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendVideo( - chatId, video.fileId, thumb ?.fileId, text, parseMode, video.duration, video.width, video.height, disableNotification, replyToMessageId, replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVideo( - chatId: ChatIdentifier, - video: MultipartFile, - thumb: FileId? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - width: Int? = null, - height: Int? = null, - supportStreaming: Boolean? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - MultipartRequestImpl( - SendVideoData( - chatId, null, thumb ?.fileId, text, parseMode, duration, width, height, supportStreaming, disableNotification, replyToMessageId, replyMarkup - ), - SendVideoFiles(video) - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVideo( - chatId: ChatIdentifier, - video: MultipartFile, - thumb: MultipartFile? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - width: Int? = null, - height: Int? = null, - supportStreaming: Boolean? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - MultipartRequestImpl( - SendVideoData( - chatId, null, null, text, parseMode, duration, width, height, supportStreaming, disableNotification, replyToMessageId, replyMarkup - ), - SendVideoFiles(video, thumb) - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVideo( - chatId: ChatIdentifier, - video: FileId, - thumb: MultipartFile, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - width: Int? = null, - height: Int? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - MultipartRequestImpl( - SendVideoData( - chatId, video.fileId, null, text, parseMode, duration, width, height, null, disableNotification, replyToMessageId, replyMarkup - ), - SendVideoFiles(null, thumb) - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVideo( - chatId: ChatIdentifier, - video: MultipartFile, - thumb: PhotoSize? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - width: Int? = null, - height: Int? = null, - supportStreaming: Boolean? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendVideo( - chatId, video, thumb ?.fileId , text, parseMode, duration, width, height, supportStreaming, disableNotification, replyToMessageId, replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVideo( - chatId: ChatIdentifier, - video: VideoFile, - thumb: MultipartFile, - text: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendVideo( - chatId, video.fileId, thumb, text, parseMode, video.duration, video.width, video.height, disableNotification, replyToMessageId, replyMarkup -) - diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVoice.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVoice.kt index 46b6e3c499..90e14a0c47 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVoice.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVoice.kt @@ -106,132 +106,3 @@ data class SendVoiceFiles internal constructor( voiceField to voice, thumbField to thumb ) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVoice( - chatId: ChatIdentifier, - voice: FileId, - thumb: FileId? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendVoiceData( - chatId, - voice.fileId, - thumb ?.fileId, - text, - parseMode, - duration, - disableNotification, - replyToMessageId, - replyMarkup - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVoice( - chatId: ChatIdentifier, - voice: AudioFile, - thumb: PhotoSize? = voice.thumb, - text: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendVoice( - chatId, voice.fileId, thumb ?.fileId, text, parseMode, voice.duration, disableNotification, replyToMessageId, replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVoice( - chatId: ChatIdentifier, - voice: MultipartFile, - thumb: FileId? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - MultipartRequestImpl( - SendVoiceData( - chatId, null, thumb ?.fileId, text, parseMode, duration, disableNotification, replyToMessageId, replyMarkup - ), - SendVoiceFiles(voice) - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVoice( - chatId: ChatIdentifier, - voice: MultipartFile, - thumb: MultipartFile? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - MultipartRequestImpl( - SendVoiceData( - chatId, null, null, text, parseMode, duration, disableNotification, replyToMessageId, replyMarkup - ), - SendVoiceFiles(voice, thumb) - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVoice( - chatId: ChatIdentifier, - voice: FileId, - thumb: MultipartFile, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - MultipartRequestImpl( - SendVoiceData( - chatId, voice.fileId, null, text, parseMode, duration, disableNotification, replyToMessageId, replyMarkup - ), - SendVoiceFiles(null, thumb) - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVoice( - chatId: ChatIdentifier, - voice: MultipartFile, - thumb: PhotoSize? = null, - text: String? = null, - parseMode: ParseMode? = null, - duration: Long? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendVoice( - chatId, voice, thumb ?.fileId , text, parseMode, duration, disableNotification, replyToMessageId, replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendVoice( - chatId: ChatIdentifier, - voice: AudioFile, - thumb: MultipartFile, - text: String? = null, - parseMode: ParseMode? = null, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendVoice( - chatId, voice.fileId, thumb, text, parseMode, voice.duration, disableNotification, replyToMessageId, replyMarkup -) - diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/payments/SendInvoice.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/payments/SendInvoice.kt index 74579a267c..9e1b06cacf 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/payments/SendInvoice.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/payments/SendInvoice.kt @@ -106,51 +106,3 @@ data class SendInvoice( photoHeight = null } } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendInvoice( - chatId: ChatId, - title: String, - description: String, - payload: String, - providerToken: String, - startParameter: StartParameter, - currency: Currency, - prices: List, - providerData: String? = null, - requireName: Boolean = false, - requirePhoneNumber: Boolean = false, - requireEmail: Boolean = false, - requireShippingAddress: Boolean = false, - shouldSendPhoneNumberToProvider: Boolean = false, - shouldSendEmailToProvider: Boolean = false, - priceDependOnShipAddress: Boolean = false, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = execute( - SendInvoice(chatId, title, description, payload, providerToken, startParameter, currency, prices, providerData, requireName, requirePhoneNumber, requireEmail, requireShippingAddress, shouldSendPhoneNumberToProvider, shouldSendEmailToProvider, priceDependOnShipAddress, disableNotification, replyToMessageId, replyMarkup) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendInvoice( - user: CommonUser, - title: String, - description: String, - payload: String, - providerToken: String, - startParameter: StartParameter, - currency: Currency, - prices: List, - providerData: String? = null, - requireName: Boolean = false, - requirePhoneNumber: Boolean = false, - requireEmail: Boolean = false, - requireShippingAddress: Boolean = false, - shouldSendPhoneNumberToProvider: Boolean = false, - shouldSendEmailToProvider: Boolean = false, - priceDependOnShipAddress: Boolean = false, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: InlineKeyboardMarkup? = null -) = sendInvoice(user.id, title, description, payload, providerToken, startParameter, currency, prices, providerData, requireName, requirePhoneNumber, requireEmail, requireShippingAddress, shouldSendPhoneNumberToProvider, shouldSendEmailToProvider, priceDependOnShipAddress, disableNotification, replyToMessageId, replyMarkup) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/polls/SendPoll.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/polls/SendPoll.kt index 1298576c65..28cd72abdf 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/polls/SendPoll.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/polls/SendPoll.kt @@ -185,136 +185,3 @@ data class SendQuizPoll( } } } - - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendRegularPoll( - chatId: ChatIdentifier, - question: String, - options: List, - isAnonymous: Boolean = true, - isClosed: Boolean = false, - allowMultipleAnswers: Boolean = false, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendRegularPoll( - chatId, question, options, isAnonymous, isClosed, allowMultipleAnswers, disableNotification, replyToMessageId, replyMarkup - ) -) -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendRegularPoll( - chatId: ChatIdentifier, - poll: RegularPoll, - isClosed: Boolean = false, - question: String = poll.question, - options: List = poll.options.map { it.text }, - isAnonymous: Boolean = poll.isAnonymous, - allowMultipleAnswers: Boolean = poll.allowMultipleAnswers, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendRegularPoll( - chatId, question, options, isAnonymous, isClosed, allowMultipleAnswers, disableNotification, replyToMessageId, replyMarkup - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendRegularPoll( - chat: Chat, - question: String, - options: List, - isAnonymous: Boolean = true, - isClosed: Boolean = false, - allowMultipleAnswers: Boolean = false, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendRegularPoll( - chat.id, question, options, isAnonymous, isClosed, allowMultipleAnswers, disableNotification, replyToMessageId, replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendRegularPoll( - chat: Chat, - poll: RegularPoll, - isClosed: Boolean = false, - question: String = poll.question, - options: List = poll.options.map { it.text }, - isAnonymous: Boolean = poll.isAnonymous, - allowMultipleAnswers: Boolean = poll.allowMultipleAnswers, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendRegularPoll( - chat.id, question, options, isAnonymous, isClosed, allowMultipleAnswers, disableNotification, replyToMessageId, replyMarkup -) - - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendQuizPoll( - chatId: ChatIdentifier, - question: String, - options: List, - correctOptionId: Int, - isAnonymous: Boolean = true, - isClosed: Boolean = false, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendQuizPoll( - chatId, question, options, correctOptionId, isAnonymous, isClosed, disableNotification, replyToMessageId, replyMarkup - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendQuizPoll( - chat: Chat, - question: String, - options: List, - correctOptionId: Int, - isAnonymous: Boolean = true, - isClosed: Boolean = false, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendQuizPoll( - chat.id, question, options, correctOptionId, isAnonymous, isClosed, disableNotification, replyToMessageId, replyMarkup -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendQuizPoll( - chatId: ChatIdentifier, - isClosed: Boolean = false, - quizPoll: QuizPoll, - question: String = quizPoll.question, - options: List = quizPoll.options.map { it.text }, - correctOptionId: Int = quizPoll.correctOptionId ?: error("Correct option ID must be provided by income QuizPoll or by developer"), - isAnonymous: Boolean = quizPoll.isAnonymous, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = execute( - SendQuizPoll( - chatId, question, options, correctOptionId, isAnonymous, isClosed, disableNotification, replyToMessageId, replyMarkup - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.sendQuizPoll( - chat: Chat, - isClosed: Boolean = false, - quizPoll: QuizPoll, - question: String = quizPoll.question, - options: List = quizPoll.options.map { it.text }, - correctOptionId: Int = quizPoll.correctOptionId ?: error("Correct option ID must be provided by income QuizPoll or by developer"), - isAnonymous: Boolean = quizPoll.isAnonymous, - disableNotification: Boolean = false, - replyToMessageId: MessageIdentifier? = null, - replyMarkup: KeyboardMarkup? = null -) = sendQuizPoll( - chat.id, question, options, correctOptionId, isAnonymous, isClosed, disableNotification, replyToMessageId, replyMarkup -) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddStickerToSet.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddStickerToSet.kt index 4069488cc5..46a34dcbad 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddStickerToSet.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddStickerToSet.kt @@ -50,98 +50,3 @@ data class AddStickerToSet internal constructor( override fun method(): String = "addStickerToSet" } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.addStickerToSet( - userId: UserId, - stickerSetName: String, - sticker: FileId, - emojis: String, - maskPosition: MaskPosition? = null -) = execute( - AddStickerToSet( - userId, stickerSetName, emojis, sticker, maskPosition - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.addStickerToSet( - userId: UserId, - stickerSetName: String, - sticker: MultipartFile, - emojis: String, - maskPosition: MaskPosition? = null -) = execute( - CommonMultipartFileRequest( - AddStickerToSet( - userId, stickerSetName, emojis, null, maskPosition - ), - mapOf(pngStickerField to sticker) - ) -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.addStickerToSet( - user: CommonUser, - stickerSetName: String, - sticker: FileId, - emojis: String, - maskPosition: MaskPosition? = null -) = addStickerToSet( - user.id, stickerSetName, sticker, emojis, maskPosition -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.addStickerToSet( - user: CommonUser, - stickerSetName: String, - sticker: MultipartFile, - emojis: String, - maskPosition: MaskPosition? = null -) = addStickerToSet( - user.id, stickerSetName, sticker, emojis, maskPosition -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.addStickerToSet( - userId: UserId, - stickerSet: StickerSet, - sticker: FileId, - emojis: String, - maskPosition: MaskPosition? = null -) = addStickerToSet( - userId, stickerSet.name, sticker, emojis, maskPosition -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.addStickerToSet( - userId: UserId, - stickerSet: StickerSet, - sticker: MultipartFile, - emojis: String, - maskPosition: MaskPosition? = null -) = addStickerToSet( - userId, stickerSet.name, sticker, emojis, maskPosition -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.addStickerToSet( - user: CommonUser, - stickerSet: StickerSet, - sticker: FileId, - emojis: String, - maskPosition: MaskPosition? = null -) = addStickerToSet( - user.id, stickerSet.name, sticker, emojis, maskPosition -) - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.addStickerToSet( - user: CommonUser, - stickerSet: StickerSet, - sticker: MultipartFile, - emojis: String, - maskPosition: MaskPosition? = null -) = addStickerToSet( - user.id, stickerSet.name, sticker, emojis, maskPosition -) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/GetWebhookInfo.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/GetWebhookInfo.kt index 1d3332f4a6..218f59a08c 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/GetWebhookInfo.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/GetWebhookInfo.kt @@ -14,6 +14,3 @@ class GetWebhookInfo : SimpleRequest { override val requestSerializer: SerializationStrategy<*> get() = serializer() } - -@Deprecated("Deprecated due to extracting into separated library") -suspend fun RequestsExecutor.getWebhookInfo() = execute(GetWebhookInfo()) diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/ChatMember.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/ChatMember.kt index 7a00b7b6ed..93c60cbf9b 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/ChatMember.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/abstracts/ChatMember.kt @@ -3,7 +3,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.RawChatMember import com.github.insanusmokrassar.TelegramBotAPI.types.User import kotlinx.serialization.* -import kotlinx.serialization.internal.StringDescriptor interface ChatMember { val user: User diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt index a030020254..91a03bb442 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt @@ -3,7 +3,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQue import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.* import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult import kotlinx.serialization.* -import kotlinx.serialization.internal.StringDescriptor @Serializer(InlineQueryResult::class) internal object InlineQueryResultSerializer : KSerializer { diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContentSerializer.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContentSerializer.kt index d1d6adfc67..eefeae7248 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContentSerializer.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InputMessageContentSerializer.kt @@ -3,7 +3,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InputMessageContent.* import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent import kotlinx.serialization.* -import kotlinx.serialization.internal.StringDescriptor @Serializer(InputMessageContent::class) internal object InputMessageContentSerializer : KSerializer { diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaSerializer.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaSerializer.kt index 078fc8448a..9da0db77fe 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaSerializer.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaSerializer.kt @@ -1,7 +1,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia import kotlinx.serialization.* -import kotlinx.serialization.internal.StringDescriptor @Serializer(InputMedia::class) internal object InputMediaSerializer : KSerializer { diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt index 5f097f33fd..2f57259689 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt @@ -1,7 +1,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia import kotlinx.serialization.* -import kotlinx.serialization.internal.StringDescriptor @Serializer(MediaGroupMemberInputMedia::class) internal object MediaGroupMemberInputMediaSerializer : KSerializer { diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt index 9d5a7c94c0..59a168aaf5 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt @@ -3,7 +3,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardB import com.github.insanusmokrassar.TelegramBotAPI.types.* import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat import kotlinx.serialization.* -import kotlinx.serialization.internal.StringDescriptor import kotlinx.serialization.json.* internal object InlineKeyboardButtonSerializer : KSerializer { diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ForwardInfo.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ForwardInfo.kt index 4ca379de2e..f6fff2681d 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ForwardInfo.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ForwardInfo.kt @@ -2,54 +2,21 @@ package com.github.insanusmokrassar.TelegramBotAPI.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.Chat -@Deprecated( - "Renamed", - ReplaceWith( - "ForwardInfo", - "com.github.insanusmokrassar.TelegramBotAPI.types.message.ForwardInfo" - ) -) -typealias ForwardedMessage = ForwardInfo sealed class ForwardInfo { abstract val dateOfOriginal: TelegramDate } -@Deprecated( - "Renamed", - ReplaceWith( - "AnonymousForwardInfo", - "com.github.insanusmokrassar.TelegramBotAPI.types.message.AnonymousForwardInfo" - ) -) -typealias AnonymousForwardedMessage = AnonymousForwardInfo data class AnonymousForwardInfo( override val dateOfOriginal: TelegramDate, val senderName: String ) : ForwardInfo() -@Deprecated( - "Renamed", - ReplaceWith( - "UserForwardInfo", - "com.github.insanusmokrassar.TelegramBotAPI.types.message.UserForwardInfo" - ) -) -typealias UserForwardedMessage = UserForwardInfo data class UserForwardInfo( override val dateOfOriginal: TelegramDate, val from: User ) : ForwardInfo() -@Deprecated( - "Renamed", - ReplaceWith( - "ForwardFromChannelInfo", - "com.github.insanusmokrassar.TelegramBotAPI.types.message.ForwardFromChannelInfo" - ) -) -typealias ForwardedFromChannelMessage = ForwardFromChannelInfo data class ForwardFromChannelInfo( override val dateOfOriginal: TelegramDate, val messageId: MessageIdentifier, diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyForwardedMessage.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyForwardedMessage.kt index 01e2b58768..225de5af71 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyForwardedMessage.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/PossiblyForwardedMessage.kt @@ -4,10 +4,4 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.message.ForwardInfo interface PossiblyForwardedMessage : Message { val forwardInfo: ForwardInfo? - @Deprecated( - "Renamed", - ReplaceWith("forwardInfo") - ) - val forwarded: ForwardInfo? - get() = forwardInfo } \ No newline at end of file diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/KtorUpdatesPoller.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/KtorUpdatesPoller.kt deleted file mode 100644 index 81f393e2d5..0000000000 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/KtorUpdatesPoller.kt +++ /dev/null @@ -1,144 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.updateshandlers - -import com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorRequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.bot.UpdatesPoller -import com.github.insanusmokrassar.TelegramBotAPI.requests.GetUpdates -import com.github.insanusmokrassar.TelegramBotAPI.requests.webhook.DeleteWebhook -import com.github.insanusmokrassar.TelegramBotAPI.types.ALL_UPDATES_LIST -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 -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update -import com.github.insanusmokrassar.TelegramBotAPI.utils.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.executeUnsafe -import io.ktor.client.HttpClient -import io.ktor.client.engine.HttpClientEngine -import kotlinx.coroutines.* -import kotlinx.coroutines.channels.Channel - -@Deprecated("Deprecated due to more simple way to get updates using TelegramBotAPI-extensions-api") -fun KtorUpdatesPoller( - telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper, - engine: HttpClientEngine, - timeoutSeconds: Int? = null, - oneTimeUpdatesLimit: Int? = null, - allowedUpdates: List = ALL_UPDATES_LIST, - exceptionsHandler: (Exception) -> Boolean = { true }, - updatesReceiver: UpdateReceiver -): KtorUpdatesPoller { - val executor = KtorRequestsExecutor( - telegramAPIUrlsKeeper, - HttpClient(engine) - ) - - return KtorUpdatesPoller( - executor, - timeoutSeconds, - oneTimeUpdatesLimit, - allowedUpdates, - exceptionsHandler, - updatesReceiver - ) -} - -@Deprecated("Deprecated due to more simple way to get updates using TelegramBotAPI-extensions-api") -class KtorUpdatesPoller( - private val executor: RequestsExecutor, - private val timeoutSeconds: Int? = null, - private val oneTimeUpdatesLimit: Int? = null, - private val allowedUpdates: List = ALL_UPDATES_LIST, - private val exceptionsHandler: (Exception) -> Boolean = { true }, - private val updatesReceiver: UpdateReceiver -) : UpdatesPoller { - private var lastHandledUpdate: UpdateIdentifier = 0L - private val mediaGroup: MutableList = mutableListOf() - - private var pollerJob: Job? = null - - private suspend fun sendToBlock(data: Update) { - updatesReceiver(data) - lastHandledUpdate = data.updateId - } - - private suspend fun pushMediaGroupUpdate(update: BaseMessageUpdate? = null) { - val inputMediaGroupId = (update ?.data as? MediaGroupMessage) ?.mediaGroupId - if (mediaGroup.isNotEmpty() && inputMediaGroupId ?.equals(mediaGroup.mediaGroupId) != true) { - mediaGroup.sortBy { it.updateId } - mediaGroup.convertWithMediaGroupUpdates().forEach { - sendToBlock(it) - } - mediaGroup.clear() - } - inputMediaGroupId ?.let { - mediaGroup.add(update) - } ?: sendToBlock(update ?: return) - } - - private suspend fun getUpdates(): List { - return executor.execute( - GetUpdates( - lastHandledUpdate + 1, // incremented because offset counted from 1 when updates id from 0 - oneTimeUpdatesLimit, - timeoutSeconds, - allowedUpdates - ) - ) - } - - private suspend fun handleUpdates(updates: List) { - for (update in updates) { - (update as? BaseMessageUpdate) ?.let { - if (it.data is MediaGroupMessage) { - pushMediaGroupUpdate(it) - } else { - null - } - } ?:let { - pushMediaGroupUpdate() - sendToBlock(update) - } - } - - pushMediaGroupUpdate() - } - - private val startStopScope = CoroutineScope(Dispatchers.Default) - private val startStopQueue = Channel(2) - private val startStopJob = startStopScope.launch { - for (scope in startStopQueue) { - scope ?.also { - pollerJob ?: scope.launch { - executor.executeUnsafe(DeleteWebhook()) - while (isActive) { - try { - val updates = getUpdates() - handleUpdates(updates) - } catch (e: Exception) { - if (exceptionsHandler(e)) { - continue - } else { - close() - break - } - } - } - }.also { - pollerJob = it - } - } ?: also { - startStopQueue.close() - pollerJob ?.cancel() - startStopScope.cancel() - return@launch - } - } - } - override fun start(scope: CoroutineScope) { - startStopQueue.offer(scope) - } - - override fun close() { - startStopQueue.offer(null) - } -} \ No newline at end of file diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/UpdatesFilter.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/UpdatesFilter.kt index ba0daee6b7..868484ccb1 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/UpdatesFilter.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/UpdatesFilter.kt @@ -13,49 +13,6 @@ interface UpdatesFilter { val allowedUpdates: List } -@Deprecated( - "It is builder function for SimpleUpdatesFilter", - ReplaceWith( - "SimpleUpdatesFilter", - "com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.SimpleUpdatesFilter" - ) -) -fun UpdatesFilter( - messageCallback: UpdateReceiver? = null, - messageMediaGroupCallback: UpdateReceiver? = null, - editedMessageCallback: UpdateReceiver? = null, - editedMessageMediaGroupCallback: UpdateReceiver? = null, - channelPostCallback: UpdateReceiver? = null, - channelPostMediaGroupCallback: UpdateReceiver? = null, - editedChannelPostCallback: UpdateReceiver? = null, - editedChannelPostMediaGroupCallback: UpdateReceiver? = null, - chosenInlineResultCallback: UpdateReceiver? = null, - inlineQueryCallback: UpdateReceiver? = null, - callbackQueryCallback: UpdateReceiver? = null, - shippingQueryCallback: UpdateReceiver? = null, - preCheckoutQueryCallback: UpdateReceiver? = null, - pollUpdateCallback: UpdateReceiver? = null, - pollAnswerUpdateCallback: UpdateReceiver? = null, - unknownUpdateTypeCallback: UpdateReceiver? = null -) = SimpleUpdatesFilter( - messageCallback, - messageMediaGroupCallback, - editedMessageCallback, - editedMessageMediaGroupCallback, - channelPostCallback, - channelPostMediaGroupCallback, - editedChannelPostCallback, - editedChannelPostMediaGroupCallback, - chosenInlineResultCallback, - inlineQueryCallback, - callbackQueryCallback, - shippingQueryCallback, - preCheckoutQueryCallback, - pollUpdateCallback, - pollAnswerUpdateCallback, - unknownUpdateTypeCallback -) - data class SimpleUpdatesFilter( private val messageCallback: UpdateReceiver? = null, private val messageMediaGroupCallback: UpdateReceiver? = null, diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/Annotations.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/Annotations.kt index fc431a2ca1..a2a11b80ba 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/Annotations.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/Annotations.kt @@ -1,6 +1,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.utils -import kotlin.Experimental.Level - -@Experimental(Level.WARNING) +@RequiresOptIn( + "It is possible, that bevahiour of this thing will be changed later", + RequiresOptIn.Level.WARNING +) annotation class PreviewFeature diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/JSON.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/JSON.kt index f579d13706..89aca12d12 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/JSON.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/JSON.kt @@ -3,16 +3,16 @@ package com.github.insanusmokrassar.TelegramBotAPI.utils import kotlinx.serialization.SerializationStrategy import kotlinx.serialization.json.* -val nonstrictJsonFormat = Json { +internal val nonstrictJsonFormat = Json { isLenient = true ignoreUnknownKeys = true serializeSpecialFloatingPointValues = true useArrayPolymorphism = true } -inline fun T.toJsonWithoutNulls(serializer: SerializationStrategy): JsonObject = toJson(serializer).withoutNulls() +fun T.toJsonWithoutNulls(serializer: SerializationStrategy): JsonObject = toJson(serializer).withoutNulls() -inline fun T.toJson(serializer: SerializationStrategy): JsonObject = nonstrictJsonFormat.toJson( +fun T.toJson(serializer: SerializationStrategy): JsonObject = nonstrictJsonFormat.toJson( serializer, this ).jsonObject diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/LinksFormatting.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/LinksFormatting.kt index cc7ec0d8ea..29523ab7ea 100644 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/LinksFormatting.kt +++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/LinksFormatting.kt @@ -7,7 +7,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended. private const val internalLinkBeginning = "https://t.me" -@PreviewFeature fun makeLinkToMessage( username: String, messageId: MessageIdentifier @@ -16,7 +15,6 @@ fun makeLinkToMessage( private val linkIdRedundantPartRegex = Regex("^-100") private val usernameBeginSymbolRegex = Regex("^@") -@PreviewFeature fun makeLinkToMessage( chat: ExtendedChat, messageId: MessageIdentifier diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/UpdatesPolling.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/UpdatesPolling.kt deleted file mode 100644 index 56295e5b51..0000000000 --- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/UpdatesPolling.kt +++ /dev/null @@ -1,118 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.utils.extensions - -import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.bot.UpdatesPoller -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.Update -import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.KtorUpdatesPoller -import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.UpdatesFilter -import kotlinx.coroutines.* - -@Deprecated( - "Replaced", - ReplaceWith( - "UpdateReceiver", - "com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.UpdateReceiver" - ) -) -typealias UpdateReceiver = com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.UpdateReceiver - -@Deprecated("Replaced into TelegramBotAPI-extensions-api") -fun RequestsExecutor.startGettingOfUpdates( - timeoutMillis: Long = 30 * 1000, - scope: CoroutineScope = CoroutineScope(Dispatchers.Default), - allowedUpdates: List? = null, - block: UpdateReceiver -): UpdatesPoller { - return KtorUpdatesPoller( - this, - timeoutMillis.toInt() / 1000, - allowedUpdates = allowedUpdates ?: ALL_UPDATES_LIST, - updatesReceiver = block - ).also { - it.start(scope) - } -} - -@Deprecated("Replaced into TelegramBotAPI-extensions-api") -fun RequestsExecutor.startGettingOfUpdates( - messageCallback: UpdateReceiver? = null, - messageMediaGroupCallback: UpdateReceiver? = null, - editedMessageCallback: UpdateReceiver? = null, - editedMessageMediaGroupCallback: UpdateReceiver? = null, - channelPostCallback: UpdateReceiver? = null, - channelPostMediaGroupCallback: UpdateReceiver? = null, - editedChannelPostCallback: UpdateReceiver? = null, - editedChannelPostMediaGroupCallback: UpdateReceiver? = null, - chosenInlineResultCallback: UpdateReceiver? = null, - inlineQueryCallback: UpdateReceiver? = null, - callbackQueryCallback: UpdateReceiver? = null, - shippingQueryCallback: UpdateReceiver? = null, - preCheckoutQueryCallback: UpdateReceiver? = null, - pollCallback: UpdateReceiver? = null, - pollAnswerCallback: UpdateReceiver? = null, - timeoutMillis: Long = 30 * 1000, - scope: CoroutineScope = GlobalScope -): UpdatesPoller { - val filter = UpdatesFilter( - messageCallback, - messageMediaGroupCallback, - editedMessageCallback, - editedMessageMediaGroupCallback, - channelPostCallback, - channelPostMediaGroupCallback, - editedChannelPostCallback, - editedChannelPostMediaGroupCallback, - chosenInlineResultCallback, - inlineQueryCallback, - callbackQueryCallback, - shippingQueryCallback, - preCheckoutQueryCallback, - pollCallback, - pollAnswerCallback - ) - return startGettingOfUpdates( - timeoutMillis, - scope, - filter.allowedUpdates, - filter.asUpdateReceiver - ) -} - -@Deprecated("Replaced into TelegramBotAPI-extensions-api") -fun RequestsExecutor.startGettingOfUpdates( - messageCallback: UpdateReceiver? = null, - mediaGroupCallback: UpdateReceiver? = null, - editedMessageCallback: UpdateReceiver? = null, - channelPostCallback: UpdateReceiver? = null, - editedChannelPostCallback: UpdateReceiver? = null, - chosenInlineResultCallback: UpdateReceiver? = null, - inlineQueryCallback: UpdateReceiver? = null, - callbackQueryCallback: UpdateReceiver? = null, - shippingQueryCallback: UpdateReceiver? = null, - preCheckoutQueryCallback: UpdateReceiver? = null, - pollCallback: UpdateReceiver? = null, - pollAnswerCallback: UpdateReceiver? = null, - timeoutMillis: Long = 30 * 1000, - scope: CoroutineScope = CoroutineScope(Dispatchers.Default) -): UpdatesPoller = startGettingOfUpdates( - messageCallback = messageCallback, - messageMediaGroupCallback = mediaGroupCallback, - editedMessageCallback = editedMessageCallback, - editedMessageMediaGroupCallback = mediaGroupCallback, - channelPostCallback = channelPostCallback, - channelPostMediaGroupCallback = mediaGroupCallback, - editedChannelPostCallback = editedChannelPostCallback, - editedChannelPostMediaGroupCallback = mediaGroupCallback, - chosenInlineResultCallback = chosenInlineResultCallback, - inlineQueryCallback = inlineQueryCallback, - callbackQueryCallback = callbackQueryCallback, - shippingQueryCallback = shippingQueryCallback, - preCheckoutQueryCallback = preCheckoutQueryCallback, - pollCallback = pollCallback, - pollAnswerCallback = pollAnswerCallback, - timeoutMillis = timeoutMillis, - scope = scope -) diff --git a/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/TestsJsonFormat.kt b/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/TestsJsonFormat.kt new file mode 100644 index 0000000000..50219dd4c5 --- /dev/null +++ b/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/TestsJsonFormat.kt @@ -0,0 +1,12 @@ +package com.github.insanusmokrassar.TelegramBotAPI + +import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonConfiguration + +val TestsJsonFormat = Json(JsonConfiguration.Stable) +val NonstrictTestsJsonFormat = Json { + isLenient = true + ignoreUnknownKeys = true + serializeSpecialFloatingPointValues = true + useArrayPolymorphism = true +} diff --git a/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/BotActionTests.kt b/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/BotActionTests.kt index a00391b948..bc1c2e3f27 100644 --- a/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/BotActionTests.kt +++ b/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/BotActionTests.kt @@ -1,5 +1,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.types +import com.github.insanusmokrassar.TelegramBotAPI.TestsJsonFormat import com.github.insanusmokrassar.TelegramBotAPI.types.actions.* import kotlinx.serialization.ImplicitReflectionSerializer import kotlinx.serialization.Serializable @@ -33,10 +34,10 @@ class BotActionTests { } private fun checkBotActionSerializeDeserialize(example: Example) { - val stringified = Json.plain.stringify(Example.serializer(), example) + val stringified = TestsJsonFormat.stringify(Example.serializer(), example) assertEquals("{\"botAction\":\"${example.botAction.actionName}\"}", stringified) - val deserialized = Json.plain.parse(Example.serializer(), stringified) + val deserialized = TestsJsonFormat.parse(Example.serializer(), stringified) assertEquals(example, deserialized) diff --git a/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatIdentifierTests.kt b/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatIdentifierTests.kt index 68654a45e4..a11c7a22ed 100644 --- a/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatIdentifierTests.kt +++ b/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatIdentifierTests.kt @@ -1,6 +1,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.types -import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat +import com.github.insanusmokrassar.TelegramBotAPI.NonstrictTestsJsonFormat +import com.github.insanusmokrassar.TelegramBotAPI.TestsJsonFormat import kotlinx.serialization.ImplicitReflectionSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json @@ -55,25 +56,25 @@ class ChatIdentifierTests { ) Example(chatIdentifierChatId.toChatId()).let { withChatId -> - val stringified = nonstrictJsonFormat.stringify(Example.serializer(), withChatId) + val stringified = NonstrictTestsJsonFormat.stringify(Example.serializer(), withChatId) assertEquals(stringified, "{\"identifier\":$chatIdentifierChatId}") - val deserialized = nonstrictJsonFormat.parse(Example.serializer(), stringified) + val deserialized = NonstrictTestsJsonFormat.parse(Example.serializer(), stringified) assertEquals(withChatId, deserialized) } Example(testUsername.toUsername()).let { withUsername -> - val stringified = nonstrictJsonFormat.stringify(Example.serializer(), withUsername) + val stringified = NonstrictTestsJsonFormat.stringify(Example.serializer(), withUsername) assertEquals(stringified, "{\"identifier\":\"$testUsername\"}") - val deserialized = nonstrictJsonFormat.parse(Example.serializer(), stringified) + val deserialized = NonstrictTestsJsonFormat.parse(Example.serializer(), stringified) assertEquals(withUsername, deserialized) } // Replace @ by empty string, because from time to time we can retrieve from Telegram system // username without starting @ symbol Example(testUsername.toUsername()).let { withUsername -> - val stringified = nonstrictJsonFormat.stringify(Example.serializer(), withUsername).replace("@", "") + val stringified = NonstrictTestsJsonFormat.stringify(Example.serializer(), withUsername).replace("@", "") assertEquals("{\"identifier\":\"${testUsername.replace("@", "")}\"}", stringified) - val deserialized = nonstrictJsonFormat.parse(Example.serializer(), stringified) + val deserialized = NonstrictTestsJsonFormat.parse(Example.serializer(), stringified) assertEquals(withUsername, deserialized) } } diff --git a/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ParseModeTests.kt b/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ParseModeTests.kt index 42aa361716..6225bb715e 100644 --- a/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ParseModeTests.kt +++ b/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ParseModeTests.kt @@ -1,5 +1,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.types +import com.github.insanusmokrassar.TelegramBotAPI.TestsJsonFormat import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.* import kotlinx.serialization.ImplicitReflectionSerializer import kotlinx.serialization.Serializable @@ -18,10 +19,10 @@ class ParseModeTests { fun `Markdown parse mode correctly serializing and deserializing`() { val example = Example(Markdown) - val stringified = Json.plain.stringify(Example.serializer(), example) + val stringified = TestsJsonFormat.stringify(Example.serializer(), example) assertEquals("{\"mode\":\"Markdown\"}", stringified) - val deserialized = Json.plain.parse(Example.serializer(), stringified) + val deserialized = TestsJsonFormat.parse(Example.serializer(), stringified) assertEquals(example, deserialized) } @@ -29,10 +30,10 @@ class ParseModeTests { fun `HTML parse mode correctly serializing and deserializing`() { val example = Example(HTML) - val stringified = Json.plain.stringify(Example.serializer(), example) + val stringified = TestsJsonFormat.stringify(Example.serializer(), example) assertEquals("{\"mode\":\"HTML\"}", stringified) - val deserialized = Json.plain.parse(Example.serializer(), stringified) + val deserialized = TestsJsonFormat.parse(Example.serializer(), stringified) assertEquals(example, deserialized) } } diff --git a/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDateTests.kt b/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDateTests.kt index 648965a44c..ec4fa3e8ae 100644 --- a/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDateTests.kt +++ b/TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDateTests.kt @@ -1,16 +1,15 @@ package com.github.insanusmokrassar.TelegramBotAPI.types +import com.github.insanusmokrassar.TelegramBotAPI.NonstrictTestsJsonFormat import com.soywiz.klock.DateTime import kotlinx.serialization.ImplicitReflectionSerializer import kotlinx.serialization.Serializable -import kotlinx.serialization.json.Json -import java.util.concurrent.TimeUnit import kotlin.test.Test import kotlin.test.assertEquals -private val dateTimeMillis = System.currentTimeMillis() -private val dateTimeUnix = TimeUnit.MILLISECONDS.toSeconds(dateTimeMillis) -private val dateTime = DateTime(TimeUnit.SECONDS.toMillis(dateTimeUnix)) +private val dateTimeUnix = DateTime.nowUnixLong() +private val dateTimeMillis = dateTimeUnix * 1000 +private val dateTime = DateTime(dateTimeMillis) @ImplicitReflectionSerializer class TelegramDateTests { @@ -22,10 +21,10 @@ class TelegramDateTests { fun `Serializtion of TelegramDate is working correctly`() { val example = Example(TelegramDate(dateTimeUnix)) - val stringified = Json.plain.stringify(Example.serializer(), example) + val stringified = NonstrictTestsJsonFormat.stringify(Example.serializer(), example) assertEquals("{\"dateTime\":$dateTimeUnix}", stringified) - val deserialized = Json.plain.parse(Example.serializer(), stringified) + val deserialized = NonstrictTestsJsonFormat.parse(Example.serializer(), stringified) assertEquals(example, deserialized) assertEquals(dateTime, deserialized.dateTime.asDate) diff --git a/TelegramBotAPI/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/KtorUpdatesCIOPoller.kt b/TelegramBotAPI/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/KtorUpdatesCIOPoller.kt deleted file mode 100644 index ba6d7be94c..0000000000 --- a/TelegramBotAPI/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/KtorUpdatesCIOPoller.kt +++ /dev/null @@ -1,78 +0,0 @@ -package com.github.insanusmokrassar.TelegramBotAPI.updateshandlers - -import com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorRequestsExecutor -import com.github.insanusmokrassar.TelegramBotAPI.types.ALL_UPDATES_LIST -import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update -import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper -import io.ktor.client.HttpClient -import io.ktor.client.engine.HttpClientEngine -import io.ktor.client.engine.cio.CIO -import io.ktor.client.engine.cio.endpoint -import io.ktor.util.KtorExperimentalAPI - -@Deprecated("Deprecated due to more simple way to get updates using TelegramBotAPI-extensions-api") -@KtorExperimentalAPI -fun KtorUpdatesPoller( - telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper, - timeoutSeconds: Int? = null, - oneTimeUpdatesLimit: Int? = null, - allowedUpdates: List = ALL_UPDATES_LIST, - exceptionsHandler: (Exception) -> Boolean = { true }, - updatesReceiver: UpdateReceiver -): KtorUpdatesPoller { - val executor = KtorRequestsExecutor( - telegramAPIUrlsKeeper, - HttpClient( - CIO.create { - endpoint { - timeoutSeconds ?.times(1000) ?.also { timeOutMillis -> - keepAliveTime = timeOutMillis.toLong() - } - connectTimeout = 1000 - } - } - ) - ) - - return KtorUpdatesPoller( - executor, - timeoutSeconds, - oneTimeUpdatesLimit, - allowedUpdates, - exceptionsHandler, - updatesReceiver - ) -} - -@Deprecated("Deprecated due to more simple way to get updates using TelegramBotAPI-extensions-api") -@KtorExperimentalAPI -fun KtorUpdatesPoller( - telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper, - timeoutSeconds: Int? = null, - oneTimeUpdatesLimit: Int? = null, - allowedUpdates: List = ALL_UPDATES_LIST, - exceptionsHandler: (Exception) -> Boolean = { true }, - clientEngine: HttpClientEngine = CIO.create { - endpoint { - timeoutSeconds ?.times(1000) ?.also { timeOutMillis -> - keepAliveTime = timeOutMillis.toLong() - } - connectTimeout = 1000 - } - }, - updatesReceiver: UpdateReceiver -): KtorUpdatesPoller { - val executor = KtorRequestsExecutor( - telegramAPIUrlsKeeper, - HttpClient(clientEngine) - ) - - return KtorUpdatesPoller( - executor, - timeoutSeconds, - oneTimeUpdatesLimit, - allowedUpdates, - exceptionsHandler, - updatesReceiver - ) -} diff --git a/TelegramBotAPI/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/Webhooks.kt b/TelegramBotAPI/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/Webhooks.kt index 1a6c82ce32..984a3372e9 100644 --- a/TelegramBotAPI/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/Webhooks.kt +++ b/TelegramBotAPI/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/Webhooks.kt @@ -8,9 +8,11 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates import com.github.insanusmokrassar.TelegramBotAPI.types.update.RawUpdate 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.updateshandlers.UpdatesFilter import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.webhook.WebhookPrivateKeyConfig import com.github.insanusmokrassar.TelegramBotAPI.utils.convertWithMediaGroupUpdates +import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat import io.ktor.application.call import io.ktor.request.receiveText import io.ktor.response.respond @@ -73,8 +75,8 @@ suspend fun RequestsExecutor.setWebhook( module { routing { post(listenRoute) { - val asJson = Json.nonstrict.parseJson(call.receiveText()) - val update = Json.nonstrict.fromJson( + val asJson = nonstrictJsonFormat.parseJson(call.receiveText()) + val update = nonstrictJsonFormat.fromJson( RawUpdate.serializer(), asJson )