diff --git a/dependencies.gradle b/dependencies.gradle index 993a5d760f..3b735b1be5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -31,7 +31,7 @@ ext.sdkVersions = [ compileSdk : '29', buildTools : '29.0.3', - kotlin : '1.4.0', + kotlin : '1.4.30', androidX : '1.1.0', okHttp : '4.5.0', @@ -39,7 +39,10 @@ ext.sdkVersions = [ androidGradlePlugin : '3.6.0', - gson : '2.8.5', + gson : '2.8.6', + + junit : '4.12', + mockito : '1.6.0', ] ext.sdkLibraries = [ @@ -57,6 +60,11 @@ ext.sdkLibrariesSupport = [ collection : "androidx.collection:collection:$sdkVersions.androidX", ] +ext.testLibraries = [ + junit : "junit:junit:$sdkVersions.junit", + mockito : "com.nhaarman:mockito-kotlin:$sdkVersions.mockito", +] + ext.sdkGradlePlugins = [ android : "com.android.tools.build:gradle:$sdkVersions.androidGradlePlugin", kotlinGradle : "org.jetbrains.kotlin:kotlin-gradle-plugin:$sdkVersions.kotlin", diff --git a/samples/app/sdk/src/build.gradle b/samples/app/sdk/src/build.gradle index 65f75acc52..390c26b8bb 100644 --- a/samples/app/sdk/src/build.gradle +++ b/samples/app/sdk/src/build.gradle @@ -53,7 +53,6 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: '*.jar') implementation sdkLibraries.kotlin implementation sdkLibrariesSupport.recyclerView implementation sdkLibrariesSupport.appCompat diff --git a/samples/app/sdk/src/main/res/values/strings.xml b/samples/app/sdk/src/main/res/values/strings.xml index 7298c9baa9..a09619d994 100644 --- a/samples/app/sdk/src/main/res/values/strings.xml +++ b/samples/app/sdk/src/main/res/values/strings.xml @@ -2,7 +2,7 @@ Войти Выйти - Отправить на стену + Post on wall Ваше сообщение Posted diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/GsonHolder.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/GsonHolder.kt index 2e7faadcef..4e0ef5e0f2 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/GsonHolder.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/GsonHolder.kt @@ -37,6 +37,8 @@ object GsonHolder { private fun makeBuilder(): GsonBuilder { val builder = GsonBuilder() + builder.registerTypeAdapter(com.vk.sdk.api.calls.dto.CallsEndState::class.java, + com.vk.sdk.api.calls.dto.CallsEndState.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.ads.dto.AdsGetStatisticsStatsFields::class.java, com.vk.sdk.api.ads.dto.AdsGetStatisticsStatsFields.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.ads.dto.AdsGetStatisticsPeriod::class.java, @@ -133,16 +135,36 @@ object GsonHolder { com.vk.sdk.api.wall.dto.WallReportCommentReason.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesGetHistoryAttachmentsMediaType::class.java, com.vk.sdk.api.messages.dto.MessagesGetHistoryAttachmentsMediaType.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.ChangeInfo::class.java, + com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.ChangeInfo.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.Call::class.java, + com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.Call.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.UseMassMentions::class.java, + com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.UseMassMentions.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.ChangePin::class.java, + com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.ChangePin.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.ChangeAdmins::class.java, + com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.ChangeAdmins.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.Invite::class.java, + com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.Invite.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.SeeInviteLink::class.java, + com.vk.sdk.api.messages.dto.MessagesChatSettingsPermissions.SeeInviteLink.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesConversation.SpecialServiceType::class.java, com.vk.sdk.api.messages.dto.MessagesConversation.SpecialServiceType.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesConversationPeerType::class.java, com.vk.sdk.api.messages.dto.MessagesConversationPeerType.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesGetIntentUsersIntent::class.java, + com.vk.sdk.api.messages.dto.MessagesGetIntentUsersIntent.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesGetHistoryRev::class.java, com.vk.sdk.api.messages.dto.MessagesGetHistoryRev.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesKeyboardButton.Color::class.java, com.vk.sdk.api.messages.dto.MessagesKeyboardButton.Color.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesChatSettingsState::class.java, + com.vk.sdk.api.messages.dto.MessagesChatSettingsState.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesSendIntent::class.java, com.vk.sdk.api.messages.dto.MessagesSendIntent.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesSetActivityType::class.java, + com.vk.sdk.api.messages.dto.MessagesSetActivityType.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesTemplateActionTypeNames::class.java, com.vk.sdk.api.messages.dto.MessagesTemplateActionTypeNames.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.messages.dto.MessagesGetConversationsFilter::class.java, @@ -185,10 +207,14 @@ object GsonHolder { com.vk.sdk.api.fave.dto.FaveAddTagPosition.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.fave.dto.FaveBookmarkType::class.java, com.vk.sdk.api.fave.dto.FaveBookmarkType.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.fave.dto.FaveRemoveClassifiedItemSource::class.java, + com.vk.sdk.api.fave.dto.FaveRemoveClassifiedItemSource.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.fave.dto.FaveSetTagsItemType::class.java, com.vk.sdk.api.fave.dto.FaveSetTagsItemType.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.fave.dto.FaveGetItemType::class.java, com.vk.sdk.api.fave.dto.FaveGetItemType.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.fave.dto.FaveAddClassifiedItemSource::class.java, + com.vk.sdk.api.fave.dto.FaveAddClassifiedItemSource.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.polls.dto.PollsGetByIdNameCase::class.java, com.vk.sdk.api.polls.dto.PollsGetByIdNameCase.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.polls.dto.PollsBackground.Type::class.java, @@ -507,28 +533,32 @@ object GsonHolder { com.vk.sdk.api.stats.dto.StatsGetInterval.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.widgets.dto.WidgetsCommentMediaType::class.java, com.vk.sdk.api.widgets.dto.WidgetsCommentMediaType.Serializer()) - builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestFooterButton.Style::class.java, - com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestFooterButton.Style.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.store.dto.StoreProduct.Type::class.java, + com.vk.sdk.api.store.dto.StoreProduct.Type.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedItemWallpostFeedbackType::class.java, com.vk.sdk.api.newsfeed.dto.NewsfeedItemWallpostFeedbackType.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigest.Template::class.java, com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigest.Template.Serializer()) - builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestHeader.Style::class.java, - com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestHeader.Style.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedNewsfeedItemType::class.java, com.vk.sdk.api.newsfeed.dto.NewsfeedNewsfeedItemType.Serializer()) - builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedItemWallpostType::class.java, - com.vk.sdk.api.newsfeed.dto.NewsfeedItemWallpostType.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedUnsubscribeType::class.java, com.vk.sdk.api.newsfeed.dto.NewsfeedUnsubscribeType.Serializer()) - builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestFooter.Style::class.java, - com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestFooter.Style.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedFilters::class.java, com.vk.sdk.api.newsfeed.dto.NewsfeedFilters.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestButton.Style::class.java, + com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestButton.Style.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestHeader.Style::class.java, + com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestHeader.Style.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedItemWallpostType::class.java, + com.vk.sdk.api.newsfeed.dto.NewsfeedItemWallpostType.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestFooter.Style::class.java, + com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestFooter.Style.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedGetBannedNameCase::class.java, com.vk.sdk.api.newsfeed.dto.NewsfeedGetBannedNameCase.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedCommentsFilters::class.java, com.vk.sdk.api.newsfeed.dto.NewsfeedCommentsFilters.Serializer()) + builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestFullItem.Style::class.java, + com.vk.sdk.api.newsfeed.dto.NewsfeedItemDigestFullItem.Style.Serializer()) builder.registerTypeAdapter(com.vk.sdk.api.newsfeed.dto.NewsfeedIgnoreItemType::class.java, com.vk.sdk.api.newsfeed.dto.NewsfeedIgnoreItemType.Serializer()) return builder diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversationsItem.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversationsItem.kt index 6462566439..e8d884d6a7 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversationsItem.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversationsItem.kt @@ -35,6 +35,9 @@ import kotlin.Int * @param disabledUntil Time until that notifications are disabled in seconds * @param peerId Peer ID * @param sound Information whether the sound are enabled + * @param disabledMentions Information whether the mentions are disabled + * @param disabledMassMentions Information whether the mass mentions (like '@all', '@online') are + * disabled. Can be affected by 'disabled_mentions' */ data class AccountPushConversationsItem( @SerializedName(value="disabled_until") @@ -42,5 +45,9 @@ data class AccountPushConversationsItem( @SerializedName(value="peer_id") val peerId: Int, @SerializedName(value="sound") - val sound: BaseBoolInt + val sound: BaseBoolInt, + @SerializedName(value="disabled_mentions") + val disabledMentions: BaseBoolInt? = null, + @SerializedName(value="disabled_mass_mentions") + val disabledMassMentions: BaseBoolInt? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdLayout.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdLayout.kt index e889d407b6..3daeda7087 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdLayout.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdLayout.kt @@ -56,7 +56,7 @@ data class AdsAdLayout( @SerializedName(value="description") val description: String, @SerializedName(value="id") - val id: Int, + val id: String, @SerializedName(value="image_src") val imageSrc: String, @SerializedName(value="link_url") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsMusician.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsMusician.kt index 986882dec7..1bb4c634f5 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsMusician.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsMusician.kt @@ -34,10 +34,13 @@ import kotlin.String /** * @param id Targeting music artist ID * @param name Music artist name + * @param avatar Music artist photo */ data class AdsMusician( @SerializedName(value="id") val id: Int, @SerializedName(value="name") - val name: String + val name: String, + @SerializedName(value="avatar") + val avatar: String? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/methods/AdsGetMusiciansByIds.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/methods/AdsGetMusiciansByIds.kt new file mode 100644 index 0000000000..eac8b879cb --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/methods/AdsGetMusiciansByIds.kt @@ -0,0 +1,50 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.ads.methods + +import com.vk.sdk.api.ApiRequestBase +import com.vk.sdk.api.GsonHolder +import com.vk.sdk.api.ads.dto.AdsGetMusiciansResponseDto +import com.vk.sdk.api.ads.responses.AdsGetMusiciansResponse +import kotlin.Int +import kotlin.collections.List +import org.json.JSONObject + +/** + * @param ids + */ +class AdsGetMusiciansByIds( + private val ids: List +) : ApiRequestBase(methodName = "ads.getMusiciansByIds") { + init { + addParam("ids", ids) + } + + override fun parse(r: JSONObject): AdsGetMusiciansResponseDto = + GsonHolder.gson.fromJson(r.toString(), AdsGetMusiciansResponse::class.java).response +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetMiniAppPoliciesResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetMiniAppPoliciesResponseDto.kt new file mode 100644 index 0000000000..81ec89717c --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetMiniAppPoliciesResponseDto.kt @@ -0,0 +1,42 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.apps.dto + +import com.google.gson.annotations.SerializedName +import kotlin.String + +/** + * @param privacyPolicy URL of the app's privacy policy + * @param terms URL of the app's terms + */ +data class AppsGetMiniAppPoliciesResponseDto( + @SerializedName(value="privacy_policy") + val privacyPolicy: String? = null, + @SerializedName(value="terms") + val terms: String? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsImageUploadResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsImageUploadResponseDto.kt new file mode 100644 index 0000000000..12ff91c2fd --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsImageUploadResponseDto.kt @@ -0,0 +1,42 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.apps.dto + +import com.google.gson.annotations.SerializedName +import kotlin.String + +/** + * @param hash Uploading hash + * @param image Uploaded photo data + */ +data class AppsImageUploadResponseDto( + @SerializedName(value="hash") + val hash: String? = null, + @SerializedName(value="image") + val image: String? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/methods/AppsGetMiniAppPolicies.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/methods/AppsGetMiniAppPolicies.kt new file mode 100644 index 0000000000..f349fc0731 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/methods/AppsGetMiniAppPolicies.kt @@ -0,0 +1,51 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.apps.methods + +import com.vk.sdk.api.ApiRequestBase +import com.vk.sdk.api.GsonHolder +import com.vk.sdk.api.apps.dto.AppsGetMiniAppPoliciesResponseDto +import com.vk.sdk.api.apps.responses.AppsGetMiniAppPoliciesResponse +import kotlin.Int +import org.json.JSONObject + +/** + * Returns policies and terms given to a mini app. + * @param appId Mini App ID minimum 0 + */ +class AppsGetMiniAppPolicies( + private val appId: Int +) : ApiRequestBase(methodName = "apps.getMiniAppPolicies") { + init { + addParam("app_id", appId) + } + + override fun parse(r: JSONObject): AppsGetMiniAppPoliciesResponseDto = + GsonHolder.gson.fromJson(r.toString(), + AppsGetMiniAppPoliciesResponse::class.java).response +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/responses/AppsGetMiniAppPoliciesResponse.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/responses/AppsGetMiniAppPoliciesResponse.kt new file mode 100644 index 0000000000..bc543ccd01 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/responses/AppsGetMiniAppPoliciesResponse.kt @@ -0,0 +1,39 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.apps.responses + +import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.apps.dto.AppsGetMiniAppPoliciesResponseDto + +/** + * @param response no description + */ +data class AppsGetMiniAppPoliciesResponse( + @SerializedName(value="response") + val response: AppsGetMiniAppPoliciesResponseDto +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/responses/AppsImageUploadResponse.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/responses/AppsImageUploadResponse.kt new file mode 100644 index 0000000000..922ce30f86 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/responses/AppsImageUploadResponse.kt @@ -0,0 +1,39 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.apps.responses + +import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.apps.dto.AppsImageUploadResponseDto + +/** + * @param response no description + */ +data class AppsImageUploadResponse( + @SerializedName(value="response") + val response: AppsImageUploadResponseDto +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioAudio.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioAudio.kt index 4dffc234eb..f2b475f35d 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioAudio.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioAudio.kt @@ -34,8 +34,10 @@ import kotlin.String /** * @param artist Artist name * @param id Audio ID + * @param ownerId Audio owner's ID * @param title Title * @param duration Duration in seconds + * @param accessKey Access key for the audio * @param url URL of mp3 file * @param date Date when uploaded * @param albumId Album ID @@ -47,10 +49,14 @@ data class AudioAudio( val artist: String, @SerializedName(value="id") val id: Int, + @SerializedName(value="owner_id") + val ownerId: Int, @SerializedName(value="title") val title: String, @SerializedName(value="duration") val duration: Int, + @SerializedName(value="access_key") + val accessKey: String? = null, @SerializedName(value="url") val url: String? = null, @SerializedName(value="date") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonAction.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonAction.kt index e9a7647008..5d4bef22a5 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonAction.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonAction.kt @@ -37,7 +37,7 @@ import kotlin.String */ data class BaseLinkButtonAction( @SerializedName(value="type") - val type: BaseLinkButtonActionType? = null, + val type: BaseLinkButtonActionType, @SerializedName(value="url") val url: String? = null, @SerializedName(value="consume_reason") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonActionType.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonActionType.kt index 4c47c80fc0..6ba074b599 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonActionType.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonActionType.kt @@ -71,6 +71,8 @@ enum class BaseLinkButtonActionType( FRIENDS_MESSAGE("friends_message"), + FRIENDS_CALL("friends_call"), + FRIENDS_SEND_GIFT("friends_send_gift"), FRIENDS_LABEL("friends_label"), @@ -105,7 +107,17 @@ enum class BaseLinkButtonActionType( REORDER_ITEMS("reorder_items"), - EDIT_ITEMS("edit_items"); + EDIT_ITEMS("edit_items"), + + SELECT_SORTING("select_sorting"), + + MARKET_ABANDONED_CARTS("market_abandoned_carts"), + + WRITE_IM("write_im"), + + CALL("call"), + + MODAL_PAGE("modal_page"); class Serializer : JsonSerializer, JsonDeserializer { diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseRepostsInfo.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseRepostsInfo.kt index ab1edd1630..b062db6358 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseRepostsInfo.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseRepostsInfo.kt @@ -38,7 +38,7 @@ import kotlin.Int */ data class BaseRepostsInfo( @SerializedName(value="count") - val count: Int? = null, + val count: Int, @SerializedName(value="wall_count") val wallCount: Int? = null, @SerializedName(value="mail_count") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicPoll.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicPoll.kt index 4969fcea5c..cdd18bc7b7 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicPoll.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicPoll.kt @@ -35,30 +35,30 @@ import kotlin.String import kotlin.collections.List /** - * @param answerId Current user's answer ID - * @param answers no description - * @param created Date when poll has been created in Unixtime * @param ownerId Poll owner's ID * @param pollId Poll ID + * @param created Date when poll has been created in Unixtime * @param question Poll question * @param votes Votes number + * @param answerId Current user's answer ID + * @param answers no description * @param isClosed Information whether the poll is closed */ data class BoardTopicPoll( - @SerializedName(value="answer_id") - val answerId: Int, - @SerializedName(value="answers") - val answers: List, - @SerializedName(value="created") - val created: Int, @SerializedName(value="owner_id") val ownerId: Int, @SerializedName(value="poll_id") val pollId: Int, + @SerializedName(value="created") + val created: Int, @SerializedName(value="question") val question: String, @SerializedName(value="votes") - val votes: String, + val votes: Int, + @SerializedName(value="answer_id") + val answerId: Int, + @SerializedName(value="answers") + val answers: List, @SerializedName(value="is_closed") val isClosed: BaseBoolInt? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackMarketComment.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackMarketComment.kt index bd597b0642..2954fd2027 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackMarketComment.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackMarketComment.kt @@ -36,7 +36,7 @@ import kotlin.String * @param fromId no description * @param date no description * @param text no description - * @param marketOwnerOd no description + * @param marketOwnerId no description * @param photoId no description */ data class CallbackMarketComment( @@ -48,8 +48,8 @@ data class CallbackMarketComment( val date: Int, @SerializedName(value="text") val text: String? = null, - @SerializedName(value="market_owner_od") - val marketOwnerOd: Int? = null, + @SerializedName(value="market_owner_id") + val marketOwnerId: Int? = null, @SerializedName(value="photo_id") val photoId: Int? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackMessageType.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackMessageType.kt index 3c494c1089..32dd95b522 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackMessageType.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackMessageType.kt @@ -41,8 +41,22 @@ import kotlin.String enum class CallbackMessageType( val value: String ) { + AUDIO_NEW("audio_new"), + + BOARD_POST_NEW("board_post_new"), + + BOARD_POST_EDIT("board_post_edit"), + + BOARD_POST_RESTORE("board_post_restore"), + + BOARD_POST_DELETE("board_post_delete"), + CONFIRMATION("confirmation"), + GROUP_LEAVE("group_leave"), + + GROUP_JOIN("group_join"), + GROUP_CHANGE_PHOTO("group_change_photo"), GROUP_CHANGE_SETTINGS("group_change_settings"), @@ -51,6 +65,8 @@ enum class CallbackMessageType( LEAD_FORMS_NEW("lead_forms_new"), + MARKET_COMMENT_NEW("market_comment_new"), + MARKET_COMMENT_DELETE("market_comment_delete"), MARKET_COMMENT_EDIT("market_comment_edit"), @@ -59,16 +75,24 @@ enum class CallbackMessageType( MESSAGE_ALLOW("message_allow"), + MESSAGE_NEW("message_new"), + MESSAGE_DENY("message_deny"), MESSAGE_READ("message_read"), MESSAGE_REPLY("message_reply"), + MESSAGE_EDIT("message_edit"), + MESSAGE_TYPING_STATE("message_typing_state"), MESSAGES_EDIT("messages_edit"), + PHOTO_NEW("photo_new"), + + PHOTO_COMMENT_NEW("photo_comment_new"), + PHOTO_COMMENT_DELETE("photo_comment_delete"), PHOTO_COMMENT_EDIT("photo_comment_edit"), @@ -81,12 +105,22 @@ enum class CallbackMessageType( USER_UNBLOCK("user_unblock"), + VIDEO_NEW("video_new"), + + VIDEO_COMMENT_NEW("video_comment_new"), + VIDEO_COMMENT_DELETE("video_comment_delete"), VIDEO_COMMENT_EDIT("video_comment_edit"), VIDEO_COMMENT_RESTORE("video_comment_restore"), + WALL_POST_NEW("wall_post_new"), + + WALL_REPLY_NEW("wall_reply_new"), + + WALL_REPLY_EDIT("wall_reply_edit"), + WALL_REPLY_DELETE("wall_reply_delete"), WALL_REPLY_RESTORE("wall_reply_restore"), diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackPhotoComment.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackPhotoComment.kt index 1a8921fbdf..08454e2d08 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackPhotoComment.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackPhotoComment.kt @@ -36,7 +36,7 @@ import kotlin.String * @param fromId no description * @param date no description * @param text no description - * @param photoOwnerOd no description + * @param photoOwnerId no description */ data class CallbackPhotoComment( @SerializedName(value="id") @@ -47,6 +47,6 @@ data class CallbackPhotoComment( val date: Int, @SerializedName(value="text") val text: String, - @SerializedName(value="photo_owner_od") - val photoOwnerOd: Int + @SerializedName(value="photo_owner_id") + val photoOwnerId: Int ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackVideoComment.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackVideoComment.kt index 6041d86932..5af58d137e 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackVideoComment.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/callback/dto/CallbackVideoComment.kt @@ -36,7 +36,7 @@ import kotlin.String * @param fromId no description * @param date no description * @param text no description - * @param videoOwnerOd no description + * @param videoOwnerId no description */ data class CallbackVideoComment( @SerializedName(value="id") @@ -47,6 +47,6 @@ data class CallbackVideoComment( val date: Int, @SerializedName(value="text") val text: String, - @SerializedName(value="video_owner_od") - val videoOwnerOd: Int + @SerializedName(value="video_owner_id") + val videoOwnerId: Int ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsCall.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsCall.kt new file mode 100644 index 0000000000..90891b27b1 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsCall.kt @@ -0,0 +1,55 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.calls.dto + +import com.google.gson.annotations.SerializedName +import kotlin.Boolean +import kotlin.Int + +/** + * @param initiatorId Caller initiator + * @param receiverId Caller receiver + * @param state no description + * @param time Timestamp for call + * @param duration Call duration + * @param video Was this call initiated as video call + */ +data class CallsCall( + @SerializedName(value="initiator_id") + val initiatorId: Int, + @SerializedName(value="receiver_id") + val receiverId: Int, + @SerializedName(value="state") + val state: CallsEndState, + @SerializedName(value="time") + val time: Int, + @SerializedName(value="duration") + val duration: Int? = null, + @SerializedName(value="video") + val video: Boolean? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsEndState.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsEndState.kt new file mode 100644 index 0000000000..c9e5222826 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsEndState.kt @@ -0,0 +1,68 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.calls.dto + +import com.google.gson.JsonDeserializationContext +import com.google.gson.JsonDeserializer +import com.google.gson.JsonElement +import com.google.gson.JsonNull +import com.google.gson.JsonParseException +import com.google.gson.JsonPrimitive +import com.google.gson.JsonSerializationContext +import com.google.gson.JsonSerializer +import java.lang.reflect.Type +import kotlin.String + +enum class CallsEndState( + val value: String +) { + CANCELED_BY_INITIATOR("canceled_by_initiator"), + + CANCELED_BY_RECEIVER("canceled_by_receiver"), + + REACHED("reached"); + + class Serializer : JsonSerializer, JsonDeserializer { + override fun serialize( + src: CallsEndState?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = src?.let { JsonPrimitive(src.value) } ?: JsonNull.INSTANCE + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): CallsEndState { + val value = values().firstOrNull { + it.value.toString() == json?.asJsonPrimitive?.asString + } + return value ?: throw JsonParseException(json.toString()) + } + } +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsParticipants.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsParticipants.kt new file mode 100644 index 0000000000..11b28ad93b --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsParticipants.kt @@ -0,0 +1,43 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.calls.dto + +import com.google.gson.annotations.SerializedName +import kotlin.Int +import kotlin.collections.List + +/** + * @param list no description + * @param count Participants count + */ +data class CallsParticipants( + @SerializedName(value="list") + val list: List? = null, + @SerializedName(value="count") + val count: Int? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocUploadResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocUploadResponseDto.kt new file mode 100644 index 0000000000..6af25bea09 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocUploadResponseDto.kt @@ -0,0 +1,39 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.docs.dto + +import com.google.gson.annotations.SerializedName +import kotlin.String + +/** + * @param file Uploaded file data + */ +data class DocsDocUploadResponseDto( + @SerializedName(value="file") + val file: String? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsGetType.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsGetType.kt index 4bd68a587b..2ac58af465 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsGetType.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsGetType.kt @@ -41,23 +41,23 @@ import kotlin.Int enum class DocsGetType( val value: Int ) { - ZERO_(0), + ALL(0), - ONE_(1), + TEXT(1), - TWO_(2), + ARCHIVE(2), - THREE_(3), + GIF(3), - FOUR_(4), + IMAGE(4), - FIVE_(5), + AUDIO(5), - SIX_(6), + VIDEO(6), - SEVEN_(7), + EBOOK(7), - EIGHT_(8); + DEFAULT(8); class Serializer : JsonSerializer, JsonDeserializer { override fun serialize( diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/responses/DocsDocUploadResponse.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/responses/DocsDocUploadResponse.kt new file mode 100644 index 0000000000..2bbe50bbac --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/responses/DocsDocUploadResponse.kt @@ -0,0 +1,39 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.docs.responses + +import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.docs.dto.DocsDocUploadResponseDto + +/** + * @param response no description + */ +data class DocsDocUploadResponse( + @SerializedName(value="response") + val response: DocsDocUploadResponseDto +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveAddClassifiedItemSource.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveAddClassifiedItemSource.kt new file mode 100644 index 0000000000..7fbbd4c82f --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveAddClassifiedItemSource.kt @@ -0,0 +1,65 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.fave.dto + +import com.google.gson.JsonDeserializationContext +import com.google.gson.JsonDeserializer +import com.google.gson.JsonElement +import com.google.gson.JsonNull +import com.google.gson.JsonParseException +import com.google.gson.JsonPrimitive +import com.google.gson.JsonSerializationContext +import com.google.gson.JsonSerializer +import java.lang.reflect.Type +import kotlin.String + +enum class FaveAddClassifiedItemSource( + val value: String +) { + YOULA("youla"); + + class Serializer : JsonSerializer, + JsonDeserializer { + override fun serialize( + src: FaveAddClassifiedItemSource?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = src?.let { JsonPrimitive(src.value) } ?: JsonNull.INSTANCE + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): FaveAddClassifiedItemSource { + val value = values().firstOrNull { + it.value.toString() == json?.asJsonPrimitive?.asString + } + return value ?: throw JsonParseException(json.toString()) + } + } +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveRemoveClassifiedItemSource.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveRemoveClassifiedItemSource.kt new file mode 100644 index 0000000000..4fb56d01f1 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveRemoveClassifiedItemSource.kt @@ -0,0 +1,65 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.fave.dto + +import com.google.gson.JsonDeserializationContext +import com.google.gson.JsonDeserializer +import com.google.gson.JsonElement +import com.google.gson.JsonNull +import com.google.gson.JsonParseException +import com.google.gson.JsonPrimitive +import com.google.gson.JsonSerializationContext +import com.google.gson.JsonSerializer +import java.lang.reflect.Type +import kotlin.String + +enum class FaveRemoveClassifiedItemSource( + val value: String +) { + YOULA("youla"); + + class Serializer : JsonSerializer, + JsonDeserializer { + override fun serialize( + src: FaveRemoveClassifiedItemSource?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = src?.let { JsonPrimitive(src.value) } ?: JsonNull.INSTANCE + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): FaveRemoveClassifiedItemSource { + val value = values().firstOrNull { + it.value.toString() == json?.asJsonPrimitive?.asString + } + return value ?: throw JsonParseException(json.toString()) + } + } +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/methods/FaveAddClassified.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/methods/FaveAddClassified.kt new file mode 100644 index 0000000000..6e8f8568ce --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/methods/FaveAddClassified.kt @@ -0,0 +1,54 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.fave.methods + +import com.vk.sdk.api.ApiRequestBase +import com.vk.sdk.api.GsonHolder +import com.vk.sdk.api.base.dto.BaseOkResponseDto +import com.vk.sdk.api.base.responses.BaseOkResponse +import com.vk.sdk.api.fave.dto.FaveAddClassifiedItemSource +import kotlin.String +import org.json.JSONObject + +/** + * Adds a link to user faves. + * @param itemSource Classifieds item source + * @param itemId Classifieds item id + */ +class FaveAddClassified( + private val itemSource: FaveAddClassifiedItemSource, + private val itemId: String +) : ApiRequestBase(methodName = "fave.addClassified") { + init { + addParam("item_source", itemSource.value) + addParam("item_id", itemId) + } + + override fun parse(r: JSONObject): BaseOkResponseDto = GsonHolder.gson.fromJson(r.toString(), + BaseOkResponse::class.java).response +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/methods/FaveGetExtended.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/methods/FaveGetExtended.kt index cfb607b517..fb58a717d2 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/methods/FaveGetExtended.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/methods/FaveGetExtended.kt @@ -47,6 +47,7 @@ import org.json.JSONObject * @param fields * @param isFromSnackbar */ + class FaveGetExtended( private val extended: Boolean? = null, private val itemType: FaveGetItemType? = null, diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/methods/FaveRemoveClassified.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/methods/FaveRemoveClassified.kt new file mode 100644 index 0000000000..5e08f4e346 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/methods/FaveRemoveClassified.kt @@ -0,0 +1,54 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.fave.methods + +import com.vk.sdk.api.ApiRequestBase +import com.vk.sdk.api.GsonHolder +import com.vk.sdk.api.base.dto.BaseOkResponseDto +import com.vk.sdk.api.base.responses.BaseOkResponse +import com.vk.sdk.api.fave.dto.FaveRemoveClassifiedItemSource +import kotlin.String +import org.json.JSONObject + +/** + * Removes link from the user's faves. + * @param itemSource Classifieds item source + * @param itemId Classifieds item id + */ +class FaveRemoveClassified( + private val itemSource: FaveRemoveClassifiedItemSource, + private val itemId: String +) : ApiRequestBase(methodName = "fave.removeClassified") { + init { + addParam("item_source", itemSource.value) + addParam("item_id", itemId) + } + + override fun parse(r: JSONObject): BaseOkResponseDto = GsonHolder.gson.fromJson(r.toString(), + BaseOkResponse::class.java).response +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsSearchNameCase.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsSearchNameCase.kt index faa23ce9c7..18fe0cc59b 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsSearchNameCase.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsSearchNameCase.kt @@ -41,17 +41,17 @@ import kotlin.String enum class FriendsSearchNameCase( val value: String ) { - NOMINATIVE("nom"), + NOMINATIVE("Nom"), - GENITIVE("gen"), + GENITIVE("Gen"), - DATIVE("dat"), + DATIVE("Dat"), - ACCUSATIVE("acc"), + ACCUSATIVE("Acc"), - INSTRUMENTAL("ins"), + INSTRUMENTAL("Ins"), - PREPOSITIONAL("abl"); + PREPOSITIONAL("Abl"); class Serializer : JsonSerializer, JsonDeserializer { diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFields.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFields.kt index 617158ee96..8255b63ac0 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFields.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFields.kt @@ -43,6 +43,8 @@ enum class GroupsFields( ) { MARKET("market"), + MARKET_SERVICES("market_services"), + MEMBER_STATUS("member_status"), IS_FAVORITE("is_favorite"), @@ -81,6 +83,8 @@ enum class GroupsFields( CAN_UPLOAD_VIDEO("can_upload_video"), + CAN_UPLOAD_CLIP("can_upload_clip"), + CAN_SEE_ALL_POSTS("can_see_all_posts"), CAN_CREATE_TOPIC("can_create_topic"), @@ -203,7 +207,11 @@ enum class GroupsFields( IS_BUSINESS("is_business"), - NEW_POSTS_COUNT("new_posts_count"); + NEW_POSTS_COUNT("new_posts_count"), + + TEXTLIVE("textlive"), + + TEXTLIVES_COUNT("textlives_count"); class Serializer : JsonSerializer, JsonDeserializer { override fun serialize( diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetMembersFilter.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetMembersFilter.kt index ee776ff575..f6f0ebfac0 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetMembersFilter.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetMembersFilter.kt @@ -43,7 +43,11 @@ enum class GroupsGetMembersFilter( ) { FRIENDS("friends"), - UNSURE("unsure"); + UNSURE("unsure"), + + MANAGERS("managers"), + + DONUT("donut"); class Serializer : JsonSerializer, JsonDeserializer { diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetSettingsResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetSettingsResponseDto.kt index 2832071201..c2289b05ef 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetSettingsResponseDto.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetSettingsResponseDto.kt @@ -41,7 +41,7 @@ import kotlin.collections.List * @param description Community description * @param docs Docs settings * @param obsceneFilter Information whether the obscene filter is enabled - * @param obsceneStopwords Information whether the stopwords filter is enabled + * @param obsceneStopwords Information whether the stop words filter is enabled * @param obsceneWords The list of stop words * @param photos Photos settings * @param title Community title @@ -51,6 +51,7 @@ import kotlin.collections.List * @param wiki Wiki settings * @param access Community access settings * @param address Community's page domain + * @param recognizePhoto Photo suggests setting * @param contacts no description * @param links no description * @param mainSection no description @@ -65,7 +66,7 @@ import kotlin.collections.List * @param publicSubcategory Information about the group subcategory * @param rss URL of the RSS feed * @param startDate Start date - * @param finishDate Finish date in Unixtime format + * @param finishDate Finish date in Unix-time format * @param subject Community subject ID * @param subjectList no description * @param suggestedPrivacy no description @@ -109,6 +110,8 @@ data class GroupsGetSettingsResponseDto( val access: GroupsGroupAccess? = null, @SerializedName(value="address") val address: String? = null, + @SerializedName(value="recognize_photo") + val recognizePhoto: Int? = null, @SerializedName(value="contacts") val contacts: BaseBoolInt? = null, @SerializedName(value="links") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsMemberRole.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsMemberRole.kt index cc01579621..dd5360ec32 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsMemberRole.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsMemberRole.kt @@ -38,7 +38,7 @@ import kotlin.collections.List */ data class GroupsMemberRole( @SerializedName(value="id") - val id: Int? = null, + val id: Int, @SerializedName(value="permissions") val permissions: List? = null, @SerializedName(value="role") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsProfileItem.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsProfileItem.kt index f314e8a6f3..be0d40293a 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsProfileItem.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsProfileItem.kt @@ -35,6 +35,7 @@ import kotlin.String * @param id User id * @param photo50 Url for user photo * @param photo100 Url for user photo + * @param firstName User first name */ data class GroupsProfileItem( @SerializedName(value="id") @@ -42,5 +43,7 @@ data class GroupsProfileItem( @SerializedName(value="photo_50") val photo50: String, @SerializedName(value="photo_100") - val photo100: String + val photo100: String, + @SerializedName(value="first_name") + val firstName: String ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/methods/GroupsTagBind.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/methods/GroupsTagBind.kt index 25f66b77b3..4067df700e 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/methods/GroupsTagBind.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/methods/GroupsTagBind.kt @@ -39,7 +39,7 @@ import org.json.JSONObject * Bind or unbind group's tag to user * @param groupId minimum 0 * @param tagId minimum 0 - * @param userId minimum 0 + * @param userId minimum 0 maximum 2000000000 * @param act Describe the action */ class GroupsTagBind( diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesType.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesType.kt index 48f6e91b4a..5f6acc9f9e 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesType.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesType.kt @@ -63,9 +63,7 @@ enum class LikesType( MARKET_COMMENT("market_comment"), - SITEPAGE("sitepage"), - - BUSINESS_PAGE("business_page"); + SITEPAGE("sitepage"); class Serializer : JsonSerializer, JsonDeserializer { override fun serialize( diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItem.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItem.kt index 03b16814c7..ea582550e4 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItem.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItem.kt @@ -39,13 +39,13 @@ import kotlin.String * @param id Item ID * @param ownerId Item owner's ID * @param price no description - * @param thumbPhoto URL of the preview image * @param title Item title * @param accessKey Access key for the market item * @param buttonTitle Title for button for url * @param date Date when the item has been created in Unixtime * @param externalId no description * @param isFavorite no description + * @param thumbPhoto URL of the preview image * @param url URL to item * @param variantsGroupingId no description * @param isMainVariant no description @@ -63,8 +63,6 @@ data class MarketMarketItem( val ownerId: Int, @SerializedName(value="price") val price: MarketPrice, - @SerializedName(value="thumb_photo") - val thumbPhoto: String, @SerializedName(value="title") val title: String, @SerializedName(value="access_key") @@ -77,6 +75,8 @@ data class MarketMarketItem( val externalId: String? = null, @SerializedName(value="is_favorite") val isFavorite: Boolean? = null, + @SerializedName(value="thumb_photo") + val thumbPhoto: String? = null, @SerializedName(value="url") val url: String? = null, @SerializedName(value="variants_grouping_id") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketPrice.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketPrice.kt index a7be50ee7c..6bd7d78787 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketPrice.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketPrice.kt @@ -34,22 +34,22 @@ import kotlin.String /** * @param amount Amount * @param currency no description + * @param text Text * @param discountRate no description * @param oldAmount no description - * @param text Text * @param oldAmountText Textual representation of old price */ data class MarketPrice( @SerializedName(value="amount") - val amount: String? = null, + val amount: String, @SerializedName(value="currency") - val currency: MarketCurrency? = null, + val currency: MarketCurrency, + @SerializedName(value="text") + val text: String, @SerializedName(value="discount_rate") val discountRate: Int? = null, @SerializedName(value="old_amount") val oldAmount: String? = null, - @SerializedName(value="text") - val text: String? = null, @SerializedName(value="old_amount_text") val oldAmountText: String? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchSort.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchSort.kt index e05a13faef..68d1a25b0e 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchSort.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchSort.kt @@ -41,13 +41,13 @@ import kotlin.Int enum class MarketSearchSort( val value: Int ) { - ZERO_(0), + DEFAULT(0), - ONE_(1), + DATE(1), - TWO_(2), + PRICE(2), - THREE_(3); + RELEVANCE(3); class Serializer : JsonSerializer, JsonDeserializer { override fun serialize( diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchStatus.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchStatus.kt index b2c34175f2..6ce54773db 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchStatus.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchStatus.kt @@ -41,9 +41,9 @@ import kotlin.Int enum class MarketSearchStatus( val value: Int ) { - ZERO_(0), + ACTIVE(0), - TWO_(2); + DISABLED(2); class Serializer : JsonSerializer, JsonDeserializer { override fun serialize( diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/methods/MarketGetAlbums.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/methods/MarketGetAlbums.kt index 760d679ffc..7668711e7f 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/methods/MarketGetAlbums.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/methods/MarketGetAlbums.kt @@ -35,7 +35,7 @@ import kotlin.Int import org.json.JSONObject /** - * Returns community's collections list. + * Returns community's market collections list. * @param ownerId ID of an items owner community. * @param offset Offset needed to return a specific subset of results. minimum 0 * @param count Number of items to return. default 50 minimum 0 maximum 100 diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/methods/MarketSearch.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/methods/MarketSearch.kt index 66881714d0..cb296902ef 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/methods/MarketSearch.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/methods/MarketSearch.kt @@ -42,7 +42,7 @@ import org.json.JSONObject /** * Searches market items in a community's catalog * @param ownerId ID of an items owner community. - * @param albumId default 0 minimum 0 + * @param albumId minimum 0 * @param q Search query, for example "pink slippers". * @param priceFrom Minimum item price value. minimum 0 * @param priceTo Maximum item price value. minimum 0 diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/methods/MarketSearchExtended.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/methods/MarketSearchExtended.kt index 01b81c679b..9bb813ad0d 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/methods/MarketSearchExtended.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/market/methods/MarketSearchExtended.kt @@ -42,7 +42,7 @@ import org.json.JSONObject /** * Searches market items in a community's catalog * @param ownerId ID of an items owner community. - * @param albumId default 0 minimum 0 + * @param albumId minimum 0 * @param q Search query, for example "pink slippers". * @param priceFrom Minimum item price value. minimum 0 * @param priceTo Maximum item price value. minimum 0 diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPreview.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPreview.kt index 44245fa024..e45ea476d4 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPreview.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPreview.kt @@ -40,6 +40,7 @@ import kotlin.collections.List * @param members no description * @param membersCount no description * @param title no description + * @param isMember no description */ data class MessagesChatPreview( @SerializedName(value="admin_id") @@ -53,5 +54,7 @@ data class MessagesChatPreview( @SerializedName(value="members_count") val membersCount: Int? = null, @SerializedName(value="title") - val title: String? = null + val title: String? = null, + @SerializedName(value="is_member") + val isMember: Boolean? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettings.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettings.kt new file mode 100644 index 0000000000..855038d830 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettings.kt @@ -0,0 +1,87 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.annotations.SerializedName +import kotlin.Boolean +import kotlin.Int +import kotlin.String +import kotlin.collections.List + +/** + * @param ownerId no description + * @param title Chat title + * @param state no description + * @param activeIds no description + * @param acl no description + * @param membersCount no description + * @param friendsCount no description + * @param pinnedMessage no description + * @param photo no description + * @param adminIds Ids of chat admins + * @param isGroupChannel no description + * @param permissions no description + * @param isDisappearing no description + * @param theme no description + * @param disappearingChatLink no description + * @param isService no description + */ +data class MessagesChatSettings( + @SerializedName(value="owner_id") + val ownerId: Int, + @SerializedName(value="title") + val title: String, + @SerializedName(value="state") + val state: MessagesChatSettingsState, + @SerializedName(value="active_ids") + val activeIds: List, + @SerializedName(value="acl") + val acl: MessagesChatSettingsAcl, + @SerializedName(value="members_count") + val membersCount: Int? = null, + @SerializedName(value="friends_count") + val friendsCount: Int? = null, + @SerializedName(value="pinned_message") + val pinnedMessage: MessagesPinnedMessage? = null, + @SerializedName(value="photo") + val photo: MessagesChatSettingsPhoto? = null, + @SerializedName(value="admin_ids") + val adminIds: List? = null, + @SerializedName(value="is_group_channel") + val isGroupChannel: Boolean? = null, + @SerializedName(value="permissions") + val permissions: MessagesChatSettingsPermissions? = null, + @SerializedName(value="is_disappearing") + val isDisappearing: Boolean? = null, + @SerializedName(value="theme") + val theme: String? = null, + @SerializedName(value="disappearing_chat_link") + val disappearingChatLink: String? = null, + @SerializedName(value="is_service") + val isService: Boolean? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsAcl.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsAcl.kt new file mode 100644 index 0000000000..e7d500f5e3 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsAcl.kt @@ -0,0 +1,69 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.annotations.SerializedName +import kotlin.Boolean + +/** + * @param canChangeInfo Can you change photo, description and name + * @param canChangeInviteLink Can you change invite link for this chat + * @param canChangePin Can you pin/unpin message for this chat + * @param canInvite Can you invite other peers in chat + * @param canPromoteUsers Can you promote simple users to chat admins + * @param canSeeInviteLink Can you see invite link for this chat + * @param canModerate Can you moderate (delete) other users' messages + * @param canCopyChat Can you copy chat + * @param canCall Can you init group call in the chat + * @param canUseMassMentions Can you use mass mentions + * @param canChangeServiceType Can you change chat service type + */ +data class MessagesChatSettingsAcl( + @SerializedName(value="can_change_info") + val canChangeInfo: Boolean, + @SerializedName(value="can_change_invite_link") + val canChangeInviteLink: Boolean, + @SerializedName(value="can_change_pin") + val canChangePin: Boolean, + @SerializedName(value="can_invite") + val canInvite: Boolean, + @SerializedName(value="can_promote_users") + val canPromoteUsers: Boolean, + @SerializedName(value="can_see_invite_link") + val canSeeInviteLink: Boolean, + @SerializedName(value="can_moderate") + val canModerate: Boolean, + @SerializedName(value="can_copy_chat") + val canCopyChat: Boolean, + @SerializedName(value="can_call") + val canCall: Boolean, + @SerializedName(value="can_use_mass_mentions") + val canUseMassMentions: Boolean, + @SerializedName(value="can_change_service_type") + val canChangeServiceType: Boolean? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPermissions.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPermissions.kt new file mode 100644 index 0000000000..f8560aa155 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPermissions.kt @@ -0,0 +1,267 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.JsonDeserializationContext +import com.google.gson.JsonDeserializer +import com.google.gson.JsonElement +import com.google.gson.JsonNull +import com.google.gson.JsonParseException +import com.google.gson.JsonPrimitive +import com.google.gson.JsonSerializationContext +import com.google.gson.JsonSerializer +import com.google.gson.annotations.SerializedName +import java.lang.reflect.Type +import kotlin.String + +/** + * @param invite Who can invite users to chat + * @param changeInfo Who can change chat info + * @param changePin Who can change pinned message + * @param useMassMentions Who can use mass mentions + * @param seeInviteLink Who can see invite link + * @param call Who can make calls + * @param changeAdmins Who can change admins + */ +data class MessagesChatSettingsPermissions( + @SerializedName(value="invite") + val invite: Invite? = null, + @SerializedName(value="change_info") + val changeInfo: ChangeInfo? = null, + @SerializedName(value="change_pin") + val changePin: ChangePin? = null, + @SerializedName(value="use_mass_mentions") + val useMassMentions: UseMassMentions? = null, + @SerializedName(value="see_invite_link") + val seeInviteLink: SeeInviteLink? = null, + @SerializedName(value="call") + val call: Call? = null, + @SerializedName(value="change_admins") + val changeAdmins: ChangeAdmins? = null +) { + enum class ChangeInfo( + val value: String + ) { + OWNER("owner"), + + OWNER_AND_ADMINS("owner_and_admins"), + + ALL("all"); + + class Serializer : JsonSerializer, JsonDeserializer { + override fun serialize( + src: ChangeInfo?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = src?.let { JsonPrimitive(src.value) } ?: JsonNull.INSTANCE + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): ChangeInfo { + val value = values().firstOrNull { + it.value.toString() == json?.asJsonPrimitive?.asString + } + return value ?: throw JsonParseException(json.toString()) + } + } + } + + enum class Call( + val value: String + ) { + OWNER("owner"), + + OWNER_AND_ADMINS("owner_and_admins"), + + ALL("all"); + + class Serializer : JsonSerializer, JsonDeserializer { + override fun serialize( + src: Call?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = src?.let { JsonPrimitive(src.value) } ?: JsonNull.INSTANCE + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): Call { + val value = values().firstOrNull { + it.value.toString() == json?.asJsonPrimitive?.asString + } + return value ?: throw JsonParseException(json.toString()) + } + } + } + + enum class UseMassMentions( + val value: String + ) { + OWNER("owner"), + + OWNER_AND_ADMINS("owner_and_admins"), + + ALL("all"); + + class Serializer : JsonSerializer, JsonDeserializer { + override fun serialize( + src: UseMassMentions?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = src?.let { JsonPrimitive(src.value) } ?: JsonNull.INSTANCE + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): UseMassMentions { + val value = values().firstOrNull { + it.value.toString() == json?.asJsonPrimitive?.asString + } + return value ?: throw JsonParseException(json.toString()) + } + } + } + + enum class ChangePin( + val value: String + ) { + OWNER("owner"), + + OWNER_AND_ADMINS("owner_and_admins"), + + ALL("all"); + + class Serializer : JsonSerializer, JsonDeserializer { + override fun serialize( + src: ChangePin?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = src?.let { JsonPrimitive(src.value) } ?: JsonNull.INSTANCE + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): ChangePin { + val value = values().firstOrNull { + it.value.toString() == json?.asJsonPrimitive?.asString + } + return value ?: throw JsonParseException(json.toString()) + } + } + } + + enum class ChangeAdmins( + val value: String + ) { + OWNER("owner"), + + OWNER_AND_ADMINS("owner_and_admins"); + + class Serializer : JsonSerializer, JsonDeserializer { + override fun serialize( + src: ChangeAdmins?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = src?.let { JsonPrimitive(src.value) } ?: JsonNull.INSTANCE + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): ChangeAdmins { + val value = values().firstOrNull { + it.value.toString() == json?.asJsonPrimitive?.asString + } + return value ?: throw JsonParseException(json.toString()) + } + } + } + + enum class Invite( + val value: String + ) { + OWNER("owner"), + + OWNER_AND_ADMINS("owner_and_admins"), + + ALL("all"); + + class Serializer : JsonSerializer, JsonDeserializer { + override fun serialize( + src: Invite?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = src?.let { JsonPrimitive(src.value) } ?: JsonNull.INSTANCE + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): Invite { + val value = values().firstOrNull { + it.value.toString() == json?.asJsonPrimitive?.asString + } + return value ?: throw JsonParseException(json.toString()) + } + } + } + + enum class SeeInviteLink( + val value: String + ) { + OWNER("owner"), + + OWNER_AND_ADMINS("owner_and_admins"), + + ALL("all"); + + class Serializer : JsonSerializer, JsonDeserializer { + override fun serialize( + src: SeeInviteLink?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = src?.let { JsonPrimitive(src.value) } ?: JsonNull.INSTANCE + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): SeeInviteLink { + val value = values().firstOrNull { + it.value.toString() == json?.asJsonPrimitive?.asString + } + return value ?: throw JsonParseException(json.toString()) + } + } + } +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPhoto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPhoto.kt new file mode 100644 index 0000000000..821f5d67d9 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPhoto.kt @@ -0,0 +1,49 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.annotations.SerializedName +import kotlin.Boolean +import kotlin.String + +/** + * @param photo50 URL of the preview image with 50px in width + * @param photo100 URL of the preview image with 100px in width + * @param photo200 URL of the preview image with 200px in width + * @param isDefaultPhoto If provided photo is default + */ +data class MessagesChatSettingsPhoto( + @SerializedName(value="photo_50") + val photo50: String? = null, + @SerializedName(value="photo_100") + val photo100: String? = null, + @SerializedName(value="photo_200") + val photo200: String? = null, + @SerializedName(value="is_default_photo") + val isDefaultPhoto: Boolean? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsState.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsState.kt new file mode 100644 index 0000000000..c74677e662 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsState.kt @@ -0,0 +1,69 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.JsonDeserializationContext +import com.google.gson.JsonDeserializer +import com.google.gson.JsonElement +import com.google.gson.JsonNull +import com.google.gson.JsonParseException +import com.google.gson.JsonPrimitive +import com.google.gson.JsonSerializationContext +import com.google.gson.JsonSerializer +import java.lang.reflect.Type +import kotlin.String + +enum class MessagesChatSettingsState( + val value: String +) { + IN("in"), + + KICKED("kicked"), + + LEFT("left"); + + class Serializer : JsonSerializer, + JsonDeserializer { + override fun serialize( + src: MessagesChatSettingsState?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = src?.let { JsonPrimitive(src.value) } ?: JsonNull.INSTANCE + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): MessagesChatSettingsState { + val value = values().firstOrNull { + it.value.toString() == json?.asJsonPrimitive?.asString + } + return value ?: throw JsonParseException(json.toString()) + } + } +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversation.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversation.kt index d432af1a67..4d087cf377 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversation.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversation.kt @@ -47,6 +47,7 @@ import kotlin.collections.List * @param lastMessageId ID of the last message in conversation * @param inRead Last message user have read * @param outRead Last outcoming message have been read by the opponent + * @param sortId no description * @param unreadCount Unread messages number * @param isMarkedUnread Is this conversation uread * @param outReadBy no description @@ -57,8 +58,11 @@ import kotlin.collections.List * @param mentions Ids of messages with mentions * @param expireMessages Ids of messages with expiration time * @param currentKeyboard no description + * @param pushSettings no description + * @param canWrite no description * @param canSendMoney no description * @param canReceiveMoney no description + * @param chatSettings no description */ data class MessagesConversation( @SerializedName(value="peer") @@ -69,6 +73,8 @@ data class MessagesConversation( val inRead: Int, @SerializedName(value="out_read") val outRead: Int, + @SerializedName(value="sort_id") + val sortId: MessagesConversationSortId? = null, @SerializedName(value="unread_count") val unreadCount: Int? = null, @SerializedName(value="is_marked_unread") @@ -89,10 +95,16 @@ data class MessagesConversation( val expireMessages: List? = null, @SerializedName(value="current_keyboard") val currentKeyboard: MessagesKeyboard? = null, + @SerializedName(value="push_settings") + val pushSettings: MessagesPushSettings? = null, + @SerializedName(value="can_write") + val canWrite: MessagesConversationCanWrite? = null, @SerializedName(value="can_send_money") val canSendMoney: Boolean? = null, @SerializedName(value="can_receive_money") - val canReceiveMoney: Boolean? = null + val canReceiveMoney: Boolean? = null, + @SerializedName(value="chat_settings") + val chatSettings: MessagesChatSettings? = null ) { enum class SpecialServiceType( val value: String diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationCanWrite.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationCanWrite.kt new file mode 100644 index 0000000000..55d5651238 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationCanWrite.kt @@ -0,0 +1,43 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.annotations.SerializedName +import kotlin.Boolean +import kotlin.Int + +/** + * @param allowed no description + * @param reason no description + */ +data class MessagesConversationCanWrite( + @SerializedName(value="allowed") + val allowed: Boolean, + @SerializedName(value="reason") + val reason: Int? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationSortId.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationSortId.kt new file mode 100644 index 0000000000..2a7dbe3469 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationSortId.kt @@ -0,0 +1,42 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.annotations.SerializedName +import kotlin.Int + +/** + * @param majorId Major id for sorting conversations + * @param minorId Minor id for sorting conversations + */ +data class MessagesConversationSortId( + @SerializedName(value="major_id") + val majorId: Int, + @SerializedName(value="minor_id") + val minorId: Int +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationWithMessage.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationWithMessage.kt index f6017d32a8..e259e3fe0f 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationWithMessage.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationWithMessage.kt @@ -35,7 +35,7 @@ import com.google.gson.annotations.SerializedName */ data class MessagesConversationWithMessage( @SerializedName(value="conversation") - val conversation: MessagesConversation? = null, + val conversation: MessagesConversation, @SerializedName(value="last_message") val lastMessage: MessagesMessage? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsByIdExtendedResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsByIdExtendedResponseDto.kt index 6edbece3e8..88630e5e5d 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsByIdExtendedResponseDto.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsByIdExtendedResponseDto.kt @@ -28,7 +28,8 @@ package com.vk.sdk.api.messages.dto import com.google.gson.annotations.SerializedName -import com.vk.sdk.api.users.dto.UsersUser +import com.vk.sdk.api.groups.dto.GroupsGroupFull +import com.vk.sdk.api.users.dto.UsersUserFull import kotlin.Int import kotlin.collections.List @@ -36,6 +37,7 @@ import kotlin.collections.List * @param count Total number * @param items no description * @param profiles no description + * @param groups no description */ data class MessagesGetConversationsByIdExtendedResponseDto( @SerializedName(value="count") @@ -43,5 +45,7 @@ data class MessagesGetConversationsByIdExtendedResponseDto( @SerializedName(value="items") val items: List, @SerializedName(value="profiles") - val profiles: List? = null + val profiles: List? = null, + @SerializedName(value="groups") + val groups: List? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryExtendedResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryExtendedResponseDto.kt new file mode 100644 index 0000000000..95eb1c2683 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryExtendedResponseDto.kt @@ -0,0 +1,54 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.groups.dto.GroupsGroupFull +import com.vk.sdk.api.users.dto.UsersUserFull +import kotlin.Int +import kotlin.collections.List + +/** + * @param count Total number + * @param items no description + * @param profiles no description + * @param groups no description + * @param conversations no description + */ +data class MessagesGetHistoryExtendedResponseDto( + @SerializedName(value="count") + val count: Int, + @SerializedName(value="items") + val items: List, + @SerializedName(value="profiles") + val profiles: List? = null, + @SerializedName(value="groups") + val groups: List? = null, + @SerializedName(value="conversations") + val conversations: List? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryResponseDto.kt index 375adebfe9..da4917b102 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryResponseDto.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryResponseDto.kt @@ -28,24 +28,16 @@ package com.vk.sdk.api.messages.dto import com.google.gson.annotations.SerializedName -import com.vk.sdk.api.groups.dto.GroupsGroupFull -import com.vk.sdk.api.users.dto.UsersUserFull import kotlin.Int import kotlin.collections.List /** * @param count Total number * @param items no description - * @param profiles no description - * @param groups no description */ data class MessagesGetHistoryResponseDto( @SerializedName(value="count") val count: Int, @SerializedName(value="items") - val items: List, - @SerializedName(value="profiles") - val profiles: List? = null, - @SerializedName(value="groups") - val groups: List? = null + val items: List ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetIntentUsersIntent.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetIntentUsersIntent.kt new file mode 100644 index 0000000000..ad0bd9eba8 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetIntentUsersIntent.kt @@ -0,0 +1,69 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.JsonDeserializationContext +import com.google.gson.JsonDeserializer +import com.google.gson.JsonElement +import com.google.gson.JsonNull +import com.google.gson.JsonParseException +import com.google.gson.JsonPrimitive +import com.google.gson.JsonSerializationContext +import com.google.gson.JsonSerializer +import java.lang.reflect.Type +import kotlin.String + +enum class MessagesGetIntentUsersIntent( + val value: String +) { + CONFIRMED_NOTIFICATION("confirmed_notification"), + + NON_PROMO_NEWSLETTER("non_promo_newsletter"), + + PROMO_NEWSLETTER("promo_newsletter"); + + class Serializer : JsonSerializer, + JsonDeserializer { + override fun serialize( + src: MessagesGetIntentUsersIntent?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = src?.let { JsonPrimitive(src.value) } ?: JsonNull.INSTANCE + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): MessagesGetIntentUsersIntent { + val value = values().firstOrNull { + it.value.toString() == json?.asJsonPrimitive?.asString + } + return value ?: throw JsonParseException(json.toString()) + } + } +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetIntentUsersResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetIntentUsersResponseDto.kt new file mode 100644 index 0000000000..c1ee6c9cb0 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetIntentUsersResponseDto.kt @@ -0,0 +1,47 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.users.dto.UsersUserFull +import kotlin.Int +import kotlin.collections.List + +/** + * @param count no description + * @param items no description + * @param profiles no description + */ +data class MessagesGetIntentUsersResponseDto( + @SerializedName(value="count") + val count: Int, + @SerializedName(value="items") + val items: List, + @SerializedName(value="profiles") + val profiles: List? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetLongPollHistoryResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetLongPollHistoryResponseDto.kt index df12f3304e..d988fd863f 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetLongPollHistoryResponseDto.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetLongPollHistoryResponseDto.kt @@ -36,27 +36,33 @@ import kotlin.collections.List /** * @param history no description - * @param groups no description * @param messages no description + * @param credentials no description * @param profiles no description + * @param groups no description * @param chats no description * @param newPts Persistence timestamp + * @param fromPts no description * @param more Has more * @param conversations no description */ data class MessagesGetLongPollHistoryResponseDto( @SerializedName(value="history") val history: List>? = null, - @SerializedName(value="groups") - val groups: List? = null, @SerializedName(value="messages") val messages: MessagesLongpollMessages? = null, + @SerializedName(value="credentials") + val credentials: MessagesLongpollParams? = null, @SerializedName(value="profiles") val profiles: List? = null, + @SerializedName(value="groups") + val groups: List? = null, @SerializedName(value="chats") val chats: List? = null, @SerializedName(value="new_pts") val newPts: Int? = null, + @SerializedName(value="from_pts") + val fromPts: Int? = null, @SerializedName(value="more") val more: Boolean? = null, @SerializedName(value="conversations") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollParams.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollParams.kt index 249c6021ca..b5973057ff 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollParams.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollParams.kt @@ -32,18 +32,18 @@ import kotlin.Int import kotlin.String /** - * @param key Key - * @param pts Persistent timestamp * @param server Server URL + * @param key Key * @param ts Timestamp + * @param pts Persistent timestamp */ data class MessagesLongpollParams( - @SerializedName(value="key") - val key: String? = null, - @SerializedName(value="pts") - val pts: Int? = null, @SerializedName(value="server") - val server: String? = null, + val server: String, + @SerializedName(value="key") + val key: String, @SerializedName(value="ts") - val ts: String? = null + val ts: Int, + @SerializedName(value="pts") + val pts: Int? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachment.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachment.kt index aab556b8ff..1f8b78fb45 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachment.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachment.kt @@ -31,11 +31,13 @@ import com.google.gson.annotations.SerializedName import com.vk.sdk.api.audio.dto.AudioAudio import com.vk.sdk.api.base.dto.BaseLink import com.vk.sdk.api.base.dto.BaseSticker +import com.vk.sdk.api.calls.dto.CallsCall import com.vk.sdk.api.docs.dto.DocsDoc import com.vk.sdk.api.gifts.dto.GiftsLayout import com.vk.sdk.api.market.dto.MarketMarketAlbum import com.vk.sdk.api.market.dto.MarketMarketItem import com.vk.sdk.api.photos.dto.PhotosPhoto +import com.vk.sdk.api.polls.dto.PollsPoll import com.vk.sdk.api.stories.dto.StoriesStory import com.vk.sdk.api.video.dto.VideoVideo import com.vk.sdk.api.wall.dto.WallWallComment @@ -45,6 +47,7 @@ import com.vk.sdk.api.wall.dto.WallWallpostFull * @param type no description * @param audio no description * @param audioMessage no description + * @param call no description * @param doc no description * @param gift no description * @param graffiti no description @@ -57,6 +60,7 @@ import com.vk.sdk.api.wall.dto.WallWallpostFull * @param video no description * @param wall no description * @param wallReply no description + * @param poll no description */ data class MessagesMessageAttachment( @SerializedName(value="type") @@ -65,6 +69,8 @@ data class MessagesMessageAttachment( val audio: AudioAudio? = null, @SerializedName(value="audio_message") val audioMessage: MessagesAudioMessage? = null, + @SerializedName(value="call") + val call: CallsCall? = null, @SerializedName(value="doc") val doc: DocsDoc? = null, @SerializedName(value="gift") @@ -88,5 +94,7 @@ data class MessagesMessageAttachment( @SerializedName(value="wall") val wall: WallWallpostFull? = null, @SerializedName(value="wall_reply") - val wallReply: WallWallComment? = null + val wallReply: WallWallComment? = null, + @SerializedName(value="poll") + val poll: PollsPoll? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachmentType.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachmentType.kt index 64552633b2..b82548dde0 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachmentType.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachmentType.kt @@ -30,9 +30,6 @@ package com.vk.sdk.api.messages.dto import com.google.gson.annotations.SerializedName enum class MessagesMessageAttachmentType { - @SerializedName(value="graffiti") - GRAFFITI, - - @SerializedName(value="audio_message") - AUDIO_MESSAGE + @SerializedName(value="call") + CALL } diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesPushSettings.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesPushSettings.kt new file mode 100644 index 0000000000..e6d0903d90 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesPushSettings.kt @@ -0,0 +1,53 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.annotations.SerializedName +import kotlin.Boolean +import kotlin.Int + +/** + * @param disabledForever Information whether push notifications are disabled forever + * @param noSound Information whether the sound is on + * @param disabledUntil Time until what notifications are disabled + * @param disabledMentions Information whether the mentions are disabled + * @param disabledMassMentions Information whether the mass mentions (like '@all', '@online') are + * disabled + */ +data class MessagesPushSettings( + @SerializedName(value="disabled_forever") + val disabledForever: Boolean, + @SerializedName(value="no_sound") + val noSound: Boolean, + @SerializedName(value="disabled_until") + val disabledUntil: Int? = null, + @SerializedName(value="disabled_mentions") + val disabledMentions: Boolean? = null, + @SerializedName(value="disabled_mass_mentions") + val disabledMassMentions: Boolean? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsExtendedResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsExtendedResponseDto.kt new file mode 100644 index 0000000000..ca8fc4e1c7 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsExtendedResponseDto.kt @@ -0,0 +1,51 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.groups.dto.GroupsGroupFull +import com.vk.sdk.api.users.dto.UsersUserFull +import kotlin.Int +import kotlin.collections.List + +/** + * @param count Total results number + * @param items no description + * @param profiles no description + * @param groups no description + */ +data class MessagesSearchConversationsExtendedResponseDto( + @SerializedName(value="count") + val count: Int, + @SerializedName(value="items") + val items: List, + @SerializedName(value="profiles") + val profiles: List? = null, + @SerializedName(value="groups") + val groups: List? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsResponseDto.kt index e7ccf090c6..51cb966cc5 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsResponseDto.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsResponseDto.kt @@ -28,24 +28,16 @@ package com.vk.sdk.api.messages.dto import com.google.gson.annotations.SerializedName -import com.vk.sdk.api.groups.dto.GroupsGroupFull -import com.vk.sdk.api.users.dto.UsersUserFull import kotlin.Int import kotlin.collections.List /** * @param count Total results number * @param items no description - * @param profiles no description - * @param groups no description */ data class MessagesSearchConversationsResponseDto( @SerializedName(value="count") - val count: Int? = null, + val count: Int, @SerializedName(value="items") - val items: List? = null, - @SerializedName(value="profiles") - val profiles: List? = null, - @SerializedName(value="groups") - val groups: List? = null + val items: List ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchExtendedResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchExtendedResponseDto.kt new file mode 100644 index 0000000000..f4a52474aa --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchExtendedResponseDto.kt @@ -0,0 +1,54 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.groups.dto.GroupsGroupFull +import com.vk.sdk.api.users.dto.UsersUserFull +import kotlin.Int +import kotlin.collections.List + +/** + * @param count Total number + * @param items no description + * @param profiles no description + * @param groups no description + * @param conversations no description + */ +data class MessagesSearchExtendedResponseDto( + @SerializedName(value="count") + val count: Int, + @SerializedName(value="items") + val items: List, + @SerializedName(value="profiles") + val profiles: List? = null, + @SerializedName(value="groups") + val groups: List? = null, + @SerializedName(value="conversations") + val conversations: List? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSetActivityType.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSetActivityType.kt new file mode 100644 index 0000000000..f32beda18f --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSetActivityType.kt @@ -0,0 +1,73 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.dto + +import com.google.gson.JsonDeserializationContext +import com.google.gson.JsonDeserializer +import com.google.gson.JsonElement +import com.google.gson.JsonNull +import com.google.gson.JsonParseException +import com.google.gson.JsonPrimitive +import com.google.gson.JsonSerializationContext +import com.google.gson.JsonSerializer +import java.lang.reflect.Type +import kotlin.String + +enum class MessagesSetActivityType( + val value: String +) { + AUDIOMESSAGE("audiomessage"), + + FILE("file"), + + PHOTO("photo"), + + TYPING("typing"), + + VIDEO("video"); + + class Serializer : JsonSerializer, + JsonDeserializer { + override fun serialize( + src: MessagesSetActivityType?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = src?.let { JsonPrimitive(src.value) } ?: JsonNull.INSTANCE + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): MessagesSetActivityType { + val value = values().firstOrNull { + it.value.toString() == json?.asJsonPrimitive?.asString + } + return value ?: throw JsonParseException(json.toString()) + } + } +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesEdit.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesEdit.kt index cf210a88b5..b397b569c9 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesEdit.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesEdit.kt @@ -41,7 +41,7 @@ import org.json.JSONObject * Edits the message. * @param peerId Destination ID. "For user: 'User ID', e.g. '12345'. For chat: '2000000000' + * 'chat_id', e.g. '2000000001'. For community: '- community ID', e.g. '-12345'. " - * @param message (Required if 'attachments' is not set.) Text of the message. + * @param message (Required if 'attachments' is not set.) Text of the message. maxLength 9000 * @param lat Geographical latitude of a check-in, in degrees (from -90 to 90). * @param long Geographical longitude of a check-in, in degrees (from -180 to 180). * @param attachment (Required if 'message' is not set.) List of objects attached to the message, diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesGetHistoryExtended.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesGetHistoryExtended.kt new file mode 100644 index 0000000000..7540531850 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesGetHistoryExtended.kt @@ -0,0 +1,98 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.methods + +import com.vk.sdk.api.ApiRequestBase +import com.vk.sdk.api.GsonHolder +import com.vk.sdk.api.messages.dto.MessagesGetHistoryExtendedResponseDto +import com.vk.sdk.api.messages.dto.MessagesGetHistoryRev +import com.vk.sdk.api.messages.responses.MessagesGetHistoryExtendedResponse +import com.vk.sdk.api.users.dto.UsersFields +import kotlin.Boolean +import kotlin.Int +import kotlin.collections.List +import org.json.JSONObject + +/** + * Returns message history for the specified user or group chat. + * @param offset Offset needed to return a specific subset of messages. + * @param count Number of messages to return. default 20 minimum 0 maximum 200 + * @param userId ID of the user whose message history you want to return. + * @param peerId + * @param startMessageId Starting message ID from which to return history. minimum 0 + * @param rev Sort order: '1' - return messages in chronological order. '0' - return messages in + * reverse chronological order. + * @param extended Information whether the response should be extended + * @param fields Profile fields to return. + * @param groupId Group ID (for group messages with group access token) minimum 0 + */ +class MessagesGetHistoryExtended( + private val offset: Int? = null, + private val count: Int? = null, + private val userId: Int? = null, + private val peerId: Int? = null, + private val startMessageId: Int? = null, + private val rev: MessagesGetHistoryRev? = null, + private val extended: Boolean? = null, + private val fields: List? = null, + private val groupId: Int? = null +) : ApiRequestBase(methodName = "messages.getHistory") { + init { + offset?.let { value -> + addParam("offset", value) + } + count?.let { value -> + addParam("count", value) + } + userId?.let { value -> + addParam("user_id", value) + } + peerId?.let { value -> + addParam("peer_id", value) + } + startMessageId?.let { value -> + addParam("start_message_id", value) + } + rev?.let { value -> + addParam("rev", value.value) + } + extended?.let { value -> + addParam("extended", if (value) 1 else 0) + } + fields?.let { value -> + addParam("fields", value) + } + groupId?.let { value -> + addParam("group_id", value) + } + } + + override fun parse(r: JSONObject): MessagesGetHistoryExtendedResponseDto = + GsonHolder.gson.fromJson(r.toString(), + MessagesGetHistoryExtendedResponse::class.java).response +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesGetIntentUsers.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesGetIntentUsers.kt new file mode 100644 index 0000000000..f1ace369fd --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesGetIntentUsers.kt @@ -0,0 +1,84 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.methods + +import com.vk.sdk.api.ApiRequestBase +import com.vk.sdk.api.GsonHolder +import com.vk.sdk.api.messages.dto.MessagesGetIntentUsersIntent +import com.vk.sdk.api.messages.dto.MessagesGetIntentUsersResponseDto +import com.vk.sdk.api.messages.responses.MessagesGetIntentUsersResponse +import kotlin.Boolean +import kotlin.Int +import kotlin.String +import kotlin.collections.List +import org.json.JSONObject + +/** + * @param intent + * @param subscribeId minimum 0 maximum 100 + * @param offset default 0 minimum 0 + * @param count default 20 minimum 0 maximum 200 + * @param extended + * @param nameCase + * @param fields + */ +class MessagesGetIntentUsers( + private val intent: MessagesGetIntentUsersIntent, + private val subscribeId: Int? = null, + private val offset: Int? = null, + private val count: Int? = null, + private val extended: Boolean? = null, + private val nameCase: List? = null, + private val fields: List? = null +) : ApiRequestBase(methodName = "messages.getIntentUsers") { + init { + addParam("intent", intent.value) + subscribeId?.let { value -> + addParam("subscribe_id", value) + } + offset?.let { value -> + addParam("offset", value) + } + count?.let { value -> + addParam("count", value) + } + extended?.let { value -> + addParam("extended", if (value) 1 else 0) + } + nameCase?.let { value -> + addParam("name_case", value) + } + fields?.let { value -> + addParam("fields", value) + } + } + + override fun parse(r: JSONObject): MessagesGetIntentUsersResponseDto = + GsonHolder.gson.fromJson(r.toString(), + MessagesGetIntentUsersResponse::class.java).response +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSearch.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSearch.kt index e0e5a5c1b6..7d510bc339 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSearch.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSearch.kt @@ -39,7 +39,7 @@ import org.json.JSONObject /** * Returns a list of the current user's private messages that match search criteria. - * @param q Search query string. + * @param q Search query string. maxLength 9000 * @param peerId Destination ID. "For user: 'User ID', e.g. '12345'. For chat: '2000000000' + * 'chat_id', e.g. '2000000001'. For community: '- community ID', e.g. '-12345'. " * @param date Date to search message before in Unixtime. minimum 0 diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSearchConversationsExtended.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSearchConversationsExtended.kt new file mode 100644 index 0000000000..67a255cd39 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSearchConversationsExtended.kt @@ -0,0 +1,78 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.methods + +import com.vk.sdk.api.ApiRequestBase +import com.vk.sdk.api.GsonHolder +import com.vk.sdk.api.messages.dto.MessagesSearchConversationsExtendedResponseDto +import com.vk.sdk.api.messages.responses.MessagesSearchConversationsExtendedResponse +import com.vk.sdk.api.users.dto.UsersFields +import kotlin.Boolean +import kotlin.Int +import kotlin.String +import kotlin.collections.List +import org.json.JSONObject + +/** + * Returns a list of the current user's conversations that match search criteria. + * @param q Search query string. + * @param count Maximum number of results. default 20 minimum 1 maximum 255 + * @param extended '1' - return extra information about users and communities + * @param fields Profile fields to return. + * @param groupId Group ID (for group messages with user access token) minimum 0 + */ +class MessagesSearchConversationsExtended( + private val q: String? = null, + private val count: Int? = null, + private val extended: Boolean? = null, + private val fields: List? = null, + private val groupId: Int? = null +) : ApiRequestBase(methodName = + "messages.searchConversations") { + init { + q?.let { value -> + addParam("q", value) + } + count?.let { value -> + addParam("count", value) + } + extended?.let { value -> + addParam("extended", if (value) 1 else 0) + } + fields?.let { value -> + addParam("fields", value) + } + groupId?.let { value -> + addParam("group_id", value) + } + } + + override fun parse(r: JSONObject): MessagesSearchConversationsExtendedResponseDto = + GsonHolder.gson.fromJson(r.toString(), + MessagesSearchConversationsExtendedResponse::class.java).response +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSearchExtended.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSearchExtended.kt new file mode 100644 index 0000000000..f5967691b1 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSearchExtended.kt @@ -0,0 +1,99 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.methods + +import com.vk.sdk.api.ApiRequestBase +import com.vk.sdk.api.GsonHolder +import com.vk.sdk.api.messages.dto.MessagesSearchExtendedResponseDto +import com.vk.sdk.api.messages.responses.MessagesSearchExtendedResponse +import kotlin.Boolean +import kotlin.Int +import kotlin.String +import kotlin.collections.List +import org.json.JSONObject + +/** + * Returns a list of the current user's private messages that match search criteria. + * @param q Search query string. maxLength 9000 + * @param peerId Destination ID. "For user: 'User ID', e.g. '12345'. For chat: '2000000000' + + * 'chat_id', e.g. '2000000001'. For community: '- community ID', e.g. '-12345'. " + * @param date Date to search message before in Unixtime. minimum 0 + * @param previewLength Number of characters after which to truncate a previewed message. To preview + * the full message, specify '0'. "NOTE: Messages are not truncated by default. Messages are truncated + * by words." default 0 minimum 0 + * @param offset Offset needed to return a specific subset of messages. default 0 minimum 0 + * @param count Number of messages to return. default 20 minimum 0 maximum 100 + * @param extended + * @param fields + * @param groupId Group ID (for group messages with group access token) minimum 0 + */ +class MessagesSearchExtended( + private val q: String? = null, + private val peerId: Int? = null, + private val date: Int? = null, + private val previewLength: Int? = null, + private val offset: Int? = null, + private val count: Int? = null, + private val extended: Boolean? = null, + private val fields: List? = null, + private val groupId: Int? = null +) : ApiRequestBase(methodName = "messages.search") { + init { + q?.let { value -> + addParam("q", value) + } + peerId?.let { value -> + addParam("peer_id", value) + } + date?.let { value -> + addParam("date", value) + } + previewLength?.let { value -> + addParam("preview_length", value) + } + offset?.let { value -> + addParam("offset", value) + } + count?.let { value -> + addParam("count", value) + } + extended?.let { value -> + addParam("extended", if (value) 1 else 0) + } + fields?.let { value -> + addParam("fields", value) + } + groupId?.let { value -> + addParam("group_id", value) + } + } + + override fun parse(r: JSONObject): MessagesSearchExtendedResponseDto = + GsonHolder.gson.fromJson(r.toString(), + MessagesSearchExtendedResponse::class.java).response +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSend.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSend.kt index c37f87ebf4..983f93114e 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSend.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSend.kt @@ -48,14 +48,14 @@ import org.json.JSONObject * @param domain User's short address (for example, 'illarionov'). * @param chatId ID of conversation the message will relate to. minimum 0 maximum 100000000 * @param userIds IDs of message recipients (if new conversation shall be started). - * @param message (Required if 'attachments' is not set.) Text of the message. + * @param message (Required if 'attachments' is not set.) Text of the message. maxLength 9000 * @param lat Geographical latitude of a check-in, in degrees (from -90 to 90). * @param long Geographical longitude of a check-in, in degrees (from -180 to 180). * @param attachment (Required if 'message' is not set.) List of objects attached to the message, * separated by commas, in the following format: "_", '' - Type of media * attachment: 'photo' - photo, 'video' - video, 'audio' - audio, 'doc' - document, 'wall' - wall post, * '' - ID of the media attachment owner. '' - media attachment ID. Example: - * "photo100172_166443618" + * "photo100172_166443618" maxLength 9000 * @param replyTo * @param forwardMessages ID of forwarded messages, separated with a comma. Listed messages of the * sender will be shown in the message body at the recipient's. Example: "123,431,544" diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSendUserids.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSendUserids.kt index 3e7649a06d..f95855d43d 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSendUserids.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSendUserids.kt @@ -49,14 +49,14 @@ import org.json.JSONObject * @param domain User's short address (for example, 'illarionov'). * @param chatId ID of conversation the message will relate to. minimum 0 maximum 100000000 * @param userIds IDs of message recipients (if new conversation shall be started). - * @param message (Required if 'attachments' is not set.) Text of the message. + * @param message (Required if 'attachments' is not set.) Text of the message. maxLength 9000 * @param lat Geographical latitude of a check-in, in degrees (from -90 to 90). * @param long Geographical longitude of a check-in, in degrees (from -180 to 180). * @param attachment (Required if 'message' is not set.) List of objects attached to the message, * separated by commas, in the following format: "_", '' - Type of media * attachment: 'photo' - photo, 'video' - video, 'audio' - audio, 'doc' - document, 'wall' - wall post, * '' - ID of the media attachment owner. '' - media attachment ID. Example: - * "photo100172_166443618" + * "photo100172_166443618" maxLength 9000 * @param replyTo * @param forwardMessages ID of forwarded messages, separated with a comma. Listed messages of the * sender will be shown in the message body at the recipient's. Example: "123,431,544" diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSetActivity.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSetActivity.kt index b298baa918..77d20ac72c 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSetActivity.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/methods/MessagesSetActivity.kt @@ -31,8 +31,8 @@ import com.vk.sdk.api.ApiRequestBase import com.vk.sdk.api.GsonHolder import com.vk.sdk.api.base.dto.BaseOkResponseDto import com.vk.sdk.api.base.responses.BaseOkResponse +import com.vk.sdk.api.messages.dto.MessagesSetActivityType import kotlin.Int -import kotlin.String import org.json.JSONObject /** @@ -45,7 +45,7 @@ import org.json.JSONObject */ class MessagesSetActivity( private val userId: Int? = null, - private val type: String? = null, + private val type: MessagesSetActivityType? = null, private val peerId: Int? = null, private val groupId: Int? = null ) : ApiRequestBase(methodName = "messages.setActivity") { @@ -54,7 +54,7 @@ class MessagesSetActivity( addParam("user_id", value) } type?.let { value -> - addParam("type", value) + addParam("type", value.value) } peerId?.let { value -> addParam("peer_id", value) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/responses/MessagesGetHistoryExtendedResponse.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/responses/MessagesGetHistoryExtendedResponse.kt new file mode 100644 index 0000000000..4f876072ff --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/responses/MessagesGetHistoryExtendedResponse.kt @@ -0,0 +1,39 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.responses + +import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.messages.dto.MessagesGetHistoryExtendedResponseDto + +/** + * @param response no description + */ +data class MessagesGetHistoryExtendedResponse( + @SerializedName(value="response") + val response: MessagesGetHistoryExtendedResponseDto +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/responses/MessagesGetIntentUsersResponse.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/responses/MessagesGetIntentUsersResponse.kt new file mode 100644 index 0000000000..193a4ca2b7 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/responses/MessagesGetIntentUsersResponse.kt @@ -0,0 +1,39 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.responses + +import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.messages.dto.MessagesGetIntentUsersResponseDto + +/** + * @param response no description + */ +data class MessagesGetIntentUsersResponse( + @SerializedName(value="response") + val response: MessagesGetIntentUsersResponseDto +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/responses/MessagesSearchConversationsExtendedResponse.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/responses/MessagesSearchConversationsExtendedResponse.kt new file mode 100644 index 0000000000..5c381e205b --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/responses/MessagesSearchConversationsExtendedResponse.kt @@ -0,0 +1,39 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.responses + +import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.messages.dto.MessagesSearchConversationsExtendedResponseDto + +/** + * @param response no description + */ +data class MessagesSearchConversationsExtendedResponse( + @SerializedName(value="response") + val response: MessagesSearchConversationsExtendedResponseDto +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/responses/MessagesSearchExtendedResponse.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/responses/MessagesSearchExtendedResponse.kt new file mode 100644 index 0000000000..e336b97f59 --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/responses/MessagesSearchExtendedResponse.kt @@ -0,0 +1,39 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.messages.responses + +import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.messages.dto.MessagesSearchExtendedResponseDto + +/** + * @param response no description + */ +data class MessagesSearchExtendedResponse( + @SerializedName(value="response") + val response: MessagesSearchExtendedResponseDto +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedFilters.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedFilters.kt index c2bf661c68..73f466fef5 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedFilters.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedFilters.kt @@ -63,7 +63,9 @@ enum class NewsfeedFilters( GAMES_CAROUSEL("games_carousel"), - CLIP("clip"); + CLIP("clip"), + + RECOMMENDED_GAME("recommended_game"); class Serializer : JsonSerializer, JsonDeserializer { override fun serialize( diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetCommentsResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetCommentsResponseDto.kt index ed0c899226..853e29cf76 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetCommentsResponseDto.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetCommentsResponseDto.kt @@ -37,7 +37,7 @@ import kotlin.collections.List * @param items no description * @param profiles no description * @param groups no description - * @param nextFrom New from value + * @param nextFrom Next from value */ data class NewsfeedGetCommentsResponseDto( @SerializedName(value="items") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetRecommendedResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetRecommendedResponseDto.kt index 06edc84596..c9de9ce842 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetRecommendedResponseDto.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetRecommendedResponseDto.kt @@ -37,7 +37,6 @@ import kotlin.collections.List * @param items no description * @param profiles no description * @param groups no description - * @param newOffset New offset value * @param nextFrom Next from value */ data class NewsfeedGetRecommendedResponseDto( @@ -47,8 +46,6 @@ data class NewsfeedGetRecommendedResponseDto( val profiles: List? = null, @SerializedName(value="groups") val groups: List? = null, - @SerializedName(value="new_offset") - val newOffset: String? = null, @SerializedName(value="next_from") val nextFrom: String? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedIgnoreItemResponseDto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedIgnoreItemResponseDto.kt new file mode 100644 index 0000000000..1873506d0c --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedIgnoreItemResponseDto.kt @@ -0,0 +1,39 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.newsfeed.dto + +import com.google.gson.annotations.SerializedName +import kotlin.Boolean + +/** + * @param status no description + */ +data class NewsfeedIgnoreItemResponseDto( + @SerializedName(value="status") + val status: Boolean +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigest.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigest.kt index 7776ac4bcd..993539c1ed 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigest.kt +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigest.kt @@ -36,7 +36,6 @@ import com.google.gson.JsonPrimitive import com.google.gson.JsonSerializationContext import com.google.gson.JsonSerializer import com.google.gson.annotations.SerializedName -import com.vk.sdk.api.wall.dto.WallWallpost import java.lang.reflect.Type import kotlin.Int import kotlin.String @@ -58,7 +57,7 @@ data class NewsfeedItemDigest( @SerializedName(value="feed_id") val feedId: String? = null, @SerializedName(value="items") - val items: List? = null, + val items: List? = null, @SerializedName(value="main_post_ids") val mainPostIds: List? = null, @SerializedName(value="template") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestButton.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestButton.kt new file mode 100644 index 0000000000..c548ab467a --- /dev/null +++ b/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestButton.kt @@ -0,0 +1,76 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.newsfeed.dto + +import com.google.gson.JsonDeserializationContext +import com.google.gson.JsonDeserializer +import com.google.gson.JsonElement +import com.google.gson.JsonNull +import com.google.gson.JsonParseException +import com.google.gson.JsonPrimitive +import com.google.gson.JsonSerializationContext +import com.google.gson.JsonSerializer +import com.google.gson.annotations.SerializedName +import java.lang.reflect.Type +import kotlin.String + +/** + * @param title no description + * @param style no description + */ +data class NewsfeedItemDigestButton( + @SerializedName(value="title") + val title: String, + @SerializedName(value="style") + val style: Style? = null +) { + enum class Style( + val value: String + ) { + PRIMARY("primary"); + + class Serializer : JsonSerializer